From 4bd6934a050e4a047a470985c753b1362feaa290 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 8 Feb 2016 12:24:29 +0100 Subject: [PATCH 0001/3452] 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 0002/3452] 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 0003/3452] 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 0004/3452] 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 0005/3452] 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 0006/3452] 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 0007/3452] 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 0008/3452] 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 0009/3452] 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 0010/3452] 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 0011/3452] 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 0012/3452] 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 0013/3452] 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 0014/3452] 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 0015/3452] 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 0016/3452] 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 0017/3452] 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 0018/3452] 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 0019/3452] 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 0020/3452] 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 0021/3452] 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 0022/3452] 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 0023/3452] 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 0024/3452] 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 0025/3452] 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 0026/3452] 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 0027/3452] 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 0028/3452] 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 0029/3452] 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 0030/3452] 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 0031/3452] 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 0032/3452] 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 0033/3452] 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 0034/3452] 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 0035/3452] 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 0036/3452] 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 0037/3452] 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 0038/3452] 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 0039/3452] 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 0040/3452] `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 0041/3452] `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 0042/3452] 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 0043/3452] 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 0044/3452] 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 0045/3452] 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 0046/3452] 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 0047/3452] 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 0048/3452] `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 0049/3452] 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 0050/3452] 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 0051/3452] 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 0052/3452] 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 0053/3452] 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 0054/3452] 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 0055/3452] 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 0056/3452] 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 0057/3452] 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 0058/3452] 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 0059/3452] 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 0060/3452] 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 0061/3452] 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 0062/3452] 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 0063/3452] 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 0064/3452] 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 0065/3452] 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 0066/3452] 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 0067/3452] 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 0068/3452] 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 0069/3452] 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 0070/3452] 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 0071/3452] 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 0072/3452] 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 0073/3452] 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 0074/3452] 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 0075/3452] 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 0076/3452] 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 0077/3452] 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 0078/3452] 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 0079/3452] 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 0080/3452] 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 0081/3452] 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 0082/3452] 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 0083/3452] 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 0084/3452] 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 0085/3452] 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 0086/3452] 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 0087/3452] 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 0088/3452] 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 0089/3452] 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 0090/3452] 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 0091/3452] 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 0092/3452] 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 0093/3452] 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 0094/3452] 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 0095/3452] 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 0096/3452] 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 0097/3452] 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 0098/3452] 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 0099/3452] 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 0100/3452] 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 0101/3452] 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 0102/3452] 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 0103/3452] 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 0104/3452] 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 0105/3452] 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 0106/3452] 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 0107/3452] 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 0108/3452] 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 0109/3452] 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 0110/3452] 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 0111/3452] 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 0112/3452] 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 0113/3452] 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 0114/3452] 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 0115/3452] 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 0116/3452] 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 0117/3452] 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 0118/3452] 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 0119/3452] 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 0120/3452] 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 0121/3452] 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 0122/3452] 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 0123/3452] 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 0124/3452] 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 0125/3452] 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 0126/3452] 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 0127/3452] 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 0128/3452] 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 0129/3452] 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 0130/3452] 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 0131/3452] 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 0132/3452] 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 0133/3452] 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 0134/3452] 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 0135/3452] 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 0136/3452] 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 0137/3452] 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 0138/3452] 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 0139/3452] 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 0140/3452] 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 0141/3452] 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 0142/3452] 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 0143/3452] 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 0144/3452] 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 0145/3452] 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 0146/3452] 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 0147/3452] 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 0148/3452] 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 0149/3452] 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 0150/3452] 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 0151/3452] 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 0152/3452] 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 0153/3452] 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 0154/3452] 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 0155/3452] 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 0156/3452] 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 0157/3452] 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 0158/3452] 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 0159/3452] 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 0160/3452] 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 0161/3452] 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 0162/3452] 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 0163/3452] 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 0164/3452] 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 0165/3452] 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 0166/3452] 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 0167/3452] 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 0168/3452] 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 0169/3452] 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 0170/3452] 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 0171/3452] 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 0172/3452] 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 0173/3452] 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 0174/3452] 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 0175/3452] 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 0176/3452] 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 0177/3452] 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 0178/3452] 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 0179/3452] 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 0180/3452] 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 0181/3452] 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 0182/3452] 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 0183/3452] 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 0184/3452] 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 0185/3452] 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 0186/3452] 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 0187/3452] 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 0188/3452] 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 0189/3452] 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 0190/3452] 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 0191/3452] 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 0192/3452] 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 0193/3452] 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 0194/3452] 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 0195/3452] 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 0196/3452] 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 0197/3452] 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 0198/3452] 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 0199/3452] 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 0200/3452] 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 0201/3452] 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 0202/3452] 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 0203/3452] 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 0204/3452] 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 0205/3452] 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 0206/3452] 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 0207/3452] 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 0208/3452] 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 0209/3452] 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 0210/3452] 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 0211/3452] 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 0212/3452] 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 0213/3452] 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 0214/3452] 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 0215/3452] 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 4f7a56fa1a21e027a1ea9b3d8cf2116fe026439d Mon Sep 17 00:00:00 2001 From: Juanjo Presa Date: Sat, 14 Sep 2019 15:14:46 +0100 Subject: [PATCH 0216/3452] dcrd/dcrwallet: 1.1.2 -> 1.5.1 dcrwallet: 1.1.2 -> 1.4.1 Update modSha256 sums Downgrade drcd to Go 1.12 update to 1.5.0 --- pkgs/applications/blockchains/dcrd.nix | 34 ++++++---------- pkgs/applications/blockchains/dcrwallet.nix | 43 ++++++--------------- 2 files changed, 24 insertions(+), 53 deletions(-) diff --git a/pkgs/applications/blockchains/dcrd.nix b/pkgs/applications/blockchains/dcrd.nix index 16d39e85da15..0d59eb670171 100644 --- a/pkgs/applications/blockchains/dcrd.nix +++ b/pkgs/applications/blockchains/dcrd.nix @@ -1,34 +1,24 @@ -{ stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "dcrd"; - version = "1.1.2"; - rev = "refs/tags/v${version}"; - goPackagePath = "github.com/decred/dcrd"; + version = "1.5.1"; - buildInputs = [ go git dep cacert ]; - - GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - - src = fetchgit { - inherit rev; - url = "https://${goPackagePath}"; - sha256 = "0xcynipdn9zmmralxj0hjrwyanvhkwfj2b1vvjk5zfc95s2xc1q9"; + src = fetchFromGitHub { + owner = "decred"; + repo = "dcrd"; + rev = "refs/tags/release-v${version}"; + sha256 = "1ggw289y1f4dqvj3w60q9bahq8bblbfjymn5xy04ldylr3qlxm9x"; }; - preBuild = '' - export CWD=$(pwd) - cd go/src/github.com/decred/dcrd - dep ensure - go install . ./cmd/... - cd $CWD - ''; + vendorSha256 = "03aw6mcvp1vr01ppxy673jf5hdryd5032cxndlkaiwg005mxp1dy"; + + subPackages = [ "." "cmd/dcrctl" "cmd/promptsecret" ]; meta = { homepage = "https://decred.org"; description = "Decred daemon in Go (golang)"; license = with lib.licenses; [ isc ]; - broken = stdenv.isLinux; # 2018-04-10 + maintainers = with lib.maintainers; [ juaningan ]; }; } diff --git a/pkgs/applications/blockchains/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet.nix index 258aad8e1bd9..0fbd5f33e724 100644 --- a/pkgs/applications/blockchains/dcrwallet.nix +++ b/pkgs/applications/blockchains/dcrwallet.nix @@ -1,43 +1,24 @@ -{ stdenv, lib, go, buildGoPackage, dep, fetchgit, git, cacert }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "dcrwallet"; - version = "1.1.2"; - rev = "refs/tags/v${version}"; - goPackagePath = "github.com/decred/dcrwallet"; + version = "1.5.1"; - buildInputs = [ go git dep cacert ]; - - GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - - src = fetchgit { - inherit rev; - url = "https://${goPackagePath}"; - sha256 = "058im4vmcmxcl5ir14h17wik5lagp2ay0p8qc3r99qmpfwvvz39x"; + src = fetchFromGitHub { + owner = "decred"; + repo = "dcrwallet"; + rev = "refs/tags/v${version}"; + sha256 = "0ij2mwvdxg78p9qbdf9wm7aaphfg4j8lqgrjyjsj3kyi1l458ds9"; }; - preBuild = '' - export CWD=$(pwd) - cd go/src/github.com/decred/dcrwallet - dep ensure - ''; - - buildPhase = '' - runHook preBuild - go build - ''; - - installPhase = '' - mkdir -pv $out/bin - cp -v dcrwallet $out/bin - ''; + vendorSha256 = "0qrrr92cad399xwr64qa9h41wqqaj0dy5mw248g5v53zars541w7"; + subPackages = [ "." ]; meta = { homepage = "https://decred.org"; - description = "Decred daemon in Go (golang)"; + description = "A secure Decred wallet daemon written in Go (golang)"; license = with lib.licenses; [ isc ]; - broken = stdenv.isLinux; # 2018-04-10 + maintainers = with lib.maintainers; [ juaningan ]; }; } From 26bbc980b9b7c6b0d38b51fec5b41e977731fb5c Mon Sep 17 00:00:00 2001 From: Ashley Gillman Date: Sun, 15 Jul 2018 22:28:25 +0100 Subject: [PATCH 0217/3452] 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 0218/3452] 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 0219/3452] 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 0220/3452] 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 0221/3452] 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 0222/3452] 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 0223/3452] 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 0224/3452] 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 0225/3452] 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 0226/3452] 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 0227/3452] 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 0228/3452] 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 0229/3452] 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 35f7d38a3ba416a7327d84cbfedd84c1e09baaea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 11 Dec 2019 15:43:17 +0100 Subject: [PATCH 0230/3452] nixos/systemd: Use a proper type for unit paths --- nixos/modules/system/boot/systemd-unit-options.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index bee21f1a8f36..62398f27d088 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -233,6 +233,7 @@ in rec { path = mkOption { default = []; + type = with types; listOf package; apply = ps: "${makeBinPath ps}:${makeSearchPathOutput "bin" "sbin" ps}"; description = '' Packages added to the service's PATH From c3b2ac63ff06e5dd4fa66f75bfab7892b3edfdc5 Mon Sep 17 00:00:00 2001 From: Alexander Berlind Date: Sat, 28 Dec 2019 10:50:04 +0100 Subject: [PATCH 0231/3452] 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 0232/3452] 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 0233/3452] 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 0234/3452] 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 6f3b04eb71ec50fafe749f8d1ebd5ac38de28b21 Mon Sep 17 00:00:00 2001 From: Jos van Bakel Date: Sun, 12 Jan 2020 14:35:23 +0100 Subject: [PATCH 0235/3452] nixos/nginx.sso: add package option --- nixos/modules/services/security/nginx-sso.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/security/nginx-sso.nix b/nixos/modules/services/security/nginx-sso.nix index d792f90abe64..50d250fc4d76 100644 --- a/nixos/modules/services/security/nginx-sso.nix +++ b/nixos/modules/services/security/nginx-sso.nix @@ -4,12 +4,21 @@ with lib; let cfg = config.services.nginx.sso; - pkg = getBin pkgs.nginx-sso; + pkg = getBin cfg.package; configYml = pkgs.writeText "nginx-sso.yml" (builtins.toJSON cfg.configuration); in { options.services.nginx.sso = { enable = mkEnableOption "nginx-sso service"; + package = mkOption { + type = types.package; + default = pkgs.nginx-sso; + defaultText = "pkgs.nginx-sso"; + description = '' + The nginx-sso package that should be used. + ''; + }; + configuration = mkOption { type = types.attrsOf types.unspecified; default = {}; From 814bd1a02422e7007fe469442c94f1ec54b065d6 Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Thu, 18 Jul 2019 15:19:31 -0400 Subject: [PATCH 0236/3452] 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 0237/3452] 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 0238/3452] 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 0239/3452] 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 0240/3452] 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 0241/3452] 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 0242/3452] 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 0243/3452] 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 0244/3452] 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 0245/3452] 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 0246/3452] 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 0247/3452] 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 0248/3452] 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 0249/3452] 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 0250/3452] 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 0251/3452] 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 0252/3452] 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 0253/3452] 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 0254/3452] 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 a15bdad2c18fef08c11151f74e147b2f5994225f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Feb 2020 12:06:11 +0000 Subject: [PATCH 0255/3452] mygui: 3.2.2 -> 3.4.0 --- pkgs/development/libraries/mygui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index c277b7934b9b..da139257fc6b 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -5,13 +5,13 @@ let renderSystem = if withOgre then "3" else "4"; in stdenv.mkDerivation rec { pname = "mygui"; - version = "3.2.2"; + version = "3.4.0"; src = fetchFromGitHub { owner = "MyGUI"; repo = "mygui"; rev = "MyGUI${version}"; - sha256 = "1wk7jmwm55rhlqqcyvqsxdmwvl70bysl9azh4kd9n57qlmgk3zmw"; + sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w"; }; enableParallelBuilding = true; 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 0256/3452] 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 27e52af5a5d5b5a6e2951b114f38482fe995882a Mon Sep 17 00:00:00 2001 From: Riley Inman Date: Sat, 29 Feb 2020 16:31:47 -0500 Subject: [PATCH 0257/3452] noto-fonts-emoji-blob-bin: init at 2019-06-14-Emoji-12 --- pkgs/data/fonts/noto-fonts/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 9681bb50efac..ebf7c8b5aebc 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -2,6 +2,7 @@ , stdenvNoCC , lib , fetchFromGitHub +, fetchurl , fetchzip , optipng , cairo @@ -146,4 +147,28 @@ in maintainers = with maintainers; [ mathnerd314 ]; }; }; + + noto-fonts-emoji-blob-bin = stdenv.mkDerivation rec { + pname = "noto-fonts-emoji-blob-bin"; + version = "2019-06-14-Emoji-12"; + + src = fetchurl { + url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf"; + sha256 = "0snvymglmvpnfgsriw2cnnqm0f4llav0jvzir6mpd17mqqhhabbh"; + }; + + dontUnpack = true; + + installPhase = '' + install -D $src $out/share/fonts/blobmoji/Blobmoji.ttf + ''; + + meta = with stdenv.lib; { + description = "Noto Emoji with extended Blob support"; + homepage = https://github.com/C1710/blobmoji; + license = with licenses; [ ofl asl20 ]; + platforms = platforms.all; + maintainers = with maintainers; [ rileyinman ]; + }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04eacccf2c11..aa90c027d929 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17806,7 +17806,7 @@ in nordic-polar = callPackage ../data/themes/nordic-polar { }; inherit (callPackages ../data/fonts/noto-fonts {}) - noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-extra; + noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-emoji-blob-bin noto-fonts-extra; nullmailer = callPackage ../servers/mail/nullmailer { stdenv = gccStdenv; 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 0258/3452] 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 0259/3452] 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 0260/3452] 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 b0b0a06788d5a7b3a3b35063b058f1326f10e983 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 23 Mar 2020 00:25:34 -0400 Subject: [PATCH 0261/3452] bintools: only add macos flags when targeting macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can’t set this for cross-compiling since we use the GNU linker. Instead, set these flags only when targetPlatform is macOS. Fixes #80754 Fixes #83141 --- pkgs/build-support/bintools-wrapper/default.nix | 5 +++++ pkgs/stdenv/darwin/default.nix | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 84020505a635..74feeece230f 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -248,6 +248,11 @@ stdenv.mkDerivation { printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before '') + + optionalString stdenv.targetPlatform.isMacOS '' + # Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID. + echo "-macosx_version_min 10.12 -sdk_version 10.12 -no_uuid" >> $out/nix-support/libc-ldflags-before + '' + + optionalString (!nativeTools) '' ## ## User env support diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index ef1ebfc32c1b..2d5a191fc32b 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -36,9 +36,7 @@ in rec { export NIX_IGNORE_LD_THROUGH_GCC=1 export SDKROOT= - # Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID. export MACOSX_DEPLOYMENT_TARGET=${macosVersionMin} - export NIX_LDFLAGS+=" -macosx_version_min ${macosVersionMin} -sdk_version ${appleSdkVersion} -no_uuid" # Workaround for https://openradar.appspot.com/22671534 on 10.11. export gl_cv_func_getcwd_abort_bug=no From c6722b86bfb34159c130606ff2ce46ef741c3b17 Mon Sep 17 00:00:00 2001 From: Niklaus Giger Date: Mon, 23 Mar 2020 20:19:54 +0100 Subject: [PATCH 0262/3452] 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 0263/3452] 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 0264/3452] 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 9d8831c8fe31ce26777274af68054c55342f48dc Mon Sep 17 00:00:00 2001 From: Greg Price Date: Sun, 29 Mar 2020 15:32:53 -0700 Subject: [PATCH 0265/3452] cpython: Drop unrecognized --with-threads configure flag. The ./configure script prints a warning when passed this flag, starting with 3.7: configure: WARNING: unrecognized options: --with-threads The reason is that there's no longer such a thing as a build without threads. Eliminate the warning, by only passing the flag on the older releases that accept it. Upstream change and discussion: https://github.com/python/cpython/commit/a6a4dc816 https://bugs.python.org/issue31370 --- pkgs/development/interpreters/python/cpython/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index b778b62f908d..1df70fb99ccb 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -136,10 +136,12 @@ in with passthru; stdenv.mkDerivation { configureFlags = [ "--enable-shared" - "--with-threads" "--without-ensurepip" "--with-system-expat" "--with-system-ffi" + ] ++ optionals (pythonOlder "3.7") [ + # This is unconditionally true starting in CPython 3.7. + "--with-threads" ] ++ optionals (sqlite != null && isPy3k) [ "--enable-loadable-sqlite-extensions" ] ++ optionals (openssl != null) [ From 3df0c40fb99283cfd14becd787f2b500e1a15d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Tue, 31 Mar 2020 03:31:29 +0200 Subject: [PATCH 0266/3452] megasync: 4.3.0.8 -> 4.3.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Minář --- pkgs/applications/misc/megasync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 3a26def26c91..6fc1124752f7 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "megasync"; - version = "4.3.0.8"; + version = "4.3.1.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "1rhxkc6j3039rcsi8cxy3n00g6w7acir82ymnksbpsnp4yxqv5r3"; + sha256 = "0b68wpif8a0wf1vfn1nr19dmz8f31dprb27jpldxrxhyfslc43yj"; fetchSubmodules = true; }; From b9a4e6953d0234cde64ac0cc55136adb3e92794b Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 1 Apr 2020 03:20:33 +0200 Subject: [PATCH 0267/3452] kernel: fix config generation Addresses https://github.com/NixOS/nixpkgs/issues/71803: Kernel options are not merged as described, especially the "optional" aspects. The error silences legitimate warnings. --- lib/kernel.nix | 8 +- nixos/modules/system/boot/kernel_config.nix | 5 +- pkgs/os-specific/linux/kernel/generic.nix | 3 - pkgs/test/kernel.nix | 88 +++++++++++++-------- 4 files changed, 64 insertions(+), 40 deletions(-) diff --git a/lib/kernel.nix b/lib/kernel.nix index 2ce19f8cb68c..a0f986ee1160 100644 --- a/lib/kernel.nix +++ b/lib/kernel.nix @@ -8,10 +8,10 @@ with lib; option = x: x // { optional = true; }; - yes = { tristate = "y"; }; - no = { tristate = "n"; }; - module = { tristate = "m"; }; - freeform = x: { freeform = x; }; + yes = { tristate = "y"; optional = false; }; + no = { tristate = "n"; optional = false; }; + module = { tristate = "m"; optional = false; }; + freeform = x: { freeform = x; optional = false; }; /* Common patterns/legacy used in common-config/hardened-config.nix diff --git a/nixos/modules/system/boot/kernel_config.nix b/nixos/modules/system/boot/kernel_config.nix index a316782dfc57..85bd420e3044 100644 --- a/nixos/modules/system/boot/kernel_config.nix +++ b/nixos/modules/system/boot/kernel_config.nix @@ -22,7 +22,7 @@ let mergeFalseByDefault = locs: defs: if defs == [] then abort "This case should never happen." - else if any (x: x == false) defs then false + else if any (x: x == false) (getValues defs) then false else true; kernelItem = types.submodule { @@ -55,6 +55,7 @@ let default = false; description = '' Wether option should generate a failure when unused. + Upon merging values, mandatory wins over optional. ''; }; }; @@ -121,7 +122,7 @@ in type = types.attrsOf kernelItem; example = literalExample '' with lib.kernel; { "9P_NET" = yes; - USB = optional yes; + USB = option yes; MMC_BLOCK_MINORS = freeform "32"; }''; description = '' diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index e6e1bd842363..a9d0cf451688 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -158,11 +158,8 @@ let ; }).config; - # structuredConfig = moduleStructuredConfig.settings; }; - - }; # end of configfile derivation kernel = (callPackage ./manual-config.nix {}) { diff --git a/pkgs/test/kernel.nix b/pkgs/test/kernel.nix index 86f1b8d8e9ac..a4da10030332 100644 --- a/pkgs/test/kernel.nix +++ b/pkgs/test/kernel.nix @@ -1,53 +1,79 @@ +# to run these tests: +# nix-instantiate --eval --strict . -A tests.kernel-config +# +# make sure to use NON EXISTING kernel settings else they may conflict with +# common-config.nix { lib, pkgs }: -with lib.kernel; -with lib.asserts; -with lib.modules; +with lib; +with kernel; -# To test nixos/modules/system/boot/kernel_config.nix; let - # copied from release-lib.nix - assertTrue = bool: - if bool - then pkgs.runCommand "evaluated-to-true" {} "touch $out" - else pkgs.runCommand "evaluated-to-false" {} "false"; - lts_kernel = pkgs.linuxPackages.kernel; - kernelTestConfig = structuredConfig: (lts_kernel.override { - structuredExtraConfig = structuredConfig; - }).configfile.structuredConfig; + # to see the result once the module transformed the lose structured config + getConfig = structuredConfig: + (lts_kernel.override { + structuredExtraConfig = structuredConfig; + }).configfile.structuredConfig; mandatoryVsOptionalConfig = mkMerge [ - { USB_DEBUG = option yes;} - { USB_DEBUG = yes;} + { NIXOS_FAKE_USB_DEBUG = yes;} + { NIXOS_FAKE_USB_DEBUG = option yes; } ]; freeformConfig = mkMerge [ - { MMC_BLOCK_MINORS = freeform "32"; } # same as default, won't trigger any error - { MMC_BLOCK_MINORS = freeform "64"; } # will trigger an error but the message is not great: + { NIXOS_FAKE_MMC_BLOCK_MINORS = freeform "32"; } # same as default, won't trigger any error + { NIXOS_FAKE_MMC_BLOCK_MINORS = freeform "64"; } # will trigger an error but the message is not great: ]; yesWinsOverNoConfig = mkMerge [ - # default for "8139TOO_PIO" is no - { "8139TOO_PIO" = yes; } # yes wins over no by default - { "8139TOO_PIO" = no; } + # default for "NIXOS_TEST_BOOLEAN" is no + { "NIXOS_TEST_BOOLEAN" = yes; } # yes wins over no by default + { "NIXOS_TEST_BOOLEAN" = no; } ]; + + optionalNoWins = mkMerge [ + { NIXOS_FAKE_USB_DEBUG = option yes;} + { NIXOS_FAKE_USB_DEBUG = yes;} + ]; + + allOptionalRemainOptional = mkMerge [ + { NIXOS_FAKE_USB_DEBUG = option yes;} + { NIXOS_FAKE_USB_DEBUG = option yes;} + ]; + in -{ +runTests { + testEasy = { + expr = (getConfig { NIXOS_FAKE_USB_DEBUG = yes;}).NIXOS_FAKE_USB_DEBUG; + expected = { tristate = "y"; optional = false; freeform = null; }; + }; + # mandatory flag should win over optional - mandatoryCheck = (kernelTestConfig mandatoryVsOptionalConfig); + testMandatoryCheck = { + expr = (getConfig mandatoryVsOptionalConfig).NIXOS_FAKE_USB_DEBUG.optional; + expected = false; + }; + + testYesWinsOverNo = { + expr = (getConfig yesWinsOverNoConfig)."NIXOS_TEST_BOOLEAN".tristate; + expected = "y"; + }; + + testAllOptionalRemainOptional = { + expr = (getConfig allOptionalRemainOptional)."NIXOS_FAKE_USB_DEBUG".optional; + expected = true; + }; # check that freeform options are unique # Should trigger - # > The option `settings.MMC_BLOCK_MINORS.freeform' has conflicting definitions, in `' and `' - freeformCheck = let - res = builtins.tryEval ( (kernelTestConfig freeformConfig).MMC_BLOCK_MINORS.freeform); - in - assertTrue (res.success == false); + # > The option `settings.NIXOS_FAKE_MMC_BLOCK_MINORS.freeform' has conflicting definitions, in `' and `' + testTreeform = let + res = builtins.tryEval ( (getConfig freeformConfig).NIXOS_FAKE_MMC_BLOCK_MINORS.freeform); + in { + expr = res.success; + expected = false; + }; - yesVsNoCheck = let - res = kernelTestConfig yesWinsOverNoConfig; - in - assertTrue (res."8139TOO_PIO".tristate == "y"); } From 121b17e1ac3fa41d82c827a9a9cfa505a0730871 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 1 Apr 2020 22:25:21 +0200 Subject: [PATCH 0268/3452] kernel: fix errors in configuration With the fix in kernel configuration merging, some kernel configuration items marked as mandatory now correctly trigger an error when unused (while they previously were unused). --- pkgs/os-specific/linux/kernel/common-config.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2c8b8de65b31..f1762054661e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -42,7 +42,7 @@ let TIMER_STATS = whenOlder "4.11" yes; DEBUG_NX_TEST = whenOlder "4.11" no; DEBUG_STACK_USAGE = no; - DEBUG_STACKOVERFLOW = mkIf (!features.grsecurity) no; + DEBUG_STACKOVERFLOW = mkIf (!features.grsecurity) (option no); RCU_TORTURE_TEST = no; SCHEDSTATS = no; DETECT_HUNG_TASK = yes; @@ -179,7 +179,7 @@ let # needed for ss INET_DIAG = yes; - INET_TCP_DIAG = module; + INET_TCP_DIAG = option module; INET_UDP_DIAG = module; INET_RAW_DIAG = whenAtLeast "4.14" module; INET_DIAG_DESTROY = whenAtLeast "4.9" yes; @@ -337,7 +337,7 @@ let CIFS_STATS = whenOlder "4.19" yes; CIFS_WEAK_PW_HASH = yes; CIFS_UPCALL = yes; - CIFS_ACL = yes; + CIFS_ACL = option yes; CIFS_DFS_UPCALL = yes; CIFS_SMB2 = whenOlder "4.13" yes; @@ -368,7 +368,7 @@ let DEBUG_SET_MODULE_RONX = { optional = true; tristate = whenOlder "4.11" "y"; }; RANDOMIZE_BASE = option yes; STRICT_DEVMEM = option yes; # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE = freeform "0"; # Disable SELinux by default + SECURITY_SELINUX_BOOTPARAM_VALUE = option (freeform "0"); # Disable SELinux by default # Prevent processes from ptracing non-children processes SECURITY_YAMA = option yes; DEVKMEM = mkIf (!features.grsecurity) no; # Disable /dev/kmem @@ -676,7 +676,7 @@ let KEXEC_JUMP = option yes; # Windows Logical Disk Manager (Dynamic Disk) support - LDM_PARTITION = yes; + LDM_PARTITION = option yes; LOGIRUMBLEPAD2_FF = yes; # Logitech Rumblepad 2 force feedback LOGO = no; # not needed MEDIA_ATTACH = yes; From 55d16d533446a815c5d266b72ff84bc97300fddc Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 2 Apr 2020 12:00:00 +0000 Subject: [PATCH 0269/3452] nixos/btrfs autoScrub: don't fail when scrub finishes successfully --- nixos/modules/tasks/filesystems/btrfs.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix index f64493e1a3c7..c0ff28039b16 100644 --- a/nixos/modules/tasks/filesystems/btrfs.nix +++ b/nixos/modules/tasks/filesystems/btrfs.nix @@ -128,7 +128,10 @@ in Nice = 19; IOSchedulingClass = "idle"; ExecStart = "${pkgs.btrfs-progs}/bin/btrfs scrub start -B ${fs}"; - ExecStop = "${pkgs.btrfs-progs}/bin/btrfs scrub cancel ${fs}"; + # if the service is stopped before scrub end, cancel it + ExecStop = pkgs.writeShellScript "btrfs-scrub-maybe-cancel" '' + (${pkgs.btrfs-progs}/bin/btrfs scrub status ${fs} | ${pkgs.gnugrep}/bin/grep finished) || ${pkgs.btrfs-progs}/bin/btrfs scrub cancel ${fs} + ''; }; }; in listToAttrs (map scrubService cfgScrub.fileSystems); From fbf575fb2587457b321696b88b9382fefe599a8d Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Thu, 2 Apr 2020 16:22:10 +0200 Subject: [PATCH 0270/3452] 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 dcbe7d355aaf8e0ea321da71c7feedaa23ebdf5c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Apr 2020 05:05:08 +0000 Subject: [PATCH 0271/3452] rgbds: 0.3.10 -> 0.4.0 --- pkgs/development/compilers/rgbds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 52d388beaed5..6fc21a0ffd10 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.3.10"; + version = "0.4.0"; src = fetchFromGitHub { owner = "rednex"; repo = "rgbds"; rev = "v${version}"; - sha256 = "0752fbffxgxyf3jw2iij88l05dqhppgcxy7dvk82hp4wdg4cflpq"; + sha256 = "15680964nlsa83nqgxk7knxajn98lddz2hg6jnn8ffmnms5wdam7"; }; nativeBuildInputs = [ bison flex pkg-config libpng ]; installFlags = [ "PREFIX=\${out}" ]; From bc6b37e9678f3a095211764b8d4f8c12d8ea7d4e Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 11 Apr 2020 14:04:25 +0200 Subject: [PATCH 0272/3452] fixup! kernel: fix errors in configuration --- pkgs/os-specific/linux/kernel/common-config.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index f1762054661e..53f2988e9cd0 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -179,7 +179,6 @@ let # needed for ss INET_DIAG = yes; - INET_TCP_DIAG = option module; INET_UDP_DIAG = module; INET_RAW_DIAG = whenAtLeast "4.14" module; INET_DIAG_DESTROY = whenAtLeast "4.9" yes; From 0ef7d22b6cd714af9af507ba9e4eab410fd93930 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 14 Apr 2020 22:45:54 +0200 Subject: [PATCH 0273/3452] 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 0274/3452] 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 4f701dd3af7e1037c867021f521500a7de296b70 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 13 Apr 2020 14:44:04 +0200 Subject: [PATCH 0275/3452] =?UTF-8?q?zziplib:=200.13.69=20=E2=86=92=200.13?= =?UTF-8?q?.71?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/gdraheim/zziplib/releases/tag/v0.13.70 https://github.com/gdraheim/zziplib/releases/tag/v0.13.71 --- .../development/libraries/zziplib/default.nix | 75 +++++++++++++------ 1 file changed, 51 insertions(+), 24 deletions(-) diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 8078a3c360c3..670a911cb6eb 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,47 +1,74 @@ -{ docbook_xml_dtd_412, fetchurl, stdenv, perl, python2, zip, xmlto, zlib, fetchpatch }: +{ stdenv +, cmake +, pkg-config +, ninja +, fetchFromGitHub +, fetchpatch +, zip +, unzip +, python3 +, xmlto +, zlib +}: stdenv.mkDerivation rec { pname = "zziplib"; - version = "0.13.69"; + version = "0.13.71"; - src = fetchurl { - url = "https://github.com/gdraheim/zziplib/archive/v${version}.tar.gz"; - sha256 = "0i052a7shww0fzsxrdp3rd7g4mbzx7324a8ysbc0br7frpblcql4"; + src = fetchFromGitHub { + owner = "gdraheim"; + repo = "zziplib"; + rev = "v${version}"; + sha256 = "P+7D57sc2oIABhk3k96aRILpGnsND5SLXHh2lqr9O4E="; }; patches = [ + # Fix ninja parsing (fetchpatch { - name = "CVE-2018-17828.patch"; - url = "https://github.com/gdraheim/zziplib/commit/f609ae8971f3c0ce6.diff"; - sha256 = "0jhiz4fgr93wzh6q03avn95b2nsf6402jaki6hxirxyhs5v9ahry"; + url = "https://github.com/gdraheim/zziplib/commit/75e22f3c365b62acbad8d8645d5404242800dfba.patch"; + sha256 = "IB0am3K0x4+Ug1CKvowTtkS8JD6zHJJ247A7guJOw80="; }) + # Install man pages (fetchpatch { - name = "CVE-2018-16548-part1.patch"; - url = "https://github.com/gdraheim/zziplib/commit/9411bde3e4a70a81ff3ffd256b71927b2d90dcbb.patch"; - sha256 = "0cy8i182zbvcqzs5z2j13d5sl7hbh59pkgw4xkyg5yz739q4fp9b"; + url = "https://github.com/gdraheim/zziplib/commit/5583ccc7a247ee27556ede344e93d3ac1dc72e9b.patch"; + sha256 = "wVExEZN8Ml1/3GicB0ZYsLVS3KJ8BSz8i4Gu46naz1Y="; + excludes = [ "GNUmakefile" ]; }) + + # Fix man page formatting (fetchpatch { - name = "CVE-2018-16548-part2.patch"; - url = "https://github.com/gdraheim/zziplib/commit/d2e5d5c53212e54a97ad64b793a4389193fec687.patch"; - sha256 = "153wd4vab8xqj9avcpx8g2zw9qsp9nkaqi7yc65pz3r7xfcxwdla"; - }) - (fetchpatch { - name = "CVE-2018-16548-part3.patch"; - url = "https://github.com/gdraheim/zziplib/commit/0e1dadb05c1473b9df2d7b8f298dab801778ef99.patch"; - sha256 = "0fs6dns8l7dz5a900397g8b7x62z72b0pbpdmwk1hnx6vb7z5rz5"; + url = "https://github.com/gdraheim/zziplib/commit/22ed64f13dc239f86664c60496261f544bce1088.patch"; + sha256 = "ScFVWLc4LQPqkcHn9HK/VkLula4b5HzuYl0b5vi4Ikc="; }) ]; - postPatch = '' - sed -i -e s,--export-dynamic,, configure - ''; - buildInputs = [ docbook_xml_dtd_412 perl python2 zip xmlto zlib ]; + nativeBuildInputs = [ + cmake + pkg-config + ninja # make fails, unable to find test2.zip + zip + python3 + xmlto + ]; + + buildInputs = [ + zlib + ]; + + checkInputs = [ + 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) doCheck = false; + checkTarget = "check"; meta = with stdenv.lib; { description = "Library to extract data from files archived in a zip file"; @@ -60,6 +87,6 @@ stdenv.mkDerivation rec { homepage = "http://zziplib.sourceforge.net/"; maintainers = [ ]; - platforms = python2.meta.platforms; + platforms = python3.meta.platforms; }; } From 2c25f8934427f1f60e4ae564282aaa451cf0222a Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 19 Apr 2020 14:13:01 +0200 Subject: [PATCH 0276/3452] networkmanager_dmenu: 1.1 -> 1.5.0 --- pkgs/tools/networking/network-manager/dmenu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/network-manager/dmenu/default.nix b/pkgs/tools/networking/network-manager/dmenu/default.nix index f84ef027f762..4204ba1fcdba 100644 --- a/pkgs/tools/networking/network-manager/dmenu/default.nix +++ b/pkgs/tools/networking/network-manager/dmenu/default.nix @@ -4,13 +4,13 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "networkmanager_dmenu"; - version = "1.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "firecat53"; repo = "networkmanager-dmenu"; - rev = "v${version}"; - sha256 = "1z6151z7c4jv5k2i50zr7ld4k3m07dgpmss9f3hsav95cv55dcnb"; + rev = "${version}"; + sha256 = "1msk4zkm4042av61rgbwc62i62vnv9py93fm1bczmw0b1f54qpmk"; }; buildInputs = [ glib python pygobject3 gobject-introspection networkmanager python3Packages.wrapPython ]; From 76f681355cb6c2aab79d190907fbb521bd19ec87 Mon Sep 17 00:00:00 2001 From: j0hax Date: Tue, 21 Apr 2020 02:54:18 +0200 Subject: [PATCH 0277/3452] 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 0278/3452] 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 0279/3452] 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 0280/3452] 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 0281/3452] 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 0282/3452] 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 a416707246077ae84b5597fe94fcfa403903faa0 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 25 Apr 2020 04:03:21 +0300 Subject: [PATCH 0283/3452] mailnag: 1.3.0 -> 2.0.0 Notable changes: - Switch to Python3 by default. - Format inputs and arguments. - Use wrapGAppsHook. - Use libsecret (replaces libgnome-keyring) by default - Add @doronbehar as maintainer. - Remove overridden phases. --- .../mailreaders/mailnag/default.nix | 68 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 44 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 8341cc63092c..5747da36b34b 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,28 +1,49 @@ -{ stdenv, fetchurl, gettext, gtk3, pythonPackages -, gdk-pixbuf, libnotify, gst_all_1 -, libgnome-keyring3 -, wrapGAppsHook, gnome3 -# otherwise passwords are stored unencrypted -, withGnomeKeyring ? true +{ stdenv +, fetchFromGitHub +, gettext +, gtk3 +, pythonPackages +, gdk-pixbuf +, libnotify +, gst_all_1 +, libsecret +, wrapGAppsHook +, gsettings-desktop-schemas +, glib +, gobject-introspection }: -let - inherit (pythonPackages) python; -in pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { pname = "mailnag"; - version = "1.3.0"; + version = "2.0.0"; - src = fetchurl { - url = "https://github.com/pulb/mailnag/archive/v${version}.tar.gz"; - sha256 = "0cp5pad6jzd5c14pddbi9ap5bi78wjhk1x2p0gbblmvmcasw309s"; + src = fetchFromGitHub { + owner = "pulb"; + repo = "mailnag"; + rev = "v${version}"; + sha256 = "0q97v9i96br22z3h6r2mz79i68ib8m8x42yxky78szfrf8j60i30"; }; + preFixup = '' + substituteInPlace $out/${pythonPackages.python.sitePackages}/Mailnag/common/dist_cfg.py \ + --replace "/usr/" $out/ + for desktop_file in $out/share/applications/*.desktop; do + substituteInPlace "$desktop_file" \ + --replace "/usr/bin" $out/bin + done + ''; buildInputs = [ - gtk3 gdk-pixbuf libnotify gst_all_1.gstreamer - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gtk3 + gdk-pixbuf + glib + libnotify + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gnome3.adwaita-icon-theme - ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3; + gobject-introspection + libsecret + ]; nativeBuildInputs = [ gettext @@ -30,20 +51,17 @@ in pythonPackages.buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - pygobject3 dbus-python pyxdg + gsettings-desktop-schemas + pygobject3 + dbus-python + pyxdg ]; - buildPhase = ""; - - installPhase = "${python}/bin/python setup.py install --prefix=$out"; - - doCheck = false; - meta = with stdenv.lib; { description = "An extensible mail notification daemon"; homepage = "https://github.com/pulb/mailnag"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ doronbehar ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f182b6d250cf..3f94fe1d390b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5047,7 +5047,7 @@ in mailhog = callPackage ../servers/mail/mailhog {}; mailnag = callPackage ../applications/networking/mailreaders/mailnag { - pythonPackages = python2Packages; + pythonPackages = python3Packages; }; mailsend = callPackage ../tools/networking/mailsend { }; From 1a3841fd824083f57992c36c7daa7851a7909e5e Mon Sep 17 00:00:00 2001 From: Sebastien Bariteau Date: Sun, 5 Apr 2020 15:39:30 -0400 Subject: [PATCH 0284/3452] AdGuardHome: init at 0.101.0 --- pkgs/servers/adguardhome/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/servers/adguardhome/default.nix diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix new file mode 100644 index 000000000000..54000a81b67d --- /dev/null +++ b/pkgs/servers/adguardhome/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "adguardhome"; + version = "0.101.0"; + + src = fetchurl { + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v${version}/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "17k37hh04zhy5csl0p9g4hybfc403i38n754in1xrkzxi81r8dh5"; + }; + + installPhase = '' + install -m755 -D ./AdGuardHome $out/bin/adguardhome + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/AdguardTeam/AdGuardHome"; + description = "Network-wide ads & trackers blocking DNS server"; + platforms = platforms.linux; + maintainers = with maintainers; [ numkem ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49ab4d06c106..de857990d709 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15347,6 +15347,8 @@ in kerberos = libkrb5; }; + adguardhome = callPackage ../servers/adguardhome {}; + apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = pkgs.apacheHttpd_2_4; 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 0285/3452] 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 6118881089b53cbc27ccbc24de10d5214b447a50 Mon Sep 17 00:00:00 2001 From: DonHugo69 <10484857+DonHugo69@users.noreply.github.com> Date: Tue, 28 Apr 2020 14:38:42 +0200 Subject: [PATCH 0286/3452] lutris: 0.5.5 -> 0.5.6 --- pkgs/applications/misc/lutris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 2ff2a82dd4fb..6087117088c2 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -31,13 +31,13 @@ let in buildPythonApplication rec { pname = "lutris-original"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - sha256 = "1g093g0difnkjmnm91p20issdsxn9ri4c56zzddj5wfrbmhwdfag"; + sha256 = "1f78qhyy8xqdg0rhxcwkap1bmg5mfxhb8qw1vbpxr6g62ajpwksa"; }; nativeBuildInputs = [ wrapGAppsHook ]; From 0ed683c7ce39acee8e23ca47052aa82f9c662d0f Mon Sep 17 00:00:00 2001 From: DonHugo69 <10484857+DonHugo69@users.noreply.github.com> Date: Tue, 28 Apr 2020 14:50:46 +0200 Subject: [PATCH 0287/3452] lutris: add p11-kit Should fix `ntlm_auth: ~/.local/share/lutris/runtime/lib64/libp11-kit.so.0: no version information available (required by /lib64/libgnutls.so.30)` warning --- pkgs/applications/misc/lutris/chrootenv.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index 84246f4ba124..2d54bac6d7c3 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -97,7 +97,7 @@ in buildFHSUserEnv { libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd - vulkan-loader xdg_utils sqlite gnutls libbsd + vulkan-loader xdg_utils sqlite gnutls p11-kit libbsd # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64" From 6a7713449fa8016f62eeb5dc8bd66223bd743e4a Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Tue, 28 Apr 2020 22:28:46 +0200 Subject: [PATCH 0288/3452] 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 a83003476265e3c5577f3e5138cca2f7db46108d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 11:26:29 +0000 Subject: [PATCH 0289/3452] heimer: 1.15.1 -> 1.16.0 --- pkgs/applications/misc/heimer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index f301122a92de..628ec7900417 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "13a9yfq7m8jhirb31i0mmigqb135r585zwqddknl090d88164fic"; + sha256 = "0j00652lgcfy5vr001c24agnfnm9v2l4r5vvvb2484mfck335grf"; }; nativeBuildInputs = [ cmake ]; From d7d897fe2499df6a4ea561d7ed642d1c1f30c98e Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 5 May 2020 01:19:42 +0530 Subject: [PATCH 0290/3452] 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 4752e21de0c607034e16994691581327d40f2d34 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Fri, 20 Sep 2019 19:01:13 +0000 Subject: [PATCH 0291/3452] meli: init at alpha-0.5.1 Co-authored-by: 0x4A6F <0x4A6F@users.noreply.github.com> --- .../networking/mailreaders/meli/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/meli/default.nix diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix new file mode 100644 index 000000000000..719965455f9c --- /dev/null +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchgit +, rustPlatform +, pkgconfig +, openssl +, dbus +, sqlite +, file +, gzip +, notmuch + # Build with support for notmuch backend +, withNotmuch ? true +}: + +rustPlatform.buildRustPackage rec { + pname = "meli"; + version = "alpha-0.5.1"; + + src = fetchgit { + url = "https://git.meli.delivery/meli/meli.git"; + rev = version; + sha256 = "1y5567hdm1s2s272drxvmp6x4y1jpyl7423iz58hgqcsjm9085zv"; + }; + + cargoSha256 = "040dfr09bg5z5pn68dy323hcppd599d3f6k7zxqw5f8n4whnlc9y"; + + cargoBuildFlags = lib.optional withNotmuch "--features=notmuch"; + + nativeBuildInputs = [ pkgconfig gzip ]; + + buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch; + + checkInputs = [ file ]; + + postInstall = '' + mkdir -p $out/share/man/man1 + gzip < meli.1 > $out/share/man/man1/meli.1.gz + mkdir -p $out/share/man/man5 + gzip < meli.conf.5 > $out/share/man/man5/meli.conf.5.gz + ''; + + meta = with stdenv.lib; { + description = "Experimental terminal mail client aiming for configurability and extensibility with sane defaults"; + homepage = "https://meli.delivery"; + license = licenses.gpl3; + maintainers = with maintainers; [ maintainers."0x4A6F" matthiasbeyer erictapen ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95517f754119..15019d8d8b75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20567,6 +20567,8 @@ in meld = callPackage ../applications/version-management/meld { }; + meli = callPackage ../applications/networking/mailreaders/meli { }; + meme = callPackage ../applications/graphics/meme { }; mendeley = libsForQt5.callPackage ../applications/office/mendeley { From 47fb499bc1747e921c128c98bc72ec74109b02c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 19:05:33 +0000 Subject: [PATCH 0292/3452] libdap: 3.20.5 -> 3.20.6 --- pkgs/development/libraries/libdap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index 27084e54a827..bc05e774cd86 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { - version = "3.20.5"; + version = "3.20.6"; pname = "libdap"; nativeBuildInputs = [ bison flex ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz"; - sha256 = "15jysnsmdjs7q4iafb4qzq4b76cfyvmbxgcxnqg4sr0x4bplwfnb"; + sha256 = "0jn5bi8k2lq6mmrsw7r1r5aviyf8gb39b2iy20v4kpkj5napzk1m"; }; meta = with stdenv.lib; { From 130560e553ef648d81b7c7d4034efd4797a5fb57 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 6 May 2020 00:20:10 +0200 Subject: [PATCH 0293/3452] 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 04248f606f4ebfe298bfbfed3680a2fd5dacf796 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 25 Feb 2020 21:21:04 +0100 Subject: [PATCH 0294/3452] rustPlatform: increase build-speed of `checkPhase` for rust-packages When running `cargo test --release`, the artifacts from `buildPhase` will be reused here. Previously, most of the stuff had to be recompiled without optimizations. --- pkgs/build-support/rust/default.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 93770d71a10d..6cece0048333 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -162,22 +162,17 @@ stdenv.mkDerivation (args // { --frozen ${concatStringsSep " " cargoBuildFlags} ) - # rename the output dir to a architecture independent one - mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep '${releaseDir}$') - for target in "''${targets[@]}"; do - rm -rf "$target/../../${buildType}" - ln -srf "$target" "$target/../../" - done - runHook postBuild ''; - checkPhase = args.checkPhase or '' + checkPhase = args.checkPhase or (let + argstr = "${stdenv.lib.optionalString (buildType == "release") "--release"} --target ${rustTarget} --frozen"; + in '' runHook preCheck - echo "Running cargo cargo test -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" - cargo test -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} + echo "Running cargo cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" + cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} runHook postCheck - ''; + ''); doCheck = args.doCheck or true; @@ -187,6 +182,13 @@ stdenv.mkDerivation (args // { installPhase = args.installPhase or '' runHook preInstall + + # rename the output dir to a architecture independent one + mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep '${releaseDir}$') + for target in "''${targets[@]}"; do + rm -rf "$target/../../${buildType}" + ln -srf "$target" "$target/../../" + done mkdir -p $out/bin $out/lib find $releaseDir \ From 16cdc10b488c605c200fdb796e029da25d754906 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 7 May 2020 14:12:35 +0000 Subject: [PATCH 0295/3452] 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 3b5a1e459168572f304ac236940365cc63e0588a Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 5 May 2020 17:52:52 +0200 Subject: [PATCH 0296/3452] xandikos: 0.1.0 -> 0.2.1 --- pkgs/servers/xandikos/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index 27fb93a88035..9f3cc1a7b5b4 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -5,20 +5,23 @@ python3Packages.buildPythonApplication rec { pname = "xandikos"; - version = "0.1.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "jelmer"; repo = "xandikos"; rev = "v${version}"; - sha256 = "12r8fciid2qpqf054584ywwh49yddyhhpkpcm6jihzyr5y2r4kn1"; + sha256 = "0bcihkfi75wg0s2an2hysrcrg6pbqqclia53l0vhkzg9b5b8cga1"; }; propagatedBuildInputs = with python3Packages; [ + aiohttp dulwich defusedxml icalendar jinja2 + multidict + prometheus_client ]; meta = with stdenv.lib; { From 71a137a297ba3b076e015ae6e71bb8c849d615bd Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Fri, 8 May 2020 18:19:32 +0200 Subject: [PATCH 0297/3452] nixos/xandikos: update listen-address parameter --- nixos/modules/services/networking/xandikos.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/xandikos.nix b/nixos/modules/services/networking/xandikos.nix index 87c029156b9e..f18822616568 100644 --- a/nixos/modules/services/networking/xandikos.nix +++ b/nixos/modules/services/networking/xandikos.nix @@ -122,7 +122,7 @@ in ExecStart = '' ${cfg.package}/bin/xandikos \ --directory /var/lib/xandikos \ - --listen_address ${cfg.address} \ + --listen-address ${cfg.address} \ --port ${toString cfg.port} \ --route-prefix ${cfg.routePrefix} \ ${lib.concatStringsSep " " cfg.extraOptions} From 79df7e6d94d0a5435717f2a82dbbf3fad6d9d0ca Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Fri, 8 May 2020 18:37:46 +0200 Subject: [PATCH 0298/3452] nixosTests.xandikos: fix route-prefix --- nixos/tests/xandikos.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/xandikos.nix b/nixos/tests/xandikos.nix index 0fded20ff1a9..886c3e0082f7 100644 --- a/nixos/tests/xandikos.nix +++ b/nixos/tests/xandikos.nix @@ -17,7 +17,7 @@ import ./make-test-python.nix ( services.xandikos.enable = true; services.xandikos.address = "localhost"; services.xandikos.port = 8080; - services.xandikos.routePrefix = "/xandikos/"; + services.xandikos.routePrefix = "/xandikos-prefix/"; services.xandikos.extraOptions = [ "--defaults" ]; @@ -28,7 +28,7 @@ import ./make-test-python.nix ( serverName = "xandikos.local"; basicAuth.xandikos = "snakeOilPassword"; locations."/xandikos/" = { - proxyPass = "http://localhost:8080/"; + proxyPass = "http://localhost:8080/xandikos-prefix/"; }; }; }; From e32c005772c9f820780453628eb9b7cd9a51223e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 24 Mar 2020 18:32:59 +0100 Subject: [PATCH 0299/3452] rustPlatform: don't install test executables This is done by gathering all binaries to install before running the checkPhase. --- pkgs/build-support/rust/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 6cece0048333..9f11919974a8 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -165,6 +165,17 @@ stdenv.mkDerivation (args // { runHook postBuild ''; + postBuild = args.postBuild or "" + '' + + # This needs to be done after postBuild: packages like `cargo` do a pushd/popd in + # the pre/postBuild-hooks that need to be taken into account before gathering + # all binaries to install. + bins=$(find $releaseDir \ + -maxdepth 1 \ + -type f \ + -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \)) + ''; + checkPhase = args.checkPhase or (let argstr = "${stdenv.lib.optionalString (buildType == "release") "--release"} --target ${rustTarget} --frozen"; in '' @@ -191,11 +202,7 @@ stdenv.mkDerivation (args // { done mkdir -p $out/bin $out/lib - find $releaseDir \ - -maxdepth 1 \ - -type f \ - -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \) \ - -print0 | xargs -r -0 cp -t $out/bin + xargs -r cp -t $out/bin <<< $bins find $releaseDir \ -maxdepth 1 \ -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \ From f236714d65baa74404e5e25a24b6208134971752 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 6 May 2020 23:25:01 +0200 Subject: [PATCH 0300/3452] rustPlatform: fix log --- pkgs/build-support/rust/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 9f11919974a8..b7d19ccd4a0a 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation (args // { argstr = "${stdenv.lib.optionalString (buildType == "release") "--release"} --target ${rustTarget} --frozen"; in '' runHook preCheck - echo "Running cargo cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" + echo "Running cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} runHook postCheck ''); From ddd2b694a7d8faf37978ce2c922d10dac55eb8b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 May 2020 23:20:50 +0100 Subject: [PATCH 0301/3452] weechatScripts.wee-slack: 2.5.0 -> 2.6.0 --- .../networking/irc/weechat/scripts/wee-slack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 8df6c8d6124e..9650f903ed6b 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wee-slack"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "0sxgi5fg8qvzqmxy7sdma6v0wj93xwh21av10n8nxvdskacw5dxz"; + sha256 = "0s4qd1z40c1bczkvc840jwjmzbv7nyj06xqs1si9v54qmkh4gaq4"; }; patches = [ From 1ef7bea94ddc85c3131bd4dde407699b5c2be311 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Wed, 29 Jan 2020 18:05:14 +0100 Subject: [PATCH 0302/3452] dovecot_fts_xapian: init at 1.3.1 --- .../dovecot/plugins/fts_xapian/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 36 insertions(+) create mode 100644 pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix new file mode 100644 index 000000000000..3736c78d4b60 --- /dev/null +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64, sqlite }: +stdenv.mkDerivation { + pname = "fts-xapian"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "grosjo"; + repo = "fts-xapian"; + rev = "1.3.1"; + sha256 = "10yl5fyfbx2ijqckx13vbmzj9mpm5pkh8qzichbdgplrzm738q43"; + }; + + buildInputs = [ dovecot xapian icu64 sqlite ]; + + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; + + preConfigure = '' + export PANDOC=false + autoreconf -vi + ''; + + configureFlags = [ + "--with-dovecot=${dovecot}/lib/dovecot" + "--without-dovecot-install-dirs" + "--with-moduledir=$(out)/lib/dovecot" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/grosjo/fts-xapian"; + description = "Dovecot FTS plugin based on Xapian"; + license = licenses.lgpl21; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5c9d3d0f687..f3a357c8fea2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15425,6 +15425,7 @@ in dovecot = callPackage ../servers/mail/dovecot { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; + dovecot_fts_xapian = callPackage ../servers/mail/dovecot/plugins/fts_xapian { }; dspam = callPackage ../servers/mail/dspam { }; From 8be7358384acc60102c1f7451c7d8452d3841ec9 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sat, 9 May 2020 14:13:31 +0200 Subject: [PATCH 0303/3452] maintainers: add julm --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 35dd144796e2..610750d12ab8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3813,6 +3813,12 @@ githubId = 11947756; name = "Julien Dehos"; }; + julm = { + email = "julm+nix@sourcephile.fr"; + github = "ju1m"; + githubId = 21160136; + name = "Julien Moutinho"; + }; jumper149 = { email = "felixspringer149@gmail.com"; github = "jumper149"; diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 3736c78d4b60..8a0f2d4efab2 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { homepage = "https://github.com/grosjo/fts-xapian"; description = "Dovecot FTS plugin based on Xapian"; license = licenses.lgpl21; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ julm ]; platforms = platforms.unix; }; } From 1202fe514f44761923c4780ef6199b6c8dff13dd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 May 2020 20:08:19 +0000 Subject: [PATCH 0304/3452] python27Packages.rope: 0.16.0 -> 0.17.0 --- pkgs/development/python-modules/rope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 6bcc05fb34d6..73b5e0b8c2b5 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "rope"; - version = "0.16.0"; + version = "0.17.0"; disabled = pythonAtLeast "3.8"; # 0.17 should support Python 3.8 src = fetchPypi { inherit pname version; - sha256 = "1zlxdrs6ww2hm41izz67h67z9dkm0rlgw8m04vygaip0q91030yj"; + sha256 = "1qa9nqryp05ah9b4r8cy5ph31kr9cm4ak79pvzbg7p23bxqdd2k5"; }; checkInputs = [ nose ]; From a3dc89a1f03116caebbf5a667bd3e3f2e5a5e961 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 10 May 2020 04:55:51 +0000 Subject: [PATCH 0305/3452] libsForQt5.qtutilities: 6.0.5 -> 6.0.6 --- pkgs/development/libraries/qtutilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 66a7b95e334f..388665f5aabd 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.0.5"; + version = "6.0.6"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "1f2nir1qb0d6r1ndpsg7vpskdw08szq82mqvbwm5bi160xkrqhjf"; + sha256 = "0g3f18530w5f8dlzrh45k868hspga5p3m8qpz7pcg3nsdjda8cwz"; }; buildInputs = [ qtbase cpp-utilities ]; From b52a5c2dbf8c5c7580bc28ead8a40b4f33db6d2c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 10 May 2020 13:00:52 +0000 Subject: [PATCH 0306/3452] serd: 0.30.2 -> 0.30.4 --- pkgs/development/libraries/serd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 9e83bdae28ed..6829275e99e4 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "serd"; - version = "0.30.2"; + version = "0.30.4"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "00kjjgs5a8r72khgpya14scvl3n58wqwl5927y14z03j25q04ccx"; + sha256 = "168rn3m32c59qbar120f83ibcnnd987ij9p053kybgl7cmm6358c"; }; nativeBuildInputs = [ pkgconfig python3 wafHook ]; From ec7e931c90e05ece6534d58c179d0835f78b9270 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 10 May 2020 18:47:02 +0000 Subject: [PATCH 0307/3452] libv4l: 1.18.0 -> 1.18.1 --- pkgs/os-specific/linux/v4l-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 73944bd6eb70..c23c37aa56d0 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -12,11 +12,11 @@ let # we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt in stdenv.mkDerivation rec { pname = "v4l-utils"; - version = "1.18.0"; + version = "1.18.1"; src = fetchurl { url = "https://linuxtv.org/downloads/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "03c80acbv2znfxs1l32yx30znmjrqq7kxhiwl2309lpf5s10vdkc"; + sha256 = "0hpkqm2bpg1ma2shjzcf6xsrpyjd8h5cakgh8a3iyh126wjl5z15"; }; outputs = [ "out" ] ++ lib.optional withUtils "lib" ++ [ "dev" ]; From d7c9582ba8f7e953218e239fcca3145fb31cd79a Mon Sep 17 00:00:00 2001 From: luc65r Date: Fri, 8 May 2020 11:55:53 +0200 Subject: [PATCH 0308/3452] pythonPackages.playsound: init at 1.2.2 --- .../python-modules/playsound/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/playsound/default.nix diff --git a/pkgs/development/python-modules/playsound/default.nix b/pkgs/development/python-modules/playsound/default.nix new file mode 100644 index 000000000000..589a8f3db819 --- /dev/null +++ b/pkgs/development/python-modules/playsound/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "playsound"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "TaylorSMarks"; + repo = "playsound"; + rev = "907f1fe73375a2156f7e0900c4b42c0a60fa1d00"; + sha256 = "1fh3m115h0c57lj2pfhhqhmsh5awzblb7csi1xc5a6f6slhl059k"; + }; + + doCheck = false; + + pythonImportsCheck = [ "playsound" ]; + + meta = with lib; { + homepage = "https://github.com/TaylorSMarks/playsound"; + description = "Pure Python, cross platform, single function module with no dependencies for playing sounds"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ luc65r ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e40fa679622e..164a3d9ba8d0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3203,6 +3203,8 @@ in { plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy {}; + playsound = callPackage ../development/python-modules/playsound { }; + plexapi = callPackage ../development/python-modules/plexapi { }; plexauth = callPackage ../development/python-modules/plexauth { }; From e338c1250d73656ac5f7c916d20b0b3d12132742 Mon Sep 17 00:00:00 2001 From: luc65r Date: Thu, 7 May 2020 22:32:09 +0200 Subject: [PATCH 0309/3452] tartube: 2.0.016 -> 2.1.0 --- pkgs/applications/video/tartube/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index ae222ae05a79..23ee76eb4693 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -14,13 +14,13 @@ python3Packages.buildPythonApplication rec { pname = "tartube"; - version = "2.0.016"; + version = "2.1.0"; src = fetchFromGitHub { owner = "axcore"; repo = "tartube"; rev = "v${version}"; - sha256 = "1y77ykihyi4v6xlsm5xldbs9lzq229l574rxz6qfvrjcbbwajfj9"; + sha256 = "1klqjwqm29y2f6nc8gn222ykfvb5d64z1w2kifw9bq5bv0np9bda"; }; nativeBuildInputs = [ @@ -35,6 +35,8 @@ python3Packages.buildPythonApplication rec { pygobject3 pyxdg requests + feedparser + playsound ]; buildInputs = [ @@ -45,6 +47,10 @@ python3Packages.buildPythonApplication rec { pango ]; + postPatch = '' + sed -i "/^\s*install_requires/s/, 'gi'\|'gi', \|'gi'//" setup.py + ''; + postInstall = '' mkdir -p $out/share/{man/man1,applications,pixmaps} cp pack/tartube.1 $out/share/man/man1 From a4763da299ff20bc7f50ee611b311c236b79dea4 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 8 May 2020 16:38:16 +0200 Subject: [PATCH 0310/3452] 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 1ad856542297c3d0a8536a91a6bd39d1371909cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 10 May 2020 21:33:28 +0000 Subject: [PATCH 0311/3452] vim: 8.2.0510 -> 8.2.0701 --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 8bdc0c0753c0..47e71e2da4d1 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.0510"; + version = "8.2.0701"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "16ggwf238pzzkn3ng6n09qz9cgdzha9vc0ghlcxhwilnjh12l7p9"; + sha256 = "1cbh2nhbvhp4kclc9fd8gqij2vi11c5zwdwn1nzg805k06hwmsrp"; }; enableParallelBuilding = true; From 4688ec0eb2e36cf4ed05a7ab11051c2d356af3fc Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 10 May 2020 22:34:19 +0100 Subject: [PATCH 0312/3452] linux: explicitly enable AIO This is disabled by default in the linux-hardened patchset, but is required by e.g. LVM. Fixes #87260. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 636d174b1551..32e49852af5b 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -639,6 +639,8 @@ let SYSVIPC = yes; # System-V IPC + AIO = yes; # POSIX asynchronous I/O + UNIX = yes; # Unix domain sockets. MD = yes; # Device mapper (RAID, LVM, etc.) From 23ce1eed34c97df283ad85ab40b8b33a6a8818eb Mon Sep 17 00:00:00 2001 From: Gaelan Steele Date: Mon, 11 May 2020 00:12:05 -0700 Subject: [PATCH 0313/3452] stdenv: only build LLVM once on darwin --- pkgs/stdenv/darwin/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index ef1ebfc32c1b..53fb282fea23 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -307,7 +307,7 @@ in rec { inherit gnumake gzip gnused bzip2 gawk ed xz patch bash python3 ncurses libffi zlib gmp pcre gnugrep - coreutils findutils diffutils patchutils ninja; + coreutils findutils diffutils patchutils ninja libxml2; # Hack to make sure we don't link ncurses in bootstrap tools. The proper # solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib, @@ -321,7 +321,7 @@ in rec { llvmPackages_7 = super.llvmPackages_7 // (let tools = super.llvmPackages_7.tools.extend (llvmSelf: _: { clang-unwrapped = llvmPackages_7.clang-unwrapped.override { llvm = llvmSelf.llvm; }; - llvm = llvmPackages_7.llvm.override { libxml2 = self.darwin.libxml2-nopython; }; + llvm = llvmPackages_7.llvm.override { inherit libxml2; }; }); libraries = super.llvmPackages_7.libraries.extend (llvmSelf: _: { inherit (llvmPackages_7) libcxx libcxxabi compiler-rt; @@ -332,9 +332,8 @@ in rec { inherit (darwin) dyld Libsystem libiconv locale; cctools = super.darwin.cctools.override { enableTapiSupport = false; }; - libxml2-nopython = super.libxml2.override { pythonSupport = false; }; CF = super.darwin.CF.override { - libxml2 = libxml2-nopython; + inherit libxml2; python3 = prevStage.python3; }; }; @@ -419,9 +418,9 @@ in rec { gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext binutils.bintools darwin.binutils darwin.binutils.bintools curl.out openssl.out libssh2.out nghttp2.lib libkrb5 - cc.expand-response-params + cc.expand-response-params libxml2.out ]) ++ (with pkgs.darwin; [ - dyld Libsystem CF cctools ICU libiconv locale libxml2-nopython.out + dyld Libsystem CF cctools ICU libiconv locale ]); overrides = lib.composeExtensions persistent (self: super: { From 1ac5398589916a6a433e845342c9b85c4c52f5dc Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 28 Apr 2020 00:08:48 -0400 Subject: [PATCH 0314/3452] *-wrapper; Switch from `infixSalt` to `suffixSalt` I hate the thing too even though I made it, and rather just get rid of it. But we can't do that yet. In the meantime, this brings us more inline with autoconf and will make it slightly easier for me to write a pkg-config wrapper, which we need. --- nixos/doc/manual/release-notes/rl-2009.xml | 6 +++ pkgs/applications/video/mplayer/default.nix | 2 +- .../bintools-wrapper/add-flags.sh | 26 +++++----- .../bintools-wrapper/add-hardening.sh | 2 +- .../bintools-wrapper/default.nix | 8 ++-- .../bintools-wrapper/ld-wrapper.sh | 20 ++++---- .../bintools-wrapper/setup-hook.sh | 11 ++--- pkgs/build-support/build-fhs-userenv/env.nix | 2 +- pkgs/build-support/cc-wrapper/add-flags.sh | 32 ++++++------- .../build-support/cc-wrapper/add-hardening.sh | 2 +- pkgs/build-support/cc-wrapper/cc-wrapper.sh | 24 +++++----- pkgs/build-support/cc-wrapper/default.nix | 8 ++-- pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 10 ++-- pkgs/build-support/cc-wrapper/setup-hook.sh | 26 +++++----- pkgs/build-support/setup-hooks/role.bash | 14 ++---- pkgs/build-support/wrapper-common/utils.bash | 32 ++++++------- pkgs/development/compilers/gcc/10/default.nix | 4 +- .../development/compilers/gcc/4.8/default.nix | 4 +- .../development/compilers/gcc/4.9/default.nix | 4 +- pkgs/development/compilers/gcc/6/default.nix | 4 +- pkgs/development/compilers/gcc/7/default.nix | 4 +- pkgs/development/compilers/gcc/8/default.nix | 4 +- pkgs/development/compilers/gcc/9/default.nix | 4 +- pkgs/development/compilers/gcc/builder.sh | 48 +++++++++---------- .../gcc/common/extra-target-flags.nix | 4 +- .../compilers/gcc/libstdc++-hook.sh | 2 +- .../development/compilers/graalvm/default.nix | 2 +- .../compilers/llvm/10/libc++/setup-hook.sh | 4 +- .../compilers/llvm/5/libc++/setup-hook.sh | 4 +- .../compilers/llvm/6/libc++/setup-hook.sh | 4 +- .../compilers/llvm/7/libc++/setup-hook.sh | 4 +- .../compilers/llvm/8/libc++/setup-hook.sh | 4 +- .../compilers/llvm/9/libc++/setup-hook.sh | 4 +- .../idris-modules/idris-wrapper.nix | 2 +- .../libraries/gettext/gettext-setup-hook.sh | 2 +- .../libraries/libiconv/setup-hook.sh | 2 +- .../tools/build-managers/cmake/default.nix | 6 ++- .../misc/texinfo/cross-tools-flags.patch | 2 +- .../bsd/netbsd/compat-setup-hook.sh | 6 +-- pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh | 2 +- .../linux/kernel-headers/default.nix | 4 +- pkgs/stdenv/generic/default.nix | 4 +- 42 files changed, 183 insertions(+), 180 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 3673f6e0d9c9..b0b8c9f51448 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -367,6 +367,12 @@ php.override { The default output of buildGoPackage is now $out instead of $bin. + + + The cc- and binutils-wrapper's "infix salt" and _BUILD_ and _TARGET_ user infixes have been replaced with with a "suffix salt" and suffixes and _FOR_BUILD and _FOR_TARGET. + This matches the autotools convention for env vars which standard for these things, making interfacing with other tools easier. + + diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 5a72fe91ddde..1dd6b593f0fc 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -182,7 +182,7 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlagsArray+=( "--cc=$CC" - "--host-cc=$BUILD_CC" + "--host-cc=$CC_FOR_BUILD" "--as=$AS" "--nm=$NM" "--ar=$AR" diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh index e5c0556556c7..e99beb381586 100644 --- a/pkgs/build-support/bintools-wrapper/add-flags.sh +++ b/pkgs/build-support/bintools-wrapper/add-flags.sh @@ -1,32 +1,32 @@ # See cc-wrapper for comments. var_templates_list=( - NIX+IGNORE_LD_THROUGH_GCC - NIX+LDFLAGS - NIX+LDFLAGS_BEFORE - NIX+LDFLAGS_AFTER - NIX+LDFLAGS_HARDEN - NIX+HARDENING_ENABLE + NIX_IGNORE_LD_THROUGH_GCC + NIX_LDFLAGS + NIX_LDFLAGS_BEFORE + NIX_LDFLAGS_AFTER + NIX_LDFLAGS_HARDEN + NIX_HARDENING_ENABLE ) var_templates_bool=( - NIX+SET_BUILD_ID - NIX+DONT_SET_RPATH + NIX_SET_BUILD_ID + NIX_DONT_SET_RPATH ) accumulateRoles for var in "${var_templates_list[@]}"; do - mangleVarList "$var" ${role_infixes[@]+"${role_infixes[@]}"} + mangleVarList "$var" ${role_suffixes[@]+"${role_suffixes[@]}"} done for var in "${var_templates_bool[@]}"; do - mangleVarBool "$var" ${role_infixes[@]+"${role_infixes[@]}"} + mangleVarBool "$var" ${role_suffixes[@]+"${role_suffixes[@]}"} done if [ -e @out@/nix-support/libc-ldflags ]; then - NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/libc-ldflags)" + NIX_LDFLAGS_@suffixSalt@+=" $(< @out@/nix-support/libc-ldflags)" fi if [ -e @out@/nix-support/libc-ldflags-before ]; then - NIX_@infixSalt@_LDFLAGS_BEFORE="$(< @out@/nix-support/libc-ldflags-before) $NIX_@infixSalt@_LDFLAGS_BEFORE" + NIX_LDFLAGS_BEFORE_@suffixSalt@="$(< @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE_@suffixSalt@" fi -export NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET=1 +export NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@=1 diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/pkgs/build-support/bintools-wrapper/add-hardening.sh index b7180870860a..5e49b7bd9053 100644 --- a/pkgs/build-support/bintools-wrapper/add-hardening.sh +++ b/pkgs/build-support/bintools-wrapper/add-hardening.sh @@ -5,7 +5,7 @@ declare -A hardeningEnableMap=() # Intentionally word-split in case 'NIX_HARDENING_ENABLE' is defined in Nix. The # array expansion also prevents undefined variables from causing trouble with # `set -u`. -for flag in ${NIX_@infixSalt@_HARDENING_ENABLE-}; do +for flag in ${NIX_HARDENING_ENABLE_@suffixSalt@-}; do hardeningEnableMap["$flag"]=1 done diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 5cc99c6412a7..a91afa0c0b3f 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -45,7 +45,7 @@ let coreutils_bin = if nativeTools then "" else getBin coreutils; # See description in cc-wrapper. - infixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; + suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; # The dynamic linker has different names on different platforms. This is a # shell glob that ought to match it. @@ -83,7 +83,7 @@ stdenv.mkDerivation { shell = getBin shell + shell.shellPath or ""; gnugrep_bin = if nativeTools then "" else gnugrep; - inherit targetPrefix infixSalt; + inherit targetPrefix suffixSalt; outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (bintools ? info) "info"); @@ -95,9 +95,9 @@ stdenv.mkDerivation { (mapc (lambda (arg) (when (file-directory-p (concat arg "/lib")) - (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib"))) + (setenv "NIX_LDFLAGS_${suffixSalt}" (concat (getenv "NIX_LDFLAGS_${suffixSalt}") " -L" arg "/lib"))) (when (file-directory-p (concat arg "/lib64")) - (setenv "NIX_${infixSalt}_LDFLAGS" (concat (getenv "NIX_${infixSalt}_LDFLAGS") " -L" arg "/lib64")))) + (setenv "NIX_LDFLAGS_${suffixSalt}" (concat (getenv "NIX_LDFLAGS_${suffixSalt}") " -L" arg "/lib64")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) ''; }; diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index ed2f00a8974e..81b5a90edd5c 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -16,7 +16,7 @@ fi source @out@/nix-support/utils.bash -if [ -z "${NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then +if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @out@/nix-support/add-flags.sh fi @@ -24,7 +24,7 @@ fi # Optionally filter out paths not refering to the store. expandResponseParams "$@" if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" - && ( -z "$NIX_@infixSalt@_IGNORE_LD_THROUGH_GCC" || -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ) ]]; then + && ( -z "$NIX_IGNORE_LD_THROUGH_GCC_@suffixSalt@" || -z "${NIX_LDFLAGS_SET_@suffixSalt@:-}" ) ]]; then rest=() nParams=${#params[@]} declare -i n=0 @@ -60,12 +60,12 @@ source @out@/nix-support/add-hardening.sh extraAfter=() extraBefore=(${hardeningLDFlags[@]+"${hardeningLDFlags[@]}"}) -if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then - extraAfter+=($NIX_@infixSalt@_LDFLAGS) - extraBefore+=($NIX_@infixSalt@_LDFLAGS_BEFORE) +if [ -z "${NIX_LDFLAGS_SET_@suffixSalt@:-}" ]; then + extraAfter+=($NIX_LDFLAGS_@suffixSalt@) + extraBefore+=($NIX_LDFLAGS_BEFORE_@suffixSalt@) fi -extraAfter+=($NIX_@infixSalt@_LDFLAGS_AFTER) +extraAfter+=($NIX_LDFLAGS_AFTER_@suffixSalt@) # Specify the target emulation if nothing is passed in ("-m" overrides this # environment variable). Ensures we never blindly fallback on targeting the host @@ -84,8 +84,8 @@ declare -A libs declare -i relocatable=0 link32=0 if - [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ] \ - || [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] \ + [ "$NIX_DONT_SET_RPATH_@suffixSalt@" != 1 ] \ + || [ "$NIX_SET_BUILD_ID_@suffixSalt@" = 1 ] \ || [ -e @out@/nix-support/dynamic-linker-m32 ] then prev= @@ -144,7 +144,7 @@ if [ -e "@out@/nix-support/dynamic-linker-m32" ] && (( "$link32" )); then fi # Add all used dynamic libraries to the rpath. -if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then +if [ "$NIX_DONT_SET_RPATH_@suffixSalt@" != 1 ]; then # For each directory in the library search path (-L...), # see if it contains a dynamic library used by a -l... flag. If # so, add the directory to the rpath. @@ -186,7 +186,7 @@ fi # Only add --build-id if this is a final link. FIXME: should build gcc # with --enable-linker-build-id instead? -if [ "$NIX_@infixSalt@_SET_BUILD_ID" = 1 ] && ! (( "$relocatable" )); then +if [ "$NIX_SET_BUILD_ID_@suffixSalt@" = 1 ] && ! (( "$relocatable" )); then extraAfter+=(--build-id) fi diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index a714bd151c90..7e9547b96c25 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -10,11 +10,11 @@ bintoolsWrapper_addLDVars () { # See ../setup-hooks/role.bash - local role_post role_pre + local role_post getHostRoleEnvHook if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then - export NIX_${role_pre}LDFLAGS+=" -L$1/lib64" + export NIX_LDFLAGS${role_post}+=" -L$1/lib64" fi if [[ -d "$1/lib" ]]; then @@ -24,7 +24,7 @@ bintoolsWrapper_addLDVars () { # directories and bloats the size of the environment variable space. local -a glob=( $1/lib/lib* ) if [ "${#glob[*]}" -gt 0 ]; then - export NIX_${role_pre}LDFLAGS+=" -L$1/lib" + export NIX_LDFLAGS${role_post}+=" -L$1/lib" fi fi } @@ -52,7 +52,7 @@ fi # Export tool environment variables so various build systems use the right ones. -export NIX_${role_pre}BINTOOLS=@out@ +export NIX_BINTOOLS${role_post}=@out@ for cmd in \ ar as ld nm objcopy objdump readelf ranlib strip strings size windres @@ -60,7 +60,6 @@ do if PATH=$_PATH type -p "@targetPrefix@${cmd}" > /dev/null then - export "${role_pre}${cmd^^}=@targetPrefix@${cmd}"; export "${cmd^^}${role_post}=@targetPrefix@${cmd}"; fi done @@ -70,4 +69,4 @@ done export NIX_HARDENING_ENABLE # No local scope in sourced file -unset -v role_pre role_post cmd upper_case +unset -v role_post cmd upper_case diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 8de43d5a9195..083e7617b502 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -58,7 +58,7 @@ let # Force compilers and other tools to look in default search paths unset NIX_ENFORCE_PURITY - export NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST=1 + export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 export NIX_CFLAGS_COMPILE='-idirafter /usr/include' export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32' export NIX_LDFLAGS='-L/usr/lib -L/usr/lib32' diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 323ea5bfd772..3398f11e8c21 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -5,15 +5,15 @@ # wrapped binary just inherit the work of the forker's wrapper script. var_templates_list=( - NIX+CFLAGS_COMPILE - NIX+CFLAGS_COMPILE_BEFORE - NIX+CFLAGS_LINK - NIX+CXXSTDLIB_COMPILE - NIX+CXXSTDLIB_LINK - NIX+GNATFLAGS_COMPILE + NIX_CFLAGS_COMPILE + NIX_CFLAGS_COMPILE_BEFORE + NIX_CFLAGS_LINK + NIX_CXXSTDLIB_COMPILE + NIX_CXXSTDLIB_LINK + NIX_GNATFLAGS_COMPILE ) var_templates_bool=( - NIX+ENFORCE_NO_NATIVE + NIX_ENFORCE_NO_NATIVE ) accumulateRoles @@ -21,37 +21,37 @@ accumulateRoles # We need to mangle names for hygiene, but also take parameters/overrides # from the environment. for var in "${var_templates_list[@]}"; do - mangleVarList "$var" ${role_infixes[@]+"${role_infixes[@]}"} + mangleVarList "$var" ${role_suffixes[@]+"${role_suffixes[@]}"} done for var in "${var_templates_bool[@]}"; do - mangleVarBool "$var" ${role_infixes[@]+"${role_infixes[@]}"} + mangleVarBool "$var" ${role_suffixes[@]+"${role_suffixes[@]}"} done # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld. -NIX_@infixSalt@_CFLAGS_COMPILE="-B@out@/bin/ $NIX_@infixSalt@_CFLAGS_COMPILE" +NIX_CFLAGS_COMPILE_@suffixSalt@="-B@out@/bin/ $NIX_CFLAGS_COMPILE_@suffixSalt@" # Export and assign separately in order that a failing $(..) will fail # the script. if [ -e @out@/nix-support/libc-cflags ]; then - NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/libc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE" + NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@" fi if [ -e @out@/nix-support/cc-cflags ]; then - NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/cc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE" + NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@" fi if [ -e @out@/nix-support/gnat-cflags ]; then - NIX_@infixSalt@_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_@infixSalt@_GNATFLAGS_COMPILE" + NIX_GNATFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/gnat-cflags) $NIX_GNATFLAGS_COMPILE_@suffixSalt@" fi if [ -e @out@/nix-support/cc-ldflags ]; then - NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)" + NIX_LDFLAGS_@suffixSalt@+=" $(< @out@/nix-support/cc-ldflags)" fi if [ -e @out@/nix-support/cc-cflags-before ]; then - NIX_@infixSalt@_CFLAGS_COMPILE_BEFORE="$(< @out@/nix-support/cc-cflags-before) $NIX_@infixSalt@_CFLAGS_COMPILE_BEFORE" + NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@="$(< @out@/nix-support/cc-cflags-before) $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@" fi # That way forked processes will not extend these environment variables again. -export NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET=1 +export NIX_CC_WRAPPER_FLAGS_SET_@suffixSalt@=1 diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index fc40fe7408b6..8e2fe6c407ea 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -5,7 +5,7 @@ declare -A hardeningEnableMap=() # Intentionally word-split in case 'NIX_HARDENING_ENABLE' is defined in Nix. The # array expansion also prevents undefined variables from causing trouble with # `set -u`. -for flag in ${NIX_@infixSalt@_HARDENING_ENABLE-}; do +for flag in ${NIX_HARDENING_ENABLE_@suffixSalt@-}; do hardeningEnableMap["$flag"]=1 done diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index ba3dfc96f5c4..cf00202221e6 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -18,12 +18,12 @@ fi source @out@/nix-support/utils.bash # Flirting with a layer violation here. -if [ -z "${NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then +if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @bintools@/nix-support/add-flags.sh fi # Put this one second so libc ldflags take priority. -if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then +if [ -z "${NIX_CC_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @out@/nix-support/add-flags.sh fi @@ -113,7 +113,7 @@ fi # Clear march/mtune=native -- they bring impurity. -if [ "$NIX_@infixSalt@_ENFORCE_NO_NATIVE" = 1 ]; then +if [ "$NIX_ENFORCE_NO_NATIVE_@suffixSalt@" = 1 ]; then rest=() # Old bash empty array hack for p in ${params+"${params[@]}"}; do @@ -129,36 +129,36 @@ fi if [[ "$isCpp" = 1 ]]; then if [[ "$cppInclude" = 1 ]]; then - NIX_@infixSalt@_CFLAGS_COMPILE+=" ${NIX_@infixSalt@_CXXSTDLIB_COMPILE:-@default_cxx_stdlib_compile@}" + NIX_CFLAGS_COMPILE_@suffixSalt@+=" ${NIX_CXXSTDLIB_COMPILE_@suffixSalt@:-@default_cxx_stdlib_compile@}" fi - NIX_@infixSalt@_CFLAGS_LINK+=" $NIX_@infixSalt@_CXXSTDLIB_LINK" + NIX_CFLAGS_LINK_@suffixSalt@+=" $NIX_CXXSTDLIB_LINK_@suffixSalt@" fi source @out@/nix-support/add-hardening.sh # Add the flags for the C compiler proper. -extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE) -extraBefore=(${hardeningCFlags[@]+"${hardeningCFlags[@]}"} $NIX_@infixSalt@_CFLAGS_COMPILE_BEFORE) +extraAfter=($NIX_CFLAGS_COMPILE_@suffixSalt@) +extraBefore=(${hardeningCFlags[@]+"${hardeningCFlags[@]}"} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@) if [ "$dontLink" != 1 ]; then # Add the flags that should only be passed to the compiler when # linking. - extraAfter+=($NIX_@infixSalt@_CFLAGS_LINK) + extraAfter+=($NIX_CFLAGS_LINK_@suffixSalt@) # Add the flags that should be passed to the linker (and prevent - # `ld-wrapper' from adding NIX_@infixSalt@_LDFLAGS again). - for i in $NIX_@infixSalt@_LDFLAGS_BEFORE; do + # `ld-wrapper' from adding NIX_LDFLAGS_@suffixSalt@ again). + for i in $NIX_LDFLAGS_BEFORE_@suffixSalt@; do extraBefore+=("-Wl,$i") done - for i in $NIX_@infixSalt@_LDFLAGS; do + for i in $NIX_LDFLAGS_@suffixSalt@; do if [ "${i:0:3}" = -L/ ]; then extraAfter+=("$i") else extraAfter+=("-Wl,$i") fi done - export NIX_@infixSalt@_LDFLAGS_SET=1 + export NIX_LDFLAGS_SET_@suffixSalt@=1 fi # As a very special hack, if the arguments are just `-v', then don't diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 1b7c5750727a..9cbc9d1b11dd 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -53,12 +53,12 @@ let "-isystem ${libcxx}/include/c++/v1" else ""; - # The "infix salt" is a arbitrary string added in the middle of env vars + # 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, # adjusted to be a valid bash identifier. This should be considered an # unstable implementation detail, however. - infixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; + suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; expand-response-params = if buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null" @@ -105,7 +105,7 @@ stdenv.mkDerivation { shell = getBin shell + shell.shellPath or ""; gnugrep_bin = if nativeTools then "" else gnugrep; - inherit targetPrefix infixSalt; + inherit targetPrefix suffixSalt; outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ]; @@ -122,7 +122,7 @@ stdenv.mkDerivation { (mapc (lambda (arg) (when (file-directory-p (concat arg "/include")) - (setenv "NIX_${infixSalt}_CFLAGS_COMPILE" (concat (getenv "NIX_${infixSalt}_CFLAGS_COMPILE") " -isystem " arg "/include")))) + (setenv "NIX_CFLAGS_COMPILE_${suffixSalt}" (concat (getenv "NIX_CFLAGS_COMPILE_${suffixSalt}") " -isystem " arg "/include")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) ''; }; diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index 15b53d76c630..d3f7d382c19a 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -18,12 +18,12 @@ fi source @out@/nix-support/utils.bash # Flirting with a layer violation here. -if [ -z "${NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then +if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @bintools@/nix-support/add-flags.sh fi # Put this one second so libc ldflags take priority. -if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then +if [ -z "${NIX_CC_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then source @out@/nix-support/add-flags.sh fi @@ -108,7 +108,7 @@ fi # Clear march/mtune=native -- they bring impurity. -if [ "$NIX_@infixSalt@_ENFORCE_NO_NATIVE" = 1 ]; then +if [ "$NIX_ENFORCE_NO_NATIVE_@suffixSalt@" = 1 ]; then rest=() # Old bash empty array hack for p in ${params+"${params[@]}"}; do @@ -124,12 +124,12 @@ fi if [ "$(basename $0)x" = "gnatmakex" ]; then extraBefore=("--GNATBIND=@out@/bin/gnatbind" "--GNATLINK=@out@/bin/gnatlink") - extraAfter=($NIX_@infixSalt@_GNATFLAGS_COMPILE) + extraAfter=($NIX_GNATFLAGS_COMPILE_@suffixSalt@) fi if [ "$(basename $0)x" = "gnatbindx" ]; then extraBefore=() - extraAfter=($NIX_@infixSalt@_GNATFLAGS_COMPILE) + extraAfter=($NIX_GNATFLAGS_COMPILE_@suffixSalt@) fi if [ "$(basename $0)x" = "gnatlinkx" ]; then diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 5b13f2683097..6a913cc4eac7 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -6,9 +6,9 @@ # tools. For example: # # # Flags for compiling (whether or not linking) C code for the... -# NIX_BUILD_CFLAGS_COMPILE # ...build platform -# NIX_CFLAGS_COMPILE # ...host platform -# NIX_TARGET_CFLAGS_COMPILE # ...target platform +# NIX_CFLAGS_COMPILE_FOR_BUILD # ...build platform +# NIX_CFLAGS_COMPILE # ...host platform +# NIX_CFLAGS_COMPILE_FOR_TARGET # ...target platform # # Notice that these platforms are the 3 *relative* to the package using # cc-wrapper, not absolute like `x86_64-pc-linux-gnu`. @@ -33,12 +33,12 @@ # The basic strategy is: # # - Everyone exclusively *adds information* to relative-platform-specific -# environment variables, like `NIX_TARGET_CFLAGS_COMPILE`, to communicate +# environment variables, like `NIX_CFLAGS_COMPILE_FOR_TARGET`, to communicate # with the wrapped binaries. # # - The wrapped binaries will exclusively *read* cc-wrapper-derivation-specific -# environment variables distinguished with with `infixSalt`, like -# `NIX_@infixSalt@_CFLAGS_COMPILE`. +# environment variables distinguished with with `suffixSalt`, like +# `NIX_CFLAGS_COMPILE_@suffixSalt@`. # # - `add-flags`, beyond its old task of reading extra flags stuck inside the # cc-wrapper derivation, will convert the relative-platform-specific @@ -65,15 +65,15 @@ # function is guaranteed to be exactly the same. ccWrapper_addCVars () { # See ../setup-hooks/role.bash - local role_post role_pre + local role_post getHostRoleEnvHook if [ -d "$1/include" ]; then - export NIX_${role_pre}CFLAGS_COMPILE+=" -isystem $1/include" + export NIX_CFLAGS_COMPILE${role_post}+=" -isystem $1/include" fi if [ -d "$1/Library/Frameworks" ]; then - export NIX_${role_pre}CFLAGS_COMPILE+=" -iframework $1/Library/Frameworks" + export NIX_CFLAGS_COMPILE${role_post}+=" -iframework $1/Library/Frameworks" fi } @@ -105,10 +105,10 @@ fi # Export tool environment variables so various build systems use the right ones. -export NIX_${role_pre}CC=@out@ +export NIX_CC${role_post}=@out@ -export ${role_pre}CC=@named_cc@ -export ${role_pre}CXX=@named_cxx@ +export CC${role_post}=@named_cc@ +export CXX${role_post}=@named_cxx@ export CC${role_post}=@named_cc@ export CXX${role_post}=@named_cxx@ @@ -117,4 +117,4 @@ export CXX${role_post}=@named_cxx@ export NIX_HARDENING_ENABLE # No local scope in sourced file -unset -v role_pre role_post +unset -v role_post diff --git a/pkgs/build-support/setup-hooks/role.bash b/pkgs/build-support/setup-hooks/role.bash index 6f1c36f5c050..cf69e732e7c3 100644 --- a/pkgs/build-support/setup-hooks/role.bash +++ b/pkgs/build-support/setup-hooks/role.bash @@ -3,21 +3,17 @@ # derivation) in which the derivation is used. # # The role is intened to be use as part of other variables names like -# - $NIX_${role_pre}_SOMETHING -# - $NIX_SOMETHING_${role_post} +# - $NIX_SOMETHING${role_post} function getRole() { case $1 in -1) - role_pre='BUILD_' role_post='_FOR_BUILD' ;; 0) - role_pre='' role_post='' ;; 1) - role_pre='TARGET_' role_post='_FOR_TARGET' ;; *) @@ -54,18 +50,18 @@ function getTargetRoleEnvHook() { } # This variant is inteneded specifically for code-prodocing tool wrapper scripts -# `NIX_@wrapperName@_@infixSalt@_TARGET_*` tracks this (needs to be an exported +# `NIX_@wrapperName@_TARGET_*_@suffixSalt@` tracks this (needs to be an exported # env var so can't use fancier data structures). function getTargetRoleWrapper() { case $targetOffset in -1) - export NIX_@wrapperName@_@infixSalt@_TARGET_BUILD=1 + export NIX_@wrapperName@_TARGET_BUILD_@suffixSalt@=1 ;; 0) - export NIX_@wrapperName@_@infixSalt@_TARGET_HOST=1 + export NIX_@wrapperName@_TARGET_HOST_@suffixSalt@=1 ;; 1) - export NIX_@wrapperName@_@infixSalt@_TARGET_TARGET=1 + export NIX_@wrapperName@_TARGET_TARGET_@suffixSalt@=1 ;; *) echo "@name@: used as improper sort of dependency" >2 diff --git a/pkgs/build-support/wrapper-common/utils.bash b/pkgs/build-support/wrapper-common/utils.bash index 4fd57162072e..8c4680a8e446 100644 --- a/pkgs/build-support/wrapper-common/utils.bash +++ b/pkgs/build-support/wrapper-common/utils.bash @@ -1,29 +1,29 @@ -# Accumulate infixes for taking in the right input parameters with the `mangle*` +# Accumulate suffixes for taking in the right input parameters with the `mangle*` # functions below. See setup-hook for details. accumulateRoles() { - declare -ga role_infixes=() - if [ "${NIX_@wrapperName@_@infixSalt@_TARGET_BUILD:-}" ]; then - role_infixes+=(_BUILD_) + declare -ga role_suffixes=() + if [ "${NIX_@wrapperName@_TARGET_BUILD_@suffixSalt@:-}" ]; then + role_suffixes+=('_FOR_BUILD') fi - if [ "${NIX_@wrapperName@_@infixSalt@_TARGET_HOST:-}" ]; then - role_infixes+=(_) + if [ "${NIX_@wrapperName@_TARGET_HOST_@suffixSalt@:-}" ]; then + role_suffixes+=('') fi - if [ "${NIX_@wrapperName@_@infixSalt@_TARGET_TARGET:-}" ]; then - role_infixes+=(_TARGET_) + if [ "${NIX_@wrapperName@_TARGET_TARGET_@suffixSalt@:-}" ]; then + role_suffixes+=('_FOR_TARGET') fi } mangleVarList() { local var="$1" shift - local -a role_infixes=("$@") + local -a role_suffixes=("$@") - local outputVar="${var/+/_@infixSalt@_}" + local outputVar="${var}_@suffixSalt@" declare -gx ${outputVar}+='' # For each role we serve, we accumulate the input parameters into our own # cc-wrapper-derivation-specific environment variables. - for infix in "${role_infixes[@]}"; do - local inputVar="${var/+/${infix}}" + for suffix in "${role_suffixes[@]}"; do + local inputVar="${var}${suffix}" if [ -v "$inputVar" ]; then export ${outputVar}+="${!outputVar:+ }${!inputVar}" fi @@ -33,12 +33,12 @@ mangleVarList() { mangleVarBool() { local var="$1" shift - local -a role_infixes=("$@") + local -a role_suffixes=("$@") - local outputVar="${var/+/_@infixSalt@_}" + local outputVar="${var}_@suffixSalt@" declare -gxi ${outputVar}+=0 - for infix in "${role_infixes[@]}"; do - local inputVar="${var/+/${infix}}" + for suffix in "${role_suffixes[@]}"; do + local inputVar="${var}${suffix}" if [ -v "$inputVar" ]; then # "1" in the end makes `let` return success error code when # expression itself evaluates to zero. diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 4a4cfce5cc47..ae723a145313 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -239,8 +239,8 @@ stdenv.mkDerivation ({ (import ../common/extra-target-flags.nix { inherit stdenv crossStageStatic libcCross threadsCross; }) - EXTRA_TARGET_FLAGS - EXTRA_TARGET_LDFLAGS + EXTRA_FLAGS_FOR_TARGET + EXTRA_LDFLAGS_FOR_TARGET ; passthru = { diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index b35b69e87e1e..6a2c506b1bf3 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -264,8 +264,8 @@ stdenv.mkDerivation ({ (import ../common/extra-target-flags.nix { inherit stdenv crossStageStatic libcCross threadsCross; }) - EXTRA_TARGET_FLAGS - EXTRA_TARGET_LDFLAGS + EXTRA_FLAGS_FOR_TARGET + EXTRA_LDFLAGS_FOR_TARGET ; passthru = { diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index f7fbe1ec554b..0a35ed023c6f 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -276,8 +276,8 @@ stdenv.mkDerivation ({ (import ../common/extra-target-flags.nix { inherit stdenv crossStageStatic libcCross threadsCross; }) - EXTRA_TARGET_FLAGS - EXTRA_TARGET_LDFLAGS + EXTRA_FLAGS_FOR_TARGET + EXTRA_LDFLAGS_FOR_TARGET ; passthru = { diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 173ca128ee0b..f3b15eac55d2 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -292,8 +292,8 @@ stdenv.mkDerivation ({ (import ../common/extra-target-flags.nix { inherit stdenv crossStageStatic libcCross threadsCross; }) - EXTRA_TARGET_FLAGS - EXTRA_TARGET_LDFLAGS + EXTRA_FLAGS_FOR_TARGET + EXTRA_LDFLAGS_FOR_TARGET ; passthru = { diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 9153268a12b3..89933c22edd4 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -247,8 +247,8 @@ stdenv.mkDerivation ({ (import ../common/extra-target-flags.nix { inherit stdenv crossStageStatic libcCross threadsCross; }) - EXTRA_TARGET_FLAGS - EXTRA_TARGET_LDFLAGS + EXTRA_FLAGS_FOR_TARGET + EXTRA_LDFLAGS_FOR_TARGET ; passthru = { diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index e3091a062be8..5a6e20c0f412 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -234,8 +234,8 @@ stdenv.mkDerivation ({ (import ../common/extra-target-flags.nix { inherit stdenv crossStageStatic libcCross threadsCross; }) - EXTRA_TARGET_FLAGS - EXTRA_TARGET_LDFLAGS + EXTRA_FLAGS_FOR_TARGET + EXTRA_LDFLAGS_FOR_TARGET ; passthru = { diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 7a5535e2a89a..03ffec835c93 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -239,8 +239,8 @@ stdenv.mkDerivation ({ (import ../common/extra-target-flags.nix { inherit stdenv crossStageStatic libcCross threadsCross; }) - EXTRA_TARGET_FLAGS - EXTRA_TARGET_LDFLAGS + EXTRA_FLAGS_FOR_TARGET + EXTRA_LDFLAGS_FOR_TARGET ; passthru = { diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index b806f5a6e503..4b14cdb94cdd 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -25,12 +25,12 @@ echo "\$LIBRARY_PATH is \`${LIBRARY_PATH-}'" if test "$noSysDirs" = "1"; then declare \ - EXTRA_BUILD_FLAGS EXTRA_FLAGS EXTRA_TARGET_FLAGS \ - EXTRA_BUILD_LDFLAGS EXTRA_TARGET_LDFLAGS + EXTRA_FLAGS_FOR_BUILD EXTRA_FLAGS EXTRA_FLAGS_FOR_TARGET \ + EXTRA_LDFLAGS_FOR_BUILD EXTRA_LDFLAGS_FOR_TARGET # Extract flags from Bintools Wrappers - for pre in 'BUILD_' ''; do - curBintools="NIX_${pre}BINTOOLS" + for post in '_FOR_BUILD' ''; do + curBintools="NIX_BINTOOLS${post}" declare -a extraLDFlags=() if [[ -e "${!curBintools}/nix-support/orig-libc" ]]; then @@ -48,14 +48,14 @@ if test "$noSysDirs" = "1"; then extraLDFlags=("-L$libc_libdir" "-rpath" "$libc_libdir" "${extraLDFlags[@]}") for i in "${extraLDFlags[@]}"; do - declare EXTRA_${pre}LDFLAGS+=" -Wl,$i" + declare EXTRA_LDFLAGS${post}+=" -Wl,$i" done done # Extract flags from CC Wrappers - for pre in 'BUILD_' ''; do - curCC="NIX_${pre}CC" - curFIXINC="NIX_${pre}FIXINC_DUMMY" + for post in '_FOR_BUILD' ''; do + curCC="NIX_CC${post}" + curFIXINC="NIX_FIXINC_DUMMY${post}" declare -a extraFlags=() if [[ -e "${!curCC}/nix-support/orig-libc" ]]; then @@ -69,11 +69,11 @@ if test "$noSysDirs" = "1"; then # Use *real* header files, otherwise a limits.h is generated that # does not include Libc's limits.h (notably missing SSIZE_MAX, # which breaks the build). - declare NIX_${pre}FIXINC_DUMMY="$libc_devdir/include" + declare NIX_FIXINC_DUMMY${post}="$libc_devdir/include" else # Hack: support impure environments. extraFlags=("-isystem" "/usr/include") - declare NIX_${pre}FIXINC_DUMMY=/usr/include + declare NIX_FIXINC_DUMMY${post}=/usr/include fi extraFlags=("-I${!curFIXINC}" "${extraFlags[@]}") @@ -89,13 +89,13 @@ if test "$noSysDirs" = "1"; then extraFlags=("-O2" "${extraFlags[@]}") fi - declare EXTRA_${pre}FLAGS="${extraFlags[*]}" + declare EXTRA_FLAGS${post}="${extraFlags[*]}" done if test -z "${targetConfig-}"; then # host = target, so the flags are the same - EXTRA_TARGET_FLAGS="$EXTRA_FLAGS" - EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" + EXTRA_FLAGS_FOR_TARGET="$EXTRA_FLAGS" + EXTRA_LDFLAGS_FOR_TARGET="$EXTRA_LDFLAGS" fi # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find @@ -103,31 +103,31 @@ if test "$noSysDirs" = "1"; then # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx # for the startfiles. makeFlagsArray+=( - "BUILD_SYSTEM_HEADER_DIR=$NIX_BUILD_FIXINC_DUMMY" - "SYSTEM_HEADER_DIR=$NIX_BUILD_FIXINC_DUMMY" + "BUILD_SYSTEM_HEADER_DIR=$NIX_FIXINC_DUMMY_FOR_BUILD" + "SYSTEM_HEADER_DIR=$NIX_FIXINC_DUMMY_FOR_BUILD" "NATIVE_SYSTEM_HEADER_DIR=$NIX_FIXINC_DUMMY" - "LDFLAGS_FOR_BUILD=$EXTRA_BUILD_LDFLAGS" + "LDFLAGS_FOR_BUILD=$EXTRA_LDFLAGS_FOR_BUILD" #"LDFLAGS=$EXTRA_LDFLAGS" - "LDFLAGS_FOR_TARGET=$EXTRA_TARGET_LDFLAGS" + "LDFLAGS_FOR_TARGET=$EXTRA_LDFLAGS_FOR_TARGET" - "CFLAGS_FOR_BUILD=$EXTRA_BUILD_FLAGS $EXTRA_BUILD_LDFLAGS" - "CXXFLAGS_FOR_BUILD=$EXTRA_BUILD_FLAGS $EXTRA_BUILD_LDFLAGS" - "FLAGS_FOR_BUILD=$EXTRA_BUILD_FLAGS $EXTRA_BUILD_LDFLAGS" + "CFLAGS_FOR_BUILD=$EXTRA_FLAGS_FOR_BUILD $EXTRA_LDFLAGS_FOR_BUILD" + "CXXFLAGS_FOR_BUILD=$EXTRA_FLAGS_FOR_BUILD $EXTRA_LDFLAGS_FOR_BUILD" + "FLAGS_FOR_BUILD=$EXTRA_FLAGS_FOR_BUILD $EXTRA_LDFLAGS_FOR_BUILD" # It seems there is a bug in GCC 5 #"CFLAGS=$EXTRA_FLAGS $EXTRA_LDFLAGS" #"CXXFLAGS=$EXTRA_FLAGS $EXTRA_LDFLAGS" - "CFLAGS_FOR_TARGET=$EXTRA_TARGET_FLAGS $EXTRA_TARGET_LDFLAGS" - "CXXFLAGS_FOR_TARGET=$EXTRA_TARGET_FLAGS $EXTRA_TARGET_LDFLAGS" - "FLAGS_FOR_TARGET=$EXTRA_TARGET_FLAGS $EXTRA_TARGET_LDFLAGS" + "CFLAGS_FOR_TARGET=$EXTRA_FLAGS_FOR_TARGET $EXTRA_LDFLAGS_FOR_TARGET" + "CXXFLAGS_FOR_TARGET=$EXTRA_FLAGS_FOR_TARGET $EXTRA_LDFLAGS_FOR_TARGET" + "FLAGS_FOR_TARGET=$EXTRA_FLAGS_FOR_TARGET $EXTRA_LDFLAGS_FOR_TARGET" ) if test -z "${targetConfig-}"; then makeFlagsArray+=( "BOOT_CFLAGS=$EXTRA_FLAGS $EXTRA_LDFLAGS" - "BOOT_LDFLAGS=$EXTRA_TARGET_FLAGS $EXTRA_TARGET_LDFLAGS" + "BOOT_LDFLAGS=$EXTRA_FLAGS_FOR_TARGET $EXTRA_LDFLAGS_FOR_TARGET" ) fi diff --git a/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/pkgs/development/compilers/gcc/common/extra-target-flags.nix index bce9a8d47381..0b659368cd03 100644 --- a/pkgs/development/compilers/gcc/common/extra-target-flags.nix +++ b/pkgs/development/compilers/gcc/common/extra-target-flags.nix @@ -5,7 +5,7 @@ let in { - EXTRA_TARGET_FLAGS = let + EXTRA_FLAGS_FOR_TARGET = let mkFlags = dep: lib.optionals (targetPlatform != hostPlatform && dep != null) ([ "-idirafter ${lib.getDev dep}${dep.incdir or "/include"}" ] ++ stdenv.lib.optionals (! crossStageStatic) [ @@ -15,7 +15,7 @@ in ++ lib.optionals (!crossStageStatic) (mkFlags threadsCross) ; - EXTRA_TARGET_LDFLAGS = let + EXTRA_LDFLAGS_FOR_TARGET = let mkFlags = dep: lib.optionals (targetPlatform != hostPlatform && dep != null) ([ "-Wl,-L${lib.getLib dep}${dep.libdir or "/lib"}" ] ++ (if crossStageStatic then [ diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh index 60c610a8e7a8..f5b4123b64d9 100644 --- a/pkgs/development/compilers/gcc/libstdc++-hook.sh +++ b/pkgs/development/compilers/gcc/libstdc++-hook.sh @@ -1,4 +1,4 @@ # See pkgs/build-support/setup-hooks/role.bash getHostRole -export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/@targetConfig@" +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/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index 244ee4c010ea..337e0f735ebe 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -462,7 +462,7 @@ in rec { export CC="gcc" export CPP="gcc -E" export NIX_CXXSTDLIB_LINK="" - export NIX_TARGET_CXXSTDLIB_LINK="" + export NIX_CXXSTDLIB_LINK_FOR_TARGET="" export OPENSSL_PREFIX=$(realpath openssl) # this fixes error: impure path 'LibFFIHeaderDirectives' used in link export NIX_ENFORCE_PURITY=0 diff --git a/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh index 6611259165ae..3a274aecc23d 100644 --- a/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh @@ -2,5 +2,5 @@ getHostRole linkCxxAbi="@linkCxxAbi@" -export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +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/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh index 6611259165ae..3a274aecc23d 100644 --- a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh @@ -2,5 +2,5 @@ getHostRole linkCxxAbi="@linkCxxAbi@" -export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +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/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh index 6611259165ae..3a274aecc23d 100644 --- a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh @@ -2,5 +2,5 @@ getHostRole linkCxxAbi="@linkCxxAbi@" -export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +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/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh index 6611259165ae..3a274aecc23d 100644 --- a/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh @@ -2,5 +2,5 @@ getHostRole linkCxxAbi="@linkCxxAbi@" -export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +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/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh index 6611259165ae..3a274aecc23d 100644 --- a/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh @@ -2,5 +2,5 @@ getHostRole linkCxxAbi="@linkCxxAbi@" -export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +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/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh index 6611259165ae..3a274aecc23d 100644 --- a/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh +++ b/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh @@ -2,5 +2,5 @@ getHostRole linkCxxAbi="@linkCxxAbi@" -export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1" -export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" +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/idris-modules/idris-wrapper.nix b/pkgs/development/idris-modules/idris-wrapper.nix index 4e1d2f9c82eb..68a1a0f267ad 100644 --- a/pkgs/development/idris-modules/idris-wrapper.nix +++ b/pkgs/development/idris-modules/idris-wrapper.nix @@ -7,7 +7,7 @@ symlinkJoin { postBuild = '' wrapProgram $out/bin/idris \ --run 'export IDRIS_CC=''${IDRIS_CC:-${stdenv.cc}/bin/cc}' \ - --set NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST 1 \ + --set 'NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}' 1 \ --prefix NIX_CFLAGS_COMPILE " " "-I${lib.getDev gmp}/include" \ --prefix NIX_CFLAGS_LINK " " "-L${lib.getLib gmp}/lib" ''; diff --git a/pkgs/development/libraries/gettext/gettext-setup-hook.sh b/pkgs/development/libraries/gettext/gettext-setup-hook.sh index 69020146f84d..5cc9655a89bc 100644 --- a/pkgs/development/libraries/gettext/gettext-setup-hook.sh +++ b/pkgs/development/libraries/gettext/gettext-setup-hook.sh @@ -13,5 +13,5 @@ addEnvHooks "$hostOffset" gettextDataDirsHook if [ -n "@gettextNeedsLdflags@" -a -z "${dontAddExtraLibs-}" ]; then # See pkgs/build-support/setup-hooks/role.bash getHostRole - export NIX_${role_pre}LDFLAGS+=" -lintl" + export NIX_LDFLAGS${role_post}+=" -lintl" fi diff --git a/pkgs/development/libraries/libiconv/setup-hook.sh b/pkgs/development/libraries/libiconv/setup-hook.sh index 120cf06c61b5..3d9656ffe5d6 100644 --- a/pkgs/development/libraries/libiconv/setup-hook.sh +++ b/pkgs/development/libraries/libiconv/setup-hook.sh @@ -4,5 +4,5 @@ # See pkgs/build-support/setup-hooks/role.bash if [ -z "${dontAddExtraLibs-}" ]; then getHostRole - export NIX_${role_pre}LDFLAGS+=" -liconv" + export NIX_LDFLAGS${role_post}+=" -liconv" fi diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 756e0cf71001..52a4c0ca7198 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -63,8 +63,10 @@ stdenv.mkDerivation rec { --subst-var-by libc_lib ${lib.getLib stdenv.cc.libc} substituteInPlace Modules/FindCxxTest.cmake \ --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell} - # BUILD_CC and BUILD_CXX are used to bootstrap cmake - configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$BUILD_CC CXX=$BUILD_CXX $configureFlags" + '' + # CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake + + '' + configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags" ''; configureFlags = [ diff --git a/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch b/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch index f0e4230d7ec2..da28a309719e 100644 --- a/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch +++ b/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch @@ -4,7 +4,7 @@ diff -ur texinfo-6.5/configure texinfo-6.5-patched/configure @@ -23281,7 +23281,7 @@ # env -i gives this build host configure a clean environment; # consequently, we have to re-initialize $PATH. - env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \ + env -i CC="$CC_FOR_BUILD" AR="$AR_FOR_BUILD" RANLIB="$RANLIB_FOR_BUILD" \ - PATH="$PATH" \ + PATH="$PATH" CFLAGS="$NATIVE_TOOLS_CFLAGS" LDFLAGS="$NATIVE_TOOLS_LDFLAGS" \ tools_only=1 \ diff --git a/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh b/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh index 81df09eba176..3c49337a937c 100644 --- a/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh +++ b/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh @@ -1,6 +1,6 @@ # See pkgs/build-support/setup-hooks/role.bash getHostRole -export NIX_${role_pre}LDFLAGS+=" -lnbcompat" -export NIX_${role_pre}CFLAGS_COMPILE+=" -DHAVE_NBTOOL_CONFIG_H" -export NIX_${role_pre}CFLAGS_COMPILE+=" -include nbtool_config.h" +export NIX_LDFLAGS${role_post}+=" -lnbcompat" +export NIX_CFLAGS_COMPILE${role_post}+=" -DHAVE_NBTOOL_CONFIG_H" +export NIX_CFLAGS_COMPILE${role_post}+=" -include nbtool_config.h" diff --git a/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh b/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh index 5cf8c753aec3..b6cb5aaca05b 100644 --- a/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh +++ b/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh @@ -1,4 +1,4 @@ # See pkgs/build-support/setup-hooks/role.bash getHostRole -export NIX_${role_pre}LDFLAGS+=" -lfts" +export NIX_LDFLAGS${role_post}+=" -lfts" diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 52b280c30261..59656f54db28 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -29,8 +29,8 @@ let "cc-version:=9999" "cc-fullversion:=999999" # `$(..)` expanded by make alone - "HOSTCC:=$(BUILD_CC)" - "HOSTCXX:=$(BUILD_CXX)" + "HOSTCC:=$(CC_FOR_BUILD)" + "HOSTCXX:=$(CXX_FOR_BUILD)" ]; # Skip clean on darwin, case-sensitivity issues. diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 77d70e84258d..e17b41eab320 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -98,7 +98,7 @@ let # TODO: This really wants to be in stdenv/darwin but we don't have hostPlatform # there (yet?) so it goes here until then. preHook = preHook+ lib.optionalString buildPlatform.isDarwin '' - export NIX_BUILD_DONT_SET_RPATH=1 + export NIX_DONT_SET_RPATH_FOR_BUILD=1 '' + lib.optionalString (hostPlatform.isDarwin || (hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.elf && hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.macho)) '' export NIX_DONT_SET_RPATH=1 export NIX_NO_SELF_RPATH=1 @@ -107,7 +107,7 @@ let # think the best solution would just be to fixup linux RPATHs so we don't # need to set `-rpath` anywhere. # + lib.optionalString targetPlatform.isDarwin '' - # export NIX_TARGET_DONT_SET_RPATH=1 + # export NIX_DONT_SET_RPATH_FOR_TARGET=1 # '' ; From ee5975319b149007a0100f15cc3356d352fb5b1c Mon Sep 17 00:00:00 2001 From: xbreak Date: Mon, 11 May 2020 18:34:11 +0000 Subject: [PATCH 0315/3452] qt5: Add missing include path to pkg-config files This is achieved by patching qtbase `qmake/generators/makefile.cpp` to unconditionally add the missing `-I${includedir}`. The include path is otherwise conditioned on whether it is already available or not. Since there is no unified set of system include paths in nix this cause problems as reported in #52457. --- pkgs/development/libraries/qt-5/5.12/default.nix | 5 +++++ .../qtbase.patch.d/0014-qtbase-pkg-config.patch | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0014-qtbase-pkg-config.patch diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 78d711e969b5..3123e83960e8 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -67,6 +67,11 @@ let ./qtbase.patch.d/0010-qtbase-qtpluginpath.patch ./qtbase.patch.d/0011-qtbase-assert.patch ./qtbase.patch.d/0012-fix-header_module.patch + + # Ensure -I${includedir} is added to Cflags in pkg-config files. + # See https://github.com/NixOS/nixpkgs/issues/52457 + ./qtbase.patch.d/0014-qtbase-pkg-config.patch + # https://bugreports.qt.io/browse/QTBUG-81715 # remove after updating to qt > 5.12.7 (fetchpatch { diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0014-qtbase-pkg-config.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0014-qtbase-pkg-config.patch new file mode 100644 index 000000000000..90caaea1cf4d --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0014-qtbase-pkg-config.patch @@ -0,0 +1,14 @@ +diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp +--- a/qmake/generators/makefile.cpp ++++ b/qmake/generators/makefile.cpp +@@ -3390,8 +3390,7 @@ MakefileGenerator::writePkgConfigFile() + << varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ") + // << varGlue("DEFINES","-D"," -D"," ") + ; +- if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir)) +- t << "-I${includedir}"; ++ t << "-I${includedir}"; + if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle") + && libDir != QLatin1String("/Library/Frameworks")) { + t << " -F${libdir}"; + From f8a8243bd3127ba9c6090d57f43d979389c1653c Mon Sep 17 00:00:00 2001 From: Greg Price Date: Sun, 29 Mar 2020 14:05:04 -0700 Subject: [PATCH 0316/3452] cpython: Use --enable-optimizations, for a 16% speedup. Without this flag, the configure script prints a warning at the end, like this (reformatted): If you want a release build with all stable optimizations active (PGO, etc), please run ./configure --enable-optimizations We're doing a build to distribute to people for day-to-day use, doing things other than developing the Python interpreter. So that's certainly a release build -- we're the target audience for this recommendation. --- And, trying it out, upstream isn't kidding! I ran the standard benchmark suite that the CPython developers use for performance work, "pyperformance". Following its usage instructions: https://pyperformance.readthedocs.io/usage.html I ran the whole suite, like so: $ nix-shell -p ./result."$variant" --run ' cd $(mktemp -d); python -m venv venv; . venv/bin/activate pip install pyperformance pyperformance run -o ~/tmp/result.'"$variant"'.json ' and then examined the results with commands like: $ python -m pyperf compare_to --table -G \ ~/tmp/result.{$before,$after}.json Across all the benchmarks in the suite, the median speedup was 16%. (Meaning 1.16x faster; 14% less time). The middle half of them ranged from a 13% to a 22% speedup. Each of the 60 benchmarks in the suite got faster, by speedups ranging from 3% to 53%. --- One reason this isn't just the default to begin with is that, until recently, it made the build a lot slower. What it does is turn on profile-guided optimization, which means first build for profiling, then run some task to get a profile, then build again using the profile. And, short of further customization, the task it would use would be nearly the full test suite, which includes a lot of expensive and slow tests, and can easily take half an hour to run. Happily, in 2019 an upstream developer did the work to carefully select a more appropriate set of tests to use for the profile: https://github.com/python/cpython/commit/4e16a4a31 https://bugs.python.org/issue36044 This suite takes just 2 minutes to run. And the resulting final build is actually slightly faster than with the much longer suite, at least as measured by those standard "pyperformance" benchmarks. That work went into the 3.8 release, but the same list works great if used on older releases too. So, start passing that --enable-optimizations flag; and backport that good-for-PGO set of tests, so that we use it on all releases. --- .../python/cpython/2.7/default.nix | 4 ++++ .../python/cpython/2.7/profile-task.patch | 21 +++++++++++++++++++ .../python/cpython/3.5/profile-task.patch | 21 +++++++++++++++++++ .../python/cpython/3.6/profile-task.patch | 21 +++++++++++++++++++ .../interpreters/python/cpython/default.nix | 9 ++++++++ 5 files changed, 76 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/2.7/profile-task.patch create mode 100644 pkgs/development/interpreters/python/cpython/3.5/profile-task.patch create mode 100644 pkgs/development/interpreters/python/cpython/3.6/profile-task.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 77b37c5f5c39..0df49213f5a3 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -85,6 +85,9 @@ let # backported in debian since 2013. # https://bugs.python.org/issue13146 ./atomic_pyc.patch + + # Backport from CPython 3.8 of a good list of tests to run for PGO. + ./profile-task.patch ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals stdenv.isLinux [ @@ -135,6 +138,7 @@ let ''; configureFlags = [ + "--enable-optimizations" "--enable-shared" "--with-threads" "--enable-unicode=ucs${toString ucsEncoding}" diff --git a/pkgs/development/interpreters/python/cpython/2.7/profile-task.patch b/pkgs/development/interpreters/python/cpython/2.7/profile-task.patch new file mode 100644 index 000000000000..9c085657ac9d --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/2.7/profile-task.patch @@ -0,0 +1,21 @@ +Backport from CPython 3.8 of a good list of tests to run for PGO. + +Upstream commit: + https://github.com/python/cpython/commit/4e16a4a31 + +Upstream discussion: + https://bugs.python.org/issue36044 + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 00fdd21ce..713dc1e53 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -259,7 +259,7 @@ TCLTK_LIBS= + # The task to run while instrumented when building the profile-opt target. + # We exclude unittests with -x that take a rediculious amount of time to + # run in the instrumented training build or do not provide much value. +-PROFILE_TASK=-m test.regrtest --pgo -x test_asyncore test_gdb test_multiprocessing test_subprocess ++PROFILE_TASK=-m test.regrtest --pgo test_array test_base64 test_binascii test_binop test_bisect test_bytes test_bz2 test_cmath test_codecs test_collections test_complex test_dataclasses test_datetime test_decimal test_difflib test_embed test_float test_fstring test_functools test_generators test_hashlib test_heapq test_int test_itertools test_json test_long test_lzma test_math test_memoryview test_operator test_ordered_dict test_pickle test_pprint test_re test_set test_sqlite test_statistics test_struct test_tabnanny test_time test_unicode test_xml_etree test_xml_etree_c + + # report files for gcov / lcov coverage report + COVERAGE_INFO= $(abs_builddir)/coverage.info diff --git a/pkgs/development/interpreters/python/cpython/3.5/profile-task.patch b/pkgs/development/interpreters/python/cpython/3.5/profile-task.patch new file mode 100644 index 000000000000..39d5587379ca --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.5/profile-task.patch @@ -0,0 +1,21 @@ +Backport from CPython 3.8 of a good list of tests to run for PGO. + +Upstream commit: + https://github.com/python/cpython/commit/4e16a4a31 + +Upstream discussion: + https://bugs.python.org/issue36044 + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 00fdd21ce..713dc1e53 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -259,7 +259,7 @@ TCLTK_LIBS= + # The task to run while instrumented when building the profile-opt target. + # We exclude unittests with -x that take a rediculious amount of time to + # run in the instrumented training build or do not provide much value. +-PROFILE_TASK=-m test.regrtest --pgo -x test_asyncore test_gdb test_multiprocessing_fork test_multiprocessing_forkserver test_multiprocessing_main_handling test_multiprocessing_spawn test_subprocess ++PROFILE_TASK=-m test.regrtest --pgo test_array test_base64 test_binascii test_binop test_bisect test_bytes test_bz2 test_cmath test_codecs test_collections test_complex test_dataclasses test_datetime test_decimal test_difflib test_embed test_float test_fstring test_functools test_generators test_hashlib test_heapq test_int test_itertools test_json test_long test_lzma test_math test_memoryview test_operator test_ordered_dict test_pickle test_pprint test_re test_set test_sqlite test_statistics test_struct test_tabnanny test_time test_unicode test_xml_etree test_xml_etree_c + + # report files for gcov / lcov coverage report + COVERAGE_INFO= $(abs_builddir)/coverage.info diff --git a/pkgs/development/interpreters/python/cpython/3.6/profile-task.patch b/pkgs/development/interpreters/python/cpython/3.6/profile-task.patch new file mode 100644 index 000000000000..df55da3a4132 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.6/profile-task.patch @@ -0,0 +1,21 @@ +Backport from CPython 3.8 of a good list of tests to run for PGO. + +Upstream commit: + https://github.com/python/cpython/commit/4e16a4a31 + +Upstream discussion: + https://bugs.python.org/issue36044 + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 00fdd21ce..713dc1e53 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -259,7 +259,7 @@ TCLTK_LIBS= + # The task to run while instrumented when building the profile-opt target. + # We exclude unittests with -x that take a rediculious amount of time to + # run in the instrumented training build or do not provide much value. +-PROFILE_TASK=-m test.regrtest --pgo ++PROFILE_TASK=-m test.regrtest --pgo test_array test_base64 test_binascii test_binop test_bisect test_bytes test_bz2 test_cmath test_codecs test_collections test_complex test_dataclasses test_datetime test_decimal test_difflib test_embed test_float test_fstring test_functools test_generators test_hashlib test_heapq test_int test_itertools test_json test_long test_lzma test_math test_memoryview test_operator test_ordered_dict test_pickle test_pprint test_re test_set test_sqlite test_statistics test_struct test_tabnanny test_time test_unicode test_xml_etree test_xml_etree_c + + # report files for gcov / lcov coverage report + COVERAGE_INFO= $(abs_builddir)/coverage.info diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 1df70fb99ccb..7dbe6216e728 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -104,6 +104,14 @@ in with passthru; stdenv.mkDerivation { ] ++ optionals (isPy37 || isPy38) [ # Fix darwin build https://bugs.python.org/issue34027 ./3.7/darwin-libutil.patch + ] ++ optionals (pythonOlder "3.8") [ + # Backport from CPython 3.8 of a good list of tests to run for PGO. + ( + if isPy36 || isPy37 then + ./3.6/profile-task.patch + else + ./3.5/profile-task.patch + ) ] ++ optionals (isPy3k && hasDistutilsCxxPatch) [ # Fix for http://bugs.python.org/issue1222585 # Upstream distutils is calling C compiler to compile C++ code, which @@ -135,6 +143,7 @@ in with passthru; stdenv.mkDerivation { PYTHONHASHSEED=0; configureFlags = [ + "--enable-optimizations" "--enable-shared" "--without-ensurepip" "--with-system-expat" From b6beb43dd7c20e34d3d9e2078b0fa2945009c9b9 Mon Sep 17 00:00:00 2001 From: Gaelan Steele Date: Tue, 12 May 2020 11:52:29 -0700 Subject: [PATCH 0317/3452] kexectools: always pass host and target to configure Fixes #56290. --- pkgs/os-specific/linux/kexectools/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index b1abf50f5f1f..a70cb2e087fc 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" "pic" "relro" "pie" ]; + # Prevent kexec-tools from using uname to detect target, which is wrong in + # cases like compiling for aarch32 on aarch64 + configurePlatforms = [ "build" "host" ]; configureFlags = [ "BUILD_CC=${buildPackages.stdenv.cc.targetPrefix}cc" ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ zlib ]; From 34aff7f6973743a5e6e672c01016c4280d471453 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 7 Mar 2020 00:39:53 -0500 Subject: [PATCH 0318/3452] treewide: strip more things in cross Stripping reduces closure sizes. --- pkgs/development/libraries/libpcap/default.nix | 6 ++++-- pkgs/development/libraries/readline/6.3.nix | 4 ---- pkgs/development/libraries/readline/7.0.nix | 4 ---- pkgs/development/libraries/readline/8.0.nix | 4 ---- pkgs/development/tools/misc/libtool/libtool2.nix | 4 ---- 5 files changed, 4 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 123c2f2f0676..078b68aab11e 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -22,12 +22,14 @@ stdenv.mkDerivation rec { "ac_cv_linux_vers=2" ]; - dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace " -arch i386" "" ''; + postInstall = '' + rm -f $out/lib/libpcap.a + ''; + meta = with stdenv.lib; { homepage = "https://www.tcpdump.org"; description = "Packet Capture Library"; diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 3f3503bb2ba6..2b0cf978d43e 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -32,10 +32,6 @@ stdenv.mkDerivation { in import ./readline-6.3-patches.nix patch); - # Don't run the native `strip' when cross-compiling. - dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null; - meta = with stdenv.lib; { description = "Library for interactive line editing"; diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix index c4bcda0110a4..248ef55cce88 100644 --- a/pkgs/development/libraries/readline/7.0.nix +++ b/pkgs/development/libraries/readline/7.0.nix @@ -32,10 +32,6 @@ stdenv.mkDerivation rec { ] ++ upstreamPatches; - # Don't run the native `strip' when cross-compiling. - dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null; - meta = with stdenv.lib; { description = "Library for interactive line editing"; diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix index 23075abd6f2e..6e1182647c29 100644 --- a/pkgs/development/libraries/readline/8.0.nix +++ b/pkgs/development/libraries/readline/8.0.nix @@ -32,10 +32,6 @@ stdenv.mkDerivation rec { ] ++ upstreamPatches; - # Don't run the native `strip' when cross-compiling. - dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null; - meta = with stdenv.lib; { description = "Library for interactive line editing"; diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 4bf637c0eba8..fbe49dc68b2a 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -26,10 +26,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Don't run the native `strip' when cross-compiling. This breaks at least - # with `.a' files for MinGW. - dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - meta = with stdenv.lib; { description = "GNU Libtool, a generic library support script"; longDescription = '' From 736462d995435ad14540f8137fddbd467db63a0a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 13 May 2020 01:15:23 +0200 Subject: [PATCH 0319/3452] rustPlatform: make it possible to override the profile for `cargo test` --- pkgs/build-support/rust/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index aa5edc1f5bf7..e79e902bcdad 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -28,6 +28,7 @@ , meta ? {} , target ? null , cargoVendorDir ? null +, checkType ? buildType , ... } @ args: assert cargoVendorDir == null -> cargoSha256 != "unset"; @@ -191,7 +192,7 @@ stdenv.mkDerivation (args // { ''; checkPhase = args.checkPhase or (let - argstr = "${stdenv.lib.optionalString (buildType == "release") "--release"} --target ${rustTarget} --frozen"; + argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${rustTarget} --frozen"; in '' runHook preCheck echo "Running cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" From 6b23cfe6894ab86ddf9b62944f39d616f993ff55 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 13 May 2020 01:28:24 +0200 Subject: [PATCH 0320/3452] rustPlatform: add `buildAndTestSubdir`-argument There are several tarballs (such as the `rust-lang/rust`-source) with a `Cargo.toml` at root and several sub-packages (with their own Cargo.toml) without using workspaces[1]. In such a case it's needed to move into a subdir to only build the specified sub-package (e.g. `rustfmt` or `rsl`), however the artifacts are at `/target` in the root-dir of the build environment. This breaks the build since `buildRustPackage` searches for executables in `target` (which is at the build-env's root) at the end of the `buildPhase`. With the optional `buildAndTestSubdir`-argument, the builder moves into the specified subdir using `pushd`/`popd` during `buildPhase` and `checkPhase`. Also moved the logic to find executables and libs to the end of the `buildPhase` from a custom `postBuild`-hook to fix packages with custom `build`/`install`-procedures such as `uutils-coreutils`. [1] https://doc.rust-lang.org/book/ch14-03-cargo-workspaces.html --- pkgs/build-support/rust/default.nix | 12 ++++++++++-- pkgs/development/compilers/rust/cargo.nix | 3 +-- pkgs/development/compilers/rust/clippy.nix | 3 +-- pkgs/development/compilers/rust/rls/default.nix | 5 ++--- pkgs/development/compilers/rust/rustfmt.nix | 9 +-------- .../development/tools/rust/rust-analyzer/generic.nix | 4 +--- 6 files changed, 16 insertions(+), 20 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index e79e902bcdad..d3e13b913f38 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -29,6 +29,12 @@ , target ? null , cargoVendorDir ? null , checkType ? buildType + +# Needed to `pushd`/`popd` into a subdir of a tarball if this subdir +# contains a Cargo.toml, but isn't part of a workspace (which is e.g. the +# case for `rustfmt`/etc from the `rust-sources). +# Otherwise, everything from the tarball would've been built/tested. +, buildAndTestSubdir ? null , ... } @ args: assert cargoVendorDir == null -> cargoSha256 != "unset"; @@ -162,6 +168,7 @@ stdenv.mkDerivation (args // { ''; buildPhase = with builtins; args.buildPhase or '' + ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} runHook preBuild ( @@ -178,9 +185,8 @@ stdenv.mkDerivation (args // { ) runHook postBuild - ''; - postBuild = args.postBuild or "" + '' + ${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"} # This needs to be done after postBuild: packages like `cargo` do a pushd/popd in # the pre/postBuild-hooks that need to be taken into account before gathering @@ -194,10 +200,12 @@ stdenv.mkDerivation (args // { checkPhase = args.checkPhase or (let argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${rustTarget} --frozen"; in '' + ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} runHook preCheck echo "Running cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} runHook postCheck + ${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"} ''); doCheck = args.doCheck or true; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 65614b9480e7..dfea7f6c8ef6 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -9,8 +9,7 @@ rustPlatform.buildRustPackage { # the rust source tarball already has all the dependencies vendored, no need to fetch them again cargoVendorDir = "vendor"; - preBuild = "pushd src/tools/cargo"; - postBuild = "popd"; + buildAndTestSubdir = "src/tools/cargo"; passthru.rustc = rustc; diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 4857b587847e..0546ad9bac1a 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -5,8 +5,7 @@ rustPlatform.buildRustPackage { # the rust source tarball already has all the dependencies vendored, no need to fetch them again cargoVendorDir = "vendor"; - preBuild = "pushd src/tools/clippy"; - postBuild = "popd"; + buildAndTestSubdir = "src/tools/clippy"; # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index 4cf507fbf5c7..a050be7c2bfd 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -10,8 +10,9 @@ rustPlatform.buildRustPackage { dontUpdateAutotoolsGnuConfigScripts = true; cargoVendorDir = "vendor"; + buildAndTestSubdir = "src/tools/rls"; + preBuild = '' - pushd src/tools/rls # client tests are flaky rm tests/client.rs ''; @@ -28,8 +29,6 @@ rustPlatform.buildRustPackage { doCheck = true; - preInstall = "popd"; - doInstallCheck = true; installCheckPhase = '' $out/bin/rls --version diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index f8ed0bce2e0d..66a18f40ad42 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -6,8 +6,7 @@ rustPlatform.buildRustPackage rec { # the rust source tarball already has all the dependencies vendored, no need to fetch them again cargoVendorDir = "vendor"; - preBuild = "pushd src/tools/rustfmt"; - preInstall = "popd"; + buildAndTestSubdir = "src/tools/rustfmt"; # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; @@ -17,12 +16,6 @@ rustPlatform.buildRustPackage rec { # As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler RUSTC_BOOTSTRAP = 1; - # we run tests in debug mode so tests look for a debug build of - # rustfmt. Anyway this adds nearly no compilation time. - preCheck = '' - cargo build - ''; - meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; homepage = "https://github.com/rust-lang-nursery/rustfmt"; diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix index de755ec17ff5..ae6ad80cdd9a 100644 --- a/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -15,9 +15,7 @@ rustPlatform.buildRustPackage { inherit rev sha256; }; - preBuild = "pushd crates/rust-analyzer"; - # Do not checking other crates in checkPhase. - preInstall = "popd"; + buildAndTestSubdir = "crates/rust-analyzer"; cargoBuildFlags = lib.optional useJemalloc "--features=jemalloc"; From 0d7f889607e97c73a3b73ff79311c4fd8cc72aab Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 13 May 2020 01:38:15 +0200 Subject: [PATCH 0321/3452] cargo-deb: fix build --- pkgs/tools/package-management/cargo-deb/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix index c6e8b4803ccf..96ef0eef8c5a 100644 --- a/pkgs/tools/package-management/cargo-deb/default.nix +++ b/pkgs/tools/package-management/cargo-deb/default.nix @@ -2,7 +2,9 @@ , lib , fetchFromGitHub , rustPlatform -, Security }: +, rust +, Security +}: rustPlatform.buildRustPackage rec { pname = "cargo-deb"; @@ -19,6 +21,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1vqnnqn6rzkdi239bh3lk7gaxr7w6v3c4ws4ya1ah04g6v9hkzlw"; + checkType = "debug"; + + preCheck = '' + substituteInPlace tests/command.rs \ + --replace 'target/debug' "target/${rust.toRustTarget stdenv.buildPlatform}/debug" + ''; + meta = with lib; { description = "Generate Debian packages from information in Cargo.toml"; homepage = "https://github.com/mmstick/cargo-deb"; From c10f0a32d26832a419e294765244eb05fda650a9 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 13 May 2020 04:39:18 +0000 Subject: [PATCH 0322/3452] Revert "Revert "libbfd: fix build"" This reverts commit 237ef3095c7604a36ab231d282fcfce02613130d. Looks like we're trying to bump binutils again? --- .../build-components-separately.patch | 38 ++++++------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/build-components-separately.patch b/pkgs/development/tools/misc/binutils/build-components-separately.patch index d3cd0d2131cc..38fa4934a28a 100644 --- a/pkgs/development/tools/misc/binutils/build-components-separately.patch +++ b/pkgs/development/tools/misc/binutils/build-components-separately.patch @@ -1,19 +1,8 @@ -From bc09a9236f67e710d545ac11bcdac7b55dbcc1a0 Mon Sep 17 00:00:00 2001 -From: John Ericson -Date: Thu, 12 Oct 2017 11:16:57 -0400 -Subject: [PATCH] Build components separately - ---- - bfd/configure.ac | 18 +++--------------- - opcodes/Makefile.am | 17 +++++++++++++---- - opcodes/configure.ac | 45 ++++++--------------------------------------- - 3 files changed, 22 insertions(+), 58 deletions(-) - diff --git a/bfd/configure.ac b/bfd/configure.ac -index 9a183c1628..8728837384 100644 +index c5bfbd5d..45ad4c26 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac -@@ -241,31 +241,19 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, +@@ -278,31 +278,19 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, LT_LIB_M @@ -33,26 +22,26 @@ index 9a183c1628..8728837384 100644 - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" - fi - - # More hacks to build DLLs on Windows. case "${host}" in + # More hacks to build DLLs on Windows. *-*-cygwin*) SHARED_LDFLAGS="-no-undefined" - SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32" + SHARED_LIBADD="-liberty -lintl -lcygwin -lkernel32" ;; - # Hack to build or1k-src on OSX - or1k*-*-darwin*) + # Use built-in libintl on macOS, since it is not provided by libc. + *-*-darwin*) - SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl" + SHARED_LIBADD="-liberty -lintl" ;; esac diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am -index 925e7ff651..47b395c195 100644 +index 4f06074a..6836c589 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am -@@ -52,7 +52,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) +@@ -51,7 +51,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) endif # This is where bfd.h lives. @@ -61,7 +50,7 @@ index 925e7ff651..47b395c195 100644 BUILD_LIBS = @BUILD_LIBS@ BUILD_LIB_DEPS = @BUILD_LIB_DEPS@ -@@ -303,7 +303,7 @@ OFILES = @BFD_MACHINES@ +@@ -301,7 +301,7 @@ OFILES = @BFD_MACHINES@ # development.sh is used to determine -Werror default. CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh @@ -70,7 +59,7 @@ index 925e7ff651..47b395c195 100644 disassemble.lo: disassemble.c if am__fastdepCC -@@ -324,12 +324,21 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c +@@ -322,12 +322,21 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c # old version of libbfd, or to pick up libbfd for the wrong architecture # if host != build. So for building with shared libraries we use a # hardcoded path to libbfd.so instead of relying on the entries in libbfd.la. @@ -95,10 +84,10 @@ index 925e7ff651..47b395c195 100644 # the build directory so that we don't have to convert all the # programs that use libopcodes.a simultaneously. This is a hack which diff --git a/opcodes/configure.ac b/opcodes/configure.ac -index b9f5eb8a4f..ef2c2152b7 100644 +index 00be9c88..6e589ae4 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac -@@ -89,6 +89,7 @@ AC_PROG_INSTALL +@@ -86,6 +86,7 @@ AC_PROG_INSTALL AC_CHECK_HEADERS(string.h strings.h stdlib.h limits.h) ACX_HEADER_STRING @@ -106,7 +95,7 @@ index b9f5eb8a4f..ef2c2152b7 100644 AC_CHECK_DECLS([basename, stpcpy]) -@@ -134,61 +135,27 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, +@@ -137,61 +138,27 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, LT_LIB_M @@ -173,6 +162,3 @@ index b9f5eb8a4f..ef2c2152b7 100644 ;; esac --- -2.14.2 - From 089c6660b0fb3cde60cae7b2e15b6d8c2b576e4c Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 13 May 2020 20:17:27 +0100 Subject: [PATCH 0323/3452] freeimage: mark as broken on aarch64 --- pkgs/development/libraries/freeimage/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 878299f725a6..c31f858850c9 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchurl, unzip, darwin }: +# TODO: consider unvendoring various dependencies (libpng, libjpeg, +# libwebp, zlib, ...) + stdenv.mkDerivation { name = "freeimage-3.18.0"; @@ -50,5 +53,7 @@ stdenv.mkDerivation { license = "GPL"; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; unix; + # see https://github.com/NixOS/nixpkgs/issues/77653 + broken = stdenv.isAarch64; }; } From e49f3a47604b2c18ac2e0aa9afe7bf786d61e34b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 13 May 2020 22:19:16 +0200 Subject: [PATCH 0324/3452] nym: fix tests A lot of tests are using `debug_assert!` which isn't available in release-mode. --- pkgs/applications/networking/nym/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix index 6bb86c016ba3..1ff449eab0cc 100644 --- a/pkgs/applications/networking/nym/default.nix +++ b/pkgs/applications/networking/nym/default.nix @@ -24,6 +24,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; + checkType = "debug"; + /* Nym's test presence::converting_mixnode_presence_into_topology_mixnode::it_returns_resolved_ip_on_resolvable_hostname tries to resolve nymtech.net. Since there is no external DNS resolution available in the build sandbox, we point cargo and its children (that's what we remove the 'unsetenv' call for) to a hosts file in which we statically resolve nymtech.net. From 068beb2c07788ea5fd8a47d0ef9d284b47df7dfc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 13 May 2020 22:19:47 +0200 Subject: [PATCH 0325/3452] gnvim: fix build When running the default builder for Rust, the artifacts would be stored in `target//`, however the `install`-target expects the default structure (`target/`) of `cargo`-builds. When using the Makefile for building as well, the expected structure is created instead. --- pkgs/applications/editors/neovim/gnvim/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix index e9f42d2b9b5e..3693ff322338 100644 --- a/pkgs/applications/editors/neovim/gnvim/default.nix +++ b/pkgs/applications/editors/neovim/gnvim/default.nix @@ -33,6 +33,10 @@ rustPlatform.buildRustPackage rec { EOF ''; + buildPhase = '' + make build + ''; + installPhase = '' make install PREFIX="${placeholder "out"}" ''; From 913dcddb6852e53e64cd6f6e7f998d6b6f57841e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 13 May 2020 22:22:51 +0200 Subject: [PATCH 0326/3452] ripasso-cursive: fix tests Needed since we store artifacts in `target//`. --- pkgs/tools/security/ripasso/cursive.nix | 2 ++ pkgs/tools/security/ripasso/fix-tests.patch | 35 +++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/security/ripasso/fix-tests.patch diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index c8a55d3f397f..29229bff0028 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -12,6 +12,8 @@ buildRustPackage rec { sha256 = "164da20j727p8l7hh37j2r8pai9sj402nhswvg0nrlgj53nr6083"; }; + patches = [ ./fix-tests.patch ]; + cargoSha256 = "1wpn67v0xmxhn1dgzhh1pwz1yc3cizmfxhpb7qv9b27ynx4486ji"; cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ]; diff --git a/pkgs/tools/security/ripasso/fix-tests.patch b/pkgs/tools/security/ripasso/fix-tests.patch new file mode 100644 index 000000000000..433ff933b1f7 --- /dev/null +++ b/pkgs/tools/security/ripasso/fix-tests.patch @@ -0,0 +1,35 @@ +diff --git a/src/pass/test.rs b/src/pass/test.rs +index c980a2f..2e6c8cc 100644 +--- a/src/pass/test.rs ++++ b/src/pass/test.rs +@@ -56,6 +56,7 @@ fn populate_password_list_small_repo() { + base_path.pop(); + base_path.pop(); + base_path.pop(); ++ base_path.pop(); + base_path.push("testres"); + + let mut password_dir: PathBuf = base_path.clone(); +@@ -84,6 +85,7 @@ fn populate_password_list_repo_with_deleted_files() { + base_path.pop(); + base_path.pop(); + base_path.pop(); ++ base_path.pop(); + base_path.push("testres"); + + let mut password_dir: PathBuf = base_path.clone(); +@@ -112,6 +114,7 @@ fn populate_password_list_directory_without_git() { + base_path.pop(); + base_path.pop(); + base_path.pop(); ++ base_path.pop(); + base_path.push("testres"); + + let mut password_dir: PathBuf = base_path.clone(); +@@ -149,4 +152,4 @@ fn parse_signing_keys_empty() { + let result = PasswordStore::parse_signing_keys(&None).unwrap(); + + assert_eq!(result.len(), 0); +-} +\ No newline at end of file ++} From 58d0719bddfdd24afa4031aef50085fc26818ffe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 11 May 2020 00:06:26 +0000 Subject: [PATCH 0327/3452] wavpack: 5.2.0 -> 5.3.0 --- pkgs/development/libraries/wavpack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 329de97d39e1..78794430860c 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "wavpack"; - version = "5.2.0"; + version = "5.3.0"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.wavpack.com/${pname}-${version}.tar.bz2"; - sha256 = "062f97bvm466ygvix3z0kbgffvvrc5cg2ak568jaq8r56v28q8rw"; + sha256 = "00baiag7rlkzc6545dqdp4p5sr7xc3n97n7qdkgx58c544x0pw5n"; }; meta = with stdenv.lib; { From ee2922a4b4733bf74cdc5bac1de98a255d553447 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 10 May 2020 12:48:24 +0000 Subject: [PATCH 0328/3452] sysstat: 12.3.1 -> 12.3.2 --- pkgs/os-specific/linux/sysstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index a27f65852023..258da07c40b6 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { - name = "sysstat-12.3.1"; + name = "sysstat-12.3.2"; src = fetchurl { url = "http://pagesperso-orange.fr/sebastien.godard/${name}.tar.xz"; - sha256 = "1hf1sy7akribmgavadqccxpy49yv0zfb3m81d2bj6jf8pyzwcrbq"; + sha256 = "0gaas16q2f7qmrv4sbqk2l2mrc7yr64s33bzw4094p59fkylm7k4"; }; buildInputs = [ gettext ]; From a1e13f6140a568b73c1c36bb9ef79d7876ccaae3 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Wed, 13 May 2020 14:34:10 -0400 Subject: [PATCH 0329/3452] go: stop setting GOPATH The compiler does not need it anymore, has not needed it for many years iirc. This just goes in and pollutes the environment overriding the users GOPATH and causing grief. Go even warns about it itself, without vs with this commit: ```sh ~> go env GOPATH /home/manny/go ~> nix-shell -p go ~> go env GOPATH warning: GOPATH set to GOROOT (/nix/store/gvw1mfpdrk7i82884yhxf9lf5j3c12zm-go-1.14.1/share/go) has no effect /nix/store/gvw1mfpdrk7i82884yhxf9lf5j3c12zm-go-1.14.1/share/go ~> exit ~> nix-shell -I nixpkgs=cloned/NixOS/nixpkgs -p go ~> go env GOPATH /home/manny/go ~> exit ``` --- pkgs/development/compilers/go/1.14.nix | 2 -- pkgs/development/compilers/go/1.4.nix | 2 -- pkgs/development/compilers/go/setup-hook.sh | 5 ----- 3 files changed, 9 deletions(-) delete mode 100644 pkgs/development/compilers/go/setup-hook.sh diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 9ee5b6fa6242..4d83e12b3b2a 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -229,8 +229,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - setupHook = ./setup-hook.sh; - disallowedReferences = [ goBootstrap ]; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index fc3fb0ad0e5a..af125d60ed0a 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -151,8 +151,6 @@ stdenv.mkDerivation rec { ./all.bash ''; - setupHook = ./setup-hook.sh; - meta = with stdenv.lib; { branch = "1.4"; homepage = "http://golang.org/"; diff --git a/pkgs/development/compilers/go/setup-hook.sh b/pkgs/development/compilers/go/setup-hook.sh deleted file mode 100644 index 7dce15eeb102..000000000000 --- a/pkgs/development/compilers/go/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addToGoPath() { - addToSearchPath GOPATH $1/share/go -} - -addEnvHooks "$targetOffset" addToGoPath From 52c04b0347d60064f11ae8430e5a6c57a30ec831 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Wed, 13 May 2020 19:52:36 -0700 Subject: [PATCH 0330/3452] cpython: Use autoreconfHook to rebuild configure script. In particular this will let us use patches that apply to configure.ac. --- .../development/interpreters/python/cpython/2.7/default.nix | 6 ++++-- pkgs/development/interpreters/python/cpython/default.nix | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 0df49213f5a3..e9d6c97cfd45 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -12,6 +12,7 @@ , zlib , self , configd, coreutils +, autoreconfHook , python-setup-hook # Some proprietary libs assume UCS2 unicode, especially on darwin :( , ucsEncoding ? 4 @@ -186,8 +187,9 @@ let ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] ++ optional (stdenv.isDarwin && configd != null) configd; nativeBuildInputs = - optionals (stdenv.hostPlatform != stdenv.buildPlatform) - [ buildPackages.stdenv.cc buildPackages.python ]; + [ autoreconfHook ] + ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) + [ buildPackages.stdenv.cc buildPackages.python ]; mkPaths = paths: { C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 7dbe6216e728..b860e357b04b 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -12,6 +12,7 @@ , zlib , self , configd +, autoreconfHook , python-setup-hook , nukeReferences # For the Python package set @@ -51,6 +52,7 @@ let version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; nativeBuildInputs = [ + autoreconfHook nukeReferences ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc From 480c8d199166b2f8cd20e6e245d8a019329ec466 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Sun, 29 Mar 2020 15:46:12 -0700 Subject: [PATCH 0331/3452] cpython: Optimize dynamic symbol tables, for a 6% speedup. I took a close look at how Debian builds the Python interpreter, because I noticed it ran substantially faster than the one in nixpkgs and I was curious why. One thing that I found made a material difference in performance was this pair of linker flags (passed to the compiler): -Wl,-O1 -Wl,-Bsymbolic-functions In other words, effectively the linker gets passed the flags: -O1 -Bsymbolic-functions Doing the same thing in nixpkgs turns out to make the interpreter run about 6% faster, which is quite a big win for such an easy change. So, let's apply it. --- I had not known there was a `-O1` flag for the *linker*! But indeed there is. These flags are unrelated to "link-time optimization" (LTO), despite the latter's name. LTO means doing classic compiler optimizations on the actual code, at the linking step when it becomes possible to do them with cross-object-file information. These two flags, by contrast, cause the linker to make certain optimizations within the scope of its job as the linker. Documentation is here, though sparse: https://sourceware.org/binutils/docs-2.31/ld/Options.html The meaning of -O1 was explained in more detail in this LWN article: https://lwn.net/Articles/192624/ Apparently it makes the resulting symbol table use a bigger hash table, so the load factor is smaller and lookups are faster. Cool. As for -Bsymbolic-functions, the documentation indicates that it's a way of saving lookups through the symbol table entirely. There can apparently be situations where it changes the behavior of a program, specifically if the program relies on linker tricks to provide customization features: https://bugs.launchpad.net/ubuntu/+source/xfe/+bug/644645 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637184#35 But I'm pretty sure CPython doesn't permit that kind of trick: you don't load a shared object that tries to redefine some symbol found in the interpreter core. The stronger reason I'm confident using -Bsymbolic-functions is safe, though, is empirical. Both Debian and Ubuntu have been shipping a Python built this way since forever -- it was introduced for the Python 2.4 and 2.5 in Ubuntu "hardy", and Debian "lenny", released in 2008 and 2009. In those 12 years they haven't seen a need to drop this flag; and I've been unable to locate any reports of trouble related to it, either on the Web in general or on the Debian bug tracker. (There are reports of a handful of other programs breaking with it, but not Python/CPython.) So that seems like about as thorough testing as one could hope for. --- As for the performance impact: I ran CPython upstream's preferred benchmark suite, "pyperformance", in the same way as described in the previous commit. On top of that commit's change, the results across the 60 benchmarks in the suite are: The median is 6% faster. The middle half (aka interquartile range) is from 4% to 8% faster. Out of 60 benchmarks, 3 come out slower, by 1-4%. At the other end, 5 are at least 10% faster, and one is 17% faster. So, that's quite a material speedup! I don't know how big the effect of these flags is for other software; but certainly CPython tends to do plenty of dynamic linking, as that's how it loads extension modules, which are ubiquitous in the stdlib as well as popular third-party libraries. So perhaps that helps explain why optimizing the dynamic linker has such an impact. --- .../python/cpython/2.7/default.nix | 7 ++++++ .../interpreters/python/cpython/default.nix | 25 +++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index e9d6c97cfd45..ca4fae51269c 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -100,6 +100,13 @@ let # libuuid, slowing down program startup a lot). ./no-ldconfig.patch + # Optimize symbol tables for the sake of dynamic linking. + # Significant for Python because of extension modules. + (fetchpatch { + url = "https://salsa.debian.org/cpython-team/python3/-/raw/27103a32e/debian/patches/link-opt.diff"; + sha256 = "0vp36276ndbrwr7882vg7vjd61c8mv7bqgal6bbh2fimp6zlkdhv"; + }) + ] ++ optionals stdenv.hostPlatform.isCygwin [ ./2.5.2-ctypes-util-find_library.patch ./2.5.2-tkinter-x11.patch diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index b860e357b04b..dc3997481be3 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -97,6 +97,31 @@ in with passthru; stdenv.mkDerivation { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). (./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch") + ] ++ optionals stdenv.isLinux [ + # Optimize symbol tables for the sake of dynamic linking. + # Significant for Python because of extension modules. + ( + if pythonAtLeast "3.8" then + fetchpatch { + url = "https://salsa.debian.org/cpython-team/python3/-/raw/3.8.3rc1-1/debian/patches/link-opt.diff"; + sha256 = "0va85318nahnqgydwjs7723h8gx41inbdawdy6v4hiykzgc8s7vs"; + } + else if isPy37 then + fetchurl { + url = "https://salsa.debian.org/cpython-team/python3/-/raw/3.7.6-1/debian/patches/link-opt.diff"; + sha256 = "1aqvsc0p3sxnfsi8jz7537wl6v95v26ba4nflwvmn5lxlc3y3g13"; + } + else if isPy36 then + fetchpatch { + url = "https://salsa.debian.org/cpython-team/python3/-/raw/3.6.8-1/debian/patches/link-opt.diff"; + sha256 = "1nhdrgla75ily9gk7xx0crxa7ynqzks0djxk36sa3lgg5w8vjvyr"; + } + else + fetchpatch { + url = "https://salsa.debian.org/cpython-team/python3/-/raw/27103a32e/debian/patches/link-opt.diff"; + sha256 = "0vp36276ndbrwr7882vg7vjd61c8mv7bqgal6bbh2fimp6zlkdhv"; + } + ) ] ++ optionals (isPy35 || isPy36) [ # Determinism: Write null timestamps when compiling python files. ./3.5/force_bytecode_determinism.patch From b14d99777815df862a5aaccd4957bf06cecacfb4 Mon Sep 17 00:00:00 2001 From: Gaelan Steele Date: Wed, 13 May 2020 09:22:11 -0700 Subject: [PATCH 0332/3452] nss: fix building for aarch32 on aarch64 There are two ways to build a package for aarch32 on an aarch64 machine: either by cross compiling as normal, or by adding armv6l/armv7l to extraPlatforms and doing a non-cross compile. Previously, NSS failed to build with both methods: when using extraPlatforms, things failed because NSS includes an armv8-specific file (presumably based on the result of uname); when cross compiling, NSS's build system expects to receive an architecture name of arm (not armv6l or whatever), so was failing to include some arch-specific code and failed with a linker error. This commit fixes those things by a) always passing the arch, even when not cross-compiling, and b) special-casing aarch32 to always pass in an arch of arm. --- pkgs/development/libraries/nss/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index d48b5a6ba735..5251c680361a 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -53,7 +53,9 @@ in stdenv.mkDerivation rec { preConfigure = "cd nss"; makeFlags = let - cpu = stdenv.hostPlatform.parsed.cpu.name; + # NSS's build systems expects aarch32 to be called arm; if we pass in armv6l/armv7l, it + # fails with a linker error + cpu = if stdenv.hostPlatform.isAarch32 then "arm" else stdenv.hostPlatform.parsed.cpu.name; in [ "NSPR_INCLUDE_DIR=${nspr.dev}/include" "NSPR_LIB_DIR=${nspr.out}/lib" @@ -64,9 +66,11 @@ in stdenv.mkDerivation rec { "USE_SYSTEM_ZLIB=1" "NSS_USE_SYSTEM_SQLITE=1" "NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc" - ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + # Pass in CPU even if we're not cross compiling, because otherwise it tries to guess with + # uname, which can be wrong if e.g. we're compiling for aarch32 on aarch64 "OS_TEST=${cpu}" "CPU_ARCH=${cpu}" + ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=1" "NSS_DISABLE_GTESTS=1" # don't want to build tests when cross-compiling ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1" From 69b9bdd53a6c5d2559066691349282f8f961cb3e Mon Sep 17 00:00:00 2001 From: Matthew Smith Date: Thu, 14 May 2020 20:33:15 +0100 Subject: [PATCH 0333/3452] 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 8d41f9f281a8317faa45c4270e8d48bf657cc1a0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 15 May 2020 09:54:39 +1000 Subject: [PATCH 0334/3452] go: 1.14.2 -> 1.14.3 https://golang.org/doc/devel/release.html#go1.14.minor --- pkgs/development/compilers/go/1.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 4d83e12b3b2a..9aaf85c598fc 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.2"; + version = "1.14.3"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0z3zxsnhmsxplnwfw1l9gr6jgglwp50sr3p5njknv9i6jzk89plq"; + sha256 = "0mmgf74snprdiajgh99jjliwjl5im71qcgm5qrxpnyfisiw3f0lk"; }; # perl is used for testing go vet From 3ea0c1720086b247d2af54f8b99f142c48aae4a8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 15 May 2020 04:20:00 -0500 Subject: [PATCH 0335/3452] postgresql_9_5: 9.5.21 -> 9.5.22 Release notes: https://www.postgresql.org/docs/9.5/release-9-5-22.html --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 8ba7e9c96cfc..5ad0796ce2bd 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -182,9 +182,9 @@ let in self: { postgresql_9_5 = self.callPackage generic { - version = "9.5.21"; + version = "9.5.22"; psqlSchema = "9.5"; - sha256 = "0b3kzc0431bvp55jns42q9h1119gy075mp4aywnkq93pm17nxdby"; + sha256 = "03v4d4nr9f86y0i1j5jmvfan5w8y4ga1mar59lhcnj3jl5q58ma8"; this = self.postgresql_9_5; inherit self; }; From 68513786143e7698ad5dfab4e18b14b44b090822 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 15 May 2020 04:21:00 -0500 Subject: [PATCH 0336/3452] postgresql_9_6: 9.6.17 -> 9.6.18 Release notes: https://www.postgresql.org/docs/9.6/release-9-6-18.html --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 5ad0796ce2bd..1fa25675cf33 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -190,9 +190,9 @@ in self: { }; postgresql_9_6 = self.callPackage generic { - version = "9.6.17"; + version = "9.6.18"; psqlSchema = "9.6"; - sha256 = "1hm0w6n988n9qn2wylhjq02i5ayzb16rzhgkcv09fpsl68ny7qgn"; + sha256 = "16crr2a1sl97aiacqzd0bk56yl1abq6blc0c6qpx5rl5ny1c4zji"; this = self.postgresql_9_6; inherit self; }; From 35d2d4d223d8993df12b70ffb312ead9f44cbf72 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 15 May 2020 04:22:00 -0500 Subject: [PATCH 0337/3452] postgresql_10: 10.12 -> 10.13 Release notes: https://www.postgresql.org/docs/10/release-10-13.html --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 1fa25675cf33..01e5d7d914b4 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -198,9 +198,9 @@ in self: { }; postgresql_10 = self.callPackage generic { - version = "10.12"; + version = "10.13"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "1rsab4zf4rx7pvvhlwhb04kb95aiad9cwazc4ksbvg2gij47z3rq"; + sha256 = "1qal0yp7a90yzya7hl56gsmw5fvacplrdhpn7h9gnbyr1i2iyw2d"; this = self.postgresql_10; inherit self; }; From 070c330f9b891513d61d2e3b8944bebc80850190 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 15 May 2020 04:23:00 -0500 Subject: [PATCH 0338/3452] postgresql_11: 11.7 -> 11.8 Release notes: https://www.postgresql.org/docs/11/release-11-8.html --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 01e5d7d914b4..869d5ce1b69d 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -206,9 +206,9 @@ in self: { }; postgresql_11 = self.callPackage generic { - version = "11.7"; + version = "11.8"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "04x343i4v0w4jf1v5ial8rwsizs1qhdjfbanbnibdys6i0xfjjij"; + sha256 = "1qksqyayxmnccmbapg3ajsw9pjgqva0inxjhx64rqd6ckhrg9wpa"; this = self.postgresql_11; inherit self; }; From 490cce07a5ed11b0fba13b739a5246bf12991513 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 15 May 2020 04:24:00 -0500 Subject: [PATCH 0339/3452] postgresql_12: 12.2 -> 12.3 Release notes: https://www.postgresql.org/docs/current/release-12-3.html --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 869d5ce1b69d..2b440f78e99d 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -214,9 +214,9 @@ in self: { }; postgresql_12 = self.callPackage generic { - version = "12.2"; + version = "12.3"; psqlSchema = "12"; - sha256 = "1pmmd59pvfs50gsi728bw9f1jl59xghsjdanfimph0659x6cq7dd"; + sha256 = "0hfg3n7rlz96579cj3z1dh2idl15rh3wfvn8jl31jj4h2yk69vcl"; this = self.postgresql_12; inherit self; }; From e7d4b315daf79752a1d6df1754395f68fdb90484 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 15 May 2020 13:37:59 +0100 Subject: [PATCH 0340/3452] pulseaudio: enable soxr (resampler) support --- pkgs/servers/pulseaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index b9fb104d5f6c..e15efd4b47d1 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -3,7 +3,7 @@ , xorg, libcap, alsaLib, glib, dconf , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat -, speexdsp, systemd, webrtc-audio-processing +, soxr, speexdsp, systemd, webrtc-audio-processing , x11Support ? false @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isLinux [ libcap ]; buildInputs = - [ libtool libsndfile speexdsp fftwFloat ] + [ libtool libsndfile soxr speexdsp fftwFloat ] ++ lib.optionals stdenv.isLinux [ glib dbus ] ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ] ++ lib.optionals (!libOnly) ( From c1983f71a275f8d68ab8bbe9c99f5870235434db Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 15 May 2020 16:37:48 +0300 Subject: [PATCH 0341/3452] mariadb-connector-c: 3.1.7 -> 3.1.8 --- pkgs/servers/sql/mariadb/connector-c/3_1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/connector-c/3_1.nix b/pkgs/servers/sql/mariadb/connector-c/3_1.nix index e3fc66045301..fb6835775fbf 100644 --- a/pkgs/servers/sql/mariadb/connector-c/3_1.nix +++ b/pkgs/servers/sql/mariadb/connector-c/3_1.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./. (args // { - version = "3.1.7"; - sha256 = "16pmdms454jbralaw6rpx0rjlf2297p6h3q8wfk0n87kbn7vrxv4"; + version = "3.1.8"; + sha256 = "0yrzhsxmjiwkhchagx8dymzhvxl3k5h40wn9wpicqjvgjb9k8523"; }) From 282cb2f8d6ca4bbd18eacfa5ca8a05481def71fa Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 May 2020 16:54:26 +0200 Subject: [PATCH 0342/3452] =?UTF-8?q?meson:=200.54.1=20=E2=86=92=200.54.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/mesonbuild/meson/compare/0.54.1...0.54.2 --- pkgs/development/tools/build-managers/meson/default.nix | 4 ++-- .../tools/build-managers/meson/more-env-vars.patch | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index a2dc1424d65f..0a61b8d02a99 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -8,11 +8,11 @@ python3Packages.buildPythonApplication rec { pname = "meson"; - version = "0.54.1"; + version = "0.54.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "L3b7RXJ2K+E+5HkpJhAJG0UJr1eIvM6zkf4iK80Cltw="; + sha256 = "p3Fu6uj43/AC5BR2Qliatklv+DnkN2pa7XYfg8H6BFU="; }; postFixup = '' diff --git a/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/pkgs/development/tools/build-managers/meson/more-env-vars.patch index a8f860f03cc7..6326f5ec3cfb 100644 --- a/pkgs/development/tools/build-managers/meson/more-env-vars.patch +++ b/pkgs/development/tools/build-managers/meson/more-env-vars.patch @@ -1,16 +1,13 @@ diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index ac13a710..e0d07c51 100644 +index 17058df6b..7a68b7f15 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -119,9 +119,9 @@ def get_env_var_pair(for_machine: MachineChoice, +@@ -120,7 +120,7 @@ def get_env_var_pair(for_machine: MachineChoice, # compiling we fall back on the unprefixed host version. This # allows native builds to never need to worry about the 'BUILD_*' # ones. - ([var_name + '_FOR_BUILD'] if is_cross else [var_name]), + [var_name + '_FOR_BUILD'] + ([] if is_cross else [var_name]), # Always just the unprefixed host verions -- ([] if is_cross else [var_name]), -+ [var_name], + [var_name] )[for_machine] - for var in candidates: - value = os.environ.get(var) From 1bc7b68b1cac260d80cb33d52c86867a31f3d424 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 May 2020 19:50:13 +0200 Subject: [PATCH 0343/3452] gobject-introspection: clean up the expression MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * format with nixpkgs-fmt * reorder the attributes * use pkg-config instead of the pkgconfig alias * optional → optionals * remove top-level `with lib;` --- .../gobject-introspection/default.nix | 99 ++++++++++++------- 1 file changed, 66 insertions(+), 33 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 0d514c3fd7d8..1a92afc98591 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,31 +1,80 @@ -{ stdenv, fetchurl, glib, flex, bison, meson, ninja, pkgconfig, libffi, python3 -, libintl, cctools, cairo, gnome3, glibcLocales -, substituteAll, nixStoreDir ? builtins.storeDir +{ stdenv +, fetchurl +, glib +, flex +, bison +, meson +, ninja +, pkg-config +, libffi +, python3 +, libintl +, cctools +, cairo +, gnome3 +, glibcLocales +, substituteAll +, nixStoreDir ? builtins.storeDir , x11Support ? true }: + # now that gobject-introspection creates large .gir files (eg gtk3 case) # it may be worth thinking about using multiple derivation outputs # In that case its about 6MB which could be separated -with stdenv.lib; stdenv.mkDerivation rec { pname = "gobject-introspection"; version = "1.64.1"; + # outputs TODO: share/gobject-introspection-1.0/tests is needed during build + # by pygobject3 (and maybe others), but it's only searched in $out + outputs = [ "out" "dev" "man" ]; + outputBin = "dev"; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0"; }; - outputs = [ "out" "dev" "man" ]; - outputBin = "dev"; + patches = [ + (substituteAll { + src = ./test_shlibs.patch; + inherit nixStoreDir; + }) - LC_ALL = "en_US.UTF-8"; # for tests + (substituteAll { + src = ./absolute_shlib_path.patch; + inherit nixStoreDir; + }) + ] ++ stdenv.lib.optionals x11Support [ + # https://github.com/NixOS/nixpkgs/issues/34080 + (substituteAll { + src = ./absolute_gir_path.patch; + cairoLib = "${stdenv.lib.getLib cairo}/lib"; + }) + ]; - nativeBuildInputs = [ meson ninja pkgconfig libintl glibcLocales ]; - buildInputs = [ flex bison python3 setupHook/*move .gir*/ ] - ++ stdenv.lib.optional stdenv.isDarwin cctools; - propagatedBuildInputs = [ libffi glib ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + libintl + glibcLocales + ]; + + buildInputs = [ + flex + bison + python3 + setupHook /*move .gir*/ + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + cctools + ]; + + propagatedBuildInputs = [ + libffi + glib + ]; mesonFlags = [ "--datadir=${placeholder "dev"}/share" @@ -33,28 +82,10 @@ stdenv.mkDerivation rec { "-Dcairo=disabled" ]; - # outputs TODO: share/gobject-introspection-1.0/tests is needed during build - # by pygobject3 (and maybe others), but it's only searched in $out - - setupHook = ./setup-hook.sh; - - patches = [ - (substituteAll { - src = ./test_shlibs.patch; - inherit nixStoreDir; - }) - (substituteAll { - src = ./absolute_shlib_path.patch; - inherit nixStoreDir; - }) - ] ++ stdenv.lib.optional x11Support # https://github.com/NixOS/nixpkgs/issues/34080 - (substituteAll { - src = ./absolute_gir_path.patch; - cairoLib = "${getLib cairo}/lib"; - }); - doCheck = !stdenv.isAarch64; + LC_ALL = "en_US.UTF-8"; # for tests + preBuild = '' # Our gobject-introspection patches make the shared library paths absolute # in the GIR files. When running tests, the library is not yet installed, @@ -68,6 +99,8 @@ stdenv.mkDerivation rec { rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} ''; + setupHook = ./setup-hook.sh; + passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -76,9 +109,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A middleware layer between C libraries and language bindings"; - homepage = "http://live.gnome.org/GObjectIntrospection"; + homepage = "http://live.gnome.org/GObjectIntrospection"; maintainers = with maintainers; [ lovek323 lethalman ]; - platforms = platforms.unix; + platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; longDescription = '' From fbb86b1fa81ae7f29c6775066f6ce089db5ff6d3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 May 2020 19:55:13 +0200 Subject: [PATCH 0344/3452] gobject-introspection: more clean-ups * remove glibcLocales now that glibc contains C.UTF-8 * remove libintl, that should be in by default or something * update homepage * add gnome team to maintainers * remove the temporary libregress closer its creation --- .../libraries/gobject-introspection/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 1a92afc98591..7ff5498e5a95 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -8,11 +8,9 @@ , pkg-config , libffi , python3 -, libintl , cctools , cairo , gnome3 -, glibcLocales , substituteAll , nixStoreDir ? builtins.storeDir , x11Support ? true @@ -58,8 +56,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - libintl - glibcLocales ]; buildInputs = [ @@ -84,9 +80,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isAarch64; - LC_ALL = "en_US.UTF-8"; # for tests - - preBuild = '' + preCheck = '' # Our gobject-introspection patches make the shared library paths absolute # in the GIR files. When running tests, the library is not yet installed, # though, so we need to replace the absolute path with a local one during build. @@ -95,7 +89,7 @@ stdenv.mkDerivation rec { ln -s $PWD/tests/scanner/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} ''; - preInstall = '' + postCheck = '' rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} ''; @@ -109,8 +103,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A middleware layer between C libraries and language bindings"; - homepage = "http://live.gnome.org/GObjectIntrospection"; - maintainers = with maintainers; [ lovek323 lethalman ]; + homepage = "https://gi.readthedocs.io/"; + maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 ]); platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; From e4a009a109f36686adde6fe15e00475072c45abf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 May 2020 21:03:52 +0200 Subject: [PATCH 0345/3452] gobject-introspection: consolidate patches and add comments --- .../absolute_shlib_path.patch | 43 +++++++++++++++++++ .../gobject-introspection/default.nix | 9 ++-- .../gobject-introspection/test_shlibs.patch | 43 ------------------- 3 files changed, 47 insertions(+), 48 deletions(-) delete mode 100644 pkgs/development/libraries/gobject-introspection/test_shlibs.patch diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch index 6e56d3fab411..775c29855301 100644 --- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch +++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch @@ -140,3 +140,46 @@ def extract_libtool(la_file): +--- a/tests/scanner/test_shlibs.py ++++ b/tests/scanner/test_shlibs.py +@@ -7,6 +7,30 @@ from giscanner.shlibs import resolve_from_ldd_output, sanitize_shlib_path + + class TestLddParser(unittest.TestCase): + ++ def test_resolve_from_ldd_output_nix(self): ++ output = '''\ ++ libglib-2.0.so.0 => @nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libglib-2.0.so.0 (0x00007f0ee1b28000) ++ libgobject-2.0.so.0 => @nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libgobject-2.0.so.0 (0x00007f0ee18cf000) ++ libgio-2.0.so.0 => @nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libgio-2.0.so.0 (0x00007f0ee1502000) ++ libxml2.so.2 => @nixStoreDir@/72mxkk74cv266snkjpz1kwl1i2rg8rpc-libxml2-2.9.8/lib/libxml2.so.2 (0x00007f0ee119c000) ++ libsqlite3.so.0 => @nixStoreDir@/ck5ay23hsmlc67pg3m34kzd1k2hhvww0-sqlite-3.24.0/lib/libsqlite3.so.0 (0x00007f0ee0e98000) ++ libpsl.so.5 => @nixStoreDir@/qn3l2gn7m76f318676wflrs2z6d4rrkj-libpsl-0.20.2-list-2017-02-03/lib/libpsl.so.5 (0x00007f0ee0c88000) ++ libc.so.6 => @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib/libc.so.6 (0x00007f0ee08d4000) ++ libpcre.so.1 => @nixStoreDir@/hxbq8lpc53qsf1bc0dfcsm47wmcxzjvh-pcre-8.42/lib/libpcre.so.1 (0x00007f0ee0662000) ++ @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib64/ld-linux-x86-64.so.2 (0x00007f0ee20ff000) ++ libblkid.so.1 => @nixStoreDir@/q0kgnq21j0l2yd77gdlld371246cwghh-util-linux-2.32.1/lib/libblkid.so.1 (0x00007f0edd0cd000) ++ libuuid.so.1 => @nixStoreDir@/q0kgnq21j0l2yd77gdlld371246cwghh-util-linux-2.32.1/lib/libuuid.so.1 (0x00007f0edcec5000) ++ librt.so.1 => @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib/librt.so.1 (0x00007f0edccbd000) ++ libstdc++.so.6 => @nixStoreDir@/3v5r7fkrbkw2qajadvjbf6p6qriz9p1i-gcc-7.3.0-lib/lib/libstdc++.so.6 (0x00007f0edc936000) ++ libgcc_s.so.1 => @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib/libgcc_s.so.1 (0x00007f0edc720000) ++ ''' ++ libraries = ['glib-2.0', 'gio-2.0'] ++ ++ self.assertEqual( ++ ['@nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libglib-2.0.so.0', ++ '@nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libgio-2.0.so.0'], ++ resolve_from_ldd_output(libraries, output)) ++ + def test_resolve_from_ldd_output(self): + output = '''\ + libglib-2.0.so.0 => /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 (0x00007fbe12d68000) +@@ -40,7 +64,8 @@ class TestLddParser(unittest.TestCase): + + self.assertEqual( + sanitize_shlib_path('/foo/bar'), +- '/foo/bar' if sys.platform == 'darwin' else 'bar') ++ # NixOS always want the absolute path ++ '/foo/bar') + + def test_unresolved_library(self): + output = '' diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 7ff5498e5a95..42c2b42f948c 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -35,16 +35,15 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./test_shlibs.patch; - inherit nixStoreDir; - }) - + # Make g-ir-scanner put absolute path to GIR files it generates + # so that programs can just dlopen them without having to muck + # with LD_LIBRARY_PATH environment variable. (substituteAll { src = ./absolute_shlib_path.patch; inherit nixStoreDir; }) ] ++ stdenv.lib.optionals x11Support [ + # Hardcode the cairo shared library path in the Cairo gir shipped with this package. # https://github.com/NixOS/nixpkgs/issues/34080 (substituteAll { src = ./absolute_gir_path.patch; diff --git a/pkgs/development/libraries/gobject-introspection/test_shlibs.patch b/pkgs/development/libraries/gobject-introspection/test_shlibs.patch deleted file mode 100644 index 65b5a1a13b91..000000000000 --- a/pkgs/development/libraries/gobject-introspection/test_shlibs.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/tests/scanner/test_shlibs.py -+++ b/tests/scanner/test_shlibs.py -@@ -7,6 +7,30 @@ from giscanner.shlibs import resolve_from_ldd_output, sanitize_shlib_path - - class TestLddParser(unittest.TestCase): - -+ def test_resolve_from_ldd_output_nix(self): -+ output = '''\ -+ libglib-2.0.so.0 => @nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libglib-2.0.so.0 (0x00007f0ee1b28000) -+ libgobject-2.0.so.0 => @nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libgobject-2.0.so.0 (0x00007f0ee18cf000) -+ libgio-2.0.so.0 => @nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libgio-2.0.so.0 (0x00007f0ee1502000) -+ libxml2.so.2 => @nixStoreDir@/72mxkk74cv266snkjpz1kwl1i2rg8rpc-libxml2-2.9.8/lib/libxml2.so.2 (0x00007f0ee119c000) -+ libsqlite3.so.0 => @nixStoreDir@/ck5ay23hsmlc67pg3m34kzd1k2hhvww0-sqlite-3.24.0/lib/libsqlite3.so.0 (0x00007f0ee0e98000) -+ libpsl.so.5 => @nixStoreDir@/qn3l2gn7m76f318676wflrs2z6d4rrkj-libpsl-0.20.2-list-2017-02-03/lib/libpsl.so.5 (0x00007f0ee0c88000) -+ libc.so.6 => @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib/libc.so.6 (0x00007f0ee08d4000) -+ libpcre.so.1 => @nixStoreDir@/hxbq8lpc53qsf1bc0dfcsm47wmcxzjvh-pcre-8.42/lib/libpcre.so.1 (0x00007f0ee0662000) -+ @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib64/ld-linux-x86-64.so.2 (0x00007f0ee20ff000) -+ libblkid.so.1 => @nixStoreDir@/q0kgnq21j0l2yd77gdlld371246cwghh-util-linux-2.32.1/lib/libblkid.so.1 (0x00007f0edd0cd000) -+ libuuid.so.1 => @nixStoreDir@/q0kgnq21j0l2yd77gdlld371246cwghh-util-linux-2.32.1/lib/libuuid.so.1 (0x00007f0edcec5000) -+ librt.so.1 => @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib/librt.so.1 (0x00007f0edccbd000) -+ libstdc++.so.6 => @nixStoreDir@/3v5r7fkrbkw2qajadvjbf6p6qriz9p1i-gcc-7.3.0-lib/lib/libstdc++.so.6 (0x00007f0edc936000) -+ libgcc_s.so.1 => @nixStoreDir@/g2yk54hifqlsjiha3szr4q3ccmdzyrdv-glibc-2.27/lib/libgcc_s.so.1 (0x00007f0edc720000) -+ ''' -+ libraries = ['glib-2.0', 'gio-2.0'] -+ -+ self.assertEqual( -+ ['@nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libglib-2.0.so.0', -+ '@nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libgio-2.0.so.0'], -+ resolve_from_ldd_output(libraries, output)) -+ - def test_resolve_from_ldd_output(self): - output = '''\ - libglib-2.0.so.0 => /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 (0x00007fbe12d68000) -@@ -40,7 +64,8 @@ class TestLddParser(unittest.TestCase): - - self.assertEqual( - sanitize_shlib_path('/foo/bar'), -- '/foo/bar' if sys.platform == 'darwin' else 'bar') -+ # NixOS always want the absolute path -+ '/foo/bar') - - def test_unresolved_library(self): - output = '' From fd5ea9d5f20bbb79ace51abeb411efb17556a60d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 May 2020 21:32:37 +0200 Subject: [PATCH 0346/3452] gobject-introspection: add docs --- .../libraries/gobject-introspection/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 42c2b42f948c..5c7ad4bbac7e 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -5,6 +5,10 @@ , bison , meson , ninja +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, docbook_xml_dtd_45 , pkg-config , libffi , python3 @@ -26,7 +30,7 @@ stdenv.mkDerivation rec { # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out - outputs = [ "out" "dev" "man" ]; + outputs = [ "out" "dev" "devdoc" "man" ]; outputBin = "dev"; src = fetchurl { @@ -55,6 +59,10 @@ stdenv.mkDerivation rec { meson ninja pkg-config + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + docbook_xml_dtd_45 ]; buildInputs = [ @@ -75,6 +83,7 @@ stdenv.mkDerivation rec { "--datadir=${placeholder "dev"}/share" "-Ddoctool=disabled" "-Dcairo=disabled" + "-Dgtk_doc=true" ]; doCheck = !stdenv.isAarch64; From 27edd9efb3cea58629091778fcbf1c3ca994f075 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 16 May 2020 00:20:32 +0000 Subject: [PATCH 0347/3452] cross/tests: Use `crossPkgs.runCommand` so we have `strictDeps` --- pkgs/test/cross/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index 6c31a16f2fd5..e65805c6a401 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -13,7 +13,7 @@ let compareTest = { emulator, pkgFun, hostPkgs, crossPkgs, exec, args ? [] }: let pkgName = (pkgFun hostPkgs).name; args' = lib.concatStringsSep " " args; - in pkgs.runCommand "test-${pkgName}-${crossPkgs.hostPlatform.config}" { + in crossPkgs.runCommand "test-${pkgName}-${crossPkgs.hostPlatform.config}" { nativeBuildInputs = [ pkgs.dos2unix ]; } '' # Just in case we are using wine, get rid of that annoying extra From ee8cfe4bf3319e4eb30ab3be6bf890f615f89453 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 27 Apr 2020 23:56:25 -0400 Subject: [PATCH 0348/3452] treewide: pkg-config has `targetPrefix` --- pkgs/applications/editors/mg/default.nix | 2 +- pkgs/applications/graphics/ImageMagick/7.0.nix | 2 +- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- pkgs/applications/misc/stupidterm/default.nix | 2 +- pkgs/build-support/dotnetbuildhelpers/default.nix | 2 +- pkgs/development/libraries/ffmpeg/generic.nix | 1 - pkgs/development/libraries/gtkd/default.nix | 2 +- pkgs/development/python-modules/pkgconfig/default.nix | 2 +- pkgs/development/python-modules/zstd/default.nix | 2 +- pkgs/os-specific/linux/batman-adv/alfred.nix | 2 +- pkgs/os-specific/linux/batman-adv/batctl.nix | 2 +- pkgs/tools/networking/openconnect_pa/default.nix | 2 +- 12 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 612cdcc7f881..ef6943001b9c 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = [ "PKG_CONFIG=${buildPackages.pkgconfig}/bin/pkg-config" ]; + makeFlags = [ "PKG_CONFIG=${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config" ]; installPhase = '' install -m 555 -Dt $out/bin mg diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index f2542301119e..cbc72f91dcc1 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation { moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params for file in "$dev"/bin/*-config; do substituteInPlace "$file" --replace pkg-config \ - "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'" + "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config'" done '' + lib.optionalString (ghostscript != null) '' for la in $out/lib/*.la; do diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 0ded57b1a72c..583a845c3c7e 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -85,9 +85,9 @@ stdenv.mkDerivation { moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params for file in "$dev"/bin/*-config; do substituteInPlace "$file" --replace "${pkgconfig}/bin/pkg-config -config" \ - ${pkgconfig}/bin/pkg-config + ${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config substituteInPlace "$file" --replace ${pkgconfig}/bin/pkg-config \ - "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'" + "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config'" done '' + lib.optionalString (ghostscript != null) '' for la in $out/lib/*.la; do diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix index 0a6e947f15c2..2016059d81e7 100644 --- a/pkgs/applications/misc/stupidterm/default.nix +++ b/pkgs/applications/misc/stupidterm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1f73wvqqvj5pr3fvb7jjc4bi1iwgkkknz24k8n69mdb75jnfjipp"; }; - makeFlags = [ "PKGCONFIG=${pkgconfig}/bin/pkg-config" "binary=stupidterm" ]; + makeFlags = [ "PKGCONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" "binary=stupidterm" ]; installPhase = '' install -D stupidterm $out/bin/stupidterm diff --git a/pkgs/build-support/dotnetbuildhelpers/default.nix b/pkgs/build-support/dotnetbuildhelpers/default.nix index 0edfd0b467ab..809619ed55d9 100644 --- a/pkgs/build-support/dotnetbuildhelpers/default.nix +++ b/pkgs/build-support/dotnetbuildhelpers/default.nix @@ -12,7 +12,7 @@ cp -v "$script" "$target"/"$scriptName" chmod 755 "$target"/"$scriptName" patchShebangs "$target"/"$scriptName" - substituteInPlace "$target"/"$scriptName" --replace pkg-config ${pkgconfig}/bin/pkg-config + substituteInPlace "$target"/"$scriptName" --replace pkg-config ${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config substituteInPlace "$target"/"$scriptName" --replace monodis ${mono}/bin/monodis done '' diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index f56447668ea6..881166ef9b95 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -163,7 +163,6 @@ stdenv.mkDerivation rec { ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" - "--pkg-config=pkg-config" # Override ffmpeg's ./configure assumption that pkg-config is prefixed by the architecture. (e.g. aarch64-unknown-linux-gnu-pkg-config) ] ++ optional stdenv.cc.isClang "--cc=clang"); depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index a03dc51f00c5..5cef820db149 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -117,7 +117,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" - "PKG_CONFIG=${pkgconfig}/bin/pkg-config" + "PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" ]; # The .pc files does not declare an `includedir=`, so the multiple diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index c338f6d47e57..ff9e3cc39aa3 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { patches = [ ./executable.patch ]; postPatch = '' - substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkgconfig}/bin/pkg-config"' + substituteInPlace pkgconfig/pkgconfig.py --replace 'PKG_CONFIG_EXE = "pkg-config"' 'PKG_CONFIG_EXE = "${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config"' ''; meta = with lib; { diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index 75856a88b7e0..c96e08ccb513 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "/usr/bin/pkg-config" "${pkgconfig}/bin/pkg-config" + --replace "/usr/bin/pkg-config" "${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" ''; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index c1fb3ef5ee1a..04217b8989bc 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gpsd libcap libnl ]; preBuild = '' - makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config" + makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" ''; meta = { diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 5767c4aa72c4..3b1cf183e08e 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnl ]; preBuild = '' - makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config" + makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config" ''; meta = { diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix index 2c452847aa3b..4b108dc303e8 100644 --- a/pkgs/tools/networking/openconnect_pa/default.nix +++ b/pkgs/tools/networking/openconnect_pa/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { }; preConfigure = '' - export PKG_CONFIG=${pkgconfig}/bin/pkg-config + export PKG_CONFIG=${pkgconfig}/bin/${pkgconfig.targetPrefix}pkg-config export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2" export LIBXML2_LIBS="-L${libxml2.out}/lib -lxml2" ''; From c71ab32a678a98ce1ec069956bc55d6ea606f55c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 27 Apr 2020 22:39:58 -0400 Subject: [PATCH 0349/3452] pkg-config-wrapper: Init This fixes longstanding build issues --- .../pkg-config-wrapper/add-flags.sh | 12 ++ .../pkg-config-wrapper/default.nix | 117 ++++++++++++++++++ .../pkg-config-wrapper/pkg-config-wrapper.sh | 21 ++++ .../pkg-config-wrapper/setup-hook.sh | 29 +++++ .../python-modules/pkgconfig/default.nix | 2 +- .../tools/misc/pkg-config/default.nix | 2 - .../tools/misc/pkg-config/setup-hook.sh | 6 - pkgs/test/cross/default.nix | 14 +++ pkgs/top-level/all-packages.nix | 17 ++- 9 files changed, 208 insertions(+), 12 deletions(-) create mode 100644 pkgs/build-support/pkg-config-wrapper/add-flags.sh create mode 100644 pkgs/build-support/pkg-config-wrapper/default.nix create mode 100644 pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh create mode 100644 pkgs/build-support/pkg-config-wrapper/setup-hook.sh delete mode 100644 pkgs/development/tools/misc/pkg-config/setup-hook.sh diff --git a/pkgs/build-support/pkg-config-wrapper/add-flags.sh b/pkgs/build-support/pkg-config-wrapper/add-flags.sh new file mode 100644 index 000000000000..35ecf62ca230 --- /dev/null +++ b/pkgs/build-support/pkg-config-wrapper/add-flags.sh @@ -0,0 +1,12 @@ +# See cc-wrapper for comments. +var_templates_list=( + PKG_CONFIG_PATH +) + +accumulateRoles + +for var in "${var_templates_list[@]}"; do + mangleVarList "$var" ${role_suffixes[@]+"${role_suffixes[@]}"} +done + +export NIX_PKG_CONFIG_WRAPPER_FLAGS_SET_@suffixSalt@=1 diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix new file mode 100644 index 000000000000..87efc3b18aa8 --- /dev/null +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -0,0 +1,117 @@ +# The wrapper script ensures variables like PKG_CONFIG_PATH and +# PKG_CONFIG_PATH_FOR_BUILD work properly. + +{ stdenvNoCC +, buildPackages +, pkg-config +, propagateDoc ? pkg-config != null && pkg-config ? man +, extraPackages ? [], extraBuildCommands ? "" +}: + +with stdenvNoCC.lib; + +let + stdenv = stdenvNoCC; + inherit (stdenv) hostPlatform targetPlatform; + + # Prefix for binaries. Customarily ends with a dash separator. + # + # TODO(@Ericson2314) Make unconditional, or optional but always true by + # default. + targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) + (targetPlatform.config + "-"); + + # See description in cc-wrapper. + suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; + +in + +stdenv.mkDerivation { + pname = targetPrefix + pkg-config.pname + "-wrapper"; + inherit (pkg-config) version; + + preferLocalBuild = true; + + shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or ""; + + inherit targetPrefix suffixSalt; + + outputs = [ "out" ] ++ optionals propagateDoc [ "man" ]; + + passthru = { + inherit pkg-config; + }; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + src=$PWD + ''; + + installPhase = + '' + mkdir -p $out/bin $out/nix-support + + wrap() { + local dst="$1" + local wrapper="$2" + export prog="$3" + substituteAll "$wrapper" "$out/bin/$dst" + chmod +x "$out/bin/$dst" + } + + echo $pkg-config > $out/nix-support/orig-pkg-config + + wrap ${targetPrefix}pkg-config ${./pkg-config-wrapper.sh} "${getBin pkg-config}/bin/pkg-config" + ''; + + strictDeps = true; + + wrapperName = "PKG_CONFIG_WRAPPER"; + + setupHooks = [ + ../setup-hooks/role.bash + ./setup-hook.sh + ]; + + postFixup = + '' + + ## + ## User env support + ## + + # Propagate the underling unwrapped pkg-config so that if you + # install the wrapper, you get anything else it might provide. + printWords ${pkg-config} > $out/nix-support/propagated-user-env-packages + '' + + + optionalString propagateDoc '' + ## + ## Man page and info support + ## + + ln -s ${pkg-config.man} $man + '' + + + '' + substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh + substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash + + ## + ## Extra custom steps + ## + '' + + + extraBuildCommands; + + meta = + let pkg-config_ = if pkg-config != null then pkg-config else {}; in + (if pkg-config_ ? meta then removeAttrs pkg-config.meta ["priority"] else {}) // + { description = + stdenv.lib.attrByPath ["meta" "description"] "pkg-config" pkg-config_ + + " (wrapper script)"; + priority = 10; + }; +} diff --git a/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh b/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh new file mode 100644 index 000000000000..f7c7429eb0b3 --- /dev/null +++ b/pkgs/build-support/pkg-config-wrapper/pkg-config-wrapper.sh @@ -0,0 +1,21 @@ +#! @shell@ +set -eu -o pipefail +o posix +shopt -s nullglob + +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + +source @out@/nix-support/utils.bash + +if [ -z "${NIX_PKG_CONFIG_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then + source @out@/nix-support/add-flags.sh +fi + +if (( ${#role_suffixes[@]} > 0 )); then + # replace env var with nix-modified one + PKG_CONFIG_PATH=$PKG_CONFIG_PATH_@suffixSalt@ exec @prog@ "$@" +else + # pkg-config isn't a bonafied dependency so ignore setup hook entirely + exec @prog@ "$@" +fi diff --git a/pkgs/build-support/pkg-config-wrapper/setup-hook.sh b/pkgs/build-support/pkg-config-wrapper/setup-hook.sh new file mode 100644 index 000000000000..12b9af5e5837 --- /dev/null +++ b/pkgs/build-support/pkg-config-wrapper/setup-hook.sh @@ -0,0 +1,29 @@ +# pkg-config Wrapper hygiene +# +# See comments in cc-wrapper's setup hook. This works exactly the same way. + +# Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a +# native compile. +# +# TODO(@Ericson2314): No native exception +[[ -z ${strictDeps-} ]] || (( "$hostOffset" < 0 )) || return 0 + +pkgConfigWrapper_addPkgConfigPath () { + # See ../setup-hooks/role.bash + local role_post + getHostRoleEnvHook + + addToSearchPath "PKG_CONFIG_PATH${role_post}" "$1/lib/pkgconfig" + addToSearchPath "PKG_CONFIG_PATH${role_post}" "$1/share/pkgconfig" +} + +# See ../setup-hooks/role.bash +getTargetRole +getTargetRoleWrapper + +addEnvHooks "$targetOffset" pkgConfigWrapper_addPkgConfigPath + +export PKG_CONFIG${role_post}=@targetPrefix@pkg-config + +# No local scope in sourced file +unset -v role_post diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index 2e6fb7c47058..c338f6d47e57 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "pkgconfig"; version = "1.5.1"; - setupHook = pkgconfig.setupHook; + setupHooks = pkgconfig.setupHooks; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index 494b8d893d42..d5e766283ce6 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -6,8 +6,6 @@ stdenv.mkDerivation rec { pname = "pkg-config"; version = "0.29.2"; - setupHook = ./setup-hook.sh; - src = fetchurl { url = "https://pkgconfig.freedesktop.org/releases/${pname}-${version}.tar.gz"; sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg"; diff --git a/pkgs/development/tools/misc/pkg-config/setup-hook.sh b/pkgs/development/tools/misc/pkg-config/setup-hook.sh deleted file mode 100644 index 34a9b9f1173b..000000000000 --- a/pkgs/development/tools/misc/pkg-config/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -addPkgConfigPath () { - addToSearchPath PKG_CONFIG_PATH $1/lib/pkgconfig - addToSearchPath PKG_CONFIG_PATH $1/share/pkgconfig -} - -addEnvHooks "$targetOffset" addPkgConfigPath diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index e65805c6a401..c5a241437732 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -91,6 +91,20 @@ let pkgFun = pkgs: pkgs.hello; }; + pkg-config = {platformFun, crossPkgs, emulator}: crossPkgs.runCommand + "test-pkg-config-${crossPkgs.hostPlatform.config}" + { + depsBuildBuild = [ crossPkgs.pkgsBuildBuild.pkg-config ]; + nativeBuildInputs = [ crossPkgs.pkgsBuildHost.pkg-config crossPkgs.buildPackages.zlib ]; + depsBuildTarget = [ crossPkgs.pkgsBuildTarget.pkg-config ]; + buildInputs = [ crossPkgs.zlib ]; + NIX_DEBUG = 7; + } '' + mkdir $out + ${crossPkgs.pkgsBuildBuild.pkg-config.targetPrefix}pkg-config --cflags zlib > "$out/for-build" + ${crossPkgs.pkgsBuildHost.pkg-config.targetPrefix}pkg-config --cflags zlib > "$out/for-host" + ! diff "$out/for-build" "$out/for-host" + ''; }; in { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23bd5ffd7718..680177a2610a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -329,7 +329,11 @@ in # break dependency cycles fetchurl = stdenv.fetchurlBoot; zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; - pkgconfig = buildPackages.pkgconfig.override { fetchurl = stdenv.fetchurlBoot; }; + pkgconfig = buildPackages.pkgconfig.override (old: { + pkg-config = old.pkg-config.override { + fetchurl = stdenv.fetchurlBoot; + }; + }); perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; openssl = buildPackages.openssl.override { fetchurl = stdenv.fetchurlBoot; @@ -10737,10 +10741,17 @@ in pkgconf = callPackage ../development/tools/misc/pkgconf {}; - pkg-config = callPackage ../development/tools/misc/pkg-config { }; + pkg-config-unwrapped = callPackage ../development/tools/misc/pkg-config { }; + pkg-config = callPackage ../build-support/pkg-config-wrapper { + pkg-config = pkg-config-unwrapped; + }; pkgconfig = pkg-config; # added 2018-02-02 - pkg-configUpstream = lowPrio (pkg-config.override { vanilla = true; }); + pkg-configUpstream = lowPrio (pkg-config.override (old: { + pkg-config = old.pkg-config.override { + vanilla = true; + }; + })); pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 inherit (nodePackages) postcss-cli; From 05aabc40fab416fa618faef7df997e8ae4754bb6 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Sat, 16 May 2020 02:10:43 +0200 Subject: [PATCH 0350/3452] highlight: 3.56 -> 3.57 --- pkgs/tools/text/highlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index bc32a60c6727..a918770aa7b9 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; let self = stdenv.mkDerivation rec { pname = "highlight"; - version = "3.56"; + version = "3.57"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "1pilx58dg96zm0yx7i6k92vibwpvpj8ir39f2akrsyjgijnv3sx4"; + sha256 = "1xrk7c7akjiwh3wh9bll0qh4g0kqvbzjz9ancpadnk0k7bqi0kxf"; }; enableParallelBuilding = true; From 376a013dac7063e767af94b539c620652e2ee425 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 16 May 2020 15:22:38 +0200 Subject: [PATCH 0351/3452] shattered-pixel-dungeon: 0.7.5f -> 0.8.0b The desktop and mobile versions are now unified. This required a few changes to dependencies and patching. --- .../games/shattered-pixel-dungeon/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index f96f61764b54..b07402063ce1 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -1,29 +1,29 @@ { stdenv -, fetchurl , makeWrapper , fetchFromGitHub , gradle_5 , perl , jre -, xorg -, openal +, libpulseaudio }: let pname = "shattered-pixel-dungeon"; - version = "0.7.5f"; + version = "0.8.0b"; src = fetchFromGitHub { owner = "00-Evan"; - repo = "shattered-pixel-dungeon-gdx"; + repo = "shattered-pixel-dungeon"; rev = "v${version}"; - sha256 = "05awbbc7np9li50shdbpv9dgdgry6lra8d5gibwn578m2g9srbxx"; + sha256 = "1qi90qw2xp56wai4gn39rpwh3gs3kx2zcpbni861f7hl9hnf87bf"; }; postPatch = '' # disable gradle plugins with native code and their targets perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle perl -i.bak2 -pe "s#(.*)#// \1# if /^(buildscript|task portable|task nsis|task proguard|task tgz|task\(afterEclipseImport\)|launch4j|macAppBundle|buildRpm|buildDeb|shadowJar)/ ... /^}/" build.gradle + # Remove unbuildable android stuff + rm android/build.gradle ''; # fake build to pre-download deps into fixed-output derivation @@ -33,7 +33,7 @@ let nativeBuildInputs = [ gradle_5 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon desktop:dist + gradle --no-daemon desktop:release ''; # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) installPhase = '' @@ -43,7 +43,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1k0v5scadw9ziq4dw2rckmh8x2xlmxslfsxmpw79zg78n3hvwhf1"; + outputHash = "0ih10c6c85vhrqgilqmkzqjx3dc8cscvs9wkh90zgdj10qv0iba3"; }; in stdenv.mkDerivation rec { @@ -54,21 +54,21 @@ in stdenv.mkDerivation rec { buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) # point to offline repo - sed -ie "s#mavenLocal()#mavenLocal(); maven { url '${deps}' }#g" build.gradle - gradle --offline --no-daemon desktop:dist + sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle + gradle --offline --no-daemon desktop:release ''; installPhase = '' install -Dm644 desktop/build/libs/desktop-${version}.jar $out/share/shattered-pixel-dungeon.jar mkdir $out/bin makeWrapper ${jre}/bin/java $out/bin/shattered-pixel-dungeon \ - --prefix LD_LIBRARY_PATH : ${xorg.libXxf86vm}/lib:${openal}/lib \ + --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \ --add-flags "-jar $out/share/shattered-pixel-dungeon.jar" ''; meta = with stdenv.lib; { homepage = "https://shatteredpixel.com/"; - downloadPage = "https://github.com/00-Evan/shattered-pixel-dungeon-gdx/releases"; + downloadPage = "https://github.com/00-Evan/shattered-pixel-dungeon/releases"; description = "Traditional roguelike game with pixel-art graphics and simple interface"; license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; From 78987e2af0346fd6d5abf9597102188e5d1cfedf Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Thu, 14 May 2020 08:39:53 +0200 Subject: [PATCH 0352/3452] ffmpeg: extend addOpenGLRunpath to handle libcuda referencing libraries --- pkgs/development/libraries/ffmpeg/generic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index f56447668ea6..500d99765ba2 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -199,9 +199,10 @@ stdenv.mkDerivation rec { --replace "includedir=$out" "includedir=''${!outputInclude}" done '' + optionalString stdenv.isLinux '' - # Set RUNPATH so that libnvcuvid in /run/opengl-driver(-32)/lib can be found. + # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. # See the explanation in addOpenGLRunpath. - addOpenGLRunpath $out/lib/libavcodec.so* + addOpenGLRunpath $out/lib/libavcodec.so + addOpenGLRunpath $out/lib/libavutil.so ''; installFlags = [ "install-man" ]; 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 0353/3452] 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 0354/3452] 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 0355/3452] 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 c9857dee7db3e77fbcee0eab8626d6b9ba100e25 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 17 May 2020 22:28:06 +0200 Subject: [PATCH 0356/3452] gobject-introspection: move build tools to nativeBuildInputs --- .../libraries/gobject-introspection/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 5c7ad4bbac7e..03b0d1767d9f 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -59,19 +59,22 @@ stdenv.mkDerivation rec { meson ninja pkg-config + flex + bison gtk-doc docbook-xsl-nons - docbook_xml_dtd_43 + docbook_xml_dtd_43 # FIXME: remove in next release docbook_xml_dtd_45 + python3 + setupHook # move .gir files ]; buildInputs = [ - flex - bison python3 - setupHook /*move .gir*/ - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - cctools + ]; + + checkInputs = stdenv.lib.optionals stdenv.isDarwin [ + cctools # for otool ]; propagatedBuildInputs = [ From 92570e6b4c25c2d3889191c6d8cac7dc39af3d45 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Fri, 24 Apr 2020 00:17:38 +0100 Subject: [PATCH 0357/3452] pythonPackages.screeninfo: init at 0.6.5 --- .../python-modules/screeninfo/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/screeninfo/default.nix diff --git a/pkgs/development/python-modules/screeninfo/default.nix b/pkgs/development/python-modules/screeninfo/default.nix new file mode 100644 index 000000000000..9ee04cb50a82 --- /dev/null +++ b/pkgs/development/python-modules/screeninfo/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonApplication, fetchPypi, isPy36, dataclasses, libX11, libXinerama, libXrandr }: + +buildPythonApplication rec { + pname = "screeninfo"; + version = "0.6.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0vcw54crdgmbzwlrfg80kd1a8p9i10yks8k0szzi0k5q80zhp8xz"; + }; + + # dataclasses is a compatibility shim for python 3.6 ONLY + patchPhase = if isPy36 then "" else '' + substituteInPlace setup.py \ + --replace "\"dataclasses\"," "" + '' + '' + substituteInPlace screeninfo/enumerators/xinerama.py \ + --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ + --replace "load_library(\"Xinerama\")" "ctypes.cdll.LoadLibrary(\"${libXinerama}/lib/libXinerama.so\")" + substituteInPlace screeninfo/enumerators/xrandr.py \ + --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ + --replace "load_library(\"Xrandr\")" "ctypes.cdll.LoadLibrary(\"${libXrandr}/lib/libXrandr.so\")" + ''; + + propagatedBuildInputs = stdenv.lib.optional isPy36 dataclasses; + + buildInputs = [ libX11 libXinerama libXrandr]; + + meta = with stdenv.lib; { + description = "Fetch location and size of physical screens"; + homepage = "https://github.com/rr-/screeninfo"; + license = licenses.mit; + maintainers = [ maintainers.nickhu ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 513b5876bf0f..0ad5e324f6bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3413,6 +3413,8 @@ in { samplerate = callPackage ../development/python-modules/samplerate { }; + screeninfo = callPackage ../development/python-modules/screeninfo { }; + ssdeep = callPackage ../development/python-modules/ssdeep { }; ssdp = callPackage ../development/python-modules/ssdp { }; From b3499b7b40dcb47e5a980d4c8f633862ace7e176 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Fri, 24 Apr 2020 00:18:46 +0100 Subject: [PATCH 0358/3452] pythonPackages.pynput: init at 1.6.8 --- .../python-modules/pynput/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/pynput/default.nix diff --git a/pkgs/development/python-modules/pynput/default.nix b/pkgs/development/python-modules/pynput/default.nix new file mode 100644 index 000000000000..2b83f4c1223b --- /dev/null +++ b/pkgs/development/python-modules/pynput/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, sphinx, setuptools-lint, xlib }: + +buildPythonPackage rec { + pname = "pynput"; + version = "1.6.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "16h4wn7f54rw30jrya7rmqkx3f51pxn8cplid95v880md8yqdhb8"; + }; + + nativeBuildInputs = [ sphinx ]; + + propagatedBuildInputs = [ setuptools-lint xlib ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A library to control and monitor input devices"; + homepage = "https://github.com/moses-palmer/pynput"; + license = licenses.lgpl3; + maintainers = with maintainers; [ nickhu ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ad5e324f6bd..6cb9f040e9fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1250,6 +1250,8 @@ in { pynisher = callPackage ../development/python-modules/pynisher { }; + pynput = callPackage ../development/python-modules/pynput { }; + pyparser = callPackage ../development/python-modules/pyparser { }; pyres = callPackage ../development/python-modules/pyres { }; From b772cd3a0ca54928be3faaa9be37769b00db4678 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Fri, 24 Apr 2020 00:19:24 +0100 Subject: [PATCH 0359/3452] pythonPackages.setuptools-lint: init at 0.6.0 --- .../setuptools-lint/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/setuptools-lint/default.nix diff --git a/pkgs/development/python-modules/setuptools-lint/default.nix b/pkgs/development/python-modules/setuptools-lint/default.nix new file mode 100644 index 000000000000..fbe1528c4c3b --- /dev/null +++ b/pkgs/development/python-modules/setuptools-lint/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, pylint }: + +buildPythonPackage rec { + pname = "setuptools-lint"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16a1ac5n7k7sx15cnk03gw3fmslab3a7m74dc45rgpldgiff3577"; + }; + + propagatedBuildInputs = [ pylint ]; + + meta = with stdenv.lib; { + description = "Package to expose pylint as a lint command into setup.py"; + homepage = "https://github.com/johnnoone/setuptools-pylint"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ nickhu ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6cb9f040e9fe..8cb9c67aa141 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3439,6 +3439,8 @@ in { setuptools-git = callPackage ../development/python-modules/setuptools-git { }; + setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; + sievelib = callPackage ../development/python-modules/sievelib { }; watchdog = callPackage ../development/python-modules/watchdog { }; From e729bd808db20052a94b1da66324002c57da3a5e Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Fri, 24 Apr 2020 00:20:06 +0100 Subject: [PATCH 0360/3452] pythonPackages.libevdev: init at 0.7 --- .../python-modules/libevdev/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/libevdev/default.nix diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix new file mode 100644 index 000000000000..ab00340cfe19 --- /dev/null +++ b/pkgs/development/python-modules/libevdev/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, isPy27, fetchPypi }: + +buildPythonPackage rec { + pname = "libevdev"; + version = "0.7"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "10gwj08kn2rs4waq7807mq34cbavgkpg8fpir8mvnba601b8q4r4"; + }; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python wrapper around the libevdev C library"; + homepage = "https://gitlab.freedesktop.org/libevdev/python-libevdev"; + license = licenses.mit; + maintainers = with maintainers; [ nickhu ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8cb9c67aa141..a6bbb492694c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2597,6 +2597,8 @@ in { libais = callPackage ../development/python-modules/libais { }; + libevdev = callPackage ../development/python-modules/libevdev { }; + libfdt = toPythonModule (pkgs.dtc.override { inherit python; pythonSupport = true; From a3c6bf8c951476db29610948c6e6099213795643 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Fri, 24 Apr 2020 00:20:40 +0100 Subject: [PATCH 0361/3452] remarkable-mouse: init at 5.2.1 --- .../remarkable/remarkable-mouse/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/misc/remarkable/remarkable-mouse/default.nix diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix new file mode 100644 index 000000000000..8d668f7a38d1 --- /dev/null +++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonApplication, fetchPypi, python3Packages }: + +buildPythonApplication rec { + pname = "remarkable-mouse"; + version = "5.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0k2wjfcgnvb8yqn4c4ddfyyhrvl6hj61kn1ddnyp6ay9vklnw160"; + }; + + propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; + + meta = with stdenv.lib; { + description = "A program to use a reMarkable as a graphics tablet"; + homepage = "https://github.com/evidlo/remarkable_mouse"; + license = licenses.gpl3; + maintainers = [ maintainers.nickhu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e32522158ce..733aa8b005c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2142,6 +2142,8 @@ in psrecord = python3Packages.callPackage ../tools/misc/psrecord {}; + remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { }; + scour = with python3Packages; toPythonApplication scour; s2png = callPackage ../tools/graphics/s2png { }; 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 0362/3452] 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 0363/3452] 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 54918d6366fd6b2946b869f2f5a0645e5477c859 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 4 May 2020 23:20:00 +0200 Subject: [PATCH 0364/3452] git: Add a doc output for the HTML and text files This will install the HTML and text documentation into a separate output so that users can install it without having to rebuild Git. Previously only `doc/git/git-subtree.html` was installed (which is now in $doc as well). The current output sizes are as follows: ``` $ du -sh $(nix-build -A git) 47M /nix/store/wyqgalp61kmavx06rams7z8jz177nd8y-git-2.26.2 $ du -sh $(nix-build -A git.doc) 14M /nix/store/6zi22fl5xc3sg23d9shsviinvwk89wvq-git-2.26.2-doc ``` Fixes #86022 (at least partly since the output has to be installed). --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 9c1a01f42ae8..140a273e342e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { sha256 = "0j685w6pzkn926z5nf5r8fij4ziipvw4c9yb0wc577nzf4j16rbd"; }; - outputs = [ "out" ]; + outputs = [ "out" "doc" ]; hardeningDisable = [ "format" ]; @@ -234,7 +234,7 @@ stdenv.mkDerivation { '') + stdenv.lib.optionalString withManual ''# Install man pages and Info manual - make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-info \ + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html install-info \ -C Documentation '' + (if guiSupport then '' From 9f2faa1f6f14b977e4b91523b6c2621bb77f7b62 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 18 May 2020 16:50:14 +0200 Subject: [PATCH 0365/3452] git-doc: init --- nixos/doc/manual/release-notes/rl-2009.xml | 5 +++++ .../version-management/git-and-tools/default.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 0ed440d79c63..a6c3c2033c38 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -391,6 +391,11 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; This matches the autotools convention for env vars which standard for these things, making interfacing with other tools easier. + + + Additional Git documentation (HTML and text files) is now available via the git-doc package. + + diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index c591ef554ee4..48fa002463b3 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -82,6 +82,14 @@ let inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; + git-doc = lib.addMetaAttrs { + description = "Additional documentation for Git"; + longDescription = '' + This package contains additional documentation (HTML and text files) that + is referenced in the man pages of Git. + ''; + } gitFull.doc; + git-extras = callPackage ./git-extras { }; git-fame = callPackage ./git-fame {}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 680177a2610a..7df73a2ec1c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19720,7 +19720,7 @@ in gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); - inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret git-secrets transcrypt git-crypt ghq; + inherit (gitAndTools) git gitFull gitSVN git-cola git-doc svn2git git-radar git-secret git-secrets transcrypt git-crypt ghq; gitMinimal = git.override { withManual = false; From 218d7c5c5ce8f8ff846daefd9f7147d4cb65a74c Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Mon, 18 May 2020 17:37:16 +0200 Subject: [PATCH 0366/3452] libmilter: set MILTER_SOVER MILTER_SOVER is used as an environment variable during the build, but never set anywhere set to so version 1 as currently used by Ubuntu --- pkgs/development/libraries/libmilter/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index 8d677d858de8..60ced27beac7 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { define(\`confLIBGRP', \`root') APPENDDEF(\`confENVDEF', \`-DNETINET6') EOF + export MILTER_SOVER=1 sh Build -f ./a.m4 ''; From c9d8edaecb5c4ef689f24b4a9905ca0697cab9c3 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Mon, 18 May 2020 17:41:25 +0200 Subject: [PATCH 0367/3452] libmilter: configurable shared object extension MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit defaults to ‘so’ if not set --- .../libraries/libmilter/sharedlib.patch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libmilter/sharedlib.patch b/pkgs/development/libraries/libmilter/sharedlib.patch index bbc69a516ffd..e0b1e6992e19 100644 --- a/pkgs/development/libraries/libmilter/sharedlib.patch +++ b/pkgs/development/libraries/libmilter/sharedlib.patch @@ -16,28 +16,29 @@ diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 sendmail-8.14.3 +# +divert(0)dnl +include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl ++define(`confSOEXT', ifdef(`confSOEXT', `confSOEXT', `so'))dnl +bldLIST_PUSH_ITEM(`bldC_PRODUCTS', bldCURRENT_PRODUCT)dnl -+bldPUSH_TARGET(bldCURRENT_PRODUCT`.so' bldCURRENT_PRODUCT`.a')dnl ++bldPUSH_TARGET(bldCURRENT_PRODUCT`.'confSOEXT bldCURRENT_PRODUCT`.a')dnl +bldPUSH_INSTALL_TARGET(`install-'bldCURRENT_PRODUCT)dnl +bldPUSH_CLEAN_TARGET(bldCURRENT_PRODUCT`-clean')dnl + +include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4') +divert(bldTARGETS_SECTION) -+bldCURRENT_PRODUCT.so: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} -+ ${CCLINK} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so -Wl,confSONAME,bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${bldCURRENT_PRODUCT`OBJS'} -lc ${LIBS} ++bldCURRENT_PRODUCT`.'confSOEXT: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} ++ ${CCLINK} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.confSOEXT ifdef(`confSONAME',`-Wl,confSONAME,bldCURRENT_PRODUCT.confSOEXT.${MILTER_SOVER}') ${bldCURRENT_PRODUCT`OBJS'} -lc ${LIBS} +bldCURRENT_PRODUCT.a: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} + ${AR} ${AROPTS} bldCURRENT_PRODUCT.a ${bldCURRENT_PRODUCT`OBJS'} + ${RANLIB} ${RANLIBOPTS} bldCURRENT_PRODUCT.a +ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)') + -+install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a ++install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.confSOEXT bldCURRENT_PRODUCT.a +ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}"; else :; fi ') -+ ${INSTALL} -c bldCURRENT_PRODUCT.so "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so.${MILTER_SOVER}" -+ ${LN} ${LNOPTS} bldCURRENT_PRODUCT.so.${MILTER_SOVER} "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so" ++ ${INSTALL} -c bldCURRENT_PRODUCT.confSOEXT "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.confSOEXT.${MILTER_SOVER}" ++ ${LN} ${LNOPTS} bldCURRENT_PRODUCT.confSOEXT.${MILTER_SOVER} "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.confSOEXT" + ${INSTALL} -c bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"') + +bldCURRENT_PRODUCT-clean: -+ rm -f ${OBJS} bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a ${MANPAGES} ++ rm -f ${OBJS} bldCURRENT_PRODUCT.confSOEXT bldCURRENT_PRODUCT.a ${MANPAGES} + +divert(0) +COPTS+= confCCOPTS_SO From 81fed3c7a2fa3f9e2238f4de6f496dd520cb72bb Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Mon, 18 May 2020 17:42:03 +0200 Subject: [PATCH 0368/3452] libmilter: install archive as not executable --- pkgs/development/libraries/libmilter/sharedlib.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmilter/sharedlib.patch b/pkgs/development/libraries/libmilter/sharedlib.patch index e0b1e6992e19..1e256c59ec3e 100644 --- a/pkgs/development/libraries/libmilter/sharedlib.patch +++ b/pkgs/development/libraries/libmilter/sharedlib.patch @@ -35,7 +35,7 @@ diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 sendmail-8.14.3 +ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'LIBDIR}"; else :; fi ') + ${INSTALL} -c bldCURRENT_PRODUCT.confSOEXT "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.confSOEXT.${MILTER_SOVER}" + ${LN} ${LNOPTS} bldCURRENT_PRODUCT.confSOEXT.${MILTER_SOVER} "${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.confSOEXT" -+ ${INSTALL} -c bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"') ++ ${INSTALL} -c -m 644 bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"') + +bldCURRENT_PRODUCT-clean: + rm -f ${OBJS} bldCURRENT_PRODUCT.confSOEXT bldCURRENT_PRODUCT.a ${MANPAGES} From cb38977986f9068fbba0a7e483a8ccbcd45f43ec Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Mon, 18 May 2020 17:48:24 +0200 Subject: [PATCH 0369/3452] libmilter: fix compilation on Darwin * configure compilation options * patch sendmail.h header inclusion --- .../libraries/libmilter/darwin.patch | 28 +++++++++++++++++++ .../libraries/libmilter/default.nix | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libmilter/darwin.patch diff --git a/pkgs/development/libraries/libmilter/darwin.patch b/pkgs/development/libraries/libmilter/darwin.patch new file mode 100644 index 000000000000..be46662d6b38 --- /dev/null +++ b/pkgs/development/libraries/libmilter/darwin.patch @@ -0,0 +1,28 @@ +Fix build issues on Darwin. + +--- a/devtools/OS/Darwin 2014-03-05 01:59:45.000000000 +0100 ++++ b/devtools/OS/Darwin 2020-05-18 14:47:57.000000000 +0200 +@@ -8,6 +8,8 @@ + # We look a lot more like 4.4BSD than NeXTStep or OpenStep. + # + define(`confCC', `cc -traditional-cpp -pipe ${Extra_CC_Flags}') ++define(`confCCOPTS_SO', `-fPIC') ++define(`confSOEXT', `dylib') + define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX -DNETINFO -DAUTO_NETINFO_ALIASES -DAUTO_NETINFO_HOSTS') + define(`confENVDEF', `-DDARWIN') + define(`confLDOPTS', `${Extra_LD_Flags}') +--- a/sendmail/sendmail.h 2020-05-18 14:51:17.000000000 +0200 ++++ b/sendmail/sendmail.h 2020-05-18 14:51:00.000000000 +0200 +@@ -104,7 +104,11 @@ + # endif /* NETX25 */ + + # if NAMED_BIND +-# include ++# ifdef __APPLE__ ++# include ++# else ++# include ++# endif + # ifdef NOERROR + # undef NOERROR /* avoid conflict */ + # endif /* NOERROR */ diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index 60ced27beac7..f937d818a559 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sh Build -f ./a.m4 ''; - patches = [ ./install.patch ./sharedlib.patch ./glibc-2.30.patch ]; + patches = [ ./install.patch ./sharedlib.patch ./glibc-2.30.patch ./darwin.patch ]; nativeBuildInputs = [ m4 ]; From 5787e9a0352e2e200ee4c5de768813a3a41290a5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 May 2020 20:26:28 +0200 Subject: [PATCH 0370/3452] gdk-pixbuf: clean up * format with nixpkgs-fmt * reorder the attributes * replace aliases * inline pname & version * add GNOME maintainers * update homepage from devdocs to repo --- .../libraries/gdk-pixbuf/default.nix | 78 ++++++++++++++----- 1 file changed, 58 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 82fbbc967efc..64a1adef0c4a 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,23 +1,44 @@ -{ stdenv, fetchurl, nixosTests, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl -, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3 -, gobject-introspection, doCheck ? false, makeWrapper +{ stdenv +, fetchurl +, nixosTests +, fixDarwinDylibNames +, meson +, ninja +, pkg-config +, gettext +, python3 +, libxml2 +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gtk-doc +, glib +, libtiff +, libjpeg +, libpng +, libX11 +, gnome3 +, gobject-introspection +, doCheck ? false +, makeWrapper , fetchpatch }: -let +stdenv.mkDerivation rec { pname = "gdk-pixbuf"; version = "2.40.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + + outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1rnlx9yfw970maxi2x6niaxmih5la11q1ilr7gzshz2kk585k0hm"; }; patches = [ # Move installed tests to a separate output ./installed-tests-path.patch + # Temporary until the fix is released. (fetchpatch { name = "tests-circular-table.patch"; @@ -26,20 +47,35 @@ in stdenv.mkDerivation rec { }) ]; - outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; - - setupHook = ./setup-hook.sh; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + python3 + libxml2 + libxslt + docbook-xsl-nons + docbook_xml_dtd_43 + gtk-doc + gobject-introspection + makeWrapper + glib + ] ++ stdenv.lib.optional stdenv.isDarwin [ + fixDarwinDylibNames + ]; # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ libX11 ]; + buildInputs = [ + libX11 + ]; - nativeBuildInputs = [ - meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43 - gtk-doc gobject-introspection makeWrapper glib - ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - - propagatedBuildInputs = [ glib libtiff libjpeg libpng ]; + propagatedBuildInputs = [ + glib + libtiff + libjpeg + libpng + ]; mesonFlags = [ "-Ddocs=true" @@ -87,6 +123,8 @@ in stdenv.mkDerivation rec { # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). inherit doCheck; + setupHook = ./setup-hook.sh; + passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -102,8 +140,8 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for image loading and manipulation"; - homepage = "http://library.gnome.org/devel/gdk-pixbuf/"; - maintainers = [ maintainers.eelco ]; + homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf"; + maintainers = [ maintainers.eelco ] ++ teams.gnome.members; license = licenses.lgpl21; platforms = platforms.unix; }; From 6323002aac02cb9e0c2da30873195b3e2e110334 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 May 2020 21:03:24 +0200 Subject: [PATCH 0371/3452] gdk-pixbuf-xlib: init at 2019-10-19-unstable https://mail.gnome.org/archives/desktop-devel-list/2019-November/msg00009.html --- .../development/libraries/gdk-pixbuf/xlib.nix | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/libraries/gdk-pixbuf/xlib.nix diff --git a/pkgs/development/libraries/gdk-pixbuf/xlib.nix b/pkgs/development/libraries/gdk-pixbuf/xlib.nix new file mode 100644 index 000000000000..e5f1718f0751 --- /dev/null +++ b/pkgs/development/libraries/gdk-pixbuf/xlib.nix @@ -0,0 +1,55 @@ +{ stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, docbook-xsl-nons +, docbook_xml_dtd_43 +, gtk-doc +, gdk-pixbuf +, libX11 +}: + +stdenv.mkDerivation rec { + pname = "gdk-pixbuf-xlib"; + version = "2019-10-19-unstable"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "Archive"; + repo = "gdk-pixbuf-xlib"; + rev = "dc22ea36f69755007c66877284596df270532cc1"; + sha256 = "XhBQ4wano+MtGaqF6JNKoWgYQN6eBW+b8ZCGEBGt8IM="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + docbook-xsl-nons + docbook_xml_dtd_43 + gtk-doc + ]; + + buildInputs = [ + libX11 + ]; + + propagatedBuildInputs = [ + gdk-pixbuf + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + ]; + + meta = with stdenv.lib; { + description = "Deprecated API for integrating GdkPixbuf with Xlib data types"; + homepage = "https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib"; + maintainers = teams.gnome.members; + license = licenses.lgpl21Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e32522158ce..0e6b92476a1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12089,6 +12089,8 @@ in gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; + gdk-pixbuf-xlib = callPackage ../development/libraries/gdk-pixbuf/xlib.nix { }; + gnome-sharp = callPackage ../development/libraries/gnome-sharp { }; gnome-menus = callPackage ../development/libraries/gnome-menus { }; From 80a89002f1ad1d89f8fe926b6ac6aefae169d5b4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 May 2020 21:03:59 +0200 Subject: [PATCH 0372/3452] gdk-pixbuf: do not build deprecated xlib library It is deprecated and will be removed: https://mail.gnome.org/archives/desktop-devel-list/2019-November/msg00009.html Until then, you can use gdk-pixbuf-xlib package. --- pkgs/development/libraries/gdk-pixbuf/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 64a1adef0c4a..08b8f70b2d9a 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -16,7 +16,6 @@ , libtiff , libjpeg , libpng -, libX11 , gnome3 , gobject-introspection , doCheck ? false @@ -65,11 +64,6 @@ stdenv.mkDerivation rec { fixDarwinDylibNames ]; - # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ - libX11 - ]; - propagatedBuildInputs = [ glib libtiff @@ -79,7 +73,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=true" - "-Dx11=true" + "-Dx11=false" # use gdk-pixbuf-xlib "-Dgir=${if gobject-introspection != null then "true" else "false"}" "-Dgio_sniffing=false" ]; From 4ef9eed22473685e3952402ff66b225de4147853 Mon Sep 17 00:00:00 2001 From: Ivar Date: Wed, 13 May 2020 20:14:22 +0200 Subject: [PATCH 0373/3452] xwallpaper: init at 0.6.5 --- pkgs/tools/X11/xwallpaper/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/X11/xwallpaper/default.nix diff --git a/pkgs/tools/X11/xwallpaper/default.nix b/pkgs/tools/X11/xwallpaper/default.nix new file mode 100644 index 000000000000..ad2995b4ca60 --- /dev/null +++ b/pkgs/tools/X11/xwallpaper/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, pkg-config, autoreconfHook, pixman, xcbutil, xcbutilimage +, libseccomp, libjpeg, libpng, libXpm }: + +stdenv.mkDerivation rec { + pname = "xwallpaper"; + version = "0.6.5"; + + src = fetchFromGitHub { + owner = "stoeckmann"; + repo = "xwallpaper"; + rev = "v${version}"; + sha256 = "121ai4dc0v65qk12gn9w62ixly8hc8a5qrygkbb82vy8ck4jqxj7"; + }; + + preConfigure = "./autogen.sh"; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ pixman xcbutilimage xcbutil libseccomp libjpeg libpng libXpm ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/stoeckmann/xwallpaper"; + description = "Utility for setting wallpapers in X"; + license = licenses.isc; + maintainers = with maintainers; [ ivar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abcba8f5ccbd..706f2d765431 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7456,6 +7456,8 @@ in xcruiser = callPackage ../applications/misc/xcruiser { }; + xwallpaper = callPackage ../tools/X11/xwallpaper { }; + xxkb = callPackage ../applications/misc/xxkb { }; ugarit = callPackage ../tools/backup/ugarit { From f2406c602a4f267672b161a908e3370fcc76956c Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Mon, 27 Apr 2020 12:48:18 -0700 Subject: [PATCH 0374/3452] qemu: 4.2.0 -> 5.0.0 --- .../virtualization/qemu/default.nix | 46 ++----------------- .../virtualization/qemu/fix-qemu-ga.patch | 30 ++++++++---- 2 files changed, 27 insertions(+), 49 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index d6611e20a9c1..6498f720463b 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -35,15 +35,15 @@ let in stdenv.mkDerivation rec { - version = "4.2.0"; + version = "5.0.0"; pname = "qemu" + stdenv.lib.optionalString xenSupport "-xen" + stdenv.lib.optionalString hostCpuOnly "-host-cpu-only" + stdenv.lib.optionalString nixosTestRunner "-for-vm-tests"; src = fetchurl { - url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "1gczv8hn3wqci86css3mhzrppp3z8vppxw25l08j589k6bvz7x1w"; + url= "https://download.qemu.org/qemu-${version}.tar.xz"; + sha256 = "1dlcwyshdp94fwd30pddxf9bn2q8dfw5jsvry2gvdj551wmaj4rg"; }; nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ]; @@ -77,44 +77,6 @@ stdenv.mkDerivation rec { ./no-etc-install.patch ./fix-qemu-ga.patch ./9p-ignore-noatime.patch - (fetchpatch { - name = "CVE-2019-15890.patch"; - url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=c59279437eda91841b9d26079c70b8a540d41204"; - sha256 = "1q2rc67mfdz034mk81z9bw105x9zad7n954sy3kq068b1svrf7iy"; - stripLen = 1; - extraPrefix = "slirp/"; - }) - # patches listed at: https://nvd.nist.gov/vuln/detail/CVE-2020-7039 - (fetchpatch { - name = "CVE-2020-7039-1.patch"; - url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=2655fffed7a9e765bcb4701dd876e9dab975f289"; - sha256 = "1jh0k3lg3553c2x1kq1kl3967jabhba5gm584wjpmr5mjqk3lnz1"; - stripLen = 1; - extraPrefix = "slirp/"; - excludes = ["slirp/CHANGELOG.md"]; - }) - (fetchpatch { - name = "CVE-2020-7039-2.patch"; - url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=82ebe9c370a0e2970fb5695aa19aa5214a6a1c80"; - sha256 = "08ccxcmrhzknnzd1a1q2brszv3a7h02n26r73kpli10b0hn12r2l"; - stripLen = 1; - extraPrefix = "slirp/"; - }) - (fetchpatch { - name = "CVE-2020-7039-3.patch"; - url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=ce131029d6d4a405cb7d3ac6716d03e58fb4a5d9"; - sha256 = "18ypj9an2jmsmdn58853rbz42r10587h7cz5fdws2x4635778ibd"; - stripLen = 1; - extraPrefix = "slirp/"; - }) - # patches listed at: https://nvd.nist.gov/vuln/detail/CVE-2020-7211 - (fetchpatch { - name = "CVE-2020-7211.patch"; - url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=14ec36e107a8c9af7d0a80c3571fe39b291ff1d4"; - sha256 = "1lc8zabqs580iqrsr5k7zwgkx6qjmja7apwfbc36lkvnrxwfzmrc"; - stripLen = 1; - extraPrefix = "slirp/"; - }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { @@ -145,6 +107,8 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--enable-docs" + "--enable-tools" + "--enable-guest-agent" ] # disable sysctl check on darwin. ++ optional stdenv.isDarwin "--cpu=x86_64" diff --git a/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch b/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch index c2f051e2b944..0b2dd0ee5ece 100644 --- a/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch +++ b/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch @@ -1,22 +1,36 @@ -diff --git a/qga/commands-posix.c b/qga/commands-posix.c -index 0dc219d..9d020d3 100644 +diff -Naur a/qga/commands-posix.c b/qga/commands-posix.c --- a/qga/commands-posix.c +++ b/qga/commands-posix.c -@@ -102,6 +102,8 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp) +@@ -109,6 +109,8 @@ reopen_fd_to_null(1); reopen_fd_to_null(2); - + + execle("/run/current-system/sw/bin/shutdown", "shutdown", "-h", shutdown_flag, "+0", + "hypervisor initiated shutdown", (char*)NULL, environ); execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0", "hypervisor initiated shutdown", (char*)NULL, environ); _exit(EXIT_FAILURE); -@@ -189,6 +191,8 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) - +@@ -157,11 +159,13 @@ + pid_t pid; + Error *local_err = NULL; + struct timeval tv; ++ static const char hwclock_path_nix[] = "/run/current-system/sw/bin/hwclock"; + static const char hwclock_path[] = "/sbin/hwclock"; + static int hwclock_available = -1; + + if (hwclock_available < 0) { +- hwclock_available = (access(hwclock_path, X_OK) == 0); ++ hwclock_available = (access(hwclock_path_nix, X_OK) == 0) || ++ (access(hwclock_path, X_OK) == 0); + } + + if (!hwclock_available) { +@@ -207,6 +211,8 @@ + /* Use '/sbin/hwclock -w' to set RTC from the system time, * or '/sbin/hwclock -s' to set the system time from RTC. */ -+ execle("/run/current-system/sw/bin/hwclock", "hwclock", has_time ? "-w" : "-s", ++ execle(hwclock_path_nix, "hwclock", has_time ? "-w" : "-s", + NULL, environ); - execle("/sbin/hwclock", "hwclock", has_time ? "-w" : "-s", + execle(hwclock_path, "hwclock", has_time ? "-w" : "-s", NULL, environ); _exit(EXIT_FAILURE); From d4c80a478b9b8d3303f39fb788f382dfaa823bdc Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Tue, 19 May 2020 23:01:00 +0200 Subject: [PATCH 0375/3452] acme-client: 0.2.5 -> 1.0.0 The upstream version fails to compile due to a missing limits.h include. I added a patch to fix that. I opened a pull request to upstream it too, but the project has moved from GitHub onto sr.ht and now asks me to send a patch to the mailing list. My default email client is not really suitable for that, and getting git-send-email set up will take some work, so in the meantime it is easier to just patch it here. --- pkgs/tools/networking/acme-client/default.nix | 6 ++- .../networking/acme-client/limits.h.patch | 41 +++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/networking/acme-client/limits.h.patch diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix index 06c2898248d0..e05adae530eb 100644 --- a/pkgs/tools/networking/acme-client/default.nix +++ b/pkgs/tools/networking/acme-client/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "acme-client"; - version = "0.2.5"; + version = "1.0.0"; src = fetchFromGitHub { owner = "graywolf"; repo = "acme-client-portable"; rev = "v${version}"; - sha256 = "1d9yk87nj5gizkq26m4wqfh4xhlrn5xlfj7mfgvrpsdiwibqxrrw"; + sha256 = "1p6jbxg00ing9v3jnpvq234w5r2gf8b04k9qm06mn336lcd2lgpl"; }; nativeBuildInputs = [ autoreconfHook bison pkgconfig ]; @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; + patches = [ ./limits.h.patch ]; + meta = { homepage = "https://github.com/graywolf/acme-client-portable"; description = "Secure ACME/Let's Encrypt client"; diff --git a/pkgs/tools/networking/acme-client/limits.h.patch b/pkgs/tools/networking/acme-client/limits.h.patch new file mode 100644 index 000000000000..2a2e04fb8fac --- /dev/null +++ b/pkgs/tools/networking/acme-client/limits.h.patch @@ -0,0 +1,41 @@ +From 05b32236adf0f3f43d74b7824b7b20bc917c6db9 Mon Sep 17 00:00:00 2001 +From: Ruud van Asseldonk +Date: Tue, 19 May 2020 22:32:01 +0200 +Subject: [PATCH] Include limits.h in compat.c + +Without this, the compiler says: + + compat.c: In function 'strtonum': + compat.c:235:19: error: 'LLONG_MIN' undeclared (first use in this function) + 235 | else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval) + | ^~~~~~~~~ + compat.c:9:1: note: 'LLONG_MIN' is defined in header ''; did you forget to '#include '? + 8 | #include + +++ |+#include + 9 | + compat.c:235:19: note: each undeclared identifier is reported only once for each function it appears in + 235 | else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval) + | ^~~~~~~~~ + compat.c:237:19: error: 'LLONG_MAX' undeclared (first use in this function) + 237 | else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval) + | ^~~~~~~~~ + compat.c:237:19: note: 'LLONG_MAX' is defined in header ''; did you forget to '#include '? +--- + compat.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git ./compat.c ./compat.c +index 72a2f96..f990eca 100644 +--- compat.c ++++ compat.c +@@ -1,6 +1,7 @@ + #include "compat.h" + + #include ++#include + #include + #include + #include +-- +2.26.2 + From 6af533e456c6c4297c23aaae75048e6174bea574 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 May 2020 04:58:42 +0000 Subject: [PATCH 0376/3452] bison: 3.5.4 -> 3.6.2 --- pkgs/development/tools/parsing/bison/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index c9758fe21e31..5302f7ca6441 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.5.4"; + version = "3.6.2"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0a2cbrqh7mgx2dwf5qm10v68iakv1i0dqh9di4x5aqxsz96ibpf0"; + sha256 = "16h8panwpljwdq902v9x7inpnks51fn0kqlbyqfjvpilv6md73p2"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; From 54db65586179599a5a2b3dabff168523339f8bf6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 May 2020 09:15:22 +0000 Subject: [PATCH 0377/3452] btrfs-progs: 5.6 -> 5.6.1 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 5c73ee945c79..5a6dafae2980 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.6"; + version = "5.6.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0srg276yccfmqz0skmmga3vbqx4wiqsk1l6h86n6ryhxa9viqcm1"; + sha256 = "1nwnvjdnr9fjj2q2p2vpjabfdhcrwykgj9knjcsqy0c7p1bgbk2h"; }; nativeBuildInputs = [ From 90868c67e85fcf2efb3f6075203021f0f9bd97f5 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Wed, 20 May 2020 16:29:50 +0200 Subject: [PATCH 0378/3452] 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 f6373d28e15e5405989cb80a826eea0e4184bf98 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 20 May 2020 16:32:23 +0200 Subject: [PATCH 0379/3452] libaom: 1.0.0-errata1 -> 2.0.0 --- pkgs/development/libraries/libaom/default.nix | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 04b1c810c085..edc9df718159 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "libaom"; - version = "1.0.0-errata1"; + version = "2.0.0"; src = fetchgit { url = "https://aomedia.googlesource.com/aom"; rev = "v${version}"; - sha256 = "090phh4jl9z6m2pwpfpwcjh6iyw0byngb2n112qxkg6a3gsaa62f"; + sha256 = "1616xjhj6770ykn82ml741h8hx44v507iky3s9h7a5lnk9d4cxzy"; }; nativeBuildInputs = [ @@ -24,10 +24,26 @@ stdenv.mkDerivation rec { export PATH=$NIX_BUILD_TOP:$PATH ''; + # Configuration options: + # https://aomedia.googlesource.com/aom/+/refs/heads/master/build/cmake/aom_config_defaults.cmake + + cmakeFlags = [ + # For libaom these must be relative instead of absolute paths: + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + meta = with stdenv.lib; { - description = "AV1 Bitstream and Decoding Library"; + description = "Alliance for Open Media AV1 codec library"; + longDescription = '' + Libaom is the reference implementation of the AV1 codec from the Alliance + for Open Media. It contains an AV1 library as well as applications like + an encoder (aomenc) and a decoder (aomdec). + ''; homepage = "https://aomedia.org/av1-features/get-started/"; - maintainers = with maintainers; [ kiloreux ]; + changelog = "https://aomedia.googlesource.com/aom/+/refs/tags/v${version}/CHANGELOG"; + maintainers = with maintainers; [ primeos kiloreux ]; platforms = platforms.all; license = licenses.bsd2; }; From d54bfa2a932b81594c967e2c8a1fcf444bf66644 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Sun, 10 May 2020 20:58:27 +0200 Subject: [PATCH 0380/3452] compiler-rt{6..10}: fix compilation on Darwin addendum to https://github.com/NixOS/nixpkgs/pull/85945 --- pkgs/development/compilers/llvm/10/compiler-rt.nix | 2 +- pkgs/development/compilers/llvm/6/compiler-rt.nix | 2 +- pkgs/development/compilers/llvm/7/compiler-rt.nix | 2 +- pkgs/development/compilers/llvm/8/compiler-rt.nix | 2 +- pkgs/development/compilers/llvm/9/compiler-rt.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix index 68f64ef42560..00c4f0677ebc 100644 --- a/pkgs/development/compilers/llvm/10/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = '' + postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' '' + stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index 5ae8bb01f050..13abf6d95611 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = '' + postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' '' + stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index e9853c58ca57..84ca6af3b36d 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = '' + postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' '' + stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 1f58cb98e3d3..15e55800dc8e 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = '' + postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' '' + stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix index 3b92264ad692..0183754a2fd4 100644 --- a/pkgs/development/compilers/llvm/9/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = '' + postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' '' + stdenv.lib.optionalString stdenv.isDarwin '' From 52ed8e3bf234786ed4c2c1e341399e0f4ed7569c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 May 2020 18:57:34 +0000 Subject: [PATCH 0381/3452] libarchive: 3.4.2 -> 3.4.3 --- pkgs/development/libraries/libarchive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 0f6b196d1507..118adc61623a 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -10,13 +10,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { pname = "libarchive"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${version}"; - sha256 = "0mjm77wbqs8sbn9j44lj39nwbg6anmgz6pkyfxsww54a4rs0p3iz"; + sha256 = "1y0v03p6zyv6plr2p0pid1qfgmk8hd427spj8xa93mcdmq5yc3s0"; }; outputs = [ "out" "lib" "dev" ]; From 0fd395b3800165dd657513a04cee41d063d62428 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 21 May 2020 12:31:02 +0000 Subject: [PATCH 0382/3452] freetype: 2.10.1 -> 2.10.2 --- pkgs/development/libraries/freetype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 408578d9c939..24757af09e3d 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { pname = "freetype"; - version = "2.10.1"; + version = "2.10.2"; meta = with stdenv.lib; { description = "A font rendering engine"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0vx2dg1jh5kq34dd6ifpjywkpapp8a7p1bvyq9yq5zi1i94gmnqn"; + sha256 = "12rd181yzz6952cyjqaa4253f5szam93cmhw18p33rnj4l8dchqm"; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype From 26f635d39aa69b740c938349f8034b281a6663ca Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 21 May 2020 08:49:21 -0400 Subject: [PATCH 0383/3452] pkg-config: Document new location of bug --- pkgs/development/tools/misc/pkg-config/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index d5e766283ce6..ceca1cf590c0 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; # Process Requires.private properly, see - # http://bugs.freedesktop.org/show_bug.cgi?id=4738. + # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to + # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/28 patches = optional (!vanilla) ./requires-private.patch ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch; From 42b203573072bc0df6285c1a3dd458eaaffd84dd Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 21 May 2020 08:52:20 -0400 Subject: [PATCH 0384/3452] pkg-config: If building vanilla version, can run original tests --- pkgs/development/tools/misc/pkg-config/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index ceca1cf590c0..2cecb25eeeec 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch; # These three tests fail due to a (desired) behavior change from our ./requires-private.patch - postPatch = '' + postPatch = if vanilla then null else '' rm -f check/check-requires-private check/check-gtk check/missing ''; From f29919da616a51d805ef1cf3800d023d9d00e2dc Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 21 May 2020 08:52:41 -0400 Subject: [PATCH 0385/3452] pkg-config: Multiple outputs This is good practice, and will help with tests. Wrapper adjust to match bintools-wrapper re these new outputs. --- pkgs/build-support/pkg-config-wrapper/default.nix | 10 ++++++---- pkgs/development/tools/misc/pkg-config/default.nix | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index 87efc3b18aa8..75390ab4b6ff 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { inherit targetPrefix suffixSalt; - outputs = [ "out" ] ++ optionals propagateDoc [ "man" ]; + outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (pkg-config ? doc) "doc"); passthru = { inherit pkg-config; @@ -87,13 +87,15 @@ stdenv.mkDerivation { printWords ${pkg-config} > $out/nix-support/propagated-user-env-packages '' - + optionalString propagateDoc '' + + optionalString propagateDoc ('' ## - ## Man page and info support + ## Man page and doc support ## ln -s ${pkg-config.man} $man - '' + '' + optionalString (pkg-config ? doc) '' + ln -s ${pkg-config.doc} $doc + '') + '' substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index 2cecb25eeeec..84f6c330f8c5 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg"; }; + outputs = [ "out" "man" "doc" ]; + # Process Requires.private properly, see # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/28 From 4b2ab665fbeb28b9837e920841ca81c570dfbdd4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 21 May 2020 09:16:34 -0400 Subject: [PATCH 0386/3452] pkg-config-wrapper: Provide autoconf macros This fixes libarchive, and probably numerous other builds. --- pkgs/build-support/pkg-config-wrapper/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index 75390ab4b6ff..3e5785d23988 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -64,6 +64,15 @@ stdenv.mkDerivation { echo $pkg-config > $out/nix-support/orig-pkg-config wrap ${targetPrefix}pkg-config ${./pkg-config-wrapper.sh} "${getBin pkg-config}/bin/pkg-config" + '' + # symlink in share for autoconf to find macros + + # TODO(@Ericson2314): in the future just make the unwrapped pkg-config a + # propagated dep once we can rely on downstream deps comming first in + # search paths. (https://github.com/NixOS/nixpkgs/pull/31414 took a crack + # at this.) + + '' + ln -s ${pkg-config}/share $out/share ''; strictDeps = true; From 23490e3f50bf663971528c2aa2a8b1f496d3d128 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 21 May 2020 11:03:57 -0400 Subject: [PATCH 0387/3452] pkgconf: Multiple outputs --- .../tools/misc/pkgconf/default.nix | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix index 02b7ff5fcd3d..fb8281ff98c4 100644 --- a/pkgs/development/tools/misc/pkgconf/default.nix +++ b/pkgs/development/tools/misc/pkgconf/default.nix @@ -1,14 +1,41 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, removeReferencesTo }: stdenv.mkDerivation rec { pname = "pkgconf"; version = "1.6.3"; + nativeBuildInputs = [ removeReferencesTo ]; + + outputs = [ "out" "lib" "dev" "man" "doc" ]; + + enableParallelBuilding = true; + src = fetchurl { url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; sha256 = "04525vv0y849vvc2pi60g5wd9fjp1wbhra2lniifi82y1ldv7w31"; }; + # Debian has outputs like these too: + # https://packages.debian.org/source/buster/pkgconf, so take it this + # reference removing is safe. + postFixup = '' + remove-references-to \ + -t "${placeholder "dev"}" \ + "${placeholder "lib"}"/lib/* \ + "${placeholder "out"}"/bin/* + remove-references-to \ + -t "${placeholder "out"}" \ + "${placeholder "lib"}"/lib/* + '' + # Move back share/aclocal. Yes, this normally goes in the dev output for good + # reason, but in this case the dev output is for the `libpkgconf` library, + # while the aclocal stuff is for the tool. The tool is already for use during + # development, so there is no reason to have separate "dev-bin" and "dev-lib" + # outputs or someting. + + '' + mv ${placeholder "dev"}/share ${placeholder "out"} + ''; + meta = with stdenv.lib; { description = "Package compiler and linker metadata toolkit"; homepage = "https://git.dereferenced.org/pkgconf/pkgconf"; From 95080ea90ba705f2a17e48b7cd824f2d0d2c44a3 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 21 May 2020 11:13:27 -0400 Subject: [PATCH 0388/3452] pkgconf: Wrap with pkg-config-wrapper --- pkgs/build-support/pkg-config-wrapper/default.nix | 5 +++-- pkgs/build-support/pkg-config-wrapper/setup-hook.sh | 2 +- pkgs/top-level/all-packages.nix | 6 +++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index 3e5785d23988..f1bc5da5481d 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -4,6 +4,7 @@ { stdenvNoCC , buildPackages , pkg-config +, baseBinName ? "pkg-config" , propagateDoc ? pkg-config != null && pkg-config ? man , extraPackages ? [], extraBuildCommands ? "" }: @@ -34,7 +35,7 @@ stdenv.mkDerivation { shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or ""; - inherit targetPrefix suffixSalt; + inherit targetPrefix suffixSalt baseBinName; outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (pkg-config ? doc) "doc"); @@ -63,7 +64,7 @@ stdenv.mkDerivation { echo $pkg-config > $out/nix-support/orig-pkg-config - wrap ${targetPrefix}pkg-config ${./pkg-config-wrapper.sh} "${getBin pkg-config}/bin/pkg-config" + wrap ${targetPrefix}${baseBinName} ${./pkg-config-wrapper.sh} "${getBin pkg-config}/bin/${baseBinName}" '' # symlink in share for autoconf to find macros diff --git a/pkgs/build-support/pkg-config-wrapper/setup-hook.sh b/pkgs/build-support/pkg-config-wrapper/setup-hook.sh index 12b9af5e5837..34f1a999a82e 100644 --- a/pkgs/build-support/pkg-config-wrapper/setup-hook.sh +++ b/pkgs/build-support/pkg-config-wrapper/setup-hook.sh @@ -23,7 +23,7 @@ getTargetRoleWrapper addEnvHooks "$targetOffset" pkgConfigWrapper_addPkgConfigPath -export PKG_CONFIG${role_post}=@targetPrefix@pkg-config +export PKG_CONFIG${role_post}=@targetPrefix@@baseBinName@ # No local scope in sourced file unset -v role_post diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 680177a2610a..228af7e55a53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10739,7 +10739,11 @@ in pmccabe = callPackage ../development/tools/misc/pmccabe { }; - pkgconf = callPackage ../development/tools/misc/pkgconf {}; + pkgconf-unwrapped = callPackage ../development/tools/misc/pkgconf {}; + pkgconf = callPackage ../build-support/pkg-config-wrapper { + pkg-config = pkgconf-unwrapped; + baseBinName = "pkgconf"; + }; pkg-config-unwrapped = callPackage ../development/tools/misc/pkg-config { }; pkg-config = callPackage ../build-support/pkg-config-wrapper { From 7e9d807f2cfbf4645ac9dab97e895435c3f6fe7b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 21 May 2020 11:15:15 -0400 Subject: [PATCH 0389/3452] pkg-config-wrapper: Move comments outside of strings This is much better because then we can freely keep the comments up to date without causing mass rebuilds. Someday, somebody should make the same change with `cc-wrapper` and `bintools-wrapper`. --- .../pkg-config-wrapper/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index f1bc5da5481d..e01df107dd17 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -86,22 +86,20 @@ stdenv.mkDerivation { ]; postFixup = + ## + ## User env support + ## + + # Propagate the underling unwrapped pkg-config so that if you + # install the wrapper, you get anything else it might provide. '' - - ## - ## User env support - ## - - # Propagate the underling unwrapped pkg-config so that if you - # install the wrapper, you get anything else it might provide. printWords ${pkg-config} > $out/nix-support/propagated-user-env-packages '' + ## + ## Man page and doc support + ## + optionalString propagateDoc ('' - ## - ## Man page and doc support - ## - ln -s ${pkg-config.man} $man '' + optionalString (pkg-config ? doc) '' ln -s ${pkg-config.doc} $doc @@ -110,12 +108,11 @@ stdenv.mkDerivation { + '' substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash - - ## - ## Extra custom steps - ## '' + ## + ## Extra custom steps + ## + extraBuildCommands; meta = From c174be1005acb065579930ec7db8629159690e21 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 21 May 2020 18:02:56 +0000 Subject: [PATCH 0390/3452] glib: 2.64.1 -> 2.64.3 --- pkgs/development/libraries/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index d74bd0c4067a..47e372cf9a36 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -48,11 +48,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.64.1"; + version = "2.64.3"; src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ixvjmsrj45xq9bq3chhj98jhgcsqa08v627mjx6sjxlph1pd5hp"; + sha256 = "08pbgiv5m3rica4ydvwvpq5mrxbyswx7l1jzjc2ch52xjabvr77y"; }; patches = optionals stdenv.isDarwin [ From 53ae029435036cc9b9d6596319d1e21e80da0a4a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 21 May 2020 19:52:11 +0000 Subject: [PATCH 0391/3452] isocodes: 4.4 -> 4.5.0 --- pkgs/development/libraries/iso-codes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 9ab25b410b4a..8ba9ea31b801 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iso-codes"; - version = "4.4"; + version = "4.5.0"; src = fetchurl { url = "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/${pname}-${version}/${pname}-${pname}-${version}.tar.bz2"; - sha256 = "02x0wcz783ammkdrmrh31wsmww481xbkbz70vf766ivbnn5sfxn6"; + sha256 = "17nnyx07q8vbyqsxbvp4m5s2nrc4fxl3dvgbgmkqww2wl4x1fv9y"; }; patchPhase = '' From 84b6ace626eef8275b3cb07b1e9a3614281b44d5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 22 May 2020 00:21:15 +0000 Subject: [PATCH 0392/3452] jansson: 2.12 -> 2.13.1 --- pkgs/development/libraries/jansson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index c1653ea5d1be..7ecf7579a307 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "jansson-2.12"; + name = "jansson-2.13.1"; src = fetchurl { url = "http://www.digip.org/jansson/releases/${name}.tar.gz"; - sha256 = "1jfj4xq3rdgnkxval1x2gqwhaam34qdxbplsj5fsrvs8a1vfr3az"; + sha256 = "0ks7gbs0j8p4dmmi2sq129mxy5gfg0z6220i1jk020mi2zd7gwzl"; }; meta = with stdenv.lib; { From 8c52a817130417c6d76cef049cad8670e46e717d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 22 May 2020 02:37:10 +0000 Subject: [PATCH 0393/3452] lilv: 0.24.6 -> 0.24.8 --- pkgs/development/libraries/audio/lilv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 831cd8c2054f..124828b0ff5f 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lilv"; - version = "0.24.6"; + version = "0.24.8"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "1p3hafsxgs5d4za7n66lf5nz74qssfqpmk520cm7iq2njvvlqm2z"; + sha256 = "0063i5zgf3d3accwmyx651hw0wh5ik7kji2hvfkcdbl1qia3dp6a"; }; patches = [ ./lilv-pkgconfig.patch ]; From a1416e63ddde7e1f4e848b995331c9716de1d5a5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 22 May 2020 03:00:15 +0000 Subject: [PATCH 0394/3452] libuv: 1.37.0 -> 1.38.0 --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 9f6adeb65b0b..e22bcdd86b4f 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.37.0"; + version = "1.38.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0iy25w4wy9f5y7i7aqidhqz93qi00lv7vhx6s521n0kphvaj8ijz"; + sha256 = "04598jglikma5plfiprnw4pcxwp7b6aqxphxs65pdd5xira6dz0s"; }; postPatch = let From c5239058fba5439459c17cfe6e177c4c76bc6fd3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 22 May 2020 06:00:55 +0000 Subject: [PATCH 0395/3452] libqmi: 1.24.10 -> 1.24.12 --- pkgs/development/libraries/libqmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 33b4983b015a..ec72578ba278 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.24.10"; + version = "1.24.12"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "1rzxapr6hb18ccvqh5fizx7zk63l47bs0p3gizycz2ysnm1i44n2"; + sha256 = "0scb8a2kh0vnzx6kxanfy2s2slnfppvrwg202rxv30m8p2i92frd"; }; outputs = [ "out" "dev" "devdoc" ]; From e0becdb1dc04cf656e0228f051989a37bc4a5161 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 22 May 2020 07:28:43 +0000 Subject: [PATCH 0396/3452] modemmanager: 1.12.8 -> 1.12.10 --- pkgs/tools/networking/modem-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 7329d78c2c83..c3981b902f2b 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "modem-manager"; - version = "1.12.8"; + version = "1.12.10"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "1zrsf57bn9rmaa2qvavr1aisci76vwlx0viqpwmkw3ds2l33vdb8"; + sha256 = "1apq9camys2gaw6y6ic1ld20cncfwpmxnzvh4j5zkbbjpf5hbcxj"; }; nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ]; From 9836d06e3d15495efd06717e1ad9c5bf7ed8f6e7 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 22 May 2020 09:17:18 +0000 Subject: [PATCH 0397/3452] libaom: enable shared, split outputs --- pkgs/development/libraries/libaom/default.nix | 14 ++++-- .../libraries/libaom/outputs.patch | 45 +++++++++++++++++++ 2 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/libaom/outputs.patch diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index edc9df718159..2c67e6ac1588 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1616xjhj6770ykn82ml741h8hx44v507iky3s9h7a5lnk9d4cxzy"; }; + patches = [ ./outputs.patch ]; + nativeBuildInputs = [ yasm perl cmake pkgconfig python3 ]; @@ -28,12 +30,16 @@ stdenv.mkDerivation rec { # https://aomedia.googlesource.com/aom/+/refs/heads/master/build/cmake/aom_config_defaults.cmake cmakeFlags = [ - # For libaom these must be relative instead of absolute paths: - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" + "-DBUILD_SHARED_LIBS=ON" + "-DENABLE_TESTS=OFF" ]; + postFixup = '' + moveToOutput lib/libaom.a "$static" + ''; + + outputs = [ "out" "bin" "dev" "static" ]; + meta = with stdenv.lib; { description = "Alliance for Open Media AV1 codec library"; longDescription = '' diff --git a/pkgs/development/libraries/libaom/outputs.patch b/pkgs/development/libraries/libaom/outputs.patch new file mode 100644 index 000000000000..7c0ff397dfee --- /dev/null +++ b/pkgs/development/libraries/libaom/outputs.patch @@ -0,0 +1,45 @@ +--- a/build/cmake/aom_install.cmake ++++ b/build/cmake/aom_install.cmake +@@ -45,2 +45,2 @@ macro(setup_aom_install_targets) +- -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR} +- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} ++ -DCMAKE_INSTALL_FULL_INCLUDEDIR=${CMAKE_INSTALL_FULL_INCLUDEDIR} ++ -DCMAKE_INSTALL_FULL_LIBDIR=${CMAKE_INSTALL_FULL_LIBDIR} +@@ -82,14 +82,14 @@ macro(setup_aom_install_targets) + install( + FILES ${AOM_INSTALL_INCS} +- DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/aom") ++ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/aom") + install( + FILES "${AOM_PKG_CONFIG_FILE}" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig") ++ DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") + install(TARGETS ${AOM_INSTALL_LIBS} DESTINATION +- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") ++ "${CMAKE_INSTALL_FULL_LIBDIR}") + + if(ENABLE_EXAMPLES) + install(TARGETS ${AOM_INSTALL_BINS} DESTINATION +- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") ++ "${CMAKE_INSTALL_FULL_BINDIR}") + endif() + endif() +--- a/build/cmake/pkg_config.cmake ++++ b/build/cmake/pkg_config.cmake +@@ -14,2 +14,2 @@ +- "CMAKE_INSTALL_BINDIR" "CMAKE_INSTALL_INCLUDEDIR" +- "CMAKE_INSTALL_LIBDIR" "CMAKE_PROJECT_NAME" ++ "CMAKE_INSTALL_BINDIR" "CMAKE_INSTALL_FULL_INCLUDEDIR" ++ "CMAKE_INSTALL_FULL_LIBDIR" "CMAKE_PROJECT_NAME" +@@ -38,4 +38,4 @@ endif() +-set(prefix "${CMAKE_INSTALL_PREFIX}") +-set(bindir "${CMAKE_INSTALL_BINDIR}") +-set(includedir "${CMAKE_INSTALL_INCLUDEDIR}") +-set(libdir "${CMAKE_INSTALL_LIBDIR}") ++get_filename_component(prefix "${CMAKE_INSTALL_FULL_INCLUDEDIR}" DIRECTORY) ++get_filename_component(exec_prefix "${CMAKE_INSTALL_FULL_LIBDIR}" DIRECTORY) ++get_filename_component(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}" NAME) ++get_filename_component(libdir "${CMAKE_INSTALL_FULL_LIBDIR}" NAME) +@@ -46 +46 @@ file(APPEND "${pkgconfig_file}" "prefix=${prefix}\n") +-file(APPEND "${pkgconfig_file}" "exec_prefix=\${prefix}\n") ++file(APPEND "${pkgconfig_file}" "exec_prefix=${exec_prefix}\n") From aa44ca368a09bf6c487216cb2987d5ddd8d5fece Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 23 May 2020 19:39:02 +0000 Subject: [PATCH 0398/3452] ffmpeg: add libaom to build inputs only if enabled --- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index fecffe889f17..5b98884c1fc5 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -173,7 +173,7 @@ stdenv.mkDerivation rec { libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers ] ++ optionals openglSupport [ libGL libGLU ] ++ optional libmfxSupport intel-media-sdk - ++ optional vpxSupport libaom + ++ optional libaomSupport libaom ++ optional vpxSupport libvpx ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva From 98bcf5d8da5ba8dde94d6cacfdbb034cba01b3d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 24 May 2020 09:08:42 +0200 Subject: [PATCH 0399/3452] Python tests: fix use of is_virtualenv Too many tests set it. --- pkgs/development/interpreters/python/tests.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 6c4a6ae8e21c..35da373e79c5 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -39,7 +39,7 @@ let interpreter = env.interpreter; is_venv = "False"; is_nixenv = "True"; - is_virtualenv = "True"; + is_virtualenv = "False"; }; } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { # Venv built using plain Python @@ -52,7 +52,7 @@ let interpreter = "${env}/bin/${python.executable}"; is_venv = "True"; is_nixenv = "False"; - is_virtualenv = "True"; + is_virtualenv = "False"; }; } // lib.optionalAttrs (python.pythonAtLeast "3.8") { @@ -66,7 +66,7 @@ let interpreter = "${env}/bin/${pythonEnv.executable}"; is_venv = "True"; is_nixenv = "True"; - is_virtualenv = "True"; + is_virtualenv = "False"; }; }; From f17001afd855262cf8e2e809fbcc3799492e77bd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 24 May 2020 09:35:45 +0200 Subject: [PATCH 0400/3452] Python: fix virtualenv with Python 2 --- .../interpreters/python/sitecustomize.py | 12 +++--- .../development/interpreters/python/tests.nix | 4 +- .../interpreters/python/tests/test_python.py | 4 ++ ...ix-and-base_exec_prefix-for-Python-2.patch | 37 +++++++++++++++++++ .../python-modules/virtualenv/default.nix | 4 ++ 5 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/python-modules/virtualenv/0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch diff --git a/pkgs/development/interpreters/python/sitecustomize.py b/pkgs/development/interpreters/python/sitecustomize.py index 72ce951328f1..d79a4696d8ea 100644 --- a/pkgs/development/interpreters/python/sitecustomize.py +++ b/pkgs/development/interpreters/python/sitecustomize.py @@ -21,9 +21,11 @@ paths = os.environ.pop('NIX_PYTHONPATH', None) if paths: functools.reduce(lambda k, p: site.addsitedir(p, k), paths.split(':'), site._init_pathinfo()) -# Check whether we are in a venv. -# Note Python 2 does not support base_prefix so we assume we are not in a venv. -in_venv = sys.version_info.major == 3 and sys.prefix != sys.base_prefix +# Check whether we are in a venv or virtualenv. +# For Python 3 we check whether our `base_prefix` is different from our current `prefix`. +# For Python 2 we check whether the non-standard `real_prefix` is set. +# https://stackoverflow.com/questions/1871549/determine-if-python-is-running-inside-virtualenv +in_venv = (sys.version_info.major == 3 and sys.prefix != sys.base_prefix) or (sys.version_info.major == 2 and hasattr(sys, "real_prefix")) if not in_venv: executable = os.environ.pop('NIX_PYTHONEXECUTABLE', None) @@ -32,8 +34,6 @@ if not in_venv: if 'PYTHONEXECUTABLE' not in os.environ and executable is not None: sys.executable = executable if prefix is not None: - # Because we cannot check with Python 2 whether we are in a venv, - # creating a venv from a Nix env won't work as well with Python 2. - # Also, note that sysconfig does not like it when sys.prefix is set to None + # Sysconfig does not like it when sys.prefix is set to None sys.prefix = sys.exec_prefix = prefix site.PREFIXES.insert(0, prefix) diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 35da373e79c5..03a3b9537090 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -19,10 +19,8 @@ let is_nixenv = "False"; is_virtualenv = "False"; }; - } // lib.optionalAttrs (python.isPy3k && !python.isPyPy) { + } // lib.optionalAttrs (!python.isPyPy) { # Use virtualenv from a Nix env. - # Does not function with Python 2 - # ValueError: source and destination is the same /nix/store/38kz3j1a87cq5y59k5w7k9yk4cqgc5b2-python-2.7.18/lib/python2.7/os.py nixenv-virtualenv = rec { env = runCommand "${python.name}-virtualenv" {} '' ${pythonVirtualEnv.interpreter} -m virtualenv $out diff --git a/pkgs/development/interpreters/python/tests/test_python.py b/pkgs/development/interpreters/python/tests/test_python.py index 41a7e687d263..0fc4b8a9e91c 100644 --- a/pkgs/development/interpreters/python/tests/test_python.py +++ b/pkgs/development/interpreters/python/tests/test_python.py @@ -43,6 +43,10 @@ class TestCasePython(unittest.TestCase): else: self.assertEqual(sys.prefix, sys.base_prefix) + @unittest.skipIf(sys.version_info.major==3, "sys.real_prefix is only set by virtualenv in case of Python 2.") + def test_real_prefix(self): + self.assertTrue(hasattr(sys, "real_prefix") == IS_VIRTUALENV) + def test_python_version(self): self.assertTrue(platform.python_version().startswith(PYTHON_VERSION)) diff --git a/pkgs/development/python-modules/virtualenv/0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch b/pkgs/development/python-modules/virtualenv/0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch new file mode 100644 index 000000000000..2b34da289e2d --- /dev/null +++ b/pkgs/development/python-modules/virtualenv/0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch @@ -0,0 +1,37 @@ +From 21563405d6e2348ee457187f7fb61beb102bb367 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk +Date: Sun, 24 May 2020 09:33:13 +0200 +Subject: [PATCH] Check base_prefix and base_exec_prefix for Python 2 + +This is a Nixpkgs-specific change so it can support virtualenvs from Nix envs. +--- + src/virtualenv/discovery/py_info.py | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/virtualenv/discovery/py_info.py b/src/virtualenv/discovery/py_info.py +index 6f12128..74e9218 100644 +--- a/src/virtualenv/discovery/py_info.py ++++ b/src/virtualenv/discovery/py_info.py +@@ -51,13 +51,17 @@ class PythonInfo(object): + self.version = u(sys.version) + self.os = u(os.name) + ++ config_vars = {} if sys.version_info.major is not 2 else sysconfig._CONFIG_VARS ++ base_prefix = config_vars.get("prefix") ++ base_exec_prefix = config_vars.get("exec_prefix") ++ + # information about the prefix - determines python home + self.prefix = u(abs_path(getattr(sys, "prefix", None))) # prefix we think +- self.base_prefix = u(abs_path(getattr(sys, "base_prefix", None))) # venv ++ self.base_prefix = u(abs_path(getattr(sys, "base_prefix", base_prefix))) # venv + self.real_prefix = u(abs_path(getattr(sys, "real_prefix", None))) # old virtualenv + + # information about the exec prefix - dynamic stdlib modules +- self.base_exec_prefix = u(abs_path(getattr(sys, "base_exec_prefix", None))) ++ self.base_exec_prefix = u(abs_path(getattr(sys, "base_exec_prefix", base_exec_prefix))) + self.exec_prefix = u(abs_path(getattr(sys, "exec_prefix", None))) + + self.executable = u(abs_path(sys.executable)) # the executable we were invoked via +-- +2.25.1 + diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index ff5172d415f7..5ca27330103d 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -43,6 +43,10 @@ buildPythonPackage rec { importlib-metadata ]; + patches = lib.optionals (isPy27) [ + ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch + ]; + meta = { description = "A tool to create isolated Python environments"; homepage = "http://www.virtualenv.org"; From 6574ba1946f3957fbf8bc1ba56850e26e15fa096 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 24 May 2020 18:37:34 +0200 Subject: [PATCH 0401/3452] rust*: add docs for testing packages See also https://discourse.nixos.org/t/rust-build-speed-improvements/7225 --- doc/languages-frameworks/rust.section.md | 66 ++++++++++++++++++++++ nixos/doc/manual/release-notes/rl-2009.xml | 18 +++++- 2 files changed, 81 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index cec3373cbee6..066633b53c43 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -75,6 +75,72 @@ pkgs.rustPlatform.buildRustPackage { } ``` +### Running package tests + +When using `buildRustPackage`, the `checkPhase` is enabled by default and runs +`cargo test` on the package to build. To make sure that we don't compile the +sources twice and to actually test the artifacts that will be used after that, +the tests will be ran in the `release`-mode by default. + +However, in some cases the test-suite of a package doesn't work properly in the +`release` mode. In that case, the mode for `checkPhase` can be changed like this: + +```nix +rustPlatform.buildRustPackage { + /* ... */ + checkType = "debug"; +} +``` + +#### Tests relying on the structure of the `target/`-directory + +Some tests may rely on the structure of the `target/`-directory. Those tests +are likely to fail since we use `cargo --target` during build. This means that +the artifacts +[are stored in `target//release/`](https://doc.rust-lang.org/cargo/guide/build-cache.html) +rather than `target/release/`. + +This can only be circumvented by patching the affected tests accordingly. + +#### Disabling package-tests + +In some cases it's necessary to disable the tests (which can be done by declaring +`doCheck = false;`) which is fine in the following cases: + +* If no tests exist, the `checkPhase` should be explicitly disabled to skip + unnecessary build-steps to speed-up the build. + +* If tests are highly impure (e.g. due to heavy network usage), it's also fine + disable tests. + +There are obviously some other corner-cases where it's sensible to disable tests, +those aren't hard-rules, in the end this is a case-by-case decision. + +Please check however if it's possible to disable a problematic subset of the +test-suite and leave comment which explains why that's needed. + +### Building a package in the `debug` mode + +By default, `buildRustPackage` will use the `release`-mode for building. If a package +should be built in the `debug`-mode however, it can be configured like this: + +```nix +rustPlatform.buildRustPackage { + /* ... */ + buildType = "debug"; +} +``` + +Obviously, the `checkPhase` will be ran in `debug`-mode as well in this case. + +### Custom `build`/`install`-procedures + +Some packages may use custom scripts for building/installing, e.g. with a `Makefile`. +In that case it's recommended to always override the `build-`/`install-`/`checkPhase`. + +Otherwise, it may be possible that one of the internal steps fails because of the +modified directory structure of `target/`. + ## Compiling Rust crates using Nix instead of Cargo ### Simple operation diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 744be530be75..afd3b5040982 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -354,9 +354,21 @@ php.override { - - The default output of buildGoPackage is now $out instead of $bin. - + + The default output of buildGoPackage is now $out instead of $bin. + + + + + Packages built using buildRustPackage now use the release + mode for the checkPhase by default. + + + Please note that rust-packages utilizing a custom build/install-procedure + (e.g. by using a Makefile) or test-suites that rely on the + structure in the target/-directory may break because of that. + For further information, please read the rust-section in the nixpkgs manual. + From d4d36c37c7ba945597f3ad25a278e304108bab9d Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Sun, 24 May 2020 23:00:17 +0200 Subject: [PATCH 0402/3452] acme-client: 1.0.0 -> 1.0.1 I submitted my patch upstream, it was merged, and version 1.0.1 which includes it has been released. So the patch here is no longer necessary. Also, the maintainer added a Nixpkgs-based build environment to the upstream CI setup, so in the future the upstream version will likely not need any patching. --- pkgs/tools/networking/acme-client/default.nix | 6 +-- .../networking/acme-client/limits.h.patch | 41 ------------------- 2 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 pkgs/tools/networking/acme-client/limits.h.patch diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix index e05adae530eb..02af803db724 100644 --- a/pkgs/tools/networking/acme-client/default.nix +++ b/pkgs/tools/networking/acme-client/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "acme-client"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "graywolf"; repo = "acme-client-portable"; rev = "v${version}"; - sha256 = "1p6jbxg00ing9v3jnpvq234w5r2gf8b04k9qm06mn336lcd2lgpl"; + sha256 = "0ds7lxn08yiq7hap1xh014smjhd4gf9lv9ypfrf1ahqna3s2w7k8"; }; nativeBuildInputs = [ autoreconfHook bison pkgconfig ]; @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - patches = [ ./limits.h.patch ]; - meta = { homepage = "https://github.com/graywolf/acme-client-portable"; description = "Secure ACME/Let's Encrypt client"; diff --git a/pkgs/tools/networking/acme-client/limits.h.patch b/pkgs/tools/networking/acme-client/limits.h.patch deleted file mode 100644 index 2a2e04fb8fac..000000000000 --- a/pkgs/tools/networking/acme-client/limits.h.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 05b32236adf0f3f43d74b7824b7b20bc917c6db9 Mon Sep 17 00:00:00 2001 -From: Ruud van Asseldonk -Date: Tue, 19 May 2020 22:32:01 +0200 -Subject: [PATCH] Include limits.h in compat.c - -Without this, the compiler says: - - compat.c: In function 'strtonum': - compat.c:235:19: error: 'LLONG_MIN' undeclared (first use in this function) - 235 | else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval) - | ^~~~~~~~~ - compat.c:9:1: note: 'LLONG_MIN' is defined in header ''; did you forget to '#include '? - 8 | #include - +++ |+#include - 9 | - compat.c:235:19: note: each undeclared identifier is reported only once for each function it appears in - 235 | else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval) - | ^~~~~~~~~ - compat.c:237:19: error: 'LLONG_MAX' undeclared (first use in this function) - 237 | else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval) - | ^~~~~~~~~ - compat.c:237:19: note: 'LLONG_MAX' is defined in header ''; did you forget to '#include '? ---- - compat.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git ./compat.c ./compat.c -index 72a2f96..f990eca 100644 ---- compat.c -+++ compat.c -@@ -1,6 +1,7 @@ - #include "compat.h" - - #include -+#include - #include - #include - #include --- -2.26.2 - From bdd706ccb24375ac1acf8a168f8a9a57b0fc258e Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Sun, 24 May 2020 23:11:56 +0200 Subject: [PATCH 0403/3452] acme-client: use source tarball to avoid autoreconf This was suggested by the upstream maintainer [1], and it is a nice simplification. Also change the url to sr.ht as the project has moved there. [1]: https://github.com/NixOS/nixpkgs/pull/88201#issuecomment-633260151 --- pkgs/tools/networking/acme-client/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix index 02af803db724..00f8778cafd5 100644 --- a/pkgs/tools/networking/acme-client/default.nix +++ b/pkgs/tools/networking/acme-client/default.nix @@ -1,7 +1,5 @@ { stdenv -, fetchFromGitHub -, autoreconfHook -, bison +, fetchurl , apple_sdk ? null , libbsd , libressl @@ -14,20 +12,18 @@ stdenv.mkDerivation rec { pname = "acme-client"; version = "1.0.1"; - src = fetchFromGitHub { - owner = "graywolf"; - repo = "acme-client-portable"; - rev = "v${version}"; - sha256 = "0ds7lxn08yiq7hap1xh014smjhd4gf9lv9ypfrf1ahqna3s2w7k8"; + src = fetchurl { + url = "https://data.wolfsden.cz/sources/acme-client-${version}.tar.xz"; + sha256 = "0gmdvmyw8a61w08hrxllypf7rpnqg0fxipbk3zmvsxj7m5i6iysj"; }; - nativeBuildInputs = [ autoreconfHook bison pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libbsd libressl ] ++ optional stdenv.isDarwin apple_sdk.sdk; makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = { - homepage = "https://github.com/graywolf/acme-client-portable"; + homepage = "https://sr.ht/~graywolf/acme-client-portable/"; description = "Secure ACME/Let's Encrypt client"; platforms = platforms.unix; license = licenses.isc; From 3151144388d40e2d6ffdb39c637dafb52f3be329 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 May 2020 22:33:29 +0000 Subject: [PATCH 0404/3452] libbytesize: 2.2 -> 2.3 --- pkgs/development/libraries/libbytesize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index 5e293c163a9b..ec14b2a6091e 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -4,7 +4,7 @@ }: let - version = "2.2"; + version = "2.3"; in stdenv.mkDerivation rec { pname = "libbytesize"; inherit version; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libbytesize"; rev = version; - sha256 = "0n4gmn68ypsk3gcw6akcghlgk3aj3wskwg3mlg93cw5y3a33nbhm"; + sha256 = "1nrlmn63k0ix1yzn8v4lni5n5b4c0b6w9f33p1ig113ymmdvcc0h"; }; outputs = [ "out" "dev" "devdoc" ]; From ae7b57c8cad5e7efa147eb2f1099985b49ab3e5c Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Mon, 25 May 2020 01:44:21 +0200 Subject: [PATCH 0405/3452] postfix: 3.4.10 -> 3.4.12 `0001-Fix-build-with-glibx-2.30` was removed since the patch is already applied to upstream source. --- .../0001-Fix-build-with-glibc-2.30.patch | 34 ------------------- pkgs/servers/mail/postfix/default.nix | 5 ++- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 pkgs/servers/mail/postfix/0001-Fix-build-with-glibc-2.30.patch diff --git a/pkgs/servers/mail/postfix/0001-Fix-build-with-glibc-2.30.patch b/pkgs/servers/mail/postfix/0001-Fix-build-with-glibc-2.30.patch deleted file mode 100644 index 9613b8906a00..000000000000 --- a/pkgs/servers/mail/postfix/0001-Fix-build-with-glibc-2.30.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a6a61d0dc018101a9a8d0a664f31140d7e38db0e Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Fri, 17 Jan 2020 01:42:40 +0100 -Subject: [PATCH] Fix build with glibc 2.30 - -https://bugs.launchpad.net/ubuntu/+source/postfix/+bug/1842923 ---- - src/dns/dns_str_resflags.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/dns/dns_str_resflags.c b/src/dns/dns_str_resflags.c -index 5f2cce5..df32345 100644 ---- a/src/dns/dns_str_resflags.c -+++ b/src/dns/dns_str_resflags.c -@@ -60,10 +60,16 @@ static const LONG_NAME_MASK resflag_table[] = { - "RES_DEFNAMES", RES_DEFNAMES, - "RES_STAYOPEN", RES_STAYOPEN, - "RES_DNSRCH", RES_DNSRCH, -+#ifdef RES_INSECURE1 - "RES_INSECURE1", RES_INSECURE1, -+#endif -+#ifdef RES_INSECURE2 - "RES_INSECURE2", RES_INSECURE2, -+#endif - "RES_NOALIASES", RES_NOALIASES, -+#ifdef RES_USE_INET6 - "RES_USE_INET6", RES_USE_INET6, -+#endif - #ifdef RES_ROTATE - "RES_ROTATE", RES_ROTATE, - #endif --- -2.23.1 - diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 0386bcf2394b..04ad4551d5e0 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.4.10"; + version = "3.4.12"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "0m36wn5grm4cf8nnvlgsgwsm6v09xz01n7jnx13h0yjk73y6d2lh"; + sha256 = "1v2xhnhf0bj6p3g3cf7grmq2g7vgr1wr4yb7c3ksjllbms1m2m8q"; }; nativeBuildInputs = [ makeWrapper m4 ]; @@ -48,7 +48,6 @@ in stdenv.mkDerivation rec { ./postfix-3.0-no-warnings.patch ./post-install-script.patch ./relative-symlinks.patch - ./0001-Fix-build-with-glibc-2.30.patch ]; postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' From 39aaed823fb18cda835bdd9e26891dfae77790d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 24 May 2020 23:55:18 +0000 Subject: [PATCH 0406/3452] mkp224o: 1.4.0 -> 1.5.0 --- pkgs/tools/security/mkp224o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/tools/security/mkp224o/default.nix index 5640debf124a..dc17cc602764 100644 --- a/pkgs/tools/security/mkp224o/default.nix +++ b/pkgs/tools/security/mkp224o/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mkp224o"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "cathugger"; repo = "mkp224o"; rev = "v${version}"; - sha256 = "0b7xs4gnyfhdkwl8wkb6mazas88ybnlbxck59p4n2mnlndvd8kb7"; + sha256 = "0b2cn96wg4l8jkkqqp8l2295xlmm2jc8nrw6rdqb5g0zkpfmrxbb"; }; buildCommand = From 6bfabdf1a22300731b63b2177caef9f232afab1a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 25 May 2020 00:55:02 +0000 Subject: [PATCH 0407/3452] openh264: 2.1.0 -> 2.1.1 --- pkgs/development/libraries/openh264/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index e038bb7f66de..ee430f800dd3 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openh264"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "cisco"; repo = pname; rev = "v${version}"; - sha256 = "1wba260n1932vafd5ni2jqv9kzc7lj6a1asm1cqk8jv690m6zvpi"; + sha256 = "0ffav46pz3sbj92nipd62z03fibyqgclfq9w8lgr80s6za6zdk5s"; }; nativeBuildInputs = [ nasm ]; From 7c011da39b33721c1d5ea640f20540cd10398cea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 26 May 2020 00:32:49 +0000 Subject: [PATCH 0408/3452] libblockdev: 2.23 -> 2.24 --- pkgs/development/libraries/libblockdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 4982157c3ba0..7628212800f4 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "libblockdev"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; rev = "${version}-1"; - sha256 = "09gp9h05vy3llhnrg98gny8g57kgwnbi8522qyzjwyv7nmhs4zhz"; + sha256 = "1gzwlwdv0jyb3lh2n016limy2ngfdsa05x7jvg9llf2ls672nq89"; }; outputs = [ "out" "dev" "devdoc" ]; From e86ed7e6937fed8467419f0fffaa3543455cec4e Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Tue, 26 May 2020 11:19:55 +0200 Subject: [PATCH 0409/3452] postfix: 3.4.12 -> 3.5.2 --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 04ad4551d5e0..3b14fab68753 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.4.12"; + version = "3.5.2"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "1v2xhnhf0bj6p3g3cf7grmq2g7vgr1wr4yb7c3ksjllbms1m2m8q"; + sha256 = "1hxy9458apnzfg4n0alncsdgy5dwzn5dbn4xm46iv15xynbj9gz3"; }; nativeBuildInputs = [ makeWrapper m4 ]; From 5a287e71022341abdd91f327d091348ab25ad390 Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Tue, 19 May 2020 21:44:04 +0200 Subject: [PATCH 0410/3452] libressl_3_1: init at 3.1.1 --- pkgs/development/libraries/libressl/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 285d7b607e7b..6a93ecb8e890 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -79,4 +79,9 @@ in { version = "3.0.2"; sha256 = "13ir2lpxz8y1m151k7lrx306498nzfhwlvgkgv97v5cvywmifyyz"; }; + + libressl_3_1 = generic { + version = "3.1.1"; + sha256 = "006vnr14499fdsvyy0ddpvcn13habymfxxvmqk2aybispdgcximx"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b92c8e91b5b6..404beb50228b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14000,7 +14000,8 @@ in inherit (callPackages ../development/libraries/libressl { }) libressl_2_9 - libressl_3_0; + libressl_3_0 + libressl_3_1; libressl = libressl_3_0; From 79865f4d88c7ce7989de24ddc814326835538bf8 Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Tue, 19 May 2020 21:46:08 +0200 Subject: [PATCH 0411/3452] libressl_2_9: remove, not maintained anymore Stable LibreSSL releases are supported one year after their OpenBSD release. OpenBSD 6.5 with the 2.9 branch was released on 2019-05-01. --- pkgs/development/libraries/libressl/default.nix | 12 ------------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 13 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 6a93ecb8e890..fa710f482753 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -63,18 +63,6 @@ let }; in { - - libressl_2_9 = generic { - version = "2.9.2"; - sha256 = "1m6mz515dcbrbnyz8hrpdfjzdmj1c15vbgnqxdxb89g3z9kq3iy4"; - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [ - (fetchpatch { - url = "https://github.com/libressl-portable/portable/pull/529/commits/a747aacc23607c993cc481378782b2c7dd5bc53b.patch"; - sha256 = "0wbrcscdkjpk4mhh7f3saghi4smia4lhf7fl6la3ahhgx1krn5zm"; - }) - ]; - }; - libressl_3_0 = generic { version = "3.0.2"; sha256 = "13ir2lpxz8y1m151k7lrx306498nzfhwlvgkgv97v5cvywmifyyz"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 404beb50228b..1ac1dd818128 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13999,7 +13999,6 @@ in openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_2_9 libressl_3_0 libressl_3_1; From e0cc9f323615abb79f797d424d20aa5635532ee2 Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Tue, 19 May 2020 21:48:38 +0200 Subject: [PATCH 0412/3452] libressl: switch to 3.1 branch It is the latest now, let's default to it. 3.0 will still be supported until October, when OpenBSD 6.6 turns one year old. Also add reminder to use the latest version, as suggested by doronbehar. --- 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 1ac1dd818128..701e329a9df3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14002,7 +14002,9 @@ in libressl_3_0 libressl_3_1; - libressl = libressl_3_0; + # Please keep this pointed to the latest version. See also + # https://discourse.nixos.org/t/nixpkgs-policy-regarding-libraries-available-in-multiple-versions/7026/2 + libressl = libressl_3_1; boringssl = callPackage ../development/libraries/boringssl { }; From fd3f22f35d214c99c21e0f15f37ad79d93a6643c Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Mon, 25 May 2020 23:55:43 +0200 Subject: [PATCH 0413/3452] libressl_3_1: 3.1.1 -> 3.1.2 --- pkgs/development/libraries/libressl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index fa710f482753..fc797cf32881 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -69,7 +69,7 @@ in { }; libressl_3_1 = generic { - version = "3.1.1"; - sha256 = "006vnr14499fdsvyy0ddpvcn13habymfxxvmqk2aybispdgcximx"; + version = "3.1.2"; + sha256 = "14nqg34yc9bm64hz96hhlvm00gwn2acjs0hcwhs9l50plrz2z2pq"; }; } From 92f080181b98c1da20f8603889460af3ffa0bc6c Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Tue, 26 May 2020 19:19:16 +0200 Subject: [PATCH 0414/3452] wasm-pack: depend on libressl_3_0 explicitly The application is incompatible with LibreSSL 3.1 because rust-openssl has a compile-time check for supported LibreSSL versions, and the version of rust-openssl that wasm-pack depends on does not yet support LibreSSL 3.1. --- pkgs/top-level/all-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 701e329a9df3..0faed60f5c78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26254,6 +26254,9 @@ in wasmer = callPackage ../development/interpreters/wasmer { }; wasm-pack = callPackage ../development/tools/wasm-pack { + # Wasm-pack depends on a version of rust-openssl which is incompatible with + # LibreSSL 3.1, so we explicitly opt for the older version. + libressl = libressl_3_0; inherit (darwin.apple_sdk.frameworks) Security; }; From 0367fa630d59673624d6742e2758b87eb12fff4c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 14 May 2020 13:35:11 +0200 Subject: [PATCH 0415/3452] python38: 3.8.2 -> 3.8.3 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 2def54de12d1..a3ba72a27b27 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -107,10 +107,10 @@ in { sourceVersion = { major = "3"; minor = "8"; - patch = "2"; + patch = "3"; suffix = ""; }; - sha256 = "1ps5v323cp5czfshqjmbsqw7nvrdpcbk06f62jbzaqik4gfffii6"; + sha256 = "0r2qg4pdvv52ld5dd95fl6lzzsxxxhbsxmymwcphh6624g3mxayz"; inherit (darwin) configd; inherit passthruFun; }; From c5f7bda79f1134b1017bcbd11528a5e6ff7da6bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 May 2020 15:03:33 +0000 Subject: [PATCH 0416/3452] sqlite: 3.31.1 -> 3.32.0 --- pkgs/development/libraries/sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 245c55e9ea88..b5fd7361e892 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.31.1"; + version = "3.32.0"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "1bj936svd8i5g25xd1bj52hj4zca01fgl3sqkj86z9q5pkz4wa32"; + sha256 = "195x23f083s38gla4id4qvcx04p5p5jpdi29369cip7mfkyig0sr"; }; outputs = [ "bin" "dev" "out" ]; From 162c0c3e6100461b5ed59144e6a69c179dfde84a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 27 May 2020 16:07:58 +0000 Subject: [PATCH 0417/3452] mkDerivation: Don't need to specify pkg-config for meson any more Env var will work fine. --- pkgs/stdenv/generic/make-derivation.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 09879451d8e4..993ae68e9e81 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -262,7 +262,7 @@ in rec { else if isx86_32 then "x86" else if isx86_64 then "x86_64" else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; - crossFile = builtins.toFile "cross-file.conf" ('' + crossFile = builtins.toFile "cross-file.conf" '' [properties] needs_exe_wrapper = true @@ -271,13 +271,7 @@ in rec { cpu_family = '${cpuFamily stdenv.targetPlatform}' cpu = '${stdenv.targetPlatform.parsed.cpu.name}' endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} - '' - # TODO should have target prefix too, issue #86077 - + '' - - [binaries] - pkgconfig = 'pkg-config' - ''); + ''; in [ "--cross-file=${crossFile}" ] ++ mesonFlags; } // lib.optionalAttrs (attrs.enableParallelBuilding or false) { enableParallelChecking = attrs.enableParallelChecking or true; From ffe57c4e3e5cb535dff2da7ab311444a37ce390a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 27 May 2020 18:34:38 +0200 Subject: [PATCH 0418/3452] lazarus: Fix eval Unclean merge between d201270d0f2eb42181560949704d620d3679c1fa and 1ac5398589916a6a433e845342c9b85c4c52f5dc. --- pkgs/development/compilers/fpc/lazarus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 701dcae2fcfe..31a0727da90b 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' \ "$(echo "$NIX_LDFLAGS" | sed -re 's/-rpath [^ ]+//g')" \ - --prefix NIX_${binutils.infixSalt}_LDFLAGS ' ' \ + --prefix NIX_LDFLAGS_${binutils.suffixSalt} ' ' \ "$(echo "$NIX_LDFLAGS" | sed -re 's/-rpath [^ ]+//g')" \ --prefix LCL_PLATFORM ' ' "$LCL_PLATFORM" \ --prefix PATH ':' "${fpc}/bin:${gdb}/bin:${gnumake}/bin:${binutils}/bin" From f005272623abfb9eb470b0317a9d18250daa3526 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 27 May 2020 17:12:43 +0000 Subject: [PATCH 0419/3452] wayland: Simplify cross build Now that we have a pkg-config wrapper, we can get build-time deps via pkg-config. --- pkgs/development/libraries/wayland/default.nix | 7 ++++--- .../wayland/fix-wayland-cross-compilation.patch | 14 -------------- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index e3b2941e8eee..402177b899c3 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -23,16 +23,17 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Ddocumentation=${lib.boolToString withDocumentation}" ]; - patches = lib.optional isCross ./fix-wayland-cross-compilation.patch; - postPatch = lib.optionalString withDocumentation '' patchShebangs doc/doxygen/gen-doxygen.py - '' + lib.optionalString isCross '' substituteInPlace egl/meson.build --replace \ "find_program('nm').path()" \ "find_program('${stdenv.cc.targetPrefix}nm').path()" ''; + depsBuildBuild = [ + pkgconfig + ]; + nativeBuildInputs = [ meson pkgconfig ninja ] ++ lib.optionals isCross [ diff --git a/pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch b/pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch deleted file mode 100644 index 77639acb6530..000000000000 --- a/pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/meson.build b/src/meson.build -index 3e8c9bf..75241cb 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -55,8 +55,7 @@ pkgconfig.generate( - ) - - if meson.is_cross_build() -- scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') -- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) -+ wayland_scanner_for_build = find_program('wayland-scanner', native: true, version: '>=1.14.0') - else - wayland_scanner_for_build = wayland_scanner - endif From 62e6d73a09870174a891d2a8d29a38e62b05efd5 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Wed, 27 May 2020 17:41:25 +0300 Subject: [PATCH 0420/3452] mesa: Fix cross build --- pkgs/development/libraries/mesa/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 7eb18dd31c1b..aa70e9e5a549 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch +{ stdenv, lib, fetchurl, fetchpatch, buildPackages , pkgconfig, intltool, ninja, meson , file, flex, bison, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva-minimal @@ -73,6 +73,12 @@ stdenv.mkDerivation { }) ]; + postPatch = '' + substituteInPlace meson.build --replace \ + "find_program('pkg-config')" \ + "find_program('${buildPackages.pkg-config.targetPrefix}pkg-config')" + ''; + outputs = [ "out" "dev" "drivers" "osmesa" ]; # TODO: Figure out how to enable opencl without having a runtime dependency on clang @@ -112,10 +118,14 @@ stdenv.mkDerivation { ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] ++ lib.optional withValgrind valgrind-light; + depsBuildBuild = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig meson ninja intltool bison flex file python3Packages.python python3Packages.Mako + ] ++ lib.optionals (elem "wayland" eglPlatforms) [ + wayland # For wayland-scanner during the build ]; propagatedBuildInputs = with xorg; [ From e1b8ff1c39c7f66234fbaae176abb0921b6e865e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 27 May 2020 19:53:41 +0000 Subject: [PATCH 0421/3452] tilda: 1.5.1 -> 1.5.2 --- pkgs/applications/misc/tilda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index 84d37a4f461d..0a672b039f6b 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "tilda"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "lanoxx"; repo = "tilda"; rev = "${pname}-${version}"; - sha256 = "1kk69sg7ph906yr5jagkjx0qfkhr5w2nyx407wl2dsjimbps44rd"; + sha256 = "0psq0f4s0s92bba6wwcf6b0j7i59b76svqxhvpavwv53yvhmmamn"; }; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; From 2bde87923edf101db95436b8709f35540bcaadca Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 28 May 2020 13:53:00 +0200 Subject: [PATCH 0422/3452] mesa: 20.0.2 -> 20.0.7 --- pkgs/development/libraries/mesa/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index aa70e9e5a549..9c49695258bb 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -27,7 +27,9 @@ with stdenv.lib; let - version = "20.0.2"; + # Release calendar: https://www.mesa3d.org/release-calendar.html + # Release frequency: https://www.mesa3d.org/releasing.html#schedule + version = "20.0.7"; # Update only to the final (last planned) release (i.e. X.Y.MAX)? branch = versions.major version; in @@ -37,12 +39,12 @@ stdenv.mkDerivation { src = fetchurl { urls = [ + "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" - "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "0vz8k07d23qdwy67fnna9y0ynnni0m8lgswcmdm60l4mcv5z2m5a"; + sha256 = "0y517qpdg6v6dsdgzb365p03m30511sbyh8pq0mcvhvjwy7javpy"; }; prePatch = "patchShebangs ."; @@ -215,6 +217,6 @@ stdenv.mkDerivation { changelog = "https://www.mesa3d.org/relnotes/${version}.html"; license = licenses.mit; # X11 variant, in most files platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ vcunat ]; + maintainers = with maintainers; [ primeos vcunat ]; # Help is welcome :) }; } From 3a4fec82326f53fd14721aa3c4fd8560752f8982 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 6 May 2020 10:23:32 -0700 Subject: [PATCH 0423/3452] mxnet: use blas.provider, fix build --- pkgs/applications/science/math/mxnet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index b006a9dd18d1..3d74421669ea 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; - buildInputs = [ opencv3 gtest blas ] + buildInputs = [ opencv3 gtest blas.provider ] ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] ++ lib.optional cudnnSupport cudnn; From 80c9f3072bd0176ab8cd6b30e9c24c5e89833d3f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 28 May 2020 20:00:37 -0700 Subject: [PATCH 0424/3452] sqlite: 3.32.0 -> 3.32.1 --- pkgs/development/libraries/sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index b5fd7361e892..dce86699a025 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.32.0"; + version = "3.32.1"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "195x23f083s38gla4id4qvcx04p5p5jpdi29369cip7mfkyig0sr"; + sha256 = "043xzxpvyi3n2lp9831bd0jg3r98n81myfjfcspxiaqnzfmlhrs8"; }; outputs = [ "bin" "dev" "out" ]; From 8f16f66b27c6abcfaa04244f9e715376035dcfcb Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Fri, 29 May 2020 12:20:06 +0200 Subject: [PATCH 0425/3452] nixos/networking: check interface state files exist before acting on them Fix #89158 --- .../tasks/network-interfaces-scripted.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index d895c58bab03..2e87197176b6 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -232,18 +232,22 @@ let ''; preStop = '' state="/run/nixos/network/routes/${i.name}" - while read cidr; do - echo -n "deleting route $cidr... " - ip route del "$cidr" dev "${i.name}" >/dev/null 2>&1 && echo "done" || echo "failed" - done < "$state" - rm -f "$state" + if [ -e "$state" ]; then + while read cidr; do + echo -n "deleting route $cidr... " + ip route del "$cidr" dev "${i.name}" >/dev/null 2>&1 && echo "done" || echo "failed" + done < "$state" + rm -f "$state" + fi state="/run/nixos/network/addresses/${i.name}" - while read cidr; do - echo -n "deleting address $cidr... " - ip addr del "$cidr" dev "${i.name}" >/dev/null 2>&1 && echo "done" || echo "failed" - done < "$state" - rm -f "$state" + if [ -e "$state" ]; then + while read cidr; do + echo -n "deleting address $cidr... " + ip addr del "$cidr" dev "${i.name}" >/dev/null 2>&1 && echo "done" || echo "failed" + done < "$state" + rm -f "$state" + fi ''; }; From 7f76daacdb0190ce91c95111cc3eba49cea41fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 29 May 2020 15:29:20 +0200 Subject: [PATCH 0426/3452] zstd: get rid of static libs if enableShared --- pkgs/tools/compression/zstd/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index a7ae4d0b3ba8..ee006a55ea3a 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DZSTD_BUILD_SHARED:BOOL=${if enableShared then "ON" else "OFF"}" + # They require STATIC for bin/zstd and tests. "-DZSTD_LEGACY_SUPPORT:BOOL=${if legacySupport then "ON" else "OFF"}" "-DZSTD_BUILD_TESTS:BOOL=ON" ]; @@ -54,6 +55,8 @@ stdenv.mkDerivation rec { substituteInPlace ../programs/zstdless \ --replace "zstdcat" "$bin/bin/zstdcat" ''; + # Don't duplicate the library code in runtime closures. + postInstall = stdenv.lib.optionalString enableShared ''rm "$out"/lib/libzstd.a''; outputs = [ "bin" "dev" "man" "out" ]; From 81b204e8a126a9c3c5de51cc23f0233c842de429 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 29 May 2020 20:21:04 +0200 Subject: [PATCH 0427/3452] python.pkgs.cython: use pkg-config instead of python.pkgs.pkgconfig It does not need the Python interface to pkg-config. Note I think the majority of Python packages that use pkgconfig should actually use pkg-config. --- pkgs/development/python-modules/Cython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 2d987abb3e48..f0b8a5dd560d 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -5,7 +5,7 @@ , fetchpatch , python , glibcLocales -, pkgconfig +, pkg-config , gdb , numpy , ncurses @@ -34,7 +34,7 @@ in buildPythonPackage rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config ]; checkInputs = [ numpy ncurses From 7fe783903e0345c76a75c41d1ceabc8265184be5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 29 May 2020 20:41:49 +0200 Subject: [PATCH 0428/3452] python.pkgs.pkgconfig: fix setup hook after regression caused by https://github.com/NixOS/nixpkgs/pull/87705 --- pkgs/development/python-modules/pkgconfig/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index ff9e3cc39aa3..05f13e8878a3 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -4,7 +4,13 @@ buildPythonPackage rec { pname = "pkgconfig"; version = "1.5.1"; - setupHooks = pkgconfig.setupHooks; + inherit (pkgconfig) + setupHooks + wrapperName + suffixSalt + targetPrefix + baseBinName + ; src = fetchPypi { inherit pname version; From 20aa1cc95c5fc67919a5a178933681eee4b8355a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 29 May 2020 20:42:11 +0200 Subject: [PATCH 0429/3452] python.pkgs.python-lz4: buildInputs are nativeBuildInputs --- pkgs/development/python-modules/python-lz4/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index 4c66ed02cfca..e9317d3f7c67 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "02cadqfdmw4vc94px18dh4hcybpsa2lr6jz6j5phwc0jjaavh3wr"; }; - buildInputs = [ setuptools_scm pkgconfig pytestrunner ]; + nativeBuildInputs = [ setuptools_scm pkgconfig pytestrunner ]; checkInputs = [ pytest pytestcov psutil ]; propagatedBuildInputs = lib.optionals (!isPy3k) [ future ]; From 9ab24ec76b7b950d48814ac51e54bd93ea187a0a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 23 May 2020 14:53:23 +0200 Subject: [PATCH 0430/3452] libva-utils: refactor Note: This doesn't affect the result. --- pkgs/development/libraries/libva-utils/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix index a4de995ada85..90f1849aee02 100644 --- a/pkgs/development/libraries/libva-utils/default.nix +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig -, libdrm, libva, libX11, libXext, libXfixes, wayland, meson, ninja +{ stdenv, fetchFromGitHub, meson, ninja, pkg-config +, libdrm, libva, libX11, libXext, libXfixes, wayland }: stdenv.mkDerivation rec { @@ -13,18 +13,10 @@ stdenv.mkDerivation rec { sha256 = "13a0dccphi4cpr2cx45kg4djxsssi3d1fcjrkx27b16xiayp5lx9"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libdrm libva libX11 libXext libXfixes wayland ]; - mesonFlags = [ - "-Ddrm=true" - "-Dx11=true" - "-Dwayland=true" - ]; - - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A collection of utilities and examples for VA-API"; longDescription = '' From a668f6a58ae9ede86b602cd4bfff9e9a69287497 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 23 May 2020 18:55:54 +0200 Subject: [PATCH 0431/3452] libva: Switch from GNU Autotools to Meson --- pkgs/development/libraries/libva/default.nix | 36 ++++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 86c6a88b1ef4..d0bd2ecc009b 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig -, libXext, libdrm, libXfixes, wayland, libffi, libX11 -, libGL, mesa +{ stdenv, lib, fetchFromGitHub, fetchpatch, meson, pkg-config, ninja, wayland +, libdrm , minimal ? false, libva-minimal -, buildPackages +, libX11, libXext, libXfixes, libffi, libGL +, mesa }: stdenv.mkDerivation rec { @@ -17,24 +17,30 @@ stdenv.mkDerivation rec { sha256 = "0ywasac7z3hwggj8szp83sbxi2naa0a3amblx64y7i1hyyrn0csq"; }; + patches = [ + (fetchpatch { # meson: Allow for libdir and includedir to be absolute paths + url = "https://github.com/intel/libva/commit/de902e2905abff635f3bb151718cc52caa3f669c.patch"; + sha256 = "1lpc8qzvsxnlsh9g0ab5lja204zxz8rr2p973pfihcw7dcxc3gia"; + }) + ]; + + postPatch = '' + # Remove the execute bit from all source code files + # https://github.com/intel/libva/commit/dbd2cd635f33af1422cbc2079af0a7e68671c102 + chmod -x va/va{,_dec_av1,_trace,_vpp}.h + ''; + outputs = [ "dev" "out" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig wayland ]; + nativeBuildInputs = [ meson pkg-config ninja wayland ]; buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libva-minimal libX11 libXext libXfixes wayland libffi libGL ]; # TODO: share libs between minimal and !minimal - perhaps just symlink them - enableParallelBuilding = true; - - configureFlags = [ - # Add FHS paths for non-NixOS applications. - "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" - "ac_cv_path_WAYLAND_SCANNER=${buildPackages.wayland}/bin/wayland-scanner" - ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; - - installFlags = [ - "dummy_drv_video_ladir=$(out)/lib/dri" + mesonFlags = [ + # Add FHS paths for non-NixOS applications: + "-Ddriverdir=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" ]; meta = with stdenv.lib; { From c2039e1901aca58527d8c1a3206accac3b8482cb Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 29 May 2020 22:29:32 -0500 Subject: [PATCH 0432/3452] mesa: make more things optional (#87438) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit osmesa & gallium-nine are not needed for all systems. So this adds a flag to disable them if you don’t want them. --- pkgs/development/libraries/mesa/default.nix | 36 +++++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index aa70e9e5a549..e46f3fb14882 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -11,6 +11,8 @@ , eglPlatforms ? [ "x11" "surfaceless" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] , OpenGL, Xplugin , withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light +, enableGalliumNine ? stdenv.isLinux +, enableOSMesa ? stdenv.isLinux }: /** Packaging design: @@ -79,7 +81,7 @@ stdenv.mkDerivation { "find_program('${buildPackages.pkg-config.targetPrefix}pkg-config')" ''; - outputs = [ "out" "dev" "drivers" "osmesa" ]; + outputs = [ "out" "dev" "drivers" ] ++ lib.optional enableOSMesa "osmesa"; # TODO: Figure out how to enable opencl without having a runtime dependency on clang mesonFlags = [ @@ -103,10 +105,10 @@ stdenv.mkDerivation { "-Domx-libs-path=${placeholder "drivers"}/lib/bellagio" "-Dva-libs-path=${placeholder "drivers"}/lib/dri" "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d" + "-Dgallium-nine=${if enableGalliumNine then "true" else "false"}" # Direct3D in Wine + "-Dosmesa=${if enableOSMesa then "gallium" else "none"}" # used by wine ] ++ optionals stdenv.isLinux [ "-Dglvnd=true" - "-Dosmesa=gallium" # used by wine - "-Dgallium-nine=true" # Direct3D in Wine ]; buildInputs = with xorg; [ @@ -142,17 +144,17 @@ stdenv.mkDerivation { '' + optionalString stdenv.isLinux '' mkdir -p $drivers/lib - # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM - mv -t $drivers/lib \ - $out/lib/libxatracker* \ - $out/lib/libvulkan_* + if [ -n "$(shopt -s nullglob; echo "$out/lib/libxatracker"*)" -o -n "$(shopt -s nullglob; echo "$out/lib/libvulkan_"*)" ]; then + # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM + mv -t $drivers/lib \ + $out/lib/libxatracker* \ + $out/lib/libvulkan_* + fi - # Move other drivers to a separate output - mv $out/lib/lib*_mesa* $drivers/lib - - # move libOSMesa to $osmesa, as it's relatively big - mkdir -p $osmesa/lib - mv -t $osmesa/lib/ $out/lib/libOSMesa* + if [ -n "$(shopt -s nullglob; echo "$out"/lib/lib*_mesa*)" ]; then + # Move other drivers to a separate output + mv $out/lib/lib*_mesa* $drivers/lib + fi # move vendor files mv $out/share/ $drivers/ @@ -167,6 +169,10 @@ stdenv.mkDerivation { for js in $drivers/share/vulkan/icd.d/*.json; do substituteInPlace "$js" --replace "$out" "$drivers" done + '' + lib.optionalString enableOSMesa '' + # move libOSMesa to $osmesa, as it's relatively big + mkdir -p $osmesa/lib + mv -t $osmesa/lib/ $out/lib/libOSMesa* ''; # TODO: @@ -181,7 +187,9 @@ stdenv.mkDerivation { # Update search path used by pkg-config for pc in $dev/lib/pkgconfig/{d3d,dri,xatracker}.pc; do - substituteInPlace "$pc" --replace $out $drivers + if [ -f "$pc" ]; then + substituteInPlace "$pc" --replace $out $drivers + fi done # add RPATH so the drivers can find the moved libgallium and libdricore9 From 7ed1ae0d6b64e2599f3f9c24458aa5ec52f9bf6d Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 30 May 2020 00:45:57 -0700 Subject: [PATCH 0433/3452] 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 3f08d642feb52ec08b09cff2ef668f3753a1803a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 31 May 2020 09:11:45 +0200 Subject: [PATCH 0434/3452] glibc: patch CVE-2020-1752 /cc roundup #88306; the issue seems quite serious to me. I also made two other patches non-conditional, as we rebuild all platforms anyway. --- .../libraries/glibc/2.30-cve-2020-1752.patch | 62 +++++++++++++++++++ pkgs/development/libraries/glibc/common.nix | 4 +- 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/glibc/2.30-cve-2020-1752.patch diff --git a/pkgs/development/libraries/glibc/2.30-cve-2020-1752.patch b/pkgs/development/libraries/glibc/2.30-cve-2020-1752.patch new file mode 100644 index 000000000000..75d874b93d09 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.30-cve-2020-1752.patch @@ -0,0 +1,62 @@ +From: Andreas Schwab +Date: Wed, 19 Feb 2020 16:21:46 +0000 (+0100) +Subject: Fix use-after-free in glob when expanding ~user (bug 25414) +X-Git-Url: https://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=da97c6b88eb03fb834e92964b0895c2ac8d61f63;hp=dd34bce38c822b67fcc42e73969bf6699d6874b6 + +Fix use-after-free in glob when expanding ~user (bug 25414) + +The value of `end_name' points into the value of `dirname', thus don't +deallocate the latter before the last use of the former. + +(cherry picked from commit ddc650e9b3dc916eab417ce9f79e67337b05035c) +--- + +diff --git a/posix/glob.c b/posix/glob.c +index e73e35c510..c6cbd0eb43 100644 +--- a/posix/glob.c ++++ b/posix/glob.c +@@ -827,31 +827,32 @@ __glob (const char *pattern, int flags, int (*errfunc) (const char *, int), + { + size_t home_len = strlen (p->pw_dir); + size_t rest_len = end_name == NULL ? 0 : strlen (end_name); +- char *d; ++ char *d, *newp; ++ bool use_alloca = glob_use_alloca (alloca_used, ++ home_len + rest_len + 1); + +- if (__glibc_unlikely (malloc_dirname)) +- free (dirname); +- malloc_dirname = 0; +- +- if (glob_use_alloca (alloca_used, home_len + rest_len + 1)) +- dirname = alloca_account (home_len + rest_len + 1, +- alloca_used); ++ if (use_alloca) ++ newp = alloca_account (home_len + rest_len + 1, alloca_used); + else + { +- dirname = malloc (home_len + rest_len + 1); +- if (dirname == NULL) ++ newp = malloc (home_len + rest_len + 1); ++ if (newp == NULL) + { + scratch_buffer_free (&pwtmpbuf); + retval = GLOB_NOSPACE; + goto out; + } +- malloc_dirname = 1; + } +- d = mempcpy (dirname, p->pw_dir, home_len); ++ d = mempcpy (newp, p->pw_dir, home_len); + if (end_name != NULL) + d = mempcpy (d, end_name, rest_len); + *d = '\0'; + ++ if (__glibc_unlikely (malloc_dirname)) ++ free (dirname); ++ dirname = newp; ++ malloc_dirname = !use_alloca; ++ + dirlen = home_len + rest_len; + dirname_modified = 1; + } diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 0429c7295fb8..36b6bea61cd4 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -106,10 +106,10 @@ stdenv.mkDerivation ({ url = "https://salsa.debian.org/glibc-team/glibc/raw/49767c9f7de4828220b691b29de0baf60d8a54ec/debian/patches/localedata/locale-C.diff"; sha256 = "0irj60hs2i91ilwg5w7sqrxb695c93xg0ik7yhhq9irprd7fidn4"; }) - ] - ++ lib.optionals stdenv.isx86_64 [ + ./fix-x64-abi.patch ./2.27-CVE-2019-19126.patch + ./2.30-cve-2020-1752.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; From 0ef57f516a54037ffa7ec2b5669c84ce5faba8bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 31 May 2020 11:15:42 +0200 Subject: [PATCH 0435/3452] sqlite-analyzer: 3.31.1 -> 3.32.1 It needs to be synced with sqlite itself. --- pkgs/development/libraries/sqlite/analyzer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 4e37febbe756..c4a09d041fcf 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "sqlite-analyzer"; - version = "3.31.1"; + version = "3.32.1"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; - sha256 = "0n7f3w59gr80s6k4l5a9bp2s97dlfapfbhb3qdhak6axhn127p7j"; + sha256 = "1l3jg1564p1fjga70zm1mg64bsbys9wq4canxyy0v0mb6kb7vk2w"; }; nativeBuildInputs = [ unzip ]; From 2995b47fa0d50392fc3c4d41155bf51f2d5d82d8 Mon Sep 17 00:00:00 2001 From: TheBrainScrambler <34945377+TheBrainScrambler@users.noreply.github.com> Date: Sun, 17 May 2020 11:07:00 +0000 Subject: [PATCH 0436/3452] maintainers: add TheBrainScrambler --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fda8fd8d204c..3b44650cb27b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7654,6 +7654,12 @@ githubId = 1141680; name = "Thane Gill"; }; + TheBrainScrambler = { + email = "the.pumpkin.man@disroot.org"; # This could change soon + github = "TheBrainScrambler"; + githubId = 34945377; + name = "John Smith"; + }; thedavidmeister = { email = "thedavidmeister@gmail.com"; github = "thedavidmeister"; From 50bf5e5d8c4b426c54bcb67913371349b6d823e3 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Sun, 31 May 2020 13:37:26 +0200 Subject: [PATCH 0437/3452] 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 0438/3452] 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 0439/3452] 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 164985ab68e3a10b75c58dd00bd325f8f219025d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Lang?= Date: Sun, 31 May 2020 16:45:01 -0300 Subject: [PATCH 0440/3452] mpv: disable samba support by default samba support will be dropped in mpv upstream in its next release (see https://github.com/mpv-player/mpv/commit/3b8b7cb9d481828953f105f92bacc07a3cb2f332). Also, using it triggered segmentation faults when using luasocket. Closes #88584 --- pkgs/applications/video/mpv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 9cb39d681401..ff837756e3db 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -39,7 +39,7 @@ , libpngSupport ? true, libpng ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , rubberbandSupport ? stdenv.isLinux, rubberband ? null -, sambaSupport ? stdenv.isLinux, samba ? null +, sambaSupport ? false, samba ? null , screenSaverSupport ? true, libXScrnSaver ? null , sdl2Support ? true, SDL2 ? null , sndioSupport ? true, sndio ? null From 59e8e7a129c1f9f657139b8554e1adf41c26de40 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 31 May 2020 20:47:32 +0200 Subject: [PATCH 0441/3452] rust: improve docs Co-authored-by: cole-h Co-authored-by: asymmetric --- doc/languages-frameworks/rust.section.md | 54 +++++++++++----------- nixos/doc/manual/release-notes/rl-2009.xml | 10 ++-- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 066633b53c43..7e5cff8ff607 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -79,11 +79,12 @@ pkgs.rustPlatform.buildRustPackage { When using `buildRustPackage`, the `checkPhase` is enabled by default and runs `cargo test` on the package to build. To make sure that we don't compile the -sources twice and to actually test the artifacts that will be used after that, -the tests will be ran in the `release`-mode by default. +sources twice and to actually test the artifacts that will be used at runtime, +the tests will be ran in the `release` mode by default. However, in some cases the test-suite of a package doesn't work properly in the -`release` mode. In that case, the mode for `checkPhase` can be changed like this: +`release` mode. For these situations, the mode for `checkPhase` can be changed like +so: ```nix rustPlatform.buildRustPackage { @@ -92,37 +93,37 @@ rustPlatform.buildRustPackage { } ``` -#### Tests relying on the structure of the `target/`-directory +Please note that the code will be compiled twice here: once in `release` mode +for the `buildPhase`, and again in `debug` mode for the `checkPhase`. -Some tests may rely on the structure of the `target/`-directory. Those tests -are likely to fail since we use `cargo --target` during build. This means that +#### Tests relying on the structure of the `target/` directory + +Some tests may rely on the structure of the `target/` directory. Those tests +are likely to fail because we use `cargo --target` during the build. This means that the artifacts -[are stored in `target//release/`](https://doc.rust-lang.org/cargo/guide/build-cache.html) -rather than `target/release/`. +[are stored in `target//release/`](https://doc.rust-lang.org/cargo/guide/build-cache.html), +rather than in `target/release/`. -This can only be circumvented by patching the affected tests accordingly. +This can only be worked around by patching the affected tests accordingly. #### Disabling package-tests -In some cases it's necessary to disable the tests (which can be done by declaring -`doCheck = false;`) which is fine in the following cases: +In some instances, it may be necessary to disable testing altogether (with `doCheck = false;`): -* If no tests exist, the `checkPhase` should be explicitly disabled to skip - unnecessary build-steps to speed-up the build. +* If no tests exist -- the `checkPhase` should be explicitly disabled to skip + unnecessary build steps to speed up the build. +* If tests are highly impure (e.g. due to network usage). -* If tests are highly impure (e.g. due to heavy network usage), it's also fine - disable tests. +There will obviously be some corner-cases not listed above where it's sensible to disable tests. +The above are just guidelines, and exceptions may be granted on a case-by-case basis. -There are obviously some other corner-cases where it's sensible to disable tests, -those aren't hard-rules, in the end this is a case-by-case decision. +However, please check if it's possible to disable a problematic subset of the +test suite and leave a comment explaining your reasoning. -Please check however if it's possible to disable a problematic subset of the -test-suite and leave comment which explains why that's needed. +### Building a package in `debug` mode -### Building a package in the `debug` mode - -By default, `buildRustPackage` will use the `release`-mode for building. If a package -should be built in the `debug`-mode however, it can be configured like this: +By default, `buildRustPackage` will use `release` mode for builds. If a package +should be built in `debug` mode, it can be configured like so: ```nix rustPlatform.buildRustPackage { @@ -131,15 +132,14 @@ rustPlatform.buildRustPackage { } ``` -Obviously, the `checkPhase` will be ran in `debug`-mode as well in this case. +In this scenario, the `checkPhase` will be ran in `debug` mode as well. ### Custom `build`/`install`-procedures Some packages may use custom scripts for building/installing, e.g. with a `Makefile`. -In that case it's recommended to always override the `build-`/`install-`/`checkPhase`. +In these cases, it's recommended to override the `buildPhase`/`installPhase`/`checkPhase`. -Otherwise, it may be possible that one of the internal steps fails because of the -modified directory structure of `target/`. +Otherwise, some steps may fail because of the modified directory structure of `target/`. ## Compiling Rust crates using Nix instead of Cargo diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index afd3b5040982..04b0802ad91f 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -360,14 +360,14 @@ php.override { - Packages built using buildRustPackage now use the release + Packages built using buildRustPackage now use release mode for the checkPhase by default. - Please note that rust-packages utilizing a custom build/install-procedure - (e.g. by using a Makefile) or test-suites that rely on the - structure in the target/-directory may break because of that. - For further information, please read the rust-section in the nixpkgs manual. + Please note that Rust packages utilizing a custom build/install procedure + (e.g. by using a Makefile) or test suites that rely on the + structure of the target/ directory may break due to those assumptions. + For further information, please read the Rust section in the Nixpkgs manual. From ce5d2286770b91f252d2ea42ed09ca90f24f4767 Mon Sep 17 00:00:00 2001 From: GTrunsec Date: Sun, 31 May 2020 13:50:36 -0700 Subject: [PATCH 0442/3452] julia: fix missing LDlib lapack --- pkgs/development/compilers/julia/1.3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix index b67a78b4a5ab..15694734d487 100644 --- a/pkgs/development/compilers/julia/1.3.nix +++ b/pkgs/development/compilers/julia/1.3.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH = makeLibraryPath [ arpack fftw fftwSinglePrec gmp libgit2 mpfr blas openlibm - openspecfun pcre2 + openspecfun pcre2 lapack ]; enableParallelBuilding = true; From 91b828f22bff2d48815c8ba9a7ecabfe195dcbd7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 31 May 2020 19:44:52 -0400 Subject: [PATCH 0443/3452] uriparser: 0.9.3 -> 0.9.4 --- pkgs/development/libraries/uriparser/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index de621b30e247..a12f040bf49c 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -2,22 +2,14 @@ stdenv.mkDerivation rec { pname = "uriparser"; - version = "0.9.3"; + version = "0.9.4"; # Release tarball differs from source tarball src = fetchurl { url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2"; - sha256 = "13z234jdaqs9jj7i66gcv4q1rgsypjz6cighnlm1j4g80pdlmbr8"; + sha256 = "0yzqp1j6sglyrmwcasgn7zlwg841p3nbxy0h78ngq20lc7jspkdp"; }; - patches = [ - # fixes tests - (fetchpatch { - url = "https://github.com/uriparser/uriparser/commit/f870e6c68696a6018702caa5c8a2feba9b0f99fa.diff"; - sha256 = "1nd6bhys9hwy6ippa42vm95zhw6hldm1s4xbdzmdjswc96as1ff5"; - }) - ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ From e5e4d387e11e2d877acd7cfc791b63e42000116b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 3 Oct 2019 16:57:51 +0300 Subject: [PATCH 0444/3452] pythonPackages.python-pam: init at 1.8.4 --- .../python-modules/python-pam/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/python-pam/default.nix diff --git a/pkgs/development/python-modules/python-pam/default.nix b/pkgs/development/python-modules/python-pam/default.nix new file mode 100644 index 000000000000..4065cd7c0145 --- /dev/null +++ b/pkgs/development/python-modules/python-pam/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pam }: + +buildPythonPackage rec { + pname = "python-pam"; + version = "1.8.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "16whhc0vr7gxsbzvsnq65nq8fs3wwmx755cavm8kkczdkz4djmn8"; + }; + + postPatch = '' + substituteInPlace pam.py --replace 'find_library("pam")' \ + '"${pam}/lib/libpam${stdenv.hostPlatform.extensions.sharedLibrary}"' + ''; + + meta = with stdenv.lib; { + description = "Python PAM module using ctypes"; + homepage = "https://github.com/FirefighterBlu3/python-pam"; + maintainers = with maintainers; [ abbradar ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b772561929c..50d3b48c8c0a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3316,6 +3316,8 @@ in { python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; + python-pam = callPackage ../development/python-modules/python-pam { }; + pythonix = callPackage ../development/python-modules/pythonix { inherit (pkgs) meson pkgconfig; }; From 9f0da72abc39765471b60f7d33bb011eb5456bfb Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 3 Oct 2019 16:59:06 +0300 Subject: [PATCH 0445/3452] matrix-synapse: factor out plugins We build plugins separately from the server now. --- pkgs/servers/matrix-synapse/default.nix | 27 +++++-------------- .../matrix-synapse/plugins/default.nix | 5 ++++ pkgs/servers/matrix-synapse/plugins/ldap3.nix | 17 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 31 insertions(+), 20 deletions(-) create mode 100644 pkgs/servers/matrix-synapse/plugins/default.nix create mode 100644 pkgs/servers/matrix-synapse/plugins/ldap3.nix diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index d2c1afa0e7ca..15df735b7072 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -5,23 +5,9 @@ with python3.pkgs; let - matrix-synapse-ldap3 = buildPythonPackage rec { - pname = "matrix-synapse-ldap3"; - version = "0.1.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "01bms89sl16nyh9f141idsz4mnhxvjrc3gj721wxh1fhikps0djx"; - }; - - propagatedBuildInputs = [ service-identity ldap3 twisted ]; - - # ldaptor is not ready for py3 yet - doCheck = !isPy3k; - checkInputs = [ ldaptor mock ]; - }; - -in buildPythonApplication rec { + plugins = python3.pkgs.callPackage ./plugins { }; +in +buildPythonApplication rec { pname = "matrix-synapse"; version = "1.14.0"; @@ -45,7 +31,6 @@ in buildPythonApplication rec { jinja2 jsonschema lxml - matrix-synapse-ldap3 msgpack netaddr phonenumbers @@ -79,12 +64,14 @@ in buildPythonApplication rec { doCheck = !stdenv.isDarwin; - passthru.tests = { inherit (nixosTests) matrix-synapse; }; - checkPhase = '' PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests ''; + passthru.tests = { inherit (nixosTests) matrix-synapse; }; + passthru.plugins = plugins; + passthru.python = python3; + meta = with stdenv.lib; { homepage = "https://matrix.org"; description = "Matrix reference homeserver"; diff --git a/pkgs/servers/matrix-synapse/plugins/default.nix b/pkgs/servers/matrix-synapse/plugins/default.nix new file mode 100644 index 000000000000..e32ba673d291 --- /dev/null +++ b/pkgs/servers/matrix-synapse/plugins/default.nix @@ -0,0 +1,5 @@ +{ callPackage }: + +{ + matrix-synapse-ldap3 = callPackage ./ldap3.nix { }; +} diff --git a/pkgs/servers/matrix-synapse/plugins/ldap3.nix b/pkgs/servers/matrix-synapse/plugins/ldap3.nix new file mode 100644 index 000000000000..9f1aec20033b --- /dev/null +++ b/pkgs/servers/matrix-synapse/plugins/ldap3.nix @@ -0,0 +1,17 @@ +{ isPy3k, buildPythonPackage, fetchPypi, service-identity, ldap3, twisted, ldaptor, mock }: + +buildPythonPackage rec { + pname = "matrix-synapse-ldap3"; + version = "0.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "01bms89sl16nyh9f141idsz4mnhxvjrc3gj721wxh1fhikps0djx"; + }; + + propagatedBuildInputs = [ service-identity ldap3 twisted ]; + + # ldaptor is not ready for py3 yet + doCheck = !isPy3k; + checkInputs = [ ldaptor mock ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f6c5dfea4f8..cee2dd78fccc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4706,6 +4706,8 @@ in (https://github.com/NixOS/nixpkgs/issues/76093) */ matrix-synapse = callPackage ../servers/matrix-synapse { /*python3 = python38;*/ }; + matrix-synapse-plugins = recurseIntoAttrs matrix-synapse.plugins; + matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {}; mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); From b5e9f87f82d4221f7504fa5d2c7da0c31b3263a8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 3 Oct 2019 17:00:11 +0300 Subject: [PATCH 0446/3452] matrix-synapse-plugins.matrix-synapse-pam: init at 0.1.2 --- pkgs/servers/matrix-synapse/plugins/default.nix | 1 + pkgs/servers/matrix-synapse/plugins/pam.nix | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/servers/matrix-synapse/plugins/pam.nix diff --git a/pkgs/servers/matrix-synapse/plugins/default.nix b/pkgs/servers/matrix-synapse/plugins/default.nix index e32ba673d291..f3dbaa1573f0 100644 --- a/pkgs/servers/matrix-synapse/plugins/default.nix +++ b/pkgs/servers/matrix-synapse/plugins/default.nix @@ -2,4 +2,5 @@ { matrix-synapse-ldap3 = callPackage ./ldap3.nix { }; + matrix-synapse-pam = callPackage ./pam.nix { }; } diff --git a/pkgs/servers/matrix-synapse/plugins/pam.nix b/pkgs/servers/matrix-synapse/plugins/pam.nix new file mode 100644 index 000000000000..47ee28a7794c --- /dev/null +++ b/pkgs/servers/matrix-synapse/plugins/pam.nix @@ -0,0 +1,15 @@ +{ buildPythonPackage, fetchFromGitHub, twisted, python-pam }: + +buildPythonPackage rec { + pname = "matrix-synapse-pam"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "14mRh4X0r"; + repo = "matrix-synapse-pam"; + rev = "v${version}"; + sha256 = "10byma9hxz3g4sirw5sa4pvljn83h9vs7zc15chhpl2n14bdx45l"; + }; + + propagatedBuildInputs = [ twisted python-pam ]; +} From cd92184f3de50335c54cec707c5fa9a40e50a3f4 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 3 Oct 2019 17:00:41 +0300 Subject: [PATCH 0447/3452] matrix-synapse service: add plugins option --- nixos/modules/services/misc/matrix-synapse.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 703bc9416f88..8ed4bbdd031c 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -9,6 +9,9 @@ let logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig; mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${boolToString r.compress}}''; mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${boolToString l.tls}, x_forwarded: ${boolToString l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}''; + pluginsEnv = cfg.package.python.buildEnv.override { + extraLibs = cfg.plugins; + }; configFile = pkgs.writeText "homeserver.yaml" '' ${optionalString (cfg.tls_certificate_path != null) '' tls_certificate_path: "${cfg.tls_certificate_path}" @@ -125,6 +128,14 @@ in { Overridable attribute of the matrix synapse server package to use. ''; }; + plugins = mkOption { + type = types.listOf types.package; + default = [ ]; + defaultText = "with config.services.matrix-synapse.package.plugins [ matrix-synapse-ldap3 matrix-synapse-pam ]"; + description = '' + List of additional Matrix plugins to make available. + ''; + }; no_tls = mkOption { type = types.bool; default = false; @@ -686,6 +697,7 @@ in { --keys-directory ${cfg.dataDir} \ --generate-keys ''; + environment.PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ]; serviceConfig = { Type = "notify"; User = "matrix-synapse"; From e215c3bcac09ea3c1b1c9a5f9acd65b8e1791133 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 31 May 2020 11:02:48 +0100 Subject: [PATCH 0448/3452] agda: install literate files --- doc/languages-frameworks/agda.section.md | 12 +++++++++++- pkgs/build-support/agda/default.nix | 13 ++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index 8cba6d9faa7d..72b895f5da12 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/doc/languages-frameworks/agda.section.md @@ -67,7 +67,17 @@ A derivation can then be written using `agdaPackages.mkDerivation`. This has sim + `libraryName` should be the name that appears in the `*.agda-lib` file, defaulting to `pname`. + `libraryFile` should be the file name of the `*.agda-lib` file, defaulting to `${libraryName}.agda-lib`. -The build phase for `agdaPackages.mkDerivation` simply runs `agda` on the `Everything.agda` file. If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden (or a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the `Everything.agda` file). `agda` and the Agda libraries contained in `buildInputs` are made available during the build phase. The install phase simply copies all `.agda`, `.agdai` and `.agda-lib` files to the output directory. Again, this can be overridden. +### Build phase +The default build phase for `agdaPackages.mkDerivation` simply runs `agda` on the `Everything.agda` file. +If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden. +Additionally, a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the `Everything.agda` file. +`agda` and the Agda libraries contained in `buildInputs` are made available during the build phase. + +### Install phase +The default install phase copies agda source files, agda interface files (`*.agdai`) and `*.agda-lib` files to the output directory. +This can be overridden. + +By default, agda sources are files ending on `.agda`, or literate agda files ending on `.lagda`, `.lagda.tex`, `.lagda.org`, `.lagda.md`, `.lagda.rst`. The list of recognised agda source extensions can be extended by setting the `extraExtensions` config variable. To add an agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other agda libraries, so the top line of the `default.nix` can look like: ``` diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 205aff555730..3c973e8cc0ac 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -30,6 +30,16 @@ let withPackages = arg: if builtins.isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; }; + extensions = [ + "agda" + "agda-lib" + "agdai" + "lagda" + "lagda.md" + "lagda.org" + "lagda.rst" + "lagda.tex" + ]; defaults = { pname @@ -39,6 +49,7 @@ let , libraryFile ? "${libraryName}.agda-lib" , buildPhase ? null , installPhase ? null + , extraExtensions ? [] , ... }: let agdaWithArgs = withPackages (builtins.filter (p: p ? isAgdaDerivation) buildInputs); @@ -59,7 +70,7 @@ let installPhase = if installPhase != null then installPhase else '' runHook preInstall mkdir -p $out - find \( -name '*.agda' -or -name '*.agdai' -or -name '*.agda-lib' \) -exec cp -p --parents -t "$out" {} + + find \( ${concatMapStringsSep " -or " (p: "-name '*.${p}'") (extensions ++ extraExtensions)} \) -exec cp -p --parents -t "$out" {} + runHook postInstall ''; }; From 108273bc1b16a46fb44e99061d815dae9d4e6e4a Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 2 Jun 2020 01:13:56 +0200 Subject: [PATCH 0449/3452] verifpal: 0.7.5 -> 0.13.7 Switch from buildGoPackage to buildGoModule. --- pkgs/tools/security/verifpal/default.nix | 30 ++++++++++-------------- pkgs/tools/security/verifpal/deps.nix | 12 ---------- 2 files changed, 12 insertions(+), 30 deletions(-) delete mode 100644 pkgs/tools/security/verifpal/deps.nix diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/tools/security/verifpal/default.nix index e1e5e100bd11..a3f3132aa3cb 100644 --- a/pkgs/tools/security/verifpal/default.nix +++ b/pkgs/tools/security/verifpal/default.nix @@ -1,35 +1,29 @@ { lib , fetchgit -, buildGoPackage +, buildGoModule , pigeon }: -buildGoPackage rec { +buildGoModule rec { pname = "verifpal"; - version = "0.7.5"; - - goPackagePath = "github.com/SymbolicSoft/verifpal"; - goDeps = ./deps.nix; + version = "0.13.7"; src = fetchgit { url = "https://source.symbolic.software/verifpal/verifpal.git"; - rev = version; - sha256 = "0njgn6j5qg5kgid6ddv23axhw5gwjbayhdjkj4ya08mnxndr284m"; + rev = "v${version}"; + sha256 = "1ia3mxwcvcxghga2vvhf6mia59cm3jl7vh8laywh421bfj42sh9d"; }; + vendorSha256 = "0cmj6h103igg5pcs9c9wrcmrsf0mwp9vbgzf5amsnj1206ryb1p2"; + nativeBuildInputs = [ pigeon ]; - postPatch = '' - sed -e 's|/bin/echo |echo |g' -i Makefile - ''; + subPackages = [ "cmd/verifpal" ]; - buildPhase = '' - make -C go/src/$goPackagePath parser linux - ''; - - installPhase = '' - mkdir -p $out/bin - cp go/src/$goPackagePath/build/bin/linux/verifpal $out/bin/ + # goversioninfo is for Windows only and can be skipped during go generate + preBuild = '' + substituteInPlace cmd/verifpal/main.go --replace "go:generate goversioninfo" "(disabled goversioninfo)" + go generate verifpal.com/cmd/verifpal ''; meta = { diff --git a/pkgs/tools/security/verifpal/deps.nix b/pkgs/tools/security/verifpal/deps.nix deleted file mode 100644 index aaa4269416a6..000000000000 --- a/pkgs/tools/security/verifpal/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/logrusorgru/aurora"; - fetch = { - type = "git"; - url = "https://github.com/logrusorgru/aurora"; - rev = "94edacc10f9b"; - sha256 = "0bhwy3rrd8mwb8xjwf44nj6vmxaj5hdvayvszr1rskkmz08l5v01"; - }; - } -] From 7da08afd273f13124ab708a2c969e426f70fa08e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 2 Jun 2020 09:29:55 +1000 Subject: [PATCH 0450/3452] go_1_13: 1.13.11 -> 1.13.12 https://golang.org/doc/devel/release.html#go1.13.minor --- pkgs/development/compilers/go/1.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index b524d3d6b093..8b013bbd6503 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.13.11"; + version = "1.13.12"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0y86q2k00lh8c7wj3lha43g804iwr61nap8j3i907l2sway1mvc9"; + sha256 = "0d5s5rqyzp6ykj4x1dz8infcsmj3gy8djnf63ji971ypwi6jrfhp"; }; # perl is used for testing go vet From 9f978147f826c55d01db6d2aeeeff2a71f80b932 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 2 Jun 2020 09:32:40 +1000 Subject: [PATCH 0451/3452] go: 1.14.3 -> 1.14.4 https://golang.org/doc/devel/release.html#go1.14.minor --- pkgs/development/compilers/go/1.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 9aaf85c598fc..e1fc3e259785 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.3"; + version = "1.14.4"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0mmgf74snprdiajgh99jjliwjl5im71qcgm5qrxpnyfisiw3f0lk"; + sha256 = "1105qk2l4kfy1ki9n9gh8j4gfqrfgfwapa1fp38hih9aphxsy4bh"; }; # perl is used for testing go vet From 1436bb9968fd14f2b992b2150c83d9b671d3a75e Mon Sep 17 00:00:00 2001 From: Aaron Lindsay Date: Fri, 29 Mar 2019 22:16:55 -0700 Subject: [PATCH 0452/3452] mspdebug: enableParallelBuilding and minor cleanup --- pkgs/development/misc/msp430/mspdebug.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix index 3c7ff00151a4..f8abc15de574 100644 --- a/pkgs/development/misc/msp430/mspdebug.nix +++ b/pkgs/development/misc/msp430/mspdebug.nix @@ -1,10 +1,15 @@ -{ stdenv, fetchFromGitHub, libusb-compat-0_1, readline ? null }: +{ stdenv +, fetchFromGitHub +, libusb-compat-0_1 +, readline ? null +, enableReadline ? true +}: -let +assert enableReadline -> readline != null; + +stdenv.mkDerivation rec { version = "0.25"; -in stdenv.mkDerivation { pname = "mspdebug"; - inherit version; src = fetchFromGitHub { owner = "dlbeer"; repo = "mspdebug"; @@ -12,9 +17,11 @@ in stdenv.mkDerivation { sha256 = "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c"; }; - buildInputs = [ libusb-compat-0_1 readline ]; - makeFlags = [ "PREFIX=$(out)" "INSTALL=install" ] ++ - (if readline == null then [ "WITHOUT_READLINE=1" ] else []); + buildInputs = [ libusb-compat-0_1 ] + ++ stdenv.lib.optional enableReadline readline; + installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; + makeFlags = stdenv.lib.optional (!enableReadline) "WITHOUT_READLINE=1"; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs"; From ceef1d2f27b4e1be6d6e3a49ed72c4c7501087df Mon Sep 17 00:00:00 2001 From: Aaron Lindsay Date: Tue, 2 Jul 2019 13:46:54 -0700 Subject: [PATCH 0453/3452] mspdebug: fix darwin build --- pkgs/development/misc/msp430/mspdebug.nix | 24 +++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix index f8abc15de574..181907a55441 100644 --- a/pkgs/development/misc/msp430/mspdebug.nix +++ b/pkgs/development/misc/msp430/mspdebug.nix @@ -3,8 +3,11 @@ , libusb-compat-0_1 , readline ? null , enableReadline ? true +, hidapi ? null +, pkg-config ? null }: +assert stdenv.isDarwin -> hidapi != null && pkg-config != null; assert enableReadline -> readline != null; stdenv.mkDerivation rec { @@ -17,11 +20,24 @@ stdenv.mkDerivation rec { sha256 = "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c"; }; - buildInputs = [ libusb-compat-0_1 ] - ++ stdenv.lib.optional enableReadline readline; - installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; - makeFlags = stdenv.lib.optional (!enableReadline) "WITHOUT_READLINE=1"; enableParallelBuilding = true; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin pkg-config; + buildInputs = [ libusb-compat-0_1 ] + ++ stdenv.lib.optional stdenv.isDarwin hidapi + ++ stdenv.lib.optional enableReadline readline; + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + # TODO: remove once a new 0.26+ release is made + substituteInPlace drivers/tilib_api.c --replace .so ${stdenv.hostPlatform.extensions.sharedLibrary} + + # Makefile only uses pkg-config if it detects homebrew + substituteInPlace Makefile --replace brew true + ''; + + installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; + makeFlags = [ "UNAME_S=$(unameS)" ] ++ + stdenv.lib.optional (!enableReadline) "WITHOUT_READLINE=1"; + unameS = stdenv.lib.optionalString stdenv.isDarwin "Darwin"; meta = with stdenv.lib; { description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs"; From 5ba76e94ec8d4d90f1f38b2ac9a2f5800fee0173 Mon Sep 17 00:00:00 2001 From: Aaron Lindsay Date: Sat, 30 Mar 2019 15:54:39 -0700 Subject: [PATCH 0454/3452] mspdebug: optional runtime dependency on TI libmsp430 --- pkgs/development/misc/msp430/mspdebug.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix index 181907a55441..471dd5b31229 100644 --- a/pkgs/development/misc/msp430/mspdebug.nix +++ b/pkgs/development/misc/msp430/mspdebug.nix @@ -1,14 +1,18 @@ { stdenv , fetchFromGitHub +, autoPatchelfHook , libusb-compat-0_1 , readline ? null , enableReadline ? true , hidapi ? null , pkg-config ? null +, mspds ? null +, enableMspds ? false }: assert stdenv.isDarwin -> hidapi != null && pkg-config != null; assert enableReadline -> readline != null; +assert enableMspds -> mspds != null; stdenv.mkDerivation rec { version = "0.25"; @@ -21,7 +25,8 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin pkg-config; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin pkg-config + ++ stdenv.lib.optional (enableMspds && stdenv.isLinux) autoPatchelfHook; buildInputs = [ libusb-compat-0_1 ] ++ stdenv.lib.optional stdenv.isDarwin hidapi ++ stdenv.lib.optional enableReadline readline; @@ -34,6 +39,15 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace brew true ''; + # TODO: wrap with MSPDEBUG_TILIB_PATH env var instead of these rpath fixups in 0.26+ + runtimeDependencies = stdenv.lib.optional enableMspds mspds; + postFixup = stdenv.lib.optionalString (enableMspds && stdenv.isDarwin) '' + # autoPatchelfHook only works on linux so... + for dep in $runtimeDependencies; do + install_name_tool -add_rpath $dep/lib $out/bin/$pname + done + ''; + installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; makeFlags = [ "UNAME_S=$(unameS)" ] ++ stdenv.lib.optional (!enableReadline) "WITHOUT_READLINE=1"; From 85760026a07d321f8f5dfd1b5363128e8c567dc5 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Tue, 2 Jun 2020 17:00:09 +1200 Subject: [PATCH 0455/3452] 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 a9eab6d2b96288a705ceca61de5a632c37576f5c Mon Sep 17 00:00:00 2001 From: DwarfMaster Date: Tue, 2 Jun 2020 11:50:36 +0200 Subject: [PATCH 0456/3452] Fix building of emacsWithPackages not findind subdirs.el --- pkgs/build-support/emacs/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 25f068cd3fa0..1f2fbd8068e7 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -174,7 +174,7 @@ runCommand mkdir -p $out/share # Link icons and desktop files into place - for dir in applications icons info man; do + for dir in applications icons info man emacs; do ln -s $emacs/share/$dir $out/share/$dir done '' From 44007dec5c96dbfa3aa2aa5850a4c05804eae38e Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Tue, 2 Jun 2020 17:01:03 +1200 Subject: [PATCH 0457/3452] 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 aeaa93c7e705f2e58a67d38b28704bdbd061e671 Mon Sep 17 00:00:00 2001 From: TheBrainScrambler Date: Sun, 17 May 2020 11:31:48 +0200 Subject: [PATCH 0458/3452] webbrowser: init at 29.0.0rc1 --- maintainers/maintainer-list.nix | 2 +- .../browsers/webbrowser/default.nix | 108 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/browsers/webbrowser/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3b44650cb27b..1a2aeb46ec1e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7655,7 +7655,7 @@ name = "Thane Gill"; }; TheBrainScrambler = { - email = "the.pumpkin.man@disroot.org"; # This could change soon + email = "esthromeris@riseup.net"; github = "TheBrainScrambler"; githubId = 34945377; name = "John Smith"; diff --git a/pkgs/applications/networking/browsers/webbrowser/default.nix b/pkgs/applications/networking/browsers/webbrowser/default.nix new file mode 100644 index 000000000000..d10758170784 --- /dev/null +++ b/pkgs/applications/networking/browsers/webbrowser/default.nix @@ -0,0 +1,108 @@ +{ stdenv, lib, fetchgit, makeDesktopItem, pkgconfig, makeWrapper +# Build +, python2, autoconf213, yasm, perl, ccache +, unzip, gnome2, gnum4 + +# Runtime +, xorg, zip, freetype, fontconfig, glibc, libffi +, dbus, dbus-glib, gtk2, alsaLib, jack2, ffmpeg +}: + +let + + libPath = lib.makeLibraryPath [ ffmpeg ]; + +in stdenv.mkDerivation rec { + pname = "webbrowser"; + version = "29.0.0rc1"; + + src = fetchgit { + url = "https://git.nuegia.net/webbrowser.git"; + rev = version; + sha256 = "1d82943mla6q3257081d946kgms91dg0n93va3zlzm9hbbqilzm6"; + fetchSubmodules = true; + }; + + desktopItem = makeDesktopItem { + name = "webbrowser"; + exec = "webbrowser %U"; + icon = "webbrowser"; + desktopName = "Web Browser"; + genericName = "Web Browser"; + categories = "Network;WebBrowser;"; + mimeType = lib.concatStringsSep ";" [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + ]; + }; + + nativeBuildInputs = [ + gnum4 makeWrapper perl pkgconfig python2 ccache + ]; + + buildInputs = [ + alsaLib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2 + unzip gnome2.GConf xorg.libXt + ]; + + enableParallelBuilding = true; + + configurePhase = '' + export MOZCONFIG=$PWD/.mozconfig + export MOZ_NOSPAM=1 + export HOME=$PWD # Needed by ccache + + cp $src/doc/mozconfig.example $MOZCONFIG + # Need to modify it + chmod 644 $MOZCONFIG + + substituteInPlace $MOZCONFIG \ + --replace "mk_add_options PYTHON=/usr/bin/python2" "mk_add_options PYTHON=${python2}/bin/python2" \ + --replace "mk_add_options AUTOCONF=/usr/bin/autoconf-2.13" "mk_add_options AUTOCONF=${autoconf213}/bin/autoconf" \ + --replace 'mk_add_options MOZ_OBJDIR=$HOME/build/wbobjects/' "" \ + --replace "ac_add_options --x-libraries=/usr/lib64" "ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]}" \ + --replace "_BUILD_64=1" "_BUILD_64=${lib.optionalString stdenv.hostPlatform.is64bit "1"}" + + echo >> $MOZCONFIG ' + # + # NixOS-specific adjustments + # + + ac_add_options --prefix=$out + + mk_add_options MOZ_MAKE_FLAGS="-j$NIX_BUILD_CORES" + ' + ''; + + buildPhase = "$src/mach build"; + + installPhase = '' + $src/mach install + + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + + for n in 16 32 48; do + size=$n"x"$n + mkdir -p $out/share/icons/hicolor/$size/apps + cp $src/webbrowser/branding/unofficial/default$n.png \ + $out/share/icons/hicolor/$size/apps/webbrowser.png + done + + # Needed to make videos work + wrapProgram $out/lib/webbrowser-${version}/webbrowser \ + --prefix LD_LIBRARY_PATH : "${libPath}" + ''; + + meta = with lib; { + description = "Generic web browser without trackers compatible with XUL plugins using UXP rendering engine"; + homepage = "https://git.nuegia.net/webbrowser.git/"; + license = [ licenses.mpl20 licenses.gpl3 ]; + maintainers = with maintainers; [ TheBrainScrambler ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f38c94f1bcf7..2a75b8fe2cab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21250,6 +21250,8 @@ in stdenv = gcc7Stdenv; }; + webbrowser = callPackage ../applications/networking/browsers/webbrowser {}; + pamix = callPackage ../applications/audio/pamix { }; pamixer = callPackage ../applications/audio/pamixer { }; From 642e9916c6f7013ea4d99ebe927686dcf846394b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 1 Jun 2020 22:31:10 +0200 Subject: [PATCH 0459/3452] nixos/go-neb: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/go-neb.nix | 53 ++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 nixos/modules/services/networking/go-neb.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e8c4a4c14cf0..75f248a69b12 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -624,6 +624,7 @@ ./services/networking/gdomap.nix ./services/networking/git-daemon.nix ./services/networking/gnunet.nix + ./services/networking/go-neb.nix ./services/networking/go-shadowsocks2.nix ./services/networking/gogoclient.nix ./services/networking/gvpe.nix diff --git a/nixos/modules/services/networking/go-neb.nix b/nixos/modules/services/networking/go-neb.nix new file mode 100644 index 000000000000..991ae38f30a5 --- /dev/null +++ b/nixos/modules/services/networking/go-neb.nix @@ -0,0 +1,53 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.go-neb; + + configFile = pkgs.writeText "config.yml" (builtins.toJSON cfg.config); +in { + options.services.go-neb = { + enable = mkEnableOption "Extensible matrix bot written in Go"; + + bindAddress = mkOption { + type = types.str; + description = "Port (and optionally address) to listen on."; + default = ":4050"; + }; + + baseUrl = mkOption { + type = types.str; + description = "Public-facing endpoint that can receive webhooks."; + }; + + config = mkOption { + type = types.uniq types.attrs; + description = '' + Your config.yaml as a Nix attribute set. + See config.sample.yaml + for possible options. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.go-neb = { + description = "Extensible matrix bot written in Go"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment = { + BASE_URL = cfg.baseUrl; + BIND_ADDRESS = cfg.bindAddress; + CONFIG_FILE = configFile; + }; + + serviceConfig = { + ExecStart = "${pkgs.go-neb}/bin/go-neb"; + DynamicUser = true; + }; + }; + }; + + meta.maintainers = with maintainers; [ hexa maralorn ]; +} From c18016cfbfb16a7a1bf89bd0e99e864f28214903 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 1 Jun 2020 12:42:39 +0200 Subject: [PATCH 0460/3452] hydra-unstable: 2020-04-16 -> 2020-06-01 --- nixos/tests/hydra/db-migration.nix | 6 +++--- pkgs/development/tools/misc/hydra/default.nix | 14 +++++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/nixos/tests/hydra/db-migration.nix b/nixos/tests/hydra/db-migration.nix index cf74acfd67aa..ca65e2e66aa1 100644 --- a/nixos/tests/hydra/db-migration.nix +++ b/nixos/tests/hydra/db-migration.nix @@ -61,7 +61,7 @@ with pkgs.lib; 'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq' ) - out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'") + out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ builds\" -A'") assert "jobset_id" not in out original.succeed( @@ -69,7 +69,7 @@ with pkgs.lib; ) original.wait_for_unit("hydra-init.service") - out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'") + out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ builds\" -A'") assert "jobset_id|integer|||" in out original.succeed("hydra-backfill-ids") @@ -79,7 +79,7 @@ with pkgs.lib; ) original.wait_for_unit("hydra-init.service") - out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'") + out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ builds\" -A'") assert "jobset_id|integer||not null|" in out original.wait_until_succeeds( diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index f9a50dd0ea0e..fb884c8ffac5 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -24,14 +24,22 @@ # so when having an older version, `pkgs.hydra-migration` should be deployed first. hydra-unstable = callPackage ./common.nix { - version = "2020-04-16"; + version = "2020-06-01"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "87837f1d82904bf48e11b5641258b6be2f663c3b"; - sha256 = "1vs3lyfyafsl7wbpmycv7c3n9n2rkrswp65msb6q1iskgpvr96d5"; + rev = "750e2e618ac6d3df02c57a2cf8758bc66a27c40a"; + sha256 = "1szfzf9kw5cj6yn57gfxrffbdkdf8v3xy9914924blpn5qll31g4"; }; 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 9857b8b24dddeda0042e4137a0ecc3778e483abf Mon Sep 17 00:00:00 2001 From: Sebastian Jordan Date: Tue, 2 Jun 2020 16:35:26 +0200 Subject: [PATCH 0461/3452] nix-prefetch-github: 2.3.2 -> 2.4 --- .../python-modules/nix-prefetch-github/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 17e4669b6bed..56387835cc6e 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -9,13 +9,17 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "2.3.2"; + version = "2.4"; src = fetchPypi { inherit pname version; - sha256 = "18xj618zjs13ib7f996fnl0xiqig0w48yns45nvy3xab55wximdx"; + sha256 = "sha256-PVB/cL0NVB5pHxRMjg8TLatvIvHjfCvaRWBanVHYT+E="; }; + # The tests for this package require nix and network access. That's + # why we cannot execute them inside the building process. + doCheck = false; + propagatedBuildInputs = [ attrs click From 880c9a85191fc1b33058b374fa5b87851fea8060 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 28 May 2020 09:49:32 +0300 Subject: [PATCH 0462/3452] gitAndTools.gita: 0.10.5 -> 0.10.9 --- .../version-management/git-and-tools/gita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix index c9d188e10e5a..38ca3e13d6a8 100644 --- a/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -6,12 +6,12 @@ }: buildPythonApplication rec { - version = "0.10.5"; + version = "0.10.9"; pname = "gita"; src = fetchPypi { inherit pname version; - sha256 = "1xggslmrrfszpl190klkc97fnl88gml1bnkmkzp6aimdch66g4jg"; + sha256 = "0fbzk9rj895s5fpbnsyy3gxwbf5spqycisx5cqwzxgm0n5qkz9dk"; }; propagatedBuildInputs = [ From abf309e005f3df1a19aa697bf3b5607e81c05a77 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 28 May 2020 09:56:10 +0300 Subject: [PATCH 0463/3452] gitAndTools.gita: add bash completion --- .../git-and-tools/gita/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix index 38ca3e13d6a8..d1a948f44e0f 100644 --- a/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -1,17 +1,20 @@ { lib , buildPythonApplication -, fetchPypi +, fetchFromGitHub , pyyaml , setuptools +, installShellFiles }: buildPythonApplication rec { version = "0.10.9"; pname = "gita"; - src = fetchPypi { - inherit pname version; - sha256 = "0fbzk9rj895s5fpbnsyy3gxwbf5spqycisx5cqwzxgm0n5qkz9dk"; + src = fetchFromGitHub { + sha256 = "0wilyf4nnn2jyxrfqs8krya3zvhj6x36szsp9xhb6h08g1ihzp5i"; + rev = "v${version}"; + repo = "gita"; + owner = "nosarthur"; }; propagatedBuildInputs = [ @@ -19,6 +22,12 @@ buildPythonApplication rec { setuptools ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --bash --name gita ${src}/.gita-completion.bash + ''; + meta = with lib; { description = "A command-line tool to manage multiple git repos"; homepage = "https://github.com/nosarthur/gita"; From a34547730f65dc0f9e2199a354a6ed2350ef0aba Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 2 Jun 2020 23:35:03 +0300 Subject: [PATCH 0464/3452] gitAndTools.gita: enable tests --- .../git-and-tools/gita/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix index d1a948f44e0f..5fe6b34fd3b5 100644 --- a/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonApplication , fetchFromGitHub +, git +, pytest , pyyaml , setuptools , installShellFiles @@ -24,6 +26,23 @@ buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; + postUnpack = '' + for case in "\n" ""; do + substituteInPlace source/tests/test_main.py \ + --replace "'gita$case'" "'source$case'" + done + ''; + + checkInputs = [ + git + pytest + ]; + + checkPhase = '' + git init + pytest tests + ''; + postInstall = '' installShellCompletion --bash --name gita ${src}/.gita-completion.bash ''; From cf657dc584e296b629ac037aab583002b11166cf Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 3 Jun 2020 18:52:00 +0300 Subject: [PATCH 0465/3452] libgme: Don't reference gcc-unwrapped --- pkgs/development/libraries/audio/libgme/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix index bcd6070831bb..3ac8293986d8 100644 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, cmake }: +{ stdenv, fetchFromBitbucket, cmake, removeReferencesTo }: let version = "0.6.3"; in stdenv.mkDerivation { @@ -21,4 +21,14 @@ in stdenv.mkDerivation { }; buildInputs = [ cmake ]; + + nativeBuildInputs = [ removeReferencesTo ]; + + # It used to reference it, in the past, but thanks to the postFixup hook, now + # it doesn't. + disallowedReferences = [ stdenv.cc.cc ]; + + postFixup = stdenv.lib.optionalString stdenv.isLinux '' + remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/lib/libgme.so)" + ''; } From 7de3d934dacd7e4b798d18bcd8d1bc54d3458b46 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 3 Jun 2020 22:09:54 +0200 Subject: [PATCH 0466/3452] bpython: substituteAll the path to `which` This is used to detect the presence of xclip and other clipboard handling tools. Fixes https://github.com/NixOS/nixpkgs/issues/56941. --- .../clipboard-make-which-substitutable.patch | 27 +++++++++++++++++++ .../python-modules/bpython/default.nix | 17 +++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch diff --git a/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch b/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch new file mode 100644 index 000000000000..685d34228a1b --- /dev/null +++ b/pkgs/development/python-modules/bpython/clipboard-make-which-substitutable.patch @@ -0,0 +1,27 @@ +From 6f544a5bd43446859754cb80e012af933b843db9 Mon Sep 17 00:00:00 2001 +From: Florian Klink +Date: Wed, 3 Jun 2020 22:05:34 +0200 +Subject: [PATCH] clipboard: make which substitutable + +This is used to detect the presence of xclip and other clipboard +handling tools. +--- + bpython/clipboard.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bpython/clipboard.py b/bpython/clipboard.py +index aee429b..f346429 100644 +--- a/bpython/clipboard.py ++++ b/bpython/clipboard.py +@@ -58,7 +58,7 @@ class OSXClipboard(object): + + def command_exists(command): + process = subprocess.Popen( +- ["which", command], stderr=subprocess.STDOUT, stdout=subprocess.PIPE ++ ["@which@", command], stderr=subprocess.STDOUT, stdout=subprocess.PIPE + ) + process.communicate() + +-- +2.26.2 + diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 73ce843cf018..ad7322cbf661 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -1,4 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi, pygments, greenlet, curtsies, urwid, requests, mock }: +{ stdenv +, buildPythonPackage +, fetchPypi +, curtsies +, greenlet +, mock +, pygments +, requests +, substituteAll +, urwid +, which }: buildPythonPackage rec { pname = "bpython"; @@ -9,6 +19,11 @@ buildPythonPackage rec { sha256 = "1764ikgj24jjq46s50apwkydqvy5a13adb2nbszk8kbci6df0v27"; }; + patches = [ (substituteAll { + src = ./clipboard-make-which-substitutable.patch; + which = "${which}/bin/which"; + })]; + propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ]; postInstall = '' From 3b1b4fde0cba48860c2db5dca0e39e6c3233a9c1 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 3 Jun 2020 22:17:42 +0200 Subject: [PATCH 0467/3452] systemd: systemd.pc: fix systemdsystemunitpath and systemduserunitpath The paths in the generated `systemd.pc` were flipped, fix this: `systemdsystemunitpath`: `/nix/var/nix/profiles/default/lib/systemd/{user => system}` `systemduserunitpath`: `/nix/var/nix/profiles/default/lib/systemd/{system => user}` The paths actually used in the code (further below in that patch) were correct, so keep them there. Fixes #59473. --- .../0005-Add-some-NixOS-specific-unit-directories.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index 23aa893362b5..a9b60cbb2e20 100644 --- a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -24,8 +24,8 @@ index 8331832c7a..bedb97115d 100644 systemduserconfdir=${sysconfdir}/systemd/user -systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system -systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user -+systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/system:${systemdsystemunitdir} -+systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/user:${systemduserunitdir} ++systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir} ++systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir} systemdsystemgeneratordir=${rootprefix}/lib/systemd/system-generators systemdusergeneratordir=${prefix}/lib/systemd/user-generators systemdsystemgeneratorpath=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemdsystemgeneratordir} From d72a7360c27f5346b7212a4d8611b38e3dd11a84 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 2 Jun 2020 02:16:59 +0200 Subject: [PATCH 0468/3452] nixos/tests/go-neb: init Simple test to start the unit with a dummy client and a dummy service and check if it can receive webhooks. --- nixos/tests/all-tests.nix | 1 + nixos/tests/go-neb.nix | 44 +++++++++++++++++++ .../instant-messengers/go-neb/default.nix | 4 +- 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/go-neb.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 796c626f3dde..a660bd17fe80 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -119,6 +119,7 @@ in installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {}); gocd-agent = handleTest ./gocd-agent.nix {}; gocd-server = handleTest ./gocd-server.nix {}; + go-neb = handleTest ./go-neb.nix {}; google-oslogin = handleTest ./google-oslogin {}; grafana = handleTest ./grafana.nix {}; graphite = handleTest ./graphite.nix {}; diff --git a/nixos/tests/go-neb.nix b/nixos/tests/go-neb.nix new file mode 100644 index 000000000000..d9e5db0b4a53 --- /dev/null +++ b/nixos/tests/go-neb.nix @@ -0,0 +1,44 @@ +import ./make-test-python.nix ({ pkgs, ... }: +{ + name = "go-neb"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ hexa maralorn ]; + }; + + nodes = { + server = { + services.go-neb = { + enable = true; + baseUrl = "http://localhost"; + config = { + clients = [ { + UserId = "@test:localhost"; + AccessToken = "changeme"; + HomeServerUrl = "http://localhost"; + Sync = false; + AutoJoinRooms = false; + DisplayName = "neverbeseen"; + } ]; + services = [ { + ID = "wikipedia_service"; + Type = "wikipedia"; + UserID = "@test:localhost"; + Config = { }; + } ]; + }; + }; + }; + }; + + testScript = '' + start_all() + server.wait_for_unit("go-neb.service") + server.wait_until_succeeds( + "curl -L http://localhost:4050/services/hooks/d2lraXBlZGlhX3NlcnZpY2U" + ) + server.wait_until_succeeds( + "journalctl -eu go-neb -o cat | grep -q service_id=wikipedia_service" + ) + ''; + +}) diff --git a/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/pkgs/applications/networking/instant-messengers/go-neb/default.nix index a82e39647de0..769e5cf55159 100644 --- a/pkgs/applications/networking/instant-messengers/go-neb/default.nix +++ b/pkgs/applications/networking/instant-messengers/go-neb/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule { pname = "go-neb"; @@ -16,6 +16,8 @@ buildGoModule { vendorSha256 = "1k3980yf6zl00dkd1djwhm2f9nnffzrsbs3kq3alpw2gm0aln739"; + passthru.tests.go-neb = nixosTests.go-neb; + meta = with lib; { description = "Extensible matrix bot written in Go"; homepage = "https://github.com/matrix-org/go-neb"; From 66e040eaac1ac4b5e41d951af5abe48dbf6a636d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 4 Jun 2020 13:14:30 +0800 Subject: [PATCH 0469/3452] nixos/pam: mount encrypted home earlier This patch was done by curro: The generated /etc/pam.d/* service files invoke the pam_systemd.so session module before pam_mount.so, if both are enabled (e.g. via security.pam.services.foo.startSession and security.pam.services.foo.pamMount respectively). This doesn't work in the most common scenario where the user's home directory is stored in a pam-mounted encrypted volume (because systemd will fail to access the user's systemd configuration). --- nixos/modules/security/pam.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index e1a94b0121ac..688344852aeb 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -436,6 +436,8 @@ let "session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"} ${optionalString config.security.pam.enableEcryptfs "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} + ${optionalString cfg.pamMount + "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} ${optionalString use_ldap "session optional ${pam_ldap}/lib/security/pam_ldap.so"} ${optionalString config.services.sssd.enable @@ -452,8 +454,6 @@ let "session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf cfg.limits}"} ${optionalString (cfg.showMotd && config.users.motd != null) "session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd}"} - ${optionalString cfg.pamMount - "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} ${optionalString (cfg.enableAppArmor && config.security.apparmor.enable) "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"} ${optionalString (cfg.enableKwallet) From 9eb7b9af36bcc802110abdb707f22aa91e406375 Mon Sep 17 00:00:00 2001 From: Philipp Riegger Date: Wed, 3 Jun 2020 21:50:58 +0200 Subject: [PATCH 0470/3452] factorio-utils: fix recursive mod dependency resolution --- pkgs/games/factorio/utils.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/factorio/utils.nix b/pkgs/games/factorio/utils.nix index 563ece6cb9c2..2764592a3246 100644 --- a/pkgs/games/factorio/utils.nix +++ b/pkgs/games/factorio/utils.nix @@ -5,7 +5,7 @@ with stdenv.lib; { mkModDirDrv = mods: # a list of mod derivations let - recursiveDeps = modDrv: [modDrv] ++ optionals (modDrv.deps == []) (map recursiveDeps modDrv.deps); + recursiveDeps = modDrv: [modDrv] ++ map recursiveDeps modDrv.deps; modDrvs = unique (flatten (map recursiveDeps mods)); in stdenv.mkDerivation { From ddb161e01a43b60e2385af4a3eaa3c8e877aa14a Mon Sep 17 00:00:00 2001 From: Alex Biehl Date: Wed, 20 May 2020 12:15:56 +0200 Subject: [PATCH 0471/3452] python3Packages.skein: init at 0.8.0 --- .../python-modules/skein/default.nix | 101 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 103 insertions(+) create mode 100644 pkgs/development/python-modules/skein/default.nix diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix new file mode 100644 index 000000000000..82e4ba63ba68 --- /dev/null +++ b/pkgs/development/python-modules/skein/default.nix @@ -0,0 +1,101 @@ +{ autoPatchelfHook +, buildPythonPackage +, coreutils +, fetchPypi +, jre +, lib +, maven +, protobuf +, pythonPackages +, stdenv +}: + +buildPythonPackage rec { + pname = "skein"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nb64p1hzshgi1kfc2jx1v9vn8b0wzs50460wfra3fsxh0ap66ab"; + }; + + skeinRepo = stdenv.mkDerivation rec { + name = "${pname}-${version}-maven-repo"; + + inherit src; + + nativeBuildInputs = [ maven ] ++ lib.optional stdenv.isLinux autoPatchelfHook; + + buildPhase = ""; + + installPhase = '' + mkdir -p $out + + archs="${ + if stdenv.isLinux + then "linux-x86_32 linux-x86_64" + else "osx-x86_64" + }" + + for arch in $archs + do + mvn -Dmaven.repo.local=$out dependency:get -Dartifact=com.google.protobuf:protoc:3.0.0:exe:$arch + mvn -Dmaven.repo.local=$out dependency:get -Dartifact=io.grpc:protoc-gen-grpc-java:1.16.0:exe:$arch + done + + if ${ lib.boolToString stdenv.isLinux } + then + autoPatchelf $out + fi + + # We have to use maven package here as dependency:go-offline doesn't + # fetch every required jar. + mvn -f java/pom.xml -Dmaven.repo.local=$out package + + rm $(find $out -name _remote.repositories) + rm $(find $out -name resolver-status.properties) + ''; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = if stdenv.isLinux + then "12f0q3444qw6y4f6qsa9540a0fz4cgi844zzi8z1phqn3k4dnl6v" + else "0bjbwiv17cary1isxca0m2hsvgs1i5fh18z247h1hky73lnhbrz8"; + + } // lib.optionalAttrs stdenv.isLinux { dontAutoPatchelf = true; }; + + # skein wants to compile a .jar file for Hadoop interaction. We build + # it separately as otherwise mvn is called from setup.py and we have + # no good way to inject the repository in there. + skeinJar = stdenv.mkDerivation rec { + name = "${pname}-${version}.jar"; + + inherit src; + + nativeBuildInputs = [ maven ]; + + buildPhase = '' + mvn --offline -f java/pom.xml package -Dmaven.repo.local="${skeinRepo}" -Dskein.version=${version} -Dversion=${version} + ''; + + installPhase = '' + # Making sure skein.jar exists skips the maven build in setup.py + mv java/target/skein-*.jar $out + ''; + }; + + propagatedBuildInputs = with pythonPackages; [ cryptography grpcio grpcio-tools jupyter pytest pyyaml requests jre ]; + + preBuild = '' + # Making sure skein.jar exists skips the maven build in setup.py + mkdir -p skein/java + ln -s ${skeinJar} skein/java/skein.jar + ''; + + meta = with stdenv.lib; { + homepage = "https://jcristharif.com/skein"; + description = "A tool and library for easily deploying applications on Apache YARN"; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 885622b9be95..8d99e2363a1d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6338,6 +6338,8 @@ in { python_statsd = callPackage ../development/python-modules/python_statsd { }; + skein = disabledIf isPy27 (callPackage ../development/python-modules/skein { }); + stompclient = callPackage ../development/python-modules/stompclient { }; subdownloader = callPackage ../development/python-modules/subdownloader { }; From 6200d2f8b235bbc2adb9db45e54cae02a407a87e Mon Sep 17 00:00:00 2001 From: Alex Biehl Date: Fri, 29 May 2020 07:35:25 +0200 Subject: [PATCH 0472/3452] Add alexbiehl as maintainer --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/development/python-modules/skein/default.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3a8c5e5a76b4..162441b23f17 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -313,6 +313,12 @@ githubId = 2387841; name = "Alexander Bakker"; }; + alexbiehl = { + email = "alexbiehl@gmail.com"; + github = "alexbiehl"; + githubId = 1876617; + name = "Alex Biehl"; + }; alexchapman = { email = "alex@farfromthere.net"; github = "AJChapman"; diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index 82e4ba63ba68..92de47e78847 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -96,6 +96,7 @@ buildPythonPackage rec { homepage = "https://jcristharif.com/skein"; description = "A tool and library for easily deploying applications on Apache YARN"; license = licenses.bsd3; + maintainers = with maintainers; [ alexbiehl ]; }; } From 1e4308dfd429d7a20f8b1319e63d25a7493cf771 Mon Sep 17 00:00:00 2001 From: Alex Biehl Date: Fri, 29 May 2020 07:54:48 +0200 Subject: [PATCH 0473/3452] Split out monlithic derivation into multiple files --- .../python-modules/skein/default.nix | 82 ++----------------- .../python-modules/skein/skeinjar.nix | 21 +++++ .../python-modules/skein/skeinrepo.nix | 46 +++++++++++ 3 files changed, 75 insertions(+), 74 deletions(-) create mode 100644 pkgs/development/python-modules/skein/skeinjar.nix create mode 100644 pkgs/development/python-modules/skein/skeinrepo.nix diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index 92de47e78847..dd98bdddc3a2 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -1,93 +1,27 @@ -{ autoPatchelfHook -, buildPythonPackage -, coreutils +{ buildPythonPackage +, callPackage , fetchPypi , jre , lib -, maven -, protobuf , pythonPackages , stdenv }: - -buildPythonPackage rec { +let pname = "skein"; version = "0.8.0"; - src = fetchPypi { inherit pname version; sha256 = "0nb64p1hzshgi1kfc2jx1v9vn8b0wzs50460wfra3fsxh0ap66ab"; }; - - skeinRepo = stdenv.mkDerivation rec { - name = "${pname}-${version}-maven-repo"; - - inherit src; - - nativeBuildInputs = [ maven ] ++ lib.optional stdenv.isLinux autoPatchelfHook; - - buildPhase = ""; - - installPhase = '' - mkdir -p $out - - archs="${ - if stdenv.isLinux - then "linux-x86_32 linux-x86_64" - else "osx-x86_64" - }" - - for arch in $archs - do - mvn -Dmaven.repo.local=$out dependency:get -Dartifact=com.google.protobuf:protoc:3.0.0:exe:$arch - mvn -Dmaven.repo.local=$out dependency:get -Dartifact=io.grpc:protoc-gen-grpc-java:1.16.0:exe:$arch - done - - if ${ lib.boolToString stdenv.isLinux } - then - autoPatchelf $out - fi - - # We have to use maven package here as dependency:go-offline doesn't - # fetch every required jar. - mvn -f java/pom.xml -Dmaven.repo.local=$out package - - rm $(find $out -name _remote.repositories) - rm $(find $out -name resolver-status.properties) - ''; - - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux - then "12f0q3444qw6y4f6qsa9540a0fz4cgi844zzi8z1phqn3k4dnl6v" - else "0bjbwiv17cary1isxca0m2hsvgs1i5fh18z247h1hky73lnhbrz8"; - - } // lib.optionalAttrs stdenv.isLinux { dontAutoPatchelf = true; }; - - # skein wants to compile a .jar file for Hadoop interaction. We build - # it separately as otherwise mvn is called from setup.py and we have - # no good way to inject the repository in there. - skeinJar = stdenv.mkDerivation rec { - name = "${pname}-${version}.jar"; - - inherit src; - - nativeBuildInputs = [ maven ]; - - buildPhase = '' - mvn --offline -f java/pom.xml package -Dmaven.repo.local="${skeinRepo}" -Dskein.version=${version} -Dversion=${version} - ''; - - installPhase = '' - # Making sure skein.jar exists skips the maven build in setup.py - mv java/target/skein-*.jar $out - ''; - }; + skeinJar = callPackage ./skeinjar.nix { inherit src version; }; +in +buildPythonPackage rec { + inherit pname version src; propagatedBuildInputs = with pythonPackages; [ cryptography grpcio grpcio-tools jupyter pytest pyyaml requests jre ]; preBuild = '' - # Making sure skein.jar exists skips the maven build in setup.py + # Ensure skein.jar exists skips the maven build in setup.py mkdir -p skein/java ln -s ${skeinJar} skein/java/skein.jar ''; diff --git a/pkgs/development/python-modules/skein/skeinjar.nix b/pkgs/development/python-modules/skein/skeinjar.nix new file mode 100644 index 000000000000..c1a0d8a57515 --- /dev/null +++ b/pkgs/development/python-modules/skein/skeinjar.nix @@ -0,0 +1,21 @@ +{ callPackage, stdenv, maven, src, version }: + +let + skeinRepo = callPackage ./skeinrepo.nix { inherit src version; }; +in +stdenv.mkDerivation rec { + name = "skein-${version}.jar"; + + inherit src; + + nativeBuildInputs = [ maven ]; + + buildPhase = '' + mvn --offline -f java/pom.xml package -Dmaven.repo.local="${skeinRepo}" -Dskein.version=${version} -Dversion=${version} + ''; + + installPhase = '' + # Making sure skein.jar exists skips the maven build in setup.py + mv java/target/skein-*.jar $out + ''; +} diff --git a/pkgs/development/python-modules/skein/skeinrepo.nix b/pkgs/development/python-modules/skein/skeinrepo.nix new file mode 100644 index 000000000000..85b4f19c8f73 --- /dev/null +++ b/pkgs/development/python-modules/skein/skeinrepo.nix @@ -0,0 +1,46 @@ +{ autoPatchelfHook, lib, maven, stdenv, src, version }: + +stdenv.mkDerivation rec { + name = "skein-${version}-maven-repo"; + + inherit src; + + nativeBuildInputs = [ maven ] ++ lib.optional stdenv.isLinux autoPatchelfHook; + + doBuild = false; + + installPhase = '' + mkdir -p $out + + archs="${ + if stdenv.isLinux + then "linux-x86_32 linux-x86_64" + else "osx-x86_64" + }" + + for arch in $archs + do + mvn -Dmaven.repo.local=$out dependency:get -Dartifact=com.google.protobuf:protoc:3.0.0:exe:$arch + mvn -Dmaven.repo.local=$out dependency:get -Dartifact=io.grpc:protoc-gen-grpc-java:1.16.0:exe:$arch + done + + if ${ lib.boolToString stdenv.isLinux } + then + autoPatchelf $out + fi + + # We have to use maven package here as dependency:go-offline doesn't + # fetch every required jar. + mvn -f java/pom.xml -Dmaven.repo.local=$out package + + rm $(find $out -name _remote.repositories) + rm $(find $out -name resolver-status.properties) + ''; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = if stdenv.isLinux + then "12f0q3444qw6y4f6qsa9540a0fz4cgi844zzi8z1phqn3k4dnl6v" + else "0bjbwiv17cary1isxca0m2hsvgs1i5fh18z247h1hky73lnhbrz8"; + +} // lib.optionalAttrs stdenv.isLinux { dontAutoPatchelf = true; } From bff1b77402e441478e7918fc23044dc44c61409b Mon Sep 17 00:00:00 2001 From: Philipp Riegger Date: Thu, 4 Jun 2020 09:28:34 +0200 Subject: [PATCH 0474/3452] factorio{,-headless}-experimental: 0.18.29 -> 0.18.30 --- pkgs/games/factorio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 29af7dae33be..fde3d31716eb 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -53,11 +53,11 @@ let x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { stable = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; }; - experimental = bdist { sha256 = "1xkmx29dxbg9vbhbrdbq6bb229mc0mbar3r14b49bdia3qfvvx8p"; version = "0.18.29"; withAuth = true; }; + experimental = bdist { sha256 = "0dm2s8iz7247i3j8cl5f4i3kipnmn5514gm21p7b4ahj6fhpc7pf"; version = "0.18.30"; withAuth = true; }; }; headless = { stable = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; }; - experimental = bdist { sha256 = "0z1n9p7cqbzmmjniwjyxp7x058c4d1knf4mwg14vgvh77ywz0y8j"; version = "0.18.29"; }; + experimental = bdist { sha256 = "1c5jiqva2z58lghm6bhvjdj2n61xk8b8ss2hx80qsywgh3nqafr3"; version = "0.18.30"; }; }; demo = { stable = bdist { sha256 = "07qknasaqvzl9vy1fglm7xmdi7ynhmslrb0a209fhbfs0s7qqlgi"; version = "0.17.79"; }; From 785cdcddd7b81a79ab85c809def71ebfb7ac3770 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Jun 2020 19:21:30 +0200 Subject: [PATCH 0475/3452] nss: 3.52 -> 3.52.1 --- pkgs/applications/networking/browsers/firefox/common.nix | 5 ----- pkgs/development/libraries/nss/default.nix | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 817d17e8fad0..5dc791631d8b 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -94,11 +94,6 @@ stdenv.mkDerivation ({ patches = [ ./env_var_for_system_dir.patch - # Fix for NSS 3.52 (add missing CK_GCM_PARMS field) - (fetchpatch { - url = "https://hg.mozilla.org/mozilla-central/raw-rev/463069687b3d"; - sha256 = "00yhz67flnkww3rbry0kqn6z6bm7vxfb2sgf7qikgbjcm3ysvpsm"; - }) ] ++ patches; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index d48b5a6ba735..07dd97c9e020 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.52"; + version = "3.52.1"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0q8m9jf6zgkbhx71myjb7y0gcl5ib3gj6qkl9yvdqpd6vl6fn2ha"; + sha256 = "0y4jb9095f7bbgw7d7kvzm4c3g4p5i6y68fwhb8wlkpb7b1imj5w"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From dd334ebabb7deefa98c24c025afb50ee8c3a1c4b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Jun 2020 19:09:55 +0200 Subject: [PATCH 0476/3452] firefox: 76.0.1 -> 77.0.1 --- pkgs/applications/networking/browsers/firefox/common.nix | 1 - pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 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 5dc791631d8b..8060895a2e0f 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -138,7 +138,6 @@ stdenv.mkDerivation ({ "-Wno-error=format-security"); postPatch = '' - substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h' rm -rf obj-x86_64-pc-linux-gnu ''; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 092f4342e158..53924272db16 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "76.0.1"; + ffversion = "77.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0gnhfcgrz6022xf3vqia3s3639xa5pjp13h343d3c09mn8r919cmm6s38vzj1v3734fm25zb68acyarsp72xqq8z1420rh02b2pv38q"; + sha512 = "ngLihC0YuclLJEV3iPEX+tRzDKIdBe+CCOuFxvWNo7DnX8royOvTj2m4YyWyZoTQ5UCbPTQYmP4otgfovZSe8g=="; }; patches = [ From 7fc793091b19ae37c5b48325dcbc48344554aad4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Jun 2020 19:18:00 +0200 Subject: [PATCH 0477/3452] firefox-esr-68: 68.8.0esr -> 68.9.0esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 53924272db16..f0ca1c7cd154 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -35,10 +35,10 @@ rec { firefox-esr-68 = common rec { pname = "firefox-esr"; - ffversion = "68.8.0esr"; + ffversion = "68.9.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2rl5irkamxi8caa8krj0wng93lb82kk9mf09mgci87mj9hy6fxzcrlmiiffp14s03rv0raagrn4w54pbx1336mylq6saxmfhpf676hk"; + sha512 = "mEMYANgPfGgK757t4p34IXgQkSoxmn9/jC5jfEPs1PTikiOkF6+ypjFegl+XlFP/bmtaV1ZJq6XMY85ZVjdbuA=="; }; patches = [ From 303f8d1da489f33e1af8f43829b433f7eb2274fe Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Jun 2020 19:22:53 +0200 Subject: [PATCH 0478/3452] firefox-bin: 76.0 -> 77.0.1 --- .../browsers/firefox-bin/release_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 28a3c085a2f0..464eef9f4b7c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "76.0"; + version = "77.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ach/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ach/firefox-77.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "d1bd187497c76c624e010ec50a43e68bd91cdfded37f85e02047acdb53027c79c8071632f1a31f35f0a2b52eacf94c905984f2edb7b83e0a74fb0a0565eb18a5"; + sha512 = "12adc58633a67921e1d1944501191510baf3b0308213f417a202abcc09d5abad3155a478c2541508273d6e8b07bd3c13f7f8ab6e40855927429a94cc8d989888"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/af/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/af/firefox-77.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "bd9e45046cb566cd3fc94eec9d5587b0270417d68091da1b29eca40645b2aff4f081c2a5b0292a0e06da410a64fd1f617543bf0702852a6fe424680fdf3ec39a"; + sha512 = "ee58827ac139f48b870d3c30d8c317857ad5973593fa99addd7d09faa1fc53ae5ae31e36cd1f5c9dec6ff56ab31b987baccad98d4c8f8e009830e2e5065b8a4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/an/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/an/firefox-77.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "d5df04a513a349291d629941e519617cdcdee1c004ec8bcc3c02bf02ad310dad2dc33878268d8a4a6b115b3b02bd558159a8eaddda48e83aca29f2a377225396"; + sha512 = "ba8a36a8e7a8638c88355ce68ca4f320d13b60522f7699dbefd056ad01c4476799c38c3cb5817d5c506f29ec32532b533bb6aa5a592cef971f1a617d353b12aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ar/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ar/firefox-77.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "753550131ee986f7a770f95959a26b24b17e0a6a5f2e12ec1b7d42b31886e32b9c93a559b7824cd5348f34f1fe26901f5198fca57ab2c9f412ce032882cf7b5b"; + sha512 = "507a3c9487f0d2fd89b91473afbb9607d2c8fe2f642e331a4c781078d0f474b5345827a83167981c0d9b06556370b6d7baddd9eb3355dfd8c64014d139483e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ast/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ast/firefox-77.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "8561ba0236a9524672c7ebacde935d4c3761fe2c5fc0125951d28f53c3d27388d48c108a6fa71064cbfa54cca57a72f6fb49b3b8314d28b875e250b218be4d55"; + sha512 = "70df4d795059609d2935243ca1af753e9e57d303f43df42f72a423135d095b8a295cf06fc3aa0284f68415c77de46b6925b34fc19987309a9b3f749e8234d9c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/az/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/az/firefox-77.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "53b7a939d02ccc0a809079070afd4db528a4cb617a4fbfaa58cca573450be764e3894caf3a40477903151f8116460dc574749f0edf9bfae6981616772b649703"; + sha512 = "34a95a03400f67bc17a405767d174de67103a57cfc2154621e4452b914e070344b361547876b2a17813638405440642f28684f84782285960d3ed5bd0d8c0eec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/be/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/be/firefox-77.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "36658c05c6b7b1f64ffe14ded709dbc08f0236f99f9457964c15a36a4ebf8d73bf482ac2f8518927b2d66fc9a1ba19289db1855a6dbc7b9502c2a3c0137bd7ab"; + sha512 = "66acd13f56a2a3c79cc49f3cd5cd203c7b7e1f7f978a1ce1eb90f702f35f501bf7b16b1fbc9be8ba9b176b103bc37d0868aaf765ca485c854192c2c4d27b1030"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bg/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/bg/firefox-77.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "890066ff182d6ce79cf0adf307a92a26ced29f633cbaaacd02eb5c1c3f0e2bc2de336a7b22fbb530ec85561d26dc44f93f2ce1f58843e1d87322badbdc92e8fc"; + sha512 = "44f3dc39fb73c03461d16a34f1fcfeb385722a0b4deb7b75199a8f8fb40fe85cec8116e11eb2f7852580a4ce9925d8f022c6133647232f6547db689b6d87912a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bn/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/bn/firefox-77.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "c6f9bda8a95351d79ecfe1e138ace440aecee6c1dc5ad2d7c6d249e5277b75b27797cdcbfa1b8d3ec2a899974f555b8b20f7c38f03a7979ca917ab050feb6cfa"; + sha512 = "2ecc1a1433eb8301cc7e9d66dadf1926aa20b609b7683e69004dd56a12b3a8a2a1db19ec85113bdb0bb0759c29b0e70a157ef6f2f7ba29a121f22d39cb256c5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/br/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/br/firefox-77.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "b15b1cd34dc4799836d67ce4ed8b166b54e21076313a2f726c7b872aeabbcc40a35c7f859cf78e0f17825fcad38b6d4dfaadf5d27ef89ebea8da0ce427492311"; + sha512 = "f9561f0d2f00da6736af19dfc2ec21a25a46b0a2c0ae195e0725a59f8df0367be3c0dbbfacc4b79ba82bce7643b00127b9a9431379e533c0393d49c6d3017ccf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bs/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/bs/firefox-77.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fee05346fed30422b79af7c0626a7763f404f8a3a2617bddd17b95434060bd1c47b47409a0147c130b51d08d98de2232abe8fc7ade9bc58cc1eeccaf0987aee7"; + sha512 = "e76982df74ee812f37f802d3e82a7ba842d6a211be3beff4fe6347a991ed49601678f11c01847a9708ce36ec2ca956f452b2d7b1fe168a7608ae7999113fbf22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ca-valencia/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ca-valencia/firefox-77.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "beb5d44cabc7a80a0ceb4573e4e6fc2b554c6cc0ae38c9a5699d0d87d5f36aee892c4bee8ca1d103001b3305ef814f9a96a8fd63dc5b495363443f9abb4edc91"; + sha512 = "a2633b6e009edcb98c4af62df6cac991254a0f370384c2d0a3b81f8c4e49648ab6cdc580888a628668acd0a4daef1bf6b65633c58441aa0e9aaf84dfccfd10fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ca/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ca/firefox-77.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "1b8cc942602134a48e0d16a3244e97edafa133c74651ed4545f5e3eb515ad1881276cd2adc204e5c9cfd677dacec79030311483469174415199b9eb679729442"; + sha512 = "c8ba559b912670a86f94188e1b3c0962093955a527b2751e4264699bdf343050999d76b93857f6819c797dbafbbd0980032cf5c497b0d34a50c5c8395cd07cd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cak/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/cak/firefox-77.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "2738e924257a81bb1ff956a6717e6ef4769e96f5940bb0fad58030e3d2ce65e84ecb2807e6e04ca820eeba61bd386c85716112535cc28d2bd3c9e7a364c734b2"; + sha512 = "52f446f2a2c4bd6d79f680ebdb38e2f62e0830d14fc98dc6ad01c5b404794da1e59f4b8da2d7f4a0483187f4725a212e41edcc2006190818e6229a5a9af8a597"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cs/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/cs/firefox-77.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "3d58acd8bafbd11307ca58894992fcf8325a5679585d5c5e09e397b941019a8a8f7bc9b63997bcad2722e8cbba88715b789683b0428632e4ec4b728a36b54099"; + sha512 = "91d8dbd3d8dd6e242943d9b416534492125746694a721fff6c9d51f811e2f93b5d521f63357addd0e11bbeac80d3a07d2fda0133d746eb3d4d5d086e59a713b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cy/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/cy/firefox-77.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "aa7aa1b06c1a28e30b532d41b4cf3bbae26c42a24a63afb1999f421577afac4e4591b465b3e659ed5c9278b2c5d2c4c449a84fcfa69b451804d2a0470524ab04"; + sha512 = "14a04b2d97ea473b45602ab44d8ad08f35f21e98621e93b901ae25731fd86d207b4949bca3283e39cf22aea7667e110c94b948b51a370551c4416a3009f10854"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/da/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/da/firefox-77.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "48160d3a437dee94c1070e2742c6bde4a36811e8d2eae87d7c8450476b30b912bc9cbef8a5f7d917ad4be771eeede9d7fa9315e27b154f50049ce80f4911024d"; + sha512 = "5ff9be1796f70f608e12732c71f46c6c4f636e52ed03cb445ee1fc35d4db2897ee1b8f231ba0a5724696d3f7db04845dddf268a3ba59b26a869f65729abd57e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/de/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/de/firefox-77.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "fc4d0ddd9649dd555b4abd4d90f9d6cff8fe7e702bcf5d2931565c469842f51ee215286f68802304868848f043e54c8224358c8f4060435a4674401d19bd6989"; + sha512 = "b15a90114ea7f2c69fa94bb6e9c2559be0f7a7a0b7c4c1042823153000bc6a04a27f62c9373cb4c73535e676c41b23dfd260396fa691f2ac0319badb7a087f05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/dsb/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/dsb/firefox-77.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "3cab1a498db5900b055a8bc6398e4dc9770657c41ba9bb6bf0f196566e9c535db99f02e5c51750e7c7185f2f0b1a26e84da51403775c33ef34915b43e3a8b27c"; + sha512 = "bd10d40bb2f52c1b5cae9c7d91d53b3cc33bac0415a6f0b37fa5e1e2f5249ce5313a45e0e8b8b218ad961b2e3b3597c7132486a71eae76acdc61805181cd7220"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/el/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/el/firefox-77.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "d099758283e38566a4d9db744590f42b5fd28de8e985c2f240096e158995da00711e97d6feb3979bac40a2ad57cf7876da37c4ba69f3467930415d87a2d10c50"; + sha512 = "4c28c9104085d2ddd024a1418f0f54cd4c57d0ad5fc59bbd26d28bf173a78999eadb025618f0221273c5cb697708f944764a88fe9c08695b10694c68ec54473c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-CA/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/en-CA/firefox-77.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "442e60f0d132d96c58364e0d5f70e43ade8e6508f5d0a76b3d7e5c61bed0bffa5f9bc2096c89879dcb1681bc394699e39d3c31f2d02fa790dd8e38f1b406154c"; + sha512 = "0722520753a1bdb093e696cebe1e9074661b7602b5d8285b41f62acd462e740cb0833b751d870d602e7473bd11f3bcb3e5dd8e84ca00ca3babeea3a19d45974d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-GB/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/en-GB/firefox-77.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "8c0d31a9123d8d8baf94f73505233786f7fd2ce721f8792f4cc1db337a1659badf08393a22159dcb9d8256e43f24661c3975e6a1f801e30d21bc54083f4da041"; + sha512 = "8f6aa14f4dddadf19661e3bf11573d930c5e931f383498fd22826cb1e61f97bb5cc5db7507e5363648fba3368c7d49d7395bd4d68c6f9787db65401e990a62c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-US/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/en-US/firefox-77.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "993e5410a946f802a47d8167c83e767fa9973754cfc1365e4cc2698a25524dc27c83f3b202990744dd654d68226c601ad9608ecc49d2c3952e50967e20ece34a"; + sha512 = "28b0f843220a88759893813c48f9b02a255c26fe954632e530f956f43c4cda6441546f3e9d827fd61bca0d61fc6a5580d3134b8d5315cdab90fb57aaf96fa5f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/eo/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/eo/firefox-77.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "c2021ecd345cc45fd26ccd8a75ee66cd1eeb506a8e0f6b9811b4149b6bb15121edcdc9a0825703db52beea61f7249f45d23fa3822a9f47701adbc2e86c7ccaa3"; + sha512 = "da2d5d3d337c39236ecf39291dc44ce5c023dc0dc0b093c73b17425befa5f8b54239f166831b2d2b88d3556b9ea1e3dddcda8bdf2907fa7c5a63d78ef222b214"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-AR/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/es-AR/firefox-77.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "c397cdeebd4527189b898db2640c1a5b8b5bd4fc1664ef384662136232b5dc21f7033686d2624ec421542d1140f46cc95c8364d47e1c89a8653d541fab52e28c"; + sha512 = "ffece84feea0c13e2f1b40c41ddf0c6bcb9db03d5d377c509421abc2bbab7d04134e14f9eda5bb87bf7a63da57ac214cf88a054fd58cf7785e620e37076b5820"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-CL/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/es-CL/firefox-77.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "86940cd36df65d0515634c7abe6c7c81157a8bd3576acd9844784041c2239d25aa455da2fc33ba9b8cac0e5a840546dda0cc04765589dab0608ebe9b3cd53967"; + sha512 = "649bcc8ffa5ae82a26c277ed648e7e02bdae3df782c2716ae15834f46230105ec4c33bf838a7c5dc7cd1ab1ef92f9babe9bd39e8dd5d34376ae76121119e7a2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-ES/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/es-ES/firefox-77.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "9a1404626e2b9716567e0c1b0a7d681acfc47bd488fcc585172fb40c4d18dc1bdd4356244c74d042ad085e0300aff73ff7619d651658655bdf7d668f64e72a3a"; + sha512 = "c292b0f01d5289ca978b0af87d15a0472748db192ef4f09b36f5fcb1a671edc9a3286d3981e482bbe0b33158f930ee1514cf0e8b18cdf31a47a2c72b0e0dbf19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-MX/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/es-MX/firefox-77.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "870b2b135ffe3ece3ef4d16abc74d469421742bb32fe8b0add3a39dbd580aa07e251df4137f3a2950d6992cefcf0eaff162959ad5eeeb7e493c016769ad2751d"; + sha512 = "969f18a23691d80f7cd7df0ac43c6a725eaffbee73d8044daf90ff4ea0baf504cba9e73049f74b9cf8619b78326797d831f247f86e5181a791fb4ae211b20e46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/et/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/et/firefox-77.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d20a3c1cb0649406d9cfcc22bffb4dacdee124b68c210ff25b1316be76a1ec26b7b9f21ee8d208cb7a6f1f733ae71b70af3fe084b92640cce03989f4d45cc375"; + sha512 = "cacc56bec434d5c44422f2178bce9db151249b4298df079a00c378995cd353d6369b6a1edc841928eef26a5dfa23d44f25cc33f0dabe96b44c13004bf134ecf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/eu/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/eu/firefox-77.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "fcc4a18ab042f31153e1f5a4d090c920e687687ae8be4259394a771c839e8af167efdf9b0a3cd8ae80f15e70300d24ca894ec1381bd91738b7a5c1160dcf8eac"; + sha512 = "a5fcf26a1b614006463f0b2503c39c00009ccadeeeef54c7ade12717837858594037cdcf96983cec88c5816e436e97eebacd07b40182504c016d238207bd3e62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fa/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/fa/firefox-77.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "7ce0bce00836d4497a440f3c66421cbab38f5b856a8b0e3dea13b88c167b689a061be7261d9daed1ddebd23f21eb806fbe72c7cf08a2f49c31ea1486287404b7"; + sha512 = "68a2938aa4f190941595e66efad29adb7770657dc755725e926a19e189f15f83a5e234d896f589c693fc3665e50b5da95fb3538238a2c2c2f955caf08d7a9cd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ff/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ff/firefox-77.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "41c0639955bb82c8042e0cd9e76c6c6b30c5baf8f94206f1932e8a56cbc21a2de53fc9b31b6dec656822e215d11259a7b2dc158e58d1edce48dbe41f2cda4098"; + sha512 = "28298f6619a3c485f08d25fd9cfcd9ff8c60014c702ff7e4b6e462a0877b7225829d4a5014a653a3073d4d51dca731859bb6600ba9a66fdc488734af7487f9a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fi/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/fi/firefox-77.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "540f26080c0b85b71e40bb0eb5acd92d8b71cd9ad8dbe72121225afc2b9821519ed6a2d2bc58cc77b445c3fa42ac6e39647c1da8c8a8935617995dcb0376b9d8"; + sha512 = "fb4ee19b0b71d6d51f82cdfa384a4229e4cb735e0901ef9d246dd192ea5fab010de5549a0236917ee0002de0cb28b0328692079087184f46511c429b4c0201f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/fr/firefox-77.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "ccf845aec06d7274acc7a850702e2dbfe69db8198a44537f7f0eef6b65bdf0cb71682b2a443f0e6a5e8ff310922bd29c39229813cd12ba54f70c0fa3418ff23a"; + sha512 = "73a06198b1b62ce230c76d045b8950008b0ea608a967cd7a143b79b745ca269b6d5960232dc2f20a26af6b9df785785db535182b2fcea2bc1fb6d46abffa1659"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fy-NL/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/fy-NL/firefox-77.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "5eca2e853a3458f5adf0a960cc7ec4f21db344e67e7e419ca19d34b807809bd0c954ae4011b5ee73b02d9ef88686ac57f2a0d1d3af43e6a4def2031b698cd656"; + sha512 = "a7a2ae5b4e1c5b6e0bee93e4dba501638d4f6aefb094833eca2e1a4c342beb29102d92840ef8c898106c8689d585548a2dd192dfdcdfae3a0c7a9fdffa604008"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ga-IE/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ga-IE/firefox-77.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "4ceee43db5cbd6ef5b18442cba0c7c74998129280e14b20ad41de041b3053b518fe77767a7aed9c62fa2467b2d6ac36a680e276d79edbc959313b260950f7c8a"; + sha512 = "1341a646c758c1b879464722a536743cbe406b964ba289d9bd36ac973db8cfe008331f1736a838c1b0fa5c2c3a01e12fd8a4b3bbc073e0772ec3d50da7ea7159"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gd/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/gd/firefox-77.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "9a5115acf49a15e10a530041029081eff7bd7a6877dac1331391d5321533083162be0dbc5dcede2bb708d8a54d47af3773c89e498d8c7d99c28f7229747c0721"; + sha512 = "d7996916bf60c44df2a354c2f09bd1116c2bf1f20bc4445686e16f1eadfa6606e772fb0f9f3086231b8666a5a22a4dd549a4efcf7aad4529ac57a49adf9a7777"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/gl/firefox-77.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "435de08a8d536491b645d630e81bd9190b61e0073c3b170977a995f9599b0ebd0fe4a18279f0ef40ca242e854fd43ea36dab41a86a73c515a691b621f8b74ae2"; + sha512 = "38068429fb33f17451babe535ed9692f8d97aa9bd10a419016f6b61c8a02232c801a2e018bb6164ddcd1c4b3216fae71c1cc7f00cbfab3e20b85d3aabda02727"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gn/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/gn/firefox-77.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "e4e4d05239306cbc0f91cf6d1eb890af45c40fff8ac53fa47c6dde6dbaa583d31b6e5e51bfac91d2fddba9f89e51125235b11f766ebc39ec5e55da65e1ba732d"; + sha512 = "ceedc3f1e05ca7b33e03bea9e0da10eec1930ebe30cc5b539e6b928da8a19eaa619289f25188888799c3a0d91c12a6873e38411e136fa684f5ad27d6ded6d6e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gu-IN/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/gu-IN/firefox-77.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "727b7db843fc1722cb5d837e02388170d06f8c6ef42aba22dde9e237808e5404820c8b14dd43ec5cf2ddfcdf4883bd678d5c9aeb2845e428c096382d8a805afa"; + sha512 = "f2497076febb3f19964b3ffa29de9061cd64706224c29ea8680a4e7277131de559b67c0012d6d7a8905143e6b19ebf27b5ddccb3263d5fb3bfcc8aed1f93b294"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/he/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/he/firefox-77.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "c151a281f8aaaf82a0021c20af2d12332674b27f2e5ac9c0ffea070c5c350f96de978a1662b5886f1d3b1d514061747f247ae3ebbd965e3ce940a2494c164243"; + sha512 = "d91a982c027d2b68c449fcaeb719d8943d089c778d017534d72b571b26af8c7e01ed9ee37309394b6984daec3579b91c901a3a1d9ecf5485a2a0a1a8f93d522e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hi-IN/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hi-IN/firefox-77.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "5048f072162e3b2cbfbcc24885aec83599a7c47bad212fbae741fa15b903014a9e29b362f1492b42341498398b009e5d929de0801a22b4333093f9057c47b42c"; + sha512 = "7aa929a279e568ca517f3727b4c51417cb4acb6e2606da30658c9a213fb789dba9191b51d62037928a47daa394ddb5baa0e2746f68a4c5569bda3632be17a719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hr/firefox-77.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "ebd9c280598ebec64a230f6711d4d7839feb005d790c0660fe789e129a1acba78e170686eff21e0bad558dc7e9b0dc98a9139b7fff2426d9050ec0b3ed3e815b"; + sha512 = "07fde2ae76e5b9ffe81ed5d68114f66aacd7209e5edb353d1962a9509c7cf75bd42ae21ee8cf30216f502e31af5caa7984676192a714712bd279440659dc1661"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hsb/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hsb/firefox-77.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "197ea2000df14ad17191e2e7eaf54bf7bd1df21fbd25c0e18b200d2c43686c4e256be329f57254422a8e156917ea3bf312a38e332b72596b5b93b97f61319be2"; + sha512 = "b591a29c05f751374fbcf9c8557d208842ee26eb27ec0be766fa1f5c608c4eac7311e667f27f95bddb4d55b984d1975533e4c6d3267c69130ec21ddf189e84ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hu/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hu/firefox-77.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "ce3b86d39f27f1a5f2287cb88bb45be0b70ca8adf7e814e3fd5191fd41ab7e33c427d8ee0d4f5c7c5b279e2079e318239aa3485771bd2f211c9f1ae2e654fc5f"; + sha512 = "cd5f400c8e66e201f34155450eadf6d920327a19e87f0d0d1f7728c481c03588268b7711c865a011a207287ba16ada555b6d370badb28ee3ea2b469a76f0a03a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hy-AM/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hy-AM/firefox-77.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "022053cf588d2f7aebb564342068d4bf3763dde50f3bbcf433dd2d7e5d90ecb134f9302b44f5bdcc84f56e74c7c965555e931ac7b6d85ce58dafe838026a91b6"; + sha512 = "f08d7c0d8db0cfefad662eece31ef9d23de333f88aac225960bffd20a9de4bdeb4f2c9835be7351e20615f24024861231a79ab7ee598caa83dde88e810d973f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ia/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ia/firefox-77.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "bd57679165653b1557569d20eaa3ca83011e5704b76e3f29730e91d2c7a5fb553ab3563a1f26d38100ff8330d7efbbd133e959c4ae5c534da2e0888dac12ca5d"; + sha512 = "b5bc06630095041dffff149743d7dd43fe0d4c698f514f2f91ec0d8dea62273501df4a304903dd96532e9fc1756a8330f052a5833e331bb39478397dca5fe7b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/id/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/id/firefox-77.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "72a391de2d665db794e5624f341245a85a85c45d8d2f3c71bcf526b273bbf1a06cdfca5e9d45ec05627570ee496e0899fd7756066f6f40a86df088c4e5025ac2"; + sha512 = "2960c0551aadd142c5fac2e99b327be4393bc2e5515d3c67cca617cdbbf6dac8e20898d124960420a8804bc7e1c61a8bc3de715fe43ff7c5a9dba62d515a4e10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/is/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/is/firefox-77.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "8707e9ea8665b0f2f773c98b7c457c00c99528676afaebd56570fea1460b11ac016ca257f10397e447581a3a8966db671bf33634255c015104c8435c067fbce3"; + sha512 = "ca9be0a8d2ed5cbaa3228de5d5cbc4ed6a0b14c5bf5f1e978e28fa1840c00d3cb32334f24cd9846e9aacbd61e04f79949f5271d061d62b5654a44e95f813b397"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/it/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/it/firefox-77.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "10d74b74ca47e406919ac9589937ecadc55b637678f895d6bb3700aa072c261416591378845fcc2f032755da08a4e996c726fa1694b18883feb9fb90a36ab71e"; + sha512 = "20259f0b35d85a75a90182851cb57f33b9e043e358a2b80e9d3e4fc5e6b0f3ce8bfffd9dca4f574304d66070f307c3832647d4829169202b119a998cf969ef39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ja/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ja/firefox-77.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "9d7d45b0e1ef893145bce37a137e648b6292febbb08e66a0f0e8b6e9765e19ed3e864483c3892d327f3c75a4f73592a5cb2957ff6c17b20d19bf18179df5b083"; + sha512 = "41234ac1f73c3f93f61bb6f1dda395d7e6b969627b86fe36f93f33353c1b28b4f9302014ad7cde6b3e8df2f84b3eaf0bb75c6df884de0a9a77ed2d133beef863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ka/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ka/firefox-77.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "22730ebd0eec5fe1c9f993c8964c81b31d2bce1b1b7ba901c3a7911d9544659e459fdd19024bb551169d17c9430e15a92c039969379da28a49db2f0b04d799c4"; + sha512 = "be9130cd5835cb103c3149dc53dc325c54c1cc5f5006cbf3598314be2022c1f51928529cf3218052abc5f7f6f649e862f69ccb5b39ab5053141e231e56113ba1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kab/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/kab/firefox-77.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "e7455deffe566f95239e6b1b6eb5a4b20d849ff9f0fa26518d993581b5e76975e41a5bdb54f69be7ff182437ceca868779b67c6a6c118155569dd8792793979e"; + sha512 = "75d15e95416f3f61e49164b7be43f9335049f62f8350cb4abcbe3c7df6848a124ff5b5e43f81a4eb2f492ad3a61ab1c0979083d14998b684b2ba8988c94d6b57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kk/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/kk/firefox-77.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "56e36532e5babf3682edf5f278b971897cbd4854b0864dde5aedffa6a7828048557dee5992f9eabdfdb67c2054abc0dc2e5d0df8ec5882b07d8b266183177e06"; + sha512 = "df7ecfd04df63351d35425f74bcd5b0b342302b6c7b24deb35394aff9ed3f025ea9ad1c1147d46a789a2a11d8dda924c15584ee826819fb4b1fb0509aa71cc9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/km/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/km/firefox-77.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "6d1ef5fb7b555d667bc1ced25b7ef49f8832b9c077b113db79ff8509d845d693af33bcccf4039805fc0c69293139a22f24ea3294706097ebde859cd0f9aae8bb"; + sha512 = "811876b5a4d070aba73426b2da43ffa5e9f9beb1a4ca37ecfb5e058100c60d3455e6284e9a71d5ae58af8cb9fe9e3e0703847ffb16fd963b4eb1410a3921f260"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kn/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/kn/firefox-77.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "04626f922214d666f1da224b2ba52960f1697ff76a0b40f92718c536eb07de6b319700566a9c3d702e50b137d54b7a75af474bdf56d39bf80165b8430b636944"; + sha512 = "8c195accc9adbe3662abf62435d3b42ae4e2affcc41cefbb8f5a702ef75ad8566cab07eead40869118ef9164fb6529e1b4203970b908ed7d3f0cf43190049b2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ko/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ko/firefox-77.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "e83f42c7c24b5a0536510ee736114d8e8ab6c6393ce63ca9e2f9d0e0216831b192781d0617e9793c6a8b687429275eafa6f84a8839900858412abff751256a4f"; + sha512 = "2c571a931e88a49e4c977728bfe51a2008d4c384aae55b759dea665bf2810e5929a693f633c82c5ee26e1236cdcbc003a9a39e0e01ac46db71c9bcc20eb8d17c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lij/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/lij/firefox-77.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "524261eaf2fd311f92d85df46459bba17b06ca4e1a61a14453c9edbf37c31b1de2d781d466812c250353546bbde2044c79626840297c76a3986fc6ef869db863"; + sha512 = "d624ab2b73c03157d0559a3a41a7a50f985364b8b2c03466f949d2cd212d206bb39957eed9ea769796f4091d7644cf7191fdd0881eb8101e2cb8944923c677ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lt/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/lt/firefox-77.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "f9c0665c4f4fa6f4a8f0fcc02b92c88d0c9eefcc7b018dd54c605c6b0f024282e25645ddf14cb2bc82827f7c4c8191a83c38d4d749af45db07bb81df99ec6d44"; + sha512 = "72607d7201c562103dd241f18cdc2b681fcd5d28302f5afcf9e03f8aded2339a88e2b8c2b81fffdad5e10bfef94fe39810116d61a415f9625d0a48c794078bd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lv/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/lv/firefox-77.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "b89f91a5223a2431ea272115b18fba29491d60ab5e0a69af4a1152644596b477876a7c8109ba08c5210b782ad11ddd2b65c775a4fe8cba1126b21cf31e31d1e9"; + sha512 = "f928e22f29e46bd9405f5d2bc902c82093ad8073d8f6ea52af20c93805b0c7b5523f489f9140baae1b04b015b7c185ba27398ca857b00c171dce32f38ea0d706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/mk/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/mk/firefox-77.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f10771c9b2f8634259b7252488e4fd3f9b249b33ab59ce9a02c77d0c4cdc5c567222a91271d4cf3949decd86602613e9fcf9e5e8a403f91255ad8a69bf2351dc"; + sha512 = "f6c7bcda5da5d3315a0a5a47d7a0b9ec0d4a6d4b0daf8fc11d41a8a8376fa05607889d108d38f3a6085c0f9cfdde86a6486993f72f44822a75a97b1b9dbfe185"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/mr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/mr/firefox-77.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "49bf1846a330c4d43d554f048bc1c5061c1059d62c57ffa224d19b3b4b2fdc806be73e6bea8409763be182b37ab6a1243652c62f5f3e48a36c3443f509a06c56"; + sha512 = "8a41b844c5faf640f78615593343dee0bde8dfc2c20977b80a6e9de37fbe10e997345c801b025e4eb79627aac27a92169e0c332e7595715227b2d3015b2c9b3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ms/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ms/firefox-77.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "018622ef6cec81de014191bf94f88aa1a7ce732324f70a1524e3866e5500ee93dc6ac48dff4603b2f86b909301ebd2440ab87bf976cf041f6f8ecc4bc7da25fc"; + sha512 = "866daf16e535cf9e404a788c8b792c8cbb391c43912738d7eafa723c5e6eaee7290d94c39324708533b4c8514391a0eabd62626029ee7591934e5ff6abd72969"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/my/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/my/firefox-77.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "24685648158e9da5e74bba611884c3d260e7bad4eb3b6b2e70cf57f15d505b87a7886868e88bfaf440f03f37f7da04fb6fcaa5947ac6ecb62a987b24e0be5759"; + sha512 = "94ba7fa3a0cb791daaeaaf9998b0c574759f7afcafcd388b0b5aeb9bb1ce97e36671378f0c56c3d5120872ab2ca48933b2a304f3ef3e194a77741c492e8e75bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nb-NO/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/nb-NO/firefox-77.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "4fd040d08c704cbcade0a290020d591fc265bcbf63467f93c58603a3f96af06cb3b38d03aae5a32b4b78fe2c4f89ef81112a69bf539fa052b721f549423b42d9"; + sha512 = "c46ada870f940387fa6bff044176aa59f3fb376a8d8b1df1715f6abbe3bf87f932a49e53f2c4bde967bdc04c930fa2e426f7c4f66c22c64353be68220d9ed94a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ne-NP/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ne-NP/firefox-77.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "0708208411de209aad6a692dc1b867011d589f2fe1e60dbb5c8448f96735d811aca6a444f7a3ae2d93a2953965b57a728e3af1b2a31ff8c86d1941a21ac2147a"; + sha512 = "005aac3f43e0104b284f1805062eea457e81e8b29940b8c034f99de7e07d38dcbf9077d62a1c44a1f2dccd65258b1346889e08b7736d9fc983f03df788fd5e2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/nl/firefox-77.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "2c6df617fe9e4c3ba1940aa86e313fa4a5e64db98f4df9abdcef2a5e7832e8586e939646e435c9725e5b97ec80da0f987b620a78faaf445c374a46cdda862f23"; + sha512 = "9d00c7ebf4589615afffddf6a33f0e75172059fa3e9ccd56d3fe720b01c521fa30a88217b77cb2ebc37b088ce69ad280488da6ab53525170cb1fafba64816235"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nn-NO/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/nn-NO/firefox-77.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5f02a673edacd9e9e9171c7324b3b45974bc5374fc5a05835a450b6aad1219dc76ee50dd4084243523fc3e10e7b65a51f33e33009f4393f790a9a8430442d87f"; + sha512 = "5a9ff27a1355497d57056826ea0ba465d9f10fe0112628634267b262b4bdaa07b0133fbacb8a5644063cacbd0d59526a09a6b98caef78d25c39173934445432d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/oc/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/oc/firefox-77.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "cf24d386d8ad5a927e86929d053eebaf03be667bee4a4d0a85a76b6030e85f254b8e9b14091cb17ce3082890affa2c75ae2c1c0da8e007fed5189c9c2fb3b95a"; + sha512 = "02e1519ec4097a990325cdcc2e13e70c16b25febb466d9d06db64b8b0c689c7246546d0666a71003a533d73d0b73b472aa8312d9bc59463dffde979618570ef8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pa-IN/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/pa-IN/firefox-77.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "1a8f07e70425bc65552fa82a16eb4009e036de60a6b84aacf7a4d47c2763b00b116f61fb87aa2a5dc28d2e09a82dc3621470b5589b3fba449e2eadf2996686aa"; + sha512 = "9f7218eeb5abe8f2196b2a43cc24a0cf6cd13dcf8801f7b57100336a90550bce23579dac36353fdefe542714e67bdb86102de734ef74e4ccd29a55c8f79a2689"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/pl/firefox-77.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "ba8dcd5ad68f8506d4c637be831365fe230209ef58640da8bfec20cde9447daab678229e0a82931c022aa0c6fecdd0e405e92a4bfd51d7627235b689aa78c555"; + sha512 = "d986bfcc489a89a9f49defd9383904043d36d4b29b02715186977cd60add217845dd1785fb457228c71ae02243d10a110b563f18fe5352e68e315ffa8290848a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pt-BR/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/pt-BR/firefox-77.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "fa1f67341221a907f24ce2953fd75a0003c04540a7673173fdc333081c82c24e68c0fcaa85e10264435a9540e356e94f0b4d5b38d892821bd307530ee10f9b7a"; + sha512 = "cfb4d9510ec5e35d25d53302e553c9a85f8eea4120a236dffc5f2350b70868016b852bb1d43eddcc03b7dc9593f8f76e133fc8329c000f315f68f2e4ae5e3201"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pt-PT/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/pt-PT/firefox-77.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "c282b71b30ee4f2f67d98551eaeb1700d2867e8ae1f19dad417f8774b8a91db63ecc14c37712910b7476e837c4c23f4871a20d2afe37f61ba4ba0ca4b1684569"; + sha512 = "335fa2e31e66f0ee0323a50154dcbfdb1516b8376a587f0097e40c51c93e3c019de3e1c4af19cbeb4f57c1b736703b82dd63af91e53c2af5532eac42d80fd800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/rm/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/rm/firefox-77.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "70cd918ccbeade126f36dee76600f7c6e78ec3291a12e6d60f684dbf5fba322bb7ab847cda9f101af5b48d9b0374573e8f6295dd8683ff3acf9a89512117d054"; + sha512 = "f7f06e4ad2f0f01f398afb5e95c4d88e6c045d57c86d7e004aac3bc79c29043853aeeb4a6162fe004ebcdd7278055a19f6c25d60887ed451905ec4e376eed175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ro/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ro/firefox-77.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "acf9a4914255bdde374ecdd77b39190c945621c51ab13b2d9e1e8b1655df593c6c7e174113d89e8b1afd223e6a0f63560ef4d991706d5f23db35a939ddf793da"; + sha512 = "4017ef08f0f1d7fb82bd9b7afa72a617a3f781ef6296b97b9c351528d8107523df5c2dac5aa1ca112cf6e6b5aaea818195f3458cbd20b9f0cf88b3acf09699f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ru/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ru/firefox-77.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "9457048e428958b55ae221471cfb2874ca16ea9c1e34a33d538b9964e6ed77711283207106814f6d18ab73f8c690e6c20b2c84d361242b228cc92c7ddb675a27"; + sha512 = "7aa2ade09571ea44e08b12f2c758e56fa66eac8cbd49d90c28abad04b99f9fe005eaa04f5b6b238cdf56cd7a59ca388ff769c862310dff0a41d952d35f1cc7a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/si/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/si/firefox-77.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "897b488d3ba0592b902f2cdc4eeb2f454b9b6f67fb5e4c583f5f49fb062483ce1d30e64f6273894c698406f8be7dd8a2af02a67e8d9bf47f8d30a572fb18e7c9"; + sha512 = "668df6d1741a9d300e975d1d25b42931a7eb3c2883c33c4ce1a585ed7a065a589ff569732e1ee04ef8f25c84d69ec3458f92263aaa5b2a36fa6da8a1ccacaffd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sk/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sk/firefox-77.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "2847545533829f45c22b85368c5fe262e2a43cef0e5d480a540ca47f0dacc8003b8e155b11098944c7012b03feb8ddca216649f645c46da0975183f42580e285"; + sha512 = "e295e69e84a768ba070f087aecf3cf041e67bc297f144af5eed9a75758e0d322f730b797601fa0733b1b9260f5d3225c899ccd80a3861fdc77ab1ce9179dc589"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sl/firefox-77.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "9b0223b409774a62216c97e522696700dd95b65e1755d889d58137602fe4302d8f5280464636d94c97cfdde8c56e49492005e487730b591d19bc947271754e1e"; + sha512 = "63dd33ca7ce582b4f3284e936f54469a4c31ae1006dcd95ec5952dc4d97b2d524a91adfebc041e8a7b9358f5af847a6fb6af35b41af744c2701d408f64d181d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/son/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/son/firefox-77.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "097ff1df64b7ef62eee3a29672447c42c46dc23741ebe87365c4d41159052ba3560f7a10956dbae6b67daaf80607600d2241dd997573b8ef8c54fa94f064e629"; + sha512 = "801bbdd3da93480dedcc13589c77dd2bebed151df9ff468e8d9d2358f69fb57c22f8916a9581e460ce4fefed6bff651126f92ca588392169556444c21a4aaf42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sq/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sq/firefox-77.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "8a76a933f261708504fb637a93bf4d600514558f08832ceae8db23a404e5d911ef23803436e5513a4b7e4cb85f536e64c5ed801457ad2e1f9c559dfd1f8be807"; + sha512 = "4eff5f67eaededa77e962609ef7da1af2b10f5510f3d354d5d8065957aec115d827da0c0ea056d02b5d7c11f05db7e4b91cfdd6bb0f879ab92f6fe84a1e137a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sr/firefox-77.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "bf7d631608e91989a8cb63cc07b8e253cc2c764e9f712eb113c7b735bbe2da04ddcc91d43fc418eb208a75f4027256cfb10d15c21e82b7e3eea096ce6fce9a5a"; + sha512 = "d688aa2911bd7925f6be1307bfad521ac29364f047b8c7d683328b95b871a7ca0f382c103babffd518f607eea0298177d6ce145511271f3c92b8e2de81da06e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sv-SE/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sv-SE/firefox-77.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "cfec4b5942c193b37e881569de1d40907d44b7ffdd6a08fdc3dc44ad27151427de0e368a08e4888d9248e07fda8de54f1b7d1eb3e106f0cb41c7fa1a8e4acb10"; + sha512 = "27fad5bd1e0a2b2a06ff48c90049ed2d03fe8c463ce5a5a5b5a83a24add6d1fb72ec83d02f4c9e2e741c3d43b86e9fd3a821cb6d158d3fc940fadcac9d040061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ta/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ta/firefox-77.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "8f487289fff43075239d79d1d4b8b0e9e7a645a8dca26eff58ec32e534a870b5b67232ea6d43dc58b1b4bae9be8af65793f185e4b5747d9c374fe7802b92c9b4"; + sha512 = "1dc96ca10fdedd37369037126c48940c060ec1b0238cb4c592db79b3154c8e1ed167152ebbd33bd7375b241776109222c1c3e886dacf4f885319eeeb7e33ee8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/te/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/te/firefox-77.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "a3ed83d4c34fe6d24c2d33c490d6d2de6fe56382bb87807f530bef967c25bfb9a00a1958ca13f2936357e3f1d75b029dd2bb89a13171574bc022f7da8b4f49f6"; + sha512 = "4c203815b896aec1a94416ae2baf96dda2c0c035da00e592ed16eadb9b729710d5cca26cd0d03fc654576b9458b4c2fc50be159164e6ef1f1fddf90609221eb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/th/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/th/firefox-77.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "54c9f36ff4f00f1bfa3f947930988ce6985bf4e2682613a8368ab60d07abd02d3171cd2457987b2bcdd7d0929003580af9e4683b7e0f529b1ff3661004aafff7"; + sha512 = "22ae877469cd895afd487175ebf04c6a10b42cd7b408e5dcb352143e457690bc13561395abe15db0bb6594074f2298609fc381d2137c5e1aef2af273f17e2489"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/tl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/tl/firefox-77.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "6dd5f5908e9ca66b7ab9e132dd6db3c5c2ea2e28eb9de211ceb6d2736746fcd50408cd327f098ffe1beb57199af6b60827bc11614c4c781d109ff315ccf9d7c8"; + sha512 = "10d60e3389f43f1206a3eb1252897d0a047cb14272f8408c61f34eaeb227966e8e43f9fbb92d246bbffde77fd139e5354fd2abdf0abc91b8631dbbb64635b549"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/tr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/tr/firefox-77.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "0222ab139a87a195fcc4489a2d2b1024e95b4b76d4ffd8c63408ab3f4c9ea0e4be019a57e31ef3eee3216fb0217c01cd92cbab9ea33b2d7f0a4660326dd0b8ce"; + sha512 = "c17c8ae0e97b130ee437752410eec9d2bbacc84aa2e5f13e0c52147d7540fe6f76e91a01b0c94aa81b1a67f2a7d8ac29fe9e21197b659a6840c3c9933603c119"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/trs/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/trs/firefox-77.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "a50634af2bb7d9cdd8ae8fd268b2bd5f24bbe68e7bfcb810e51921a56db7f831e84e73f93001a12f83a269a27df956df03e70aaf6231925b08399bc54aa71de7"; + sha512 = "df664c21640b9d36c487030a5db3f83a2947f375a7bbea3fef9a86add22ebe23f482091cff6205ef22e8544dacad43345302a7b34f0a4729a8da6670ee9ec9cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/uk/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/uk/firefox-77.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "9e32876027449c3b145cf7088b5b9bf7d941d3086f6d1da1dd13f3f06138b1c7c375dd7561d9342dd7a1aad1adae6da3a2f354927be1318eb79703753dbb0d00"; + sha512 = "68f6c6a804b40441cd5bccab2e925864ae8642dd2be6433e215e1a786043b50eebb8e00299d47c19d5b3c52a86c8a0877a511f3142299b906ea2bf4bcd92099f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ur/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ur/firefox-77.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "f4331e2c47373a612083697f4a693d7c05edda3f08518642617aa274e735f7a64ac49f28a0c1681addfe488107367377757b12dedae49a14a4752ca726d0fe02"; + sha512 = "05751d956fe5c5d3662c722bf97af4056e32daaff5b704e0f514a16529d8110ffb6caa4207747745b9c46bdaabe51be658b15b54168fea4f0b27287ba7ae9173"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/uz/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/uz/firefox-77.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "ba7a39e9f8537bb5fff9253d01b3fb2a0c815c3d93fda024d1da6dffcaf313e7c75068c302887355b0e1b498157917be5f290fe81a2c30f8303c33ae2f23d9fe"; + sha512 = "bbc479208f90b22da1a8cc154870b1b2eaaed25395525820c5add437186c7e3a391545f5efef0d1b11e6ff82d5cb7ba85d1a0872e919cd681eca7abf92aefb92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/vi/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/vi/firefox-77.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "4382a78302dac11f2ec626627c65c528d756364b8332c0124cbfd45ce9ae226d4b42eddf723e306a1b1e0b7bb3fe70c9efd3019f91993ac2e140492900fc0ab0"; + sha512 = "9414e3c51efde79c1d959036d6365416cb421d0cf37bc5e2fbfadf7673d5bd87d506e0ee1914949292c4cdb9061dc93ec50c405eff5cbba8bfe5f1870afb4948"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/xh/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/xh/firefox-77.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "b23a1f3b7fa906fd6dc25638d8cafdf3adfe63346fdcdcf878b9f0f98c8803631fa608fd75086aa7808fa0d4730ea7a89998e2d695b2d1f140a178f14294d318"; + sha512 = "61c8b31b28f406eb63688258757ba072065eccc91cf0195f03721cb774ac3e5d5aca0fdba27e09933be8e4106e30ba39ba4cdcfa85d3bda1a8e976695a3e47e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/zh-CN/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/zh-CN/firefox-77.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "b73405a8872f079f5f69cbd9fd69aa60e614a0e22f1f933be9a8a9e7312fca362549f57af17629548694e92679c763786978fb572faf4f9f6cb72d64b2661d60"; + sha512 = "4fc2046f4f2cce47c27876cb63a7b07024b639e43cd01c771bf01ffbbaa70943dab0a17e08ecf63d47b66416a7fbf89cd37cb06dd0eb5d589f0e58168632d6ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/zh-TW/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/zh-TW/firefox-77.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "0069f82c583d88e9630fcb70c481969ada68a7ce919c4f5ab12ee442ca77f69d15179a46e5f2e7850a6686bcd6cd896f2e03163ddaa7e88affe6d62856d1fde6"; + sha512 = "5eaca5f3d81588547f0df7929f8591527c2a331d52136b23aca547e7d97b711ef45d1b5309d63b08eef44897fb9ba47d91b0b94f077856dbc5e6db3bb62ae441"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ach/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ach/firefox-77.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "1e81c77813d8f489ca2d2d75dcf74ef1085ddb367df885c2d25cc7051d759f26685da89860f67920a49ae4331762be74fbd2293bc2a6e0549187ed8fde643d4c"; + sha512 = "10723c4bfb26d00637f4e190330bcce602b80b4693c4321b7fd7cfa58cf7ee33d8829c0afd23c17c836ef82f03d5c7da98695248bf932264697015a2949a3576"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/af/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/af/firefox-77.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a753254f0e302af7aea86499c1b03cec34a83691eff48231840a20c0afff1c595fab893d804b83aa0964eb5e570185102a701d31c668764d58c4715b3d0feeea"; + sha512 = "276a26621d0fb37f9c57bb5de992a3213cfc97ddf891b6fbec331722455221d71b1dbe6f5ec63cbb552a1dd0addc2ca8549451facd83d9b3b3b5d88fc0e5537c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/an/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/an/firefox-77.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "e1fa38d89cdc7d7c9a01f8de5ee19316b1ddbdce1f4f868e8ce1bbbf22e68b8f741246a5ba4f2a4e67c959b9575c73acd7b88e918e3be5fa285dc5ed42e9af61"; + sha512 = "2cd26f8507a49676c32fb7c9c8ce43a9df082a965d59340ec794f11e85077f126a2052c86ab78edc6087a1fbbed3e58e773930f20a5e3e69fece29df0931aa1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ar/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ar/firefox-77.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "10270f9783b09b09fd7f43b8f3c4196d332644820796b097ca219819e81bd5fe23ffcd4df988d3f2f3d59fd005e38feece57b7dedb84a78aac6af7965e73421c"; + sha512 = "80a4fa4279f0121fddc956ebec61b9ad2fc4417f8e41461517e50fbbd6d44278640590e4d4ae383a3e1d732382f037ed7bcbfe599fb08ab21a0d98b52f32d0f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ast/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ast/firefox-77.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "1df6b8b479fe391bd128cd9b175ddc233b19b61b3f538ee75ba7728a4b59e4cf1ec09bd9576f82df66e89048b62ebd9cd2206038a0387492cf7b1994c36d84b2"; + sha512 = "68392bec35e5ae6913311c7f6187d916dee6e3702663e0812a557e331a5cc4f30cf8cd6555abdf132ae7d638100ddbcd485bdbbe1519693ba34d607e32c361e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/az/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/az/firefox-77.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "81305694cb1601b45d09aedb7bf6c0ecdda500c95209abaa00feb2cd2aaa1f5d86f5bb18933f00cbb5a6b676710db4e96495b17141cc62dea06c26483d90976f"; + sha512 = "e15dda365436f32ce3b553f63e459e5d32c5a00aa3b4413899c9028e0b18d1a575c33747cd621d1b8e08a84a77ee2ead5c5fdd8b4077055dbe96cbf2d223cb05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/be/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/be/firefox-77.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "13e5c72791ccc0ee12844d8a9ffdb5ac60a2a9d79bb3f25818f4f1b3b606137b5eb3c8911f81d654028cef48a00d9cf10841465c7fe0304000357c62d964ec44"; + sha512 = "46dc546bf28e57f7d2fd462733eb7486f88d4198159e77873a5b566590fa1b81db8ef4149dffcf60cbc6aad1529be11b8eaf5aa4fc410600a4a1eff3b576f0e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bg/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/bg/firefox-77.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "06a1ba2fc944a15375029ff12ed9f566ccf6a795ea8e63743be8084c7e11004d72693c65b8a330cf945a530fde5298c69c83a0f549edca8fa50d85a904ee744f"; + sha512 = "f44fbeb1b25249a28a9fd77dda908c3247f85f788ba22dc131155e6c21d80450975687e546a63291832974555745e29bc8b8b177c338bf911c212125a10f95c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bn/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/bn/firefox-77.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "4b4c8871d5da372ddd15ac410ecfae08385a74b68e142b64e4e463d58b1e60583025f3855375b5adffb8a218839f86cf538a96dd285dabde96f8695af2ed1a4d"; + sha512 = "b2fdfb72aede045bbdf03feeb38d0f8530edbf6f2e9ecd9723b481365eaf0827e879a38136e6d72efb666138403205c13cdb10a1018e5d255a847d8fda4a2507"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/br/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/br/firefox-77.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "e33d927f88d4e0a67b28f27ed32696cadba6241fd3bb48800e68248173bcd7085adfd3dd3700c8d4ddf5be3df93403e20e9c0d57db9ff5d6a141ed58b74c26b8"; + sha512 = "68cd1a7eaabab81400c78e1fa36850dd84fae8f2b05d5c57a4769beb7948d050b6cdb5b4b6928afa3a70ab9cd97e37214d67ccc5cebf62d09b7c1194ff410b24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bs/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/bs/firefox-77.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "680587ff748248a665751f004b02d0b0d4e28f90f672141961d47cff6239823431b863e8ba702cad8f43fa70b295ad69b47954d2abe2fcec423e68f704fddc6c"; + sha512 = "4fa4d41a85e4746e383bb514aab8222a9c0aa4ebb1779009a50e891c672e6a1002ba454ed24d7d4fc4f0f79ca53a985ff56981acb2845762085570bed93da3f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ca-valencia/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ca-valencia/firefox-77.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "3f740ce2af373a3154372796edc4e85f8bf87b83cf4895328dcdb357aa4214e7711cdacbed596c4d7a1ce1ccc16bfba32fdf2d38749f3144faf747d05e76e208"; + sha512 = "23b3a60a34fdc9dc31e54141e5f62d21fc118b9932ed5b0eef6614535174c107b113bbcb3c42a940fcf6a86d1e734d5478dcf840f882cad6a772c6006c8944c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ca/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ca/firefox-77.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ea9b71eee4f6e967753acf4e9f0a4014eeadadc6d1bcc5fad11a5975b778f92cade729338636d86a783ca08b0363942d7d9b7e4ad65fc3186760189ead9bf0ae"; + sha512 = "227cbe52a302f4030fe610ba816c70c5051c58732964fbe64462b62e879df0e35069b0a5d5a862bed87c21f36387fa43bdb82db827fe58b1e1d80c966f0ccf5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cak/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/cak/firefox-77.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "bab4ceb14749b67877a99b96f47aa7a9d6d65281e78fc416d3bc3e5296ba2133d7548ccfd4ab32637c976d178fc911f55b6acc60dc6658b4193e1c6146bb641d"; + sha512 = "5a615b7de8caefaab8f4f75401b13f40f3cc4ea23404f9a998979402789e8b2493c1cdb88b56a450b3a0bdc075a42722d963c3f65241ed3b690398d0d71dc196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cs/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/cs/firefox-77.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e33adfe91886dc66f09cce26dc33ea26cdf432915674541a8fbde09cb41d2b14c0ebb3c41683cb1c29908dd652c83c92bacea3b8cab9bb3e8d9d6010a19f9646"; + sha512 = "75f06c1697372e0432e8c6e9691497e0cd328ed7e050a0bdf76acd3513328994d734c4ebddd923e2d19b5a83142c4570e16f3079fa6e0406ac83de25e3fe6e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cy/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/cy/firefox-77.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "1c5b5d518914fb69b6a978fbb8530589c0aa117da1f2f7398696fe29c6177f0ee932f88bfabeab049bdc80d6e457835a492853ee9095b10f12b68172004a2b73"; + sha512 = "7636a99636e77e4a6b6ea20c6d73eefc11c91691d0418d75a3fa7033d844c8ab652cc5dd1caa1c574dbf4c1a143ed738c08346af4ff4323493aca461fa256b44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/da/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/da/firefox-77.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "90d385bf3faaea5ec6884c4042a72e6a23c68f1454309bc933670d0fed7a5aac2210ab4c6b23755d883fed385ae0f11639a932c2540687b219aa009067a3ab89"; + sha512 = "0a591e75f79f196dc45630b32e237e8b28cc2ae8463ababfb36b1fa9ae4f271eb53d7cf31834de8ebc0e453b89310e5789996add2f57d0035d1d9a80369e6ae6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/de/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/de/firefox-77.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "7fbc20a9cef66a6760fa314f2d074d2c597b420fee45fbc8c61a85f963130564e18d47a97833299283faf5c959d12f70e4f99089dabcbc3d83f3bfbefaec0f63"; + sha512 = "fcbfe21676ccda69d67f945260ec5a62a7513b5d4c4a51dadd252d083860f2b0d2ca0882714af55485a0e11b36a0059c87db682032901506973ca54a8e341c38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/dsb/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/dsb/firefox-77.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "2dc3dde5159c64b61a4599a0ee2aaf3e4d9e71d7a3913e086c0c187cca48e8bbaebf7d4253dab7a3cb4fbce55a1119e3f4c30026671b92b70059b8b3256e72db"; + sha512 = "76e8200017f7a89b0418ff555ef8028e38012fa520ca2fa83239290eebfbf4c1e063d42bbe288e6d32daf9dd27d463cc6fde2d8c60e7a3b8ab2cd442742da450"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/el/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/el/firefox-77.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "73bfdcc5482d5793c0c5673738ae08cb6a2187e61d8ee057ef89f4ceb801bfeec48b8c0a9f48bdd996bca8ae4a232afc61c6539a1c22c7bf96d06180364cecc6"; + sha512 = "73f5a0f278556b0c99eb479407401f19ce228cfef164ab1cfc61c766052beac10ad9ca3d8bb2e9684d31db75b764572203ad22682f48af3db9d74b3b2c7e327d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-CA/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/en-CA/firefox-77.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "baf1441e6f6ce7a31ce5ff12b600b61068bdbb9beebfe74f6c9b97ed2533ec734bc34b702caa9e9c59bb4563bfdd64c2612151793067cef3ffa1fb0ada312e28"; + sha512 = "51d76ddee014df74e45fcf960fbcf61aff4500fbd86d4ce99b9f52223955af2b7f81bf6c66501085460ec759471a8ea45d45b09295d3be8f9d03a3b55d788570"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-GB/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/en-GB/firefox-77.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "60b276043c2ec3456b6b06acd2edf6f3df5149824d20c33974f3ac77fa0ef81a03f99f337add0209bb88b390fbf4dec08a30da207ad72ef91c9a89cd36e4452d"; + sha512 = "93aa0d761f68c2b5b6c387284418795a77491d5f880d3cc0fa9ccdea2971563326545fc9dbb1f5ca0bae19e7199553c757320706e95afb2b77c00c2e06fba911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-US/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/en-US/firefox-77.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "26eae1d8a6f9e988695d59d418749fde988e48514d7c183039ee998b400f480dae16e9d5a590ff4364954e57a4008e7104cece212fa81fe73666d2bf3f0c0020"; + sha512 = "b3da650b9da5df10c611aeb5e08a6f96be431a85edc0c3768221faabfc3b302bb23677b33527d23d9df37aac7b83daf869f4a373d461893a9be83d1b74937e87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/eo/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/eo/firefox-77.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "55aee2c68a1cb6b7e374f2622c8aa30a8f26e14ea0f0119d97bbe6e807c15c7df94ec74c0f31ef071ea7b112c3bd8ee501c7d7b33ab5eae9a8126b2fc9673047"; + sha512 = "c089b6425c683a1a75956fe50be90e9027693eb4bf3dd7b19efcfedcae36cf8c989898b5d6e69f15810be0a2485a353fd0d6a1ef9041e50ac62888769e9187cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-AR/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/es-AR/firefox-77.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "dbd5aa229d0123a26290330df078967bff4d0484bcdcc3eb499a7cdc82176b49a2362a0ab08e2b55286141b25c8cd4970308cf48a1143a5af788eced5b84b83b"; + sha512 = "369fe08d54a48e9d6c5260b03c4af124ab43676ba46d96eac08f71b4bcd3a9776563e6bebf37ed523828463735792f6a160e222cba912cea9020a84b92136d31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-CL/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/es-CL/firefox-77.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "5082bef600a311f560daa09b31945961766a0ec63ebf9f38a0f0e76560fca2a99594c1f26fd0b57a2dca0c94d1991a91501ee3e931740e59010c93d46d3e8a67"; + sha512 = "dc9f850c487209b414b77d9bbebfbf3c32a8ee5644dbb2a9a119fb0f9da6d3d711a3783a4151dbf3036b9f94c28273802893add63238ffffdbf77cf213686c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-ES/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/es-ES/firefox-77.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "87ef420353069862cd539aa8e53f93f50330e0c68bfa4a56913e9245bd4a972bcd271a7c159218f9ffb78c9d9be3046206f20fad4faae3d76e4e9687530ea6b8"; + sha512 = "331a100f8b71ad1e33e436e0d03c37438e0c7dfaad9f280d627dd02c2c28e28756d7856d36e407b84c254ca45b88a761e9a940955a8aa52c0c558fb98b4e6bc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-MX/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/es-MX/firefox-77.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d02362e93a290f34063fdfa7af8fea71a6cb92b964b872bfac8f5b5665dc6ce9cde7a38a445de1074fa8673cc2c0243af69e2663542c5c2fb8e53f2c41518cbd"; + sha512 = "c4ce60e070214ca4901e153c3033e66cfcfe8d0ebf9c1d1e448105467b8a129e7904a3293fb3d895a6380a0e54bfd007e5d581bba4f1d2ee7ba3cd44b5117705"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/et/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/et/firefox-77.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "0064c56cf6cfc38a5eff201f16df5c9037da8089655df5c88a348ffbeaf933941d5ce99b3618293d2154774b483298b4c28616c6e175fe0f6c9124ce00bb16f9"; + sha512 = "bae0eec7d0578f8ba911f71505d803efcb8b7005e6e6ba0bc7dc36093f462c7f704c1244dddad5d38249204b553cdf8b0efeb12c235db171d98f5e2827d085eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/eu/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/eu/firefox-77.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "bf5cd434f45bd057de94bdc219f25e4da878a0be58c4a864a22961ac5677d0a679204a069220cdfb353d319d493e10d3423888999de6701e33227b1dde16e43b"; + sha512 = "821d3b331ac1bda31543c08ca678d141f640e862986da1c5b0e8c48981fe88252cacbc728b63e4552fbd83dcd086268420f63a0afad5a37ab0348e7d29828d03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fa/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/fa/firefox-77.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "402f980bbffd145e9f6f832ad4bff8c6dbb0db9a77a303ffe16c44b449668e621c2edf75e41686cc69684069efa10b7853d57ed5ee928298bad5ed27c253eed0"; + sha512 = "1ded2445623c10c5b348041935c03050eebfe1af1fcbc9ca9c2bb630a38a095408f3d09e9f4ecb9db4e06ea51d9aa139ddde8531db0072f6a57c7932fe302e80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ff/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ff/firefox-77.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "baae62b09a0a7fef88f64b43b854dc8c4ff583765338c4dd1e00db9c7717adfb3d8817c776cfc88f88ae6865d490a08bf4d0c97824ae3280835769ca04fd8c71"; + sha512 = "1f3a2d9c0c981c20f1dcabcdc5c8b6a8170a238f4381004183f8381bc1059d65d650374f03d124d22e821cb8d9bef59d59aba6ef132dec991b72af4c77f61d8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fi/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/fi/firefox-77.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "161da9aa8cd66a9f691b218f5d11cdae19fbfb04f44a77e266731afdb7202af98f165e33107af15ee6ced477b0ae07d78f91f57d14fec0e9a6de24847cc73976"; + sha512 = "8f4737e9bbdfae980faae68758906099aede135167cc99b3ee98eab85e6d9d22616e8043af7f02981ab96b885312a89869980a06fc0ddc117806b1d5f9b2d3ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/fr/firefox-77.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "150677eb9c0aafb0486dce2c846e0997f6eb1ccfb022a9ec2914628fa2affc32801fc34f0397fdade3cbe3afd1897ead515bc240043dd1cc7b879d92566a47c5"; + sha512 = "8680f38e6b9d56f3339f243e99cb5d541d6b2eb10a7210d8cd81bdc91f35dedd0de3b551e1b857b216806bda223c3a638cdd7e786d97674c5b7ea6710f669304"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fy-NL/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/fy-NL/firefox-77.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "b03e12ebeed5af0150715176e32a7da3ce20a57d227f3ef6da369f6fa27059cb23a8af0b4e165027598894c572d02e4d58e8fdb9a48b86d3bdc35385a249287f"; + sha512 = "aa34dde7faed1b86707f71fe190abde730f0ecf33351c487d1a2fdd369dd67375d122a266fb5dc2b28aba87c93663a5606c43fe3092597b04cf9adc752c3bcb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ga-IE/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ga-IE/firefox-77.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7122e4f914f5e8d42393a86e61baeecbcdf6fff646ddb38cbb2d7324a0be90d60bf609824f2dcc696c107f856a867e0ac9717fc098b1db3571bf60fb6d3b8a28"; + sha512 = "bb1988e6b4b718cc698a5de87b9f339dd28a2d552906c24fbe9d67385c70e3669eb284220f506f3afe03949be5df0178af1d13c727716e1bcc07d9020c180661"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gd/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/gd/firefox-77.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "f35b295657bbceb293cf1bb88a140d629f0b1fc654cf3f1ebcb5d9de84f40b17a9a7bc8973dc6699c4c6609e5cfbb858df52c0153ed4dcde6eff2e25c38f7ad0"; + sha512 = "57b665e7bf404a0ae8c7602b88d987ff550d66a2a72c47ad8d163d9a697cef18753dde981d46471c5276002ebc5464bae54316e595d1d2aa8a00ca07bae25d69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/gl/firefox-77.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "4a4a37fdce02108118cca5fddc2f2ebfeddb8a4fad97ef0584fb85748e09d43abe79b0d3f7b5250deeaec8ec0b2e698771100dca486831fdde09f41d8d77b093"; + sha512 = "409cec1407ab01070aa75a0234ecc82e974f00ef7391119828b1a2ab019c62b5986a15226f620bb1fb403288d9aabded3bad1226ae8ce516476929a181b0ffad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gn/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/gn/firefox-77.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "6c4969572ce922eca81344f1b05747d3935f88486082bdc64c814825af2cfdf27eac7f8f0c25edfd4d249b9f469ada0b062abd0aff02b9849c7055e40bec5b67"; + sha512 = "e2db32222279de40ae37392af9df330ab6d3bc1d1a583c93530262ad541b4d3139392a5d0043d6e9d0841fd0eaeb40c53b5e6f3f8fea762ad160888012dc7428"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gu-IN/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/gu-IN/firefox-77.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "a5d1daf151be8d23dde730945343bfd507ba29314ab8acb71e4d5e71b534eadc573eb4eec1bcae0ab0bd72735cd891b72d8d931b634680881bf65f63a4a7abab"; + sha512 = "99bb0e4244ad5c406259d627161c8abbf5dbedd664c83ecff6767656af8e4101c8d62081ded7a8cd1842d739689cb6aaee02bba593ab162dad3139d5b03ad3cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/he/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/he/firefox-77.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "87b6c4a1dfdb49bc9430d9740612d24ec9f61d74bd379caebef6d19fb3492cfd1a4c8112126ab509af1f35e3f6e10062a786a0e5397b424e057e9d13c924fd7d"; + sha512 = "ec00d7c46d50f38d0d43efe2e98d6e404398676eaee9640a4148e3cc196cb73ac62711a188d32c167c48bf048a5e0155db714172ba0bb7024dce6c2122c656ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hi-IN/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hi-IN/firefox-77.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "e2b96ab462227f70f4208b52b144d852e657edd3fc9885ba6b4217461a414a6aac6dedc206b4fc82d269c768662ce94ccc6cb3e0f096250d074b3d91ffa98c9e"; + sha512 = "e107c3042a1e9ab1896a7b98dcff5918b8b3adf35d3e50fea5847337c505d2cb4073a9a15fd2d3b4f6949615cd8b0376541e715d686388e418d5ce64c1001e0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hr/firefox-77.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "1fcaff37d60936b68a6f2e368c414c69718e114bcdcf8f71114f5e3dfea1eb2fbfc8b5e237406576daae74f8c4371d8a824d2542dcdd36221c931a86c9ea7175"; + sha512 = "cee9eb9a7b13944d2dd4c52456cc44404b2377062972eb3c9992499f3835d352567fb05560829ebd9db083f62bf9722d9c0e9610d439fb5d79c2dc120542970f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hsb/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hsb/firefox-77.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "5146346331ed881f0f85f42bb43f4b4884cdeb659b392db28f7a534c685a579405fa482ad14c6c4e20422e8e22b07f2fc35ead1f3756539dcee797fb0df8c1dd"; + sha512 = "7936c949ac42d69b573f8b6be4055cf3b4cc62a8ad7c5c060ee4be8aaf0ad1e9e3c651289dab7c159e8ab18584374023dc605629233f58d944f13ca87db574c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hu/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hu/firefox-77.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "eb043d50e735f1b99eab7cedef601aa302dce2b0270f08a9e93c1b1fa9b85da87305aa94e8db638e81dd8f6d9bed96b6c22f87928026cb042964bbb51420fff2"; + sha512 = "a68299f239c80c1346a5aa559fc5dd6f6e6dfc13f883c2e7be88c267725c837b6ca3c4dda06e5bf6c81ecd16739a1921c21bc71c3caf72944797915f452ba450"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hy-AM/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hy-AM/firefox-77.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "eb0553646d6b53a41bff160379845b0a21c28815ea523ab0de21230ce6c519b7ee07c9d97ce26f2078f3c66448dcd1c09e978bb1f748e548d1b5c2e0fe4e7f7a"; + sha512 = "a8ef4b5467d58ef6935bb4525363d38a9167a00a8ad84665b2971cae231c60706ac46618d62d183c19ca2eaaee04d0f386c845cefe6eed3a3e12dae188524f2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ia/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ia/firefox-77.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "b43efaa2e45de94e9be8b8b9bea50966b0fa089dff9e25671577c724f45d0dba502044c2da7de32cf1431a38aaa92c2e5856659fb7f1ee557e38616beb4a9c96"; + sha512 = "5c3b30a18467b416b109e2ff48e3a50c1cf10e550b22436115a44d13aaa03696443a5fee6c978e3560ada583fdd2806f3f1ec13c221dea097768b2d282d12160"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/id/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/id/firefox-77.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "5fd68752ab6309af0bbc6d523e2e251c8378ac0a6c2ba0627b37ddf7dbb1efc444901a254944f4384a6fc10ccd1909f6312c0fd7c9e700ba5f223ccdf76d30d5"; + sha512 = "bfbd86bd3eef27c2eed900c23c29a0236884b1fd4d858ee8bcdda2a071abe1d042624b31ef258f9ea415b04ff1d17e70333c6507ef2a534033f1869e742e8b82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/is/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/is/firefox-77.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "1c128e7fffc103347329cbd65037e798292d5b0e843f878ffc44d9d53c32f1d9a917acd694cb3662ba0089e79063421705f30d39e9736c88b9c439660147b949"; + sha512 = "459e4c9686952467d7e179c1b4f9f422e6445509813b0e0fba200e46468dabbefe59210a2cb218b226a6c41a333a64bc17005380be7e319015d722fa70a600fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/it/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/it/firefox-77.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "890812041bb3ab8cb0ddc6a54222fec9f4e342f9734f3c92f9d0452122cceff739eb46d92ebef5d2571509e4c7821704a64da1ec3dfe8150193a6dc5b4aa8477"; + sha512 = "6cd7c36d28e6abbcb92582b14022e56b048481cda7832b93c5dec6b0b4e38bd99de121c433eb0e90c9ebaad2bd00f681f22fadd09acfb1b669c0886544ebd8d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ja/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ja/firefox-77.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "13703e62dd8d6728553524723828cf7bd8db672febeff63324c93e300a9ed6c2f3b1919d6f4bf8f1f74164df278a0c95ac98c348531581b717ab09e921490a91"; + sha512 = "cecda310147fc3298bbdb250d4d7a5a66225dd96f1bb0317b1846049a15c47bd2b7579982dac583dd4eaa1cd8bf706e7213b0c7bbe48ca980070f413380a133e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ka/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ka/firefox-77.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "929b2e3ca70c8d9ee11405b1366faf957cde5075dec5631a49ebc724d4912291b1f3826ee01e5c90e2d68c09b2664599ed73e4f597298ffb066ff8419a8056d8"; + sha512 = "ad29814eb9cbe19061b361c23c896f8bf8cb21c67d36942a1614af74a5adcb225df20dccf3af8d34dba27036d38feb758a945cb69a66c6ad1ec0271fe1c316b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kab/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/kab/firefox-77.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "83900bd13db0731508e516bfafb5bb540a43f6b8ba9c9e2e9c0878d67e9cd8f9b6b496e5b77ccf314346ea3089f6d95c1902b9280741ac3325638e972794872a"; + sha512 = "cadd0cb80e9d00d2a4f6f5a5274d85b23eaf802874c813a87fd7464d4cf7ac528c4b2ff30446c7cb438fd1faa514c80a2576d1d6b36779ab983fac5fd6654317"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kk/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/kk/firefox-77.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "a62767e00ba2c0d522f503331c2b6eb4cc82d3abb4879711c2d9f611c8454f2cbfa5e76707e6ec6ce54df8d40f64da6ad8af2e15079ea75b3b8ec55e6273ef2f"; + sha512 = "033bdb4274c05b06b2c1fc3822a220aceb7b39bff310de6fbe2e59a097eac77a6aafcd275be690e84334ea7bf70c6bdb1a43f4bec0b82286e42db7797348ee57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/km/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/km/firefox-77.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "03a47578e51da36b51bbaa98e36927a1a5b3f216ff6ed60c337d905f414902c7638cdd361b5d8f4c29960dc93b19343b18567c7b40106f0e7e95fa941c0dae88"; + sha512 = "d028d387c7546ccba6b3001d006d0243300d770b1e255cbe02841bba759a8b4d75a55a68dc5f8a7dcc869badde9d7bd38f572e26d544444190ae05c23ff4b9c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kn/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/kn/firefox-77.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "c4cb00f4383f73c65930ff3626342cb53695ca4aaa29ec5f80400ed4d18e4dc87dc44445069c62265112980ac7a061d0839f542a792aa5d294561b201445b677"; + sha512 = "e7c17380869b5f47359bcbb82fbe6b2b16d814536218bfa1447432f0affae78d6c53e68a7ff7153e0e2ed72979c026edf6e8a9689b0cc90ff3d10919b3e06061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ko/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ko/firefox-77.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "72fc61f2429fbef846eec40e53f50bd95d3b6b728d78e2199408b052b0d85ea66fbd6d2a114cd046311f88b419eeb7447b062cc9c5824cbae572debe872656db"; + sha512 = "bda7e81ddb11dd7a197a9e6e286b3a8cc10e3c3d2a627f5c970643427a158c7615901aa05fc4da737586d5bd86eb4411a23e5830c1f6af582963f18c169eaa05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lij/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/lij/firefox-77.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9192d46b8b16129243ee2f5af47cd0f8fdf9af3ac953ae6481452cdd1f4da9ad9b75aa9c1b96416cba47dc16ca867db3135da810f32df5a33bed233a3b68f447"; + sha512 = "4a2a07e90d9ec3aa26557523c0c20d1aef34895ee06ee02dfedbb6f3d612623c23c84f10eaaeaabb35133e3f69b9545dd8720929ea04b73af8c9c3acac53901e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lt/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/lt/firefox-77.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "89a5c07f1c1b7b389bf7074feb6b7c29470bfb143b720503783c35cabb36fbd0e5c3fe31349e1004728f128db36148ad6dd07f389099fab17c8a6d078c37675d"; + sha512 = "ddccb22c9d0dac8abe9c81782293834213a53b182ae0650b7904c6cc8f5777255ef642cb442345c64a1cad96d0ec8f45ce6d6cafb0e6405474c2a8e972250254"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lv/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/lv/firefox-77.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "1bc60805513cfd6ab6d563108fecb176766e77bf10203c942ada3878d062e6a75c54129505fa63f16aeb72f4a1c6b360f7e65e8f23433d20fe134692e53f4210"; + sha512 = "86af4440803d27a5f6312b8a7dbd0d5f66fd1cf90b0e9b1cee8c4ee3b555927830a8cc3a06b6c72a66cee4e75d7e11168060d8681fa1f7c39ea2522819dc893d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/mk/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/mk/firefox-77.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "811449cc14b5bc3185c56a8ea2b640a3fdfcb60b309ae9ccb5498196677e1431719897e3e239dec4ee964575187430c1a0a1b4fa48fbd29dc874a1edceb7fd00"; + sha512 = "e3876258021cd0d3197af334eff967ef2d1429eee880b63ee0d88569b94f0ab938b5843153cf4b9e6608c4c63c50682671ef4f6c15d8298b43748885f8d57c17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/mr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/mr/firefox-77.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "940563e7a93a08372790ea3f0403c4facc900a6ec680c0e7d71fa10978fbe484c448f1e7bdc8096e26528a969178273223592daba724296f423b1293b79aa5fe"; + sha512 = "9b7379aef1061ffc24f9f70e28dde4c5828315bbff4848cec7764a7d373f3590539a052e6578e1e87d214263f009c831dd2890f3d7a7eb071b0011f75402ecc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ms/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ms/firefox-77.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "ab8d456745a815934736ae25cf597dd6eec2dc25320dfe99c6af804823ad71b482b19eae071be08763c82678e7c966bd86ab1bc285925945b6800ab725dbebe5"; + sha512 = "36d44b200a554476da7c63918b709d57c31741901bd33081f493d9ef8bfb27969d491381ccbb8f4a21e48693cd35bc1630144121c8871dbc0d1a87a730d467b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/my/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/my/firefox-77.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "a8b4532eda52b3543767a28fb9550b21324c72976b71fd2101665e0ca89c63c4b1d8272a9f425feacb3bef188b43edacf603ac87fa1a3dd19c374d22877ac02f"; + sha512 = "4e290ea118b8b2ce63879a926d7992a3a231343ae98f9d6f61de720c5c39e2b4dd5b2e63ce8937945b02cc6b2acad1e7ee6aa3c2c15441e11270d817ea2615df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nb-NO/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/nb-NO/firefox-77.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "a68193718025329d73e07b7199fc6a11e4834cf3f0ca327efbc182d0b33bff342e8a3012ae180fec2167f842781ae9c6d63d29e312e2385ee06e4ef25c851fbe"; + sha512 = "82820f7da33b522f6e4547f650ff85e8d05e8b2142d2e113b9e0d94af560792ca3314a1afe98d3f18d3fc0fcf887de601bc22e93101908cc31a2238af359d150"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ne-NP/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ne-NP/firefox-77.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "5ba2c7da5741d45b376de87c9d3abd65de5a74885cac25ba0c7c8a81d681c0dd0fb870764208b62aecbc93122daea5cd7dba1fec41a1d97eda0dc674f16dd6cd"; + sha512 = "591699f34737fcbfdf9c72b12be83ba5bc83bc027ef439c40f5b0eb22014fac54b5661da9fa0f118ed82bb5290147445f4d703e40a152ad4f7d2cb7153b9586b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/nl/firefox-77.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "941cbc8f65b1b307f998c853010bd373541aa8043f1fc97e261453f7d49ed7ad9880e0cd85fd1bdb5b4b038272e210d9eeb7a5a24f27f1212ffbfde494c87b04"; + sha512 = "fbeae8de6a8297a9e0fab0a10e2c95aaa2d82af7304bbf49fad7cae69f26c5a9dae9de4d84614a1061cf9a82f71abb7eba2e8cb4988ad93d1b5667912ee537fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nn-NO/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/nn-NO/firefox-77.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0c0dd5ce17626e96c3e88a9771272f60e93c7ad4f1f40710d8b70d4f40a58010933de89a2b381dac94831db786621a35ef6894f46f1b19026c0eb7ce0b172459"; + sha512 = "4cbef717a02fec48d29a9f0ed80c8db34fcee2ccd1f2cd6e0fbf0d2b0d36cb5101bbe794c59c8bdafe28c6286eb4c0fa28942c77b3d4a4c047a97bd66c41b7c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/oc/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/oc/firefox-77.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "169b6a1a48b2711ecdccdd6a685ee10b5f602d0300cac13b56feb331901be88edf6e8386ce6e4bfc108f419de305a5603445f5b7561b37358a75adb8e8d418e0"; + sha512 = "5a1cf2f3b9200c0fc039ff7c961eb7fff97464f0259c4b6a5fbfecf54d7d333abdc8b052d3138278c87726769bf7b10f2bd4557493e6e666f96187386289c8b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pa-IN/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/pa-IN/firefox-77.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "96dda02dda90aaa1de2bd31e04d87b37a179773d1f3f8094d33fcdfa6ffc78616f9d7539b4405911a6dfd31382cba91ce34ca6680c36e7aec22493d3bf6f15fa"; + sha512 = "355656300dfd9bef921e2123ffcc633d0562798b5ac692506c87204f2951f3800c03fc3e9e85c6dc9110644b17e40fe5058149b805255f43b1217b1cd71aacf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/pl/firefox-77.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "326b8b65388b6e7d8215a665fd6acd9ad9fd5a03edfd6ee428dc53b217df7b108a351094530621c5b78f3cfaed90092c17e1d1c9656a37a10c108aa441ae0e47"; + sha512 = "b677c207bad42145fac04efb40d9c48800ca0796536ece583d6588f612a3e7c1e5dfa8476e38795eac7362ee0cf4ff60e803bf4263bb6ef875337688d2f9897b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pt-BR/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/pt-BR/firefox-77.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "70a56009e39e06b701de62c7df02d3d648e04ffe94d2718f2f2cc4ee24f19e832decf0371425ab9791ed5db6a5b56d5f221163d3bd67bcbf6cd48617114353c4"; + sha512 = "96e99c72d3131b7e920652a9adfa0794ed67932adfa9193796a8375e907a6c7817a21a2aa41f852e5c58897f41de8394c8e7e81462d74900fa45e2b3b5837d51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pt-PT/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/pt-PT/firefox-77.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "33a770a0ea0c177c1d839056f4045e41e8e2102e840c99c48abd2cb49733d44af2753f040696e859eb724dfbb6dddc3357bf505620f74c0c29b92211d8ab9572"; + sha512 = "2c119a0774f6ae8802a15ae24f2a1fae50da1d4a2f676e3fee7349745ffac497859aafdfca3d092dd3b2dae7f51307953337281ca3274a2746503161b93ff2d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/rm/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/rm/firefox-77.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "233af09f6a4ebb88aa678362c85244f1465d5da57e193b26d676543d0d1df9e673b25096da705178d1784cf3682fb6a1d12564525b77723eca0924bad7ecb0e4"; + sha512 = "09c9669f36b03be27b4defde30cb3c20ea2790e18a05a2059bc79ecde006f019053cdf6c8f0eb2523de0c8d0fca3b2f0bd9cf02b8e2b6d9890ca3ecd51abe965"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ro/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ro/firefox-77.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "6be29acfa925e3524c83ccd6915523cb8a37143855361b46fbd71465002f8791426ea9985d34486db17edffcf53d6197b7115cc0dd38a2be16502d07d3b26cf9"; + sha512 = "24b1b5587dafc81a45e6ed89db33cf0bdf054f14a4d7e883a4f779573d17fc04cde1065b22243d0e0827c73accdc0dd08619a56e8caa04986e7500a57916f95e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ru/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ru/firefox-77.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "46b2a7b8370fc173101dd1e78ce12e363f80a852d55b2e6be9f5b31232888750e07937afa60bee2571e0b3b18ca2987ffbbad8c6065d4bb71064c34acc46c3a1"; + sha512 = "dbb9654c696ac29966551843b6c27d0867750565c21e84c9e71b6443bb5557847e109826ff550107bd56008e913c625e89ac60268f4cd140d2278a4eb82b1a67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/si/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/si/firefox-77.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "934144d99326a139d994518e5aa763cf32035a7d310fa94eba7b4a2b7cf40eaff732dc20100f7bba35dbf415b7a5fc22c5122ef40a65732566063d4517321ffb"; + sha512 = "a47e67c9b3e6a33dcd0dc489e32d95f44345593fac2e678610045fe5408928e12445551011ae87d4e6e242f35c11ee0edad2b6955485394d1f55d3d4e8f68dd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sk/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sk/firefox-77.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "a892ced0d9c5dac7cda65cd67abc1232d5be3ba8ebc2c98181f504b68d43018fc392e0e5b4b12ed22f1ca1b6469be83f68b12e60fad28fd42eba18d9b8d4d7b0"; + sha512 = "c73e183daea5adc333c04b0c473af3189c2d24f84ee352733b211925e62c02cdcd2125c4ccb12fa15b08a48bd0a690a06e39c364108ce47b834b321268cf5488"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sl/firefox-77.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "229175292f435f3cb1db7ba671933508ba7b4daba1aa5db0ed9f03fe8bb83778a0b951b0248a27b4e4a7beaa374f9bc4eef3b2762596b22bd45045efc3038be3"; + sha512 = "7f64f829c83b5483fd3a839aca41dbc0e3506576d633f8c6dfb9265a5bf783aeed537ca801fd07f8356b71aa47719e742b1bcf680f4a6d6c21469327bfa0b9b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/son/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/son/firefox-77.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "44d585391132de3c4df67bdec4a5062bf71af4ae32084e0602de93d75c279e8ee76a022aa19926eee03a31022b4d7eb9feab8e349c2a6547b85f8a42f5b122d1"; + sha512 = "fc8120011f886f996840420c07bd7502622f63a1b53b7d918c16ba1b60ed76a737bc6bd27532f03262671cbfc0f094e41422f5485b4c6854d78d4f95422141da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sq/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sq/firefox-77.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "f0b04a81888f8cac58e311f9f4fe16111a414f541bd1a5b3dc2fda028cf85b3a701ae5b91d223a3d6542580c1bec5459dd4dfe90cac517d3f974c1084ed6be1f"; + sha512 = "9116b54651b0ed2caa04f7c9327cb1fb977242364ee17ea19e114d8fcfad03c08cc3706ab6e355f91ecc3d1f6232955db0668e5f7f290d191a051b214f06b779"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sr/firefox-77.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c3fae910a582dbcb5b8609dbfce0d759d776667e34c737755968f1a531e83b58b098b8a88bd948ee820ab76328210631b7d85ff65a88be630f795522831a7014"; + sha512 = "ec0ac112222d35bf2345a91f448677ccc24f213710a1d5cda976c6ac15b8d3ca28bc32790f301103cfd3f2ae52ebfdf41464b6fb95df4b0f8535238b714649de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sv-SE/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sv-SE/firefox-77.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "fd5feca0a4a107b018329ab2fc1d7eab9c0e51d2660d8356cba4792cf73f1176fd19411580f98a469f47eb6bacb2c311134194ee612caa7ad8a5a0021b062420"; + sha512 = "7e3a6c8da1143c3cf19e3f98542ed6b3e9dc1bab0667a2e64ab82c5f68f9623ed2196ed4378174998070e72a77bf00d5d9bc9d727b319d1c7699992a7bb67aef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ta/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ta/firefox-77.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "c54d20862ec7c09e4ceaca3afb120938beb7ec0bf1c38e651355fad1247c61e75acbd0fe6b96a17fc19136720ba55755a8bb04726c714c812a333c9e300b9463"; + sha512 = "5e3d653003fe036687bc55f4f5f0a2f1008ae58a196047654a1a067d88c7cf06b132207a3647ad5d3a707d85322d0d9eee21222c832daf67b9dc2895e6cf75ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/te/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/te/firefox-77.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "a594904a68ccd42f5e6c0a829100fb99e37732a29775273ac202fbb65785549bbdf638e8ddbcf6b7269161cafd229354b5b350be8e2f2360892bcf17ef777e07"; + sha512 = "2f42f73eb590ed605e1871d11217027abed2dfe0d2bdba2e9c29c6cbcc5c639b48e4bc26b8a6807c316dde23005e5e1010ebef4c4dfb385bf2e41a4710acf12e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/th/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/th/firefox-77.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "45b5fca122f7900da176ff3d55dd70a1a2d594fd9119b75760dc094b7a254e21aa6455c8370650f1b17d69ec1e81749881635d176dc72a45eec8f632d3a2e0f2"; + sha512 = "49f4f6d2f5dacf108debe915116905f5da4c65bed1c13d7f2a65b8b21b0734a34add68c6b56c340e90f6f82ba1f8cbcf9b7fb2546ce64e33c73e2a73e9b3bb17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/tl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/tl/firefox-77.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "06b3fd1f4cf030377854ea39bfe0818322123d53299a3f5d7308db32683f3992240099491422858c3104079b566958dfa60b58248c0c6adcd0153d584429fca2"; + sha512 = "6e4368b4a0ebe0b296eae341563f8712567f08c7889b0600cd5c0ab881b1de1f5bf8e657b5ac497746fdfe087c8bed902014bb6daa0ce4c2d3712dda614b698e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/tr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/tr/firefox-77.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "2cb1d03ced3d88344e24bda60687e9a0c34aade38fd635a63ffea3f072188bf6f5ab76cc7c54188280932c225f1e5c9b7c6cea4d2ee0b1798335e84b7826c886"; + sha512 = "fedfa95f6516d3685d73ec3997148eb0954a8ef6713e8cffc304080937a1962a26cf384a85e937a9394150d52fc9db14c3a85b8b483d18615759dd06bb04a558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/trs/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/trs/firefox-77.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "6fa6eb60bef978b82e6805c3a083ee40418125416f139bfae2695c2a4b28e34081a984e8c8e092e449e28fae28d812ac2c76b808da83f79c2be4e7f5361f4536"; + sha512 = "3b165460a7a34e5b2a059101a508a6353ca7f89c03c9eeb7b062e734c2cb1786b1cd2f9415cef7fd3ca2aceb72b4311b2b5da778f96b51f33aeb39cd7e69f1e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/uk/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/uk/firefox-77.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "e412938a9ff5bca8b770a83a2f7b9a03f92fc155df9088f60d758aa41c47bb348e331e34c8b04b1b2b5c796ec34261aebedc697c058bc5457265ee7b87d2d773"; + sha512 = "02c39e86a144dcb6ccffaf4a6c6620088409b8a098e3d2d92268d5b2dd7098c01b9a55878a9ebf1a91552b3f1be8dc86a6a8ff514e3988ffa51e581dfcf43b8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ur/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ur/firefox-77.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "8a4d50ceae88d1ccb354135fa10df40a2427bc0e704dca5b7ceafafbfcb3970eb57d4d6eb427330a2198894e67e2da2532adcdf5f900f5e8ed15727e1dc4fa84"; + sha512 = "d244301b2ee17b78a1ab20cb7a8fe362b6ac86e0cdb9d811afc11c0637ad3fe1e1dffb721411f36960ecec011b7b691a12df1bef1d257c22ae45d345096b7166"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/uz/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/uz/firefox-77.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "cb1be90d64caa7ac445cc7a6b3549350eaf8859e7a4e662e602eee4218de98944360bcd828b62bdcf18a5a602b153a1e4cfb0bdac92a802a8b071f349c88262a"; + sha512 = "8fc3cf2b1eca9b229ada7ca632fd362e42bc1063ad1bc22df1f6781cf996d179dd8e8fa231e02ffb12dcdfccd6f6641735e0b4b28c6e2a1a9372d80c0dc8fd78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/vi/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/vi/firefox-77.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "69fc97339bd8fddedf12ac5f545c2f768cb071c4786f08c43fe61775e43b2dcf065d84d23ef9b9fb3f09c6df6364413f61fec0fa1cdeea2b4b769e3ef0bf124f"; + sha512 = "3676a6246a7fbd49a5779fb2b9ad3e14be809228e15bb19f81ca3b880ee5d584c4aba07d1a94ed2cdb6ec7549409d7738750422d06fa2415722d3424e948ab98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/xh/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xh/firefox-77.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b8013f7c0e1cfad11ef950015444105b1e8512d778fe4b2a7567e0613a1191a7a929c5fdca9c15ab846da05f189fea1b0c137784ca1061b43f7ebada27376a06"; + sha512 = "d4a8d251a4ad5603f301ad45f7eb3518066f06668a765d1583d067e0b89caa87f6699e1e06f67853527dd352b903c4b3a063d5ad7d19d297a040671a98aac2dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/zh-CN/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/zh-CN/firefox-77.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "154bfde5424cca1af2e624596755fe95a1504be0ce977162117e937b6ab6ec6b03b1cdb470ef62c710129d19a16c42fac334477f8638de6472b742ab2395b262"; + sha512 = "2137ced68047439bfff22eaa7bccdeac3b0c30c7e71e3523c54f47a3127a8f0ecf6ff3a3ff789e05c5df525f3c3d32d616eb731f022fe063170d3c67e459b093"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/zh-TW/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/zh-TW/firefox-77.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "6c3d36ba9e4682600c2a99d6837dfe76032d6d1618c0ddb8dab5633c2961d413959e9fe0a9c0fc7ef4bbbc41af469a92fab566d24458c43c1671cd3288dcaae8"; + sha512 = "23efdb7382ea3483784589fe0cfb9919630f34e5418734de9bd52ad9e91438a4d86f8760b1c4a4c127e1fe05de19ed24aedd0e21c2bdb32c5ab62183bc32fb18"; } ]; } From 0e3b3bd5b08472f5c1ad60dff5439fdd95d4ff87 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Jun 2020 19:23:45 +0200 Subject: [PATCH 0479/3452] firefox-beta-bin: 77.0b7 -> 78.0b2 --- .../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 56910dd1e79f..601e4a77db5b 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 = "77.0b7"; + version = "78.0b2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ach/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ach/firefox-78.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "faa837577f00714097bdec079b1df8cef64047fc9225df81e3531c6e0adfab4abdd82cd7184155d13eab152cd117804ccdb7c43f2893b6f3ff3bc1077e125e77"; + sha512 = "f70d001f2415f46f0a2fddb7a3de19d0b4be6fb185b1e4e875bb3f374b9e73f65369117b197ddeea7cea72bf8993984ff166d0a58dd9fcea1a555db19df242af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/af/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/af/firefox-78.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "32a963ca337c71702c5a6da5b3131af4b83fff24a27236a2cdc04bf191f1fc877869ae3ad3762e78a5d0f384bd104f89a019d405f875df1984667449fe31155c"; + sha512 = "9376bfa53068581a4bcbbf2fa7fe946d3ae006770edef1060f82b0c1722c90712c65cd86e89292c03167bebbe3e67c5b3215b88e11681c723f430470f84e685c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/an/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/an/firefox-78.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "6729c589b1ec63e0dda604a138016d37507479205ac477d12e63859c3937e1c82d10c72b0bf419ab516d9ccb60a86e0b60cc7d3f595ee90c10f7200201c5bc39"; + sha512 = "51b4294f4ecd8716b875060b219af558df8298113c487f24a23c0e598ef7c5516fdab9a888022c4ad6679efdf0cd86cdb601179c146e6b97ccd332d22f0d08a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ar/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ar/firefox-78.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "c03744d53d95663133696f277aca2e6d22f07eef1c61c94c478893cb09605169bbc34d0558842444a454e31921e6d29349dd6cc410a9276051df5a03c1c7d6ae"; + sha512 = "4fc9a968ffaa96019819603ab9788ef0580f43da222c899c1af68db2e8f4e9d056356ea99d27481bb9b7eb451504bbe31fb857bd511d1862cb366ad4177616e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ast/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ast/firefox-78.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "a361ecf02bc85ca44ba6a8e86f91ef11013b86fa9f093d330ae43e2347e560d5112b8012a5af8940afb0e34fdcd6003030149daf33dab1ba8f8717855e50d6bd"; + sha512 = "c70026f3a7ec4572750c01df1d7ab5859afd91dd12b242534c5afbfeaf99dfe2585655d5d87d861f5211cef6cf67a0ab177190adcfca0697a89c7a6f7de022c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/az/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/az/firefox-78.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "7a6baa17135213be0a21257ec9f0bd1522f0e402a3746f58bb605cf2cc4b947163696313fa60cb6148c073456e3b4bfeaf5d7c948905657c1517ba6cb4976b4d"; + sha512 = "005b79149215e2f85851900e08ffb1214f8b100a0a1bcf73365115769f8744e687f9b0ff8500a40cc48dc53cb203d33b757153266157cda3406532e5a1cb0c5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/be/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/be/firefox-78.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "45f3af3d2378f48da55d2793f5b9c57835fdd2f94ac2f15614db1cb0b7b717c9ff744ea101646add604867e6ede53f62d191a12f48df071b46b57ef114dfd3d8"; + sha512 = "11e1ec1146b0688ccadf1c9ce4c219a722533ecd00a3df828e0519c2b49bdb66280aee053254fecd00fc90e0d577de167ea3c1e146e2f9c351b9bfe4756c21eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/bg/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/bg/firefox-78.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "f01e95c639dd864de6dc7742260b29a4f7b9aea0f1c404d1f00068ca5ef67fb85fccefbe443ef7fc13ee58031ad3d1d38d1c71592e8b1aca7fc215f4314f50a1"; + sha512 = "4a8cc34e0a59d9000b62181461633863583c2f35e50dd7e2de8307b0d537e0f3b439112b2879a95c9a4341a01b361971f0160abd9409be1f4169cad44c3c3825"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/bn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/bn/firefox-78.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "507c26d022d1935e007131252ee0798759ef93df65b789f8aee0ad1724929524f23f0a911d7ce5a8a82f6bf7ed2dc845da06b465ba23ab51103584655db12e2b"; + sha512 = "8330315eb21da9da68840bfa64e8f4a150fd4df5e12d10ebd504f38dacab17cf43a246c10cd77ccb6fafbd8f4094d1f6ede53b623308fae90e161d4cf86e6fe6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/br/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/br/firefox-78.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "070b062286944c8be2b11d81206f18e5ff9e35373dd70e222d7ed252c5e42bdced507bb31cdaca8f9130ab5f012282555d4c7c54a6d216e0ac2c9f222f338358"; + sha512 = "cfd67e67af7d97f0bbae051b3c366fba48a09ec4615fa4ff178bc12610962952dd2584916df5a76e52a5f575fd4060e473ff4a2ccb63322f8cb8ed1a351b5a94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/bs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/bs/firefox-78.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fea2e69feb05419faab82623296845673434f269d391d52b0bc4e0b1d4c3d55ce9b6b8b7ced70414a5a1266ef5cd55faf9c31c3dfbbfe7c08c609f821293b199"; + sha512 = "e4781c53f1eeae10b6af48c4841a2ecff7f82006ecdea50b3afd40d000af3d4d89806a5372feb13c5d44b04c0c7dca32a0ca6f2d9a138b393569a9f1d96d572c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ca-valencia/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ca-valencia/firefox-78.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "d2dd835fd2a9b179ec44963df2aa38b0e8bcb46ee55bca312b6c59cb3f82857039239e51cbd224f8c66f2760214ed52da9021b9895682897231c8e7d3733e89e"; + sha512 = "9dc0395dd7f7e2c704a77deb4823882e1ea7c9ccc38bc49da4c906e70a009d912afb0cf05359d1f757b4591243091adc6890caaa85ee15cf1b2a26d2245cae58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ca/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ca/firefox-78.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "14f626b4aa9096334d563fc853afad428d2de8d2cd7f80d512464c219f1326568530be08cb318e0edce0489c9686364471e92455db9ceabb97e497f327acecb1"; + sha512 = "118980cb81ac4d84d456675db91d61ea54a35ad4796acc59434cfe294fd1e0355c1ee92a73de867b18ae04972a28d849d8ed4c8feb5dd6bacd1066175ae3968a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/cak/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/cak/firefox-78.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "ab25fd7b09a8c46a452a57e3e5586188a9a614bc884cf7d133460c730c5cc20945e4d29d54229be17ac5101f1c2aadb937a0a116d2f0fa8fe83e18b3bda003d7"; + sha512 = "47f85a0a6dd1c8540abdb017de664577d9ca79da8057c26b84045fb2ae1fa3b03dafb6c067c9bfe485e0d208d114449ac3cc02274ffef6e80affde8c2ec0c530"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/cs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/cs/firefox-78.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "bf62968ad7aab66d7b931b33953aaabae004de2b3224d099ca8a600ada0cb7c1e7703ab7e4fc3699942cc2a0b1b37a1af0b93aa3134fec7c6aa8e79e9eb19c74"; + sha512 = "0a51c2fbd9ea337487073b7c6e4fe616762019682b91cb9513f1a8a8436ec73f2c1175ee3fd66ce81084d0122f3f550fb49c5d91ac461bb6f2ac47d29dd69152"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/cy/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/cy/firefox-78.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "0bac8d012df7364429f656e8b20e94b18ec1629111e4c3675c2f4d8b9104de929ab1833bb28ac5ebdbd20f3e8f0b0b393ad1857308c57a76b8d465e0d2c731f6"; + sha512 = "aa795f346fe87ac8afbca19add1bcf6aaacdf051323e4dbe8f04fa83c27444d9814cd4b7ae169390fbe3c3987deed14e453f45800393c64d896b8607af05b65b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/da/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/da/firefox-78.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "990899501c4fb0228817288f06c9af9f295101af053412a3171f2c3a368cd7047388b43c07e4fa205c3c9d4e2a19dd7232742e46bbcfa128494c274a98e01f41"; + sha512 = "80796ffe89d9dd15b354015585dd722da3047db5b8b15fb380f7566fd99792959133a100bebe7d4b77ce5dfa710117fab61f5f5d0569eae88284138718e5fa63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/de/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/de/firefox-78.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "c093c2304f95151eccdd694f714541d92c99327534645ae3b9219b779776aea0478d5a7539cecfac4c22e6e49b02ca2e92442343a9b818a79fee6a3c100887da"; + sha512 = "a75dea0908d83630e2df0991250102fc8d3148644005e70e31a15cc626d189735565e49021de9ed766419873adcded2086186a520b6edd8c8f753710381e55e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/dsb/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/dsb/firefox-78.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "ea83c7500ed8c59b6edc128bdd77fb4ab608f25f020d91bbe1b76970f7a054fd4c5492ec8d3bf4ddb3105957cb89deca16eed82895435998233731c658c1bc1c"; + sha512 = "729e10b88c59a24b4d838b3888ed6ba910e28199211df046c1f09d68b19b5547e5e9953c131118fda4c302b23b09a5a8d6a78a6e220207701590d815af74097e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/el/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/el/firefox-78.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "c6c32e780edb3feb57874efb61a0e155ea3dd011008db47ec9fae19fa035d01657a3b4fae05407dab5ebfb72ae00dee9680023c9d2d2f572a4f59e3f7e42cbe3"; + sha512 = "862377ff91054392814f851da646f18a2e485753fce3338411fa590eb461100d94f5b9926fc97848e38d4d1715a8cbd82b87033575daf2e3cff00bddb5c7f165"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/en-CA/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/en-CA/firefox-78.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "6a9a96205a2edd93c08d10ff0b9456a7964a167ac20e881b37e21cfce169455ecf3f6aab39719574f102d7f1b3322b829a20399601b156d0f9cd465a5f0a9a60"; + sha512 = "5a02d99dad00e69f47117f41a0b5f48b3a52d64b1595f9c8cc13086ed0db67c7f9debee30c071140d633821fd42f588430bd8ef93a16bb80f0def1f965da7135"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/en-GB/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/en-GB/firefox-78.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "94bedfeaf71fc9f8a4d0e0d79e47790e0fa70838fc2f3759255e4f5466cb26924e72aa044de2d8ba238569eb1a77092f5dc03ca4e7267f745b26689355056fcb"; + sha512 = "a8fefe63ff03015f945d45294d20954808488bbbb8f28629ac0bd2309500f64b6c766a1c75cc2b340f65bb511d1a50516097ac82d7bc2f3e7f82ae88789aeb91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/en-US/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/en-US/firefox-78.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "fa03a78389ecb11ff3c76e182bc1b84cdc9043eeb9d9648e38a7b3362e22f7ce2cf1fc0af9fabce3a2d103f169f74e946cae4cb655a868ae26cc765e25155dbf"; + sha512 = "73df2d07120716b9e25028f8fc46c0e0e671b6ae1b131f9045049c709a1d678f9227d882ebe2f496cf0dfb71ae7bdab4185015728d1bd8e2b3661acf74ee1573"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/eo/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/eo/firefox-78.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "afd6821d1a76097f7cb8285355c554d05d694e7c5bfed2cbde0b9d5c25512d2ff5d4c338a342fe546c3094152fe0f196f4826a859ea4eeea9a69a91198660c32"; + sha512 = "835944b50e3005cfa69c8c0aa0644d76ad2f953d1b01be6d019423a276f8ba5abc39cad0393356029f5bfd4d2edf6b94c653a1590017eaa4cd206161e3513350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/es-AR/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/es-AR/firefox-78.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "90a821a4db378e64c74f2a30b951febf1d56fc91dd1746ccfe789614f9b5ca61d78b4374cc01eed4b776445a00956eba14bfe402dbd360241a6542cf37a64e5c"; + sha512 = "7395feba72406eb9888a59587674e1ad0041fb8339fef29f2bf136a7a7a54aeeb082e9be897b2137ee2f48bb09c844ed153213393d0492b05b93ec13fb9852cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/es-CL/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/es-CL/firefox-78.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "ce7c9a90de740aaf21c23404f335c16edd0647dc44167e5cbd55491f7edd4135ba8c8c220cd65a76fc7ec91972b1b53d0c9f61b571aefc920049f590074b776f"; + sha512 = "ec654f43750239ba622b8e0dffe99acc7bd04144f8a116ffe2f40b3995ca37abfd94b6827cf3af916d0657e38041b8ae3e86c6f5c0d215b24fcabbc97accf51d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/es-ES/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/es-ES/firefox-78.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "7c3fc75ac74feff0ef0862cff2b476d2ed847dbba717889d848bd9d9265cfdbd0c8238337f116bd9976955d51d0e1165cfdb643e6d67e85137d8481abc323d29"; + sha512 = "65ad0d7c4d9d0ca6501b7c957175661bf692ee388679c435471af6199d4ed0e070168490c4dcb65d53b66d8b517c5271019f869af7a5048be81259c3d73d01ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/es-MX/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/es-MX/firefox-78.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "c5f8b98ae9166fac5c9da9d39008bbd43aa3548ab451f0d47e096a2e22e5b5ad4acba5aedc1ae0e1d67dca8c1789a2e1e9e65124a3fa816b0eb31eeaa22d050b"; + sha512 = "de8fd8cd130f6de8bd26ca054c8eb655de4c958d183cc05bcb41e64102697a4805abe706e760eaa32121e777f20170eaa48eb46db468a51c3c77fc74b4ca2626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/et/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/et/firefox-78.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "3ba3213746a3d22c3d332946c4a98702689b2a7427fe5742e47cb696fc04817bf9fb3511188983050e14ab33135661e7104c75e7ae1439048f3762c08b34a0b0"; + sha512 = "d39f4f6a65ae24aac5d4c541246ca5911d6af14cb851eef3869e9481f52c9dc593f5518d1c475dfd3a7f2f55d661463e0d6510e0267f46795b3282a6a26684ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/eu/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/eu/firefox-78.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "433eec6c2b3d03e6c4d549dd09017d04685c2079c6bd3d34773ac424c871013bcfe57f872083ee5c3e5578208cae79c151b3bc1d5943568827f6edd8de196460"; + sha512 = "4661cf17da33ed88b8bb0ef8967809f0748c3cd1c8afaf22ba679aec95a9d0ee95cd5c1d08f7a449fafb55f49a32e2a4ef366d09056460985ee5b6999ae80181"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/fa/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/fa/firefox-78.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "5cbcf27f43ac79f802fd05c90d7fd0364be88acbce0e994bb7a867f378b5aad146a1c667426d736dafe0ade86a5d91abb2de4ac1a0a897dec6d3c38a94cb62c6"; + sha512 = "83181415420d2c8c5d56f81d40ad587c1ff1ccf21b1469a235efabad0960db78e912f459e7264f10cc9c2707fa3d6756b8c0b0f8321754e44ca5b319a952f9e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ff/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ff/firefox-78.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "4a0416ed025073d5a41ebfd9432ee1451917c3b1ff94403011c381170c558be4f1ed7fc052473f806be4d035c7e16c266a2d2db5b2d7a2bb2b9de1d236280077"; + sha512 = "7821df8329fa367002e526bc792432631e098b1ee15e116af2b0ca06d629594d650e8310e701d5e02711bc438c7be9aac997686ee314d226b834ae9ad661fbbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/fi/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/fi/firefox-78.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "3560e1528fd40497e5e16ee7c0f4ab76fe71e77e8e8f938a09e2b89fd8c6d1fb3389d4b95807267101a7dcc361f47d227e5831e5bb7416e45d0b1435bd728f5b"; + sha512 = "9cb5b49cd326ba3f3effa2c844a9b2cec1f5e55a56f4e86514e6b8607dd8d3fdf88335614c974a8d2362f6967bca800032411e2d18a6ae5f1d44ea815baba134"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/fr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/fr/firefox-78.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "d0e7ab281050f7d2cc8804660e5bc5e507c3dfe4fc493c3082bde5f6d6b41d596b92903f821e5d37ab94c819cc97d55f2a266627b6be42e492dcb8d2d99f826c"; + sha512 = "fcc80e9643c05ab9c581c9652bb24aa682b76c07702c3cc6bf4fb6abc3b5e198bba5691e0403cafacd1a52e45eeab707897603a24311a78a4b54da706208123b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/fy-NL/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/fy-NL/firefox-78.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "5995b510a737396700316f32ac7484545c93f8957ca8faa0c40678d0271ca650ed28014e301c00b721144f386ac37c0410f28f550381f6561b1f6754a1f8df79"; + sha512 = "6df59da001300587d579b6202b85c089867b2b762ddb4705cd44927f16766e8c85d9c72fa00a5c47904b07e475f7ebf4f26428b9f4af73684a1b8140a8a6e7ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ga-IE/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ga-IE/firefox-78.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "11416a57a298db37407f1c0998833f16bb580a00a51902fe6efb7c38e6ed01806ef9007f871331882253880ed277ebf87266c0723228d5a747537be910f64858"; + sha512 = "b94d32ed84c6c06a060040fa349f470886ce06a33139b987a04540fd567f74be779a63d7a8e860b22abb8711114cbd2c22b882bfaea4baba1eaa73d9a31670ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/gd/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/gd/firefox-78.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "3128f71da4e849307fad30e0531a891f6de58a61641e7b641e5b0b8dc3c4e0d0883ac1581f5d1cd09c28130fb1d087c4f1a25582672b6af3efc70a2390af2884"; + sha512 = "4dfd64b333aac4848dcf3ff44b56d2070dcaa5b81150d643e50c68a1c1c32e533f6b00befef3daa1fa6f6bfa8041593acfbef4fbf91694c9cbea931b0082f890"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/gl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/gl/firefox-78.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e0297f754c9599491d5e0f18c45f3570a0589f6b8750c2500b973b176ad963f56f5e44eeecebf23faae2d1cf549e9b7ff6a02a2b403e7cc3a05694315ed7d4c8"; + sha512 = "b4f10e6c26cf215b810512786988af3e961383d5c00e4d0c6ff2e0cf45d4616a3f999837df0b15c642109f0a930a543192d69b38fd5ac6d2adc4b8e147c85297"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/gn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/gn/firefox-78.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "c84d8f600b84e5c665e7acaa36e640ce7e2a6758a210a55e0a3b4d0b43890ec0d39269029d480ad9b2c4cebb2491784c99313632a3e7858d73fffbb16a77e425"; + sha512 = "f51911301d88ca070defb75ff49bdc6d1ca5dc60534518febfad20f2aa256dc226f15945993300e96ff4fe1aadb427aa51340dc1f3ec7420c15432f57fa31d8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/gu-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/gu-IN/firefox-78.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "2ee2ef40e4ec35eb36c639e0b5caaa9bad57e3ecf5056c99c6d3e5d4bc12dc116a0dda02621f06924131097d921987364d7db5beae5f1707525af251ca922ad8"; + sha512 = "c122187243467d12422da400affa93fc62070801d30976fda1fde6664c5dbff3cab37c3b1e0a20a1b62605eb1127f13bdf806c07063cd84ee5f8fb9d19397573"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/he/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/he/firefox-78.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "1cd2ba19b79b94044c7da3072936e5d2c663e965bab9e7a2fe04ead68c0de1e94e4093f4321d1b07342fa10ceb6d079e0ea2dd1d818b289c6b4a8a935d3d3006"; + sha512 = "5f0208c47710d0bdde59742392c4086add04cce787cf257d9295243426cd3085b5693a382985a6a0b5cc46815049012807c6fdf5c4835fce8c0f60c105743020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hi-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hi-IN/firefox-78.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "09249512d40303a35acf62d7ac5dfb5f25d5aade17f163b7abed95f08eac9e7bc5f67c4939a539ba7c2fa521aa67d05690b08d1c7541abc329467861292d556a"; + sha512 = "28c296e2e3e6c17ddeb5bdff5b3c75e81eebe631c10bfe63a8b7755cbce78627634cdd300d8ca7e65bebab1ad3a058eed0be6704a1f3eb0c46761b2516e25a34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hr/firefox-78.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b2fc193b0017b81155db010ccfebb37b0f631526b18a8061ed626654d0d3f49cb973aeb0112da9e099b7dcf232a9967e2a7ae81ca2d76a6329c62d1f72d0e5c5"; + sha512 = "638cc3b5f2a1f5fb3e45e81beb209234a1a89356bdc99b933a7c7d84811691a33dca27163e93e9b77b2cd1168decac98d2c21a6837dee4335214f87e5f1cd78c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hsb/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hsb/firefox-78.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "7a7ace8330802da958189d06e51b61eaecc536c8808421ceadfc9599547c7314927b08e1c595ec1e73651d5e74863a1d5ecbbc09cc11879fc9ff4dd16c6baae5"; + sha512 = "40e842a776c591dbe92ad2d191e6fd1c1c26c00aec6110b74e734ace0b5868afe430017ee2e953692fcbdb542115904229adb9294c64ffa63a15ae4da6abd949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hu/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hu/firefox-78.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "4a79b19ff66417f61abb12ae77068563a493c4983d41bcea198f3ea9b646550cc43061e49a5c641d56fd030de99154c37767098dfb36209ed2287afbe8014812"; + sha512 = "b544898a2433c66c6b69fa84e36558f95d722e986d09afeb76f412c128a351977389bf554d524e28c02d8e5554519ebcdc136d57f17b0baaf40f78f0738c9aa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hy-AM/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hy-AM/firefox-78.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "4d0ce5ab930e49bae189e3bebb84f3a05611b13b674cc0cbe71eb3760827115c24a27457a2dc4ca4277007733a785093742e331dd961edc2feebe98f6f74dc4a"; + sha512 = "1a3a40148fb35f3d741f732e3a39e6f1662e6196b1d0ab149b0f42f2f7dfc103fa51df0dfe1874a5d483a5a998555d858be06f8afce9815f7242b7b86d8b3af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ia/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ia/firefox-78.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "2824698f01cfe336f2e292387c0044f7ae15949ae561e0944f6ab6a44603e73b62b95eb7fb0dfe8ceaad958b111ebb0a709b5efd07ecd13644d4c6334e3bc1de"; + sha512 = "7e8472462754b358a4ed7f7d9a1d853d0f590a680a64e985ff1db631e84e6200908348d85ae3757b9236c76e9b3e302f18bba3a84b620834345142e3e39f95ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/id/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/id/firefox-78.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "8c126ffd553fe98919a307e654321385598aa21343ee7bb4e7241b3bc59a825faa9b7e13ee1a98f3d322205d124fc19cfe53e0503f53794e01b1b28a5ed2e1b2"; + sha512 = "028df055359a2fc5088b65ee1f377b94dd69f7c6c718cc954084ef5a53e3f53ddb95a8e52c46b2e463e5de6ecd7272a4d687e49718ad96ac17579ad121403bc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/is/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/is/firefox-78.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "d6885c9858853d882664577748fe5d3cc0ccde79867ec21e080b1fe799a895f0b93de2456e1332e5600ecf5286975b7d170dfd4ebaf66cdd276b7fb7d5a3f415"; + sha512 = "232ed8f86d6c825444a0e2448b5d5f06a8d17be5c4ce35fc0d6cff24cf3e49253ab92c16d82ff52726540104106c242e3bfd0b3b969f8a437f46b60114654f42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/it/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/it/firefox-78.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "249a07a88d7e6c9fa779956547a4709fe8cb75113a40aef9f8261709aeb8412ff0a2ac776096ad043c7d00d7cc03599cdab11df021d2b7a926f8fb8261fae8bb"; + sha512 = "43f29ac4beb67d8859cc8cd7abdb3ffe2e3c3aec7c962e4e9481d89005a72598571a0dd53a65b06241ed04e6022b7992b2a2c4cb95bbaac95c4132e1bde4869e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ja/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ja/firefox-78.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "a71922abcb69e483a84aab49893caf580b6cfcc2cf25138342e45fae6a925c4ce8b71ca3be7c606f6d4bb56c5a0e32d2b8305171a45ad90285b04e4f59be7e91"; + sha512 = "c469704306f8e28f8508b66bc418a867b3f39eb33405430c0b3fce3f5ff5cf0390d03889ab1c20aa52d5f0b7f4631cb98e0315ab63c3e9412f30f484ac88df5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ka/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ka/firefox-78.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "2af6292101878bd056844ad8bd98c1c200004faf83bb40206b979439718c2c652ac15cc5be7713648b0821aed6876bf16e68964273c307c17c38d7c7cdf4c997"; + sha512 = "5c4eb2a1f8167ab3f6e818291595a67b3b9f125f800ca84b930e0ffe64357e37b9a9999efc17593e502abd1912498250423fd672c7c479d227dd7d6df3092c49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/kab/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/kab/firefox-78.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "bff8278ae5c4fe87daa0a04613b979386aee97ebe0aec8d80a6ac79ea13de791fc9f8ebf46d6b200d282c0fa9a6bdb3923051824ebede1a1d7ff4623b6511731"; + sha512 = "d7b7eb5065a6d949b018d0b1bd7c3613a97311168783a64597731da0b7bd248f11b13069833f3fc794563b1de1f4e0c40be23231b33471dc49bbe112f8e536e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/kk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/kk/firefox-78.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "9e94630f949d32e0f53cd8a9658d777ded9fbad464de542ec4f606c4befb1ade55efc56afe692c6c15ceb969b1c8b5196e342e795eae5de6eeb27744989c8d33"; + sha512 = "7c2a20a0e20bf581aa8ebcea29ce7096fe14c8181780364ca6c828e0df71862b4da85e46ad5e9b73c6fb1dd575732ad1bf36e7dd9f6087f187cd56e29861aa4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/km/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/km/firefox-78.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "8a38c0ba6ec5a37a02f7d24419cc43cef75f9549d3db8c5eaed8e5a00e534877c63c71fbdc5853a4886ea787d5a513406a73c48d9d9d8e31fbde39016551992c"; + sha512 = "47ce70d662ad99540a0186f62c51918e1728976467f612cba3fc36b9d336b1435db1c06a834bec54e1546b9842028c03fc965efc472a08db81a6c13766db48bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/kn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/kn/firefox-78.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "9a4b93057dc9ccaa3bf14074629e9f31e18ad188fdbf1195e6daa4c6ec31509f7e417723ddda909ea0eac121627cce716c9b6ad74bb59ab9274370141af2256d"; + sha512 = "3a62cacb7f5e3b4d2652731268fb0517678ed38508f5fa0fc2fc5288031c706ef95a2ebc09116b35a1587e4b42fb8e9b07667ec90f3727be0541d398acc1e8eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ko/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ko/firefox-78.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "0de01ecf0815f1046c7d24fb5561dc7602dfe24d0f3d9a23cf934e6087a7b190635738f7d08c84d3dd368c62776f003db6b2cd90a9249090d479784758ecb61b"; + sha512 = "9fe53ec1bb0e5b2ab583c2f7709101ef6ad8f7a246ed0ce9988dbd086640cf34321b49b753960eda5b47a09fc162b0a2a2eb103287e208f75a85c97ad7752545"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/lij/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/lij/firefox-78.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d659155611ba762a2c8a670c2d77b7ba693816d062bed08834251c56b8c4727c580cf6b38c1e7807deb4e65b2da7db940df4c9cddabfcc1b99d1d8e00f056170"; + sha512 = "221ca319327c9bc4f68f12f93309612ab7b286f3df0971dba3f42d6e0ffaf12bb554cd0dca83a4bb9de4c9a239af724eaf5f70d0f0b594593b64f8338b4c7954"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/lt/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/lt/firefox-78.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "487c1d0be32fbed5c4ee7c5a3c8964acca6402fb03dac2e8a32534d8a2737129d06aaa69b1747e40aae18874b5b5b74aed682d59618765d7b248d388a4b4fe36"; + sha512 = "2aff555428cc9b04ed2134178e8c2da1ac702f1a77b3f5b648cad9bb4c59875277830ba657aaa7dff7652a4fc35fb39b6dbfce3013213a503cc39700156193bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/lv/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/lv/firefox-78.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "c87501dec3fda705c7bc50d14b733cd8516d9a3f83228bb7a5805ef6195ec52e57da626c698460ba09bdeafc2e373f5b890a0d77f6b36aaa3b4603f97d87cf48"; + sha512 = "540057409baa8b823ba2eb2ee1a823e24ff08510637caed97635d719c1e3be6fa12379f86f08a68e53c9084ea1d79bb89d188bb3520c723c52db2fef3ee8025b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/mk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/mk/firefox-78.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "21167a3e6ad9d740f567270bda50ea8cb0315f1fced2b70aadb9eeb5c6de9609504cb5b81f3c51e1b69542e393d522278f649fa515b77d2e5fbc02a82d03e7f7"; + sha512 = "adde84f336cc36f23daf58b006a0cfef18acaade8892c2368b0a3b3322ddf2b26a0783f04a533e173d71a4e2f579fde2f6fa6a6c23d80506a1dfe1945a2fb073"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/mr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/mr/firefox-78.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "58ff22621d4158b93a773016cf766f0f90f71181d77b4c7d28ab2546e61f630447e5c01c559ee887224f6579801a6ded557a748bb89e8b5d4cd086e1e04f8bd0"; + sha512 = "93b021845b9dcf173b4fef281dd4f51ae5a84de3bdf80c3861fd0e5e4d9431366b4592f0bd553d45fd2f9f3cf690ff82cfef6b32f9bab06fa916b417658402cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ms/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ms/firefox-78.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ad3e4725cff1f9b6bca01425764110df71694ede2b7afcd56da88da1982cdce93f08607c17806659917ba4fa1f0c88c4758079bb695b5145f3e717b5dcd45848"; + sha512 = "071217dc5109570a1f5a98a06ebc0120aa809a189b3a78a3cc19dbdce0ad1cae409f665eaf97cdc7b4df529c8406fa2fa2c57e5b34dc32e3a0f4a62d981aa2f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/my/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/my/firefox-78.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "c70153af55f07aa84d9fac8e9ebf9c9137f62f6028662afc1189ba8329efbe17d77d1f3d2f368d800cddd715701714ce73b24960c243f933aa239b880d658543"; + sha512 = "39fa770a4b6632d1dc0e3bee24ff7ed95caa26db7298c93a7e0f4732ef18d72a1f21612275908dd12ee94da0a89b08e2b575cb745340ef0d595263f554fc61b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/nb-NO/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/nb-NO/firefox-78.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "a3ef8dee50ae5b0aeb08b3e7007fd766916fa7703189efdd9a2f7e9938f68699232aa1a4550f42fadf1fcdfa236fc355a072173ef2de1b00f6ec867f47cdc080"; + sha512 = "f408f1ffa88b3c918e52c001ee95027730e4961e13a0b47a0c8c6d3c39aa8d7cab172329738ec546207051bc1d682b8d62d59ee9efae4d7533036cc9a6869f71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ne-NP/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ne-NP/firefox-78.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "2fe23bbbaa450de730e8269bb530dc03f1ff6b6d08e128bb685cfc601ff3930bdf50646f0f23252d692be0e843505a57c182dd747dd60e1404883b89379d697d"; + sha512 = "6b8bda91d969a832ffbadd4d2241b9bb572637d0d34c910f7e5f14921d7c9f76b4a88e0e3bdbfa259a0090cc8b7cbe638f60596f05d8b8c5f48faa181393a37e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/nl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/nl/firefox-78.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "efed082f592adf33fcb1fa1619743d0f502295dfb0626eeb66c17aac2d6cbb68598013b37631050c0438cc9dccb5756becad117a82493c9ef9b4c4c46aad6eef"; + sha512 = "ea86fff04dfa7cdb8344af38b5b983dc9043b5b754999ac4b2ee1fef19df31fb4c43be6952e0e97ecd4af62c97b1a8c12914f0473dcb19d1a9fdcce4c0710869"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/nn-NO/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/nn-NO/firefox-78.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "6f34fee6e0beb244b567e748c8c4ffb72021061aec9f5112f782dda3cd90a76b1ba3f044e5eee7b6c0b0b39c2c9b32626cc379d3e4d1bbd37ef6b7bed8d3ae33"; + sha512 = "9bb74a166716654e32f1b2931241dc556d399148bac3b1fc44a96a101f48e74413d40f380f6e469639c186a2483bd9131ee27b8acd8e442e4a3c2eec7361bf1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/oc/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/oc/firefox-78.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "cfa9c3712952e93e854300bef57cc8b4c5ac908abcab9fc06c6818936b52377ec7d2dbee8d1d28313175b7d39977b7c1294babce387e5a8bc3bce50d6de74ac8"; + sha512 = "3d7445cf18226db6a4a875f2f006150d709b53a8837f4dbb2bfc7782149c01949473a1fa7ac0d5ab3ce269b2a41077cc93f7635b3b55a08c2a105973c926e62b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/pa-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/pa-IN/firefox-78.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "166c240c73de0b4c3107270b3a1a4539a9c4a0712e96f3ccbef95330842d8b1c02ff6a15187c262231bfbd3e0ed237ecd3184b1abbb666ff55e5d4f242cc6f95"; + sha512 = "0208389b74ca0070c727f6fde7102e12e28b460eaa062839c23a81f5f25f68ebf4596e5dfa661a2de7c21c233e09d621dca716233c6b73368c7eb7fb0aed6d93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/pl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/pl/firefox-78.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "5588ffb0238189fd9f18b6a50e8b421b807e50e9bb2da7fbed2c8c5d503a738a4c1b79457780ac6731e71b938879e2c8d61701cf5e21814172eb268c9d71c460"; + sha512 = "9765be62795d6a0efdac06a91d2993a1da2b015ea20679aca8ea6d70768b2a0f9603533d2ab81bd2cf33dafe842e9c78d0a0bdf2b705c74f22b7d9fc22cf2c32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/pt-BR/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/pt-BR/firefox-78.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "a9341b379e27f059cd26d03cc4f68124f52b8501c983e8c29653694e5d821311c92af123e2569933e6140889a701f4a7e5eeaa7f80e24502f75414be3631b57a"; + sha512 = "c59eb5f10a8f94e44f785bdb8425e8b889e0120434c1796def1fb521a77d5da356176d1c864a2fdef08cb650a1b6c71cd334a3cd0d1b2f647519d46d2d65ef8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/pt-PT/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/pt-PT/firefox-78.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "8ce686c98f56d8e8847a567a71a52577569403daf02793f090a360e266d8fe3044088d615db0c0b8d3eea8f1da331f6f37bc21265fc4078c2a1e7d12d3be70e9"; + sha512 = "8fa1dd31772b0de062c1621ef9346ee1b0fa77629977c39a8111f0f22b00a1656e6bf143c3ac74af7abeb8f2c2cd26495327ec72b067c4ab7743957248b62e32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/rm/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/rm/firefox-78.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d66607192e6155ad67648c9c8ec5327b58433f14ab646d8b7fc8ffe301c02258057fcfbaa37d792978de4e171e89520521d741608a2186013931c6adfbd1c04f"; + sha512 = "737c5614d84fd72313c3ee4eb72779bbb339a40f249967417d591137e19d76b32e9ce528adb167415134ec75b796f7ee4dfa624cdefa4bd42e11148297b08867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ro/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ro/firefox-78.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "3c74b828b663de1e091e11534656579759a6953a7fe21b0531aaf501ad368dec9652af9a70eb183fc4a5242bdc9cead4d2ec8fbf3274d8e78963df2c78779584"; + sha512 = "0744ff66859699c611597113c77de6bdfb5ddb543768671a48f9cb83da888ea88ed6fbde5fb86f610a35fb6e7daaf0a4c6fec1d9658c700c16f37e04f7b41366"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ru/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ru/firefox-78.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "5f3a78c25b202c732ca14a98bb4b3ac5baabcf47248ae0157c83afc6cd6d628e2ef44de0ec0292e4839994e2806ebd8698dbf0dcc13716f5f6e34110ee8111a0"; + sha512 = "77e085bcbbb2ee78c486f85d86a5be43498ea094214fa1e769c3edf7af42821c833d6dd207766ad1fea9eb9ad2354229617b6ee49b38d869024092d317790781"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/si/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/si/firefox-78.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "398efe34b30ad6978e98363c978e6bbb810f359dea7066c06f904dff4bb934a49a20561e39cbd639eab9474210e9d34e3cbd97e1b78aca2755431ba7cbd83afa"; + sha512 = "1742142be1d9fdcb13f6d68c5fe413b9ad019556491263855c172d350fe0bd00d467bd91683caae51eee3e512023e309ad97319e3327098ee47ab6be35d1a851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sk/firefox-78.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "8521f91202f18acfabb2ed2e914ab4f8a28079d1b474d86e110d1b0ceb0aae8f8b70a1a0cb3fa5a23b38a905f3abbfc2c1eb5277a400a215856c408efb0efb23"; + sha512 = "2c292ca74a5424315e22d595a688d14167389cd7afbf73e07342b7e77ca32e9b56300594790f26d048b32d0ec014d23f144b9226b01cdeea3233050998394f99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sl/firefox-78.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "e137e54527667f98a5fb1f65707d2e60a151a7296068fb1190a62f07f091c5fefd97c098217e352ef2e62b5256bb45f5e410e4eb0636ef2f1033eb9a391e397b"; + sha512 = "d6dad078272c4afd6d0641bd53db9d9af4b9ff9ec34c45917ad313cd6088ccfdce614669765281d57c57dd83a5b7e428514e21c6fa13cea70c93e91690ece671"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/son/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/son/firefox-78.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "924401c776f507c70e6a60c873c84f1f7540454946a4cfbb85426aa20a589973147a42f03fc106407a91cf484a3763cbb6268f8c119d72bcb3b4c46610986b57"; + sha512 = "7a382d02653006c00e4761a7f61746f6ee80ae2f922cb2eb027da3ec7f6cebfccacbd51c528a29186557dd9e905a744e6db7e07c273751a1f80a277a08a86410"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sq/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sq/firefox-78.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "8615b1930cb673c7eca59e5beef70cf05f9be628b90e6a895f28f5dbdfe46cf051a14134a30940d3f55512d6d1e12714ab2568b53202bb33af2ee4f0b26e586e"; + sha512 = "0ee0ed873edeae765b624e1f76612b06bd6bc7b8df396656c76b59b1e1ef8d5b7f056a18a71eb2cf9f950382ca272bb9517ce24c6145e966f6e895b4ad843e6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sr/firefox-78.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "aee6e902c58389e5794ab802c3e7f0e6750c3dd9076e8dd33894388186daad17e3bd34f48cf16b082eb1fa4e3e8a4f794fd6bd87940792d089c50214b390d35f"; + sha512 = "d8589397053bd3b5068885925ad69ccbece3b439ee61b787babce92f24a8cec9e32164616d73fbd35f34047d1f5ebee48e91bd9f1ddedda2dc4f19d5ba869afd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sv-SE/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sv-SE/firefox-78.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c61acff7429cbdfc14dc6aca65bb538d99417567b477e24324d7ca1f7fcd12a0e2f338ee5a8246b8ceeed0c1761b3bf8d4e6d2be9311d6fdd91bc5677ecf3cd9"; + sha512 = "d72111d03ddd880a24590a5b1e17e950401fe9d61fafc7b4b256f877d8c950689ca393ef6fdae048566beb1aa46ccebc7f1de8273c22b8a02a651730a75e29b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ta/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ta/firefox-78.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "8c9255e218e0cbbd77cd6089d02535af65301a988c74cda0070ecd71a432ce34c5bc8c71aadf1edc5d558ebbaa5d8a5b78e3c76c0c714a6afd8d4b11e1b9e3a8"; + sha512 = "8b3c549bd419861fbf8d3dd30e10482922af955454bc1974f0c9bbe065a6aa88aa55b8808b2c4865ea3bb5ec240490b882a3d1251291513b234cee3c075f28c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/te/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/te/firefox-78.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "92afd454d7542100ea73bb71df673bc006084fcc1a31f240b6431f4bc6cff946ab57a94d8a8634a8d01ee996e52cbadd5c9dc58e3d47533d3d3a72a8d3581142"; + sha512 = "8d8c74aa0811c24d97ce03628d9fa3be139ae53356296d8599c5c4a9269f479a2dd720dace92e86560a3986fe68daf042b18e2bf1c4d4339033b5c42cbca0f26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/th/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/th/firefox-78.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "077e610d74fbf8d861f9ad0e3bd1b5dcf79e9d89913f7cb53bef139db94cecaa08d00dbe830a66f0775daf216a4e44416827bfd386d383272d7cee75b5493bb2"; + sha512 = "7c6645a2287b0da7c346f1075e44658c72d9c95e4e47413d0e18024691471e0165f2ca58142658e4ecc605fa5398d047e9acd248e1090231809887189ab19926"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/tl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/tl/firefox-78.0b2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "00fde9ca4590744e2877a6460e5fcccde3da81864f6ca0e7b092cb250137d449038b618bfb9a3b58f2b349dfeebe964c88e194162f83c6dc573a239e8d4d3598"; + sha512 = "d27d4f5815ebf6d92c9394fb9b187985eee43b89034f6378a862c5e0099156423d925e4f239da7f4dadde31a68053eef909d53814a2342157f42a1ffaef48df1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/tr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/tr/firefox-78.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "c84b99040d24d1e13ee568c6d5a0ec336823deb2ab229ca29d0738490dd848cbb79089687009016313b5b7d80601e9d54f68d7be08138b71dcb2cd016e555867"; + sha512 = "e9001e4ac3d56a76955c04f2cc43915696e3ecf0ed0d7446a282bae6bd3ff7461ee6abfe7db40ad61cfe37361636089f2d4b353eb5f7f09a9af16f933c9e1ea5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/trs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/trs/firefox-78.0b2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "7b50b2662861c4dc8a800f251297a21be22d3dbf863dabd0d2edc48406a0d190a1dba5dcfc623f3717c741b771dc338563e31f4d75484dc0fd7fb3bccb9c7a30"; + sha512 = "9aa5a64c8ab17beccaa53cda383383b28b7ba311c08c21dc9bc097d2e43f351901399f315f2b12fddfcf101023212e61c5e416442a726a324c66c7872dea75af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/uk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/uk/firefox-78.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "e2893db5b1d1199c9f823294b487e79b0c7f4e4c4c33398a3fd74db93fb11b1272292e0ccf8c6e51e706eea5ae63810dafee04ff8f53d76fc98f73cd5560ef04"; + sha512 = "8d33e4ff58711e2bd71144b00a96fde332675c6a81b09c1896eea25b6599fa37358c762d951e4515ed398f746b368216fe26beafdcea51cd3e927e132d26856f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ur/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ur/firefox-78.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2cc0f3af1e52573b570ae07e39af53f63d0e51f6cd15121d3894a9afa96a0796d2dde9d49f0888ef7ab1a644682963c68282a4f9032a64b2093d7ff8083f35f9"; + sha512 = "2f8e5d91c9f4119340762efe519b11eb69c4dca355a4add963cf71a5aa58b53c315c0315caab323b27cca293f383bc07325dcbc483326dadf95f305fb2ecd067"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/uz/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/uz/firefox-78.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "10faea0201c3b350cdf52935a5df3fb0277f6ac52259b446a87a9cda1fa4f412a2d8e77c005abbaf2c2d9d3fab998a97ab8ef9833ea63e2acaa6981d194d064d"; + sha512 = "b23309f728ccd814f7444c1e3e129034c66a1ad1fd216e6960c79470fe37d765314fbe9d221d8bf2f423ec07406657135029b280e2d5884c5f3a55050e0194f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/vi/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/vi/firefox-78.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "2360929b0099a6712fff7658216bee5c9a90d38fed6fb181ec9d16423a2796763b3d955fbbf9ec124320595bcafcf7e50b1877989185a35bd5f25d1321dc5325"; + sha512 = "698f917a168d753d7dea3f0e91566beb6cd96cb708abebfeda808115775ee5ee2dd906ed68f99cc571c752560d765dbb49ddf701de4f74df2ddc8a6642f9bb19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/xh/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/xh/firefox-78.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "2abd797d2f9b81f22c140bd3c57ad68baf54c10947a0d0615b639fa289a54ce3b3e72ea6c596ec6389977a9b31a1853b6c96e1bf23902f4c0eb7f4aa8a907e9a"; + sha512 = "1b1dc73a235218bdb832bde08f4de5f157fd9acc2257fbee5f1684e2d4bc2f14a22ab70e062d53612b36588dc3f252a6a1e6707cbff392d9d1b1365adfecb13e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/zh-CN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/zh-CN/firefox-78.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "ec379eeb6d70eb210291651125a3fca08b1aca0f06cd22a6ccfa532ffef8d1480fa32ce79f93786f7ce3359328d5a96442ab88b4e7c78fa88a892ec08b8822ca"; + sha512 = "07d21c46ff1cad5cc9e75d6719224721e230895bde0adc34b69eb5a34f14d400206e0d2e4de80ba4e029de0b185b2c6ae0a44624b5838eee210726831ad082f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/zh-TW/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/zh-TW/firefox-78.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "fa18cc45678129584438122766b7b56705aa9332025c6f729f29fd50c3051a2f60988fac4f1f267a94d443a35f3f9d58162d3d355f978c018062a8546976a341"; + sha512 = "13be3323975a7ed42f6a9ccb8bea4b71d875cd5dd8e1e5bbef8ed36d1020819f3189b6e933200ce58793bf89cd7d989e6e22dda60321c9ea3c5d3b776cdf8e5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ach/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ach/firefox-78.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "4f32295fa57221d2658f2bdcc4d3396ed3337944dbd9e46a1694ff478f4ac2d68ba57d8d65a6e5387c657d1e51b2a392dcece3735fc0c075da6c9e9f3a053cb9"; + sha512 = "383146225929a318a6dbe25e74880f7c8b630bedf4ee91adfda3b8c9626b2967d6e6e76573e05fec2a4efeefd0573c6ba63ab252acc453b691cca3f09dac7f1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/af/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/af/firefox-78.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "8c88972e9f0b716d5e10f730d040188f4bd4566eef196da473f1be7206c67cbce90edb4bd08f7261e6860c276fa0c8fd15f39641e5f243715608b617ed8c27ed"; + sha512 = "4b0fdbdddd7c5eb18a25dfa03a95580826c940941f66c984a9d6e46f1ec88ab932b0db8d94644310dc5fa1519d44a3cbc24d8373a449b6987e2401b9bc2800c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/an/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/an/firefox-78.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "ee72bbd1608ef81184fe128d3274ac0eee56003230d61e7047d0d40f5d0176383e843a5b7d090391203a1e3d6a8c1014096dae3796fb47feb55fdf08e5d5f37d"; + sha512 = "72495918ee96313318db942c8c403286ff6ccbeb59811ab2c595723cd18c2a57d6a42adea7d8779b22b9dfdd1e5c5c0e19b5fb438d198f9e770f3034a932e610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ar/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ar/firefox-78.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "280ee75fcff94e9bf6052c139871fc1d3e54f9427be30d2b286f654468436a906905fc3b8d48a943d1e2c4eb741d941020ccc2b82a99c73280bb8a5638689bc9"; + sha512 = "61117afc0748e44daf713234b91911336875b8d9eaaeecf8e183d54d2c6bbabebd1cbf34c74a019ab660b06bfaa28c417d7ea3ae8cc476c26c9c40bb9fff5392"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ast/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ast/firefox-78.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "11a78f70db70c0ae9284c623100ac92b8af742ae389905007bcff5b9c731e18b97ad1226503b8fb7a78e981ff97595594e8ca84cd76ef48052c8440f1ff757bb"; + sha512 = "63f66ac824c1ace695000cebd357684d0b09c3e69f46021f44ffb2201327468c2d4d21597a660cb14f6fd08c21d58e0e47520f72595da8f59c808459ae8ef0e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/az/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/az/firefox-78.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "5f6064fdf15fff16312005114e91b8957daaaa45c2bbe12277b5d2bea72d6e20b2c04f5f5731300337d7204f3114ce9964c006cdab349b9d78255b109213fdbc"; + sha512 = "481f350c51b234aa44091e7e6ba308364c84ef988bc11c0f66aac72511e0aaed0c0a4bd865e781516cad6a867bcb2e09fd4d1726871290f828837398712ca401"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/be/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/be/firefox-78.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "08e136fd182c7c126a7c6bd410d5d1fd776797a7409e42ebdaad5dd9e0b7dc847a6fe8c5dfd9cec929c48461ba0c5da996a8eb8f34eb4be215f018fa71d290a6"; + sha512 = "1c4b35ac02bec3daf9f5a7fd984071beb274281ccc3f3a8979d8255709fa22396a1d2ab2606521f279943c872294e19b99e974b116f1293d63d10dae0f92e586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/bg/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/bg/firefox-78.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "fbd6a0fa6ae9e4f4232662edfcaf23b3c5b13cd8f9e33c714459ec398bf0cc06a358b448cc56fc5208b7f93315ff47d34f5b2975c90765f49d73f88d47596f9e"; + sha512 = "9bf06f95a1769a9f0a4e63ddc15f612d8f5f8678ac217671c58f3fe8669d3936186a2695b6b49ab6d37a052a2844ac53e6d65795f4539033467f2405930e191f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/bn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/bn/firefox-78.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "5ac3c52f9e8f40bafb3edb7b3cf6483fa74f6537ce1baedaa96e41a851197d6bf74c7181a132a51bf225d450081fc57450217c9db3df8cc085f799af5aeb0b04"; + sha512 = "7388dbc16b05f32a0c2cb69489e8dc5054c6ae785881b91571d2ef7bd010300efffcf322598c51157f681ba599f7f39791bd2dae217147eeb478be92efc82f7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/br/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/br/firefox-78.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "1311c592461fd0d23ab1e7616e120fe51b15c70790c2290340ff6f6110984a1ae9a96da40a73cccacbdcb4b2aa03717401b34b415c6509850adabbe028e9aa7c"; + sha512 = "ca7fd9c0c46c92b26e1038a4b611f26690b4385cadae2651611f079323a6775f47d305d9547d98711eeebcc00374df5172fddafaacf44279cbe0c765c7fe011f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/bs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/bs/firefox-78.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "ea11227e9e53c781542c61212397dfbfdeefb2f70ec0e8a26bafd6e7de4dde3f35e6d87e3e3fdd5e31fd1e061d7906adad355398a4dba0ec1e6ebccf517bf2c1"; + sha512 = "fcd846854ff686542a0159e722722a97b6be0a797341bbfb2fac62cd8b6bdcaa3aa2f51bbd6a7b2d90b46188af1ebc5c1b6ae6e6dc24f3f4f1a1bb26cf2205e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ca-valencia/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ca-valencia/firefox-78.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "c858400aad550180e04bedfe10ff1094bd0bcfe5c7bcffd5edd9512eefd671d6401bf1b50679af4636c3211fada6c44c126ebc3916fbec3fa08f587f70520e1d"; + sha512 = "4e997173753a7eda937c5c04c1bfed27a2368e58db459d1e0918642d2c5878a5abf5437f96de9e47e0322f4f0d0e8782cda27bd24f6c5efecf685fdab3b9d149"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ca/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ca/firefox-78.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "2a6464c84120f2c85002554af4759f282440435a84501817c0e933de0f2fa6535a5acd59bef92ad6befecd8bd7e40a8f650fcfa75aa4dc2b20b546eafd4df056"; + sha512 = "c2ba20e8217134b641d9c97e3332167236549e027946d7cd4200ace74498639e6841eae76f753195ba8ffd2872dc3dc81576970a128cc618c51526497d14c1ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/cak/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/cak/firefox-78.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "c2d492cbc4ac4cd5ba030f1253dc987fff0cc2ebc0d3b126c52b1a6de9badf57b8601a350526934e059bd7f3b539f45fc120cb1c2f327e96abefe62b1177c439"; + sha512 = "e89879635fcda716916f5e0afe2372172a7e3e13db6a57310cc2d4e8bed95ebc76fd2a39d730ba548a8f2871e68ec6c80364a67a8a9f2f72e8770a6088cd489b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/cs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/cs/firefox-78.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "9a2eb3ec93e43d789c3a15acf826cf72ea67afd5656114a0ba1125dc2bf57741799b52f565e47f4403859bc7110f3cea100c126c8280936235289331c7292fca"; + sha512 = "ce657c44e1ae63db3f206601b5be7107e0334de7be574c8ff9211fabb6d41936eca3aca33f58e05220adf1213aa96ccd20f183a72c4bfd7cd71c145e8e8c051d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/cy/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/cy/firefox-78.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "9fca98e4eb686968d5608a8e253e0738f3369b943e63b960296c7ec718ab29638f522844705eed29fbccacb6b525189a7a828a7b29ce23e1bae61cacc925a73f"; + sha512 = "fa217e8a7dcf509132c35775c85c74eba600dbbbf2952a00a61bdf258396f134759667f6c3b8195bcc0fce8a6d896e70fcbfe514bb50346969fec258a8ce9342"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/da/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/da/firefox-78.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "9393a9198d200b757e51af3961c2cf20f42cd6a8d85a7c2194731643648dc971eec924784958e306d3ea177a4ba8c15e79195dc59063eb81e332d4010e35884d"; + sha512 = "ace0ea8fdcc68845f948656c31e142d5158eb2ebd0ead6c8d1752d6ffd4ad6d915b632034ac328751e69fe133d288309b2db0e97caa8cfcbf697150abc757839"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/de/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/de/firefox-78.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "22f901cc49ad275ef107a6c49607c3d8ae51315f83472088cc7d062bd980e6f74b911067f92740ee5906fca3e3fb1cfac8be63c8fc0d6cd45474f32be5f23007"; + sha512 = "6e87302f9a5c9a08c7e9c56257a31787c013ce8b5b800d4a7be1cb7ebc66c32d9cee536312ba0042638c33b614fcee051f99b83b71007cb21716e0d12d380696"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/dsb/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/dsb/firefox-78.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "190db9d98bc335e9cc34e37921af328ac0beee967aab4804c4a513199ca9f9c4c5153351c359d91d34f25cea4e109b90735009ed1f480b2da6a80422f0ea7839"; + sha512 = "5f09de6e10b863e06699b9131c5bb819aae6afb40030550a1e2785555588fee83e18abf60825b27f8e458dc9459ed101db213c230a06507e95e9b43a0fb1fd58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/el/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/el/firefox-78.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "36b0942422aabdc0dbe1959f330fd6347c0e3e0de9fdb18f33db3bbc8f7b1982a4cfe99aa126c8c4b3ccf93b0c26d01b01e74838460793cbd5d0a6a8193da4c9"; + sha512 = "03dc3e0ee03c27653c42f314a3e65d9e45b717803a869827cedc5ed5351ef32dcc768f7c13a9cd3eb14b0ac8a0d386a8392e677f7481bf81699d4cd22f91cc3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/en-CA/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/en-CA/firefox-78.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "af22e98b054cf4052120bc17735e196b56e3d8875936f7c35fe66016858c650bee94932ce892afa5ab7cef3012f880b2533d58571a752f1ecab9a6284f69f991"; + sha512 = "9eefc744bbfd503e6cb0cc0c25a1955a3246775ad2f204b7004aef96f24e6268576b89a83853de93998c228208174cab91cc0615ca16d42c6f2dc043939aa213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/en-GB/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/en-GB/firefox-78.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "34b5a9a7270d6bde97caa77e5b43c3c47bc71d9bb50e51bb6449969ac99b2e7df870349f73a4b7cafd4fef1e409720156a2f8c4082b50ed1abc042f3c53f03e8"; + sha512 = "66e3abfa4acd7b701285a8bf9a48f6be2401e8bafe19c694f1307b7b3437efdf500e12ceaeb5b41f3deaab29a3ac90b78ff79fd5521e94bae055b119d4918690"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/en-US/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/en-US/firefox-78.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "ec6dc83bd8e5cd20a47566be95e152ee63d770557b9f1c864da411fee6ca554e58aff21372e97f1ea557156381ed24a619262669190742ad705d2e48a9e9dbfe"; + sha512 = "38500788aeaa19cc295c038e85ab11ed7a091fd5b4105cc2b7202b22e271dd8f3ca8139586e87273f98b1e17b6a7f526131ded5e4bddd0c4e52896cb7f47c5c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/eo/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/eo/firefox-78.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "9b97b46029ccd4e47fdfe157c9c34619311755da4d02e55469e434a82e187324f1a25a4015a8fc6345ca9701c6bbf721d076132b7d953a8d55cbb8e6cca8e918"; + sha512 = "d3e5aad8cbf2b2a61cf52d3f17d99d050ee46567a7aefb04d0855922f86e7820d11c15d60efe6beea76232a7d1f43f2b5a4aca088844906affdb2d272364a492"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/es-AR/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/es-AR/firefox-78.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "3dc73cbf68defecb48519996dde87f89f30788c4eda9782b89d5449e35b31bd3c842727564f9aa17dcca7acb19f4c8d27d975aebbd0045a0499217533a546362"; + sha512 = "81aeaf4e97d53db8dc93d0e6b163b4df6218621781dcabd85755baad71a4454f406d5119d16044ccb867f8f6826006943b72d97dd6b5d658daf196d16bac040e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/es-CL/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/es-CL/firefox-78.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "dcaffcb471bfd9da4c4eb2e55061828a5fe569de2ef64492047122acf74a7885a91eac49c2057fb2d29045ad41ea4d9817ec0579aca286f186c12f3fd17020e3"; + sha512 = "e22ece882fe8141864f1efd7d72774aa659cea88ac45380c709f8da92906b8f0d72ff959add05b6be57955b4687ae52a138b51bc4da81223c16ca40b76c056ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/es-ES/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/es-ES/firefox-78.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "ac4cb3bcff2be801b3ef23c7b0daba5f36b6d2e5fb8e1b2baa45313963c1c32467c1a93fb1072a6fd38713b3fbde86e8de24ddc9f66b002ffd6a3d4bea9eb0a3"; + sha512 = "26b6d729d72b302d38d7a372e716dc9cf741658e3c42c7080a8593f3eb5e5e96fb40b5188082a2ff9eae528f387801f034744fd2ca47cc279461669550e29502"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/es-MX/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/es-MX/firefox-78.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "79377037cdfa8a66df3d55e95b5a9a6846f8976371d7c88f2bf4f6df0bf33faee44fa0ccc9570f55367e5772750b53dc0fea6d1e847aab222599d055d64f387d"; + sha512 = "2069eacc1ef1ec020088b3406755dbe2cb178f53555371f7132636033b4ec4883973a00f5f89907f8d6588a1cbe7fbb2d0b6dbb9d42c74165698bb222669bf42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/et/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/et/firefox-78.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "17d04657ed054a8a7f2bde5d71906064ab924e24a1055a9bc9383fa86a1c5481e2a32f63735737e5c129e32046b06458879313bac37ff72774053a437714d8cf"; + sha512 = "1c2c865b8a7106a91ecc223a167216da94be3373a4d43012165989e6482a3d0a90f685b163f5bba50d14d1f2abe1f0866d6f1f75871cafd5823b060d9f6272e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/eu/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/eu/firefox-78.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "a87495e8f4b8035886c007421ac84fb47d8cce387f8cd16e5cdc5f5fb71a80148ef42fee553d4ecb2d794aae367d609377cde61f9388f5aa7635fe704cd268be"; + sha512 = "3f2e68d6fe86a59cee48023cb646d5002495e2ae416ee18c7ae51c3e48690969c704da16e574068ea7f91fd17cc581be7cdae8303f0666fda3025cd87f173c4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/fa/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/fa/firefox-78.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "99b989bc71e58b09106038db336ff9de46c8381be2294010b7a6cb32b1f222de413b051062f5fb2981ee173b0879d089d74c8cc9b6022f2f544c6021a998ddae"; + sha512 = "6e6c7a29a1a20cab73b82f2c6d6167c8de66a249c0b02170c9a1ea052bc1eb8af5195dee3e83b597004127639fe96b4d89ffd020625a0aa0369dc47cc9560d05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ff/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ff/firefox-78.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "125bfb8aab76599a1b35b9bfad886735ec8a89ccdcf8d29c45a238b4e06ab56ff2b848c94febe00042b75c378c5719610613b5b35fb80257daad35cc456bd90d"; + sha512 = "3975634e0395df6377e7a240d4ae6328691709f50f115a0c364de9a9da849a6655c8397defd80df6e8edefb6f6b413bb877fccd847bc56b1bf71431e2151b114"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/fi/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/fi/firefox-78.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "e2f115848250093981efd9b4ad344464636bca52eba388e26f3d10795351f25d411ee71ed77ab3097c1e285676ea30d5151117a24527e8739f73431f60b346ad"; + sha512 = "1a96293cb6aad59b5706ff26f7324cb6dafeb9f17de4043c03aa789b9a81f7555218213923fac0abc16700cff4bc68848345f99376696025238122626a341177"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/fr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/fr/firefox-78.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "9960af7e15dd722c93a7620b4f30fba8651d2245933e29d4f3f6fc3e89bb79a5658aba2c8969e569de7204e2d34bee72fb2ce292e970cbbe50cdad320e030117"; + sha512 = "1d3d243663ed47c7ee3ab68a578d87769b617a4e961572d3db2b34dd62b8b1c997d223104ded10b42a00a0f0382b0ba10c089060f613e30001253ed008b09ddd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/fy-NL/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/fy-NL/firefox-78.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "aaa2ae8968ce6906a47305e78e2efe348117cce9040d7079415f082033c510ce67f833b9195d6496b831f7d8baf95f501ce1d54185009bc3f1d12b16a8275e4d"; + sha512 = "8f1a40d1a46e5b4bd9cc679f07893f407b1ba7de11cbaf0ac6889ed9d344ac6a9f10842359e85f92187256548365b038d619c58d62eeb80538ee592691aca6f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ga-IE/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ga-IE/firefox-78.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "1b7f808948bd3dcfdf748b3e0b8f03cc6c5cc2c43edf84ab62a385ccbd51c915c971e5deae03048b4e48f7f73d671031bd55be06bbf74c050746d87b3d9213ec"; + sha512 = "e15f1d055f6bf4c81736370577a102dd4ffd548d66bcd6c74c807d4996d400979bc5761ae5e5053dd0600b9c7e69ca0fd9e4b03f8428032e4a1acd3485a47f37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/gd/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/gd/firefox-78.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "2494ac50da66ec1a711a245ace28543c4d9095fd186855d968eafb48b385ff15e258b5476168464a3ed5059455bb023d3a964288bec8cc759f2421b8e3705b21"; + sha512 = "564f101816eb3812fc1498725562205f10590b8b2a97dd80fb2f5965a6f69d6dc10d42ba21171b4064107e8403ff81bd6a65da13d302d93a142ffd19dd13778f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/gl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/gl/firefox-78.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "5c5345d2cf6d26b33c6526c1591fc4c4667d2f9c553fd6b5a48a77316ceb1091b7c68c1860e4e01dfe9ba02ff397a48b10cae4047474e25a53bcf09942cbfebd"; + sha512 = "bf67fab5222c481088dabcc92f1298cfb4420f5d4e93c5e320d6bc1c306a51a4fea98c7bff52821b61b70d02c7cbb2e0a8a01bd76a21bb5d8dd7ccbf1a2cca72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/gn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/gn/firefox-78.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "8e5a5b0791a937c3c4c5fd5b7862f92947e16b596842725af7c3c72597ce91946e2a8291a864ca2adb06f96b7bec9cdf0e01d9c915f68f186f80f95e245c61d9"; + sha512 = "306887a8436502fbd8f6654b6bcff057cb279e81e01e05eba6394a109fd21ca5d5b45a61570b9b880a5d104b1a52b002a3efcdb4018b44a9437443e3ea4678ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/gu-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/gu-IN/firefox-78.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "b12cafbb422a817073fc967b632fa80e3c08c38be5e5cd33a4648185e68be7ad2d5827ad0923c4d86e6ffddb50612175bf6a58c19992fc6ebccc3ca170b9ef73"; + sha512 = "84a27c6b14035bd8a6679e954a7f62728a24b7720cf32f1dd93533c97dec7965a963bca8bad7ae1b1895f5d8b30a9356f8fb87a45ae2bed99661852107dc4613"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/he/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/he/firefox-78.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "b97e5a8f4958499391007d4a299bd70f5978185381be0e984bd87bb79563dd691fbee5a6106210629cfbb85346ee867b8eed6136454f9c910e9a728daa3c2524"; + sha512 = "f9ab81b3f184c3351492deba6e4cdcf87306c378eca65813269d779467c68951e9000636d2ed6bc7d548453a5be59b50db2658e69d385bcb800eb452e360a245"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hi-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hi-IN/firefox-78.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "44a512fd82b840141360ba2f2c283a014649cf532a151b8ce75f5b64dc8e04ab1ec7addf8c2ce4c288b125b1bde433c05ab87891bba0d6515c1d9501239887fc"; + sha512 = "d4ee0b984ca5679fa4d5922c321ba2e96f7fb2f6e0c3221eb4e22b25cf8385869c195e668932cf95b28efb17b7f9946dfd3453e679047d74eaa49032f7f494ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hr/firefox-78.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "167b1128c547c6d041d5ead144a7539ca77cee428ebdc9ca712a5a13b89c38d332f00a71f48719af7162db0c59a067001181b8dbabc0e30cbaf2dd9dcfb4fb3a"; + sha512 = "f8217dd5f3772500584eea717cf142cf7a16655ed02c2628edbb6ef43c8a53cc8c73e3b829bd71f98e1c3d8e54619155ba5db8f988a5435e86587367ee754ea5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hsb/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hsb/firefox-78.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "116ceb3aab81c56d526c8564dbb45d4a58712ab62d0ce26edf99bd903e7782be8d4fc1a3d117feadb2a36740803bbd7778b18397abae4aeb71e69b48841e6097"; + sha512 = "1883d76849ff588abb135f594ec7f8faa7c6eed2dd899ce4d7fb5e3f20e0884cb91bd6c606248910dd1d680c516336faea352b043ef7f0cbf95c86b82fb8781f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hu/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hu/firefox-78.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "8ea1cbdf1985b065bf71209ce5a4e9cc91b0a258b873b0b65fc9e7030a67c5eed3feadd714542962aca079a191a4fe92b452cfba6c45ff7f8dff7f874b627535"; + sha512 = "36434f4fd5be4c50bdaa2b2a3ebea4ba1e89f18d51b337d17455a35169c3ec65d5b0aa17c6771f211b81f607175b6df754a28efc927a951e4d34072da343e0e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hy-AM/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hy-AM/firefox-78.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6aeab5e8fd9984410d8cf95ea675336a1fa98807abe19182c2f94155ec1bef36e7bd9a10b9ffb38d2a9ef7441a56dd329d07df4f7c9c301342f46afdb5f2f348"; + sha512 = "0b09ba2521e364fd839769725292bacee154806d94239e21dab70e4fd167b2295cac01e070cc5a50b1fc767ed57f50bdfa428fd5aa57a2ce6d2c0639c1b82807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ia/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ia/firefox-78.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "f853d14a988c3a9c1f8d1d3182d8bdd849784f081bfc609871e592a78de14159203b64755a0e9c63d1649b812094d389172b60bf12feec8cd23c55bb5ce664cd"; + sha512 = "2753b8d3413bad99cdb40e4dc2576ffd559e4ea92a507e0617e04b8fa41abef34ee642d6e8bb58c973a837e1483d117638cc49f1df3f485987be96c2b6d0dc77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/id/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/id/firefox-78.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "897a928303027345459e2343a025fc0e926be7ab8ae7bca951afe36de5748aa6606dcc630bd33df8efa383897f5d1e24b078d94d15400496c61c6494fd9a9f2a"; + sha512 = "a0f863f34f4ba67c049749453220d06f9737d855f6385c16e933a24c9a73f9a28928049fb99a89fe976db9224f40fd90495016388c5442eb0b977100bd5a8ff3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/is/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/is/firefox-78.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b86c9ce4a0f95ebbe9865443420576fa37946bdd5ea5e060cf4b6bf2d97ae98af599a00836ed722e1d19ae002c79d4ba1a8d41e0779745061410bd4d020771cc"; + sha512 = "4425c986b537b04ad0d9740bcd835388b1bfd3a719867c7ea264eb1665a96deca9f4fa58d84e6e9dc7e038ab9bc55fe86fc69381c055f88899fc68b39505f393"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/it/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/it/firefox-78.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c7320bf6f9f5ae18d7eb7edc6b070dd77b79f594795395f2158ef3c9109e6b582b992aaf9712646f7e832eec9f4a622f00b8f218ec6a742f2010d4ab9f0fe1e2"; + sha512 = "4869bca5c889deced2e2d1029262726db3aee7a1aa5c79e928038295c1367ff6003b030ab2fa8940fa1920129c89636e059d9b20e20fa43f2dd938a44995b4fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ja/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ja/firefox-78.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "32d619b4818fcb05061c5a07f4e83115532a37bc67ed7fb655dd813ff1390fcab1f7477f34a2a78832252cdff7f31d2046583afa4c0f48ec810a97bc2a2fddc0"; + sha512 = "e4f288ec38c5a9723f3c653e3d995f9cc2c2dd86f285277a1b44f315df2bfe51e6ed58db00e7df1914b34bcad3b8258ae43075d02d4440cec2c1fd307baaaa9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ka/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ka/firefox-78.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "9f4eb01db315b8f3b13900ce05ca3d6d036eeb45f67fd2e925d1d4e50a87418a0be5a0843e789174449c105e50beab82baf00f524e4b327d2a3e4b8596866a0c"; + sha512 = "f03488b30e3551cf670ee3a193452dde79c72fb5ed63288c41922e627ea0033cb31b1117a4b270260235492ef9d37ce7b6317d637c2495d1732c606aa2d5f6aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/kab/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/kab/firefox-78.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "2a57cb02f645ad0505292bfb064d908a5218928b9964761f89a1a775054fbe0f094c0e22895de68c7603e4328d33e7371ac09edc2b6d2c1737d5b662141fd0de"; + sha512 = "ed496b1cec1152db8f63a04f056479019b90338220b163f1da1022de11b1064dff1dc32299f92a0464073d4938551da813f88d5dcc8536c61abc84347098cd20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/kk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/kk/firefox-78.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "708a29a81a0f1ded29abae0d0d781883aaf809f7910db2985d9e95b8de78cea750dd40f9721b24b642719f37c917d36e4e876d6aa8aa27401e695b61a392a2d5"; + sha512 = "01eef4b39491227ba2a0428066fe99b59222dc1d9c98d435254558d14d91b4cfc062a2649d87c86da3b83e327ef8a7889a78068ba1e118140dde8d696aaa4654"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/km/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/km/firefox-78.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "65de59b8b41f44e9e759e9bda4eeee88558e4660db30b3d9ca3f66dde0a82145a82ba463eeec55fd839f70f455c9d855d77e0507910ad234c6c883572942899e"; + sha512 = "f284b80465c175a141210dc57b4bb472418981197ef5c7cc4b32c5d2d65898dc9def0f29a096d14eeb8d66328713afdbedd26e9b88a969a43ec62117c2d38d0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/kn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/kn/firefox-78.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "094c26405e965834c5483d62c0403b0a64426ac1e559c1a760bd4492b7ec1662cc998a896e06778f910ad375073d996a25ce9549bf16f4b17aa4be52dbf26ffd"; + sha512 = "1b3f97c710a45441fb66c83ba6b2e648f726d8fcd0d245f9f8121a86d878c6bf3b0b114878d70f64f6f18f057218f84c5e30ea0f4f4ad8b1921d22ac9aba5e7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ko/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ko/firefox-78.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "642acfd183571001c25592ce0f35155dd80aebb8a79bdfdb2fc89a1130f93329b43a02d8ae550d495d277de0ad1ba5c746352c80419e97b51ea5c05169c4690f"; + sha512 = "4deaf19c5b1fd396566dabd7f9cefe416e29ec885781f7aedca1bfad37645c2878a884b516d1300eaf2292220616ba494be4b8d763998cacd1d5e9e5b7a902e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/lij/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/lij/firefox-78.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9aa044f118cb4aab69570ee08f67591662e6664b54e5989076875e59ba38b5b546047a3c2cb91a6d4ae658a89158b4ee78aca048598e5c26c79e4c79e972117f"; + sha512 = "17bf34017b58765bc0f90d08ac8cd73065edb223e1d8222425122460c8a502ba2430caca3447e535ed9f444dc5d05b5958984e8a87e29dd1b713095cb68c130f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/lt/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/lt/firefox-78.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "92db275ad457450f7f7866a599082e643c106155347a18e4ad443f4123589014aa628bc485722d31ec625ad7d123d772c65579771dc0a253785ce61bd00f674b"; + sha512 = "43240bde81bb7a27a9a9b9ecd95bfcfdcc701441a5820ef2abfc0d13fcb8eb41abe240e16bef0a5c1126d498216c9d2c5302c787c93093665cbadeafbd81bcd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/lv/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/lv/firefox-78.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c1f5e72a8948e3fc8b240f93d9c6ebc403ca9f6c839064c830414935c4921825da39a3a9ded4c0362729c9da866c22fd24a1b5fb5a53b776b8a8e924dc862ce7"; + sha512 = "6c91a4d5e746ce88522ee9ab1fb5ade7293365eb3bd67f5f5648fc8b298fdb41227408bfde8c567d238bf65ba5276021edb630c4b8f3314493a6f2d5face7845"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/mk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/mk/firefox-78.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "b7fb36e20d83197e64b43b01e8f2d38f8c9ab721889a72c922df6f2d97ea8eae53cd638fa5cd18540b7c28bff6ce64a596246f535745d0890f69bd3fbc011a41"; + sha512 = "c9a29a67dba15e60aa3a08499c19c151ed88e4f9b108204fffc42a56cc2b73f2ac65460f1f6ead90595deb1b874a0aaec466d5decf3c975c9507f32c6708e4e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/mr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/mr/firefox-78.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "5f65d79c539eaf73ce41ac3effe9a3ba033ce3bc32a4afda3353c815645dd69daa989f85def03ad6017a759f8b5d05cfc39223bd265f4962fa01d9ba83ecacae"; + sha512 = "e83006eb8bb225c5c8961e73c02dab509cc99be714a563f7de6203d7b1f9aeea61228de5c2c0353203bf206d113af6d95b47ab83793aedd0d8fc57c66774ed08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ms/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ms/firefox-78.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "67ebaff0a9dd48dd257b93dc31857ec6e3ca190a9ccd945f93b153293f9ceae9f461370a35f52f8d4f667905198076c79e2594e49a62c436248e2e198b75946f"; + sha512 = "30c08210314a0bb9854ec3ec7db222bc03a3118578940f28fd503a90b266b3d803b59e4d691be4d5d50281b6036d3162676a775de1b0d22d57473ca4f277331d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/my/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/my/firefox-78.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "aa14d4a9aca7bd601cee793f9f269b6a8009f5b8c41858d7eb3440d0037f5d31f0fd9aec05c6dff1ff294e724d487bdeaf55450d378013b79ec198761e88dfee"; + sha512 = "744153ef1626a18fc6295934e4ba53a12854f7f8eee73a451e996ff9497caa7c33a85a8fcda2ce8c510ad516568909dcf793acd69f2b183775dc2e2921280c6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/nb-NO/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/nb-NO/firefox-78.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "535df626eb1cda145fa474a0b8281480703f738dd40649e8a090ff880dc69c7c9b002a7f4fbbf149ba50eff43b05b978f7bffb73c2d994b709bb1221addeda6f"; + sha512 = "f1519f65a3437394906750a19b9581a2bbdd295f8491caac191a6d702cfd81eee31dc58f18297a2c77b7a3099c1cde191017590881613cec21ece0abb3b33b0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ne-NP/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ne-NP/firefox-78.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "f6d3eb4b0bf3fd9891123fbea78d8b63e205886f0f2b7d9fb4fd7217981903ee9ea2933744a682f5684c1db1d398d5aac5e62e4c331d74b5f1ba0132d44c70fa"; + sha512 = "c433b58a5c95c8bb15eba38fbbb443ddcd6e996809e382925284d46c5357901f3996d677cd1a7a4e3afb5d36fe9ff7aeeac9202f333a0acaf4cede1932fb9c1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/nl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/nl/firefox-78.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "02ba2f98ea4c1ecb9751feeeb603c058947df68841c803b218a3c92bdfc66f61f98c56bbb0614ebaf4cf67831e6702ec857cb7f6a8c540bc5fec3d81c5ba5ee6"; + sha512 = "4a08f0571fb66742cf99abc582f761cc8dcd7297bc66db56f11f12bcbc5c46ad0030b6943d31d4f42faa9b2caed5b25576df34d4078ffad5712bc1cd7f9fb3bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/nn-NO/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/nn-NO/firefox-78.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "591ecaf523f48a27101417a963a5792329b78605928ca400a8c61b5afd653a840755fae5ed3f752b88fb1d746cb51c3acf655ced3051ffe379e165264958c0b4"; + sha512 = "97768cf2279b49a5d2ee5dafbd1315a9645ae017d6658106c4dfed682079d8b1aaaed201d8b571e8c00a5a305e5390a7f799307f167c24930b6e08b601586071"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/oc/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/oc/firefox-78.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "a11bce29cede60bc9bff8adadbe22ed70b44576686b88a0e7ebb59d3fab38c69553af4827fb7ee3db29c3f587c3099da6f19d4583f4c688eb46be4bbd04d2568"; + sha512 = "2bfb1e7d79c8c7256c7a4af08e33bd3cfd7bb3b5e214b06d50714d602b0ed44db5556d555d506b29d5779b86c8f15cabd6e9d4151e76e0c4e03003a49f1e2460"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/pa-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/pa-IN/firefox-78.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "6c060521f85228487cedae7ff6c333e72fb3ac50269136585a0582e2ccc3ea0874ec21ac2db332cb90059dddb60014a68f434b9396a535694e65ea7207ff41bf"; + sha512 = "e53b42fcc15613bef2201e2c8269269901130884fc7b3d4fbb5cc3eea1c9ff1a219503c2e2960643ae23ed0ee99287ba977f55f77df00c0cdbacd380623967ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/pl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/pl/firefox-78.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "a03d759520fdea2f911066b17082e4c322daad8bf6120643da9a1f19d2c1bb3cf3db359da614f0f876637f0edcfeaab45e18b90769568cdf2d2ea46cd6fa4902"; + sha512 = "bce7db6d18de63080a806dbf8639bd2f6dd00876605b17b9fcc741678618f1f17a5d991c461daa765cd2f3f217d2f39971e572e2e607b91bcdfc8ca15529526c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/pt-BR/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/pt-BR/firefox-78.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "6fdabc52c892fe28f43d7acccc5c4edbf8bbf4e2cb9939447bac1299b78315df0f47c17c6abd1dae8508b20e2053f13ab169663b3572f13d6c5b55c91f9ef216"; + sha512 = "7260d2a9ff4fc0b29f5c72942eee47c36b4041982924ece2a32f70a5a821bbbff07ebd57a3b97c64700a6e7815e3f00f8fc521ca7f99192b25f3199089b33738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/pt-PT/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/pt-PT/firefox-78.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "4be9f310a230ff5426c73786e421bbd8ee96eb3ed15d394e7ecd8514b08d6b4edbbae259587da522c25a4f3c6eb57324672f8adc3622334c7f5c48af495254f0"; + sha512 = "47f02eb60a50799c542ec8f82dd5e43a684ca03dd8daf487d651a33c7ed78ab12be1ab910c2a658e67645b2537f6f112d9000b59377be448c066f218bc9287a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/rm/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/rm/firefox-78.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "05fe442d3ea0af4bbe1901b17521d0a1eb527eefef803d9a66fade056b988bf52a6bb2f7f32fef22a6d9bef76d66b31b690e03b14e1277627e228e0ba85260e3"; + sha512 = "dcea73109f2c6bd570729175e136856d1a8141cd3e6caa04ad5a0b94096171587980d9567181c41fcc950da92c15155ef23402ff7e97939fd7cc4d3c6d349e6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ro/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ro/firefox-78.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "b3fcabb7dcf35ca9e444a618b476862050ceff0845dfea4070793b59d347018dfdb6362fc5cb2f6a5ecb6fabcc2e55511535c018e2229a6aba4b6c0266eaf6f8"; + sha512 = "5189292876c243ef963f552123876d9a392a258efdd3704d4ac2b4da26d98e3ff5d281dd54be89ae414c8a78abf080234259045326487eabca45a645a1ba29c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ru/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ru/firefox-78.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "1e67aad86d44fdd6d7b72528b558b772868d72b9aab634224019646aadb64d23d19b7827a7b15e3e5b0e6a0247f64afecffa3ac88b171133c054b7587c2aa050"; + sha512 = "c4ced260fbae120147c18cc03be8ed6c604c5b98c4c63d3f7ba579154cbfc04003b5ff03c65617cb6a2c65a49c36c81fc1c1b2d6315e51ea368165d0c6fe971c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/si/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/si/firefox-78.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "df01e74d2c2ac38ad574e2cbbabb057c60ffcd18a9e43f8de12483e9ed256a2368005b3c02f11cf6a742ce19d46eed7083f8834c3fdae5eaf1ab5f42b2281360"; + sha512 = "84f62ba8c25c46cfde46e2dfd2ca6e9051d75ff4b930f1898da661714976103530571a39ba19f374beb4ecbcbcb30a390483d91433558e2f263d9106efaefabb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sk/firefox-78.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "d2db364b089b2786407c6606657b182980b4de9d09333fbe63f6d51bab8e99a493bcab417f06d528d4b178bf7cf5101e2903cd4c2998b264b9233db3be9e8330"; + sha512 = "9f9792fb821396d46c5ef30acd2d71ed224db8a8a533a6dc3f0afe3b8aa7c9915f425d921fc2f8adc11fa3f5d9ef2580eece36f488417cee4b4dd3988d9f7553"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sl/firefox-78.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "5d6b3e9b918ffd18533335e32f8088dddfb66ca82e98a9af8a76fd2ff23247f4c8b05cea9895d076b555f2edd2af34776ed25a0e902be9abd589fe577e7bd659"; + sha512 = "55d0c5d17f80d9a35ea5dffcc93ad6cf9af2414e8b74bb7f0681dc97b9c7292a95a9175400b1710ce5eb78e2aab6ca9a57deba96df68bc8b0949029a4fca55e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/son/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/son/firefox-78.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "ebfecd76869650105ee62325de604413a409b97fa0560d9f0e908a002a318234cff23dd857168ea0d782095fdc5db371af1382cebc49640a2554e6a602117f90"; + sha512 = "a341592537300f4aaaee8010c58143204487642bfd72fc25086aaf94bf916aeef57ac1a8cf5aa6d3456759a4a9416da6c72a6e222a1011bf3dcef3a1bacc53fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sq/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sq/firefox-78.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "c94332eaecd79c0d1bec6cb9aeb9abe78a1528d855f71028a5d0eee95c9bc30c50263bebc198b86fa583d0a86ffb72fade74afa6d2a93ebd85e04154bd94b2f2"; + sha512 = "ce6f8b75467d9a97732a9541ceae1611b37ad81c2cac1a150502e4d96b3d2f0a35e3031f534cc974a13810716e2c2f4bd30d71f84076a98c0bff85b37bcdd51a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sr/firefox-78.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "386fcd94487ee4c360e6d5bd4cd97668c68c035100140f3ce894fb33eb179617281e3af42893abb9fe830e057d8b8a987f387861fb415bfe7af5cc49a2160763"; + sha512 = "644cfbad8921ad9101eaa2eb20cc4764baecf8c2ac29e30ded8470df6b103cd39f2ac913b30a89cc92b8cd6e2a0a16a2c5dec61102a599e43675d9edf59ce2b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sv-SE/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sv-SE/firefox-78.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "d3413015adf93a6f9923b69805729e58f3826cd1db17585be10263fad78118d666e6036fb3c7e8f64057259e8f1fa93dd4fb2677e3b913bfca42b609077590d5"; + sha512 = "6b4805545d53241e6f4bd6de168fe642d502cdcb33d805f696e7622894b7e1e347870294b168f2be191b96c8d109bf567a0c102c727b0d6d399e4bf1f0e0464b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ta/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ta/firefox-78.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "fa6365f5ed4f53f12b8f7692aebae81150b4b8df6830f0f215c854b9603bfa57157f9e984201c5edf46bef8bd2d12772b5453b9b518f8cb90b3fd927d991d69b"; + sha512 = "0681cef623d3266b40cf3081c19f5fd54b0aac447684553fa9205735099bacd615d024f2205329c2c14a4f48c81cb7356039cb8bdc76c0e68b0c4c85c821f0a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/te/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/te/firefox-78.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "6eafe03b0856218a04f9fd78153552fd9b1026c2fb1b252e90decacd580b235d40cea0b54b6ba4209f9aea92c82785469cbd633e23c6ef8dfc61071f7412c491"; + sha512 = "d1b4eab69607d6ce2b94841c2320aebdfbbf2ed71d09d2d34eaeedf18828b3db6c85062f52dfd7555230d29b5431db742ed261d76c7ff61bc8e652dd9af5eae1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/th/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/th/firefox-78.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "6c18435b711a8300232eb64014305366f9eb96196e8c04cb2b30a84c8d21a738405e0c5abcbc2e2acf598d7ff6479cd170fe4b1fe9e02a1a59c0407d3d301c2a"; + sha512 = "2020ca64cc8aac6fc5cf45fb9201dfff33f29c453bd2e876456017876f7965bde5308464bf08eaafd457da2d51dbee385cdf35921ca8f92f651ed9cf3b900697"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/tl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/tl/firefox-78.0b2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "d97c291dd618fd9ee9863d021c15113355d6668904685197d355156e365aa15e8ebcc2d62959caa3e596ab6609c84a571ff1b9c2e206e763f1dc691d2c4b90ca"; + sha512 = "9cef23915220fd61dd699fae18ce7ceac585d5b704ebf8268365a36108d0e52a488a88deb49e0b942fc2cfc164d5306d1bcba9c2ebefaabcead775bde181f368"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/tr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/tr/firefox-78.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "4c253b3f65ad7a04759fcde055315fe30f0b8433e0b670ffecbd906b8ec2ce96825bfd133bf7f014f696c1805e38152b0e4159b29840b22c77dbdc92dde5ebc9"; + sha512 = "7f02a59ba18c59648c98f5965bd0e960149b2edf121ebc2590353d4aa8fc26a270ef2fb16f9a80fa69e604244d56cdaf3029c12149049aabe9796e347fcc4d77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/trs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/trs/firefox-78.0b2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "b8d6e7ecbdfbff07a08a739cafb50a26c760b0ffb77386d57ae29255c57f67fcbc25ff95d4c3d9f1592b0aa84241493edf86a834a11af3f565ba35a1a6bac21d"; + sha512 = "e1dc9905817bdff2db64f60440044204c9335c443b9db605915a4b412426ae877f5e7b2a83cb8b73ca534627d2b1b8b4b9a11306779baa8516ba06d85b3b9a18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/uk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/uk/firefox-78.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "d4d33614c0ee3382609d069327a7eb64dc00572c9150650f469389f13d6e8031e9ff92900fe1f8ff0bd6c8b0e77733d7dba1ded72bd598257c028fef218925ea"; + sha512 = "3bb99eda1b5c33418ae7267dfe65bb905c617818f405b80e775d70d6bb8a78f143843aa2256e442aa36304ae6f4284524ce4836a1c864ba06fe558c202f04258"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ur/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ur/firefox-78.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "b9efc510b1694a3aed04727484bd436d74f426d6c10ff491e770d4db38a0617a462015c5715e1d586490869f3d986b546a2f0da32e9c9bd7b9fb599804ec8b15"; + sha512 = "e1f71eb9b6b5f0dcdeedd3cca964a6110e6d9cf4e5fae815922135b3dee8bd6ce42c97b893eb922e436c5088130035793d99293ec1c5ce8c70d4ae5e0a097f7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/uz/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/uz/firefox-78.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "65b0b0daf9869d82c16956f36d470dd52f82c7521c11877420ade0726e5f859f0b5fd8a68f587ea51f668067b45b777313b96f584e8cbfb4628704bd21b8f150"; + sha512 = "39cc68ab411bbfb784ea3a70306ad2fd27cf377e796f3cf39a1f68d70363923dd1fb0cfcd39f62efa2940439969ae0467191c0c62ac68dfb5205b29760f9a923"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/vi/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/vi/firefox-78.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "4bb9160bd25f77959e9113b6fde02898193679afb2f11432271129472c8495427597c753c4ca3d7c138814278aa801957cbc73d55ab229cc05ed02a9b446b873"; + sha512 = "4ab8ee124d40ed7a26ff0cf7257c60dc8a9879c82b6b881ee0fbae1662fa8e26f672ad59993419dbe93458723c4d4b1a1dbec261ec3811c348449a1a352dd688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/xh/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/xh/firefox-78.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "0a5b9924328080838c1a2ae2a0823d0d28954a356d431fcc57c2ca387651e4bdb20673533ae098af68a93430214ff159c2d13a0180cb7862dbfa78abb2e1dd37"; + sha512 = "fea8a74c935e7213e551b1f9c2c00286eca13a2d1a987bf523ebabcd57bcc5dfdcdceb23b4d589e354f116900b8ace28e41a069fa0d8692656e70960025e39f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/zh-CN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/zh-CN/firefox-78.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "811934399498bae9a330b5a773510507fc6cd4d3d084ea9a2d866d2789576276155a8173a2e6cb4ac6c021acfb79220f64f4b484e5806a8aede252fdc726712f"; + sha512 = "a5b1dcc1fad60e62f3d7b258193f7c76a807ec3efbc766c50096649eb1e4bb523a981f4b30c9d93a1bd814dea1d99230ad3091a1f8502ac44e177073c0afcb3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/zh-TW/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/zh-TW/firefox-78.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "ddcee97acae9b4abfcb10e6ff095d9f69134f56e95ad46abd9dbba7f26f9fd0318aca470346add479ffa6899aa6a403c7a29563827935388dd92a49a9817faee"; + sha512 = "3f82220802d5fee6502464faf62bc0dd7edcddd0bb93d9e9636da70b7a5e4760d1b1928976793d984c56c6aa73cc9bb13b687590b0a85b395137fa4d7ec72d90"; } ]; } From 458b2cb7d67561c796c6f0660a97eea9b685fc65 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 4 Jun 2020 15:24:25 +0200 Subject: [PATCH 0480/3452] bison_3_5: init at 3.5.4, for ruby Ruby does not build with 3.6. To unblock staging-next, let it use the previous bison version. --- pkgs/top-level/all-packages.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 092b44bf984d..f8b7b6d4a619 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9794,6 +9794,7 @@ in inherit (callPackage ../development/interpreters/ruby { inherit (darwin) libiconv libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; + bison = bison_3_5; }) ruby_2_5 ruby_2_6 @@ -10124,6 +10125,15 @@ in bison = callPackage ../development/tools/parsing/bison { }; yacc = bison; # TODO: move to aliases.nix + # Ruby fails to build with current bison + bison_3_5 = pkgs.bison.overrideAttrs (oldAttrs: rec { + version = "3.5.4"; + src = fetchurl { + url = "mirror://gnu/${oldAttrs.pname}/${oldAttrs.pname}-${version}.tar.gz"; + sha256 = "0a2cbrqh7mgx2dwf5qm10v68iakv1i0dqh9di4x5aqxsz96ibpf0"; + }; + }); + black = with python3Packages; toPythonApplication black; blackmagic = callPackage ../development/tools/misc/blackmagic { }; From af2dd0c798101dc112108859a3c427979d4802fc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 4 Jun 2020 15:30:23 +0200 Subject: [PATCH 0481/3452] Revert "Revert "Merge pull request #78910 from serokell/libarchive-zstd"" The PR was accidentally merged into master instead of staging and thus reverted. Now, in staging, we can re-revert it. This reverts commit 4df2f78ec72f6a8d2fe286cd34eb3acdfcac81f3. --- pkgs/development/libraries/libarchive/default.nix | 4 ++-- pkgs/tools/compression/zstd/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 6 +++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 118adc61623a..d1917de37d6a 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, - acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, + acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd, # Optional but increases closure only negligibly. xarSupport ? true, @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ sharutils zlib bzip2 openssl xz lzo ] + buildInputs = [ sharutils zlib bzip2 openssl xz lzo zstd ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] ++ stdenv.lib.optional xarSupport libxml2; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index eb42fdbaff4f..f919fb92ed1d 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -51,14 +51,16 @@ stdenv.mkDerivation rec { preInstall = '' substituteInPlace ../programs/zstdgrep \ --replace ":-grep" ":-${gnugrep}/bin/grep" \ - --replace ":-zstdcat" ":-$out/bin/zstdcat" + --replace ":-zstdcat" ":-$bin/bin/zstdcat" substituteInPlace ../programs/zstdless \ - --replace "zstdcat" "$out/bin/zstdcat" + --replace "zstdcat" "$bin/bin/zstdcat" ''; # Don't duplicate the library code in runtime closures. postInstall = stdenv.lib.optionalString enableShared ''rm "$out"/lib/libzstd.a''; + outputs = [ "bin" "dev" "man" "out" ]; + meta = with stdenv.lib; { description = "Zstandard real-time compression algorithm"; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4214943ad523..662feb6d396c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7899,7 +7899,11 @@ in zssh = callPackage ../tools/networking/zssh { }; - zstd = callPackage ../tools/compression/zstd { }; + zstd = callPackage ../tools/compression/zstd { + cmake = cmake.override { + libarchive = libarchive.override { zstd = null; }; + }; + }; zsync = callPackage ../tools/compression/zsync { }; From f9af74e75a27fac3bb50a43fce0c72c9b6ac24ed Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 4 Jun 2020 17:53:31 +0200 Subject: [PATCH 0482/3452] meson: fix hash after incorrect merge --- pkgs/development/tools/build-managers/meson/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index f7468bf7f0c9..5b1266da3823 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1p4n0b6jn8pyj6rwxg48ayphji8v1482cabrwhzf2avnf92znxig"; + sha256 = "0m84zb0q67vnxmd6ldz477w6yjdnk9c44xhlwh1g1pzqx3m6wwd7"; }; postFixup = '' From 7d5751412795e3a58cad82ac945eaa30377df746 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 4 Jun 2020 17:53:31 +0200 Subject: [PATCH 0483/3452] meson: fix hash after incorrect merge --- pkgs/development/tools/build-managers/meson/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index f7468bf7f0c9..5b1266da3823 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1p4n0b6jn8pyj6rwxg48ayphji8v1482cabrwhzf2avnf92znxig"; + sha256 = "0m84zb0q67vnxmd6ldz477w6yjdnk9c44xhlwh1g1pzqx3m6wwd7"; }; postFixup = '' From b7ff7465401257e9b0814bb68937a494c58de538 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 4 Jun 2020 18:03:57 +0200 Subject: [PATCH 0484/3452] python3: now points to python38 Note this also means python3Minimal is now also Python 3.8. This reverts commit eb1369670b5a4e616ff0cf4100616479b1fa3064 and adds more. --- doc/languages-frameworks/python.section.md | 2 +- nixos/doc/manual/release-notes/rl-2009.xml | 5 +++++ pkgs/development/interpreters/python/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 838426afa04f..7da839ee4826 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -643,7 +643,7 @@ and in this case the `python38` interpreter is automatically used. Versions 2.7, 3.5, 3.6, 3.7 and 3.8 of the CPython interpreter are available as respectively `python27`, `python35`, `python36`, `python37` and `python38`. The aliases `python2` and `python3` correspond to respectively `python27` and -`python37`. The default interpreter, `python`, maps to `python2`. The PyPy +`python38`. The default interpreter, `python`, maps to `python2`. The PyPy interpreters compatible with Python 2.7 and 3 are available as `pypy27` and `pypy3`, with aliases `pypy2` mapping to `pypy27` and `pypy` mapping to `pypy2`. The Nix expressions for the interpreters can be found in diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 9ac5a347de8f..428aeec23415 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -42,6 +42,11 @@ PHP now defaults to PHP 7.4, updated from 7.3. + + + Python 3 now defaults to Python 3.8 instead of 3.7. + + Two new options, authorizedKeysCommand diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index a3ba72a27b27..6da7abc876e7 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -129,7 +129,7 @@ in { }; # Minimal versions of Python (built without optional dependencies) - python3Minimal = (python37.override { + python3Minimal = (python3.override { self = python3Minimal; pythonForBuild = pkgs.buildPackages.python3Minimal; # strip down that python version as much as possible diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 662feb6d396c..f017003a93a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9646,7 +9646,7 @@ in # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md python = python2; python2 = python27; - python3 = python37; + python3 = python38; pypy = pypy2; pypy2 = pypy27; pypy3 = pypy36; From ac0716aa6193d6ad72d255de38c9d0a6077ce8ee Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 3 Jun 2020 14:43:02 +0200 Subject: [PATCH 0485/3452] iproute: 5.6.0 -> 5.7.0 "As usual lots of small fixes, across many utilities. Several qdisc now have more parameters available. Devlink get most of the fixes." [0] File changes (additions/removals): +share/bash-completion/completions/devlink +share/man/man8/devlink-dpipe.8.gz +share/man/man8/tc-ct.8.gz [0]: https://marc.info/?l=linux-netdev&m=159115579900638 --- pkgs/os-specific/linux/iproute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 46312a637dab..3ac79464ac4b 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "14j6n1bc09xhq8lxs40vfsx8bb8lx12a07ga4rsxl8vfrqjhwnqv"; + sha256 = "088gs56iqhdlpw1iqjwrss4zxd4zbl2wl8s2implrrdajjxcfpbj"; }; preConfigure = '' From b7b7da0521bbddf5725ff6259f51845de5f03311 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 3 Jun 2020 00:22:45 -0700 Subject: [PATCH 0486/3452] python3Packages.cython: 0.29.14 -> 0.29.19 --- pkgs/development/python-modules/Cython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index f0b8a5dd560d..3d5afd52abdd 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -26,11 +26,11 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.14"; + version = "0.29.19"; src = fetchPypi { inherit pname version; - sha256 = "e4d6bb8703d0319eb04b7319b12ea41580df44fd84d83ccda13ea463c6801414"; + sha256 = "0n2j87nka8cs772qc60d0c7lrpvsw0y8p3qzvhrsi3nmq1yqmycp"; }; nativeBuildInputs = [ From d89c58a012e4a8bc2d408bbc69a8d4bb1b265c44 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 3 Jun 2020 03:07:53 +0000 Subject: [PATCH 0487/3452] perl: 5.30.2 -> 5.30.3 --- pkgs/development/interpreters/perl/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index cc43a7d2f858..9690dfac2f20 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -170,11 +170,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "1.3.2"; # Mar 21, 2020 + crossVersion = "1.3.4"; # Jun 2, 2020 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "1283crdjsyi45mgdiak4jmy907mqn09frxzxp21b18hvxmfn4smq"; + sha256 = "15wvlafhpsh9h66s3vazhx46hf8ik75473acrvf6722ijd1wpz45"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -194,23 +194,23 @@ in { perl528 = common { perl = pkgs.perl528; buildPerl = buildPackages.perl528; - version = "5.28.2"; - sha256 = "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da"; + version = "5.28.3"; + sha256 = "052if351m81yhaab429i1kv77v9b15qm0g48kr6y2yjrc7bc3jdg"; }; # Maint version perl530 = common { perl = pkgs.perl530; buildPerl = buildPackages.perl530; - version = "5.30.2"; - sha256 = "128nfdxcvxfn5kq55qcfrx2851ys8hv794dcdxbyny8rm7w7vnv6"; + version = "5.30.3"; + sha256 = "0vs0wwwlw47sswxaflkk4hw0y45cmc7arxx788kwpbminy5lrq1j"; }; # the latest Devel version perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.31.10"; - sha256 = "1gvv5zs54gzb947x7ryjkaalm9rbqf8l8hwjwdm9lbfgkpg07kny"; + version = "5.32.0-RC0"; + sha256 = "02i6n1xa4j0ksp014yy8q0j7scjcy5mr0yd4iash2ryrrfv5yw5k"; }; } From 62ee86086c611e2209e11615cfc5fa96384ef468 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Mon, 1 Jun 2020 16:53:32 -0400 Subject: [PATCH 0488/3452] libssh2: fix broken patch hash Patches from direct URLs on github are not stable (comment headers change w/ server settings), hence why we usually use `fetchpatch`. In lieu of that, vendor the unstable patch. --- .../libraries/libssh2/CVE-2019-17498.patch | 210 ++++++++++++++++++ .../development/libraries/libssh2/default.nix | 8 +- 2 files changed, 212 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/libssh2/CVE-2019-17498.patch diff --git a/pkgs/development/libraries/libssh2/CVE-2019-17498.patch b/pkgs/development/libraries/libssh2/CVE-2019-17498.patch new file mode 100644 index 000000000000..8681c3ef6091 --- /dev/null +++ b/pkgs/development/libraries/libssh2/CVE-2019-17498.patch @@ -0,0 +1,210 @@ +From b9aa7c2495694d0527e4e7fd560a3f0f18556c72 Mon Sep 17 00:00:00 2001 +From: Will Cosgrove +Date: Thu, 29 Aug 2019 15:14:19 -0700 +Subject: [PATCH 1/5] packet.c: improve parsing of packets + +file: packet.c + +notes: +Use _libssh2_get_string API in SSH_MSG_DEBUG, additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST +--- + src/packet.c | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +diff --git a/src/packet.c b/src/packet.c +index 38ab62944..ac69768cd 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -537,26 +537,26 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + case SSH_MSG_DEBUG: + if(datalen >= 2) { + int always_display = data[1]; +- ++ + if(datalen >= 6) { +- message_len = _libssh2_ntohu32(data + 2); +- +- if(message_len <= (datalen - 10)) { +- /* 6 = packet_type(1) + display(1) + message_len(4) */ +- message = (char *) data + 6; +- language_len = _libssh2_ntohu32(data + 6 + +- message_len); +- +- if(language_len <= (datalen - 10 - message_len)) +- language = (char *) data + 10 + message_len; +- } ++ struct string_buf buf; ++ buf.data = (unsigned char *)data; ++ buf.dataptr = buf.data; ++ buf.len = datalen; ++ buf.dataptr += 2; /* advance past type & always display */ ++ ++ _libssh2_get_string(&buf, &message, &message_len); ++ _libssh2_get_string(&buf, &language, &language_len); + } + + if(session->ssh_msg_debug) { +- LIBSSH2_DEBUG(session, always_display, message, +- message_len, language, language_len); ++ LIBSSH2_DEBUG(session, always_display, ++ (const char *)message, ++ message_len, (const char *)language, ++ language_len); + } + } ++ + /* + * _libssh2_debug will actually truncate this for us so + * that it's not an inordinate about of data +@@ -579,7 +579,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + uint32_t len = 0; + unsigned char want_reply = 0; + len = _libssh2_ntohu32(data + 1); +- if(datalen >= (6 + len)) { ++ if((len <= (UINT_MAX - 6) && (datalen >= (6 + len))) { + want_reply = data[5 + len]; + _libssh2_debug(session, + LIBSSH2_TRACE_CONN, + +From 8b3cf0b17c1b84a138bed9423a9e0743452b4de9 Mon Sep 17 00:00:00 2001 +From: Will Cosgrove +Date: Thu, 29 Aug 2019 15:15:33 -0700 +Subject: [PATCH 2/5] stray whitespace + +--- + src/packet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/packet.c b/src/packet.c +index ac69768cd..8908b2c5a 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -537,7 +537,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + case SSH_MSG_DEBUG: + if(datalen >= 2) { + int always_display = data[1]; +- ++ + if(datalen >= 6) { + struct string_buf buf; + buf.data = (unsigned char *)data; + +From 1c6fa92b77e34d089493fe6d3e2c6c8775858b94 Mon Sep 17 00:00:00 2001 +From: Will Cosgrove +Date: Thu, 29 Aug 2019 15:24:22 -0700 +Subject: [PATCH 3/5] fixed type issue, updated SSH_MSG_DISCONNECT + +SSH_MSG_DISCONNECT now also uses _libssh2_get API. +--- + src/packet.c | 40 +++++++++++++++------------------------- + 1 file changed, 15 insertions(+), 25 deletions(-) + +diff --git a/src/packet.c b/src/packet.c +index 8908b2c5a..97f0cdd4b 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + size_t datalen, int macstate) + { + int rc = 0; +- char *message = NULL; +- char *language = NULL; ++ unsigned char *message = NULL; ++ unsigned char *language = NULL; + size_t message_len = 0; + size_t language_len = 0; + LIBSSH2_CHANNEL *channelp = NULL; +@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + + case SSH_MSG_DISCONNECT: + if(datalen >= 5) { +- size_t reason = _libssh2_ntohu32(data + 1); ++ uint32_t reason = 0; ++ struct string_buf buf; ++ buf.data = (unsigned char *)data; ++ buf.dataptr = buf.data; ++ buf.len = datalen; ++ buf.dataptr++; /* advance past type */ + +- if(datalen >= 9) { +- message_len = _libssh2_ntohu32(data + 5); ++ _libssh2_get_u32(&buf, &reason); ++ _libssh2_get_string(&buf, &message, &message_len); ++ _libssh2_get_string(&buf, &language, &language_len); + +- if(message_len < datalen-13) { +- /* 9 = packet_type(1) + reason(4) + message_len(4) */ +- message = (char *) data + 9; +- +- language_len = +- _libssh2_ntohu32(data + 9 + message_len); +- language = (char *) data + 9 + message_len + 4; +- +- if(language_len > (datalen-13-message_len)) { +- /* bad input, clear info */ +- language = message = NULL; +- language_len = message_len = 0; +- } +- } +- else +- /* bad size, clear it */ +- message_len = 0; +- } + if(session->ssh_msg_disconnect) { +- LIBSSH2_DISCONNECT(session, reason, message, +- message_len, language, language_len); ++ LIBSSH2_DISCONNECT(session, reason, (const char *)message, ++ message_len, (const char *)language, ++ language_len); + } ++ + _libssh2_debug(session, LIBSSH2_TRACE_TRANS, + "Disconnect(%d): %s(%s)", reason, + message, language); + +From 77616117cc9dbbdd0fe1157098435bff73a83a0f Mon Sep 17 00:00:00 2001 +From: Will Cosgrove +Date: Thu, 29 Aug 2019 15:26:32 -0700 +Subject: [PATCH 4/5] fixed stray ( + +bad paste +--- + src/packet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/packet.c b/src/packet.c +index 97f0cdd4b..bd4c39e46 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -569,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + uint32_t len = 0; + unsigned char want_reply = 0; + len = _libssh2_ntohu32(data + 1); +- if((len <= (UINT_MAX - 6) && (datalen >= (6 + len))) { ++ if(len <= (UINT_MAX - 6) && datalen >= (6 + len)) { + want_reply = data[5 + len]; + _libssh2_debug(session, + LIBSSH2_TRACE_CONN, + +From 436c45dc143cadc8c59afac6c4255be332856581 Mon Sep 17 00:00:00 2001 +From: Will Cosgrove +Date: Thu, 29 Aug 2019 15:29:00 -0700 +Subject: [PATCH 5/5] added additional parentheses for clarity + +--- + src/packet.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/packet.c b/src/packet.c +index bd4c39e46..2e01bfc5d 100644 +--- a/src/packet.c ++++ b/src/packet.c +@@ -569,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, + uint32_t len = 0; + unsigned char want_reply = 0; + len = _libssh2_ntohu32(data + 1); +- if(len <= (UINT_MAX - 6) && datalen >= (6 + len)) { ++ if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) { + want_reply = data[5 + len]; + _libssh2_debug(session, + LIBSSH2_TRACE_CONN, diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 5cc0232e17de..8ce9c814df05 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -15,12 +15,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; patches = [ - # not able to use fetchpatch here: infinite recursion - (fetchurl { - name = "CVE-2019-17498.patch"; - url = "https://github.com/libssh2/libssh2/pull/402.patch"; - sha256 = "1n9s2mcz5dkw0xpm3c5x4hzj8bar4i6z0pr1rmqjplhfg888vdvc"; - }) + # Not able to use fetchpatch here: infinite recursion + ./CVE-2019-17498.patch ]; meta = with stdenv.lib; { From 683004d092e6c4b5dc68d40684e8ecf65c87c1fc Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 31 May 2020 00:29:33 +1000 Subject: [PATCH 0489/3452] libgpgerror: 1.36 -> 1.38 https://github.com/gpg/libgpg-error/blob/libgpg-error-1.38/NEWS --- .../libraries/libgpg-error/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index e170e4931b83..1e49a72096a3 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchurl, gettext, fetchpatch +{ stdenv, lib, buildPackages, fetchurl, gettext , genPosixLockObjOnly ? false }: let genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { @@ -17,25 +17,14 @@ }; in stdenv.mkDerivation (rec { pname = "libgpg-error"; - version = "1.36"; + version = "1.38"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds"; + sha256 = "00px79xzyc5lj8aig7i4fhk29h1lkqp4840wjfgi9mv9m9sq566q"; }; - # Remove gawk buildfix on > 1.36 - patches = [ - (fetchpatch { - url = "https://dev.gnupg.org/rE7865041c77f4f7005282f10f9b6666b19072fbdf?diff=1"; - sha256 = "0hs4rpwqq2afpsbqliq451jjaysq2iyzxvd9sx3992b4vnllgqqq"; - }) - ]; - postPatch = '' - # Remove on > 1.36 release: gawk upgrade fix didn't include Makefile regeneration - sed 's/-v namespace=errnos_/-v pkg_namespace=errnos_/' -i src/Makefile.in - sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h From 3d2010311fd2280728dd404d4157086222a8c57e Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 25 May 2020 15:44:24 +0100 Subject: [PATCH 0490/3452] gdb: 9.1 -> 9.2 See https://lists.gnu.org/archive/html/info-gnu/2020-05/msg00008.html for release information --- pkgs/development/tools/misc/gdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index f6a001e488c3..7702df423bb5 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -18,7 +18,7 @@ let basename = "gdb-${version}"; - version = "9.1"; + version = "9.2"; in assert pythonSupport -> python3 != null; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "0dqp1p7w836iwijg1zb4a784n0j4pyjiw5v6h8fg5lpx6b40x7k9"; + sha256 = "0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n"; }; postPatch = if stdenv.isDarwin then '' From 55258867b922839d8349a2483ceeecf81703907c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 22 May 2020 23:58:55 +0000 Subject: [PATCH 0491/3452] pcre2: 10.34 -> 10.35 --- pkgs/development/libraries/pcre2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 6c5d526d523b..d39b91355b98 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "pcre2"; - version = "10.34"; + version = "10.35"; src = fetchurl { url = "https://ftp.pcre.org/pub/pcre/${pname}-${version}.tar.bz2"; - sha256 = "1jlqnzcz2yi70dm40wyfa9w8is9z2kh4dl8zjnv3vqd9mgzp7i3l"; + sha256 = "04s6kmk9qdd4rjz477h547j4bx7hfz0yalpvrm381rqc5ghaijww"; }; configureFlags = [ From 0f2e569505597fc700049d06eeb54b3cf7656582 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 22 May 2020 19:35:19 -0700 Subject: [PATCH 0492/3452] linux: CONFIG_MOUSE_ELAN_I2C_SMBUS=y Signed-off-by: Anders Kaseorg --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d239455ad344..148a2c83c8ad 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -720,6 +720,7 @@ let PSI = whenAtLeast "4.20" yes; MODVERSIONS = whenOlder "4.9" yes; + MOUSE_ELAN_I2C_SMBUS = yes; MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension MTRR_SANITIZER = yes; NET_FC = yes; # Fibre Channel driver support From e761cfe50ac6a9204af703e2bb91e89ba521db02 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Tue, 19 May 2020 01:12:05 +0200 Subject: [PATCH 0493/3452] libexif: 0.6.21 -> 0.6.22 Also: - build from git - enable cross compilation --- .../development/libraries/libexif/default.nix | 47 +++++-------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 090c6a2fff34..fd2ed39e34a4 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -1,45 +1,24 @@ -{ stdenv, fetchurl, fetchpatch, gettext }: +{ stdenv, fetchFromGitHub, autoreconfHook, gettext }: stdenv.mkDerivation rec { - name = "libexif-0.6.21"; + pname = "libexif"; + version = "0.6.22"; - src = fetchurl { - url = "mirror://sourceforge/libexif/${name}.tar.bz2"; - sha256 = "06nlsibr3ylfwp28w8f5466l6drgrnydgxrm4jmxzrmk5svaxk8n"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "${pname}-${builtins.replaceStrings ["."] ["_"] version}-release"; + sha256 = "0mzndakdi816zcs13z7yzp7hj031p2dcyfq2p391r63d9z21jmy1"; }; - patches = [ - (fetchpatch { - name = "CVE-2017-7544.patch"; - url = "https://github.com/libexif/libexif/commit/c39acd1692023b26290778a02a9232c873f9d71a.patch"; - sha256 = "0xgx6ly2i4q05shb61mfx6njwf1yp347jkznm0ka4m85i41xm6sd"; - }) - (fetchpatch { - name = "CVE-2018-20030-1.patch"; - url = "https://github.com/libexif/libexif/commit/5d28011c40ec86cf52cffad541093d37c263898a.patch"; - sha256 = "1wv8s962wmbn2m2xypgirf12g6msrbplpsmd5bh86irfwhkcppj3"; - }) - (fetchpatch { - name = "CVE-2018-20030-2.patch"; - url = "https://github.com/libexif/libexif/commit/6aa11df549114ebda520dde4cdaea2f9357b2c89.patch"; - sha256 = "01aqvz63glwq6wg0wr7ykqqghb4abgq77ghvhizbzadg1k4h7drx"; - excludes = [ "NEWS" ]; - }) - (fetchpatch { - name = "CVE-2019-9278.patch"; - url = "https://github.com/libexif/libexif/commit/75aa73267fdb1e0ebfbc00369e7312bac43d0566.patch"; - sha256 = "10ikg33mips5zq9as7l9xqnyzbg1wwr4sw17517nzf4hafjpasrj"; - }) - ]; + nativeBuildInputs = [ autoreconfHook gettext ]; - buildInputs = [ gettext ]; - - meta = { + meta = with stdenv.lib; { homepage = "https://libexif.github.io/"; description = "A library to read and manipulate EXIF data in digital photographs"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.erictapen ]; + license = licenses.lgpl21; + platforms = platforms.unix; + maintainers = with maintainers; [ erictapen ]; }; } From d1dcd310ddaf4dfcd192fb09e97c441836082cd8 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 14 May 2020 13:50:15 +0200 Subject: [PATCH 0494/3452] jbig2dec: 0.17 -> 0.18 Fixes https://nvd.nist.gov/vuln/detail/CVE-2020-12268 autoreconfHook was added because the build was failing on missing install-sh. --- pkgs/development/libraries/jbig2dec/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index 8cc2ce008716..22d38a080cab 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, python3, autoconf }: +{ stdenv, fetchurl, python3, autoreconfHook }: stdenv.mkDerivation rec { - name = "jbig2dec-0.17"; + pname = "jbig2dec"; + version = "0.18"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs950/${name}.tar.gz"; - sha256 = "0wpvslmwazia3z8gyk343kbq6yj47pxr4x5yjvx332v309qssazp"; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/${pname}-${version}.tar.gz"; + sha256 = "0pigfw2v0ppvr0lbysm69gx0zsa5q2q92yrb8af2j3im6x97f6cy"; }; postPatch = '' patchShebangs test_jbig2dec.py ''; - buildInputs = [ autoconf ]; + buildInputs = [ autoreconfHook ]; checkInputs = [ python3 ]; doCheck = true; From 1c7d22e663ebbf76bf2a939994317a43dceb4c3a Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 14 May 2020 13:51:31 +0200 Subject: [PATCH 0495/3452] ghostscript: 9.50 -> 9.52 https://www.ghostscript.com/doc/9.51/News.htm https://www.ghostscript.com/doc/9.52/News.htm --- ...2364-Fix-missing-echogs-dependencies.patch | 105 +++++++----------- pkgs/misc/ghostscript/default.nix | 9 +- 2 files changed, 41 insertions(+), 73 deletions(-) diff --git a/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch b/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch index c914634f579c..dd31260302c6 100644 --- a/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch +++ b/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch @@ -1,18 +1,5 @@ -From 9f56e78d111d726ca95a59b2d64e5c3298451505 Mon Sep 17 00:00:00 2001 -From: Chris Liddell -Date: Mon, 27 Apr 2020 11:04:57 +0100 -Subject: [PATCH] Bug 702364: Fix missing echogs dependencies - -Rebased version of http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c -to fix parallel build ---- - contrib/contrib.mak | 281 ++++++++++++++++++++++---------------------- - 1 file changed, 143 insertions(+), 138 deletions(-) - -diff --git a/contrib/contrib.mak b/contrib/contrib.mak -index 5411ae902..7dd9822a9 100644 ---- a/contrib/contrib.mak -+++ b/contrib/contrib.mak +--- a/contrib/contrib.mak 2020-03-19 09:21:42.000000000 +0100 ++++ b/contrib/contrib.mak 2020-05-14 13:41:03.202258445 +0200 @@ -22,6 +22,10 @@ CONTRIB_MAK=$(CONTRIBDIR)$(D)contrib.mak $(TOP_MAKEFILES) CONTRIBSRC=$(CONTRIBDIR)$(D) @@ -24,7 +11,7 @@ index 5411ae902..7dd9822a9 100644 ###### --------------------------- Catalog -------------------------- ###### # The following drivers are user-contributed, and maintained (if at all) by -@@ -161,19 +165,19 @@ $(DEVOBJ)gdevbjca.$(OBJ) : $(CONTRIBSRC)gdevbjca.c $(PDEVH) $(bjc_h) \ +@@ -185,19 +189,19 @@ $(DEVCC) $(DEVO_)gdevbjca.$(OBJ) $(C_) $(CONTRIBSRC)gdevbjca.c $(DD)bjcmono.dev : $(bjc_) $(DD)page.dev \ @@ -48,7 +35,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)bjccolor $(bjc_) -@@ -184,25 +188,25 @@ cdeskjet8_=$(DEVOBJ)gdevcd8.$(OBJ) $(HPPCL) +@@ -208,25 +212,25 @@ # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) # Printer: HP 670 $(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev \ @@ -78,7 +65,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_) $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\ -@@ -220,7 +224,8 @@ $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\ +@@ -244,7 +248,8 @@ # Author: Matthew Gelhaus (mgelhaus@proaxis.com) # Printer: HP 880c @@ -88,7 +75,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV2) $(DD)cdj880 $(cdeskjet8_) -@@ -231,7 +236,7 @@ cdeskjet9_=$(DEVOBJ)gdevdj9.$(OBJ) $(HPPCL) +@@ -255,7 +260,7 @@ # Author: Rene Harsch (rene@harsch.net) # Printer: HP 970Cxi $(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev \ @@ -97,7 +84,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV2) $(DD)cdj970 $(cdeskjet9_) $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h)\ -@@ -244,7 +249,7 @@ $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h +@@ -268,7 +273,7 @@ ### NOTE: Same as chp2200 (some PJL and CRD changes). $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \ @@ -106,7 +93,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV2) $(DD)cdnj500 $(cdeskjet8_) -@@ -253,7 +258,7 @@ $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \ +@@ -277,7 +282,7 @@ ### NOTE: Depends on the presence of the cdj850 section. $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \ @@ -115,7 +102,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV2) $(DD)chp2200 $(cdeskjet8_) -@@ -264,11 +269,11 @@ $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \ +@@ -288,11 +293,11 @@ GDIMONO=$(DEVOBJ)gdevgdi.$(OBJ) $(HPPCL) $(DD)gdi.dev : $(GDIMONO) $(DD)page.dev \ @@ -129,7 +116,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)samsunggdi $(GDIMONO) $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \ -@@ -282,17 +287,17 @@ $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \ +@@ -306,17 +311,17 @@ hl1250_=$(DEVOBJ)gdevhl12.$(OBJ) $(HPDLJM) $(DD)hl1250.dev : $(hl1250_) $(DD)page.dev \ @@ -150,7 +137,7 @@ index 5411ae902..7dd9822a9 100644 $(DEVCC) $(DEVO_)gdevhl12.$(OBJ) $(C_) $(CONTRIBSRC)gdevhl12.c -@@ -303,37 +308,37 @@ ln03_=$(DEVOBJ)gdevln03.$(OBJ) +@@ -327,37 +332,37 @@ # Author: Ulrich Mueller (ulm@vsnhd1.cern.ch) # Printer: DEC LN03 $(DD)ln03.dev : $(ln03_) $(DD)page.dev \ @@ -194,7 +181,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)la75plus $(ln03_) $(DEVOBJ)gdevln03.$(OBJ) : $(CONTRIBSRC)gdevln03.c $(PDEVH) \ -@@ -356,27 +361,27 @@ $(DEVOBJ)gdevescv.$(OBJ) : $(ESCV_SRC)gdevescv.c $(ESCV_SRC)gdevescv.h $(PDEVH) +@@ -380,233 +385,233 @@ $(DEVCC) -DA4 $(DEVO_)gdevescv.$(OBJ) $(C_) $(escv_opts) $(ESCV_SRC)gdevescv.c $(DD)alc1900.dev : $(escv_) $(DD)page.dev \ @@ -228,7 +215,8 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)alc8600 $(escv_) $(DD)alc9100.dev : $(escv_) $(DD)page.dev \ -@@ -384,11 +389,11 @@ $(DD)alc9100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) $(SETPDEV) $(DD)alc9100 $(escv_) $(DD)lp3000c.dev : $(escv_) $(DD)page.dev \ @@ -242,7 +230,8 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)lp8000c $(escv_) $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \ -@@ -396,15 +401,15 @@ $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) $(SETPDEV) $(DD)lp8200c $(escv_) $(DD)lp8300c.dev : $(escv_) $(DD)page.dev \ @@ -261,7 +250,8 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)lp8800c $(escv_) $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \ -@@ -412,177 +417,177 @@ $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) $(SETPDEV) $(DD)lp9000c $(escv_) $(DD)lp9200c.dev : $(escv_) $(DD)page.dev \ @@ -481,7 +471,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)lex2050 $(lex2050_) $(DEVOBJ)gdevlx7.$(OBJ) : $(CONTRIBSRC)gdevlx7.c $(PDEVH) \ -@@ -599,7 +604,7 @@ $(DEVOBJ)gdevlx32.$(OBJ) : $(CONTRIBSRC)gdevlx32.c $(PDEVH) $(gsparam_h) \ +@@ -623,7 +628,7 @@ $(DEVCC) $(DEVO_)gdevlx32.$(OBJ) $(C_) $(CONTRIBSRC)gdevlx32.c $(DD)lxm3200.dev : $(lxm3200_) $(DD)page.dev \ @@ -490,7 +480,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)lxm3200 $(lxm3200_) -@@ -625,13 +630,13 @@ $(DEVOBJ)gdevlips.$(OBJ) : $(GX) $(LIPS_SRC)gdevlips.c $(std_h) \ +@@ -649,13 +654,13 @@ $(DEVCC) $(DEVO_)gdevlips.$(OBJ) $(LIPS_OPT) $(C_) $(LIPS_SRC)gdevlips.c $(DD)lips4.dev : $(lipsr_) $(DD)page.dev \ @@ -506,7 +496,7 @@ index 5411ae902..7dd9822a9 100644 $(SETDEV) $(DD)lips4v $(lipsv_) $(ADDMOD) $(DD)lips4v -include $(GLD)vector -@@ -644,11 +649,11 @@ $(DEVOBJ)gdevl4v.$(OBJ) : $(LIPS_SRC)gdevl4v.c $(LIPS_SRC)gdevlips.h $(GDEV)\ +@@ -668,11 +673,11 @@ ### --------------- Some extra devices: lips2p, bjc880j ---------------- ### $(DD)lips2p.dev : $(lipsr_) $(DD)page.dev \ @@ -520,7 +510,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)bjc880j $(lipsr_) -@@ -657,15 +662,15 @@ $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \ +@@ -681,15 +686,15 @@ md2k_=$(DEVOBJ)gdevmd2k.$(OBJ) $(DD)md2k.dev : $(md2k_) $(DD)page.dev \ @@ -539,7 +529,7 @@ index 5411ae902..7dd9822a9 100644 $(DEVCC) $(DEVO_)gdevmd2k.$(OBJ) $(C_) $(CONTRIBSRC)gdevmd2k.c -@@ -673,7 +678,7 @@ $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \ +@@ -697,7 +702,7 @@ oki4w_=$(DEVOBJ)gdevop4w.$(OBJ) $(DD)oki4w.dev : $(oki4w_) $(DD)page.dev \ @@ -548,7 +538,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)oki4w $(oki4w_) # Author: Ivan Schreter (ivan@shadow.sk) -@@ -696,11 +701,11 @@ $(DEVOBJ)gdevopvp.$(OBJ) : $(OPVP_SRC)gdevopvp.c $(OPVP_SRC)opvp_common.h\ +@@ -720,11 +725,11 @@ $(DEVCC) $(DEVO_)gdevopvp.$(OBJ) $(OPVP_OPT) $(C_) $(OPVP_SRC)gdevopvp.c $(DD)opvp.dev : $(opvp_) $(DD)page.dev \ @@ -562,7 +552,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)oprp $(opvp_) -@@ -877,78 +882,78 @@ $(DEVOBJ)pclcomp.$(OBJ) : $(pcl3_src)pclcomp.c $(pcl3_src)pclgen.h \ +@@ -901,78 +906,78 @@ # The generic pcl3 device with selectable subdevices $(DD)pcl3.dev : $(pcl3_) $(DD)page.dev \ @@ -665,7 +655,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)hpdj1120c $(pcl3_) #------------------------------------------------------------------------------ -@@ -985,7 +990,7 @@ pcl3-install: +@@ -1009,7 +1014,7 @@ xes_=$(DEVOBJ)gdevxes.$(OBJ) $(DD)xes.dev : $(xes_) $(DD)page.dev \ @@ -674,7 +664,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)xes $(xes_) # Author: Peter Flass (flass@lbdrscs.bitnet) -@@ -1005,16 +1010,16 @@ JAPSRC=$(JAPDIR)$(D) +@@ -1029,16 +1034,16 @@ pr201_=$(DEVOBJ)gdevp201.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) @@ -695,7 +685,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)pr1000_4 $(pr201_) $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \ -@@ -1025,7 +1030,7 @@ $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \ +@@ -1049,7 +1054,7 @@ jj100_=$(DEVOBJ)gdevj100.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) @@ -704,7 +694,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)jj100 $(jj100_) $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \ -@@ -1037,11 +1042,11 @@ $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \ +@@ -1061,11 +1066,11 @@ bj10v_=$(DEVOBJ)gdev10v.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) $(DD)bj10v.dev : $(bj10v_) \ @@ -718,7 +708,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)bj10vh $(bj10v_) # Uncomment the following line if you are using MS-DOS on PC9801 series. -@@ -1056,7 +1061,7 @@ $(DEVOBJ)gdev10v.$(OBJ) : $(JAPSRC)gdev10v.c $(PDEVH) \ +@@ -1080,7 +1085,7 @@ dmprt_=$(DEVOBJ)gdevdmpr.$(OBJ) $(DEVOBJ)dviprlib.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) $(DD)dmprt.dev : $(dmprt_) $(DD)page.dev \ @@ -727,7 +717,7 @@ index 5411ae902..7dd9822a9 100644 $(SETDEV) $(DD)dmprt $(dmprt_) $(ADDMOD) $(DD)dmprt -ps dmp_init -@@ -1086,19 +1091,19 @@ $(DEVOBJ)gdevmjc.$(OBJ) : $(JAPSRC)gdevmjc.c $(JAPSRC)gdevmjc.h $(PDEVH) $(gdevp +@@ -1110,19 +1115,19 @@ $(DEVCC) -DA4 $(DEVO_)gdevmjc.$(OBJ) $(C_) $(JAPSRC)gdevmjc.c $(DD)mj700v2c.dev : $(mj700v2c_) $(DD)page.dev \ @@ -751,7 +741,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)mj8000c $(mj700v2c_) ### ----------------- The Fujitsu FMPR printer device ----------------- ### -@@ -1106,7 +1111,7 @@ $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \ +@@ -1130,7 +1135,7 @@ fmpr_=$(DEVOBJ)gdevfmpr.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) $(DD)fmpr.dev : $(fmpr_) $(DD)page.dev \ @@ -760,7 +750,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)fmpr $(fmpr_) $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \ -@@ -1118,7 +1123,7 @@ $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \ +@@ -1142,7 +1147,7 @@ fmlbp_=$(DEVOBJ)gdevfmlbp.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) $(DD)fmlbp.dev : $(fmlbp_) $(DD)page.dev \ @@ -769,7 +759,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)fmlbp $(fmlbp_) $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \ -@@ -1135,7 +1140,7 @@ $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \ +@@ -1159,7 +1164,7 @@ ml6_=$(DEVOBJ)gdevml6.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) $(DD)ml600.dev : $(ml6_) $(DD)page.dev \ @@ -778,7 +768,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)ml600 $(ml6_) $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \ -@@ -1148,11 +1153,11 @@ $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \ +@@ -1172,11 +1177,11 @@ lbp3x0_=$(DEVOBJ)gdevlbp3.$(OBJ) $(DD)lbp310.dev :$(lbp3x0_) $(DD)page.dev \ @@ -792,7 +782,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)lbp320 $(lbp3x0_) $(DEVOBJ)gdevlbp3.$(OBJ) : $(JAPSRC)gdevlbp3.c $(PDEVH) -@@ -1167,7 +1172,7 @@ $(DEVOBJ)gdevnpdl.$(OBJ) : $(JAPSRC)gdevnpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ +@@ -1191,7 +1196,7 @@ $(DEVCC) -DA4 $(DEVO_)gdevnpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevnpdl.c $(DD)npdl.dev : $(npdl_) $(DD)page.dev \ @@ -801,7 +791,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)npdl $(npdl_) ### ------- EPSON ESC/Page printer device ----------------- ### -@@ -1179,11 +1184,11 @@ $(DEVOBJ)gdevespg.$(OBJ) : $(JAPSRC)gdevespg.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ +@@ -1203,11 +1208,11 @@ $(DEVCC) -DA4 $(DEVO_)gdevespg.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevespg.c $(DD)escpage.dev : $(escpage_) $(DD)page.dev \ @@ -815,7 +805,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)lp2000 $(escpage_) ### --- The RICOH RPDL language printer device ------ ### -@@ -1194,7 +1199,7 @@ $(DEVOBJ)gdevrpdl.$(OBJ) : $(JAPSRC)gdevrpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ +@@ -1218,7 +1223,7 @@ $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevrpdl.c $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ @@ -824,21 +814,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)rpdl $(rpdl_) ### ---------- RICOH RPDL IV(600dpi) printer devices ---------- ### -@@ -1204,11 +1209,11 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ - # $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(C_) $(JAPSRC)gdevrpdl.c - # - #$(DD)nx100f.dev : $(rpdl_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - # $(SETPDEV2) $(DD)nx100f $(rpdl_) - # - #$(DD)nx100v.dev : $(rpdl_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - # $(SETPDEV2) $(DD)nx100v $(rpdl_) - - ### ------------ The ALPS Micro Dry printer devices ------------ ### -@@ -1216,15 +1221,15 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ +@@ -1240,15 +1245,15 @@ alps_=$(DEVOBJ)gdevalps.$(OBJ) $(DD)md50Mono.dev : $(alps_) $(DD)page.dev \ @@ -857,6 +833,3 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)md1xMono $(alps_) $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ --- -2.26.2 - diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 7f6766cf4624..a10595591875 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -10,8 +10,8 @@ assert cupsSupport -> cups != null; let version = "9.${ver_min}"; - ver_min = "50"; - sha512 = "3p46kzn6kh7z4qqnqydmmvdlgzy5730z3yyvyxv6i4yb22mgihzrwqmhmvfn3b7lypwf6fdkkndarzv7ly3zndqpyvg89x436sms7iw"; + ver_min = "52"; + sha512 = "1ksm3v4nw8acc4j817n44l1c65ijk0mr3mp4kryy17jz41bmzzql5d8vr40h59n9dmf8b2wmnbq45bj3an1zrpfagavlf0i9s436jjc"; fonts = stdenv.mkDerivation { name = "ghostscript-fonts"; @@ -47,11 +47,6 @@ stdenv.mkDerivation rec { patches = [ ./urw-font-files.patch ./doc-no-ref.diff - (fetchpatch { - name = "CVE-2019-14869.patch"; - url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=485904772c5f0aa1140032746e5a0abfc40f4cef"; - sha256 = "0z5gnvgpp0dlzgvpw9a1yan7qyycv3mf88l93fvb1kyay893rshp"; - }) # rebased version of upstream http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c, # Remove on update to version > 9.52 ./0001-Bug-702364-Fix-missing-echogs-dependencies.patch From d2d070015b6daefc7dd5428b88cbfdca5de8d562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Sat, 9 May 2020 22:50:51 +0200 Subject: [PATCH 0496/3452] python: coverage: 4.5.4 -> 5.1 --- pkgs/development/python-modules/coverage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 04c469204d78..a22009ac9db1 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "coverage"; - version = "4.5.4"; + version = "5.1"; src = fetchPypi { inherit pname version; - sha256 = "e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c"; + sha256 = "0ll0hr8g3szbxa4al6khhzi6l92a3vwyldj0085whl44s55gq2zr"; }; # No tests in archive From bcf03e8cd2d1fb3a7d1dbbfee960dd47b36fc7bb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 4 Jun 2020 20:36:31 +0200 Subject: [PATCH 0497/3452] Revert "cpython: Optimize dynamic symbol tables, for a 6% speedup." ofborg does not like fetching patches when the derivation is used during bootstrapping. This reverts commit 480c8d199166b2f8cd20e6e245d8a019329ec466. --- .../python/cpython/2.7/default.nix | 7 ------ .../interpreters/python/cpython/default.nix | 25 ------------------- 2 files changed, 32 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 0e9a790237fe..db86b67835e3 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -100,13 +100,6 @@ let # libuuid, slowing down program startup a lot). ./no-ldconfig.patch - # Optimize symbol tables for the sake of dynamic linking. - # Significant for Python because of extension modules. - (fetchpatch { - url = "https://salsa.debian.org/cpython-team/python3/-/raw/27103a32e/debian/patches/link-opt.diff"; - sha256 = "0vp36276ndbrwr7882vg7vjd61c8mv7bqgal6bbh2fimp6zlkdhv"; - }) - ] ++ optionals stdenv.hostPlatform.isCygwin [ ./2.5.2-ctypes-util-find_library.patch ./2.5.2-tkinter-x11.patch diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 34ffc9b32d09..9f0ac8d69728 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -99,31 +99,6 @@ in with passthru; stdenv.mkDerivation { # (since it will do a futile invocation of gcc (!) to find # libuuid, slowing down program startup a lot). (./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch") - ] ++ optionals stdenv.isLinux [ - # Optimize symbol tables for the sake of dynamic linking. - # Significant for Python because of extension modules. - ( - if pythonAtLeast "3.8" then - fetchpatch { - url = "https://salsa.debian.org/cpython-team/python3/-/raw/3.8.3rc1-1/debian/patches/link-opt.diff"; - sha256 = "0va85318nahnqgydwjs7723h8gx41inbdawdy6v4hiykzgc8s7vs"; - } - else if isPy37 then - fetchurl { - url = "https://salsa.debian.org/cpython-team/python3/-/raw/3.7.6-1/debian/patches/link-opt.diff"; - sha256 = "1aqvsc0p3sxnfsi8jz7537wl6v95v26ba4nflwvmn5lxlc3y3g13"; - } - else if isPy36 then - fetchpatch { - url = "https://salsa.debian.org/cpython-team/python3/-/raw/3.6.8-1/debian/patches/link-opt.diff"; - sha256 = "1nhdrgla75ily9gk7xx0crxa7ynqzks0djxk36sa3lgg5w8vjvyr"; - } - else - fetchpatch { - url = "https://salsa.debian.org/cpython-team/python3/-/raw/27103a32e/debian/patches/link-opt.diff"; - sha256 = "0vp36276ndbrwr7882vg7vjd61c8mv7bqgal6bbh2fimp6zlkdhv"; - } - ) ] ++ optionals (isPy35 || isPy36) [ # Determinism: Write null timestamps when compiling python files. ./3.5/force_bytecode_determinism.patch From b51258e72138ff216da19af69441dd14e834ed9e Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Thu, 4 Jun 2020 20:51:34 +0200 Subject: [PATCH 0498/3452] xandikos: 0.2.1 -> 0.2.2 --- pkgs/servers/xandikos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index 9f3cc1a7b5b4..f10c5dc1d1fe 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "xandikos"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "jelmer"; repo = "xandikos"; rev = "v${version}"; - sha256 = "0bcihkfi75wg0s2an2hysrcrg6pbqqclia53l0vhkzg9b5b8cga1"; + sha256 = "1b75r3ipjmk48nvc99zib8gc8xpsb3m0ssg7k0am3zmryi7i19h7"; }; propagatedBuildInputs = with python3Packages; [ From a337c44db65bdb7838bf1b1875631879b3a820c9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 4 Jun 2020 18:37:59 +0200 Subject: [PATCH 0499/3452] python3Minimal: disable optimizations No point for the bootstrapping. --- pkgs/development/interpreters/python/cpython/default.nix | 4 +++- pkgs/development/interpreters/python/default.nix | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 9f0ac8d69728..8886b60d39e4 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -31,6 +31,7 @@ , stripBytecode ? false , includeSiteCustomize ? true , static ? false +, enableOptimizations ? true }: assert x11Support -> tcl != null @@ -151,11 +152,12 @@ in with passthru; stdenv.mkDerivation { PYTHONHASHSEED=0; configureFlags = [ - "--enable-optimizations" "--enable-shared" "--without-ensurepip" "--with-system-expat" "--with-system-ffi" + ] ++ optionals enableOptimizations [ + "--enable-optimizations" ] ++ optionals (pythonOlder "3.7") [ # This is unconditionally true starting in CPython 3.7. "--with-threads" diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 6da7abc876e7..a4bf8599aac6 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -146,6 +146,7 @@ in { rebuildBytecode = false; stripBytecode = true; includeSiteCustomize = false; + enableOptimizations = false; }).overrideAttrs(old: { pname = "python3-minimal"; meta = old.meta // { From 8589af0a558b1e0eb030316260d9a46fa3cd0de9 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sun, 10 May 2020 12:00:00 +0000 Subject: [PATCH 0500/3452] python3Packages.matrix-nio: use matrix-nio as pname fixes the confusion of https://repology.org/project/python:nio/versions and anyway nio just means that no io is performed directly, so the matrix part of the name is important. --- pkgs/development/python-modules/matrix-nio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index ff4f6198aa5e..e8849cfecf08 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -19,7 +19,7 @@ }: buildPythonPackage rec { - pname = "nio"; + pname = "matrix-nio"; version = "0.10.0"; src = fetchFromGitHub { From bfed70b3f1e1961a64300ebc345284be6fa2deec Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sun, 10 May 2020 12:00:00 +0000 Subject: [PATCH 0501/3452] python3Packages.matrix-nio: 0.10.0 -> 0.11.2 changelog: https://github.com/poljar/matrix-nio/blob/master/CHANGELOG.md --- pkgs/development/python-modules/matrix-nio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index e8849cfecf08..1e59dcbf49bc 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.10.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "04ryf9lrm0820hqij46hav6mgplabnyl9dfj46iwvxasn06fh2j8"; + sha256 = "0j39waql69rn96q4qc1df4w0z6zz48gkr2m924j3ba7v7pj6p7w4"; }; nativeBuildInputs = [ From 98ebd83d4658c64e38cafbb99b80f97ecf910df1 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 21 May 2020 12:00:00 +0000 Subject: [PATCH 0502/3452] matrix-nio: 0.11.2 -> 0.12.0 Changelog: https://github.com/poljar/matrix-nio/blob/master/CHANGELOG.md --- pkgs/development/python-modules/matrix-nio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 1e59dcbf49bc..aca4bf35434b 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "0j39waql69rn96q4qc1df4w0z6zz48gkr2m924j3ba7v7pj6p7w4"; + sha256 = "1d4jhl2xjjp31yjs4zz2cfkvzbi2vr5bsrp07s6nhyc18azxr7ba"; }; nativeBuildInputs = [ From be7c11c439adbd80098283fe971ae773014f4376 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Jun 2020 19:21:30 +0200 Subject: [PATCH 0503/3452] nss: 3.52 -> 3.52.1 Needed to compile firefox 77. Taken from PR #89438. --- pkgs/development/libraries/nss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 5251c680361a..d083a256cd11 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.52"; + version = "3.52.1"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0q8m9jf6zgkbhx71myjb7y0gcl5ib3gj6qkl9yvdqpd6vl6fn2ha"; + sha256 = "0y4jb9095f7bbgw7d7kvzm4c3g4p5i6y68fwhb8wlkpb7b1imj5w"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From a5bdbb895d9c34929a1d7745e615023f30f76fad Mon Sep 17 00:00:00 2001 From: Alexander Biehl Date: Fri, 5 Jun 2020 12:19:51 +0200 Subject: [PATCH 0504/3452] Apply @jonringers suggestions Co-authored-by: Jon --- pkgs/development/python-modules/skein/default.nix | 3 +++ pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index dd98bdddc3a2..630c4370a87d 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -1,11 +1,13 @@ { buildPythonPackage , callPackage , fetchPypi +, isPy27 , jre , lib , pythonPackages , stdenv }: + let pname = "skein"; version = "0.8.0"; @@ -17,6 +19,7 @@ let in buildPythonPackage rec { inherit pname version src; + disabled = isPy27; propagatedBuildInputs = with pythonPackages; [ cryptography grpcio grpcio-tools jupyter pytest pyyaml requests jre ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d99e2363a1d..7021dd612d1e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6338,7 +6338,7 @@ in { python_statsd = callPackage ../development/python-modules/python_statsd { }; - skein = disabledIf isPy27 (callPackage ../development/python-modules/skein { }); + skein = callPackage ../development/python-modules/skein { }; stompclient = callPackage ../development/python-modules/stompclient { }; From 72e80cdc54f33889d4bf7b38fa58bd2d459d14e6 Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Fri, 5 Jun 2020 12:57:18 +0200 Subject: [PATCH 0505/3452] lxd: Add proper support for `nftables` --- nixos/modules/virtualisation/lxd.nix | 5 ++--- pkgs/tools/admin/lxd/default.nix | 26 ++++++++++++++++++-------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 53b89a9f55b1..f526324e0a02 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -15,7 +15,6 @@ in ###### interface options = { - virtualisation.lxd = { enable = mkOption { type = types.bool; @@ -30,7 +29,7 @@ in package = mkOption { type = types.package; - default = pkgs.lxd; + default = pkgs.lxd.override { nftablesSupport = config.networking.nftables.enable; }; defaultText = "pkgs.lxd"; description = '' The LXD package to use. @@ -65,6 +64,7 @@ in with nixos. ''; }; + recommendedSysctlSettings = mkOption { type = types.bool; default = false; @@ -83,7 +83,6 @@ in ###### implementation config = mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; security.apparmor = { diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index f270576e684a..9da7e76657db 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,13 +1,21 @@ { stdenv, hwdata, pkgconfig, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq -, squashfsTools, iproute, iptables, ebtables, libcap, libco-canonical, dqlite -, raft-canonical, sqlite-replication, udev +, squashfsTools, iproute, iptables, ebtables, iptables-nftables-compat, libcap +, libco-canonical, dqlite, raft-canonical, sqlite-replication, udev , writeShellScriptBin, apparmor-profiles, apparmor-parser , criu , bash , installShellFiles +, nftablesSupport ? false }: +let + networkPkgs = if nftablesSupport then + [ iptables-nftables-compat ] + else + [ iptables ebtables ]; + +in buildGoPackage rec { pname = "lxd"; version = "4.1"; @@ -38,12 +46,14 @@ buildGoPackage rec { # test binaries, code generation rm $out/bin/{deps,macaroon-identity,generate} - wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ - acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash criu - (writeShellScriptBin "apparmor_parser" '' - exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" - '') - ]} + wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath ( + networkPkgs + ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute bash criu ] + ++ [ (writeShellScriptBin "apparmor_parser" '' + exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" + '') ] + ) + } installShellCompletion --bash go/src/github.com/lxc/lxd/scripts/bash/lxd-client ''; From 4dee97c43e72daee80e1c6b61e402c7cad6ac689 Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Fri, 5 Jun 2020 14:37:14 +0200 Subject: [PATCH 0506/3452] lxcfs: Wrap `lxc.mount.hook`, so that it detects the `mount` command --- pkgs/os-specific/linux/lxcfs/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 68d05f0be65d..4011b3885625 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -1,4 +1,5 @@ { config, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse +, utillinux, makeWrapper , enableDebugBuild ? config.lxcfs.enableDebugBuild or false }: with stdenv.lib; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; - buildInputs = [ fuse ]; + buildInputs = [ fuse makeWrapper ]; preConfigure = stdenv.lib.optionalString enableDebugBuild '' sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am @@ -27,6 +28,12 @@ stdenv.mkDerivation rec { installFlags = [ "SYSTEMD_UNIT_DIR=\${out}/lib/systemd" ]; + postInstall = '' + # `mount` hook requires access to the `mount` command from `utillinux`: + wrapProgram "$out/share/lxcfs/lxc.mount.hook" \ + --prefix PATH : "${utillinux}/bin" + ''; + postFixup = '' # liblxcfs.so is reloaded with dlopen() patchelf --set-rpath "$(patchelf --print-rpath "$out/bin/lxcfs"):$out/lib" "$out/bin/lxcfs" From 6c6924b2eb54658ededd4e20275c4a5b2ebab24c Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Fri, 5 Jun 2020 14:40:02 +0200 Subject: [PATCH 0507/3452] lxd: When `lxcfs` is enabled, start `lxd` with explicit `LXD_LXC_TEMPLATE_CONFIG` --- nixos/modules/virtualisation/lxd.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index f526324e0a02..3958fc2c1d7c 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -24,6 +24,12 @@ in containers. Users in the "lxd" group can interact with the daemon (e.g. to start or stop containers) using the lxc command line tool, among others. + + Most of the time, you'll also want to start lxcfs, so + that containers can "see" the limits: + + virtualisation.lxc.lxcfs.enable = true; + ''; }; @@ -114,6 +120,12 @@ in LimitNOFILE = "1048576"; LimitNPROC = "infinity"; TasksMax = "infinity"; + + # By default, `lxd` loads configuration files from hard-coded + # `/usr/share/lxc/config` - since this is a no-go for us, we have to + # explicitly tell it where the actual configuration files are + Environment = mkIf (config.virtualisation.lxc.lxcfs.enable) + "LXD_LXC_TEMPLATE_CONFIG=${pkgs.lxcfs}/share/lxc/config"; }; }; From 913bee36eda54e1edceccdef0cb6b161ba85269e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 16:46:40 +0200 Subject: [PATCH 0508/3452] python3Minimal: override python38, not python3 This avoids an infinite recursion, accidentally introduced in b7ff7465401257e9b0814bb68937a494c58de538. --- pkgs/development/interpreters/python/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index a4bf8599aac6..b05f989714a5 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -129,7 +129,7 @@ in { }; # Minimal versions of Python (built without optional dependencies) - python3Minimal = (python3.override { + python3Minimal = (python38.override { self = python3Minimal; pythonForBuild = pkgs.buildPackages.python3Minimal; # strip down that python version as much as possible From 8def595c2e09a0861bbc2d48a73b924a12a98a73 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 18:43:38 +0200 Subject: [PATCH 0509/3452] Remove fridh as maintainer of older Python packages I am not interested in maintaining packages for Python < 3.7. --- pkgs/development/python-modules/ipython/7.9.nix | 2 +- pkgs/development/python-modules/jupyter_client/5.nix | 2 +- pkgs/development/python-modules/nbformat/2.nix | 2 +- pkgs/development/python-modules/notebook/2.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ipython/7.9.nix b/pkgs/development/python-modules/ipython/7.9.nix index 4c8086def330..9953868df5f3 100644 --- a/pkgs/development/python-modules/ipython/7.9.nix +++ b/pkgs/development/python-modules/ipython/7.9.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { description = "IPython: Productive Interactive Computing"; homepage = "http://ipython.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ bjornfor fridh ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/python-modules/jupyter_client/5.nix b/pkgs/development/python-modules/jupyter_client/5.nix index 4855663ebc7d..8ce8150cbd47 100644 --- a/pkgs/development/python-modules/jupyter_client/5.nix +++ b/pkgs/development/python-modules/jupyter_client/5.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Jupyter protocol implementation and client libraries"; homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/nbformat/2.nix b/pkgs/development/python-modules/nbformat/2.nix index faf2cee2b008..06d02520b20d 100644 --- a/pkgs/development/python-modules/nbformat/2.nix +++ b/pkgs/development/python-modules/nbformat/2.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "The Jupyter Notebook format"; homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh globin ]; + maintainers = with lib.maintainers; [ globin ]; }; } diff --git a/pkgs/development/python-modules/notebook/2.nix b/pkgs/development/python-modules/notebook/2.nix index 8b8cce2f8245..37f39c44967c 100644 --- a/pkgs/development/python-modules/notebook/2.nix +++ b/pkgs/development/python-modules/notebook/2.nix @@ -71,6 +71,6 @@ buildPythonPackage rec { description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ ]; }; } From 36bfc01df6938fa1c3c3a681465a7ab4d9ee3183 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 18:44:50 +0200 Subject: [PATCH 0510/3452] python: ipython: 7.14.0 -> 7.15.0 --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 69fe73eb3423..692daa7b2f38 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.14.0"; + version = "7.15.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f0126781d0f959da852fb3089e170ed807388e986a8dd4e6ac44855845b0fb1c"; + sha256 = "0ef1433879816a960cd3ae1ae1dc82c64732ca75cec8dab5a4e29783fb571d0e"; }; prePatch = lib.optionalString stdenv.isDarwin '' From d54acb0da4d8a2f991222aaa9a50061571fa051c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 18:44:50 +0200 Subject: [PATCH 0511/3452] python: numpy: 1.18.4 -> 1.18.5 --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 62a871fda092..0c9bac973203 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -35,13 +35,13 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.18.4"; + version = "1.18.5"; format = "pyproject.toml"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bbcc85aaf4cd84ba057decaead058f43191cc0e30d6bc5d44fe336dc3d3f4509"; + sha256 = "34e96e9dae65c4839bd80012023aadd6ee2ccb73ce7fdf3074c62f301e63120b"; }; nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; From 63767fc2548c39de568077dd41242f1adb7ea95a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 18:44:50 +0200 Subject: [PATCH 0512/3452] python: pandas: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/pandas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 0f4a35420865..5d7bb4a6d696 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -30,11 +30,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "11j5s6hz29yh3rwa2rjgric0knbhp9shphd4i7hx00xr5wr2xx1j"; + sha256 = "b35d625282baa7b51e82e52622c300a1ca9f786711b2af7cbe64f1e6831f4126"; }; checkInputs = [ pytest glibcLocales moto hypothesis ]; From 462aa777dfbb45829321dead7749382e3d551e8c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 18:44:50 +0200 Subject: [PATCH 0513/3452] python: tqdm: 4.46.0 -> 4.46.1 --- pkgs/development/python-modules/tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index af72dc6b8a5f..138c24ebbe3c 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.46.0"; + version = "4.46.1"; src = fetchPypi { inherit pname version; - sha256 = "4733c4a10d0f2a4d098d801464bdaf5240c7dadd2a7fde4ee93b0a0efd9fb25e"; + sha256 = "cd140979c2bebd2311dfb14781d8f19bd5a9debb92dcab9f6ef899c987fcf71f"; }; checkInputs = [ nose coverage glibcLocales flake8 ]; From 47361447f89a1abd36365ea8da7822eeb8b58d3c Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Fri, 5 Jun 2020 13:29:26 -0700 Subject: [PATCH 0514/3452] nanopb: init at 0.4.1 --- pkgs/development/libraries/nanopb/default.nix | 81 +++++++++++++++++++ .../libraries/nanopb/protoc-gen-nanopb | 3 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 86 insertions(+) create mode 100644 pkgs/development/libraries/nanopb/default.nix create mode 100644 pkgs/development/libraries/nanopb/protoc-gen-nanopb diff --git a/pkgs/development/libraries/nanopb/default.nix b/pkgs/development/libraries/nanopb/default.nix new file mode 100644 index 000000000000..92d56386f0f4 --- /dev/null +++ b/pkgs/development/libraries/nanopb/default.nix @@ -0,0 +1,81 @@ +{ callPackage +, cmake +, fetchFromGitHub +, lib +, protobuf +, python3 +, stdenv +}: + +let + pythonRuntime = python3.withPackages(ps: [ ps.protobuf ]); +in stdenv.mkDerivation rec { + pname = "nanopb"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "16zxk42wzn519bpxf4578qn97k0h1cnbkvqqkqvka9sl0n3lz2dp"; + }; + + nativeBuildInputs = [ cmake python3 ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.so{.0,} + "-DBUILD_STATIC_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.a + "-Dnanopb_PROTOC_PATH=${protobuf}/bin/protoc" + ]; + + # On a case-insensitive filesystem (such as on Darwin), CMake fails to create + # the build directory because of the existence of the BUILD file. + # TODO: This can be removed once https://github.com/nanopb/nanopb/pull/537 is merged. + preConfigure = "rm BUILD"; + + # install the generator which requires Python3 with the protobuf package. It + # also requires the nanopb module that's generated by CMake to be in a + # relative location to the generator itself so we move it out of the + # python.sitePackages into the shared generator folder. + postInstall = '' + mkdir -p $out/share/nanopb/generator/proto + cp ../generator/nanopb_generator.py $out/share/nanopb/generator/nanopb_generator.py + cp ../generator/proto/_utils.py $out/share/nanopb/generator/proto/_utils.py + cp ../generator/proto/nanopb.proto $out/share/nanopb/generator/proto/nanopb.proto + mv $out/${python3.sitePackages}/nanopb_pb2.py $out/share/nanopb/generator/proto + rm -rf $out/${python3.sitePackages} + + mkdir $out/bin + substitute ${./protoc-gen-nanopb} $out/bin/protoc-gen-nanopb \ + --subst-var-by python ${pythonRuntime}/bin/python \ + --subst-var-by out $out + chmod +x $out/bin/protoc-gen-nanopb + ''; + + meta = with lib; { + inherit (protobuf.meta) platforms; + + description = "Protocol Buffers with small code size"; + homepage = "https://jpa.kapsi.fi/nanopb/"; + license = licenses.zlib; + maintainers = with maintainers; [ kalbasit ]; + + longDescription = '' + Nanopb is a small code-size Protocol Buffers implementation in ansi C. It + is especially suitable for use in microcontrollers, but fits any memory + restricted system. + + - Homepage: jpa.kapsi.fi/nanopb + - Documentation: jpa.kapsi.fi/nanopb/docs + - Downloads: jpa.kapsi.fi/nanopb/download + - Forum: groups.google.com/forum/#!forum/nanopb + + In order to use the nanopb options in your proto files, you'll need to + tell protoc where to find the nanopb.proto file. + You can do so with the --proto_path (-I) option to add the directory + ''${nanopb}/share/nanopb/generator/proto like so: + + protoc --proto_path=. --proto_path=''${nanopb}/share/nanopb/generator/proto --plugin=protoc-gen-nanopb=''${nanopb}/bin/protoc-gen-nanopb --nanopb_out=out file.proto + ''; + }; +} diff --git a/pkgs/development/libraries/nanopb/protoc-gen-nanopb b/pkgs/development/libraries/nanopb/protoc-gen-nanopb new file mode 100644 index 000000000000..764e6614b18a --- /dev/null +++ b/pkgs/development/libraries/nanopb/protoc-gen-nanopb @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec @python@ @out@/share/nanopb/generator/nanopb_generator.py --protoc-plugin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7fc5edf06b3..58e5c3d86f1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14170,6 +14170,8 @@ in flatbuffers = callPackage ../development/libraries/flatbuffers { }; + nanopb = callPackage ../development/libraries/nanopb { }; + gnupth = callPackage ../development/libraries/pth { }; pth = if stdenv.hostPlatform.isMusl then npth else gnupth; From c0810058bee79ce9b2959657d0fb13882e3b9bbc Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Fri, 5 Jun 2020 13:29:52 -0700 Subject: [PATCH 0515/3452] nanopb: add tests via passthru.tests --- pkgs/development/libraries/nanopb/default.nix | 7 +++++ .../test-message-with-annotations/default.nix | 27 +++++++++++++++++++ .../withannotations.proto | 7 +++++ .../test-message-with-options/default.nix | 27 +++++++++++++++++++ .../withoptions.options | 1 + .../withoptions.proto | 5 ++++ .../nanopb/test-simple-proto2/default.nix | 24 +++++++++++++++++ .../nanopb/test-simple-proto2/simple.proto | 5 ++++ .../nanopb/test-simple-proto3/default.nix | 24 +++++++++++++++++ .../nanopb/test-simple-proto3/simple.proto | 5 ++++ 10 files changed, 132 insertions(+) create mode 100644 pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix create mode 100644 pkgs/development/libraries/nanopb/test-message-with-annotations/withannotations.proto create mode 100644 pkgs/development/libraries/nanopb/test-message-with-options/default.nix create mode 100644 pkgs/development/libraries/nanopb/test-message-with-options/withoptions.options create mode 100644 pkgs/development/libraries/nanopb/test-message-with-options/withoptions.proto create mode 100644 pkgs/development/libraries/nanopb/test-simple-proto2/default.nix create mode 100644 pkgs/development/libraries/nanopb/test-simple-proto2/simple.proto create mode 100644 pkgs/development/libraries/nanopb/test-simple-proto3/default.nix create mode 100644 pkgs/development/libraries/nanopb/test-simple-proto3/simple.proto diff --git a/pkgs/development/libraries/nanopb/default.nix b/pkgs/development/libraries/nanopb/default.nix index 92d56386f0f4..a63d367b800d 100644 --- a/pkgs/development/libraries/nanopb/default.nix +++ b/pkgs/development/libraries/nanopb/default.nix @@ -52,6 +52,13 @@ in stdenv.mkDerivation rec { chmod +x $out/bin/protoc-gen-nanopb ''; + passthru.tests = { + simple-proto2 = callPackage ./test-simple-proto2 {}; + simple-proto3 = callPackage ./test-simple-proto3 {}; + message-with-annotations = callPackage ./test-message-with-annotations {}; + message-with-options = callPackage ./test-message-with-options {}; + }; + meta = with lib; { inherit (protobuf.meta) platforms; diff --git a/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix b/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix new file mode 100644 index 000000000000..618d7c521ce0 --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix @@ -0,0 +1,27 @@ +{ stdenv, protobuf, nanopb }: + +stdenv.mkDerivation { + name = "nanopb-test-message-with-annotations"; + meta.timeout = 60; + src = ./.; + + # protoc requires any .proto file to be compiled to reside within it's + # proto_path. By default the current directory is automatically added to the + # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did + # not work because they end up in the store at different locations. + installPhase = ":"; + buildPhase = '' + mkdir $out + + ${protobuf}/bin/protoc --proto_path=. --proto_path=${nanopb}/share/nanopb/generator/proto --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withannotations.proto + ''; + + docheck = true; + checkphase = '' + grep -q WithAnnotations $out/withannotations.pb.c || (echo "error: WithAnnotations not found in $out/withannotations.pb.c"; exit 1) + grep -q WithAnnotations $out/withannotations.pb.h || (echo "error: WithAnnotations not found in $out/withannotations.pb.h"; exit 1) + grep -q "pb_byte_t uuid\[16\]" $out/withannotations.pb.h || (echo "error: uuid is not of type pb_byte_t and of size 16 in $out/withannotations.pb.h"; exit 1) + grep -q "FIXED_LENGTH_BYTES, uuid" $out/withannotations.pb.h || (echo "error: uuid is not of fixed lenght bytes in $out/withannotations.pb.h"; exit 1) + grep -q "#define WithAnnotations_size" $out/withannotations.pb.h || (echo "error: the size of WithAnnotations is not known in $out/withannotations.pb.h"; exit 1) + ''; +} diff --git a/pkgs/development/libraries/nanopb/test-message-with-annotations/withannotations.proto b/pkgs/development/libraries/nanopb/test-message-with-annotations/withannotations.proto new file mode 100644 index 000000000000..d8109e877d68 --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-message-with-annotations/withannotations.proto @@ -0,0 +1,7 @@ +syntax = "proto3"; + +import "nanopb.proto"; + +message WithAnnotations { + bytes uuid = 1 [(nanopb).max_size = 16, (nanopb).fixed_length = true]; +} diff --git a/pkgs/development/libraries/nanopb/test-message-with-options/default.nix b/pkgs/development/libraries/nanopb/test-message-with-options/default.nix new file mode 100644 index 000000000000..c15b51f71977 --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-message-with-options/default.nix @@ -0,0 +1,27 @@ +{ stdenv, protobuf, nanopb }: + +stdenv.mkDerivation { + name = "nanopb-test-message-with-options"; + meta.timeout = 60; + src = ./.; + + # protoc requires any .proto file to be compiled to reside within it's + # proto_path. By default the current directory is automatically added to the + # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did + # not work because they end up in the store at different locations. + installPhase = ":"; + buildPhase = '' + mkdir $out + + ${protobuf}/bin/protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withoptions.proto + ''; + + docheck = true; + checkphase = '' + grep -q WithOptions $out/withoptions.pb.c || (echo "error: WithOptions not found in $out/withoptions.pb.c"; exit 1) + grep -q WithOptions $out/withoptions.pb.h || (echo "error: WithOptions not found in $out/withoptions.pb.h"; exit 1) + grep -q "pb_byte_t uuid\[16\]" $out/withoptions.pb.h || (echo "error: uuid is not of type pb_byte_t and of size 16 in $out/withoptions.pb.h"; exit 1) + grep -q "FIXED_LENGTH_BYTES, uuid" $out/withoptions.pb.h || (echo "error: uuid is not of fixed lenght bytes in $out/withoptions.pb.h"; exit 1) + grep -q "#define WithOptions_size" $out/withoptions.pb.h || (echo "error: the size of WithOptions is not known in $out/withoptions.pb.h"; exit 1) + ''; +} diff --git a/pkgs/development/libraries/nanopb/test-message-with-options/withoptions.options b/pkgs/development/libraries/nanopb/test-message-with-options/withoptions.options new file mode 100644 index 000000000000..ecf98a217367 --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-message-with-options/withoptions.options @@ -0,0 +1 @@ + WithOptions.uuid max_size:16 fixed_length:true diff --git a/pkgs/development/libraries/nanopb/test-message-with-options/withoptions.proto b/pkgs/development/libraries/nanopb/test-message-with-options/withoptions.proto new file mode 100644 index 000000000000..5a5da3a1c973 --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-message-with-options/withoptions.proto @@ -0,0 +1,5 @@ +syntax = "proto3"; + +message WithOptions { + bytes uuid = 1; +} diff --git a/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix b/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix new file mode 100644 index 000000000000..a915e7785370 --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-simple-proto2/default.nix @@ -0,0 +1,24 @@ +{ stdenv, protobuf, nanopb }: + +stdenv.mkDerivation { + name = "nanopb-test-simple-proto2"; + meta.timeout = 60; + src = ./.; + + # protoc requires any .proto file to be compiled to reside within it's + # proto_path. By default the current directory is automatically added to the + # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did + # not work because they end up in the store at different locations. + installPhase = ":"; + buildPhase = '' + mkdir $out + + ${protobuf}/bin/protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out simple.proto + ''; + + doCheck = true; + checkPhase = '' + grep -q SimpleMessage $out/simple.pb.c || (echo "ERROR: SimpleMessage not found in $out/simple.pb.c"; exit 1) + grep -q SimpleMessage $out/simple.pb.h || (echo "ERROR: SimpleMessage not found in $out/simple.pb.h"; exit 1) + ''; +} diff --git a/pkgs/development/libraries/nanopb/test-simple-proto2/simple.proto b/pkgs/development/libraries/nanopb/test-simple-proto2/simple.proto new file mode 100644 index 000000000000..b02936b1ae26 --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-simple-proto2/simple.proto @@ -0,0 +1,5 @@ +syntax = "proto2"; + +message SimpleMessage { + required int32 lucky_number = 1; +} diff --git a/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix b/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix new file mode 100644 index 000000000000..3e2bba731b9f --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-simple-proto3/default.nix @@ -0,0 +1,24 @@ +{ stdenv, protobuf, nanopb }: + +stdenv.mkDerivation { + name = "nanopb-test-simple-proto3"; + meta.timeout = 60; + src = ./.; + + # protoc requires any .proto file to be compiled to reside within it's + # proto_path. By default the current directory is automatically added to the + # proto_path. I tried using --proto_path ${./.} ${./simple.proto} and it did + # not work because they end up in the store at different locations. + installPhase = ":"; + buildPhase = '' + mkdir $out + + ${protobuf}/bin/protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out simple.proto + ''; + + doCheck = true; + checkPhase = '' + grep -q SimpleMessage $out/simple.pb.c || (echo "ERROR: SimpleMessage not found in $out/simple.pb.c"; exit 1) + grep -q SimpleMessage $out/simple.pb.h || (echo "ERROR: SimpleMessage not found in $out/simple.pb.h"; exit 1) + ''; +} diff --git a/pkgs/development/libraries/nanopb/test-simple-proto3/simple.proto b/pkgs/development/libraries/nanopb/test-simple-proto3/simple.proto new file mode 100644 index 000000000000..6b99cdb5daa7 --- /dev/null +++ b/pkgs/development/libraries/nanopb/test-simple-proto3/simple.proto @@ -0,0 +1,5 @@ +syntax = "proto3"; + +message SimpleMessage { + int32 lucky_number = 1; +} From 5f140a61f296e86cb7967ef743c92db0872ad824 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 5 Jun 2020 14:44:22 -0700 Subject: [PATCH 0516/3452] sqlite: 3.32.1 -> 3.32.2 --- pkgs/development/libraries/sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index dce86699a025..35d3d062ab78 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.32.1"; + version = "3.32.2"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "043xzxpvyi3n2lp9831bd0jg3r98n81myfjfcspxiaqnzfmlhrs8"; + sha256 = "1130bcd70s2vlsq0d638pb5qrw9kwqvjswnp2dfypghx9hjz3gid"; }; outputs = [ "bin" "dev" "out" ]; From ebb2f246283f6aa7af902f6abfea5118b3239505 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 4 Jun 2020 03:40:15 +0000 Subject: [PATCH 0517/3452] python3.pkgs.importlib-metadata: 1.5.0 -> 1.6.0 --- .../python-modules/importlib-metadata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 76545edcbeba..5a3137922475 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "00ikdj4gjhankdljnz7g5ggak4k9lql2926x0x117ir9j2lv7x86"; + sha256 = "07icyggasn38yv2swdrd8z6i0plazmc9adavsdkbqqj91j53ll9l"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zipp ] ++ lib.optionals (!isPy3k) [ pathlib2 contextlib2 configparser ]; - checkInputs = [ importlib-resources packaging ]; + doCheck = false; # Cyclic dependencies. # removing test_main.py - it requires 'pyflakefs' # and adding `pyflakefs` to `checkInputs` causes infinite recursion. From 167391c20e51f3f2c7ddd43da9a3fb397c2f53c1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 4 Jun 2020 03:40:59 +0000 Subject: [PATCH 0518/3452] python3.pkgs.importlib-resources: 1.0.2 -> 1.5.0 --- .../python-modules/importlib-resources/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 6fba0a703e16..7faefd4c0e1e 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -1,24 +1,28 @@ { lib , buildPythonPackage , fetchPypi -, pathlib2 +, setuptools_scm +, toml +, importlib-metadata , typing -, isPy3k +, singledispatch , pythonOlder , python }: buildPythonPackage rec { pname = "importlib_resources"; - version = "1.0.2"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "d3279fd0f6f847cced9f7acc19bd3e5df54d34f93a2e7bb5f238f81545787078"; + sha256 = "1jilyxyb2z7hzcjhx1ddni52mq00i728wqh8f5k4469yhdkdz1vg"; }; + nativeBuildInputs = [ setuptools_scm toml ]; propagatedBuildInputs = [ - ] ++ lib.optional (!isPy3k) pathlib2 + importlib-metadata + ] ++ lib.optional (pythonOlder "3.4") singledispatch ++ lib.optional (pythonOlder "3.5") typing ; From ee36ba3858a723bb7f385ac67dfc417d0658da3e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 4 Jun 2020 03:51:38 +0000 Subject: [PATCH 0519/3452] python3.pkgs.zope_interface: 4.7.2 -> 5.1.0 --- .../development/python-modules/zope_interface/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index 9214c0badf0a..5e7086191cce 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -6,15 +6,17 @@ buildPythonPackage rec { pname = "zope.interface"; - version = "4.7.2"; - + version = "5.1.0"; + src = fetchPypi { inherit pname version; - sha256 = "fd1101bd3fcb4f4cf3485bb20d6cb0b56909b94d3bd2a53a6cb9d381c3da3365"; + sha256 = "03nrl6b8cb600dnnh46y149awvrm0gxyqgwq5hdw3lvys8mw9r20"; }; propagatedBuildInputs = [ zope_event ]; + doCheck = false; # Circular deps. + meta = with stdenv.lib; { description = "Zope.Interface"; homepage = "http://zope.org/Products/ZopeInterface"; From da5b2cea9afdde0e01ac70742cd3240db85c914e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 4 Jun 2020 03:44:53 +0000 Subject: [PATCH 0520/3452] python3.pkgs.mailmanclient: 3.3.0 -> 3.3.1 Also enable tests, which seem to work now. --- pkgs/development/python-modules/mailmanclient/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index 247a7ed1b004..45dfc55ae9a8 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -2,20 +2,16 @@ buildPythonPackage rec { pname = "mailmanclient"; - version = "3.3.0"; + version = "3.3.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c8736cbe152ae1bd58b46ccfbcafb6a1e301513530772e7fda89f91d1e5c1ae9"; + sha256 = "0pjgzpvhdb6ql8asb20xr8d01m646zpghmcp9fmscks0n1k4di4g"; }; propagatedBuildInputs = [ six httplib2 requests ]; - # no tests with Pypi tar ball, checkPhase removes setup.py which invalidates import check - doCheck = false; - pythonImportsCheck = [ "mailmanclient" ]; - meta = with stdenv.lib; { homepage = "https://www.gnu.org/software/mailman/"; description = "REST client for driving Mailman 3"; From ef90440c8f149b2341fd3437aff745969a184b18 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 4 Jun 2020 03:52:15 +0000 Subject: [PATCH 0521/3452] python3.pkgs.django-mailman3: 1.3.2 -> 1.3.3 --- pkgs/development/python-modules/django-mailman3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index bcb39633f7ea..c8fdd57c98e1 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-mailman3"; - version = "1.3.2"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "1vq5qa136h4rz4hjznnk6y8l443i41yh4w4wxg20f9b059xrsld1"; + sha256 = "1q9ciy2yawgvbha5kwlzwdmdqvas287dc0i60ygp2799jnfr5dr6"; }; propagatedBuildInputs = [ From 5322686d537e30cd11c2bf135edb41578e570108 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 4 Jun 2020 03:53:41 +0000 Subject: [PATCH 0522/3452] mailman: 3.3.0 -> 3.3.1 --- pkgs/servers/mail/mailman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 8443a1968fdf..37b4d29eeb16 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "mailman"; - version = "3.3.0"; + version = "3.3.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1qph9i93ndahfxi3bb2sd0kjm2c0pkh844ai6zacfmvihl1k3pvy"; + sha256 = "0idfiv48jjgc0jq4731094ddhraqq8bxnwmjk6sg5ask0jss9kxq"; }; propagatedBuildInputs = [ From 1fe94466e68dc325f1beef9b98a9f8d306f6cd24 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 4 Jun 2020 04:11:09 +0000 Subject: [PATCH 0523/3452] python3.pkgs.postorius: 1.3.2 -> 1.3.3 --- pkgs/servers/mail/mailman/postorius.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index 5f542b9036ea..ae797fa6cbc7 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "postorius"; - version = "1.3.2"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "0wrm0hda7ym9qaygxirqaaii66ndmgyy7gx8wqdg07pfx14zcyja"; + sha256 = "08jn23gblbkfl09qlykbpsmp39mmach3sl69h1j5cd5kkx839rwa"; }; propagatedBuildInputs = [ django-mailman3 readme_renderer ]; From 9e59980eb55a178ced688ddf3e0e716d303a7a34 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 4 Jun 2020 03:58:48 +0000 Subject: [PATCH 0524/3452] python3.pkgs.hyperkitty: 1.3.2 -> 1.3.3 --- pkgs/servers/mail/mailman/hyperkitty.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 57c1b355bf26..5ed5b74d309a 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "HyperKitty"; - version = "1.3.2"; + version = "1.3.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "092fkv0xyf5vgj33xwq0mh9h5c5d56ifwimaqbfpx5cwc6yivb88"; + sha256 = "0p85r9q6mn5as5b39xp9hkkipnk0156acx540n2ygk3qb3jd4a5n"; }; nativeBuildInputs = [ isort ]; From e9848d11ad038d4077948f14986496ccb14e11bc Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 5 Jun 2020 21:40:35 +0000 Subject: [PATCH 0525/3452] fontforge: 20190801 -> 20200314 This fixes the failing build. Build system changed to cmake. --- pkgs/tools/misc/fontforge/default.nix | 31 ++++++++++----------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 67ab7b2d6917..ed5c242e6241 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, lib -, autoconf, automake, gnum4, libtool, perl, uthash, pkgconfig, gettext +, cmake, perl, uthash, pkgconfig, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango , readline, woff2, zeromq, libuninameslist , withSpiro ? false, libspiro -, withGTK ? false, gtk2 +, withGTK ? false, gtk3 , withPython ? true , withExtras ? true , Carbon ? null, Cocoa ? null @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "fontforge"; - version = "20190801"; + version = "20200314"; src = fetchurl { - url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r"; + url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; + sha256 = "0qf88wd6riycq56d24brybyc93ns74s0nyyavm43zp2kfcihn6fd"; }; # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps @@ -30,41 +30,32 @@ stdenv.mkDerivation rec { # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-msse2 -mfpmath=sse"; - nativeBuildInputs = [ pkgconfig autoconf automake gnum4 libtool perl gettext ]; + nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ readline uthash woff2 zeromq libuninameslist python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] ++ lib.optionals withSpiro [libspiro] - ++ lib.optionals withGTK [ gtk2 cairo pango ] + ++ lib.optionals withGTK [ gtk3 cairo pango ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; - configureFlags = [ "--enable-woff2" ] - ++ lib.optionals (!withPython) [ "--disable-python-scripting" "--disable-python-extension" ] - ++ lib.optional withGTK "--enable-gtk2-use" - ++ lib.optional (!withGTK) "--without-x" - ++ lib.optional withExtras "--enable-fontforge-extras"; + cmakeFlags = [ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ] + ++ lib.optional (!withSpiro) "-DENABLE_LIBSPIRO=OFF" + ++ lib.optional (!withGTK) "-DENABLE_GUI=OFF" + ++ lib.optional withExtras "-DENABLE_FONTFORGE_EXTRAS=ON"; # work-around: git isn't really used, but configuration fails without it preConfigure = '' # The way $version propagates to $version of .pe-scripts (https://github.com/dejavu-fonts/dejavu-fonts/blob/358190f/scripts/generate.pe#L19) export SOURCE_DATE_EPOCH=$(date -d ${version} +%s) - - export GIT="$(type -P true)" - ./bootstrap --skip-git --force ''; - doCheck = false; # tries to wget some fonts - doInstallCheck = doCheck; - postInstall = # get rid of the runtime dependency on python lib.optionalString (!withPython) '' rm -r "$out/share/fontforge/python" ''; - enableParallelBuilding = true; - meta = { description = "A font editor"; homepage = "http://fontforge.github.io"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37749de497b5..b343c5fabd0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3527,7 +3527,7 @@ in fontforge-gtk = fontforge.override { withSpiro = true; withGTK = true; - gtk2 = gtk2-x11; + gtk3 = gtk3-x11; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; From 8a74399de3c1f78061ba08ddab1606b0a91fc689 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 6 Jun 2020 00:03:38 +0000 Subject: [PATCH 0526/3452] fontforge: introduce withGUI option It was unintuitive that the withGTK option controlled whether a fontforge GUI was enabled at all, since fontforge supports multiple GUIs (a GTK one and an X11 one -- confusingly the X11 one still requires GTK). With the new withGUI option, it is possible to build the X11 GUI by setting withGTK to false and withGUI to true. I haven't added an attribute for this configuration because I expect it to be pretty obsure -- my rationale for adding this option was code clarity rather than utility. --- pkgs/tools/misc/fontforge/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index ed5c242e6241..82fd5c8210dd 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -4,11 +4,14 @@ , readline, woff2, zeromq, libuninameslist , withSpiro ? false, libspiro , withGTK ? false, gtk3 +, withGUI ? withGTK , withPython ? true , withExtras ? true , Carbon ? null, Cocoa ? null }: +assert withGTK -> withGUI; + stdenv.mkDerivation rec { pname = "fontforge"; version = "20200314"; @@ -36,12 +39,13 @@ stdenv.mkDerivation rec { python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] ++ lib.optionals withSpiro [libspiro] - ++ lib.optionals withGTK [ gtk3 cairo pango ] + ++ lib.optionals withGUI [ gtk3 cairo pango ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; cmakeFlags = [ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" ] ++ lib.optional (!withSpiro) "-DENABLE_LIBSPIRO=OFF" - ++ lib.optional (!withGTK) "-DENABLE_GUI=OFF" + ++ lib.optional (!withGUI) "-DENABLE_GUI=OFF" + ++ lib.optional (!withGTK) "-DENABLE_X11=ON" ++ lib.optional withExtras "-DENABLE_FONTFORGE_EXTRAS=ON"; # work-around: git isn't really used, but configuration fails without it From d2155d336d4b3cf858b3f5c7e53abe95611ed175 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:31 +0200 Subject: [PATCH 0527/3452] python: GitPython: 3.1.2 -> 3.1.3 --- pkgs/development/python-modules/GitPython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index b5ffacae2964..7b39ebb7a390 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -1,13 +1,13 @@ { lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }: buildPythonPackage rec { - version = "3.1.2"; + version = "3.1.3"; pname = "GitPython"; disabled = isPy27; # no longer supported src = fetchPypi { inherit pname version; - sha256 = "864a47472548f3ba716ca202e034c1900f197c0fb3a08f641c20c3cafd15ed94"; + sha256 = "e107af4d873daed64648b4f4beb89f89f0cfbe3ef558fc7821ed2331c2f8da1a"; }; patches = [ From 9310a94a3e8a6cfbd242e9f71fbc129d06696f05 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:32 +0200 Subject: [PATCH 0528/3452] python: JPype1: 0.7.4 -> 0.7.5 --- pkgs/development/python-modules/JPype1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index c43b2a05a519..b70879952f4e 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "JPype1"; - version = "0.7.4"; + version = "0.7.5"; src = fetchPypi { inherit pname version; - sha256 = "92f24b0fe11e90b57343494ce38699043d9e6828a22a99dddbcf99c0adb4c1f7"; + sha256 = "7bbd25453dc04704d77d854c80acb5537ecb18b9de8a5572e5f22649a2160aaf"; }; checkInputs = [ From 41be5ce3806d4f210d5cbf35342d60cf7042ee25 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:32 +0200 Subject: [PATCH 0529/3452] python: Mako: 1.1.2 -> 1.1.3 --- pkgs/development/python-modules/Mako/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index 597a4695c0cb..375a02968646 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.1.2"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "3139c5d64aa5d175dbafb95027057128b5fbd05a40c53999f3905ceb53366d9d"; + sha256 = "8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27"; }; checkInputs = [ markupsafe nose mock ]; From 5bd70130501bf715f36937774544b7ce081a497d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:32 +0200 Subject: [PATCH 0530/3452] python: aioharmony: 0.2.1 -> 0.2.3 --- pkgs/development/python-modules/aioharmony/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioharmony/default.nix b/pkgs/development/python-modules/aioharmony/default.nix index 13769bbeaed3..09b6919495de 100644 --- a/pkgs/development/python-modules/aioharmony/default.nix +++ b/pkgs/development/python-modules/aioharmony/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aioharmony"; - version = "0.2.1"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "8c8f6e3b776e4e7eba5a1d2ae739aac6a1dd558a7f15951c34ffe0ee28f7f538"; + sha256 = "445323810978454ba3b32be53ba6b43cf9948586de3f9734b8743b55858b3cc7"; }; disabled = !isPy3k; From 47f8540751331a2fdb76d3d0cf5a5588e45e7df3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:32 +0200 Subject: [PATCH 0531/3452] python: aiolifx: 0.6.7 -> 0.6.8 --- pkgs/development/python-modules/aiolifx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index c40f8d3b4471..7b33b1c508f8 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "0.6.7"; + version = "0.6.8"; src = fetchPypi { inherit pname version; - sha256 = "cf53c9faea6eee25a466e73eef1753b82a75c7497648149c19c15342df2678f2"; + sha256 = "9f9055bc2a9a72c5eab17e0ce5522edecd6de07e21cf347bf0cffabdabe5570e"; }; # tests are not implemented From 7313da3b97ff838d67302fc56e3659ae9cd33cf2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:32 +0200 Subject: [PATCH 0532/3452] python: aioresponses: 0.6.3 -> 0.6.4 --- pkgs/development/python-modules/aioresponses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index bbeca1c31507..9034e6a67316 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "aioresponses"; - version = "0.6.3"; + version = "0.6.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "06w15iyr07s861hkzqfdclzxkpvgg83sx8f235mz8k2490hnyqvv"; + sha256 = "4397ca736238a1ada8c7f47e557dda05e9ecfdd467b9f6b83871efd365af7e9f"; }; nativeBuildInputs = [ From a99b673ab1118cc09f678d16ac41f126647dd499 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:32 +0200 Subject: [PATCH 0533/3452] python: appdirs: 1.4.3 -> 1.4.4 --- pkgs/development/python-modules/appdirs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix index 2f7f2ae0281b..22fa3dc98fb0 100644 --- a/pkgs/development/python-modules/appdirs/default.nix +++ b/pkgs/development/python-modules/appdirs/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "appdirs"; - version = "1.4.3"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92"; + sha256 = "7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"; }; meta = { From 9b90aef74d596d3af77e33c6bf26654002b10cd0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:32 +0200 Subject: [PATCH 0534/3452] python: atlassian-python-api: 1.15.7 -> 1.15.9 --- .../python-modules/atlassian-python-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index f9462c5b0a50..5f124cc09434 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "1.15.7"; + version = "1.15.9"; src = fetchPypi { inherit pname version; - sha256 = "b54cce1ca4bea838a949b4362410b1d717597951e5b7efbfa34ce89bc5df805e"; + sha256 = "c6a3125ee68ecf4d11947497c1f891b6436df9d8453f8865cabf595813504cc1"; }; checkInputs = [ pytestrunner pytest ]; From 00952e12c81520a7e65385ea9fa9b0111becf6e5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:32 +0200 Subject: [PATCH 0535/3452] python: autopep8: 1.5.2 -> 1.5.3 --- pkgs/development/python-modules/autopep8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 715e4da8f44e..7b7131f2a7fc 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.5.2"; + version = "1.5.3"; src = fetchPypi { inherit pname version; - sha256 = "0m29ndgrcgrzi3y1fsxmdl421x6n4gn02l70hsz8486h8zzdhbqm"; + sha256 = "60fd8c4341bab59963dafd5d2a566e94f547e660b9b396f772afe67d8481dbf0"; }; propagatedBuildInputs = [ pycodestyle ]; From e7f6dafbede3a024606089dfe2ca2ac98932dc57 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:32 +0200 Subject: [PATCH 0536/3452] python: awkward1: 0.2.19 -> 0.2.22 --- pkgs/development/python-modules/awkward1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward1/default.nix b/pkgs/development/python-modules/awkward1/default.nix index 3e2b08061d92..0c2b3338690f 100644 --- a/pkgs/development/python-modules/awkward1/default.nix +++ b/pkgs/development/python-modules/awkward1/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward1"; - version = "0.2.19"; + version = "0.2.22"; src = fetchPypi { inherit pname version; - sha256 = "23446eacdf52cad1fb0b5bb0f2ed16c1ae8bb5a282d667ad37ab69494e1ef27f"; + sha256 = "c64a8ad0204743d49cf2f8775f92d9c23dd9d7eb6996a61f4a9de57a53d429f9"; }; nativeBuildInputs = [ cmake ]; From 63940dfdfe22bf1a32669a0679ce5a80b6641ddb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:32 +0200 Subject: [PATCH 0537/3452] python: bids-validator: 1.5.1 -> 1.5.2 --- pkgs/development/python-modules/bids-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 56a941e60e09..036f54346144 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.5.1"; + version = "1.5.2"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "1fy8w56m0x546zjk3is1xp83jm19fkn4y15g5jgmq29sfzc8n3y3"; + sha256 = "6f3bd0402d41ee9be03637d74f34a7db279d00cb9c6386b0597cbbac16ee8f4e"; }; propagatedBuildInputs = [ ]; From 803a3e9001b09d9b966fcaa81f90fd1603a19e83 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:33 +0200 Subject: [PATCH 0538/3452] python: bleak: 0.6.2 -> 0.6.4 --- pkgs/development/python-modules/bleak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 559fd33e8eb0..b7ebca9eb034 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.6.2"; + version = "0.6.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1kmq2z3dhq6dd20i5w71gshjrfvyw0pkpnld8iib9ai2rz6a8aj0"; + sha256 = "1dc32899d0700c5b5ed9abf642dfee28ac62b1fb5d7be5fa5a6db104dec9a03c"; }; postPatch = '' From ed62205858d07f5185be2751f0535f91a20b29ae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:33 +0200 Subject: [PATCH 0539/3452] python: block-io: 1.1.10 -> 1.1.13 --- pkgs/development/python-modules/block-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index f80c8a8c145f..505d3ffe149c 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "block-io"; - version = "1.1.10"; + version = "1.1.13"; src = fetchPypi { inherit pname version; - sha256 = "ba2e750085d9da4d1567932f3f719974fdc3f02649ee0d5c2f85fce592208723"; + sha256 = "a45e31361d17ce272a0d563a689d6b87b65cc16e9348f8cd3a6460c93359b1bd"; }; propagatedBuildInputs = [ From 2335a24f5d8a7f82911c7c5646aadccae010d434 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:33 +0200 Subject: [PATCH 0540/3452] python: boto3: 1.13.6 -> 1.13.23 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 2903b8ae7c66..1baa668d3c89 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.13.6"; # N.B: if you change this, change botocore too + version = "1.13.23"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "f1ac7eb23ff8b1d7e314123668ff1e93b874dd396ac5424adc443d68bd8a6fbf"; + sha256 = "bcaa88b2f81b88741c47da52f3414c876236700441df87b6198f860e6a200d6f"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 0b81332a85912d95e84b3650665a634e14eb3a57 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:33 +0200 Subject: [PATCH 0541/3452] python: botocore: 1.16.6 -> 1.16.23 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 9bf977f831dd..060abad204b0 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.16.6"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.16.23"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "b9c8e0aa07770b7b371d586db41eef46e70bfc4ab47f7a1ee1acd4e9c811c6c9"; + sha256 = "5831068c9b49b4c91b0733e0ec784a7733d8732359d73c67a07a0b0868433cae"; }; propagatedBuildInputs = [ From 41dba08dd0ca5df86616f1857f8d01e715e7ceba Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:33 +0200 Subject: [PATCH 0542/3452] python: bugsnag: 3.6.0 -> 3.6.1 --- pkgs/development/python-modules/bugsnag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index 2f0e67683d9a..612ab13c1934 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "3.6.0"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "17cjh7g8gbr0gb22nzybkw7vq9x5wfa5ln94hhzijbz934bw1f37"; + sha256 = "8878437aa44ec485cecb255742035b3b98a6c7e7d167a943b5fbe597b2f8f7f9"; }; propagatedBuildInputs = [ six webob ]; From 2f44bcd02a3a90c43d4b5d04140142bac41a58f8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:33 +0200 Subject: [PATCH 0543/3452] python: python-can: 3.3.2 -> 3.3.3 --- pkgs/development/python-modules/can/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index 3629e0097eda..0a7e58ac8006 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-can"; - version = "3.3.2"; + version = "3.3.3"; src = fetchPypi { inherit pname version; - sha256 = "5fefb5c1e7e7f07faefc02c6eac79f9b58376f007048a04d8e7f325d48ec6b2e"; + sha256 = "ecd69cf6b2f0235345ebe607a15325cf1384c85b24ffbe1d68c3754357f87488"; }; propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing; From 3db09b87532eddd3389b8f5c0aa3a1a260b9acae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:33 +0200 Subject: [PATCH 0544/3452] python: CNVkit: 0.9.6 -> 0.9.7 --- pkgs/development/python-modules/cnvkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cnvkit/default.nix b/pkgs/development/python-modules/cnvkit/default.nix index 054e302dfe76..f4f46f2dff0f 100644 --- a/pkgs/development/python-modules/cnvkit/default.nix +++ b/pkgs/development/python-modules/cnvkit/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "CNVkit"; - version = "0.9.6"; + version = "0.9.7"; src = fetchPypi { inherit pname version; - sha256 = "1hj8c98s538i0hg5mrz4bw4v07qmcl51rhxq611rj2nglnc9r25y"; + sha256 = "d68adc0121e17c61a3aa28c0a9ba6526510a5a0df0f0a6eb1818bab71b7e927a"; }; propagatedBuildInputs = [ From f844a15f5639865027d6245c86be5ce8a1f20462 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:33 +0200 Subject: [PATCH 0545/3452] python: croniter: 0.3.31 -> 0.3.32 --- pkgs/development/python-modules/croniter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index 90334fd42250..15aaf97d15c0 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "croniter"; - version = "0.3.31"; + version = "0.3.32"; src = fetchPypi { inherit pname version; - sha256 = "15riw8sl8jzzkvvjlz3i3p7jcx423zipxhff5ddvki6zgnrb9149"; + sha256 = "0d5bf45f12861c1b718c51bd6e2ab056da94e651bf22900658421cdde0ff7088"; }; propagatedBuildInputs = [ From 106237bf42415ddf962b70e30a13fa19d5e17976 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:33 +0200 Subject: [PATCH 0546/3452] python: django-modelcluster: 5.0.1 -> 5.0.2 --- .../python-modules/django_modelcluster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index 27060e18ae27..4ded69bc3256 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "5.0.1"; + version = "5.0.2"; src = fetchPypi { inherit pname version; - sha256 = "1fk7fh30i0fzi0hjd841vxh25iryvgp4lirmxfpq428w4nq7p1bg"; + sha256 = "c7a42cf9b93d1161a10bf59919f7ee52d996a523a4134b2a136f6fe1eba7a2fa"; }; disabled = pythonOlder "3.5"; From c03b348d0f3ede1f3a5732970e8ac65c5b7c2922 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:34 +0200 Subject: [PATCH 0547/3452] python: dnslib: 0.9.12 -> 0.9.13 --- pkgs/development/python-modules/dnslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix index fafa4c5cbf57..df9843893238 100644 --- a/pkgs/development/python-modules/dnslib/default.nix +++ b/pkgs/development/python-modules/dnslib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dnslib"; - version = "0.9.12"; + version = "0.9.13"; src = fetchPypi { inherit pname version; - sha256 = "c206f09948f3ad17884adffdb552b700072c6022fa59744a0f0606114c475e19"; + sha256 = "a0fed3e139c12ee4884b19bcde1d4a170745bcabb6026397876e3236ce38b9db"; }; checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh"; From 95c12f618a840abae7a148f5405b0bb0398514ae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:34 +0200 Subject: [PATCH 0548/3452] python: doc8: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/doc8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index f7e620f491cb..c2a7df098f4b 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "doc8"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "2df89f9c1a5abfb98ab55d0175fed633cae0cf45025b8b1e0ee5ea772be28543"; + sha256 = "4d1df12598807cf08ffa9a1d5ef42d229ee0de42519da01b768ff27211082c12"; }; buildInputs = [ pbr ]; From df81ee598ec738e0a813c32446b0e4c197669b98 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:34 +0200 Subject: [PATCH 0549/3452] python: docker: 4.2.0 -> 4.2.1 --- pkgs/development/python-modules/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index a31ba7c69c03..9c788bde123d 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "docker"; - version = "4.2.0"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0bkj1xfp6mnvk1i9hl5awsmwi07q6iwwsjznd7kvrx5m19i6dbnx"; + sha256 = "380a20d38fbfaa872e96ee4d0d23ad9beb0f9ed57ff1c30653cbeb0c9c0964f2"; }; nativeBuildInputs = lib.optional isPy27 mock; From 603a0b7616be3baa73d57960d717d871c5810d51 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:34 +0200 Subject: [PATCH 0550/3452] python: dockerfile-parse: 0.0.17 -> 0.0.18 --- pkgs/development/python-modules/dockerfile-parse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix index ffed5fb170d4..580945656b4c 100644 --- a/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: buildPythonPackage rec { - version = "0.0.17"; + version = "0.0.18"; pname = "dockerfile-parse"; src = fetchPypi { inherit pname version; - sha256 = "a69d4ed44c4a890c16437327009ae59ec3a3afeb1abc3819d0c1b14a46099220"; + sha256 = "a09eae6871b7b314f8a8bddb67b6c5002708b22247511906cf2a9a45564b83db"; }; postPatch = '' From 334ce2a774f9112b10acadab4a2d3a186fcf91cd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:34 +0200 Subject: [PATCH 0551/3452] python: elasticsearch-dsl: 7.2.0 -> 7.2.1 --- pkgs/development/python-modules/elasticsearch-dsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 712766fa58e2..68d658f4989e 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "7.2.0"; + version = "7.2.1"; src = fetchPypi { inherit pname version; - sha256 = "19q91srlcvfrk5rnk18c0mzvki9l893g7rqgymfg0p8abb9c05a0"; + sha256 = "1e345535164cb684de4b825e1d0daf81b75554b30d3905446584a9e4af0cc3e7"; }; propagatedBuildInputs = [ elasticsearch python-dateutil six ] From 8f27495c51898178a1d48abbcc1b36d9f8feabae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:34 +0200 Subject: [PATCH 0552/3452] python: elasticsearch: 7.7.0 -> 7.7.1 --- pkgs/development/python-modules/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 821a890346fc..b04bc9069f71 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.7.0"; + version = "7.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1fm6lalyiy4ayj0mp400dvy629j2av5cqww72w4cg8bqifb83pim"; + sha256 = "9bfcb2bd137d6d7ca123e252b9d7261cfe4f7723f7b749a99c52b47766cf387c"; }; # Check is disabled because running them destroy the content of the local cluster! From e4768fef2642bf78eff500abd8acfe588c5bb989 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:34 +0200 Subject: [PATCH 0553/3452] python: Eve: 1.1 -> 1.1.1 --- pkgs/development/python-modules/eve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 7a74de03d522..062d6e3bedb8 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Eve"; - version = "1.1"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1a7i7x77p5wjqfzmgn30m9sz2mcz06k4qf5af6a45109lafcq0bv"; + sha256 = "dbb409c481ffd5100a5ab13177f6ef6284257e33ac8e5090cd50e42533607ebd"; }; propagatedBuildInputs = [ From 5dc5a3c047067713c746b810cc703722e3889319 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:34 +0200 Subject: [PATCH 0554/3452] python: Flask-SQLAlchemy: 2.4.1 -> 2.4.3 --- pkgs/development/python-modules/flask-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 2453bb50766d..594af9f74bf4 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-SQLAlchemy"; - version = "2.4.1"; + version = "2.4.3"; src = fetchPypi { inherit pname version; - sha256 = "6974785d913666587949f7c2946f7001e4fa2cb2d19f4e69ead02e4b8f50b33d"; + sha256 = "0b656fbf87c5f24109d859bafa791d29751fabbda2302b606881ae5485b557a5"; }; propagatedBuildInputs = [ flask sqlalchemy ]; From 094e742444a7827923401289484160250fe01bd6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:34 +0200 Subject: [PATCH 0555/3452] python: GeoAlchemy2: 0.8.0 -> 0.8.3 --- pkgs/development/python-modules/geoalchemy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index e4fbb37c966e..892b373f065c 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.8.0"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "0kqxm9imqjbhjj5imvf2kl57di454xmnnsr3i0cs66ibq90nx5m8"; + sha256 = "a5a2444d90ce7f2c6b2d7bd7346c8aed16fd32c3e190e631576a51814e8f7ee9"; }; propagatedBuildInputs = [ sqlalchemy shapely ]; From 45c2c3094bdc6cb4c65638597ffd609e2f98e6cc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:34 +0200 Subject: [PATCH 0556/3452] python: google-cloud-resource-manager: 0.30.1 -> 0.30.2 --- .../python-modules/google_cloud_resource_manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix index d1d4217b3ccc..84fac88bcfa9 100644 --- a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix +++ b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "0.30.1"; + version = "0.30.2"; src = fetchPypi { inherit pname version; - sha256 = "03n9ahf4qiyamblh217m5bjc8n57gh09xz87l2iw84c81xxdfcpg"; + sha256 = "de7eba5235df61deee2291a2fe70b904154df613a334109488afdea7a4c0011f"; }; checkInputs = [ pytest mock ]; From e5a0f56b0559641e2edab3bd17cf0a119107dc3e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:34 +0200 Subject: [PATCH 0557/3452] python: google-resumable-media: 0.5.0 -> 0.5.1 --- .../python-modules/google_resumable_media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix index e9c7eecbc3a7..40c8f2596bb1 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google_resumable_media/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "2a8fd188afe1cbfd5998bf20602f76b0336aa892de88fe842a806b9a3ed78d2a"; + sha256 = "97155236971970382b738921f978a6f86a7b5a0b0311703d991e065d3cb55773"; }; checkInputs = [ pytest mock ]; From a89bf42280dd7fc8977f64dc8615353ec6f51f14 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:35 +0200 Subject: [PATCH 0558/3452] python: greenlet: 0.4.15 -> 0.4.16 --- pkgs/development/python-modules/greenlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index f6cff7411d21..c325c9652491 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "greenlet"; - version = "0.4.15"; + version = "0.4.16"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "9416443e219356e3c31f1f918a91badf2e37acf297e2fa13d24d1cc2380f8fbc"; + sha256 = "6e06eac722676797e8fce4adb8ad3dc57a1bb3adfb0dd3fdf8306c055a38456c"; }; propagatedBuildInputs = [ six ]; From f1bcaf94f1f533231ba2ffddf8838def3cc48d87 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:35 +0200 Subject: [PATCH 0559/3452] python: hsaudiotag3k: 1.1.3 -> 1.1.3.post1 --- pkgs/development/python-modules/hsaudiotag3k/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hsaudiotag3k/default.nix b/pkgs/development/python-modules/hsaudiotag3k/default.nix index 28fa42b70f04..d12d3bc8c832 100644 --- a/pkgs/development/python-modules/hsaudiotag3k/default.nix +++ b/pkgs/development/python-modules/hsaudiotag3k/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "hsaudiotag3k"; - version = "1.1.3"; + version = "1.1.3.post1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0bv5k5594byr2bmhh77xv10fkdpckcmxg3w380yp30aqf83rcsx3"; + sha256 = "ef60e9210d4727e82f0095a686cb07b676d055918f0c59c5bfa8598da03e59d1"; }; # no tests From 8deeb9ab730650a8dcdbdbe921b9ad830119bbb7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:35 +0200 Subject: [PATCH 0560/3452] python: httplib2: 0.17.3 -> 0.17.4 --- pkgs/development/python-modules/httplib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index f0191ad8226c..5495c806dc0f 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.17.3"; + version = "0.17.4"; src = fetchPypi { inherit pname version; - sha256 = "39dd15a333f67bfb70798faa9de8a6e99c819da6ad82b77f9a259a5c7b1225a2"; + sha256 = "1e9340ecf0187a621bdcfb407c32e04e8e09fc6ab28b050efa38f20eae0e975f"; }; # Needs setting up From c0a0a0feb29c47adc52eee2f454f134a6cbb1507 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:35 +0200 Subject: [PATCH 0561/3452] python: hvac: 0.10.1 -> 0.10.3 --- pkgs/development/python-modules/hvac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index a783246ee5c3..d68e12b37732 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.10.1"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "1fcd2psvkfsqy45iygm59rzhb7qkbgv3c1dk3x3jvhy6a1ls4kkq"; + sha256 = "391b558a465d1919a2862926ab9a7c6bef1f2ac2c46daf8dd5115080c42978e4"; }; propagatedBuildInputs = [ requests six ]; From 0542d999f38b8d623f1ebb0ea86675b16038d0e6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:35 +0200 Subject: [PATCH 0562/3452] python: identify: 1.4.16 -> 1.4.19 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 19ad7317ce41..9f78298a3f3a 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.16"; + version = "1.4.19"; src = fetchPypi { inherit pname version; - sha256 = "19zk3qmcf0afbcbfnj7cmmgr47pxhjqwa1bfdc3fp60yy10kvbgr"; + sha256 = "249ebc7e2066d6393d27c1b1be3b70433f824a120b1d8274d362f1eb419e3b52"; }; # Tests not included in PyPI tarball From 57b6cc6ebc94664800b055b48fa22fb7cafd5b76 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:35 +0200 Subject: [PATCH 0563/3452] python: isbnlib: 3.10.1 -> 3.10.3 --- pkgs/development/python-modules/isbnlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 11ae3157615a..2c454fd9ce0c 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.1"; + version = "3.10.3"; src = fetchPypi { inherit pname version; - sha256 = "1ky5ynb8p580y2x3vpib6yrvdjgjb0wpqmdfnq5pqi3qzjyzsqra"; + sha256 = "2295c01465fe19776b1f9432fd99fd24e61230d146ded2752e0d980ef6f4101f"; }; checkInputs = [ From b972ba130f826c9f5eb348a6bc71669d6a04b3a3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:35 +0200 Subject: [PATCH 0564/3452] python: jupyterlab: 2.1.2 -> 2.1.4 --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index a8057ed06ae5..8d08fec6f5d9 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "2.1.2"; + version = "2.1.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "380c29d674f6dcf8e380615334c7813bb4feb7bbb6222baf1d4c9f8318f4b104"; + sha256 = "7b5bd4a05330a01c8522ee7f1cda5cb2e0d96412d9e1e879a19b3afb63d4ac69"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; From 1ee5d6a79eb75ffe1c44b89995cfa7fd09b4aa28 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:35 +0200 Subject: [PATCH 0565/3452] python: jupyterlab_server: 1.1.3 -> 1.1.5 --- pkgs/development/python-modules/jupyterlab_server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index cd166b2d801e..9185c2940060 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "1.1.3"; + version = "1.1.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "17eac20af10167abebbeca72e7e390b9c19a400b8fffa158b5cfdcac344253d4"; + sha256 = "3398e401b95da868bc96bdaa44fa61252bf3e68fc9dd1645bd93293cce095f6c"; }; checkInputs = [ requests pytest ]; From dee24966060c9e2691bc8c49e44f72641d8bcc8e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:35 +0200 Subject: [PATCH 0566/3452] python: Keras_Preprocessing: 1.1.0 -> 1.1.2 --- .../python-modules/keras-preprocessing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix index cb4b6d249b60..d62a179136f4 100644 --- a/pkgs/development/python-modules/keras-preprocessing/default.nix +++ b/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Keras_Preprocessing"; - version = "1.1.0"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "1r98nm4k1svsqjyaqkfk23i31bl1kcfcyp7094yyj3c43phfp3as"; + sha256 = "add82567c50c8bc648c14195bf544a5ce7c1f76761536956c3d2978970179ef3"; }; propagatedBuildInputs = [ From 583e7161544e2285463c6d764f4bc7fff91a3855 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:35 +0200 Subject: [PATCH 0567/3452] python: kombu: 4.6.8 -> 4.6.10 --- pkgs/development/python-modules/kombu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 437f03276708..27d225c6f7cf 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "kombu"; - version = "4.6.8"; + version = "4.6.10"; src = fetchPypi { inherit pname version; - sha256 = "0xlv1rsfc3vn22l35csaj939zygd15nzmxbz3bcl981685vxl71d"; + sha256 = "437b9cdea193cc2ed0b8044c85fd0f126bb3615ca2f4d4a35b39de7cacfa3c1a"; }; postPatch = '' From 4b44e08e2a261be7f29a96822c9c3706b4db53b7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:36 +0200 Subject: [PATCH 0568/3452] python: mautrix: 0.5.0 -> 0.5.1 --- 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 1bf23111422d..364b62ef8676 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.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "0hcm2hwryfr6js33zcl2k95wbjrgcj89pi90lka0hjw9vs9bmdz6"; + sha256 = "a8dcf86c3562c1c6c25247b0a1a16f95d821bc8b3805141787c0b9ed8a2b4ca9"; }; propagatedBuildInputs = [ From 7ed4607d26bc0b2f4b04a5d64434b3f180b677bb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:36 +0200 Subject: [PATCH 0569/3452] python: meinheld: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/meinheld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix index 247523a9a830..2941505184de 100644 --- a/pkgs/development/python-modules/meinheld/default.nix +++ b/pkgs/development/python-modules/meinheld/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "meinheld"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "447de7189e4dc9c1f425aa1b9c8210aab492fda4d86f73a24059264e7d8b0134"; + sha256 = "008c76937ac2117cc69e032dc69cea9f85fc605de9bac1417f447c41c16a56d6"; }; propagatedBuildInputs = [ greenlet ]; From 4bbce0ac895f62d57dcb32afc4228dee834a7710 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:36 +0200 Subject: [PATCH 0570/3452] python: msgpack-numpy: 0.4.5 -> 0.4.6.post0 --- pkgs/development/python-modules/msgpack-numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index d646c1ed15f2..9be30fff5383 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msgpack-numpy"; - version = "0.4.5"; + version = "0.4.6.post0"; src = fetchPypi { inherit pname version; - sha256 = "0z3ls52iamqv6fbn1ljnd5nnnzaiakczciry5c3vym5r77wgc9mg"; + sha256 = "dfcb0c9cb5850e656344ac464a260e7b8b9b1c62d77c2e1d3d9ef15a88f1df6b"; }; buildInputs = [ From be85c8751bd219093501fbeb04585a5981d00da2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:36 +0200 Subject: [PATCH 0571/3452] python: multidict: 4.7.5 -> 4.7.6 --- pkgs/development/python-modules/multidict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 155395efa4ad..d818a63cd5d0 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "multidict"; - version = "4.7.5"; + version = "4.7.6"; src = fetchPypi { inherit pname version; - sha256 = "aee283c49601fa4c13adc64c09c978838a7e812f85377ae130a24d7198c0331e"; + sha256 = "fbb77a75e529021e7c4a8d4e823d88ef4d23674a202be4f5addffc72cbb91430"; }; checkInputs = [ pytest pytestrunner pytestcov ]; From d675f6ec07cc4881518f3e9682adcb288973be8b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:36 +0200 Subject: [PATCH 0572/3452] python: phik: 0.9.11 -> 0.9.12 --- pkgs/development/python-modules/phik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index e09182d5e714..ca1b5ba65da7 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "phik"; - version = "0.9.11"; + version = "0.9.12"; format = "wheel"; disabled = !isPy3k; src = fetchPypi { inherit pname version format; python = "py3"; - sha256 = "b8c36dc50265d8c0626b34e3bc74cd0edd342d9d8ecc3d78c06817200bb31d10"; + sha256 = "c4f86e5587e5b456e69bf69d95d07fe7aafc341c40f8f3a21dd5b52272e9ae7b"; }; checkInputs = [ From 10d5c107e9f22bdcc18e6b9d308c4eaef9bd79cc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:36 +0200 Subject: [PATCH 0573/3452] python: phonenumbers: 8.12.4 -> 8.12.5 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 47a60acaa0af..2ba64faad31e 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.4"; + version = "8.12.5"; src = fetchPypi { inherit pname version; - sha256 = "021dc6kdzqh9kkrsbs08x3ibmfm4xr9hqvdnsji6l0knw1zrkia6"; + sha256 = "3586f19abeb92aa6b539d7a4757cb507cf54efcd78224e895caf20fbdde07c26"; }; meta = { From ca39f880b25777a8636d40c2c73e4da1af4b4d19 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:36 +0200 Subject: [PATCH 0574/3452] python: pyenchant: 3.1.0 -> 3.1.1 --- pkgs/development/python-modules/pyenchant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index 1d2686ec2992..1c82f7c9d630 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyenchant"; - version = "3.1.0"; + version = "3.1.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "14is5p40f516plzccwg6yf51zkja38abw46kybzwgyy94phr8i9b"; + sha256 = "ce0915d7acd771fde6e8c2dce8ad0cb0e6f7c4fa8430cc96e3e7134e99aeb12f"; }; propagatedBuildInputs = [ enchant2 ]; From 5e8c7f390a786958c4d72a90681e301433ed449d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:36 +0200 Subject: [PATCH 0575/3452] python: pyhomematic: 0.1.66 -> 0.1.67 --- pkgs/development/python-modules/pyhomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 5349ea994a44..14bf1cfe7be0 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.66"; + version = "0.1.67"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f046db8406ee8a1aea6f6b05de8a133d3459b990c065c3f66446050e9aad5d79"; + sha256 = "2d18e0059367e9e32d6472023322113fce431bcc72187b4a6eb7402fe5d2794b"; }; # PyPI tarball does not include tests/ directory From 2ddec151afb3d6af23f64f174bf17a593c61e6e5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:36 +0200 Subject: [PATCH 0576/3452] python: pysonos: 0.0.28 -> 0.0.31 --- pkgs/development/python-modules/pysonos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index 67e8e5573d7f..427c42545c5a 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.28"; + version = "0.0.31"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "09852c0bfe07e3529f8665527381f586c7ea3beabcd7291311e679d56459069d"; + sha256 = "03f21d2fb27cd938bd2c47f8582c0737eb7426a0cd59e5a60171fabe5e963e62"; }; propagatedBuildInputs = [ xmltodict requests ifaddr ]; From 392cd945eab5d1d6b095fe3d6e87ceec7f8f83a7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:36 +0200 Subject: [PATCH 0577/3452] python: pytest-flake8: 1.0.5 -> 1.0.6 --- pkgs/development/python-modules/pytest-flake8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index af1cbb2add51..a5ed447aceac 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pytest-flake8"; - version = "1.0.5"; + version = "1.0.6"; # although pytest is a runtime dependency, do not add it as # propagatedBuildInputs in order to allow packages depend on another version @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "d85efaafbdb9580791cfa8671799dd40d482fc30bd4476c1ca5efd661e751333"; + sha256 = "1b82bb58c88eb1db40524018d3fcfd0424575029703b4e2d8e3ee873f2b17027"; }; checkPhase = '' From 7869150bd4489f0aefacef8e8b02e43772e58f56 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:36 +0200 Subject: [PATCH 0578/3452] python: pytest: 5.4.2 -> 5.4.3 --- pkgs/development/python-modules/pytest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 9e0cd88cf0a4..daf43961ea67 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -19,7 +19,7 @@ }: buildPythonPackage rec { - version = "5.4.2"; + version = "5.4.3"; pname = "pytest"; disabled = !isPy3k; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "eb2b5e935f6a019317e455b6da83dd8650ac9ffd2ee73a7b657a30873d67a698"; + sha256 = "7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"; }; checkInputs = [ hypothesis pygments ]; From e539d2c543a0bea52c19fe21461672552d62dffa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:37 +0200 Subject: [PATCH 0579/3452] python: python-miio: 0.5.0.1 -> 0.5.1 --- pkgs/development/python-modules/python-miio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 5b8c140df67e..a18645697089 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "python-miio"; - version = "0.5.0.1"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "fa9c318256945ad4a8623fdf921ce81c466a7aea18b04a6711efb662f520b195"; + sha256 = "8d23caf4906f2112dc88b9a6d5e1767877744cae016cd71c2bf75592a4be3b79"; }; checkInputs = [ pytest ]; From 5b92ab4fca163d13e49e8e5ba67a3e5b1d41c3b2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:37 +0200 Subject: [PATCH 0580/3452] python: pytrends: 4.7.2 -> 4.7.3 --- pkgs/development/python-modules/pytrends/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix index db7f781c5bf4..0b0bad801e12 100644 --- a/pkgs/development/python-modules/pytrends/default.nix +++ b/pkgs/development/python-modules/pytrends/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytrends"; - version = "4.7.2"; + version = "4.7.3"; src = fetchPypi { inherit pname version; - sha256 = "1cf80573276b3a93c4fb2ff296c260fa86e7ab43709473ce34f3bad3841f06df"; + sha256 = "8ccb06c57c31fa157b978a0d810de7718ee46583d28cf818250d45f36abd2faa"; }; doCheck = false; From 40121ebad9dadb6c1412af8ff037844312f3769a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:37 +0200 Subject: [PATCH 0581/3452] python: readthedocs-sphinx-ext: 1.0.3 -> 1.0.4 --- .../python-modules/readthedocs-sphinx-ext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index efadd4337126..68ccf676f292 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "faccf1c52aab34b1fdfd672ec4ce4321975453b05741e32a94b33cc682d045b2"; + sha256 = "33dbb135373d539233f7fbdb5e8dcfa07d41254300ee23719eb9caa8c68a40ae"; }; propagatedBuildInputs = [ requests ]; From 88482ad59e5ab2f976bf99005a233b92734f5bf4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:37 +0200 Subject: [PATCH 0582/3452] python: restructuredtext_lint: 1.3.0 -> 1.3.1 --- .../python-modules/restructuredtext_lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index 4f62d232ab5e..17bf5fbf2974 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "restructuredtext_lint"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "97b3da356d5b3a8514d8f1f9098febd8b41463bed6a1d9f126cf0a048b6fd908"; + sha256 = "470e53b64817211a42805c3a104d2216f6f5834b22fe7adb637d1de4d6501fb8"; }; checkInputs = [ nose testtools ]; From 5d127f5eb082df201c4ea0bc111bbb3586e4ab9c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:37 +0200 Subject: [PATCH 0583/3452] python: rethinkdb: 2.4.6 -> 2.4.7 --- pkgs/development/python-modules/rethinkdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix index fc33d7206e76..f1239b75d481 100644 --- a/pkgs/development/python-modules/rethinkdb/default.nix +++ b/pkgs/development/python-modules/rethinkdb/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "rethinkdb"; - version = "2.4.6"; + version = "2.4.7"; src = fetchPypi { inherit pname version; - sha256 = "4eb4252b498af3f5d01e07d7870eb35f78b96bccc45812d313c14c5184789d74"; + sha256 = "945b5efdc10f468fc056bd53a4e4224ec4c2fe1a7e83ae47443bbb6e7c7a1f7d"; }; doCheck = false; From 5bb225edad4de915b9a1b310a8a758593cc4d558 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:37 +0200 Subject: [PATCH 0584/3452] python: snapcast: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/snapcast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 6e319a183418..93d7d1d9d9cf 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "snapcast"; - version = "2.1.0"; + version = "2.1.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1z3c9p22pm3823jzh917c3rryv02mhigrjkjf9wlhzmjwx5vmjqf"; + sha256 = "c3ecd63d997fbcf6e5322dc47c1f02615f1d9611cba01ec18e9c9f8c14ed824b"; }; checkInputs = [ pytest ]; From 450b10c793a4111d239fe4456988548bb0eeb453 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:37 +0200 Subject: [PATCH 0585/3452] python: snowflake-connector-python: 2.2.5 -> 2.2.7 --- .../python-modules/snowflake-connector-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 0b14a97b647f..1d8389d80640 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.2.5"; + version = "2.2.7"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "2f720c4989b2ad92c1fc3c221f049102155f2d8006527daa15f2b54ecfdaf652"; + sha256 = "84974778dd8d1efd4ff87d8404d71241f90e02044b1b94a52eea567080f93ac4"; }; propagatedBuildInputs = [ From 2c2f09b6d084f8e818312a83cb04f2f4a33cbd88 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:37 +0200 Subject: [PATCH 0586/3452] python: snscrape: 0.3.1 -> 0.3.2 --- pkgs/development/python-modules/snscrape/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index 9f0b805a19da..4370388959d0 100644 --- a/pkgs/development/python-modules/snscrape/default.nix +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "snscrape"; - version = "0.3.1"; + version = "0.3.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "11jv5mv3l11qjlsjihd74gc1jafq0i7360cksqjkx1wv2hcc32rf"; + sha256 = "ea038827afe439577eb109ebd1b5c481d516d489c624fc3fe6e92ec71ef42be9"; }; # There are no tests; make sure the executable works. From 367bdcb29b9e9122f5a63798e242b563e236749c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:37 +0200 Subject: [PATCH 0587/3452] python: soupsieve: 1.9.5 -> 1.9.6 --- pkgs/development/python-modules/soupsieve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index b8cdd63cbde5..bb5ecbc839c2 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "soupsieve"; - version = "1.9.5"; + version = "1.9.6"; src = fetchPypi { inherit pname version; - sha256 = "e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda"; + sha256 = "7985bacc98c34923a439967c1a602dc4f1e15f923b6fcf02344184f86cc7efaa"; }; checkPhase = '' From e72fec734818fb1bd58f44aaf08b644be896a435 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:37 +0200 Subject: [PATCH 0588/3452] python: sphinxcontrib-katex: 0.6.0 -> 0.6.1 --- .../python-modules/sphinxcontrib-katex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index d3c9fe152806..95bd4b592010 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-katex"; - version = "0.6.0"; + version = "0.6.1"; # pkgutil namespaces are broken in nixpkgs (because they can't scan multiple # directories). But python2 is EOL, so not supporting it should be ok. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1692q3f3z1rsd3nyxd8wrv0vscwcq2gqjbv79c8ws402y3m7y5ni"; + sha256 = "88320b2780f350d67f84a5424973ce24aee65701e8e163a7f5856c5df3353188"; }; propagatedBuildInputs = [ sphinx ]; From 286151c07eed0661f2ce1a6b168e98461fba7953 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:37 +0200 Subject: [PATCH 0589/3452] python: SQLAlchemy: 1.3.16 -> 1.3.17 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 9be357fbed33..cd2b00021e7b 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.3.16"; + version = "1.3.17"; src = fetchPypi { inherit pname version; - sha256 = "0w1xfy7j1h0dyfwk6zc6lfbv2m77lmxk7g17sbgpi08bq0kf293j"; + sha256 = "156a27548ba4e1fed944ff9fcdc150633e61d350d673ae7baaf6c25c04ac1f71"; }; checkInputs = [ From 45fd228ad68aeb2b95bc16067b998b07fc314841 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:38 +0200 Subject: [PATCH 0590/3452] python: sqlmap: 1.4.5 -> 1.4.6 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index bc94ad50861a..81aede240eeb 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.4.5"; + version = "1.4.6"; src = fetchPypi { inherit pname version; - sha256 = "1ec0d320aca95be3ba53d1af0faefc047864dfe6328622ae10e33a6ed9446ca8"; + sha256 = "0da3a6700a370fcd671265502c7c4aca39a1d055de9a1dcc8b9b751c9ad3efa8"; }; postPatch = '' From d755f0c4342e745f5f9be70bbf07dcc1f70babd0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:38 +0200 Subject: [PATCH 0591/3452] python: stytra: 0.8.27 -> 0.8.33 --- pkgs/development/python-modules/stytra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index 970fe5a19878..8ca61b3b29ca 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -30,12 +30,12 @@ buildPythonPackage rec { pname = "stytra"; - version = "0.8.27"; + version = "0.8.33"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8fc1ca5f75f47ec1eeb3d62722437bed4ddf598e130b3dd22f0e663f61857df5"; + sha256 = "b0aacc8e2c1bba33c337ebc76c0d8f2971c113d298aea2a375d84a5eeff5d83e"; }; doCheck = false; checkInputs = [ From 6061ddbd16d3fa83434bb7c9c125abf2b5e96298 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:38 +0200 Subject: [PATCH 0592/3452] python: toml: 0.10.0 -> 0.10.1 --- pkgs/development/python-modules/toml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/toml/default.nix b/pkgs/development/python-modules/toml/default.nix index 29d0a4c692f3..8e96efcdf444 100644 --- a/pkgs/development/python-modules/toml/default.nix +++ b/pkgs/development/python-modules/toml/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "toml"; - version = "0.10.0"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "0p1xww2mzkhqvxkfvmfzm58bbfj812zhdz4rwdjiv94ifz2q37r2"; + sha256 = "926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f"; }; # This package has a test script (built for Travis) that involves a) From 3b3d4f9dbef0e9c7258f1f66c55bdf07d6ef22b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:38 +0200 Subject: [PATCH 0593/3452] python: trimesh: 3.6.38 -> 3.6.43 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index be135f651213..c6d1ba00a850 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.6.38"; + version = "3.6.43"; src = fetchPypi { inherit pname version; - sha256 = "0rdffk6a1jlfanb4i0prvy68qya8waa390yyw2kix4ja8fk7y6sx"; + sha256 = "f62dbaf4739858148fe4889f3b4dff93da281982b6592f211c4d33c2e00678eb"; }; propagatedBuildInputs = [ numpy ]; From cff7a0a45c2df1da9aeda7488ccb642b9faaa612 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:38 +0200 Subject: [PATCH 0594/3452] python: txdbus: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/txdbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/txdbus/default.nix b/pkgs/development/python-modules/txdbus/default.nix index 0fbe4900f9e5..8ef694d34ff2 100644 --- a/pkgs/development/python-modules/txdbus/default.nix +++ b/pkgs/development/python-modules/txdbus/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "txdbus"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0z41n1ikpdvk0nm8dbyh6g9bg781q4j6hg2b09b5k4wdqm17zxbg"; + sha256 = "eefcffa4efbf82ba11222f17f5989fe1b2b6ef57226ef896c4a7084c990ba217"; }; propagatedBuildInputs = [ six twisted ]; From a605db4dade43b6219e82bd1d2856a83bf49898d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:38 +0200 Subject: [PATCH 0595/3452] python: uproot: 3.11.5 -> 3.11.7 --- pkgs/development/python-modules/uproot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 55c215ac75a3..3d472a604d64 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.11.5"; + version = "3.11.7"; src = fetchPypi { inherit pname version; - sha256 = "05bb55d0576813bb7bf252654cf854fcbabe34e30eb99beb70eff6abc4d3f121"; + sha256 = "3fbf9dfe5ce996ffda3a49d16eba804b95fb05bc041fc4e7bc05317a03bf6cba"; }; nativeBuildInputs = [ pytestrunner ]; From 9ea63f43bd6252c19c66c82124364d1862155a06 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:38 +0200 Subject: [PATCH 0596/3452] python: vertica-python: 0.10.3 -> 0.10.4 --- pkgs/development/python-modules/vertica-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index cfbfcde6fd50..8beb39b26d9e 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "0.10.3"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "0de23c0a09f0d849db626569207d52d324ffd51c69b4f7f3650f167c3c2c9de9"; + sha256 = "570525d0371806993874bd2ee0f47cc5d68994abb5aa382e964e53e0b81160b2"; }; propagatedBuildInputs = [ future dateutil six ]; From 0ae13cede4db5e5dbdc09f8ac11da383c4d4dac9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:38 +0200 Subject: [PATCH 0597/3452] python: zeroc-ice: 3.7.3 -> 3.7.4 --- pkgs/development/python-modules/zeroc-ice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index ccc34b42afb4..16bf5b7855c5 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.3"; + version = "3.7.4"; src = fetchPypi { inherit version pname; - sha256 = "1adec3b54c77c46acfc8a99d6336ce9a0223a7016852666358133cbe37d99744"; + sha256 = "dc79a1eaad1d1cd1cf8cfe636e1bc413c60645e3e87a5a8e9b97ce882690e0e4"; }; buildInputs = [ openssl bzip2 ]; From ae2ac95acef13d75ef67bb934def00a37a719080 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:38 +0200 Subject: [PATCH 0598/3452] python: zeroconf: 0.26.1 -> 0.26.3 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index d293ae449c1d..e9d3c6e038ea 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.26.1"; + version = "0.26.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "09rvliph7phvgzwmmdv1kwcp3andpiiqfpkrwq1vkxvwqa3mgwji"; + sha256 = "43ad5006c00be2040cdca1fe768206f4a25356d3cc87eff8b66bd7ead2a82440"; }; propagatedBuildInputs = [ ifaddr ] From cff356b82dac00704576c2b3f0893f1bb04be646 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 5 Jun 2020 19:44:38 +0200 Subject: [PATCH 0599/3452] python: zstd: 1.4.4.0 -> 1.4.5.1 --- pkgs/development/python-modules/zstd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index c96e08ccb513..8f61f2ffc66e 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zstd"; - version = "1.4.4.0"; + version = "1.4.5.1"; src = fetchPypi { inherit pname version; - sha256 = "33f2c1fd8d3f9ac8e35fb3e199896afc54cceb68878570c6d4b72985dc6584a5"; + sha256 = "2a1806d625bd2d8944ead4b3018fc6444a31467fa09935e9c1d4296275f024c6"; }; postPatch = '' From e2309df85ead6611394693ead92ca99a94caec4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 6 Jun 2020 09:48:21 +0200 Subject: [PATCH 0600/3452] pythonPackages.pipBuildHook: do not build in an isolated environment When a PEP 517 project file is present, pip will not install prerequisites in `site-packages`: https://pip.pypa.io/en/stable/reference/pip/#pep-517-and-518-support For the shell hook, this has the consequence that the generated temporary directory that is added to PYTHONPATH does not contain `site.py`. As a result, Python does not discover the Python module. Thus when a user executes nix-shell in a project, they cannot import the project's Python module. This change adds the `--no-build-isolation` option to pip when creating the editable environment, to correctly generate `site.py`, even when a `pyproject.toml` is present. --- pkgs/development/interpreters/python/hooks/pip-build-hook.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh index 292f13d30154..6dd384b4847f 100644 --- a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh @@ -24,7 +24,8 @@ pipShellHook() { export PATH="$tmp_path/bin:$PATH" export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH" mkdir -p "$tmp_path/@pythonSitePackages@" - @pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" >&2 + @pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" \ + --no-build-isolation >&2 fi runHook postShellHook From 1e2b6695cf8c71b3a0605bf0edd53d8d19d4545e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 6 Jun 2020 09:55:05 +0200 Subject: [PATCH 0601/3452] pythonPackages.setuptoolsBuildHook: do not build in an isolated environment When a PEP 517 project file is present, pip will not install prerequisites in `site-packages`: https://pip.pypa.io/en/stable/reference/pip/#pep-517-and-518-support For the shell hook, this has the consequence that the generated temporary directory that is added to PYTHONPATH does not contain `site.py`. As a result, Python does not discover the Python module. Thus when a user executes nix-shell in a project, they cannot import the project's Python module. This change adds the `--no-build-isolation` option to pip when creating the editable environment, to correctly generate `site.py`, even when a `pyproject.toml` is present. --- .../interpreters/python/hooks/setuptools-build-hook.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh index 2aec92793825..311590425e68 100644 --- a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh @@ -29,7 +29,8 @@ setuptoolsShellHook() { export PATH="$tmp_path/bin:$PATH" export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH" mkdir -p "$tmp_path/@pythonSitePackages@" - eval "@pythonInterpreter@ -m pip install -e . --prefix $tmp_path >&2" + eval "@pythonInterpreter@ -m pip install -e . --prefix $tmp_path \ + --no-build-isolation >&2" fi runHook postShellHook From d8f46b9da0cb9a08e0b278b8e77f327dce7cdb77 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Fri, 5 Jun 2020 20:01:27 +0200 Subject: [PATCH 0602/3452] stig: update to 0.11.0a --- pkgs/applications/networking/p2p/stig/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index 6b1a7ace902a..98fd41e8bcd1 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "stig"; # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig - version = "0.10.1a"; + version = "0.11.0a"; src = fetchFromGitHub { owner = "rndusr"; repo = "stig"; rev = "v${version}"; - sha256 = "076rlial6h1nhwdxf1mx5nf2zld5ci43cadj9wf8xms7zn8s6c8v"; + sha256 = "192v8f80jfly12bqzsslpxlvm72kdqm3jl40x1az5czpg4ab3lb7"; }; # urwidtrees 1.0.3 is requested by the developer because 1.0.2 (which is packaged @@ -34,7 +34,6 @@ python3Packages.buildPythonApplication rec { pyxdg blinker natsort - maxminddb setproctitle ]; @@ -53,6 +52,8 @@ python3Packages.buildPythonApplication rec { "tests" # test_string__month_day_hour_minute_second fails on darwin "--deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second" + # TestScrollBarWithScrollable.test_wrapping_bug fails + "--deselect=tests/tui_test/scroll_test.py::TestScrollBarWithScrollable::test_wrapping_bug" ]; meta = with lib; { From d13a479d6e9e04807d957ee1702736cfc295dcaf Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Sat, 6 Jun 2020 12:18:35 +0200 Subject: [PATCH 0603/3452] vscode, vscodium: 1.45.0 -> 1.45.1 --- pkgs/applications/editors/vscode/vscode.nix | 6 +++--- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 5aa5881ec5a8..e6e767c7db22 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "16zchjp72m6n6za4ak5kn2ax1s5pjfn7l082d6gfbb2y62isvs7q"; - x86_64-darwin = "0w35s6nxagcnd6xcm6bp0m63agkqxffig61cr3nnmpbcgj9zc969"; + x86_64-linux = "0zdg6z6h0h8vvwdrnihwd76bik41spv6xbw7cdh7hz97sjsh15zq"; + x86_64-darwin = "1c5c24vj8nqsxx8hwfj04as7vsl9gnl97yniw36pdfgv88v8qzin"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.45.0"; + version = "1.45.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 5c7cb3fe6fc9..8a191e157fa0 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1wb4s2jw90irlawgl6539gwl0xwaxglaksmbcddbvnr6rq3ypn8n"; - x86_64-darwin = "16c1r7knfd5pfqhnk77nanh82azkc28pwkqfcyasbdgm70k17d3p"; + x86_64-linux = "1m965d8ggg2ffbhyrgadfrgikcavyjszc3sgbsd930b8pxrmqlxp"; + x86_64-darwin = "017fj7imjxa0n3r7c9kcz7192rxkw18bry6rfkv2hycfja70j5qj"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.45.0"; + version = "1.45.1"; pname = "vscodium"; executableName = "codium"; From a81bb16ff01d302ae59f4087ad5da79405157615 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 11:25:42 +0000 Subject: [PATCH 0604/3452] libheif: 1.6.2 -> 1.7.0 --- pkgs/development/libraries/libheif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index b5717034da0e..d147820cff1c 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libheif"; - version = "1.6.2"; + version = "1.7.0"; outputs = [ "bin" "out" "dev" "man" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "0ngbzban585hsgs6fb6fkhccc91kxn1n59qvqjp8bw41l24i3nr2"; + sha256 = "0alri5h486ck9b5z6wwrmlpzydhz58l223z3zxkizqrzxlllhr6p"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 5a8de771660e9160e8a1cbd160d272727d6c2b5e Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 17 May 2020 02:47:51 +0100 Subject: [PATCH 0605/3452] mercurial: 5.3.1 -> 5.4.1 --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index ffbd98791358..47453cb5e6fe 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -8,11 +8,11 @@ let in python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.3.1"; + version = "5.4.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "1nbjpzjrzgql4hrvslpxwbcgn885ikq6ba1yb4w6p78rw9nzkhgp"; + sha256 = "1ilam0dz121nn4852jgkgyzyrvk3hn5cqnivy8gk1qg815mh4763"; }; format = "other"; From 86127634c4d8f84d89c82f47bf5e30a13bbe89c9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 12:07:22 +0000 Subject: [PATCH 0606/3452] lite: 1.05 -> 1.06 --- pkgs/applications/editors/lite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/lite/default.nix b/pkgs/applications/editors/lite/default.nix index 34800d7f0235..d938edaa6e9e 100644 --- a/pkgs/applications/editors/lite/default.nix +++ b/pkgs/applications/editors/lite/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "lite"; - version = "1.05"; + version = "1.06"; src = fetchFromGitHub { owner = "rxi"; repo = pname; rev = "v${version}"; - sha256 = "0xh29ddl5h92n1c4nlh4kx9mchwkzn4r3l16kklix3a1jm1c878a"; + sha256 = "1lw4a6xv8pdlgwnhh870caij4iyzxdyjw4qmm4fswja9mbqkj32f"; }; nativeBuildInputs = [ makeWrapper pkg-config ]; From e51b28bfd0e247f6f9f150229dc722f5311665db Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 12:36:54 +0000 Subject: [PATCH 0607/3452] micronaut: 1.3.5 -> 1.3.6 --- pkgs/development/tools/micronaut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index e781bb80ac8c..6d9149d4107a 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "1.3.5"; + version = "1.3.6"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "16n1dk9jgy78mrkvr78m4x772kn09y5aa4d06wl4sdgn6apcq2mc"; + sha256 = "0jmj5xpj4invvpp289gh81vq7b4mmfhqb2h50yjn7wgdicyn295a"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 845f0a5e44907943306ecf04f37016d79276edc8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 12:45:44 +0000 Subject: [PATCH 0608/3452] mill: 0.7.1 -> 0.7.3 --- pkgs/development/tools/build-managers/mill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index dffdbdb9aed4..44ff87d71a4a 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.7.1"; + version = "0.7.3"; src = fetchurl { url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "1fa7cjrp16618hj6xzrxiy44ghxvzgkvygzdzyi8jj2y5jnwxf10"; + sha256 = "10rjhkncxswbh30jsq7j4is5ngp1r737j45xdwl9z1frmwz6l67d"; }; nativeBuildInputs = [ makeWrapper ]; From 6d1ca7db4abbc7c8851df8c89683763396aebb83 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Sun, 29 Mar 2020 20:50:14 +0200 Subject: [PATCH 0609/3452] nixos/{modules,tests}/teeworlds: init add module and test --- nixos/modules/module-list.nix | 1 + nixos/modules/services/games/teeworlds.nix | 119 +++++++++++++++++++++ nixos/tests/teeworlds.nix | 55 ++++++++++ pkgs/games/teeworlds/default.nix | 3 + 4 files changed, 178 insertions(+) create mode 100644 nixos/modules/services/games/teeworlds.nix create mode 100644 nixos/tests/teeworlds.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 978d33e75852..5c5281b730f3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -334,6 +334,7 @@ ./services/games/minecraft-server.nix ./services/games/minetest-server.nix ./services/games/openarena.nix + ./services/games/teeworlds.nix ./services/games/terraria.nix ./services/hardware/acpid.nix ./services/hardware/actkbd.nix diff --git a/nixos/modules/services/games/teeworlds.nix b/nixos/modules/services/games/teeworlds.nix new file mode 100644 index 000000000000..babf989c98ca --- /dev/null +++ b/nixos/modules/services/games/teeworlds.nix @@ -0,0 +1,119 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.teeworlds; + register = cfg.register; + + teeworldsConf = pkgs.writeText "teeworlds.cfg" '' + sv_port ${toString cfg.port} + sv_register ${if cfg.register then "1" else "0"} + ${optionalString (cfg.name != null) "sv_name ${cfg.name}"} + ${optionalString (cfg.motd != null) "sv_motd ${cfg.motd}"} + ${optionalString (cfg.password != null) "password ${cfg.password}"} + ${optionalString (cfg.rconPassword != null) "sv_rcon_password ${cfg.rconPassword}"} + ${concatStringsSep "\n" cfg.extraOptions} + ''; + +in +{ + options = { + services.teeworlds = { + enable = mkEnableOption "Teeworlds Server"; + + openPorts = mkOption { + type = types.bool; + default = false; + description = "Whether to open firewall ports for Teeworlds"; + }; + + name = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Name of the server. Defaults to 'unnamed server'. + ''; + }; + + register = mkOption { + type = types.bool; + example = true; + default = false; + description = '' + Whether the server registers as public server in the global server list. This is disabled by default because of privacy. + ''; + }; + + motd = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Set the server message of the day text. + ''; + }; + + password = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Password to connect to the server. + ''; + }; + + rconPassword = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Password to access the remote console. If not set, a randomly generated one is displayed in the server log. + ''; + }; + + port = mkOption { + type = types.int; + default = 8303; + description = '' + Port the server will listen on. + ''; + }; + + extraOptions = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra configuration lines for the teeworlds.cfg. See Teeworlds Documentation. + ''; + example = [ "sv_map dm1" "sv_gametype dm" ]; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall = mkIf cfg.openPorts { + allowedUDPPorts = [ cfg.port ]; + }; + + systemd.services.teeworlds = { + description = "Teeworlds Server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + DynamicUser = true; + ExecStart = "${pkgs.teeworlds}/bin/teeworlds_srv -f ${teeworldsConf}"; + + # Hardening + CapabilityBoundingSet = false; + PrivateDevices = true; + PrivateUsers = true; + ProtectHome = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + SystemCallArchitectures = "native"; + }; + }; + }; +} diff --git a/nixos/tests/teeworlds.nix b/nixos/tests/teeworlds.nix new file mode 100644 index 000000000000..edf588968788 --- /dev/null +++ b/nixos/tests/teeworlds.nix @@ -0,0 +1,55 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +let + client = + { pkgs, ... }: + + { imports = [ ./common/x11.nix ]; + environment.systemPackages = [ pkgs.teeworlds ]; + }; + +in { + name = "teeworlds"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ hax404 ]; + }; + + nodes = + { server = + { services.teeworlds = { + enable = true; + openPorts = true; + }; + }; + + client1 = client; + client2 = client; + }; + + testScript = + '' + start_all() + + server.wait_for_unit("teeworlds.service") + server.wait_until_succeeds("ss --numeric --udp --listening | grep -q 8303") + + client1.wait_for_x() + client2.wait_for_x() + + client1.execute("teeworlds 'player_name Alice;connect server'&") + server.wait_until_succeeds( + 'journalctl -u teeworlds -e | grep --extended-regexp -q "team_join player=\'[0-9]:Alice"' + ) + + client2.execute("teeworlds 'player_name Bob;connect server'&") + server.wait_until_succeeds( + 'journalctl -u teeworlds -e | grep --extended-regexp -q "team_join player=\'[0-9]:Bob"' + ) + + server.sleep(10) # wait for a while to get a nice screenshot + + client1.screenshot("screen_client1") + client2.screenshot("screen_client2") + ''; + +}) diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 3035c02e2623..9ff50d533bec 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,5 +1,6 @@ { fetchFromGitHub, stdenv, cmake, pkgconfig, python3, alsaLib , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack, icoutils +, nixosTests }: stdenv.mkDerivation rec { @@ -36,6 +37,8 @@ stdenv.mkDerivation rec { install -D $src/other/teeworlds.desktop $out/share/applications/teeworlds.desktop ''; + passthru.tests.teeworlds = nixosTests.teeworlds; + meta = { description = "Retro multiplayer shooter game"; From b94b0e419aba8cf4f5c0b10249849dd1e5a025a5 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 5 Jun 2020 16:20:39 +0100 Subject: [PATCH 0610/3452] deno: 1.0.0 -> 1.0.5 Dropped tests as they were running inconsistently. Removed python as if the rusty_v8 lib is present no python is ran. Will be happy to add them back in once resolved. --- pkgs/development/web/deno/default.nix | 70 ++++----------------------- 1 file changed, 9 insertions(+), 61 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 629c1eeb41a1..dda9e7a5a8dd 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -3,29 +3,15 @@ , fetchFromGitHub , rust , rustPlatform -, python27 , installShellFiles , Security , CoreServices }: let - pname = "deno"; - version = "1.0.0"; - - denoSrc = fetchFromGitHub { - owner = "denoland"; - repo = pname; - rev = "v${version}"; - sha256 = "0k8mqy1hf9hkp60jhd0x4z814y36g51083b3r7prc69ih2523hd1"; - - fetchSubmodules = true; - }; - cargoSha256 = "1fjl07qqvl1f20qazcqxh32xmdfh80jni7i3jzvz6vgsfw1g5cmk"; - - rustyV8Lib = fetchlib "rusty_v8" "0.4.2" { - x86_64-linux = "1ac6kv3kv087df6kdgfd7kbh24187cg9z7xhbz6rw6jjv4ci2zbi"; - aarch64-linux = "06iyjx4p4vp2i81wdy0vxai2k18pki972ff7k0scjqrgmnav1p8k"; - x86_64-darwin = "02hwbpsqdzb9mvfndgykvv44f1jig3w3a26l0h26hs5shsrp47jv"; + rustyV8Lib = fetchlib "rusty_v8" "0.5.0" { + x86_64-linux = "1jmrqf5ns2y51cxx9r88my15m6gc6wmg54xadi3kphq47n4hmdfw"; + aarch64-linux = "14v57pxpkz1fs483rbbc8k55rc4x41dqi0k12zdrjwa5ycdam3m5"; + x86_64-darwin = "0466px7k2zvbsswwcrr342i5ml669gf76xd8yzzypsmb7l71s6vr"; }; arch = rust.toRustTarget stdenv.hostPlatform; @@ -40,15 +26,8 @@ rustPlatform.buildRustPackage rec { src = denoSrc; - nativeBuildInputs = [ - # chromium/V8 requires python 2.7, we're not building V8 from source - # but as a result rusty_v8's download script also uses python 2.7 - # tracking issue: https://bugs.chromium.org/p/chromium/issues/detail?id=942720 - python27 - - # Install completions post-install - installShellFiles - ]; + # Install completions post-install + nativeBuildInputs = [ installShellFiles ]; buildInputs = with stdenv.lib; [ ] ++ optionals stdenv.isDarwin [ Security CoreServices ]; @@ -77,40 +56,9 @@ rustPlatform.buildRustPackage rec { _rusty_v8_setup "debug" "release" "${arch}/release" ''; - # Set home to existing env var TMP dir so tests that write there work correctly - preCheck = '' - export HOME="$TMPDIR" - ''; - - checkFlags = [ - # Strace not allowed on hydra - "--skip benchmark_test" - - # Tests that try to write to `/build/source/target/debug` - "--skip _017_import_redirect" - "--skip https_import" - "--skip js_unit_tests" - "--skip lock_write_fetch" - - # Cargo test runs a deno test on the std lib with sub-benchmarking-tests, - # The sub-sub-tests that are failing: - # forAwaitFetchDenolandX10, promiseAllFetchDenolandX10is - # Trying to access https://deno.land/ on build's limited network access - "--skip std_tests" - - # Fails on aarch64 machines - # tracking issue: https://github.com/denoland/deno/issues/5324 - "--skip run_v8_flags" - - # Skip for multiple reasons: - # downloads x86_64 binary on aarch64 machines - # tracking issue: https://github.com/denoland/deno/pull/5402 - # downloads a binary that needs ELF patching & tries to run imediately - # upgrade will likely never work with nix as it tries to replace itself - # code: https://github.com/denoland/deno/blob/v1.0.0/cli/upgrade.rs#L211 - "--skip upgrade_in_tmpdir" - "--skip upgrade_with_version_in_tmpdir" - ]; + # Tests have some inconsistencies between runs with output integration tests + # Skipping until resolved + doCheck = false; # TODO: Move to enhanced installShellCompletion when merged: PR #83630 postInstall = '' From 6c03b04e93055648997e0ffb246f88eb11899b62 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sat, 6 Jun 2020 15:10:37 +0100 Subject: [PATCH 0611/3452] deno: refactor ready for an updateScript Refactored the structure of the package to be easier to auto update --- pkgs/development/web/deno/default.nix | 36 +++++++++++---------------- pkgs/development/web/deno/deps.nix | 12 +++++++++ 2 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/web/deno/deps.nix diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index dda9e7a5a8dd..cb6de9447ac4 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -8,23 +8,26 @@ , CoreServices }: let - rustyV8Lib = fetchlib "rusty_v8" "0.5.0" { - x86_64-linux = "1jmrqf5ns2y51cxx9r88my15m6gc6wmg54xadi3kphq47n4hmdfw"; - aarch64-linux = "14v57pxpkz1fs483rbbc8k55rc4x41dqi0k12zdrjwa5ycdam3m5"; - x86_64-darwin = "0466px7k2zvbsswwcrr342i5ml669gf76xd8yzzypsmb7l71s6vr"; - }; - + deps = import ./deps.nix { }; arch = rust.toRustTarget stdenv.hostPlatform; - fetchlib = name: version: sha256: fetchurl { - url = "https://github.com/denoland/${name}/releases/download/v${version}/librusty_v8_release_${arch}.a"; - sha256 = sha256."${stdenv.hostPlatform.system}"; + rustyV8Lib = with deps.rustyV8Lib; fetchurl { + url = "https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${arch}.a"; + sha256 = sha256s."${stdenv.hostPlatform.system}"; meta = { inherit version; }; }; in rustPlatform.buildRustPackage rec { - inherit pname version cargoSha256; + pname = "deno"; + version = "1.0.5"; - src = denoSrc; + src = fetchFromGitHub { + owner = "denoland"; + repo = pname; + rev = "v${version}"; + sha256 = "1hlmgcppr01bddvp28js010hhlzyx2lm7g7lq9nrcjazfw7kd2pf"; + fetchSubmodules = true; + }; + cargoSha256 = "1jqaryr7np6h65a1bqr952h0vllsvd6v6v6wvivc7933dcbhdal4"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; @@ -35,16 +38,6 @@ rustPlatform.buildRustPackage rec { # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem # To avoid this we pre-download the file and place it in the locations it will require it in advance preBuild = '' - # Check the rusty_v8 lib downloaded matches the Cargo.lock file - rusty_v8_ver="$(grep 'name = "rusty_v8"' -A 1 Cargo.lock | grep "version =" | cut -d\" -f2)" - if [ "${rustyV8Lib.meta.version}" != "$rusty_v8_ver" ]; then - printf "%s\n" >&2 \ - "version mismatch between 'rusty_v8' in Cargo.lock and downloaded library:" \ - " wanted: ${rustyV8Lib.meta.version}" \ - " got: $rusty_v8_ver" - exit 1 - fi; - _rusty_v8_setup() { for v in "$@"; do dir="target/$v/gn_out/obj" @@ -70,6 +63,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { homepage = "https://deno.land/"; + changelog = "${src.meta.homepage}/releases/tag/v${version}"; description = "A secure runtime for JavaScript and TypeScript"; longDescription = '' Deno aims to be a productive and secure scripting environment for the modern programmer. diff --git a/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix new file mode 100644 index 000000000000..9218e8ad97d2 --- /dev/null +++ b/pkgs/development/web/deno/deps.nix @@ -0,0 +1,12 @@ +# auto-generated file -- DO NOT EDIT! +{}: +rec { + rustyV8Lib = { + version = "0.5.0"; + sha256s = { + x86_64-linux = "1jmrqf5ns2y51cxx9r88my15m6gc6wmg54xadi3kphq47n4hmdfw"; + aarch64-linux = "14v57pxpkz1fs483rbbc8k55rc4x41dqi0k12zdrjwa5ycdam3m5"; + x86_64-darwin = "0466px7k2zvbsswwcrr342i5ml669gf76xd8yzzypsmb7l71s6vr"; + }; + }; +} From 55da692e6f9c82b82e1637fbd3806bad66800669 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sat, 6 Jun 2020 15:42:45 +0100 Subject: [PATCH 0612/3452] deno: add updateScript for automatic updates This'll save time and avoid human error. Wrote in deno typescript because why not. --- pkgs/development/web/deno/default.nix | 2 + pkgs/development/web/deno/update/common.ts | 52 ++++++++++++++ pkgs/development/web/deno/update/deps.ts | 79 ++++++++++++++++++++++ pkgs/development/web/deno/update/src.ts | 67 ++++++++++++++++++ pkgs/development/web/deno/update/update.ts | 50 ++++++++++++++ 5 files changed, 250 insertions(+) create mode 100644 pkgs/development/web/deno/update/common.ts create mode 100644 pkgs/development/web/deno/update/deps.ts create mode 100644 pkgs/development/web/deno/update/src.ts create mode 100755 pkgs/development/web/deno/update/update.ts diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index cb6de9447ac4..28e438fa1e95 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -61,6 +61,8 @@ rustPlatform.buildRustPackage rec { installShellCompletion deno.{bash,fish} --zsh _deno ''; + passthru.updateScript = ./update/update.ts; + meta = with stdenv.lib; { homepage = "https://deno.land/"; changelog = "${src.meta.homepage}/releases/tag/v${version}"; diff --git a/pkgs/development/web/deno/update/common.ts b/pkgs/development/web/deno/update/common.ts new file mode 100644 index 000000000000..71e4d638f8d7 --- /dev/null +++ b/pkgs/development/web/deno/update/common.ts @@ -0,0 +1,52 @@ +interface GHRelease { + tag_name: string; +} + +const decode = (buffer: Uint8Array) => new TextDecoder("utf-8").decode(buffer); +const run = async (command: string, args: string[]) => { + const cmd = Deno.run( + { cmd: [command, ...args], stdout: "piped", stderr: "piped" }, + ); + if (!(await cmd.status()).success) { + throw await cmd.stderrOutput().then((b) => decode(b)); + } + return cmd.output().then((b) => decode(b).trimEnd()); +}; + +// Exports +export const versionRegExp = /\d+\.\d+\.\d+/; +export const sha256RegExp = /[a-z0-9]{52}/; + +export async function commit( + name: string, + oldVer: string, + newVer: string, + files: string[], +) { + await run("git", ["add", ...files]); + await run("git", ["commit", "-m", `${name}: ${oldVer} -> ${newVer}`]); +} + +export const getExistingVersion = async (filePath: string) => + read(filePath).then((s) => + s.match(genValueRegExp("version", versionRegExp))?.shift() || "" + ); + +export const getLatestVersion = (owner: string, repo: string) => + fetch(`https://api.github.com/repos/${owner}/${repo}/releases`) + .then((res) => res.json()) + .then((res: GHRelease[]) => res[0].tag_name); + +// The (?<=) and (?=) allow replace to only change inside +// Match the regex passed in or empty +export const genValueRegExp = (key: string, regex: RegExp) => + new RegExp(`(?<=${key} = ")(${regex.source}|)(?=")`); + +export const logger = (name: string) => + (...a: any) => console.log(`[${name}]`, ...a); + +export const nixPrefetch = (args: string[]) => run("nix-prefetch", args); +export const nixPrefetchURL = (args: string[]) => run("nix-prefetch-url", args); + +export const read = Deno.readTextFile; +export const write = Deno.writeTextFile; diff --git a/pkgs/development/web/deno/update/deps.ts b/pkgs/development/web/deno/update/deps.ts new file mode 100644 index 000000000000..beedeade3a86 --- /dev/null +++ b/pkgs/development/web/deno/update/deps.ts @@ -0,0 +1,79 @@ +import { + getExistingVersion, + genValueRegExp, + logger, + nixPrefetchURL, + versionRegExp, + write, +} from "./common.ts"; + +const log = logger("deps"); + +export interface Architecture { + nix: string; + rust: string; +} +interface PrefetchResult { + arch: Architecture; + sha256: string; +} + +const getRustyV8Version = async ( + owner: string, + repo: string, + version: string, +) => + fetch( + `https://github.com/${owner}/${repo}/raw/${version}/core/Cargo.toml`, + ) + .then((res) => res.text()) + .then((txt) => + txt.match(genValueRegExp("rusty_v8", versionRegExp))?.shift() + ); + +const archShaTasks = (version: string, arches: Architecture[]) => + arches.map(async (arch: Architecture): Promise => { + log("Fetching:", arch.nix); + const sha256 = await nixPrefetchURL( + [`https://github.com/denoland/rusty_v8/releases/download/v${version}/librusty_v8_release_${arch.rust}.a`], + ); + log("Done: ", arch.nix); + return { arch, sha256 }; + }); + +const templateDeps = (version: string, deps: PrefetchResult[]) => + `# auto-generated file -- DO NOT EDIT! +{}: +rec { + rustyV8Lib = { + version = "${version}"; + sha256s = { +${deps.map((d) => ` ${d.arch.nix} = "${d.sha256}";`).join("\n")} + }; + }; +} +`; + +export async function updateDeps( + filePath: string, + owner: string, + repo: string, + denoVersion: string, + arches: Architecture[], +) { + log("Starting deps update"); + // 0.0.0 + const version = await getRustyV8Version(owner, repo, denoVersion); + if (typeof version !== "string") { + throw "no rusty_v8 version"; + } + log("rusty_v8 version:", version); + const existingVersion = await getExistingVersion(filePath); + if (version === existingVersion) { + log("Version already matches latest, skipping..."); + return; + } + const archShaResults = await Promise.all(archShaTasks(version, arches)); + await write(filePath, templateDeps(version, archShaResults)); + log("Finished deps update"); +} diff --git a/pkgs/development/web/deno/update/src.ts b/pkgs/development/web/deno/update/src.ts new file mode 100644 index 000000000000..fae15acd0d2c --- /dev/null +++ b/pkgs/development/web/deno/update/src.ts @@ -0,0 +1,67 @@ +import { + genValueRegExp, + logger, + nixPrefetch, + read, + sha256RegExp, + versionRegExp, + write, +} from "./common.ts"; + +interface Replacer { + regex: RegExp; + value: string; +} + +const log = logger("src"); + +const prefetchSha256 = (nixpkgs: string, version: string) => + nixPrefetch(["-f", nixpkgs, "deno.src", "--rev", version]); +const prefetchCargoSha256 = (nixpkgs: string) => + nixPrefetch( + [`{ sha256 }: (import ${nixpkgs} {}).deno.cargoDeps.overrideAttrs (_: { outputHash = sha256; })`], + ); + +const replace = (str: string, replacers: Replacer[]) => + replacers.reduce( + (str, r) => str.replace(r.regex, r.value), + str, + ); + +const updateNix = (filePath: string, replacers: Replacer[]) => + read(filePath).then((str) => write(filePath, replace(str, replacers))); + +const genVerReplacer = (k: string, value: string): Replacer => ( + { regex: genValueRegExp(k, versionRegExp), value } +); +const genShaReplacer = (k: string, value: string): Replacer => ( + { regex: genValueRegExp(k, sha256RegExp), value } +); + +export async function updateSrc( + filePath: string, + nixpkgs: string, + denoVersion: string, +) { + log("Starting src update"); + const trimVersion = denoVersion.substr(1); + log("Fetching sha256 for:", trimVersion); + const sha256 = await prefetchSha256(nixpkgs, denoVersion); + log("sha256 to update:", sha256); + await updateNix( + filePath, + [ + genVerReplacer("version", trimVersion), + genShaReplacer("sha256", sha256), + genShaReplacer("cargoSha256", ""), // Empty ready for prefetchCargoSha256 + ], + ); + log("Fetching cargoSha256 for:", sha256); + const cargoSha256 = await prefetchCargoSha256(nixpkgs); + log("cargoSha256 to update:", cargoSha256); + await updateNix( + filePath, + [genShaReplacer("cargoSha256", cargoSha256)], + ); + log("Finished src update"); +} diff --git a/pkgs/development/web/deno/update/update.ts b/pkgs/development/web/deno/update/update.ts new file mode 100755 index 000000000000..ab13cee9dbe2 --- /dev/null +++ b/pkgs/development/web/deno/update/update.ts @@ -0,0 +1,50 @@ +#!/usr/bin/env nix-shell +/* +#!nix-shell -i "deno run --allow-net --allow-run --allow-read --allow-write" -p deno git nix-prefetch nix-prefetch-url +*/ +import { + commit, + getExistingVersion, + getLatestVersion, + logger, +} from "./common.ts"; +import { Architecture, updateDeps } from "./deps.ts"; +import { updateSrc } from "./src.ts"; + +const log = logger("update"); +// TODO: Getting current file position to more-safely point to nixpkgs root +const nixpkgs = Deno.cwd(); +// TODO: Read values from default.nix +const owner = "denoland"; +const repo = "deno"; +const denoDir = `${nixpkgs}/pkgs/development/web/${repo}`; +const src = `${denoDir}/default.nix`; +const deps = `${denoDir}/deps.nix`; +const architectures: Architecture[] = [ + { nix: "x86_64-linux", rust: "x86_64-unknown-linux-gnu" }, + { nix: "aarch64-linux", rust: "aarch64-unknown-linux-gnu" }, + { nix: "x86_64-darwin", rust: "x86_64-apple-darwin" }, +]; + +log("Updating deno"); + +log("Getting latest deno version"); +const version = await getLatestVersion(owner, repo); +const existingVersion = await getExistingVersion(src); +const trimVersion = version.substr(1); // Strip v from v0.0.0 +log("Latest version: ", trimVersion); +log("Extracted version:", existingVersion); +if (trimVersion === existingVersion) { + log("Version already matches latest, skipping..."); + Deno.exit(0); +} + +const tasks = [ + updateSrc(src, nixpkgs, version), + updateDeps(deps, owner, repo, version, architectures), +]; +await Promise.all(tasks); +log("Updating deno complete"); +log("Commiting"); +await commit(repo, existingVersion, trimVersion, [src, deps]); +log("Done"); From 5cfcfc300b6742dcdac074eb63d025b555e062c0 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 6 Feb 2019 13:57:53 +0900 Subject: [PATCH 0613/3452] doc: update lua documentation Reflects the recent changes to the lua infrastructure. Packaging from luarocks should be encouraged. --- doc/languages-frameworks/index.xml | 2 +- doc/languages-frameworks/lua.section.md | 237 ++++++++++++++++++++++++ 2 files changed, 238 insertions(+), 1 deletion(-) create mode 100644 doc/languages-frameworks/lua.section.md diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 2414956995c0..728a38c264a3 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -18,7 +18,7 @@ - + diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md new file mode 100644 index 000000000000..b4b593af7496 --- /dev/null +++ b/doc/languages-frameworks/lua.section.md @@ -0,0 +1,237 @@ +--- +title: Lua +author: Matthieu Coudron +date: 2019-02-05 +--- + +# User's Guide to Lua Infrastructure + +## Using Lua + +### Overview of Lua + +Several versions of the Lua interpreter are available: luajit, lua5.1, 5.2, 5.3. +The attribute `lua` refers to the default interpreter, it is also possible to refer to specific versions, e.g. `lua_52` refers to Lua 5.2. + +Lua libraries are in separate sets, with one set per interpreter version. + +The interpreters have several common attributes. One of these attributes is +`pkgs`, which is a package set of Lua libraries for this specific +interpreter. E.g., the `busted` package corresponding to the default interpreter +is `lua.pkgs.busted`, and the lua 5.2 version is lua_52.pkgs.busted`. +The main package set contains aliases to these package sets, e.g. +`luaPackages` refers to `lua_51.pkgs` and `lua_52Packages` to +`lua_52.pkgs`. + +### Installing Lua and packages + +#### Lua environment defined in separate `.nix` file + +Create a file, e.g. `build.nix`, with the following expression +```nix +with import {}; + +lua_52.withPackages (ps: with ps; [ busted luafilesystem ]) +``` +and install it in your profile with +```shell +nix-env -if build.nix +``` +Now you can use the Lua interpreter, as well as the extra packages (`busted`, +`luafilesystem`) that you added to the environment. + +#### Lua environment defined in `~/.config/nixpkgs/config.nix` + +If you prefer to, you could also add the environment as a package override to the Nixpkgs set, e.g. +using `config.nix`, +```nix +{ # ... + + packageOverrides = pkgs: with pkgs; { + myLuaEnv = lua_52.withPackages (ps: with ps; [ busted luafilesystem ]); + }; +} +``` +and install it in your profile with +```shell +nix-env -iA nixpkgs.myLuaEnv +``` +The environment is is installed by referring to the attribute, and considering +the `nixpkgs` channel was used. + +#### Lua environment defined in `/etc/nixos/configuration.nix` + +For the sake of completeness, here's another example how to install the environment system-wide. + +```nix +{ # ... + + environment.systemPackages = with pkgs; [ + (lua.withPackages(ps: with ps; [ busted luafilesystem ])) + ]; +} +``` + +### Temporary Lua environment with `nix-shell` + +For development you may need to use multiple environments. +`nix-shell` gives the possibility to temporarily load another environment, akin +to `virtualenv`. + +There are two methods for loading a shell with Lua packages. The first and recommended method +is to create an environment with `lua.buildEnv` or `lua.withPackages` and load that. E.g. +```sh +$ nix-shell -p 'lua.withPackages(ps: with ps; [ busted luafilesystem ])' +``` +opens a shell from which you can launch the interpreter +```sh +[nix-shell:~] lua +``` +The other method, which is not recommended, does not create an environment and requires you to list the packages directly, + +```sh +$ nix-shell -p lua.pkgs.busted lua.pkgs.luafilesystem +``` +Again, it is possible to launch the interpreter from the shell. +The Lua interpreter has the attribute `pkgs` which contains all Lua libraries for that specific interpreter. + + +## Developing with Lua + +Now that you know how to get a working Lua environment with Nix, it is time +to go forward and start actually developing with Lua. There are two ways to +package lua software, either it is on luarocks and most of it can be taken care +of by the luarocks2nix converter or the packaging has to be done manually. +Let's present the luarocks way first and the manual one in a second time. + +### Packaging a library on luarocks + +[Luarocks.org](www.luarocks.org) is the main repository of lua packages. The site proposes two types of packages, the rockspec and the src.rock (equivalent of a rockspec but with the source). These packages can have different build types such as `cmake`, `builtin` etc (See https://github.com/luarocks/luarocks/wiki/Rockspec-format). + +Luarocks-based packages are generated in pkgs/development/lua-modules/generated-packages.nix from +the whitelist maintainers/scripts/luarocks-packages.csv and updated by running maintainers/scripts/update-luarocks-packages. + +[luarocks2nix](https://github.com/teto/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock). +The automation only goes so far though and some packages need some customization. +These go in pkgs/development/lua-modules/generated-packages.nix +nix won't work with all packages. If the package lists `external_dependencies` in its rockspec file then it won't work. + +You can run `nix-shell -p luarocks-nix` and then `luarocks nix PKG_NAME`. +Nix rely on luarocks to install lua packages, basically it runs: +`luarocks make --deps-mode=none --tree $out` + +#### Packaging a library manually + +You can develop your package as you usually would, just don't forget to wrap it +within a `toLuaModule` call, for instance +```nix +mynewlib = toLuaModule ( stdenv.mkDerivation { ... }); +``` + + + +## Lua Reference + +### Lua interpreters + +Versions 5.1, 5.2 and 5.3 of the lua interpreter are available as +respectively `lua_51`, `lua_52` and `lua_53`. The luajit interpreter is also available. +The Nix expressions for the interpreters can be found in `pkgs/development/interpreters/lua`. + + +#### Attributes on lua interpreters packages + +Each interpreter has the following attributes: + +- `interpreter`. Alias for `${lua}/bin/lua`. +- `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation. +- `withPackages`. Simpler interface to `buildEnv`. +- `pkgs`. Set of Lua packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`. + + +#### `buildLuarocksPackage` function + +The `buildLuarocksPackage` function is implemented in `pkgs/development/interpreters/lua-5/build-lua-package.nix` +The following is an example: +```nix +luaexpat = buildLuaPackage rec { + pname = "luaexpat"; + version = "1.3.0-1"; + + src = fetchurl { + url = https://luarocks.org/luaexpat-1.3.0-1.src.rock; + sha256 = "15jqz5q12i9zvjyagzwz2lrpzya64mih8v1hxwr0wl2gsjh86y5a"; + }; + disabled = luaOlder "5.1"; + + propagatedBuildInputs = [ lua ]; + + buildType="builtin"; + + meta = { + homepage = http://www.keplerproject.org/luaexpat/; + description="XML Expat parsing"; + license = { + fullName = "MIT/X11"; + }; + }; +}; +``` + +The `buildLuarocksPackage` delegates most tasks to luarocks: + +* it adds `luarocks` as an unpacker for `src.rock` files (in fact zip files) +* configurePhase` writes a temporary luarocks configuration file which location +is exported via the environment variable `LUAROCKS_CONFIG`. +* In the `buildPhase`, nothing is done. +* `installPhase` calls `luarocks make --deps-mode=none --tree $out` to build and +install the package +* In the `postFixup` phase, the `wrapLuaPrograms` bash function is called to + wrap all programs in the `$out/bin/*` directory to include `$PATH` + environment variable and add dependent libraries to script's `LUA_PATH` and + `LUA_CPATH`. + +By default `meta.platforms` is set to the same value +as the interpreter unless overridden otherwise. + +#### `buildLuaApplication` function + +The `buildLuaApplication` function is practically the same as `buildLuaPackage`. +The difference is that `buildLuaPackage` by default prefixes the names of the packages with the version of the interpreter. +Because with an application we're not interested in multiple version the prefix is dropped. + +#### lua.withPackages function + +The `lua.withPackages` function provides a simpler interface to the `python.buildEnv` functionality. +It takes a function as an argument that is passed the set of python packages and returns the list +of the packages to be included in the environment. Using the `withPackages` function, the previous +example for the luafilesystem environment can be written like this: +```nix +with import {}; + +lua.withPackages (ps: [ps.luafilesystem]) +``` + +`withPackages` passes the correct package set for the specific interpreter version as an argument to the function. In the above example, `ps` equals `luaPackages`. +But you can also easily switch to using lua_52: +```nix +with import {}; + +lua_52.withPackages (ps: [ps.lua]) +``` + +Now, `ps` is set to `lua_52Packages`, matching the version of the interpreter. + + +### Possible Todos + +* export/use version specific variables such as LUA_PATH_5_2/LUAROCKS_CONFIG_5_2 +* let luarocks check for dependencies via exporting the different rocktrees in temporary config + +### Lua Contributing guidelines + +Following rules should be respected: + +* Make sure libraries build for all Lua interpreters. +* Commit names of Lua libraries should reflect that they are Lua libraries, so write for example `lua.luafilesystem: 1.11 -> 1.12`. + From 404d057e89eb77099cd6ca8d50b79ccc52bb7914 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 7 Mar 2019 17:17:18 +0900 Subject: [PATCH 0614/3452] Added an example about overlay --- doc/languages-frameworks/lua.section.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md index b4b593af7496..f11a1a5862ec 100644 --- a/doc/languages-frameworks/lua.section.md +++ b/doc/languages-frameworks/lua.section.md @@ -72,6 +72,27 @@ For the sake of completeness, here's another example how to install the environm } ``` +### How to override a Python package using overlays? + +Use the following overlay template: + +```nix +self: prev: +{ + + lua = prev.lua.override { + packageOverrides = luaself: luaprev: { + + luarocks-nix = luaprev.luarocks-nix.overrideAttrs(oa: { + pname = "toto"; + src = /home/my_luarocks/repository; + }); + }; + + luaPackages = lua.pkgs; +} +``` + ### Temporary Lua environment with `nix-shell` For development you may need to use multiple environments. @@ -154,7 +175,7 @@ Each interpreter has the following attributes: The `buildLuarocksPackage` function is implemented in `pkgs/development/interpreters/lua-5/build-lua-package.nix` The following is an example: ```nix -luaexpat = buildLuaPackage rec { +luaexpat = buildLuarocksPackage rec { pname = "luaexpat"; version = "1.3.0-1"; From 2909dc9f3988551b5b31a89a162d825511fca5ca Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 18 May 2019 21:51:16 +0900 Subject: [PATCH 0615/3452] builds --- doc/languages-frameworks/lua.section.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md index f11a1a5862ec..21fe3f21e092 100644 --- a/doc/languages-frameworks/lua.section.md +++ b/doc/languages-frameworks/lua.section.md @@ -72,7 +72,7 @@ For the sake of completeness, here's another example how to install the environm } ``` -### How to override a Python package using overlays? +### How to override a Lua package using overlays? Use the following overlay template: @@ -165,7 +165,7 @@ The Nix expressions for the interpreters can be found in `pkgs/development/inter Each interpreter has the following attributes: - `interpreter`. Alias for `${lua}/bin/lua`. -- `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation. +- `buildEnv`. Function to build lua interpreter environments with extra packages bundled together. See section *lua.buildEnv function* for usage and documentation. - `withPackages`. Simpler interface to `buildEnv`. - `pkgs`. Set of Lua packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`. @@ -223,10 +223,8 @@ Because with an application we're not interested in multiple version the prefix #### lua.withPackages function -The `lua.withPackages` function provides a simpler interface to the `python.buildEnv` functionality. -It takes a function as an argument that is passed the set of python packages and returns the list -of the packages to be included in the environment. Using the `withPackages` function, the previous -example for the luafilesystem environment can be written like this: +The `lua.withPackages` takes a function as an argument that is passed the set of lua packages and returns the list of packages to be included in the environment. +Using the `withPackages` function, the previous example for the luafilesystem environment can be written like this: ```nix with import {}; From a353657b275906df780bb0a98d8884a7fd7984c5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 16:58:15 +0000 Subject: [PATCH 0616/3452] qtstyleplugin-kvantum-qt4: 0.15.2 -> 0.15.3 --- .../libraries/qtstyleplugin-kvantum-qt4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index f17165b5ed34..2120c6938571 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0cv0lxyi2sr0k7f03rsh1j28avdxd0l0480jsa95ca3d2lq392g3"; + sha256 = "0jq3y63c36nr2rprg7im9ik112p5zvhj46vzgxfbnpvskmg0cchm"; }; nativeBuildInputs = [ qmake4Hook ]; From 276c216a2209d6fd0e2733db1a3dd2bb5d1a28ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 17:18:55 +0000 Subject: [PATCH 0617/3452] rambox-pro: 1.3.1 -> 1.3.2 --- .../applications/networking/instant-messengers/rambox/pro.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix index 215aebf2b2fa..f7a904f1e361 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rambox-pro"; - version = "1.3.1"; + version = "1.3.2"; dontBuild = true; dontStrip = true; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz"; - sha256 = "1cy4h2yzrpr3gxd16p4323w06i67d82jjlyx737c3ngzw7aahmq1"; + sha256 = "010v5i8lxfz77cb5cn9va5cbnfa28nzdymk5k2fcpi65jldw1pxx"; }; installPhase = '' From 3f50371a61eaffcccb3bb965b4fd5697921efbc4 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sat, 6 Jun 2020 19:15:27 +0200 Subject: [PATCH 0618/3452] python3Packages.pydsdl: init at 1.4.2 --- .../python-modules/pydsdl/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pydsdl/default.nix diff --git a/pkgs/development/python-modules/pydsdl/default.nix b/pkgs/development/python-modules/pydsdl/default.nix new file mode 100644 index 000000000000..655adecd5c89 --- /dev/null +++ b/pkgs/development/python-modules/pydsdl/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder }: + + buildPythonPackage rec { + pname = "pydsdl"; + version = "1.4.2"; + disabled = pythonOlder "3.5"; # only python>=3.5 is supported + + src = fetchFromGitHub { + owner = "UAVCAN"; + repo = pname; + rev = version; + sha256 = "03kbpzdrjzj5vpgz5rhc110pm1axdn3ynv88b42zq6iyab4k8k1x"; + }; + + propagatedBuildInputs = [ + ]; + + # allow for writable directory for darwin + preBuild = '' + export HOME=$TMPDIR + ''; + + # repo doesn't contain tests, ensure imports aren't broken + pythonImportsCheck = [ + "pydsdl" + ]; + + meta = with lib; { + description = "A UAVCAN DSDL compiler frontend implemented in Python"; + longDescription = '' + It supports all DSDL features defined in the UAVCAN specification. + ''; + homepage = "https://uavcan.org"; + maintainers = with maintainers; [ wucke13 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00960b457252..451bcff62a1e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1287,6 +1287,8 @@ in { pyscreenshot = callPackage ../development/python-modules/pyscreenshot { }; + pydsdl = callPackage ../development/python-modules/pydsdl { }; + pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; From 98c44f565746165a556953cda769d23d732466f4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 6 Jun 2020 19:21:54 +0200 Subject: [PATCH 0619/3452] git: 2.26.2 -> 2.27.0 (#89355) disable_test: Use \s instead of ' ' as tabs are used for indentation in t5324-split-commit-graph.sh. It's also necessary to insert : (no op) in front of # to prevent Bash syntax errors due to empty loops. Two newly added tests fail due the usage of shared permissions (outside of the build sandbox they succeed, actually even with breakpointHook (cntr attach + cntr exec bash)): ``` t5324-split-commit-graph.sh (Wstat: 256 Tests: 29 Failed: 2) Failed tests: 28-29 Non-zero exit status: 1 ``` I'm also adding myself as maintainer since there currently doesn't seem to be a fixed one for regular updates. Announcement: https://lkml.kernel.org/lkml/xmqqzh9mu4my.fsf@gitster.c.googlers.com/ --- .../version-management/git-and-tools/git/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 140a273e342e..325be9d1397b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.26.2"; + version = "2.27.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0j685w6pzkn926z5nf5r8fij4ziipvw4c9yb0wc577nzf4j16rbd"; + sha256 = "1ybk39ylvs32lywq7ra4l2kdr5izc80r9461hwfnw8pssxs9gjkk"; }; outputs = [ "out" "doc" ]; @@ -286,13 +286,14 @@ stdenv.mkDerivation { mv t/{,skip-}$test.sh || true else sed -i t/$test.sh \ - -e "/^ *test_expect_.*$pattern/,/^ *' *\$/{s/^/#/}" + -e "/^\s*test_expect_.*$pattern/,/^\s*' *\$/{s/^/: #/}" fi } # Shared permissions are forbidden in sandbox builds. disable_test t0001-init shared disable_test t1301-shared-repo + disable_test t5324-split-commit-graph 'split commit-graph respects core.sharedrepository' # Our patched gettext never fallbacks disable_test t0201-gettext-fallbacks @@ -343,6 +344,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ peti wmertens globin ]; + maintainers = with stdenv.lib.maintainers; [ primeos peti wmertens globin ]; }; } From 5930a0ea449514cff02563326f95a1947db85d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Lang?= Date: Fri, 29 May 2020 02:56:21 -0300 Subject: [PATCH 0620/3452] mpvScripts.simple-mpv-webui: init at 1.0.0 --- maintainers/maintainer-list.nix | 6 ++++ pkgs/applications/video/mpv/default.nix | 3 ++ .../video/mpv/scripts/simple-mpv-webui.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 43 insertions(+) create mode 100644 pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5329efeab87e..e918a5ba7ad3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1616,6 +1616,12 @@ githubId = 12202789; name = "CrazedProgrammer"; }; + cript0nauta = { + email = "shareman1204@gmail.com"; + github = "cript0nauta"; + githubId = 1222362; + name = "Matías Lang"; + }; cryptix = { email = "cryptix@riseup.net"; github = "cryptix"; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index ff837756e3db..51d284f277a1 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -39,6 +39,9 @@ , libpngSupport ? true, libpng ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , rubberbandSupport ? stdenv.isLinux, rubberband ? null +# NOTE: samba support should be removed on the next mpv release, see also: +# https://github.com/NixOS/nixpkgs/pull/89145#issuecomment-636424362 +# Please remove this line on the next mpv release. , sambaSupport ? false, samba ? null , screenSaverSupport ? true, libXScrnSaver ? null , sdl2Support ? true, SDL2 ? null diff --git a/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix new file mode 100644 index 000000000000..d51434e241c9 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetchFromGitHub }: +stdenv.mkDerivation rec { + pname = "simple-mpv-ui"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "open-dynaMIX"; + repo = "simple-mpv-webui"; + rev = "v${version}"; + sha256 = "1glrnnl1slcl0ri0zs4j64lc9aa52p9ffh6av0d81fk95nm98917"; + }; + + dontBuild = true; + installPhase = '' + mkdir -p $out/share/mpv/scripts + cp -r webui.lua webui-page $out/share/mpv/scripts/ + ''; + passthru.scriptName = "webui.lua"; + + meta = with stdenv.lib; { + description = "A web based user interface with controls for the mpv mediaplayer"; + homepage = "https://github.com/open-dynaMIX/simple-mpv-webui"; + maintainers = [ maintainers.cript0nauta ]; + longDescription = '' + You can access the webui when accessing http://127.0.0.1:8080 or + http://[::1]:8080 in your webbrowser. By default it listens on + 0.0.0.0:8080 and [::0]:8080 + ''; + license = licenses.mit; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f6c5dfea4f8..df883aa5abb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20967,6 +20967,7 @@ in mpvScripts = recurseIntoAttrs { convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; + simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {}; }; mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; From 3042b38ce107a0380793883d58cd32d84fff9cf6 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 6 Jun 2020 19:53:58 +0200 Subject: [PATCH 0621/3452] update --- doc/languages-frameworks/lua.section.md | 86 ++++++++++++------------- doc/languages-frameworks/lua.xml | 36 ----------- 2 files changed, 41 insertions(+), 81 deletions(-) delete mode 100644 doc/languages-frameworks/lua.xml diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md index 21fe3f21e092..058b8f45c988 100644 --- a/doc/languages-frameworks/lua.section.md +++ b/doc/languages-frameworks/lua.section.md @@ -10,7 +10,7 @@ date: 2019-02-05 ### Overview of Lua -Several versions of the Lua interpreter are available: luajit, lua5.1, 5.2, 5.3. +Several versions of the Lua interpreter are available: luajit, lua 5.1, 5.2, 5.3. The attribute `lua` refers to the default interpreter, it is also possible to refer to specific versions, e.g. `lua_52` refers to Lua 5.2. Lua libraries are in separate sets, with one set per interpreter version. @@ -18,10 +18,10 @@ Lua libraries are in separate sets, with one set per interpreter version. The interpreters have several common attributes. One of these attributes is `pkgs`, which is a package set of Lua libraries for this specific interpreter. E.g., the `busted` package corresponding to the default interpreter -is `lua.pkgs.busted`, and the lua 5.2 version is lua_52.pkgs.busted`. +is `lua.pkgs.busted`, and the lua 5.2 version is `lua5_2.pkgs.busted`. The main package set contains aliases to these package sets, e.g. -`luaPackages` refers to `lua_51.pkgs` and `lua_52Packages` to -`lua_52.pkgs`. +`luaPackages` refers to `lua5_1.pkgs` and `lua52Packages` to +`lua5_2.pkgs`. ### Installing Lua and packages @@ -31,7 +31,7 @@ Create a file, e.g. `build.nix`, with the following expression ```nix with import {}; -lua_52.withPackages (ps: with ps; [ busted luafilesystem ]) +lua5_2.withPackages (ps: with ps; [ busted luafilesystem ]) ``` and install it in your profile with ```shell @@ -77,14 +77,14 @@ For the sake of completeness, here's another example how to install the environm Use the following overlay template: ```nix -self: prev: +final: prev: { lua = prev.lua.override { packageOverrides = luaself: luaprev: { luarocks-nix = luaprev.luarocks-nix.overrideAttrs(oa: { - pname = "toto"; + pname = "luarocks-nix"; src = /home/my_luarocks/repository; }); }; @@ -95,9 +95,6 @@ self: prev: ### Temporary Lua environment with `nix-shell` -For development you may need to use multiple environments. -`nix-shell` gives the possibility to temporarily load another environment, akin -to `virtualenv`. There are two methods for loading a shell with Lua packages. The first and recommended method is to create an environment with `lua.buildEnv` or `lua.withPackages` and load that. E.g. @@ -127,17 +124,20 @@ Let's present the luarocks way first and the manual one in a second time. ### Packaging a library on luarocks -[Luarocks.org](www.luarocks.org) is the main repository of lua packages. The site proposes two types of packages, the rockspec and the src.rock (equivalent of a rockspec but with the source). These packages can have different build types such as `cmake`, `builtin` etc (See https://github.com/luarocks/luarocks/wiki/Rockspec-format). +[Luarocks.org](www.luarocks.org) is the main repository of lua packages. +The site proposes two types of packages, the rockspec and the src.rock +(equivalent of a [rockspec](https://github.com/luarocks/luarocks/wiki/Rockspec-format) but with the source). +These packages can have different build types such as `cmake`, `builtin` etc . Luarocks-based packages are generated in pkgs/development/lua-modules/generated-packages.nix from the whitelist maintainers/scripts/luarocks-packages.csv and updated by running maintainers/scripts/update-luarocks-packages. -[luarocks2nix](https://github.com/teto/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock). -The automation only goes so far though and some packages need some customization. -These go in pkgs/development/lua-modules/generated-packages.nix -nix won't work with all packages. If the package lists `external_dependencies` in its rockspec file then it won't work. +[luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock). +The automation only goes so far though and some packages need to be customized. +These customizations go in `pkgs/development/lua-modules/overrides.nix`. +For instance if the rockspec defines `external_dependencies`, these need to be manually added in in its rockspec file then it won't work. -You can run `nix-shell -p luarocks-nix` and then `luarocks nix PKG_NAME`. +You can try converting luarocks packages to nix packages with the command `nix-shell -p luarocks-nix` and then `luarocks nix PKG_NAME`. Nix rely on luarocks to install lua packages, basically it runs: `luarocks make --deps-mode=none --tree $out` @@ -149,22 +149,23 @@ within a `toLuaModule` call, for instance mynewlib = toLuaModule ( stdenv.mkDerivation { ... }); ``` - +There is also the `buildLuaPackage` function that can be used when lua modules +are not packaged for luarocks. You can see a few examples at `pkgs/top-level/lua-packages.nix`. ## Lua Reference ### Lua interpreters Versions 5.1, 5.2 and 5.3 of the lua interpreter are available as -respectively `lua_51`, `lua_52` and `lua_53`. The luajit interpreter is also available. -The Nix expressions for the interpreters can be found in `pkgs/development/interpreters/lua`. +respectively `lua_51`, `lua_52` and `lua_53`. Luajit is available too. +The Nix expressions for the interpreters can be found in `pkgs/development/interpreters/lua-5`. #### Attributes on lua interpreters packages Each interpreter has the following attributes: -- `interpreter`. Alias for `${lua}/bin/lua`. +- `interpreter`. Alias for `${pkgs.lua}/bin/lua`. - `buildEnv`. Function to build lua interpreter environments with extra packages bundled together. See section *lua.buildEnv function* for usage and documentation. - `withPackages`. Simpler interface to `buildEnv`. - `pkgs`. Set of Lua packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`. @@ -175,36 +176,32 @@ Each interpreter has the following attributes: The `buildLuarocksPackage` function is implemented in `pkgs/development/interpreters/lua-5/build-lua-package.nix` The following is an example: ```nix -luaexpat = buildLuarocksPackage rec { - pname = "luaexpat"; - version = "1.3.0-1"; +luaposix = buildLuarocksPackage { + pname = "luaposix"; + version = "34.0.4-1"; src = fetchurl { - url = https://luarocks.org/luaexpat-1.3.0-1.src.rock; - sha256 = "15jqz5q12i9zvjyagzwz2lrpzya64mih8v1hxwr0wl2gsjh86y5a"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaposix-34.0.4-1.src.rock"; + sha256 = "0yrm5cn2iyd0zjd4liyj27srphvy0gjrjx572swar6zqr4dwjqp2"; }; - disabled = luaOlder "5.1"; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ bit32 lua std_normalize ]; - propagatedBuildInputs = [ lua ]; - - buildType="builtin"; - - meta = { - homepage = http://www.keplerproject.org/luaexpat/; - description="XML Expat parsing"; - license = { - fullName = "MIT/X11"; - }; + meta = with stdenv.lib; { + homepage = "https://github.com/luaposix/luaposix/"; + description = "Lua bindings for POSIX"; + maintainers = with maintainers; [ vyp lblasc ]; + license.fullName = "MIT/X11"; }; }; ``` The `buildLuarocksPackage` delegates most tasks to luarocks: -* it adds `luarocks` as an unpacker for `src.rock` files (in fact zip files) +* it adds `luarocks` as an unpacker for `src.rock` files (zip files really). * configurePhase` writes a temporary luarocks configuration file which location is exported via the environment variable `LUAROCKS_CONFIG`. -* In the `buildPhase`, nothing is done. +* the `buildPhase` does nothing. * `installPhase` calls `luarocks make --deps-mode=none --tree $out` to build and install the package * In the `postFixup` phase, the `wrapLuaPrograms` bash function is called to @@ -212,8 +209,7 @@ install the package environment variable and add dependent libraries to script's `LUA_PATH` and `LUA_CPATH`. -By default `meta.platforms` is set to the same value -as the interpreter unless overridden otherwise. +By default `meta.platforms` is set to the same value as the interpreter unless overridden otherwise. #### `buildLuaApplication` function @@ -232,19 +228,19 @@ lua.withPackages (ps: [ps.luafilesystem]) ``` `withPackages` passes the correct package set for the specific interpreter version as an argument to the function. In the above example, `ps` equals `luaPackages`. -But you can also easily switch to using lua_52: +But you can also easily switch to using `lua5_2`: ```nix with import {}; -lua_52.withPackages (ps: [ps.lua]) +lua5_2.withPackages (ps: [ps.lua]) ``` -Now, `ps` is set to `lua_52Packages`, matching the version of the interpreter. +Now, `ps` is set to `lua52Packages`, matching the version of the interpreter. ### Possible Todos -* export/use version specific variables such as LUA_PATH_5_2/LUAROCKS_CONFIG_5_2 +* export/use version specific variables such as `LUA_PATH_5_2`/`LUAROCKS_CONFIG_5_2` * let luarocks check for dependencies via exporting the different rocktrees in temporary config ### Lua Contributing guidelines @@ -252,5 +248,5 @@ Now, `ps` is set to `lua_52Packages`, matching the version of the interpreter. Following rules should be respected: * Make sure libraries build for all Lua interpreters. -* Commit names of Lua libraries should reflect that they are Lua libraries, so write for example `lua.luafilesystem: 1.11 -> 1.12`. +* Commit names of Lua libraries should reflect that they are Lua libraries, so write for example `luaPackages.luafilesystem: 1.11 -> 1.12`. diff --git a/doc/languages-frameworks/lua.xml b/doc/languages-frameworks/lua.xml deleted file mode 100644 index bcca6b737539..000000000000 --- a/doc/languages-frameworks/lua.xml +++ /dev/null @@ -1,36 +0,0 @@ -
- Lua - - - Lua packages are built by the buildLuaPackage function. This function is implemented in pkgs/development/lua-modules/generic/default.nix and works similarly to buildPerlPackage. (See for details.) - - - - Lua packages are defined in pkgs/top-level/lua-packages.nix. Most of them are simple. For example: - -fileSystem = buildLuaPackage { - name = "filesystem-1.6.2"; - src = fetchurl { - url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; - sha256 = "1n8qdwa20ypbrny99vhkmx8q04zd2jjycdb5196xdhgvqzk10abz"; - }; - meta = { - homepage = "https://github.com/keplerproject/luafilesystem"; - hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = with maintainers; [ flosse ]; - }; -}; - - - - - Though, more complicated package should be placed in a seperate file in pkgs/development/lua-modules. - - - - Lua packages accept additional parameter disabled, which defines the condition of disabling package from luaPackages. For example, if package has disabled assigned to lua.luaversion != "5.1", it will not be included in any luaPackages except lua51Packages, making it only be built for lua 5.1. - -
From 6fa6decdedfd65d5423b2299920dc83e66bdb89c Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 6 Jun 2020 14:24:13 -0400 Subject: [PATCH 0622/3452] pythonPackages.geant4: init at 10.6.2 Starting geant4 10.6.2 g4py can not be built separately http://geant4-data.web.cern.ch/geant4-data/ReleaseNotes/Patch4.10.6-2.txt Also, it appears that g4py itself is now deprecated, it was moved to environments/g4py/tests/g4pytest in the source distribution. The only remaining imported module is Geant4, hence python package name `pythonPackages.geant4`, the capitalization matches the one of the non-python attribute. --- .../libraries/physics/geant4/default.nix | 25 ++++++- .../libraries/physics/geant4/g4py/default.nix | 65 ------------------- .../physics/geant4/g4py/setup-hook.sh | 1 - pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/python-packages.nix | 5 ++ 6 files changed, 30 insertions(+), 69 deletions(-) delete mode 100644 pkgs/development/libraries/physics/geant4/g4py/default.nix delete mode 100644 pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 2e44a7136df8..97822d769dd5 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -5,6 +5,7 @@ , enableQT ? false , enableXM ? false , enableOpenGLX11 ? true +, enablePython ? false , enableRaytracerX11 ? false # Standard build environment with cmake. @@ -33,8 +34,16 @@ , libGLU, libGL , xlibsWrapper , libXmu + +# For enablePython +, boost +, python3 }: +let + boost_python = boost.override { enablePython = true; python = python3; }; +in + stdenv.mkDerivation rec { version = "10.6.2"; pname = "geant4"; @@ -44,6 +53,16 @@ stdenv.mkDerivation rec { sha256 = "0vznm3pjlbihjy1wsxc4gj229k0dzc283wvil2xghyl08vwdpnpc"; }; + boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}"; + postPatch = '' + # Fix for boost 1.67+ + substituteInPlace environments/g4py/CMakeLists.txt \ + --replace "find_package(Boost REQUIRED python)" \ + "find_package(Boost REQUIRED COMPONENTS $boost_python_lib)" + substituteInPlace environments/g4py/G4PythonHelpers.cmake \ + --replace "Boost::python" "Boost::$boost_python_lib" + ''; + cmakeFlags = [ "-DGEANT4_INSTALL_DATA=OFF" "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}" @@ -52,11 +71,14 @@ stdenv.mkDerivation rec { "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}" "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}" "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}" + "-DGEANT4_USE_PYTHON=${if enablePython then "ON" else "OFF"}" "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}" "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}" "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}" "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}" "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" + ] ++ stdenv.lib.optionals (enableMultiThreading && enablePython) [ + "-DGEANT4_BUILD_TLS_MODEL=global-dynamic" ] ++ stdenv.lib.optionals enableInventor [ "-DINVENTOR_INCLUDE_DIR=${coin3d}/include" "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" @@ -66,7 +88,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU xlibsWrapper libXmu ] - ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt motif ]; + ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt motif ] + ++ stdenv.lib.optionals enablePython [ boost_python python3 ]; propagatedBuildInputs = [ clhep expat zlib libGL ] ++ stdenv.lib.optionals enableGDML [ xercesc ] diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix deleted file mode 100644 index 4937cc0eca93..000000000000 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, cmake, xercesc - -# The target version of Geant4 -, geant4 - -# Python (obviously) and boost::python for wrapping. -, python -, boost -}: - -let - # g4py does not support MT and will fail to build against MT geant - geant4_nomt = geant4.override { enableMultiThreading = false; }; - boost_python = boost.override { enablePython = true; inherit python; }; -in - -stdenv.mkDerivation { - inherit (geant4_nomt) version src; - pname = "g4py"; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ geant4_nomt xercesc boost_python python ]; - - GEANT4_INSTALL = geant4_nomt; - - postPatch = '' - cd environments/g4py - ''; - - preConfigure = '' - # Fix for boost 1.67+ - substituteInPlace CMakeLists.txt \ - --replace "find_package(Boost)" "find_package(Boost 1.40 REQUIRED COMPONENTS python${builtins.replaceStrings ["."] [""] python.pythonVersion})" - for f in `find . -name CMakeLists.txt`; do - substituteInPlace "$f" \ - --replace "boost_python" "\''${Boost_LIBRARIES}" - done - ''; - - enableParallelBuilding = true; - - setupHook = ./setup-hook.sh; - - # Make sure we set PYTHONPATH - shellHook = '' - source $out/nix-support/setup-hook - ''; - - meta = { - description = "Python bindings and utilities for Geant4"; - longDescription = '' - Geant4 is a toolkit for the simulation of the passage of particles - through matter. Its areas of application include high energy, - nuclear and accelerator physics, as well as studies in medical and - space science. The two main reference papers for Geant4 are - published in Nuclear Instruments and Methods in Physics Research A - 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 - (2006) 270-278. - ''; - homepage = "http://www.geant4.org"; - license = stdenv.lib.licenses.g4sl; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh b/pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh deleted file mode 100644 index 8abfb461fc0f..000000000000 --- a/pkgs/development/libraries/physics/geant4/g4py/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -export PYTHONPATH=$PYTHONPATH:@out@/lib diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1004a444469e..4f356a6a8415 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -153,6 +153,7 @@ mapAliases ({ fuseki = apache-jena-fuseki; # added 2018-04-25 fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15 fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19 + g4py = python3Packages.geant4; # added 2020-06-06 gccApple = throw "gccApple is no longer supported"; # added 2018-04-25 gdb-multitarget = gdb; # added 2017-11-13 gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd298ce24ea2..38207e72127f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25344,8 +25344,6 @@ in cernlib = callPackage ../development/libraries/physics/cernlib { }; - g4py = callPackage ../development/libraries/physics/geant4/g4py { }; - hepmc2 = callPackage ../development/libraries/physics/hepmc2 { }; hepmc3 = callPackage ../development/libraries/physics/hepmc3 { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00960b457252..ec27df8d71ce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3886,6 +3886,11 @@ in { gdrivefs = callPackage ../development/python-modules/gdrivefs { }; + geant4 = disabledIf (!isPy3k) (toPythonModule (pkgs.geant4.override { + enablePython = true; + python3 = python; + })); + genshi = callPackage ../development/python-modules/genshi { }; gentools = callPackage ../development/python-modules/gentools { }; From 4612927ad27c6316655ac3fa1b98f8f28a15c77b Mon Sep 17 00:00:00 2001 From: Ada Avery <2561504+SquircleSpace@users.noreply.github.com> Date: Sat, 6 Jun 2020 00:57:19 -0700 Subject: [PATCH 0623/3452] libraspberrypi: 2019-10-22 -> 2020-5-28 --- pkgs/development/libraries/libraspberrypi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix index 1cd1f5e62ac1..bbe0b6145503 100644 --- a/pkgs/development/libraries/libraspberrypi/default.nix +++ b/pkgs/development/libraries/libraspberrypi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "libraspberrypi"; - version = "2019-10-22"; + version = "2020-05-28"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "5070cb7fc150fc98f1ed64a7739c3356970d9f76"; - sha256 = "08yfzwn9s7lhrblcsxyag9p5lj5vk3n66b1pv3f7r3hah7qcggyq"; + rev = "f97b1af1b3e653f9da2c1a3643479bfd469e3b74"; + sha256 = "1r7n05rv96hqjq0rn0qzchmfqs0j7vh3p8jalgh66s6l0vms5mwy"; }; cmakeFlags = if (stdenv.targetPlatform.system == "aarch64-linux") From 31a1952cadd0d35b060d95c9ff9dcd2f94dd0968 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 7 Jun 2020 01:36:00 +0200 Subject: [PATCH 0624/3452] gxplugins-lv2: 0.7 -> 0.8 --- pkgs/applications/audio/gxplugins-lv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix index 077bb407020e..fa80611fc280 100644 --- a/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "GxPlugins.lv2"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "brummer10"; repo = pname; rev = "v${version}"; - sha256 = "0jqdqnkg7pg9plcbxy49p7gcs1aj6h0xf7y9gndmjmkw5yjn2940"; + sha256 = "11iv7bwvvspm74pisqvcpsxpg9xi6b08hq4i8q67mri4mvy9hmal"; fetchSubmodules = true; }; From b64ecc3b5f3b0dab2622bbccc596b80b5aa470a5 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 7 Jun 2020 09:19:04 +0300 Subject: [PATCH 0625/3452] polybar: Don't reference gcc Polybar wants to be capable of printing the compiler that was used to build it with `polybar -vv` but that makes it reference gcc. See: https://github.com/polybar/polybar/blob/15e79b09d33c7cac888f93d218ae8be5ae617a2b/src/settings.cpp.cmake#L55 --- pkgs/applications/misc/polybar/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index a793ee887243..c324a3f8be40 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,6 +1,7 @@ { cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig , python3, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage , xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper +, removeReferencesTo # optional packages-- override the variables ending in 'Support' to enable or # disable modules @@ -74,6 +75,10 @@ stdenv.mkDerivation rec { '' else ""; nativeBuildInputs = [ - cmake pkgconfig + cmake pkgconfig removeReferencesTo ]; + + postFixup = '' + remove-references-to -t ${stdenv.cc} $out/bin/polybar + ''; } From 2da5872b72f7986913ff37eb0d782a4f04cdc83e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 7 Jun 2020 10:18:16 +0300 Subject: [PATCH 0626/3452] ruby: Enable to disable JIT support --- pkgs/development/interpreters/ruby/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 1756c13b53d1..e21d765e7b91 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -37,6 +37,7 @@ let , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , useRailsExpress ? true , rubygemsSupport ? true + , JitSupport ? true , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -118,6 +119,7 @@ let configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby_${tag}"] ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby" + ++ op (!JitSupport) "--disable-jit-support" ++ op (!docSupport) "--disable-install-doc" ++ ops stdenv.isDarwin [ # on darwin, we have /usr/include/tk.h -- so the configure script detects From 0ab3c6b7d00a33d3412867f74f83ebe9fe709cdb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 7 Jun 2020 10:19:16 +0300 Subject: [PATCH 0627/3452] ruby: make removeReferencesToCC remove all cc refs `lib/ruby/${version}//rbconfig.rb` records the compiler used for JIT. --- pkgs/development/interpreters/ruby/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index e21d765e7b91..bea64fa7a776 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -157,6 +157,9 @@ let ${removeReferencesTo}/bin/remove-references-to \ -t ${stdenv.cc} \ $out/lib/libruby* + ${removeReferencesTo}/bin/remove-references-to \ + -t ${stdenv.cc} \ + $out/lib/ruby/${version}/${stdenv.targetPlatform.system}/rbconfig.rb '' } # Bundler tries to create this directory From 17181fd88186f10e7c6389b258787202b97cd939 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 7 Jun 2020 14:21:54 +0700 Subject: [PATCH 0628/3452] pulumi: 2.1.0 -> 2.2.1 --- pkgs/tools/admin/pulumi/data.nix | 42 +++++++++++++------------------ pkgs/tools/admin/pulumi/update.sh | 11 ++++---- 2 files changed, 23 insertions(+), 30 deletions(-) mode change 100644 => 100755 pkgs/tools/admin/pulumi/update.sh diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index cad7b97fd37d..aa4f03b07fe4 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,50 +1,42 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "2.1.0"; + version = "2.2.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.1.0-linux-x64.tar.gz"; - sha256 = "0d9bmljgf62dhj1z8h71c2pj2cbvf4ghhlbbbh2jcg55i33ks8ih"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.2.1-linux-x64.tar.gz"; + sha256 = "0bvwkvsinnhlh1yhh5llffh89w07f412q6z03ypzl19p6fvik1k1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.1.0-linux-amd64.tar.gz"; - sha256 = "1kf43j1b4wp39sny92dnsy1myn6wb2msli1ydds3yza81srgcfnh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.1.1-linux-amd64.tar.gz"; + sha256 = "0ggi1c4lg6pip6d4bh2cji25hcwv3ii870bjwd35ax668z0dc28d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.3.0-linux-amd64.tar.gz"; - sha256 = "17anj9pc90hhiknyf2yab7dzvcfbjn1803bl6ld26r701w3h1jqx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.6.0-linux-amd64.tar.gz"; + sha256 = "0l4vv7vkzsphvk9r28l253ds8ny0wh0fahqjjnz31jqzfbvzyxm8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.0.0-linux-amd64.tar.gz"; - sha256 = "0526a4ll1q9v566i313223pnx2pa3qkcjp01l49h5jmgn8qpw1fn"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.2.0-linux-amd64.tar.gz"; - sha256 = "14ya2sax2yyza3zbxp5a638y81pcbi26hv8k9y8agnjn82bgx8dy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.5.0-linux-amd64.tar.gz"; + sha256 = "02xjwx2rfh3k9zk8aw39n4k6jnp8chcfc5f1zac7x4xfkqyjlpcy"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.1.0-darwin-x64.tar.gz"; - sha256 = "1d7w32wac2sc0z5i893h66fgyivf4x3mqki649vxkxc3081kpzi9"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.2.1-darwin-x64.tar.gz"; + sha256 = "1fizddk1hxazn33xliankps3fv0casx4r8rvwkdzqx1piqq18xy4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.1.0-darwin-amd64.tar.gz"; - sha256 = "1smy1y2pnxnvw8zcs31q9xs80hyqhzawfzcwkkfnyamdrgasxqsi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.1.1-darwin-amd64.tar.gz"; + sha256 = "1mdchvibk989xq5zfjb7cdzgh9m769cvj2l5dfxmkava7zhmj2bj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.3.0-darwin-amd64.tar.gz"; - sha256 = "03idn1livy9w3izi7qrdgnigx3ayrp8qp2q3m5ik9ffvv2g11962"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.6.0-darwin-amd64.tar.gz"; + sha256 = "013c13ypvz75x9qppzmlvwg4bnjryw9q16j6v987ibrrfxblan5b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.0.0-darwin-amd64.tar.gz"; - sha256 = "06m6ldqa82w82kjz7pxi0pbk9x02pzsy4x0in8fcq9gsh1p0gka9"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.2.0-darwin-amd64.tar.gz"; - sha256 = "0mymvn2355bq9ykvnww0si0imikzxp7mp1yh2scn8kjn2gs4nhgk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.5.0-darwin-amd64.tar.gz"; + sha256 = "0kc4il1ixh7ricl4n3vadvjy0rjj0bps7n8lbqgrq8lm5m419izv"; } ]; }; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh old mode 100644 new mode 100755 index 26a48469841c..4aa8478da1f7 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -1,13 +1,14 @@ #!/usr/bin/env bash -VERSION="2.1.0" +VERSION="2.2.1" declare -A plugins plugins=( - ["aws"]="2.2.0" - ["gcp"]="3.3.0" - ["random"]="2.1.0" - ["kubernetes"]="2.0.0" + ["aws"]="2.5.0" + ["gcp"]="3.6.0" + ["random"]="2.1.1" + ["kubernetes"]="2.2.0" + ["postgresql"]="2.1.1" ) function genMainSrc() { From aa416da92b58443dea1c1d6cff9def6c00bfcafb Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 7 Jun 2020 14:27:39 +0700 Subject: [PATCH 0629/3452] pulumi: add postgresql and kubernetes providers --- pkgs/tools/admin/pulumi/data.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index aa4f03b07fe4..cfed777020a2 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -8,6 +8,10 @@ url = "https://get.pulumi.com/releases/sdk/pulumi-v2.2.1-linux-x64.tar.gz"; sha256 = "0bvwkvsinnhlh1yhh5llffh89w07f412q6z03ypzl19p6fvik1k1"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.1.1-linux-amd64.tar.gz"; + sha256 = "0bj9nlxsb77ycwvmba1vsh1vydyrszq3jxlf9d1qsv71h4s88a90"; + } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.1.1-linux-amd64.tar.gz"; sha256 = "0ggi1c4lg6pip6d4bh2cji25hcwv3ii870bjwd35ax668z0dc28d"; @@ -16,6 +20,10 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.6.0-linux-amd64.tar.gz"; sha256 = "0l4vv7vkzsphvk9r28l253ds8ny0wh0fahqjjnz31jqzfbvzyxm8"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.2.0-linux-amd64.tar.gz"; + sha256 = "1maiy1i43p0gl2w12hfk9zgfz418innzi7nkv68qlyxd4hi5v6mf"; + } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.5.0-linux-amd64.tar.gz"; sha256 = "02xjwx2rfh3k9zk8aw39n4k6jnp8chcfc5f1zac7x4xfkqyjlpcy"; @@ -26,6 +34,10 @@ url = "https://get.pulumi.com/releases/sdk/pulumi-v2.2.1-darwin-x64.tar.gz"; sha256 = "1fizddk1hxazn33xliankps3fv0casx4r8rvwkdzqx1piqq18xy4"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.1.1-darwin-amd64.tar.gz"; + sha256 = "17iqzv06s4xhnway3j534lsj8gzxld67kfn7awn4ymwh2zn8l3z0"; + } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.1.1-darwin-amd64.tar.gz"; sha256 = "1mdchvibk989xq5zfjb7cdzgh9m769cvj2l5dfxmkava7zhmj2bj"; @@ -34,6 +46,10 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.6.0-darwin-amd64.tar.gz"; sha256 = "013c13ypvz75x9qppzmlvwg4bnjryw9q16j6v987ibrrfxblan5b"; } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.2.0-darwin-amd64.tar.gz"; + sha256 = "0maca137agmig8njz0fd0yhxahdra7pqaw23mxfxa8m5j44p787a"; + } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.5.0-darwin-amd64.tar.gz"; sha256 = "0kc4il1ixh7ricl4n3vadvjy0rjj0bps7n8lbqgrq8lm5m419izv"; From bb8ea1384097210b942bd5333f97794df5a730b4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 7 Jun 2020 10:31:58 +0300 Subject: [PATCH 0630/3452] rubyMinimal: Disable JIT support and remove cc refs To make rubyMinimal truely minimal, it shouldn't reference stdenv.cc --- pkgs/development/interpreters/ruby/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index bea64fa7a776..1e6a81373bb5 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -159,7 +159,7 @@ let $out/lib/libruby* ${removeReferencesTo}/bin/remove-references-to \ -t ${stdenv.cc} \ - $out/lib/ruby/${version}/${stdenv.targetPlatform.system}/rbconfig.rb + $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb '' } # Bundler tries to create this directory diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2b95da052c2..b963674d1e55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9777,6 +9777,8 @@ in rubyMinimal = ruby.override { # gem support is minimal overhead rubygemsSupport = true; + removeReferenceToCC = true; + JitSupport = false; useRailsExpress = false; zlibSupport = false; opensslSupport = false; From 601a99f0310529af24ca208a3cd4cfb8a8ebf299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 7 Jun 2020 10:01:57 +0200 Subject: [PATCH 0631/3452] sqlite-analyzer: 3.32.1 -> 3.32.2 It needs to be synced with sqlite itself. --- pkgs/development/libraries/sqlite/analyzer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index c4a09d041fcf..cf8a9aaa7326 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "sqlite-analyzer"; - version = "3.32.1"; + version = "3.32.2"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; - sha256 = "1l3jg1564p1fjga70zm1mg64bsbys9wq4canxyy0v0mb6kb7vk2w"; + sha256 = "1jqhs896cvp9l399mjpbv1x2qbfvq875l1vrgnl3zc4ffdjxs9z0"; }; nativeBuildInputs = [ unzip ]; From 59ca4153efcca4b041c38975a8f5f38ad33d0c38 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 10:46:21 +0200 Subject: [PATCH 0632/3452] apache-airflow: build with python 3.7 --- 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 95a505054a99..dce5b5eb18f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -624,7 +624,7 @@ in airfield = callPackage ../tools/networking/airfield { }; - apache-airflow = with python3.pkgs; toPythonApplication apache-airflow; + apache-airflow = with python37.pkgs; toPythonApplication apache-airflow; airsonic = callPackage ../servers/misc/airsonic { }; From 7c65275595ed047d78233ba5e0ae6c49d66196ad Mon Sep 17 00:00:00 2001 From: Christoph Neidahl Date: Sun, 7 Jun 2020 12:27:03 +0200 Subject: [PATCH 0633/3452] palemoon: 28.9.3 -> 28.10.0 --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 4593e30f2fa5..4a64d0af0189 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.9.3"; + version = "28.10.0"; src = fetchgit { url = "https://github.com/MoonchildProductions/Pale-Moon.git"; rev = "${version}_Release"; - sha256 = "1f8vfjyihlr2l79mkfgdcvwjnh261n6imkps310x9x3977jiq2wr"; + sha256 = "0c64vmrp46sbl1dgl9dq2vkmpgz9gvgd59dk02jqwyhx4lln1g2l"; fetchSubmodules = true; }; From a739d310c1dcfabbdbeb48b57a2fb22fed5d61a3 Mon Sep 17 00:00:00 2001 From: "EEva (JPotier)" Date: Wed, 3 Jun 2020 16:40:48 +0300 Subject: [PATCH 0634/3452] libucl: init at 0.8.1 --- pkgs/development/libraries/libucl/default.nix | 58 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/libraries/libucl/default.nix diff --git a/pkgs/development/libraries/libucl/default.nix b/pkgs/development/libraries/libucl/default.nix new file mode 100644 index 000000000000..b9b33453a4c6 --- /dev/null +++ b/pkgs/development/libraries/libucl/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +, autoreconfHook +, curl +, lua +, openssl +, features ? { + urls = false; + # Upstream enables regex by default + regex = true; + # Signature support is broken with openssl 1.1.1: https://github.com/vstakhov/libucl/issues/203 + signatures = false; + lua = false; + utils = false; + } +}: + +let + featureDeps = { + urls = [ curl ]; + signatures = [ openssl ]; + lua = [ lua ]; + }; +in +stdenv.mkDerivation rec { + pname = "libucl"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "vstakhov"; + repo = pname; + rev = version; + sha256 = "1h52ldxankyhbbm1qbqz1f2q0j03c1b4mig7343bs3mc6fpm18gf"; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + buildInputs = with stdenv.lib; + concatLists ( + mapAttrsToList (feat: enabled: + optionals enabled (featureDeps."${feat}" or []) + ) features + ); + + enableParallelBuilding = true; + + configureFlags = with stdenv.lib; + mapAttrsToList (feat: enabled: strings.enableFeature enabled feat) features; + + meta = with stdenv.lib; { + description = "Universal configuration library parser"; + homepage = "https://github.com/vstakhov/libucl"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ jpotier ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62f5aca336b0..142ed2bf1494 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5008,6 +5008,8 @@ in libiberty = callPackage ../development/libraries/libiberty { }; + libucl = callPackage ../development/libraries/libucl { }; + libxc = callPackage ../development/libraries/libxc { }; libxcomp = callPackage ../development/libraries/libxcomp { }; From 36d52ba5663ebfdbdd8fcab950e90140c4c0c125 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 7 Jun 2020 14:06:05 +0300 Subject: [PATCH 0635/3452] 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 177ac37bd94f9fe0873fb3d2c4fbc20d68c8cde7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 7 Jun 2020 09:32:45 -0300 Subject: [PATCH 0636/3452] lumina.lumina: make bsdtar available for lumina-archiver --- pkgs/desktops/lumina/lumina/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index 1b30b8cdb107..ff1810db6e6e 100644 --- a/pkgs/desktops/lumina/lumina/default.nix +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -2,6 +2,7 @@ , mkDerivation , fetchFromGitHub , fluxbox +, libarchive , numlockx , qmake , qtbase @@ -33,6 +34,7 @@ mkDerivation rec { buildInputs = [ fluxbox # window manager for Lumina DE + libarchive # make `bsdtar` available for lumina-archiver numlockx # required for changing state of numlock at login qtbase qtmultimedia @@ -66,9 +68,12 @@ mkDerivation rec { substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \ --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox" + # Add full path of bsdtar to lumina-archiver + substituteInPlace src-qt5/desktop-utils/lumina-archiver/TarBackend.cpp \ + --replace '"bsdtar"' '"${stdenv.lib.getBin libarchive}/bin/bsdtar"' + # Fix desktop files for i in $(grep -lir 'OnlyShowIn=Lumina' src-qt5); do - echo ===== $i substituteInPlace $i --replace 'OnlyShowIn=Lumina' 'OnlyShowIn=X-Lumina' done ''; From e9083c5a887b8e8378e7d7b4d68e1c6c3b9713c7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 15:12:24 +0200 Subject: [PATCH 0637/3452] vulnix: use python 3.7 --- 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 dce5b5eb18f7..284ea624f2fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11135,7 +11135,9 @@ in vultr-cli = callPackage ../development/tools/vultr-cli { }; - vulnix = callPackage ../tools/security/vulnix { }; + vulnix = callPackage ../tools/security/vulnix { + python3Packages = python37Packages; + }; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; From 6394b12a07900d8acc01dc96a9669bed6549d1f9 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 6 Jun 2020 10:58:44 -0400 Subject: [PATCH 0638/3452] nixos/ssmtp: add settings option --- nixos/modules/programs/ssmtp.nix | 50 +++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix index c7a947393496..eee36b6ae577 100644 --- a/nixos/modules/programs/ssmtp.nix +++ b/nixos/modules/programs/ssmtp.nix @@ -45,6 +45,21 @@ in ''; }; + settings = mkOption { + type = with types; attrsOf (oneOf [ bool str ]); + default = {}; + description = '' + ssmtp5 configuration. Refer + to for details on supported values. + ''; + example = literalExample '' + { + Debug = true; + FromLineOverride = false; + } + ''; + }; + hostName = mkOption { type = types.str; example = "mail.example.org"; @@ -148,19 +163,28 @@ in text = cfg.authPass; }))); - environment.etc."ssmtp/ssmtp.conf".text = - let yesNo = yes : if yes then "YES" else "NO"; in - '' - MailHub=${cfg.hostName} - FromLineOverride=YES - ${optionalString (cfg.root != "") "root=${cfg.root}"} - ${optionalString (cfg.domain != "") "rewriteDomain=${cfg.domain}"} - UseTLS=${yesNo cfg.useTLS} - UseSTARTTLS=${yesNo cfg.useSTARTTLS} - #Debug=YES - ${optionalString (cfg.authUser != "") "AuthUser=${cfg.authUser}"} - ${optionalString (cfg.authPassFile != null) "AuthPassFile=${cfg.authPassFile}"} - ''; + services.ssmtp.settings = mkMerge [ + ({ + MailHub = cfg.hostName; + FromLineOverride = mkDefault true; + UseTLS = cfg.useTLS; + UseSTARTTLS = cfg.useSTARTTLS; + }) + (mkIf (cfg.root != "") { root = cfg.root; }) + (mkIf (cfg.domain != "") { rewriteDomain = cfg.domain; }) + (mkIf (cfg.authUser != "") { AuthUser = cfg.authUser; }) + (mkIf (cfg.authPassFile != null) { AuthPassFile = cfg.authPassFile; }) + ]; + + environment.etc."ssmtp/ssmtp.conf".source = + let + toStr = value: + if value == true then "YES" + else if value == false then "NO" + else builtins.toString value + ; + in + pkgs.writeText "ssmtp.conf" (concatStringsSep "\n" (mapAttrsToList (key: value: "${key}=${toStr value}") cfg.settings)); environment.systemPackages = [pkgs.ssmtp]; From a5e6901702ae08e5bcbe4c7b6574abd559aff6ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vojt=C4=9Bch=20K=C3=A1n=C4=9B?= Date: Sun, 7 Jun 2020 17:19:45 +0200 Subject: [PATCH 0639/3452] traefik: unify TOML generation As a side effect, the dynamic config file is now indented --- nixos/modules/services/web-servers/traefik.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index 4ab7307c3b67..0631a26569c8 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -20,10 +20,10 @@ let in valueType; dynamicConfigFile = if cfg.dynamicConfigFile == null then pkgs.runCommand "config.toml" { - buildInputs = [ pkgs.remarshal ]; + buildInputs = [ pkgs.yj ]; preferLocalBuild = true; } '' - remarshal -if json -of toml \ + yj -jt -i \ < ${ pkgs.writeText "dynamic_config.json" (builtins.toJSON cfg.dynamicConfigOptions) From b78c6d47eecb0641a4f1eb0a9a77fbaa9fa2d975 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 6 Jun 2020 21:53:52 +0000 Subject: [PATCH 0640/3452] autogen: More normal formatting --- pkgs/development/tools/misc/autogen/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 6b9e8db2f2aa..17aa6e5fdf9c 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; - nativeBuildInputs = [ which pkgconfig perl ] + nativeBuildInputs = [ + which pkgconfig perl + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # autogen needs a build autogen when cross-compiling - ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - buildPackages.buildPackages.autogen buildPackages.texinfo ]; + buildPackages.buildPackages.autogen buildPackages.texinfo + ]; buildInputs = [ guile libxml2 ]; From 87e86b457467e09a1e26a48b7b4abc223a4d7d3f Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 7 Jun 2020 15:36:28 +0000 Subject: [PATCH 0641/3452] autoen: Fix cross build See comments for details. Patch can be removed whend version is bumped. --- pkgs/development/tools/misc/autogen/default.nix | 16 ++++++++++++++++ .../tools/misc/autogen/pkg-config-use-var.patch | 13 +++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/misc/autogen/pkg-config-use-var.patch diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 17aa6e5fdf9c..65c4f3174051 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -11,6 +11,22 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; + patches = [ + # Temporary, so builds with a prefixed pkg-config (like cross builds) work. + # + # https://savannah.gnu.org/support/?109050 was supposed to fix this, but + # the generated configure script mysteriously still contained hard-coded + # pkg-config. I tried regenerating it, but that didn't help. Only + # https://git.savannah.gnu.org/cgit/autogen.git/commit/?h=5cbe233387d7f7b36752736338d1cd4f71287daa, + # in the next release, finally fixes this, by getting rid of some + # metaprogramming of the autoconf m4 metaprogram! There evidentally was + # some sort escaping error such that the `PKG_CONFIG` check got evaluated + # before `configure` was generated. + # + # Remove this when the version is bumped + ./pkg-config-use-var.patch + ]; + nativeBuildInputs = [ which pkgconfig perl ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/pkgs/development/tools/misc/autogen/pkg-config-use-var.patch b/pkgs/development/tools/misc/autogen/pkg-config-use-var.patch new file mode 100644 index 000000000000..69476f62c6db --- /dev/null +++ b/pkgs/development/tools/misc/autogen/pkg-config-use-var.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index c3f761d1c3f..14b101f67c1 +--- a/configure ++++ b/configure +@@ -16683,7 +16683,7 @@ fi + + + +- ag_gv=`gdir=\`pkg-config --cflags-only-I \ ++ ag_gv=`gdir=\`${PKG_CONFIG} --cflags-only-I \ + guile-${GUILE_EFFECTIVE_VERSION} | \ + sed 's/\(^\| \)-I/\1/g'\` + for d in $gdir From a8ee561b0f2f9d5676a83dfe274985b052343907 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Sun, 7 Jun 2020 19:08:59 +0200 Subject: [PATCH 0642/3452] 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 1deac026fe5b8027c3b0803aaab87e63bfb22af8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 19:23:26 +0200 Subject: [PATCH 0643/3452] azure-cli: use python37 because of aiohttp --- 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 284ea624f2fd..08eecfa1b3c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -777,7 +777,7 @@ in iamy = callPackage ../tools/admin/iamy { }; - azure-cli = callPackage ../tools/admin/azure-cli { python = python3; }; + azure-cli = callPackage ../tools/admin/azure-cli { python = python37; }; azure-storage-azcopy = callPackage ../development/tools/azcopy { }; From e1efaad9324a0d9abcb75a4ce06833781d87bd0d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 19:23:54 +0200 Subject: [PATCH 0644/3452] home-assistant: use python37 because of aiohttp --- 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 08eecfa1b3c6..7d2d6788e4d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15740,7 +15740,9 @@ in hiawatha = callPackage ../servers/http/hiawatha {}; - home-assistant = callPackage ../servers/home-assistant { }; + home-assistant = callPackage ../servers/home-assistant { + python3 = python37; + }; home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { }; From 8d05c66dc66dcffcc1c15289cfef2dc4d122911f Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sun, 7 Jun 2020 20:12:56 +0200 Subject: [PATCH 0645/3452] fixup! update --- doc/languages-frameworks/lua.section.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md index 058b8f45c988..a0e9917b8ec5 100644 --- a/doc/languages-frameworks/lua.section.md +++ b/doc/languages-frameworks/lua.section.md @@ -11,7 +11,7 @@ date: 2019-02-05 ### Overview of Lua Several versions of the Lua interpreter are available: luajit, lua 5.1, 5.2, 5.3. -The attribute `lua` refers to the default interpreter, it is also possible to refer to specific versions, e.g. `lua_52` refers to Lua 5.2. +The attribute `lua` refers to the default interpreter, it is also possible to refer to specific versions, e.g. `lua5_2` refers to Lua 5.2. Lua libraries are in separate sets, with one set per interpreter version. @@ -48,7 +48,7 @@ using `config.nix`, { # ... packageOverrides = pkgs: with pkgs; { - myLuaEnv = lua_52.withPackages (ps: with ps; [ busted luafilesystem ]); + myLuaEnv = lua5_2.withPackages (ps: with ps; [ busted luafilesystem ]); }; } ``` @@ -157,7 +157,7 @@ are not packaged for luarocks. You can see a few examples at `pkgs/top-level/lua ### Lua interpreters Versions 5.1, 5.2 and 5.3 of the lua interpreter are available as -respectively `lua_51`, `lua_52` and `lua_53`. Luajit is available too. +respectively `lua5_1`, `lua5_2` and `lua5_3`. Luajit is available too. The Nix expressions for the interpreters can be found in `pkgs/development/interpreters/lua-5`. From f87b23a966d46dfcc77ea6a203479f79c8d5cf02 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Sun, 7 Jun 2020 19:38:50 +0200 Subject: [PATCH 0646/3452] luxcorerender: dependency: python35 -> python36 --- pkgs/tools/graphics/luxcorerender/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index fc8a98c19930..3afb6ebd9877 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35 +{ stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python36 , tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core , dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre @@ -7,28 +7,34 @@ , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp }: -let boost_static = boost165.override { - python = python35; +let + python = python36; + + boost_static = boost165.override { + inherit python; enableStatic = true; enablePython = true; }; + version = "2.0"; + sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38"; + in stdenv.mkDerivation { pname = "luxcorerender"; - version = "2.0"; + inherit version; src = fetchFromGitHub { owner = "LuxCoreRender"; repo = "LuxCore"; - rev = "luxcorerender_v2.0"; - sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38"; + rev = "luxcorerender_v${version}"; + inherit sha256; }; buildInputs = [ embree2 pkgconfig cmake zlib boost_static libjpeg libtiff libpng ilmbase freetype openexr openimageio tbb qt5.full c-blosc libGLU pcre bison - flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon + flex libX11 libpthreadstubs python libXdmcp libxkbcommon epoxy at-spi2-core dbus doxygen # needed for GSETTINGS_SCHEMAS_PATH gsettings-desktop-schemas glib gtk3 @@ -43,15 +49,15 @@ in stdenv.mkDerivation { "-DOpenEXR_IlmThread_INCLUDE_DIR=${ilmbase.dev}/include/OpenEXR" "-DOpenEXR_Imath_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" "-DOpenEXR_half_INCLUDE_DIR=${ilmbase.dev}/include" - "-DPYTHON_LIBRARY=${python35}/lib/libpython3.so" - "-DPYTHON_INCLUDE_DIR=${python35}/include/python3.5" + "-DPYTHON_LIBRARY=${python}/lib/libpython3.so" + "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.pythonVersion}" "-DEMBREE_INCLUDE_PATH=${embree2}/include" "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so" "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so" ] ++ stdenv.lib.optional withOpenCL "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include"; preConfigure = '' - NIX_CFLAGS_COMPILE+=" -isystem ${python35}/include/python3.5" + NIX_CFLAGS_COMPILE+=" -isystem ${python}/include/python${python.pythonVersion}" NIX_LDFLAGS+=" -lpython3" ''; From da6ab6626e6a7c8fed529a9e3ff8d686995d98d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 7 Jun 2020 16:22:53 -0300 Subject: [PATCH 0647/3452] qsudo: init at 2020.03.27 --- pkgs/applications/misc/qsudo/default.nix | 42 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/misc/qsudo/default.nix diff --git a/pkgs/applications/misc/qsudo/default.nix b/pkgs/applications/misc/qsudo/default.nix new file mode 100644 index 000000000000..63d97b3001c4 --- /dev/null +++ b/pkgs/applications/misc/qsudo/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, mkDerivation +, fetchFromGitHub +, qmake +, qtbase +, sudo +}: + +mkDerivation rec { + pname = "qsudo"; + version = "2020.03.27"; + + src = fetchFromGitHub { + owner = "project-trident"; + repo = pname; + rev = "v${version}"; + sha256 = "06kg057vwkvafnk69m9rar4wih3vq4h36wbzwbfc2kndsnn47lfl"; + }; + + sourceRoot = "source/src-qt5"; + + nativeBuildInputs = [ + qmake + ]; + + buildInputs = [ + qtbase + sudo + ]; + + postPatch = '' + substituteInPlace qsudo.pro --replace /usr/bin $out/bin + ''; + + meta = with stdenv.lib; { + description = "Graphical sudo utility from Project Trident"; + homepage = "https://github.com/project-trident/qsudo"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5004ef6dba73..6e5d290c538a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21694,6 +21694,8 @@ in }; }; + qsudo = libsForQt5.callPackage ../applications/misc/qsudo { }; + qsynth = libsForQt5.callPackage ../applications/audio/qsynth { }; qtbitcointrader = libsForQt5.callPackage ../applications/misc/qtbitcointrader { }; From a239864fc610ff7738c5a8af2a7be25a0af4a28b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 8 Jun 2020 00:25:01 +0000 Subject: [PATCH 0648/3452] systemd: Fix cross build This was very similar to the Mesa issues fixed in 62e6d73a09870174a891d2a8d29a38e62b05efd5: the user-written code is looking up an unprefixed binutils program. [I think we should have a way in Meson of specifying a program prefix in the cross / native files, as a fallback for any program that isn't explicitly specified. This could both be availible for user written rules, and help with the default rules.] Fixes https://github.com/NixOS/mobile-nixos/issues/161 --- pkgs/os-specific/linux/systemd/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 00a545ed3f54..3235fb3b95cd 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -66,6 +66,13 @@ in stdenv.mkDerivation { postPatch = '' substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" + substituteInPlace src/boot/efi/meson.build \ + --replace \ + "find_program('ld'" \ + "find_program('${stdenv.cc.bintools.targetPrefix}ld'" \ + --replace \ + "find_program('objcopy'" \ + "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" ''; outputs = [ "out" "lib" "man" "dev" ]; From 4b1ac88d480f1b22a4d48290dddb24392f41f35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 7 Jun 2020 23:51:04 -0300 Subject: [PATCH 0649/3452] snowblind: 2020-02-26 -> 2020-06-07 --- pkgs/data/themes/snowblind/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/snowblind/default.nix b/pkgs/data/themes/snowblind/default.nix index db7b34d78e76..3517f4de2638 100644 --- a/pkgs/data/themes/snowblind/default.nix +++ b/pkgs/data/themes/snowblind/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "snowblind"; - version = "2020-02-26"; + version = "2020-06-07"; src = fetchFromGitLab { domain = "www.opencode.net"; owner = "ju1464"; repo = pname; - rev = "94c35410be5cccc142c9cd6be9dff973ce0761c4"; - sha256 = "1aqmpg1vyqwp6s6iikp5c5yfrvdkzq75jdr9mmv2ijcam1g0jhnv"; + rev = "88d626b204e19d1730836289a1c0d83efcf247d0"; + sha256 = "0admiqwdc0rvl8zxs0b2qyvsi8im7lrpsygm8ky8ymyf7alkw0gd"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From efe9c7c138873efd52e2fb9f55282838e6d588ae Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 8 Jun 2020 13:24:34 +1000 Subject: [PATCH 0650/3452] bat: add maintainer --- pkgs/tools/misc/bat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index b4806b6b4a07..9902142df352 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { description = "A cat(1) clone with syntax highlighting and Git integration"; homepage = "https://github.com/sharkdp/bat"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir lilyball ]; + maintainers = with maintainers; [ dywedir lilyball zowoq ]; platforms = platforms.all; }; } From 6ade1ec9a0c250d55da3b5a979827dcef4c69a70 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 8 Jun 2020 13:24:34 +1000 Subject: [PATCH 0651/3452] exa: add maintainer --- pkgs/tools/misc/exa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index fd6baadb685c..13c8b3f1d4f5 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -57,6 +57,6 @@ buildRustPackage rec { ''; homepage = "https://the.exa.website"; license = licenses.mit; - maintainers = with maintainers; [ ehegnes lilyball globin ]; + maintainers = with maintainers; [ ehegnes lilyball globin zowoq ]; }; } From bec1b17a4c70c7ab90ecde3f5dab81b8648aebc3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 8 Jun 2020 13:24:35 +1000 Subject: [PATCH 0652/3452] fd: add maintainer --- pkgs/tools/misc/fd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 4fd4c5428d98..1f56eda0a422 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/sharkdp/fd"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir globin ma27 ]; + maintainers = with maintainers; [ dywedir globin ma27 zowoq ]; platforms = platforms.all; }; } From 6ac70262b748fa1d8b11bef911778c391bb8a40a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 8 Jun 2020 13:24:35 +1000 Subject: [PATCH 0653/3452] fzf: add maintainer --- pkgs/tools/misc/fzf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index e875dd77b02b..2fe4bac88f0c 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -60,7 +60,7 @@ buildGoModule rec { homepage = "https://github.com/junegunn/fzf"; description = "A command-line fuzzy finder written in Go"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ma27 ]; + maintainers = with maintainers; [ filalex77 ma27 zowoq ]; platforms = platforms.unix; }; -} \ No newline at end of file +} From f13cb53452dc824d0a79f0c25ca7509f79f6f743 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 8 Jun 2020 13:24:35 +1000 Subject: [PATCH 0654/3452] miniserve: add maintainer --- pkgs/tools/misc/miniserve/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index dab44e1eea5a..503131898c8f 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { description = "For when you really just want to serve some files over HTTP right now!"; homepage = "https://github.com/svenstaro/miniserve"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ nequissimus ]; + maintainers = with maintainers; [ nequissimus zowoq ]; platforms = platforms.unix; }; } From d2528b8873cd8f93b006646ec2e03ef12df3eef0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 8 Jun 2020 13:24:36 +1000 Subject: [PATCH 0655/3452] ncdu: add maintainer --- pkgs/tools/misc/ncdu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 6b6567a9be5c..71b7f9c6cd47 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = "https://dev.yorhel.nl/ncdu"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub zowoq ]; }; } From cc1b2a14be1d6f30287ee6b8c6213dadf0f7bb2d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 8 Jun 2020 13:24:36 +1000 Subject: [PATCH 0656/3452] megatools: add maintainer --- pkgs/tools/networking/megatools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index b729e9961857..43bbc62be954 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Command line client for Mega.co.nz"; homepage = "https://megatools.megous.com/"; license = licenses.gpl2Plus; - maintainers = [ maintainers.viric maintainers.AndersonTorres ]; + maintainers = with maintainers; [ viric AndersonTorres zowoq ]; platforms = platforms.unix; }; } From 72fb771de98144395b742488ad8d3c63d0713329 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 8 Jun 2020 13:24:36 +1000 Subject: [PATCH 0657/3452] ripgrep: add maintainer --- pkgs/tools/text/ripgrep/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 65ec36e58643..548b6fd22de5 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; homepage = "https://github.com/BurntSushi/ripgrep"; license = with licenses; [ unlicense /* or */ mit ]; - maintainers = with maintainers; [ tailhook globin ma27 ]; + maintainers = with maintainers; [ tailhook globin ma27 zowoq ]; platforms = platforms.all; }; } From 794e0f7ca4d07740a1261f36bbec9f07ff5bdd69 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 8 Jun 2020 13:24:37 +1000 Subject: [PATCH 0658/3452] shfmt: add maintainer --- pkgs/tools/text/shfmt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index ab96392a95d0..251f6224b403 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -24,5 +24,6 @@ buildGoModule rec { You can feed it standard input, any number of files or any number of directories to recurse into. ''; license = licenses.bsd3; + maintainers = with maintainers; [ zowoq ]; }; -} \ No newline at end of file +} From b59847b848079ba872e18b5f0683c1bff7e924ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 8 Jun 2020 06:27:16 +0200 Subject: [PATCH 0659/3452] systemd: avoid rebuild from the parent commit for now Otherwise we'd be delaying this staging-next cycle noticeably. --- pkgs/os-specific/linux/systemd/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3235fb3b95cd..722b4db9a80a 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -66,6 +66,9 @@ in stdenv.mkDerivation { postPatch = '' substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" + '' + # TODO: unconditionalize on the next rebuild + + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace src/boot/efi/meson.build \ --replace \ "find_program('ld'" \ From aae680cd5d508b4696252368b72490b96c101277 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 8 Jun 2020 20:35:08 +1000 Subject: [PATCH 0660/3452] go: fix TestDontCacheBrokenHTTP2Conn failure --- pkgs/development/compilers/go/1.14.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index e1fc3e259785..5625680e4519 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -2,6 +2,7 @@ , perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell , buildPackages, pkgsTargetTarget +, fetchpatch }: let @@ -137,6 +138,12 @@ stdenv.mkDerivation rec { ./go-1.9-skip-flaky-20072.patch ./skip-external-network-tests.patch ./skip-nohup-tests.patch + + # fix rare TestDontCacheBrokenHTTP2Conn failure + (fetchpatch { + url = "https://github.com/golang/go/commit/ea1437a8cdf6bb3c2d2447833a5d06dbd75f7ae4.patch"; + sha256 = "1lyzy4nf8c34a966vw45j3j7hzpvncq2gqspfxffzkyh17xd8sgy"; + }) ] ++ [ # breaks under load: https://github.com/golang/go/issues/25628 (if stdenv.isAarch32 From b47e4cc0c00871a942de086306058a4474b3d5df Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Mon, 8 Jun 2020 13:22:39 +0200 Subject: [PATCH 0661/3452] mumble: 1.3.0 -> 1.3.1 --- pkgs/applications/networking/mumble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 633d6e63dce9..b83e98a558c2 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -128,14 +128,14 @@ let } source; source = rec { - version = "1.3.0"; + version = "1.3.1"; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; rev = version; - sha256 = "0g5ri84gg0x3crhpxlzawf9s9l4hdna6aqw6qbdpx1hjlf5k6g8k"; + sha256 = "1xsla9g7xbq6xniwcsjik5hbjh0xahv44qh4z9hjn7p70b8vgnwc"; fetchSubmodules = true; }; }; From 1553a46f280e18e8960e8d64d251dc68b7f5e55a Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sat, 6 Jun 2020 19:16:39 +0200 Subject: [PATCH 0662/3452] python3Packages.nunavut: init at 0.3.0 --- .../python-modules/nunavut/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/nunavut/default.nix diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix new file mode 100644 index 000000000000..96247c93000b --- /dev/null +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, pythonOlder, fetchPypi, pydsdl }: + + buildPythonPackage rec { + pname = "nunavut"; + version = "0.3.0"; + disabled = pythonOlder "3.5"; # only python>=3.5 is supported + + src = fetchPypi { + inherit pname version; + sha256 = "1ycnxrw2qgm7kdapsnhz80jsqkghgvb5giqwapn0m30rplwc3s36"; + }; + + propagatedBuildInputs = [ + pydsdl + ]; + + # allow for writable directory for darwin + preBuild = '' + export HOME=$TMPDIR + ''; + + # repo doesn't contain tests, ensure imports aren't broken + pythonImportsCheck = [ + "nunavut" + ]; + + meta = with lib; { + description = "A UAVCAN DSDL template engine"; + longDescription = '' + It exposes a pydsdl abstract syntax tree to Jinja2 templates allowing + authors to generate code, schemas, metadata, documentation, etc. + ''; + homepage = "https://nunavut.readthedocs.io/"; + maintainers = with maintainers; [ wucke13 ]; + license = with licenses; [ bsd3 mit ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 451bcff62a1e..cd9d8de823eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1002,6 +1002,8 @@ in { nvchecker = callPackage ../development/python-modules/nvchecker { }; numericalunits = callPackage ../development/python-modules/numericalunits { }; + + nunavut = callPackage ../development/python-modules/nunavut { }; oath = callPackage ../development/python-modules/oath { }; From 8f1aac8c00dfaac0d725f947fd679860ed50f4ac Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sat, 6 Jun 2020 19:18:58 +0200 Subject: [PATCH 0663/3452] python3Packages.pyuavcan: init at 1.1.0.dev1 --- .../python-modules/pyuavcan/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 11 ++++ 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/pyuavcan/default.nix diff --git a/pkgs/development/python-modules/pyuavcan/default.nix b/pkgs/development/python-modules/pyuavcan/default.nix new file mode 100644 index 000000000000..0c78b3059593 --- /dev/null +++ b/pkgs/development/python-modules/pyuavcan/default.nix @@ -0,0 +1,50 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, numpy, nunavut +, pyserial , pytest, ruamel_yaml}: + + buildPythonPackage rec { + pname = "pyuavcan"; + version = "1.1.0.dev1"; + disabled = pythonOlder "3.7"; # only python>=3.7 is supported + + src = fetchFromGitHub { + owner = "UAVCAN"; + repo = pname; + rev = version; + sha256 = "0fmbmdnnh679zkllv5m6pkrasg7m9vjwabqnmz5m7flrgdh6h4qa"; + }; + + propagatedBuildInputs = [ + numpy + nunavut + pyserial + pytest + ruamel_yaml + ]; + + # allow for writable directory for darwin + preBuild = '' + export HOME=$TMPDIR + export PYTHONASYNCIODEBUG=1 + ''; + + # tests fail ATM. + doCheck = false; + + # check at least that import works, as tests fail + pythonImportsCheck = [ + "pyuavcan" + ]; + + meta = with lib; { + description = "A full-featured implementation of the UAVCAN protocol stack"; + longDescription = '' + It is intended for non-embedded, user-facing applications such as GUI + software, diagnostic tools, automation scripts, prototypes, and various + R&D cases. PyUAVCAN consists of a Python library (package) and a simple + CLI tool for basic diagnostics and shell script automation. + ''; + homepage = "https://pyuavcan.readthedocs.io"; + maintainers = with maintainers; [ wucke13 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cd9d8de823eb..333b589af3a2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1617,6 +1617,17 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }; + pyuavcan = callPackage ../development/python-modules/pyuavcan { + # this version pinpoint to anold version is necessary due to a regression + nunavut = self.nunavut.overridePythonAttrs ( old: rec { + version = "0.2.3"; + src = old.src.override { + inherit version; + sha256 = "0x8a9h4mc2r2yz49s9arsbs4bn3h25mvmg4zbgksm9hcyi9536x5"; + }; + }); + }; + pyunifi = callPackage ../development/python-modules/pyunifi { }; vdf = callPackage ../development/python-modules/vdf { }; From 77ca582d91127a5e606652a2e9825dcd63b35df0 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Mon, 8 Jun 2020 10:23:44 -0400 Subject: [PATCH 0664/3452] prometheus-keylight-exporter: init at 0.1.1 --- .../prometheus/keylight-exporter.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/keylight-exporter.nix diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix new file mode 100644 index 000000000000..b4d716bcdcb8 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "keylight-exporter"; + version = "0.1.1"; + + goPackagePath = "github.com/mdlayher/keylight_exporter"; + + src = fetchFromGitHub { + owner = "mdlayher"; + repo = "keylight_exporter"; + rev = "v${version}"; + sha256 = "141npawcnxj3sz2xqsnyf06r4x1azk3g55941i8gjr7pwcla34r7"; + }; + + vendorSha256 = "0w065ls8dp687jmps4xdffcarss1wyls14dngr43g58xjw6519gb"; + + meta = with stdenv.lib; { + homepage = "https://github.com/mdlayher/keylight_exporter"; + description = "Prometheus exporter for Elgato Key Light devices."; + license = licenses.mit; + maintainers = with maintainers; [ mdlayher ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d3741cae398..4caa999e44c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16134,6 +16134,7 @@ in prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; + prometheus-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { }; prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { }; From 19b2efbc3921c967d8260bf246391a93aed30874 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 8 Jun 2020 17:01:58 +0200 Subject: [PATCH 0665/3452] linux_5_7: init at 5.7.1 Changes: - Copied linux-5.7.nix from linux-5.6.nix - Add linux_5_7 and linuxPackages_5_7 - Update linux_latest to 5.7 Note: The kernel patch 'kernelPatches.export_kernel_fpu_functions."5.3"' is still applied as I copied the list from linux_5_7 (vs. linux_testing). This patch is probably still required for the ZFS performance. --- pkgs/os-specific/linux/kernel/linux-5.7.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 11 ++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-5.7.nix diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix new file mode 100644 index 000000000000..81f4d4b3553d --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.7.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "5.7.1"; + + # 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; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "1vcxrrb2i4366iciw0mfahwbdrzmhrrsr7gi4vdkzznfv2niils0"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d3741cae398..6558f59ef638 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16906,6 +16906,14 @@ in ]; }; + linux_5_7 = callPackage ../os-specific/linux/kernel/linux-5.7.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -17118,7 +17126,7 @@ in linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_5_6; + linuxPackages_latest = linuxPackages_5_7; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -17133,6 +17141,7 @@ in linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_6); + linuxPackages_5_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_7); # When adding to this list: # - Update linuxPackages_latest to the latest version From 063043fa63a7d5fc4f885626e8fab671514eed23 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves <2335822+alexfmpe@users.noreply.github.com> Date: Mon, 8 Jun 2020 16:47:46 +0100 Subject: [PATCH 0666/3452] Fix typo --- nixos/modules/virtualisation/qemu-vm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index b8d0606be7c1..be06d6feb11f 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -448,7 +448,7 @@ in description = '' An alternate BIOS (such as qboot) with which to start the VM. - Should containin a file named bios.bin. + Should contain a file named bios.bin. If null, QEMU's builtin SeaBIOS will be used. ''; }; From 1d2e139a7691ed080902f814f2f89fca8dee55b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 8 Jun 2020 17:08:11 +0000 Subject: [PATCH 0667/3452] codeql: 2.1.4 -> 2.2.1 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index ec985a2ae19b..545cc035c929 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.1.4"; + version = "2.2.1"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "0jgwvc9flqdm88q9kknzjs125j9d3j5l5adcpngfy17ljgziy4nn"; + sha256 = "0ijgvp2ifs4wnqmxidinwdcpv41iia74nk0xahasnjm8ljvgnnqh"; }; nativeBuildInputs = [ From 9146684bbbdc29f5ee89ca2344fff947c0985e02 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 8 Jun 2020 13:17:46 -0400 Subject: [PATCH 0668/3452] liblastfm: switch to Qt 5 --- pkgs/development/libraries/liblastfm/default.nix | 15 +++++++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 62409bb7f649..762e707528a6 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, qt4, pkgconfig, libsamplerate, fftwSinglePrec, which, cmake +{ stdenv, fetchurl, pkgconfig, which, cmake +, fftwSinglePrec, libsamplerate, qtbase , darwin }: let version = "1.1.0"; in @@ -14,16 +15,22 @@ stdenv.mkDerivation rec { sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x"; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'find_package(Qt5Core QUIET)' \ + 'find_package(Qt5 REQUIRED COMPONENTS Core Network Sql Test Xml)' + ''; + prefixKey = "--prefix "; - propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ]; nativeBuildInputs = [ pkgconfig which cmake ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; + buildInputs = [ fftwSinglePrec libsamplerate qtbase ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; meta = with stdenv.lib; { homepage = "https://github.com/lastfm/liblastfm"; repositories.git = "git://github.com/lastfm/liblastfm.git"; description = "Official LastFM library"; - inherit (qt4.meta) platforms; + platforms = platforms.unix; maintainers = [ maintainers.phreedom ]; license = licenses.gpl3; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d3741cae398..dad48c6a6ee3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13036,7 +13036,7 @@ in liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; - liblastfm = callPackage ../development/libraries/liblastfm { }; + liblastfm = libsForQt5.callPackage ../development/libraries/liblastfm { }; liblcf = callPackage ../development/libraries/liblcf { }; From 458d86fd9ce01637f6a4a80559aaf207862a9dd5 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 8 Jun 2020 13:19:18 -0400 Subject: [PATCH 0669/3452] clementine: 1.3.1 -> 1.4.0rc1, switch to Qt 5, fix build --- ...ntine-spotify-blob-remove-from-build.patch | 21 ---------- .../applications/audio/clementine/default.nix | 41 ++++++++----------- 2 files changed, 17 insertions(+), 45 deletions(-) delete mode 100644 pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch diff --git a/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch b/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch deleted file mode 100644 index 226536a13ba7..000000000000 --- a/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 23070d9..83b6772 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -275,8 +275,6 @@ optional_component(LIBPULSE ON "Pulse audio integration" - optional_component(VISUALISATIONS ON "Visualisations") - - if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND) -- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify " -- "code must be compiled in") - elseif(CRYPTOPP_FOUND) - set(HAVE_CRYPTOPP ON) - set(HAVE_SPOTIFY_DOWNLOADER ON) -@@ -434,7 +432,6 @@ if(HAVE_BREAKPAD) - endif(HAVE_BREAKPAD) - - if(HAVE_SPOTIFY_BLOB) -- add_subdirectory(ext/clementine-spotifyblob) - endif(HAVE_SPOTIFY_BLOB) - - if(HAVE_MOODBAR) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 15d0f92b76aa..0c1690f1462a 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm +, qtbase, qtx11extras , taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf , qca2, pkgconfig, sparsehash, config, makeWrapper, gst_plugins }: @@ -9,30 +10,17 @@ let withCD = config.clementine.cd or true; withCloud = config.clementine.cloud or true; - version = "1.3.1"; + version = "1.4.0rc1"; src = fetchFromGitHub { owner = "clementine-player"; repo = "Clementine"; rev = version; - sha256 = "0i3jkfs8dbfkh47jq3cnx7pip47naqg7w66vmfszk4d8vj37j62j"; + sha256 = "1rqk0hrsn8f8bjk0j0vq1af0ygy6xx7qi9fw0jjw2cmj6kzckyi2"; }; patches = [ ./clementine-spotify-blob.patch - # Required so as to avoid adding libspotify as a build dependency (as it is - # unfree and thus would prevent us from having a free package). - ./clementine-spotify-blob-remove-from-build.patch - (fetchpatch { - # Fix w/gcc7 - url = "https://github.com/clementine-player/Clementine/pull/5630.patch"; - sha256 = "0px7xp1m4nvrncx8sga1qlxppk562wrk2qqk19iiry84nxg20mk4"; - }) - (fetchpatch { - # Fixes compilation with chromaprint >= 1.4 - url = "https://github.com/clementine-player/Clementine/commit/d3ea0c8482dfd3f6264a30cfceb456076d76e6cd.patch"; - sha256 = "1ifrs5aqdzw16jbnf0z1ilir20chdnr9k5n21r99miq9hzjpbh12"; - }) ]; nativeBuildInputs = [ cmake pkgconfig ]; @@ -54,6 +42,8 @@ let protobuf qca2 qjson + qtbase + qtx11extras sqlite taglib ] @@ -71,7 +61,7 @@ let -e 's,libprotobuf.a,protobuf,g' ''; - free = stdenv.mkDerivation { + free = mkDerivation { pname = "clementine-free"; inherit version; inherit src patches nativeBuildInputs postPatch; @@ -79,7 +69,14 @@ let # gst_plugins needed for setup-hooks buildInputs = buildInputs ++ [ makeWrapper ] ++ gst_plugins; - cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ]; + preConfigure = '' + rm -rf ext/{,lib}clementine-spotifyblob + ''; + + cmakeFlags = [ + "-DUSE_SYSTEM_PROJECTM=ON" + "-DSPOTIFY_BLOB=OFF" + ]; enableParallelBuilding = true; @@ -100,15 +97,11 @@ let }; # Unfree Spotify blob for Clementine - unfree = stdenv.mkDerivation { + unfree = mkDerivation { pname = "clementine-blob"; inherit version; # Use the same patches and sources as Clementine - inherit src nativeBuildInputs postPatch; - - patches = [ - ./clementine-spotify-blob.patch - ]; + inherit src nativeBuildInputs patches postPatch; buildInputs = buildInputs ++ [ libspotify makeWrapper ]; # Only build and install the Spotify blob From f56b70378ebcbf551e52598e7c77ad8b8e744161 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Thu, 7 Nov 2019 00:31:04 +0100 Subject: [PATCH 0670/3452] rpm: 4.14.2.1 -> 4.15.1 It's only compatible with Python3 now. --- pkgs/tools/package-management/rpm/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +++- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index fdcf9832e667..fee282de52fc 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,15 +1,15 @@ -{ stdenv +{ stdenv, lib , pkgconfig, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua }: stdenv.mkDerivation rec { pname = "rpm"; - version = "4.14.2.1"; + version = "4.15.1"; src = fetchurl { - url = "http://ftp.rpm.org/releases/rpm-4.14.x/rpm-${version}.tar.bz2"; - sha256 = "1nmck2fq9h85fgs3zhh6w1avlw5y16cbz5khd459ry3jfd5w4f8i"; + url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2"; + sha256 = "0c6jwail90fhha3bpx70w4a2i8ycxwvnx6zwxm121l8wc3wlbvyx"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d3741cae398..c228ff5050f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6389,7 +6389,9 @@ in rpiboot-unstable = callPackage ../development/misc/rpiboot/unstable.nix { }; - rpm = callPackage ../tools/package-management/rpm { }; + rpm = callPackage ../tools/package-management/rpm { + python = python3; + }; rpm-ostree = callPackage ../tools/misc/rpm-ostree { gperf = gperf_3_0; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a376a5abcbb..91bbf8e94693 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5693,7 +5693,7 @@ in { rply = callPackage ../development/python-modules/rply {}; - rpm = toPythonModule (pkgs.rpm.override{inherit python;}); + rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override{ inherit python; })); rpmfluff = callPackage ../development/python-modules/rpmfluff {}; From 131fda1225c395ae35e42b548ccfee1a55fd4cfb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 8 Jun 2020 19:14:11 +0000 Subject: [PATCH 0671/3452] go-jsonnet: 0.15.0 -> 0.16.0 --- pkgs/development/compilers/go-jsonnet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index 6c00d5ee6ce5..d85cf1adfe78 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-jsonnet"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "google"; repo = "go-jsonnet"; rev = "v${version}"; - sha256 = "0l6cwky2xl7m8nnc9abp76bhkdcf2ldbbv3r8p30xv2yr5wd1j8i"; + sha256 = "17606gc75wnkm64am4hmlv7m3fy2hi8rnzadp6nrgpcd6rl26m83"; }; - vendorSha256 = "1vdv0nq31mjprxzxf8x0diaigissy07vnm338h8jrk5i74x5by39"; + vendorSha256 = "0nsm4gsbbn8myz4yfi6m7qc3iizhdambsr18iks0clkdn3mi2jn1"; subPackages = [ "cmd/jsonnet" ]; From 8ae7ac9e8c959cf0524331550f858549edd5152e Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Mon, 8 Jun 2020 21:33:21 +0200 Subject: [PATCH 0672/3452] lxd: Add tests --- nixos/tests/all-tests.nix | 2 + nixos/tests/lxd-nftables.nix | 50 +++++++++++++ nixos/tests/lxd.nix | 135 +++++++++++++++++++++++++++++++++++ 3 files changed, 187 insertions(+) create mode 100644 nixos/tests/lxd-nftables.nix create mode 100644 nixos/tests/lxd.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 796c626f3dde..abc9dc2f89af 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -178,6 +178,8 @@ in limesurvey = handleTest ./limesurvey.nix {}; login = handleTest ./login.nix {}; loki = handleTest ./loki.nix {}; + lxd = handleTest ./lxd.nix {}; + lxd-nftables = handleTest ./lxd-nftables.nix {}; #logstash = handleTest ./logstash.nix {}; lorri = handleTest ./lorri/default.nix {}; magnetico = handleTest ./magnetico.nix {}; diff --git a/nixos/tests/lxd-nftables.nix b/nixos/tests/lxd-nftables.nix new file mode 100644 index 000000000000..25517914db85 --- /dev/null +++ b/nixos/tests/lxd-nftables.nix @@ -0,0 +1,50 @@ +# This test makes sure that lxd stops implicitly depending on iptables when +# user enabled nftables. +# +# It has been extracted from `lxd.nix` for clarity, and because switching from +# iptables to nftables requires a full reboot, which is a bit hard inside NixOS +# tests. + +import ./make-test-python.nix ({ pkgs, ...} : { + name = "lxd-nftables"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ patryk27 ]; + }; + + machine = { lib, ... }: { + virtualisation = { + lxd.enable = true; + }; + + networking = { + firewall.enable = false; + nftables.enable = true; + nftables.ruleset = '' + table inet filter { + chain incoming { + type filter hook input priority 0; + policy accept; + } + + chain forward { + type filter hook forward priority 0; + policy accept; + } + + chain output { + type filter hook output priority 0; + policy accept; + } + } + ''; + }; + }; + + testScript = '' + machine.wait_for_unit("network.target") + + with subtest("When nftables are enabled, lxd doesn't depend on iptables anymore"): + machine.succeed("lsmod | grep nf_tables") + machine.fail("lsmod | grep ip_tables") + ''; +}) diff --git a/nixos/tests/lxd.nix b/nixos/tests/lxd.nix new file mode 100644 index 000000000000..db2d44dff557 --- /dev/null +++ b/nixos/tests/lxd.nix @@ -0,0 +1,135 @@ +import ./make-test-python.nix ({ pkgs, ...} : + +let + # Since we don't have access to the internet during the tests, we have to + # pre-fetch lxd containers beforehand. + # + # I've chosen to import Alpine Linux, because its image is turbo-tiny and, + # generally, sufficient for our tests. + + alpine-meta = pkgs.fetchurl { + url = "https://uk.images.linuxcontainers.org/images/alpine/3.11/i386/default/20200608_13:00/lxd.tar.xz"; + sha256 = "1hkvaj3rr333zmx1759njy435lps33gl4ks8zfm7m4nqvipm26a0"; + }; + + alpine-rootfs = pkgs.fetchurl { + url = "https://uk.images.linuxcontainers.org/images/alpine/3.11/i386/default/20200608_13:00/rootfs.tar.xz"; + sha256 = "1v82zdra4j5xwsff09qlp7h5vbsg54s0j7rdg4rynichfid3r347"; + }; + + lxd-config = pkgs.writeText "config.yaml" '' + storage_pools: + - name: default + driver: dir + config: + source: /var/lxd-pool + + networks: + - name: lxdbr0 + type: bridge + config: + ipv4.address: auto + ipv6.address: none + + profiles: + - name: default + devices: + eth0: + name: eth0 + network: lxdbr0 + type: nic + root: + path: / + pool: default + type: disk + ''; + +in { + name = "lxd"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ patryk27 ]; + }; + + machine = { lib, ... }: { + virtualisation = { + # Since we're testing `limits.cpu`, we've gotta have a known number of + # cores to lay on + cores = 2; + + # Ditto, for `limits.memory` + memorySize = 512; + + lxc.lxcfs.enable = true; + lxd.enable = true; + }; + }; + + testScript = '' + machine.wait_for_unit("sockets.target") + machine.wait_for_unit("lxd.service") + + # It takes additional second for lxd to settle + machine.sleep(1) + + # lxd expects the pool's directory to already exist + machine.succeed("mkdir /var/lxd-pool") + + machine.succeed( + "cat ${lxd-config} | lxd init --preseed" + ) + + machine.succeed( + "lxc image import ${alpine-meta} ${alpine-rootfs} --alias alpine" + ) + + with subtest("Containers can be launched and destroyed"): + machine.succeed("lxc launch alpine test") + machine.succeed("lxc exec test true") + machine.succeed("lxc delete -f test") + + with subtest("Containers are being mounted with lxcfs inside"): + machine.succeed("lxc launch alpine test") + + ## ---------- ## + ## limits.cpu ## + + machine.succeed("lxc config set test limits.cpu 1") + + # Since Alpine doesn't have `nproc` pre-installed, we've gotta resort + # to the primal methods + assert ( + "1" + == machine.succeed("lxc exec test grep -- -c ^processor /proc/cpuinfo").strip() + ) + + machine.succeed("lxc config set test limits.cpu 2") + + assert ( + "2" + == machine.succeed("lxc exec test grep -- -c ^processor /proc/cpuinfo").strip() + ) + + ## ------------- ## + ## limits.memory ## + + machine.succeed("lxc config set test limits.memory 64MB") + + assert ( + "MemTotal: 62500 kB" + == machine.succeed("lxc exec test grep -- MemTotal /proc/meminfo").strip() + ) + + machine.succeed("lxc config set test limits.memory 128MB") + + assert ( + "MemTotal: 125000 kB" + == machine.succeed("lxc exec test grep -- MemTotal /proc/meminfo").strip() + ) + + machine.succeed("lxc delete -f test") + + with subtest("Unless explicitly changed, lxd leans on iptables"): + machine.succeed("lsmod | grep ip_tables") + machine.fail("lsmod | grep nf_tables") + ''; +}) From 7f14cdbe04d75b10a24aac0ed853d42d6f2c521e Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Mon, 8 Jun 2020 21:47:09 +0200 Subject: [PATCH 0673/3452] matomo: 3.13.5 -> 3.13.6 --- pkgs/servers/web-apps/matomo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 76d1a5f0b755..152ed4087114 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,16 +3,16 @@ let versions = { matomo = { - version = "3.13.5"; - sha256 = "1b9a9jj86bb3f0093k6sz235iivvvqbcvkjqxwn7c9z7qsmpvbxr"; + version = "3.13.6"; + sha256 = "1d3s5v96mmhcxdnxi7qh822p55g9a2nxh0zcq2d8bhg0cshi9804"; }; matomo-beta = { - version = "3.13.5"; + version = "3.13.6"; # `beta` examples: "b1", "rc1", null # TOOD when updating: use null if stable version is >= latest beta or release candidate beta = null; - sha256 = "1b9a9jj86bb3f0093k6sz235iivvvqbcvkjqxwn7c9z7qsmpvbxr"; + sha256 = "1d3s5v96mmhcxdnxi7qh822p55g9a2nxh0zcq2d8bhg0cshi9804"; }; }; common = pname: { version, sha256, beta ? null }: From 0f181a98afdc9b4e4b053ecac69379ba8057151d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 8 Jun 2020 19:50:22 +0000 Subject: [PATCH 0674/3452] helmfile: 0.114.0 -> 0.118.6 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index f193186144a2..856fa51437e8 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.114.0"; in +let version = "0.118.6"; in buildGoModule { pname = "helmfile"; @@ -10,12 +10,12 @@ buildGoModule { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "0486wcfizi8xljr29mznc4p11ggz4rvk5n53qvb30f7ry4ncc8n5"; + sha256 = "0zbvz8kn52c1q4yn8n9z4rrf761h495fhjw72x9q1nh44hr7npwd"; }; goPackagePath = "github.com/roboll/helmfile"; - vendorSha256 = "0m16l3px2ykdsrmlirf7c4lwgmigs6p3rdr61l49acwsmniz2m8a"; + vendorSha256 = "0xj14f0yx7x9ziijd1yka1n6kbmmhbibsk3ppp8cn1pqrwgqk7pr"; nativeBuildInputs = [ makeWrapper ]; From 071c0f935c71a2e72e5ccccf158a62804e46c761 Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Mon, 8 Jun 2020 16:34:50 -0400 Subject: [PATCH 0675/3452] nixos/manual: spelling s/environent/environment/g in configuration.xml --- doc/using/configuration.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/using/configuration.xml b/doc/using/configuration.xml index f4d6e9110064..f19eddb58686 100644 --- a/doc/using/configuration.xml +++ b/doc/using/configuration.xml @@ -387,7 +387,7 @@ fi - Now just run source $HOME/.profile and you can starting loading man pages from your environent. + Now just run source $HOME/.profile and you can starting loading man pages from your environment. From 966631c5362a6eb1547602caba043214946918ee Mon Sep 17 00:00:00 2001 From: Karol Chmist Date: Mon, 8 Jun 2020 22:17:28 +0200 Subject: [PATCH 0676/3452] i3status-rust: 0.14.0 -> 0.14.1 --- .../window-managers/i3/status-rust.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index acc306a72f2f..8bd3d581434e 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -1,25 +1,17 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio, fetchpatch }: +{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio }: rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "0d2xigm932x6pc9z24g5cg8xq2crd9n3wq1bwi96h35w799lagjg"; + sha256 = "11qhzjml04njhfa033v98m4yd522zj91s6ffvrm0m6sk7m0wyjsc"; }; - cargoPatches = [ - # https://github.com/greshake/i3status-rust/pull/732/ (Update Cargo.lock) - (fetchpatch { - url = "https://github.com/greshake/i3status-rust/commit/7762a5c7ad668272fb8bb8409f12242094b032b8.patch"; - sha256 = "097f6w91cn53cj1g3bbdqm9jjib5fkb3id91jqvq88h43x14b8zb"; - }) - ]; - - cargoSha256 = "1k50yhja73w91h6zjmkb5kh1hknpjzrqd3ilvjjyynll513m1sfd"; + cargoSha256 = "0jmmxld4rsjj6p5nazi3d8j1hh7r34q6kyfqq4wv0sjc77gcpaxd"; nativeBuildInputs = [ pkgconfig ]; From e542f78f56bddb1d412145685033c325b97e7161 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 8 Jun 2020 22:19:59 +0000 Subject: [PATCH 0677/3452] 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 28a142050d1d3c879e7b1caac285b46417b2fcfb Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Jun 2020 21:13:42 +0200 Subject: [PATCH 0678/3452] eq10q: work around breaking change in lv2 1.18.0 --- pkgs/applications/audio/eq10q/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index cc3a3c9ac1f5..c614b96f6385 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + # Fix build with lv2 1.18: https://sourceforge.net/p/eq10q/bugs/23/ + find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \ + -exec sed -i {} -e 's/const _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \; + ''; + installFlags = [ "DESTDIR=$(out)" ]; fixupPhase = '' From dcdcf4355ff2a62a17057d20f4758d9aadce1745 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 8 Jun 2020 23:42:58 +0000 Subject: [PATCH 0679/3452] pistol: 0.1.1 -> 0.1.2 --- pkgs/tools/misc/pistol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index eeb392606edd..5c92b70c0983 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pistol"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "1d9c1bhidh781dis4427wramfrla4avqw9y2bmpjp81cqq3nc27d"; + sha256 = "1ar8c7s8ihcwrwfspmqw7cb5560wkbdc5qyvddkx8lj03cjhcslj"; }; - vendorSha256 = "1f780vhxw0brvnr8hhah4sf6ms8spar29rqmy1kcqf9m75n94g56"; + vendorSha256 = "1mhxb72fzpa2n88i9h154aci346dgcs2njznkjxchivz28crbqr8"; subPackages = [ "cmd/pistol" ]; From d362779958a640aff2ce9ec968b78d3439005a90 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 01:24:35 +0000 Subject: [PATCH 0680/3452] saml2aws: 2.25.0 -> 2.26.1 --- pkgs/tools/security/saml2aws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 42845705ff6b..d3157529215b 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.25.0"; + version = "2.26.1"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "12aidylamrq4rvy2cfdz669lr1p20yqrshigcc5x1hrlhh9y64xc"; + sha256 = "09b217x10mn3y244rwym0fcqr4ly6n83wnykb77488kn960b0pqb"; }; hid = fetchFromGitHub { From 5351819578eede43fecf4dd9746f7de4e26fc515 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 02:00:59 +0000 Subject: [PATCH 0681/3452] simplenote: 1.16.0 -> 1.17.0 --- pkgs/applications/misc/simplenote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 46b80dc98f04..917e1965e2ea 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -16,10 +16,10 @@ let pname = "simplenote"; - version = "1.16.0"; + version = "1.17.0"; sha256 = { - x86_64-linux = "01nk3dbyhs0p7f6b4bkrng95i29g0x7vxj0rx1qb7sm3n11yi091"; + x86_64-linux = "14kjx4y3kvw7h8wk8mmkpx1288jscmd8bgl10bw6kcfigcwahpw3"; }.${system} or throwSystem; meta = with stdenv.lib; { From b150500ca73b728d20bf6442cba35e2acd966dce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 02:46:15 +0000 Subject: [PATCH 0682/3452] syncthingtray: 0.10.9 -> 0.10.10 --- pkgs/applications/misc/syncthingtray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 7af90535530e..28506c8fa883 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -20,14 +20,14 @@ }: mkDerivation rec { - version = "0.10.9"; + version = "0.10.10"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "19kni5v9g0p4751bw2xb8dawg5yjkyk39vdy0m93448lsl8cqq04"; + sha256 = "14nn0igcx4kd7pcna1ggz3yz9xfk1czgy87fxkmn2p91psmy2i18"; }; buildInputs = [ qtbase cpp-utilities qtutilities ] From 7ec89e7793708821eff884bd07f1b9a1e50b7c58 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 02:52:05 +0000 Subject: [PATCH 0683/3452] taisei: 1.3 -> 1.3.1 --- pkgs/games/taisei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/taisei/default.nix b/pkgs/games/taisei/default.nix index c3b76b4980e3..3c4d0df2b036 100644 --- a/pkgs/games/taisei/default.nix +++ b/pkgs/games/taisei/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "taisei"; - version = "1.3"; + version = "1.3.1"; src = fetchurl { url = "https://github.com/taisei-project/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz"; - sha256 = "0fl41cbjr8h6gmhc27l44cfkcnhg5c10b4fcfvnfsbjii8gdwvjd"; + sha256 = "11f9mlqmzy1lszwcc1nsbar9q1hs4ml6pbm52hqfd4q0f4x3ln46"; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { project of shoot-em-up games set in an isolated world full of Japanese folklore. ''; - homepage = https://taisei-project.org/; + homepage = "https://taisei-project.org/"; license = [ licenses.mit licenses.cc-by-40 ]; maintainers = [ maintainers.lambda-11235 ]; platforms = platforms.all; From 1bf56dc39dcdd8c2e9fa2a2c115e76f72b944041 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 03:01:24 +0000 Subject: [PATCH 0684/3452] tendermint: 0.32.12 -> 0.33.5 --- pkgs/tools/networking/tendermint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 93b0b69f22f1..4c0f87efbc4e 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.32.12"; + version = "0.33.5"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "1d3q5d49pzh86brrwp4kfsxs0n9zdmcnkminarg3wl9w97qrjsr6"; + sha256 = "0a6wm1gnr75mdfhzb9cgg4an655vln525slgp10r5abg9j3l8202"; }; - vendorSha256 = "1vhd3s6yxfhirgipxcy0rh8sk55cdzirr8n8r31sijgyak92mq0l"; + vendorSha256 = "0i0n89lal99fqnzva51kp9f7wzqsfmncpshwxhq26kvykp7ji7sw"; meta = with stdenv.lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; From f21011e8cf81ee02e03d474ab26abc11f463136a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 03:13:05 +0000 Subject: [PATCH 0685/3452] terragrunt: 0.23.14 -> 0.23.23 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 6a4e1979e883..74f576b9a394 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.23.14"; + version = "0.23.23"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "1znb9d4n9zv3dq10dw17kb1h04gj8iz6gwx1a741fcf4ygp8zpy1"; + sha256 = "1087zs5k73rhhzni8zdj950aw4nsc7mqjj8lgdcc8y3yx8p8y5hy"; }; - vendorSha256 = "0h737h25f80zfx84vm6ry0581c32ylcb5h9givqk5k5kh5qgkbgx"; + vendorSha256 = "1xn7c6y32vpanqvf1sfpw6bs73dbjniavjbf00j0vx83bfyklsr4"; buildInputs = [ makeWrapper ]; From 58b060591d6e78e0c4cd6378219c5a99e02902d9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 03:34:19 +0000 Subject: [PATCH 0686/3452] tokei: 11.2.0 -> 11.2.1 --- pkgs/development/tools/misc/tokei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index ca07a1d72676..dee4c910fb80 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "11.2.0"; + version = "11.2.1"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "1nyv73bawmshzzp8hkbcac5bgq0yf8f51ps5hycdw0c5qhrsjwns"; + sha256 = "1bdq66si9vvvyf5nia8ww77imp0f8jas0yfcvq1rialwm9922dfl"; }; - cargoSha256 = "18a0rg3hgisjd6zh4dk6rflaipmrxxszpigqg8fa816rg0f4bdc7"; + cargoSha256 = "17666wh4sfzhgxngymd02892mqpkr8jm6a4w95wwsc9iinzbygrm"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security From 70ec9412658837af2422ff9639e1451730bc1f27 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 03:39:04 +0000 Subject: [PATCH 0687/3452] tpm2-tools: 4.1.2 -> 4.1.3 --- pkgs/tools/security/tpm2-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix index 282b1df299cf..e6a7621d9877 100644 --- a/pkgs/tools/security/tpm2-tools/default.nix +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tpm2-tools"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0di97zmxdh04m2ibyshcgvillwxx6rnd0543scm7q10y7nv74m0p"; + sha256 = "0117r0zzdnblkibv81y71v3limixsw5m7g9xwf7lcx8fc8836pdv"; }; nativeBuildInputs = [ pandoc pkgconfig makeWrapper ]; From c9d5007dbca98fa680b07317683abe788d79d3fa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 04:22:03 +0000 Subject: [PATCH 0688/3452] watchexec: 1.13.0 -> 1.13.1 --- pkgs/tools/misc/watchexec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index a737728784be..01993ebed6d2 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0b6ichf528v9mca67301ncm808mzbdi212j0b8zz72aw8dff6ph2"; + sha256 = "1idyr3h9dhb67xlhd5bsa7866i75w4jzjbbchq6fd9lqd488bsj7"; }; - cargoSha256 = "13812swawp65f4j0c0q9x5bs9s3qancw0q2awasry0pcyh7nrxrj"; + cargoSha256 = "14lkvfr1yz8g15ffc8j1vvy7q1nwqbkhz2y0fnskwqfzpd17f9gl"; nativeBuildInputs = [ installShellFiles ]; From cb0f15817646d7c2e222abad3e7cd1f0713b569e Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Mon, 8 Jun 2020 22:02:30 -0700 Subject: [PATCH 0689/3452] unixODBCDrivers: fix sqlite driver to link with sqlite3 Without this change, it doesn't actually link to libsqlite3.so correctly, and so the output driver has unresolved symbols. --- pkgs/development/libraries/unixODBCDrivers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 6de0aabe70cb..04aa7e6c6854 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -108,7 +108,7 @@ buildInputs = [ unixODBC sqlite zlib libxml2 ]; - configureFlags = [ "--with-odbc=${unixODBC}" ]; + configureFlags = [ "--with-odbc=${unixODBC}" "--with-sqlite3=${sqlite.dev}" ]; installTargets = [ "install-3" ]; From fa607bc93941ae1ccd2e3cd99a93feb214a2958e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 9 Jun 2020 15:33:37 +1000 Subject: [PATCH 0690/3452] nixos/gnome3: nixos-artwork -> pkgs.nixos-artwork --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 803419f5d6c6..69cf98321720 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -320,8 +320,8 @@ in gnome-shell gnome-shell-extensions gnome-themes-extra - nixos-artwork.wallpapers.simple-dark-gray - nixos-artwork.wallpapers.simple-dark-gray-bottom + pkgs.nixos-artwork.wallpapers.simple-dark-gray + pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom pkgs.gnome-user-docs pkgs.orca pkgs.glib # for gsettings From 1dba11754189f8f548f353368bdc0555030efe35 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Mon, 8 Jun 2020 23:13:00 -0700 Subject: [PATCH 0691/3452] gnutls: 3.6.13 -> 3.6.14 Fixes CVE-2020-13777 [1]. Changes: https://lists.gnupg.org/pipermail/gnutls-help/2020-June/004648.html [1] https://nvd.nist.gov/vuln/detail/CVE-2020-13777 --- pkgs/development/libraries/gnutls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 6d0faa03a888..f75d107718da 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -8,7 +8,7 @@ assert guileBindings -> guile != null; let - version = "3.6.13"; + version = "3.6.14"; # XXX: Gnulib's `test-select' fails on FreeBSD: # https://hydra.nixos.org/build/2962084/nixlog/1/raw . @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "0f1gnm0756qms5cpx6yn6xb8d3imc2gkqmygf12n9x6r8zs1s11j"; + sha256 = "0qwxsfizynly0ns537vnhnlm5lh03la4vbsmz675n0n7vqd7ac2n"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; From 66fd218bac8838e7f062ca870e87ddef5e4e1e85 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 3 Jun 2020 16:42:54 +0200 Subject: [PATCH 0692/3452] bitcoin: 0.19.1 -> 0.20.0 - drop openssl from buildInputs as it is no longer used by the project - drop rapidcheck from check checkInputs as it is no longer used by the project - reformat with nixpkgs-fmt - add meta.downloadPage and meta.changelog --- pkgs/applications/blockchains/bitcoin.nix | 73 ++++++++++++++--------- 1 file changed, 45 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 450102da66f3..7a4386d23866 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -1,59 +1,74 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck, hexdump -, zlib, miniupnpc, qtbase ? null, qttools ? null, wrapQtAppsHook ? null, utillinux, python3, qrencode, libevent -, withGui }: +{ stdenv +, fetchurl +, pkgconfig +, autoreconfHook +, db48 +, boost +, zeromq +, hexdump +, zlib +, miniupnpc +, qtbase ? null +, qttools ? null +, wrapQtAppsHook ? null +, utillinux +, python3 +, qrencode +, libevent +, withGui +}: with stdenv.lib; - let - version = "0.19.1"; + version = "0.20.0"; majorMinorVersion = versions.majorMinor version; - desktop = fetchurl { url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop"; sha256 = "0cpna0nxcd1dw3nnzli36nf9zj28d2g9jf5y0zl9j18lvanvniha"; }; - pixmap = fetchurl { url = "https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png"; sha256 = "08p7j7dg50jlj783kkgdw037klmx0spqjikaprmbkzgcb620r25d"; }; - -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = if withGui then "bitcoin" else "bitcoind"; inherit version; src = fetchurl { - urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" - "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" - ]; - sha256 = "f2591d555b8e8c2e1bd780e40d53a91e165d8b3c7e0391ae2d24a0c0f23a7cc0"; + urls = [ + "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" + "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" + ]; + sha256 = "ec5a2358ee868d845115dc4fc3ed631ff063c57d5e0a713562d083c5c45efb28"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optional stdenv.isDarwin hexdump ++ optional withGui wrapQtAppsHook; - buildInputs = [ openssl db48 boost zlib zeromq - miniupnpc libevent] - ++ optionals stdenv.isLinux [ utillinux ] - ++ optionals withGui [ qtbase qttools qrencode ]; + buildInputs = [ db48 boost zlib zeromq miniupnpc libevent ] + ++ optionals stdenv.isLinux [ utillinux ] + ++ optionals withGui [ qtbase qttools qrencode ]; postInstall = optional withGui '' install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop install -Dm644 ${pixmap} $out/share/pixmaps/bitcoin128.png ''; - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" - "--disable-bench" - ] ++ optionals (!doCheck) [ - "--disable-tests" - "--disable-gui-tests" - ] - ++ optionals withGui [ "--with-gui=qt5" - "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" - ]; + configureFlags = [ + "--with-boost-libdir=${boost.out}/lib" + "--disable-bench" + ] ++ optionals (!doCheck) [ + "--disable-tests" + "--disable-gui-tests" + ] + ++ optionals withGui [ + "--with-gui=qt5" + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" + ]; - checkInputs = [ rapidcheck python3 ]; + checkInputs = [ python3 ]; doCheck = true; @@ -67,13 +82,15 @@ in stdenv.mkDerivation rec { meta = { description = "Peer-to-peer electronic cash system"; - longDescription= '' + longDescription = '' Bitcoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. ''; homepage = "https://bitcoin.org/"; + downloadPage = "https://bitcoincore.org/bin/bitcoin-core-${version}/"; + changelog = "https://bitcoincore.org/en/releases/${version}/"; maintainers = with maintainers; [ roconnor AndersonTorres ]; license = licenses.mit; platforms = platforms.unix; From 115b7d92b8c99af419e760ba45dfcda38f61d2a2 Mon Sep 17 00:00:00 2001 From: Julien Coolen Date: Mon, 8 Jun 2020 15:37:04 +0200 Subject: [PATCH 0693/3452] graphql_ppx: init at 0.7.1 --- .../ocaml-modules/graphql_ppx/default.nix | 30 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/ocaml-modules/graphql_ppx/default.nix diff --git a/pkgs/development/ocaml-modules/graphql_ppx/default.nix b/pkgs/development/ocaml-modules/graphql_ppx/default.nix new file mode 100644 index 000000000000..59e832291f6f --- /dev/null +++ b/pkgs/development/ocaml-modules/graphql_ppx/default.nix @@ -0,0 +1,30 @@ +{ lib, buildDunePackage, fetchFromGitHub, alcotest, cppo +, ocaml-migrate-parsetree, ppx_tools_versioned, reason, result, yojson }: + +buildDunePackage rec { + pname = "graphql_ppx"; + version = "0.7.1"; + + minimumOCamlVersion = "4.06"; + + src = fetchFromGitHub { + owner = "reasonml-community"; + repo = "graphql_ppx"; + rev = "v${version}"; + sha256 = "0gpzwcnss9c82whncyxfm6gwlkgh9hy90329hrazny32ybb470zh"; + }; + + propagatedBuildInputs = + [ cppo ocaml-migrate-parsetree ppx_tools_versioned reason result yojson ]; + + checkInputs = lib.optional doCheck alcotest; + + doCheck = false; + + meta = { + homepage = "https://github.com/reasonml-community/graphql_ppx"; + description = "GraphQL PPX rewriter for Bucklescript/ReasonML"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ Zimmi48 jtcoolen ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 87d67e5e8e65..f75ecabe6348 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -363,6 +363,8 @@ let graphql_parser = callPackage ../development/ocaml-modules/graphql/parser.nix { }; + graphql_ppx = callPackage ../development/ocaml-modules/graphql_ppx { }; + gtktop = callPackage ../development/ocaml-modules/gtktop { }; hex = callPackage ../development/ocaml-modules/hex { }; From 005d4b35c54f0202b1afae7078a5951dda784c5b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 06:58:24 +0000 Subject: [PATCH 0694/3452] amtk: 5.0.2 -> 5.1.1 --- pkgs/development/libraries/amtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 48b230795967..b33c45adb41c 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, gtk3 , pkgconfig, gnome3, dbus, xvfb_run }: let - version = "5.0.2"; + version = "5.1.1"; pname = "amtk"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11jgz2i9wjzv4alrxl1qyxiapb52w7vs5ygfgsw0qgdap8gqkk3i"; + sha256 = "1wax6mim8dj0m21k8ima7ysm3bzzp54r00jganwbzakq8bfnnrgr"; }; nativeBuildInputs = [ From 0b4afef84a37c47bd6a5319513db6279fc4bc4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 9 Jun 2020 09:26:10 +0200 Subject: [PATCH 0695/3452] gitMinimal: fix build after PR #86848 In that case it specified $doc output but didn't even create it. I expect it's better to do it this way instead of creating it as an empty directory. (Only the failed builds get rebuilt by this commit.) --- .../version-management/git-and-tools/git/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 140a273e342e..78981ef9ad0f 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { sha256 = "0j685w6pzkn926z5nf5r8fij4ziipvw4c9yb0wc577nzf4j16rbd"; }; - outputs = [ "out" "doc" ]; + outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc"; hardeningDisable = [ "format" ]; From 0e0df31e2a91f00dc49ec3e97d85c6ba3cd3f6a2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 07:47:18 +0000 Subject: [PATCH 0696/3452] armadillo: 9.880.1 -> 9.900.1 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index ece38b2cb038..ecf337fc375a 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "9.880.1"; + version = "9.900.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "17sb9hylrr7wl63whr39ypjg7xps32k9z5zdgchj5dyq6n6kw3wh"; + sha256 = "0dfn6wbr7mrh1nzg2rj642p4sycwchf0k743ipgdwvyh4ihsvmsk"; }; nativeBuildInputs = [ cmake ]; From 6fc4c561d17e2e44f6916b87d98de2a6d428eae0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 00:52:57 -0700 Subject: [PATCH 0697/3452] beanstalkd: 1.11 -> 1.12 (#89890) --- pkgs/servers/beanstalkd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix index 40e6267bd7bd..aa5f79ff8f1b 100644 --- a/pkgs/servers/beanstalkd/default.nix +++ b/pkgs/servers/beanstalkd/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.11"; + version = "1.12"; pname = "beanstalkd"; installPhase=''make install "PREFIX=$out"''; src = fetchurl { url = "https://github.com/kr/beanstalkd/archive/v${version}.tar.gz"; - sha256 = "0i65d0pln1p6wxghzwziz2k8vafvdgjq6yc962ayzs80kpj18d2y"; + sha256 = "0gw8aygysnjzzfjgfzivy5vajla9adg2zcr4h8rrdf0xyykpwfpl"; }; hardeningDisable = [ "fortify" ]; From 41525f7d9ab21cf445a8dca932f8ff4bf2b684ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 08:01:11 +0000 Subject: [PATCH 0698/3452] avocode: 4.6.3 -> 4.6.4 --- pkgs/applications/graphics/avocode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index d72d52f3c2ff..098aee119e60 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.6.3"; + version = "4.6.4"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "1s8i82963fdx5q4wgh0cn211h0p1r1mzyss0g99bplp8d9ll40kw"; + sha256 = "1hkqv2lix58my009i61cy0vpazxqpzapfhxkw5439ndn6qk1782d"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ From 521416791b3d79ec89d470da1fca74b5963d49e5 Mon Sep 17 00:00:00 2001 From: geistesk Date: Tue, 9 Jun 2020 10:23:55 +0200 Subject: [PATCH 0699/3452] znc: 1.8.0 -> 1.8.1 Fixes CVE-2020-13775 --- pkgs/applications/networking/znc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index fae03846b68e..13803556a479 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "znc"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { url = "https://znc.in/releases/archive/${pname}-${version}.tar.gz"; - sha256 = "0m5xf60r40pgbg9lyk56dafxj2hj149pn2wf8vzsp8xgq4kv5zcl"; + sha256 = "0hb1v167aa6gv5bcwz352l6b8gnd74ymjw92y4x882l099hzg59i"; }; nativeBuildInputs = [ pkgconfig ]; From 4e9fb76420d764ffc661afa142bc291e14128789 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 9 Jun 2020 10:47:38 +0200 Subject: [PATCH 0700/3452] perlPackages.NetIPLite: init at 0.03 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2f89e1cfd8de..8544265c32c0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13853,6 +13853,22 @@ let }; }; + NetIPLite = buildPerlPackage { + pname = "Net-IP-Lite"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AL/ALEXKOM/Net-IP-Lite-0.03.tar.gz"; + sha256 = "c9916e6cfaa53be275379ce4b2a550ae176ddfab50dad43b43ed43e8267802a9"; + }; + buildInputs = [ TestException ]; + meta = { + homepage = "https://metacpan.org/pod/Net::IP::Lite"; + description = "Perl extension for manipulating IPv4/IPv6 addresses"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + NetIPv4Addr = buildPerlPackage { pname = "Net-IPv4Addr"; version = "0.10"; From c766192b30a031d01a080d4a3a4d48a4fd51b5ec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 09:17:52 +0000 Subject: [PATCH 0701/3452] dbus: 1.12.16 -> 1.12.18 --- pkgs/development/libraries/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index a3e3c4ebd89a..049623d3d911 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -20,11 +20,11 @@ assert enableSystemd -> systemd != null; stdenv.mkDerivation rec { pname = "dbus"; - version = "1.12.16"; + version = "1.12.18"; src = fetchurl { url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; - sha256 = "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl"; + sha256 = "01jkm6shm76bl3cflmnn37dv6nkph0w1akbqpklyac02hiq4vkv4"; }; patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; From f73436b3748183377e4e18810cc552408c1c338f Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Tue, 9 Jun 2020 11:39:26 +0200 Subject: [PATCH 0702/3452] nixos/make-iso9660: fix zstd input --- nixos/lib/make-iso9660-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index be8ad9912db0..12a6cf649966 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -35,7 +35,7 @@ isohybridMbrImage ? "" , # Whether to compress the resulting ISO image with zstd. - compressImage ? false + compressImage ? false, zstd , # The volume ID. volumeID ? "" From 29e4bbe4b11f3f0083f494fb53aa807d13f0c58c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 8 Jun 2020 15:47:19 -0300 Subject: [PATCH 0703/3452] ibm-plex: 4.0.2 -> 5.0.0 --- pkgs/data/fonts/ibm-plex/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index 3e507047166c..70657f03281e 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -1,15 +1,19 @@ { lib, fetchzip }: let - version = "4.0.2"; + version = "5.0.0"; + in fetchzip { name = "ibm-plex-${version}"; + url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; + postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype ''; - sha256 = "1v00y1l9sjcv9w8d3115w1vv1b7bgwbrv4d3zv68galk8wz8px1x"; + + sha256 = "1m8a9p0bryrj05v7sg9kqvyp0ddhgdwd0zjbn0i4l296cj5s2k97"; meta = with lib; { description = "IBM Plex Typeface"; From 264f85658e015da62bc9acf8c007019fdba77b0d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 10:03:55 +0000 Subject: [PATCH 0704/3452] cargo-watch: 7.4.0 -> 7.4.1 --- pkgs/development/tools/rust/cargo-watch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index ac0eeff2c09c..850b6d2e1e71 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "7.4.0"; + version = "7.4.1"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "0yg6im7hzwzl84gxcg7wbix5h0ciq4l4ql6ili7k0k7j8bhrxn82"; + sha256 = "1nq7sfdxvqldj94laz562y4cvgagm67b6a5b7bzxdip0sf1l11f8"; }; - cargoSha256 = "1y299mvg9k568f16d2r92y0bgwfrng6idw21wcsd5mnsd28fsww1"; + cargoSha256 = "1rjx3k8li8ck5cdygm4pd2i5wkslr6d9z9vl2vp0x6hqv1gcv5zh"; buildInputs = lib.optional stdenv.isDarwin CoreServices; From ee092d086f4162f48e636603278d5fc9079ce819 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 9 Jun 2020 20:28:38 +1000 Subject: [PATCH 0705/3452] dnscrypt-proxy2: 2.0.42 -> 2.0.43 https://github.com/DNSCrypt/dnscrypt-proxy/blob/2.0.43/ChangeLog#L1 --- pkgs/tools/networking/dnscrypt-proxy2/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 7f16d9478f3f..508d9ecd0f30 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -1,16 +1,16 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "dnscrypt-proxy2"; - version = "2.0.42"; + version = "2.0.43"; - goPackagePath = "github.com/jedisct1/dnscrypt-proxy"; + vendorSha256 = null; src = fetchFromGitHub { - owner = "jedisct1"; + owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "1v4n0pkwcilxm4mnj4fsd4gf8pficjj40jnmfkiwl7ngznjxwkyw"; + sha256 = "1c12y8h7dww72a3agb74vr5fzxzy6k8394rdbgz9knk82fdwah1c"; }; meta = with stdenv.lib; { From e31bab80cdf4637cb05bc3810b3ac3a6c38940cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 10:19:16 +0000 Subject: [PATCH 0706/3452] cloudflared: 2020.3.2 -> 2020.5.1 --- pkgs/applications/networking/cloudflared/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 31bb18f20a82..aca523545adb 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -1,18 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, runCommand }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cloudflared"; - version = "2020.3.2"; + version = "2020.5.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "1vbxm5z72y9zfg4carmja3fc1vhkanmc25pgnlw550p1l14y6404"; + sha256 = "0r1n3a8h8gyww4p2amb24jmp8zkyxy1ava3nbqgwlfjr3zagga00"; }; - vendorSha256 = "14w2iz3ycbzfvlr8a6qn86aaa8687cm203d73wpfkfskp277hwz0"; - deleteVendor = true; + vendorSha256 = null; buildFlagsArray = "-ldflags=-X main.Version=${version}"; From 6e746a6e2c94c2b60898f8a2251a49f042f9a997 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 11:06:04 +0000 Subject: [PATCH 0707/3452] dash: 0.5.10.2 -> 0.5.11 --- pkgs/shells/dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 7aedd0189e44..f4ee68f7444b 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.10.2"; + name = "dash-0.5.11"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; - sha256 = "0wb0bwmqc661hylqcfdp7l7x12myw3vpqk513ncyqrjwvhckjriw"; + sha256 = "1jwilfsy249d3q7fagg1ga4bgc2bg1fzw63r2nan0m77bznsdnad"; }; hardeningDisable = [ "format" ]; From ba8d84f69fe9b3114859846b6fe95e4f5375e834 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 9 Jun 2020 19:29:00 +0800 Subject: [PATCH 0708/3452] onedrive: 2.3.13 -> 2.4.2 --- .../networking/sync/onedrive/default.nix | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index 636761d2aaff..dd5e633c3f4a 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -1,21 +1,37 @@ -{ stdenv, fetchFromGitHub, dmd, pkgconfig, curl, sqlite, libnotify }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, dmd, installShellFiles, pkgconfig +, curl, sqlite, libnotify +, withSystemd ? stdenv.isLinux, systemd ? null }: stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.3.13"; + version = "2.4.2"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "0bcsrfh1g7bdlcp0zjn6np88qzpn5frv61lzxz9b2ayxf7wyybvi"; + sha256 = "10s33p1xzq9c5n1bxv9n7n31afxgx9i6c17w0xgxdrma75micm3a"; }; - nativeBuildInputs = [ dmd pkgconfig ]; + nativeBuildInputs = [ autoreconfHook dmd installShellFiles pkgconfig ]; - buildInputs = [ curl sqlite libnotify ]; + buildInputs = [ + curl sqlite libnotify + ] ++ lib.optional withSystemd systemd; - configureFlags = [ "--enable-notifications" ]; + configureFlags = [ + "--enable-notifications" + ] ++ lib.optionals withSystemd [ + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" + ]; + + # we could also pass --enable-completions to configure but we would then have to + # figure out the paths manually and pass those along. + postInstall = '' + installShellCompletion --bash --name ${pname} contrib/completions/complete.bash + installShellCompletion --zsh --name _${pname} contrib/completions/complete.zsh + ''; meta = with stdenv.lib; { description = "A complete tool to interact with OneDrive on Linux"; From 1d38f6bcb295d3bfd380c8f71193adbbcd6c098a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 8 Jun 2020 13:55:34 +0200 Subject: [PATCH 0709/3452] chromiumBeta: Fix the configuration phase The changes from chromiumDev (see 029a5de0839) are required for chromiumBeta as well. --- pkgs/applications/networking/browsers/chromium/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 5b77551640e8..6e3c0ee65e7a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -80,7 +80,7 @@ let # "ffmpeg" # https://crbug.com/731766 # "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together # so we can't build with one from system and other from source - ] ++ optional (upstream-info.channel != "dev") "yasm"; + ] ++ optional (versionRange "0" "84") "yasm"; opusWithCustomModes = libopus.override { withCustomModes = true; @@ -95,7 +95,7 @@ let ffmpeg libxslt libxml2 # harfbuzz # in versions over 63 harfbuzz and freetype are being built together # so we can't build with one from system and other from source - ] ++ (if upstream-info.channel == "dev" then [ nasm ] else [ yasm ]); + ] ++ (if (versionRange "0" "84") then [ yasm ] else [ nasm ]); # build paths and release info packageName = extraAttrs.packageName or extraAttrs.name; @@ -226,7 +226,7 @@ let ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar ''; - gnFlags = mkGnFlags (optionalAttrs (upstream-info.channel != "dev") { + gnFlags = mkGnFlags (optionalAttrs (versionRange "0" "84") { linux_use_bundled_binutils = false; } // { use_lld = false; From d8291bb1f89c92c3f95c0cad3253183fc084a880 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 12:02:52 +0000 Subject: [PATCH 0710/3452] eksctl: 0.19.0 -> 0.21.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 18fb37aa41c0..4fce86557372 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.19.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0xlr7hsncih4nzydi6sphp7j7k82cbhmi7jb0sd954i8kzl3sc1q"; + sha256 = "0pfjv5m1fly7n9hmxy8bnpblfh5rzbjkiav3dczy4hkmq226gjsa"; }; - vendorSha256 = "14d9hl01z7ixp1wa8kp1zs0z1p3pvz6hkp49z582nqllpb2xjmkx"; + vendorSha256 = "09c3a5g27aqmy4ml42c6zwzrv8yas7i04w3j9jbvp90npwvc62cz"; subPackages = [ "cmd/eksctl" ]; From 2c79d7f0c22e79398e67c33054b8d9938b60830e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 8 Jun 2020 14:38:32 +1000 Subject: [PATCH 0711/3452] ffmpeg-full: inherit src/version from ffmpeg --- pkgs/development/libraries/ffmpeg-full/default.nix | 9 ++------- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 68648e64b27c..4f03f775fff6 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ stdenv, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm +{ stdenv, ffmpeg, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm /* * Licensing options (yes some are listed twice, filters and such are not listed) */ @@ -239,12 +239,7 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; stdenv.mkDerivation rec { pname = "ffmpeg-full"; - version = "4.2.3"; - - src = fetchurl { - url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2"; - sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1"; - }; + inherit (ffmpeg) src version; patches = [ ./prefer-libdav1d-over-libaom.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3a6fd640311..d9aaf5881554 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11681,6 +11681,8 @@ in ffmpeg = ffmpeg_3; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { + ffmpeg = ffmpeg_4; + # The following need to be fixed on Darwin frei0r = if stdenv.isDarwin then null else frei0r; game-music-emu = if stdenv.isDarwin then null else game-music-emu; From 244b0ee62a13e323a49f6f25b858b5ff681266ea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 12:38:58 +0000 Subject: [PATCH 0712/3452] epiphany: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index c41f5d79eb71..5cffe4187ca6 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1dpgp1fqkn6azdrkw9imbrxi5d6mznrhfisrsiv88cf68gxk7wpn"; + sha256 = "0ppvzfv98031y884cgy5agr90a0q3m37x2kybsd804g21ym7drn2"; }; # Tests need an X display From 3c1ac429d4d0d2c11042b56473d5d3683d2b0922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 9 Jun 2020 09:33:05 -0300 Subject: [PATCH 0713/3452] enlightenment.efl: add dependence mint-x-icons It provides the Mint-X icon theme, which is a parent of the Enlightenment-X icon theme. --- pkgs/desktops/enlightenment/efl.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 449c16e13baf..5ac8194d74e1 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -39,6 +39,7 @@ , luajit , lz4 , mesa +, mint-x-icons , openjpeg , openssl , poppler @@ -92,7 +93,7 @@ stdenv.mkDerivation rec { xorg.libXcursor xorg.xorgproto zlib - # still missing parent icon themes: Mint-X, RAVE-X, Faenza + # still missing parent icon themes: RAVE-X, Faenza ]; propagatedBuildInputs = [ @@ -107,6 +108,7 @@ stdenv.mkDerivation rec { fribidi ghostscript harfbuzz + hicolor-icon-theme # for the icon theme jbig2dec libdrm libinput @@ -117,6 +119,7 @@ stdenv.mkDerivation rec { libwebp libxkbcommon luajit + mint-x-icons # Mint-X is a parent icon theme of Enlightenment-X openjpeg poppler utillinux From 1c14b52e1837efb226287f9dd115ef8655868506 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Jun 2020 14:52:42 +0200 Subject: [PATCH 0714/3452] hostapd: apply patches for CVE-2020-12695 https://w1.fi/security/2020-1/upnp-subscribe-misbehavior-wps-ap.txt Fixes: CVE-2020-12695 --- pkgs/os-specific/linux/hostapd/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 8152655d457d..964de0f47b21 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -19,11 +19,30 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/openwrt/openwrt/master/package/network/services/hostapd/patches/300-noscan.patch"; sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k"; }) + # AP mode PMF disconnection protection bypass (CVE.2019-16275), can be removed >= 2.10 + # https://w1.fi/security/2019-7/ (fetchurl { name = "CVE-2019-16275.patch"; url = "https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch"; sha256 = "15xjyy7crb557wxpx898b5lnyblxghlij0xby5lmj9hpwwss34dz"; }) + # Fixes for UPnP SUBSCRIBE misbehavior in hostapd WPS AP (CVE-2020-12695), can be removed >= 2.10 + # https://w1.fi/security/2020-1/ + (fetchurl { + name = "CVE-2020-12695_0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch"; + url = "https://w1.fi/security/2020-1/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch"; + sha256 = "1mrbhicqb34jlw1nid5hk2vnjbvfhvp7r5iblaj4l6vgc6fmp6id"; + }) + (fetchurl { + name = "CVE-2020-12695_0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch"; + url = "https://w1.fi/security/2020-1/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch"; + sha256 = "1pk08b06b24is50bis3rr56xjd3b5kxdcdk8bx39n9vna9db7zj9"; + }) + (fetchurl { + name = "CVE-2020-12695_0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"; + url = "https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"; + sha256 = "12npqp2skgrj934wwkqicgqksma0fxz09di29n1b5fm5i4njl8d8"; + }) ]; outputs = [ "out" "man" ]; From 5a211182fd89d55599eea505c690d9271b18ae8d Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 17 Apr 2020 15:33:54 +0200 Subject: [PATCH 0715/3452] castor: init at 0.8.14 --- .../networking/browsers/castor/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/applications/networking/browsers/castor/default.nix diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix new file mode 100644 index 000000000000..6209c3263bcd --- /dev/null +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchurl +, rustPlatform +, pkg-config +, wrapGAppsHook +, openssl +, gtk3 +, gdk-pixbuf +, pango +, atk +, cairo +}: + +rustPlatform.buildRustPackage rec { + pname = "castor"; + version = "0.8.14"; + + src = fetchurl { + url = "https://git.sr.ht/~julienxx/castor/archive/${version}.tar.gz"; + sha256 = "1ykpmbimhfy3ys2hvv0mn8xiwxzdl43gpny1nc58i0gzv07ar8sc"; + }; + + cargoSha256 = "04w49wka1vkb295lk6fzd6c5rwhzrqkp26hd5d94rx7bhcjmmb9w"; + verifyCargoDeps = true; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + openssl + gtk3 + gdk-pixbuf + pango + atk + cairo + ]; + + postInstall = "make PREFIX=$out copy-data"; + + # Sometimes tests fail when run in parallel + checkFlags = [ "--test-threads=1" ]; + + meta = with stdenv.lib; { + description = "A graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols"; + homepage = "https://sr.ht/~julienxx/Castor"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ fgaz ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86cee3a17203..818ef163ad79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18696,6 +18696,8 @@ in carla = qt5.callPackage ../applications/audio/carla { }; + castor = callPackage ../applications/networking/browsers/castor { }; + catimg = callPackage ../tools/misc/catimg { }; catt = python3Packages.callPackage ../applications/video/catt { }; From 74734f3f3d9e7e671a7c669b86c509ecb2e161a2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 9 Jun 2020 15:02:16 +0200 Subject: [PATCH 0716/3452] python38.pkgs.gst-python: Fix build --- pkgs/development/python-modules/gst-python/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index dc15e4b043d2..00d05e189126 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -45,6 +45,13 @@ buildPythonPackage rec { url = "https://github.com/GStreamer/gst-python/commit/f98c206bdf01529f8ea395a719b10baf2bdf717f.patch"; sha256 = "04n4zrnfivgr7iaqw4sjlbd882s8halc2bbbhfxqf0sg2lqwmrxg"; }) + ] ++ [ + # Fix linking against Python 3.8 + # https://gitlab.freedesktop.org/gstreamer/gst-python/merge_requests/30 + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gst-python/commit/22f28155d86e27c4134de4ed2861264003fcfd23.patch"; + sha256 = "Y70qVguHUBmmRVMFBKAP0d6anBQw5W0TKyu2bAwxbQg="; + }) ]; mesonFlags = [ From 551a9887e2852f0908adcc3a4cc8b15c290af0c0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 9 Jun 2020 15:39:32 +0200 Subject: [PATCH 0717/3452] hardenedLinuxPackagesFor: Make it possible to delay major updates This adds an abstraction/hack to update the latest hardened kernel independent of linux_latest, which is required as the hardened patches aren't immediately available ([0] currently doesn't exist). Currently the Linux hardened patches aren't even available for 5.7 which was released on 2020-05-31 (already 9 days ago!). Therefore it is required to keep both linuxPackages_latest_hardened and linuxPackages_latest_xen_dom0_hardened at 5.6 until the patches for 5.7 are released. This abstraction makes that task more manageable but we should aim for a better solution to resolve this or at least a cleaner and more robust implementation (in the sense of better error messages). [0]: https://github.com/anthraxx/linux-hardened/releases/tag/5.7.1.a --- pkgs/top-level/all-packages.nix | 35 +++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6558f59ef638..4a022868fded 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17126,6 +17126,7 @@ in linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! + # And update linux_latest_for_hardened below if the patches are already available linuxPackages_latest = linuxPackages_5_7; linux_latest = linuxPackages_latest.kernel; @@ -17176,28 +17177,32 @@ in linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); - # Hardened linux - hardenedLinuxPackagesFor = kernel: linuxPackagesFor (kernel.override { - structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { - inherit stdenv; - inherit (kernel) version; - }; - kernelPatches = kernel.kernelPatches ++ [ - kernelPatches.tag_hardened - kernelPatches.hardened.${kernel.meta.branch} - ]; - modDirVersionArg = kernel.modDirVersion + "-hardened"; + # Hardened Linux + hardenedLinuxPackagesFor = kernel': overrides: + let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: + linux_latest_for_hardened = pkgs.linux_5_6; # TODO: Update to linux_latest + kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; + in linuxPackagesFor (kernel.override { + structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { + inherit stdenv; + inherit (kernel) version; + }; + kernelPatches = kernel.kernelPatches ++ [ + kernelPatches.tag_hardened + kernelPatches.hardened.${kernel.meta.branch} + ]; + modDirVersionArg = kernel.modDirVersion + "-hardened"; }); - linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux); + linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { }); linux_hardened = linuxPackages_hardened.kernel; - linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest); + linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest { }); linux_latest_hardened = linuxPackages_latest_hardened.kernel; - linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; })); + linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { features.xen_dom0=true; }); - linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); + linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest { features.xen_dom0=true; }); # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14); From a89b2379bbc77048e7c119c843555746902c50fd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 14:12:54 +0000 Subject: [PATCH 0718/3452] evince: 3.36.1 -> 3.36.3 --- pkgs/desktops/gnome-3/core/evince/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 88e5d78c4c34..e268b8f8f121 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.36.1"; + version = "3.36.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1msbb66lasikpfjpkwsvi7h22hqmk275850ilpdqwbd0b39vzf4c"; + sha256 = "1clx580n8vb6w0fhdbmcsxs07yczdgidyax1y7280rafyzvvsbmg"; }; postPatch = '' From fff8963272de700a75939497634cbcc33e93f39e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 14:32:46 +0000 Subject: [PATCH 0719/3452] facter: 3.14.10 -> 3.14.11 --- pkgs/tools/system/facter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 0d2d704ea6c2..b6a04f808a4c 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.10"; + version = "3.14.11"; src = fetchFromGitHub { - sha256 = "0yblz8k30kv9jpfs6bd0hcx5nfr23l7nxyw0q7p7c4ygkx3mb1ji"; + sha256 = "1x7m11bda86xkr8mncy50nga9q3gnvnklcvwwpa7frka99kgai26"; rev = version; repo = pname; owner = "puppetlabs"; From 735e22d1f920a30c3b1597123c8d1cb8a5728d13 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 14:43:23 +0000 Subject: [PATCH 0720/3452] evolution-data-server: 3.36.2 -> 3.36.3 --- pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 0d3c786690d1..4bb3f4517f0e 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.36.2"; + version = "3.36.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0yz9fsnbnnlj2iidd81i9w7d0dhidrzqkixrnfjfdkhnxk7p9qlq"; + sha256 = "1cix02xl473m0l7h715s68cn7bi1p4y1jkrxswcq4a0g7lblhpqz"; }; patches = [ From 9b0a95e481533193344fc87fedd54c176122263a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 15:03:37 +0000 Subject: [PATCH 0721/3452] go-ethereum: 1.9.14 -> 1.9.15 --- pkgs/applications/blockchains/go-ethereum.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 690731fa1201..e5cad0c76813 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.14"; + version = "1.9.15"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0vqsx4q7jn6vhmrm9kkk810d5nvnmyb6bni38ynkxcwlrp3qs6v2"; + sha256 = "1c69rfnx9130b87pw9lnaxyrbzwfhqb2dxyl7qyiscq85hqs16f9"; }; usb = fetchFromGitHub { @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "0asd5fz2rhzkjmd8wjgmla5qmqyz4jaa6qf0n2ycia16jsck6wc2"; }; - vendorSha256 = "01mbmc8qlp08127dlmcqz0viasmg7mrzqzmyw21an69sabcr112n"; + vendorSha256 = "1pjgcx6sydfipsx8s0kl7n6r3lk61klsfrkd7cg4l934k590q2n7"; overrideModAttrs = (_: { postBuild = '' From bcead5272d1b737dd1efb2f36ffe46642bae38a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 15:08:48 +0000 Subject: [PATCH 0722/3452] flexget: 3.1.57 -> 3.1.59 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 65fb6ffa369d..7e6915828815 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "3.1.57"; + version = "3.1.59"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "661663726f75b12ba2e67db1276a9abf586b41db1ff313488ca35a439ec5d721"; + sha256 = "19vp2395sl6gdv54zn0k4vf1j6b902khvm44q5hfr805jd3fc11h"; }; postPatch = '' From 5fbbfe48a704b8af126f524b37938bd1fda3d00b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 10 Jun 2020 01:07:41 +1000 Subject: [PATCH 0723/3452] gogetdoc: remove unnecessary goDeps/goPackagePath --- pkgs/development/tools/gogetdoc/default.nix | 5 +---- pkgs/development/tools/gogetdoc/deps.nix | 13 ------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 pkgs/development/tools/gogetdoc/deps.nix diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/development/tools/gogetdoc/default.nix index 5d360f4572ab..6898c998ef60 100644 --- a/pkgs/development/tools/gogetdoc/default.nix +++ b/pkgs/development/tools/gogetdoc/default.nix @@ -10,7 +10,6 @@ buildGoModule rec { vendorSha256 = null; - goPackagePath = "github.com/zmb3/gogetdoc"; excludedPackages = "\\(testdata\\)"; src = fetchFromGitHub { @@ -21,8 +20,6 @@ buildGoModule rec { sha256 = "1v74zd0x2xh10603p8raazssacv3y0x0lr9apkpsdk0bfp5jj0lr"; }; - goDeps = ./deps.nix; - meta = with lib; { description = "Gets documentation for items in Go source code"; homepage = "https://github.com/zmb3/gogetdoc"; @@ -30,4 +27,4 @@ buildGoModule rec { maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/gogetdoc/deps.nix b/pkgs/development/tools/gogetdoc/deps.nix deleted file mode 100644 index d770057d1d78..000000000000 --- a/pkgs/development/tools/gogetdoc/deps.nix +++ /dev/null @@ -1,13 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "6adeb8aab2de"; - sha256 = "0kylkki0ksdm12ppl37fghzbma9hmgqwph0nwngv08v4blk6li6k"; - }; - } -] From e95a896c82986f15d02f0099e69efebc51d2867e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 15:16:02 +0000 Subject: [PATCH 0724/3452] gnome3.gnome-klotski: 3.36.2 -> 3.36.3 --- pkgs/desktops/gnome-3/games/gnome-klotski/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index ac15ebadce92..eb6f4b10dbd6 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-klotski"; - version = "3.36.2"; + version = "3.36.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1w7fp79hc2v98r7ffg57d6na3wwr355gg9jrdd7w2ad362dfg1kw"; + sha256 = "0fj1hlkqpjdb4hxd0di16ahm5j2r5j218ckyk88pmhjf8whb2g6z"; }; nativeBuildInputs = [ From f8ba613f10a7ad044a06662aed3aad6c41cb956b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 4 May 2020 16:13:36 +0200 Subject: [PATCH 0725/3452] perlPackages.XMLRPCLite: init at 0.717 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index daec9dacbe67..7d3d08817dae 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21202,6 +21202,22 @@ let }; }; + XMLRPCLite = buildPerlPackage { + pname = "XMLRPC-Lite"; + version = "0.717"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PH/PHRED/XMLRPC-Lite-0.717.tar.gz"; + sha256 = "0925md6jhzgpsibwgny4my461b2wngm8dhxlcry8pbqzrgrab7rs"; + }; + propagatedBuildInputs = [ SOAPLite ]; + # disable tests that require network + preCheck = "rm t/{26-xmlrpc.t,37-mod_xmlrpc.t}"; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + description = "Client and server implementation of XML-RPC protocol"; + }; + }; + XMLRSS = buildPerlModule { pname = "XML-RSS"; version = "1.61"; From d020ee07cda36787d5bc5fe8a0da0dbbed63859a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 9 Jun 2020 16:29:20 +0200 Subject: [PATCH 0726/3452] patchelf: 0.9 -> 0.11 --- pkgs/development/tools/misc/patchelf/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix index ad09cdc6eb33..5119225d9ae6 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "patchelf-0.9"; + name = "patchelf-0.11"; src = fetchurl { url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; - sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83"; + sha256 = "16ms3ijcihb88j3x6cl8cbvhia72afmfcphczb9cfwr0gbc22chx"; }; setupHook = [ ./setup-hook.sh ]; - doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6 + # fails 8 out of 24 tests, problems when loading libc.so.6 + doCheck = stdenv.name == "stdenv-linux"; meta = with stdenv.lib; { homepage = "https://github.com/NixOS/patchelf/blob/master/README"; From 9546174fa5bfb54296fe8f6e70e291d85a7e3813 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 15:43:04 +0000 Subject: [PATCH 0727/3452] gnome3.gnome-tetravex: 3.36.2 -> 3.36.3 --- pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index 7061610ced1e..01dc3bab0ca4 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-tetravex"; - version = "3.36.2"; + version = "3.36.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0qf6s3gl5qrs5rwsgx0191b0xyknhz2n9whx5i6ma5yw5ikslmq4"; + sha256 = "0y1kc9j740088ffj4rd49w4f2pkn8w6paids5g1dv609sfpzyips"; }; passthru = { From 01b660d8f1289d8d57f63cc2fae0d4c7d76a5bb7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 15:49:24 +0000 Subject: [PATCH 0728/3452] gitAndTools.gitui: 0.3.0 -> 0.5.0 --- .../version-management/git-and-tools/gitui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index f1e466302240..d3581eef5596 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.3.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "0rdaschf6030zprz81g7xnx57idjsq3bjhjp5d9387ha5njq0bp1"; + sha256 = "0z3k83nfnl765ably4naybjf614qfizzpqb40ppwljijj9nqlng1"; }; - cargoSha256 = "1k24xabhgwwdvslq81w6b8jnnjxbafj4s0zpcq2c4hals2xxwfy4"; + cargoSha256 = "11y4q56vl5dp2vdc7dc5q44l2m0mn590hfg6i134m11r8988am6y"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; From fb1f86757e7e4a12a0dac6f45bcae7b3e67d47bc Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Tue, 9 Jun 2020 17:52:00 +0200 Subject: [PATCH 0729/3452] go-ethereum: remove asymmetric from maintainers --- pkgs/applications/blockchains/go-ethereum.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 690731fa1201..b2cfc2e1d680 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -53,6 +53,6 @@ buildGoModule rec { homepage = "https://geth.ethereum.org/"; description = "Official golang implementation of the Ethereum protocol"; license = with licenses; [ lgpl3 gpl3 ]; - maintainers = with maintainers; [ adisbladis asymmetric lionello xrelkd ]; + maintainers = with maintainers; [ adisbladis lionello xrelkd ]; }; } From e49189078fa5194d0bef55d2432c259a0cabc172 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 06:49:15 +0000 Subject: [PATCH 0730/3452] blender: 2.82a -> 2.83.0 Co-authored-by: Dmitry Kalinkin --- pkgs/applications/misc/blender/darwin.patch | 21 ++++++--------------- pkgs/applications/misc/blender/default.nix | 4 ++-- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/blender/darwin.patch b/pkgs/applications/misc/blender/darwin.patch index 43b96466df28..c426c0b66077 100644 --- a/pkgs/applications/misc/blender/darwin.patch +++ b/pkgs/applications/misc/blender/darwin.patch @@ -9,7 +9,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf endif() if(WITH_OPENAL) -@@ -79,7 +78,7 @@ endif() +@@ -86,7 +85,7 @@ endif() if(WITH_CODEC_SNDFILE) set(LIBSNDFILE ${LIBDIR}/sndfile) set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include) @@ -18,7 +18,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib ${LIBDIR}/ffmpeg/lib) # TODO, deprecate endif() -@@ -90,7 +89,7 @@ if(WITH_PYTHON) +@@ -97,7 +96,7 @@ if(WITH_PYTHON) # normally cached but not since we include them with blender set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m") set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m") @@ -27,7 +27,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}") # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled else() -@@ -155,10 +154,7 @@ if(WITH_CODEC_FFMPEG) +@@ -162,10 +161,7 @@ if(WITH_CODEC_FFMPEG) set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include) set(FFMPEG_LIBRARIES avcodec avdevice avformat avutil @@ -39,7 +39,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf set(FFMPEG_LIBPATH ${FFMPEG}/lib) endif() -@@ -199,14 +195,14 @@ if(WITH_OPENCOLLADA) +@@ -206,14 +202,14 @@ if(WITH_OPENCOLLADA) set(OPENCOLLADA ${LIBDIR}/opencollada) set(OPENCOLLADA_INCLUDE_DIRS @@ -60,16 +60,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf set(OPENCOLLADA_LIBRARIES OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -@@ -215,7 +211,7 @@ if(WITH_OPENCOLLADA) - -lMathMLSolver - -lGeneratedSaxParser - -lbuffer -lftoa -lUTF -- ${OPENCOLLADA_LIBPATH}/libxml2.a -+ xml2 - ) - # PCRE is bundled with openCollada - # set(PCRE ${LIBDIR}/pcre) -@@ -276,14 +272,13 @@ if(WITH_BOOST) +@@ -277,14 +273,13 @@ if(WITH_BOOST) endif() if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG) @@ -85,7 +76,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} -@@ -306,7 +301,7 @@ endif() +@@ -307,7 +302,7 @@ endif() if(WITH_OPENCOLORIO) set(OPENCOLORIO ${LIBDIR}/opencolorio) set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index e27aca4fc3d1..54aad945f077 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -17,11 +17,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.82a"; + version = "2.83.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "18zbdgas6qf2kmvvlimxgnq7y9kj7hdxcgixrs6fj50x40q01q2d"; + sha256 = "07rzm4xaj94pjxy2vlqfhi1adsqpshfkrzrq8kljmcbnw22vrqhl"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; From 3d6ea5fd08afe318f35d789109664fe5a6dcc107 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 9 Jun 2020 11:56:50 -0400 Subject: [PATCH 0731/3452] blender: add veprbl to maintainers --- pkgs/applications/misc/blender/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 54aad945f077..60514c92b338 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -142,6 +142,6 @@ stdenv.mkDerivation rec { # say: "We've decided to cancel the BL offering for an indefinite period." license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu veprbl ]; }; } From fbace4e4ed32ccd7a84aeab95996d55a52e6518a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 15:57:43 +0000 Subject: [PATCH 0732/3452] feh: 3.4 -> 3.4.1 --- pkgs/applications/graphics/feh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index a0e04bf4ad32..cecd2a3776d3 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.4"; + version = "3.4.1"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "0r83zincbfnk8g13xwm2qaccml9srnwlsmpc1f0nhwjkqyjmqm0q"; + sha256 = "0yvvj1s7ayn0lwils582smwkmckdk0gij5c58g45n4xh981n693q"; }; outputs = [ "out" "man" "doc" ]; From 9e296840642e3941b7cf0a72b774a029ab897f4e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 16:09:51 +0000 Subject: [PATCH 0733/3452] glib-networking: 2.64.2 -> 2.64.3 --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 882c9f8c3f54..59bf8485971f 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.64.2"; + version = "2.64.3"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19wmyv7j355z1wk650fyygadbwwmmhqggr54845rn7smbiqz1pj5"; + sha256 = "0s518l4bwvdvcp51lbjqcw8g0vq18bznpf5hq2zi6a054jqhcylk"; }; patches = [ From 62f80aaeff984c5a381c74abde67c55b2d6e8f8b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 16:18:14 +0000 Subject: [PATCH 0734/3452] gallery-dl: 1.13.6 -> 1.14.0 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 6845cbcb59db..c73a28d0febd 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.13.6"; + version = "1.14.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "17hgryj8qsxcx3c96ir25q0wsh5q0s6c6fb33lqfdbrfxrjcixbk"; + sha256 = "0ckqxibyf14lgl1aj5pv79bmfanacgcc96x6mdwfp2dnbvfjk71b"; }; doCheck = false; From 9ca728109340c7ce47599c3338e032ba31c85594 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 16:23:35 +0000 Subject: [PATCH 0735/3452] fetchmail: 6.4.5 -> 6.4.6 --- pkgs/applications/misc/fetchmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index c1104eb0a570..00b858a32798 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: let - version = "6.4.5"; + version = "6.4.6"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "073bjh8qbvww7f5gbd6pq640qspi7dc6cjndvm0h2jcl0a90c3yk"; + sha256 = "04b0sq1xad6gs1bfhkbmhsn1kq6y4gsx9l9ywjvd5d0rc15yrvqn"; }; buildInputs = [ openssl ]; From a1aecffc971202acaca5882e87510d2a15a000f7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 9 Jun 2020 18:12:09 +0200 Subject: [PATCH 0736/3452] tdesktop: 2.1.10 -> 2.1.11 --- .../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 9a452ec2cd6e..388144c4e12f 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.10"; + version = "2.1.11"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0z2mlrbzknjnkgmpyaiw80cjd5cjymdvl3a0wjaippn7xhilbh52"; + sha256 = "1sd6nrcjg5gpq6ynvwnz8f4jz8flknybx6b0pfxqrqqpzy7wjl5m"; }; postPatch = '' From 9bf1155671090d557100a25fa93a613d3239c909 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 16:35:03 +0000 Subject: [PATCH 0737/3452] gnome3.gnome-chess: 3.36.0 -> 3.36.1 --- pkgs/desktops/gnome-3/games/gnome-chess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index 21348370579d..7747676f09e3 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1a9fgi749gy1f60vbcyrqqkab9vqs42hji70q73k1xx8rv0agmg0"; + sha256 = "165bk8s3nngyqbikggspj4rff5nxxfkfcmgzjb4grmsrgbqwk5di"; }; nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ]; From d63e7b5b21e875a7c2f8b430a468bc5e5c37e8e1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 17:14:30 +0000 Subject: [PATCH 0738/3452] gnome3.gnome-music: 3.36.2 -> 3.36.3 --- pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 26cebe076ea4..fd2b48ba355d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -30,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.36.2"; + version = "3.36.3"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19c2x7h9gq4kh4995y1qcn5pyry4x04lh5n7md0q33zsxcx43bdb"; + sha256 = "0ds225fd0zl0zpjc2wmzg4fwivqbqsyiqpnf9pzlqpwrz10d5y2l"; }; nativeBuildInputs = [ From 42f3f3cbda30c23ffea5bf52fa56f06b9d47c272 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 17:24:57 +0000 Subject: [PATCH 0739/3452] freetds: 1.1.39 -> 1.1.40 --- pkgs/development/libraries/freetds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 96ec3434b782..f244bdc7ad2b 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.1.39"; + version = "1.1.40"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "1p5ixc1hxh9mmhplndf1j87cw9989bp0fh0nsbx6l3p2wnqz9nyl"; + sha256 = "0wc7xxf8fzpp3pc3hpsamnykn0vjkq53qp53nyxjjcri8g0ch7wq"; }; buildInputs = [ From 2df0fef39ea5278d6fcd8ec0d09e6f51c9f1666c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 17:50:56 +0000 Subject: [PATCH 0740/3452] gjs: 1.64.2 -> 1.64.3 --- pkgs/development/libraries/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index ee29c6a97a45..8e298e64ce6d 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -28,11 +28,11 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.64.2"; + version = "1.64.3"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ywrsfmkxaw11z83dnmb9yqkn6k3c1mkxw2mv6arbwad6x6q7zqm"; + sha256 = "1rl524rmdbpmp5xdkm8dx3znq47l7dgvh192x80zjf8wc1af35lx"; }; outputs = [ "out" "dev" "installedTests" ]; From 0855b425930096b16e2531e4483984041ce6b9ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 18:25:34 +0000 Subject: [PATCH 0741/3452] tridactyl-native: 1.19.0 -> 1.19.1 --- pkgs/tools/networking/tridactyl-native/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index c2ea4ee62d85..7072fb96edab 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "1myqhhjilj9sjvvw64f2931jqgvwv60ajqngw790ygcs4vr7gmfk"; + sha256 = "19hldr6ii1z7gghc80h7qsnlz9na586gldm5y33i6lrs93193l82"; }; sourceRoot = "source/native"; From 1c7fd15a423cf26590207dd9c133fba051a55af6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 21 May 2020 02:23:05 +0200 Subject: [PATCH 0742/3452] ocamlPackages.crowbar: init at 0.2 --- .../ocaml-modules/crowbar/default.nix | 32 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/ocaml-modules/crowbar/default.nix diff --git a/pkgs/development/ocaml-modules/crowbar/default.nix b/pkgs/development/ocaml-modules/crowbar/default.nix new file mode 100644 index 000000000000..0189026e346b --- /dev/null +++ b/pkgs/development/ocaml-modules/crowbar/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildDunePackage, fetchFromGitHub, ocplib-endian, cmdliner, afl-persistent +, calendar, fpath, pprint, uutf, uunf, uucp }: + +buildDunePackage rec { + pname = "crowbar"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "stedolan"; + repo = pname; + rev = "v${version}"; + sha256 = "0wjfc9irvirfkic32ivvj6qb7r838w08b0d3vmngigbjpjyc9b14"; + }; + + minimumOCamlVersion = "4.08"; + + # disable xmldiff tests, so we don't need to package unmaintained and legacy pkgs + postPatch = "rm -rf examples/xmldiff"; + + propagatedBuildInputs = [ ocplib-endian cmdliner afl-persistent ]; + checkInputs = [ calendar fpath pprint uutf uunf uucp ]; + # uunf is broken on aarch64 + doCheck = !stdenv.isAarch64; + + meta = with stdenv.lib; { + description = "Property fuzzing for OCaml"; + homepage = "https://github.com/stedolan/crowbar"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} + diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f75ecabe6348..602e131ad9e6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -161,6 +161,8 @@ let cpuid = callPackage ../development/ocaml-modules/cpuid { }; + crowbar = callPackage ../development/ocaml-modules/crowbar { }; + crunch = callPackage ../development/tools/ocaml/crunch { }; cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; From 524ce45651be1ac124b1bce2cf126ab1c521d8e0 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 9 Jun 2020 21:30:03 +0200 Subject: [PATCH 0743/3452] mu: 1.4.9 -> 1.4.10 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index cf2a01b3bb27..fc693bae212d 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.4.9"; + version = "1.4.10"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "1l8c72f3yd2vypc11frsmjnkr87h1q4gb6k3armpypwv6a6zl8z4"; + sha256 = "10vnqlpphjkkiji42sfs954l1zfgwnic7mmpr4nx6yx44z619v0y"; }; postPatch = stdenv.lib.optionalString (batchSize != null) '' From 84264ef0f01ea909020995d05b9f71428660f699 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 19:34:00 +0000 Subject: [PATCH 0744/3452] gitAndTools.git-absorb: 0.6.2 -> 0.6.3 --- .../version-management/git-and-tools/git-absorb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index fe14e7a5da11..00f279942d9d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "tummychow"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "1xjs5yjb0wj0nf3k3mpgh3hm16544gq7954k1y2r5lwammp0fsxk"; + sha256 = "0kvb9nzjlxhnrd2ir3zjd99v7zcq4bch1i9nqsn3505j5m0wv0hh"; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoSha256 = "194ic3f60gpx35rs665vrnjsc3047f0msx1qp797xsz6pg0jx1zq"; + cargoSha256 = "0bppb1ng77ynhlxnhgz9qx4x5j0lyzcxw3zshfpgjc03fxcwl6cz"; postInstall = '' installManPage Documentation/git-absorb.1 From e359d94760e989db04b1742f71ac17fb5b4a0d49 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 19:39:15 +0000 Subject: [PATCH 0745/3452] gnome3.gnome-boxes: 3.36.3 -> 3.36.4 --- pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index e2ac4cb4b89d..fd7205e08fd0 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "3.36.3"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18imxv1859gr53z4yay02611p5f1rd2pwnbaq093gmn77l0j9292"; + sha256 = "16l0mq2ydmywcdya1795mcy8syg4zkmz9ws3pzjcqv5y4m7cjj03"; }; doCheck = true; From 1028f591e56af4dcbd3e2c69e5725f3481db0eab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 19:53:07 +0000 Subject: [PATCH 0746/3452] gnome3.gnome-taquin: 3.36.2 -> 3.36.3 --- pkgs/desktops/gnome-3/games/gnome-taquin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index ad549a7c6829..fb609bbb9781 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-taquin"; - version = "3.36.2"; + version = "3.36.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0pi8kxici7p3jys8673ib0kigpif4mfkq0zlq48rsibhdqfhrlij"; + sha256 = "149bv8q2a44i9msyshhh57nxwf5a43hankbndbvjqvq95yqlnhv4"; }; passthru = { From 4f5e740880ef45e4af771acf7c0acffc6a58746d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 19:59:57 +0000 Subject: [PATCH 0747/3452] gitAndTools.git-filter-repo: 2.26.0 -> 2.27.0 --- .../git-and-tools/git-filter-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix index 0439669f9da5..307fbf1ca675 100644 --- a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "git-filter-repo"; - version = "2.26.0"; + version = "2.27.0"; src = fetchurl { url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "15d07i66b090bhjfj9s4s2s38k75mhxmddzyn44bnnyb967w6yjk"; + sha256 = "1vry0pqwi0p82m3wflr0wyf88wn75l049w18xf9f5z43xd9vpva1"; }; buildInputs = [ pythonPackages.python ]; From e8eb27ffc3dd007b409a0f07f48e593e29bb053b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 20:40:53 +0000 Subject: [PATCH 0748/3452] gnome3.gnome-system-monitor: 3.36.0 -> 3.36.1 --- pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 82ec3c9a9d76..2dd4ae9e7f7b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1gipjaw708lv1zj1c9g09x4h4226kawam2kzdhdd6zjkzfghp9s0"; + sha256 = "18dwwwmw4m2kzvfmxyaxmnm66d1plwvh6c6naznb0xac1ymlfsw6"; }; doCheck = true; From 7de19f4599b1b41b2445cbbddb02352cc53b9d8d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 20:45:54 +0000 Subject: [PATCH 0749/3452] gnome3.four-in-a-row: 3.36.2 -> 3.36.3 --- pkgs/desktops/gnome-3/games/four-in-a-row/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 1523da990e37..aaaba71c7ee3 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "four-in-a-row"; - version = "3.36.2"; + version = "3.36.3"; src = fetchurl { url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pjwaly0f36gn8ashf19b6w1yldmqpa8grdxcyb6h7b0k3bd54z6"; + sha256 = "1qc6s0v8gnzw3wfbfaaindb031cc8akdjdn2sjqqfxhbpx6mhzmr"; }; nativeBuildInputs = [ From 5a57efe9e4f40fe44dad6c2d8c809b29fd787ee7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 20:50:24 +0000 Subject: [PATCH 0750/3452] gnome3.gnome-initial-setup: 3.36.2 -> 3.36.3 --- pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index fb801ca19a61..ff7463b940ec 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "3.36.2"; + version = "3.36.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mjp2j4smikmr4fa0y8wrw2srlfjahiixzphz3dmc30hx8df92sg"; + sha256 = "11f2yj8q844gks3jkfbi4ap448snz1wjflqbq4y2kk12r3w37afq"; }; nativeBuildInputs = [ From 074911e4606e8e4634c1f4a0bd7e9f41343add77 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 21:04:40 +0000 Subject: [PATCH 0751/3452] flyway: 6.4.2 -> 6.4.3 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 6018d6306745..1349d4c009aa 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.4.2"; + version = "6.4.3"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "1m5i7mw3ml2iaqy09h8nmykn602rwkjfgh2mrmc1gss9q3klj1r8"; + sha256 = "05gbqc3hvi7yiqf03iwyamvvhc3jmyfvv1989527psdzhxs8gw7b"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From 27276d82523318f1b79cf6cc0f66e131cf466867 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 21:16:24 +0000 Subject: [PATCH 0752/3452] gnome3.gnome-applets: 3.36.3 -> 3.36.4 --- pkgs/desktops/gnome-3/misc/gnome-applets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index ef87571e038b..a33376618c2c 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -24,13 +24,13 @@ let pname = "gnome-applets"; - version = "3.36.3"; + version = "3.36.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "02jwh5yxka2mnzdqnr55lfijplvscy97isv7lqx1zvsi2p7hy38m"; + sha256 = "1cd7y2air9cjznqmnynadbsayvq4dpsi39avnz46vv0bavx1aiwz"; }; nativeBuildInputs = [ From 22e75d4445d53eda9e25e1bbb40d8cef155c12cb Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 10 Jun 2020 00:19:41 +0300 Subject: [PATCH 0753/3452] clex: enable on darwin --- pkgs/tools/misc/clex/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix index 5e5bf4166ff9..7a6a78af59a9 100644 --- a/pkgs/tools/misc/clex/default.nix +++ b/pkgs/tools/misc/clex/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.clex.sk"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; }; } From a24dbc9f36f2d50d0459283f8227365adb49c4b7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 21:32:12 +0000 Subject: [PATCH 0754/3452] gnome3.iagno: 3.36.2 -> 3.36.3 --- pkgs/desktops/gnome-3/games/iagno/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index c3df9bd1099d..3b4fca5f364e 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "iagno"; - version = "3.36.2"; + version = "3.36.3"; src = fetchurl { url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hgn2iqvnfiiwm57bir28dz61b1kkp1zh6av8f342q153rxx10g6"; + sha256 = "0cid9fag8irlq0cywyqaj402vb60l8f66ld1zj7a023rg0khqnbb"; }; nativeBuildInputs = [ From 08815104f541a36708a9d11eefc22fb6eb864fe0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 9 Jun 2020 23:40:29 +0200 Subject: [PATCH 0755/3452] microcodeIntel: 20200520 -> 20200609 --- pkgs/os-specific/linux/microcode/intel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index c0201fb01fd4..bbf584b2fa3b 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20200520"; + version = "20200609"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "1cs4b7q9j2lw2y09rfa82aijbfmy4lddahz8qlz9gwajf2ziqns8"; + sha256 = "0vzsv0fqp44dhmvj6syjjab3cs1bc4r0g7g97lna8l91vj2yin9j"; }; nativeBuildInputs = [ iucode-tool libarchive ]; From 663ea3b0e36edcb43e0403c21703b33a5d92820d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 21:58:50 +0000 Subject: [PATCH 0756/3452] hopper: 4.5.27 -> 4.5.28 --- pkgs/development/tools/analysis/hopper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index 8a265d89849d..bd7b831b8162 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "hopper"; - version = "4.5.27"; + version = "4.5.28"; rev = "v${lib.versions.major version}"; src = fetchurl { url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "1c0lyj20kvb6ljf7zk6hzs70bl5fwnmyiv6w3hhr079bgn4fq4m0"; + sha256 = "0mjpkd5c9igkxp9jg8cvrgrxw9x7ag1p5xivjbzhb3vld6xjm4dh"; }; sourceRoot = "."; From 4abc9581ab31b09ff37e81ea302b88ee243ac2dc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 22:18:07 +0000 Subject: [PATCH 0757/3452] icewm: 1.6.5 -> 1.6.6 --- pkgs/applications/window-managers/icewm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index b6b07d8d7278..b5657379c062 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -9,13 +9,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "icewm"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "bbidulock"; repo = "icewm"; rev = version; - sha256 = "1glzpkpl0vl5sjn1d9jlvwd9ch16dvxvsf2n310kb0ycpfkl84vs"; + sha256 = "05jg2gs5cdxn2kfm2y6yrqxpza5s1zsgb52168psmzhb4nakpv42"; }; nativeBuildInputs = [ cmake pkgconfig perl asciidoc ]; From 49d525848a33bda4a3103e4ef2a3886119479e60 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 23:04:46 +0000 Subject: [PATCH 0758/3452] ibm-sw-tpm2: 1563 -> 1628 --- pkgs/tools/security/ibm-sw-tpm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix index 5e1d460a4634..d6e8a521a2fa 100644 --- a/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ibm-sw-tpm2"; - version = "1563"; + version = "1628"; src = fetchurl { url = "mirror://sourceforge/ibmswtpm2/ibmtpm${version}.tar.gz"; - sha256 = "1sfi7drmbm08rgd2414s3sxd7h5g8d4kiwk40xklf7sw67w1ffpw"; + sha256 = "18wywbsdp5sjrapznk2ydbmx0whz513dhybn1lls24xfl7kp9s58"; }; buildInputs = [ openssl ]; From 3d44c01fe39a5bce1b8fa934b00b41f311d5ebfe Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 9 Jun 2020 18:18:18 -0500 Subject: [PATCH 0759/3452] gitAndTools.git-filter-repo: add meta platforms --- .../version-management/git-and-tools/git-filter-repo/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix index 307fbf1ca675..78011604cdd7 100644 --- a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/newren/git-filter-repo"; description = "Quickly rewrite git repository history (filter-branch replacement)"; license = licenses.mit; + inherit (pythonPackages.python.meta) platforms; maintainers = [ maintainers.marsam ]; }; } From 4f67c0cc6c6e5e6d2a40a55a0f8465b1a567aab8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 10 Jun 2020 00:15:56 +0200 Subject: [PATCH 0760/3452] adb-sync: 2016-08-31 -> 2019-01-01 Simple tool to synchronize a directory-tree between a local machine and an Android device using `adb` and `rsync`. Since this repo doesn't have any releases atm, I added the `-unstable` suffix to `pname`. Since 2016-08-31 the following things changed: https://github.com/google/adb-sync/compare/7fc48ad1e15129ebe34e9f89b04bfbb68ced144d...fb7c549753de7a5579ed3400dd9f8ac71f7bf1b1 Also applied the following changes to the derivation: * Removed the `phases` hack to enable important things like `fixupPhase` again (amongst other things this is needed for shebang-patching and reference-checks). * Fixed the wrapper to make sure that every binary needed by those scripts is available. * Added myself as additional maintainer. --- pkgs/development/mobile/adb-sync/default.nix | 39 +++++++++++++------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix index 5c0f0c07c214..98f69ed88b16 100644 --- a/pkgs/development/mobile/adb-sync/default.nix +++ b/pkgs/development/mobile/adb-sync/default.nix @@ -1,24 +1,35 @@ -{ stdenv, fetchgit, python3, platform-tools, makeWrapper }: +{ stdenv, fetchFromGitHub, python3, platform-tools, makeWrapper +, socat, go-mtpfs, adbfs-rootless +}: stdenv.mkDerivation { - pname = "adb-sync"; - version = "2016-08-31"; + pname = "adb-sync-unstable"; + version = "2019-01-01"; - src = fetchgit { - url = "https://github.com/google/adb-sync"; - rev = "7fc48ad1e15129ebe34e9f89b04bfbb68ced144d"; - sha256 = "1y016bjky5sn58v91jyqfz7vw8qfqnfhb9s9jd32k8y29hy5vy4d"; + src = fetchFromGitHub { + owner = "google"; + repo = "adb-sync"; + rev = "fb7c549753de7a5579ed3400dd9f8ac71f7bf1b1"; + sha256 = "1kfpdqs8lmnh144jcm1qmfnmigzrbrz5lvwvqqb7021b2jlf69cl"; }; - buildInputs = [ python3 platform-tools makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 ]; - phases = "installPhase"; + dontBuild = true; + + installPhase = let + dependencies = stdenv.lib.makeBinPath [ platform-tools socat go-mtpfs adbfs-rootless ]; + in '' + runHook preInstall - installPhase = '' mkdir -p $out/bin - cp $src/adb-channel $src/adb-sync $out/bin/ - patchShebangs $out/bin - wrapProgram $out/bin/adb-sync --suffix PATH : ${platform-tools}/bin + cp adb-{sync,channel} $out/bin + + wrapProgram $out/bin/adb-sync --suffix PATH : "${dependencies}" + wrapProgram $out/bin/adb-channel --suffix PATH : "${dependencies}" + + runHook postInstall ''; meta = with stdenv.lib; { @@ -27,6 +38,6 @@ stdenv.mkDerivation { license = licenses.asl20; platforms = platforms.unix; hydraPlatforms = []; - maintainers = with maintainers; [ scolobb ]; + maintainers = with maintainers; [ scolobb ma27 ]; }; } From 7440f0f3862abcee9c352d8e898ff7da279a2780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 5 Jun 2020 15:49:58 +0200 Subject: [PATCH 0761/3452] pycurl: Exclude another flaky test. Fixes #77304 --- pkgs/development/python-modules/pycurl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index e65ae7a167b3..6b6aad2b2342 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -36,6 +36,8 @@ buildPythonPackage rec { ]; # skip impure or flakey tests + # See also: + # * https://github.com/NixOS/nixpkgs/issues/77304 checkPhase = '' HOME=$TMPDIR pytest tests -k "not test_ssl_in_static_libs \ and not test_keyfunction \ @@ -44,7 +46,8 @@ buildPythonPackage rec { and not test_libcurl_ssl_nss \ and not test_libcurl_ssl_openssl" \ --ignore=tests/getinfo_test.py \ - --ignore=tests/memory_mgmt_test.py + --ignore=tests/memory_mgmt_test.py \ + --ignore=tests/multi_memory_mgmt_test.py ''; preConfigure = '' From 5ca9a2d15bd12d87d0cf9f260addcb4d38b93da3 Mon Sep 17 00:00:00 2001 From: Robin Palotai Date: Wed, 10 Jun 2020 02:07:51 +0200 Subject: [PATCH 0762/3452] leveldb: Add snappy dependency (#89852) This is practically required. Without this option, snappy compression is not supported, so 1) newly created leveldb stores will take more space than needed 2) existing snappy-compressed stores won't be opened by tools built without the snappy support --- pkgs/development/libraries/leveldb/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index b64b426a6403..33eca603c267 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fixDarwinDylibNames }: +{ stdenv, fetchFromGitHub, fixDarwinDylibNames, snappy }: stdenv.mkDerivation rec { pname = "leveldb"; @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "01kxga1hv4wp94agx5vl3ybxfw5klqrdsrb6p6ywvnjmjxm8322y"; }; + buildInputs = [ snappy ]; + nativeBuildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; From 58d2c8028c0cd2c2de6eb556fc93ff7b3ab5265f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 00:13:35 +0000 Subject: [PATCH 0763/3452] groonga: 10.0.2 -> 10.0.3 --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index b53a207a6c57..b622cf3447d1 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "10.0.2"; + version = "10.0.3"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "0851sdzgg5krf05b1pg29gmwzvzxvawfp37ny3lrb5xcdqbr379c"; + sha256 = "0vnrpzd7gkjh4bc0lgvh5l11ym6pls4lp1pl5jjlkyx505635k8d"; }; buildInputs = with stdenv.lib; From 500ab908f20df250252ee45ab9398b458de0a777 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 10 Jun 2020 03:06:10 +0200 Subject: [PATCH 0764/3452] gnome3.gnome-music: disable strictDeps With strictDeps, wrapGAppsHook in nativeBuildInputs does not seem to propagate librsvg, leading to the folowing warning: (org.gnome.Music:23143): Gtk-WARNING **: 03:04:24.030: Could not load a pixbuf from /org/gtk/libgtk/theme/Adwaita/assets/bullet-symbolic.svg. This may indicate that pixbuf loaders or the mime database could not be found. --- pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index fd2b48ba355d..d2d3f83f427c 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -93,6 +93,9 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; + # handle setup hooks better + strictDeps = false; + passthru = { updateScript = gnome3.updateScript { packageName = pname; From 81c9cc0b607ac317491ce0af6cb86eac8a742823 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 01:51:27 +0000 Subject: [PATCH 0765/3452] joker: 0.15.3 -> 0.15.4 --- pkgs/development/interpreters/joker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 789816c34d04..823ab6d10990 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "joker"; - version = "0.15.3"; + version = "0.15.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "1pxj6flyhf522zjab1dfvxfajyx3v3rzs7l8ma7ma6b8zmwp2wdn"; + sha256 = "1ad6cdqadd1zs9zh85zyhdiiv6ir28k28w034vzsx5zaipvy4kml"; }; - vendorSha256 = "1rn8ijq3v3fzlbyvm7g4i3qpwcl3vrl4rbcvlbzv05wxrgcw9iqb"; + vendorSha256 = "031ban30kx84r54fj9aq96pwkz9nqh4p9yzs4l8i1wqmy52rldvl"; preBuild = '' go generate ./... From 6dd6c9e5c8fa3642424e677c5bd0779351e9fc35 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 02:37:26 +0000 Subject: [PATCH 0766/3452] kdev-php: 5.5.1 -> 5.5.2 --- pkgs/applications/editors/kdevelop5/kdev-php.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index 4bd6e34b4fcb..b4e4044bea6a 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-php"; - version = "5.5.1"; + version = "5.5.2"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1z3mmlg5srzff0y1pjd4wfdf9k4rzk7gfdvbvzizkiy395qw1phv"; + sha256 = "0z32x0297g078jk3jhzb4vrf8jhw0qprvqzm9p097h8x0026w42l"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; From c04e2c41ca2cfadafe7769fa7fe2c0f18cdf379c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 03:50:47 +0000 Subject: [PATCH 0767/3452] jmol: 14.30.2 -> 14.31.0 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index f52621dd71af..45f28c93b380 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.30.2"; + version = "14.31.0"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "0f9sxhxyqrd1vvmq566v1zpzzlci37pm9j7alzak766x5dg5yyz1"; + sha256 = "14p823vxb8sfis1dgq8i9kj0rqf3cb8d0l8pspb8nz30fcvp1q7f"; }; patchPhase = '' From e8bcac75f3b71b53c0ae1226d08a5f48619bf3cb Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 10 Jun 2020 05:22:51 +0000 Subject: [PATCH 0768/3452] gore: init at 0.5.0 (#89722) --- pkgs/development/tools/gore/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/gore/default.nix diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix new file mode 100644 index 000000000000..92eeaeaeddbd --- /dev/null +++ b/pkgs/development/tools/gore/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gore"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "motemen"; + repo = pname; + rev = "v${version}"; + sha256 = "61Hn3Vs4BZtAX8WNJlUeodvEWvwLo+lXKsc8JxRwOE4="; + }; + + vendorSha256 = "3bq6sRKS5dq7WCPpKGm2q5gFajthR3zhrTFGve9zXhY="; + + meta = with stdenv.lib; { + description = "Yet another Go REPL that works nicely."; + homepage = "https://github.com/motemen/gore"; + license = licenses.mit; + maintainers = with maintainers; [ offline ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca1e95788cff..b487de74d0ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17415,6 +17415,8 @@ in gopls = callPackage ../development/tools/gopls { }; + gore = callPackage ../development/tools/gore { }; + gotests = callPackage ../development/tools/gotests { }; gotestsum = callPackage ../development/tools/gotestsum { }; From a44f91af2774f6561367745bab7c29aeabf5896e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 7 Jun 2020 10:46:26 +0200 Subject: [PATCH 0769/3452] lua packages: remove myself from some meta.maintainers It will really happen after regeneration (no need to hurry, I guess). Commit b7e6161b4 added me to cyrussasl by a mistake apparently. In knot-resolver upstream we dropped luaossl and luafilesystem from closure to ease up maintenance, so I no longer have motivation for them. --- maintainers/scripts/luarocks-packages.csv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index e34d9044f388..89a1c0bbbe09 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -12,7 +12,7 @@ compat53,,,,,vcunat cosmo,,,,,marsam coxpcall,,,1.17.0-1,, cqueues,,,,,vcunat -cyrussasl,,,,,vcunat +cyrussasl,,,,, digestif,,,,lua5_3, dkjson,,,,, fifo,,,,, @@ -50,9 +50,9 @@ luaepnf,,,,, luaevent,,,,, luaexpat,,,1.3.0-1,,arobyn flosse luaffi,,http://luarocks.org/dev,,, -luafilesystem,,,1.7.0-2,,flosse vcunat +luafilesystem,,,1.7.0-2,,flosse lualogging,,,,, -luaossl,,,,lua5_1,vcunat +luaossl,,,,lua5_1, luaposix,,,,,vyp lblasc luarepl,,,,, luasec,,,,,flosse From 4410e2c0adcb0e2594e751a29f29c5a597aa711d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 06:12:14 +0000 Subject: [PATCH 0770/3452] ktlint: 0.37.0 -> 0.37.1 --- pkgs/development/tools/ktlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 19e51fa998cf..b8a8dc75158e 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.37.0"; + version = "0.37.1"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "1z2hvhcrz1rj9g8749x640axrf529wk361pckwb4ihn43c19ajpf"; + sha256 = "0i5frcy3ya1qwq0hl67gq6fgz0c8vgskgha25irsw7j2ndf4qp8i"; }; nativeBuildInputs = [ makeWrapper ]; From 2988780eb5f31912917270ad330765761c1f66c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 7 Jun 2020 09:38:37 +0200 Subject: [PATCH 0771/3452] autogen: 5.18.12 -> 5.18.16 I re-checked that pkgsCross.aarch64-multiplatform.autogen builds. https://github.com/NixOS/nixpkgs/pull/89388#issuecomment-639155770 --- .../tools/misc/autogen/default.nix | 61 ++++++++++--------- .../misc/autogen/pkg-config-use-var.patch | 13 ---- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 33 insertions(+), 45 deletions(-) delete mode 100644 pkgs/development/tools/misc/autogen/pkg-config-use-var.patch diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 65c4f3174051..2911855e7023 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,34 +1,39 @@ -{ stdenv, buildPackages, fetchurl, which, pkgconfig, perl, guile, libxml2 }: +{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkgconfig, perl, guile, libxml2 }: stdenv.mkDerivation rec { pname = "autogen"; - version = "5.18.12"; + version = "5.18.16"; src = fetchurl { url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.xz"; - sha256 = "1n5zq4872sakvz9c7ncsdcfp0z8rsybsxvbmhkpbd19ii0pacfxy"; + sha256 = "16mlbdys8q4ckxlvxyhwkdnh1ay9f6g0cyp1kylkpalgnik398gq"; }; + patches = let + dp = { ver ? "1%255.18.16-4", pname, name ? (pname + ".diff"), sha256 }: fetchurl { + url = "https://salsa.debian.org/debian/autogen/-/raw/debian/${ver}" + + "/debian/patches/${pname}.diff?inline=false"; + inherit name sha256; + }; + in [ + (dp { + pname = "20_no_Werror"; + sha256 = "08z4s2ifiqyaacjpd9pzr59w8m4j3548kkaq1bwvp2gjn29m680x"; + }) + (dp { + pname = "30_ag_macros.m4_syntax_error"; + sha256 = "1z8vmbwbkz3505wd33i2xx91mlf8rwsa7klndq37nw821skxwyh3"; + }) + (dp { + pname = "31_allow_overriding_AGexe_for_crossbuild"; + sha256 = "0h9wkc9bqb509knh8mymi43hg6n6sxg2lixvjlchcx7z0j7p8xkf"; + }) + ]; + outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; - patches = [ - # Temporary, so builds with a prefixed pkg-config (like cross builds) work. - # - # https://savannah.gnu.org/support/?109050 was supposed to fix this, but - # the generated configure script mysteriously still contained hard-coded - # pkg-config. I tried regenerating it, but that didn't help. Only - # https://git.savannah.gnu.org/cgit/autogen.git/commit/?h=5cbe233387d7f7b36752736338d1cd4f71287daa, - # in the next release, finally fixes this, by getting rid of some - # metaprogramming of the autoconf m4 metaprogram! There evidentally was - # some sort escaping error such that the `PKG_CONFIG` check got evaluated - # before `configure` was generated. - # - # Remove this when the version is bumped - ./pkg-config-use-var.patch - ]; - nativeBuildInputs = [ - which pkgconfig perl + which pkgconfig perl autoreconfHook/*patches applied*/ ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # autogen needs a build autogen when cross-compiling buildPackages.buildPackages.autogen buildPackages.texinfo @@ -45,13 +50,7 @@ stdenv.mkDerivation rec { #"MAKEINFO=${buildPackages.texinfo}/bin/makeinfo" ]; - postPatch = '' - # Fix a broken sed expression used for detecting the minor - # version of guile we are using - sed -i "s,sed '.*-I.*',sed 's/\\\(^\\\| \\\)-I/\\\1/g',g" configure - - substituteInPlace pkg/libopts/mklibsrc.sh --replace /tmp $TMPDIR - ''; + #doCheck = true; # not reliable postInstall = '' mkdir -p $dev/bin @@ -62,9 +61,13 @@ stdenv.mkDerivation rec { sed -e "s|$bin/bin|/no-such-autogen-bin-path|" -i $f sed -e "s|$lib/lib|/no-such-autogen-lib-path|" -i $f done - ''; - #doCheck = true; # 2 tests fail because of missing /dev/tty + # remove /build/** from RPATHs + for f in "$bin"/bin/*; do + local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)/build/[^:]*:@\1@g')" + patchelf --set-rpath "$nrp" "$f" + done + ''; meta = with stdenv.lib; { description = "Automated text and program generation tool"; diff --git a/pkgs/development/tools/misc/autogen/pkg-config-use-var.patch b/pkgs/development/tools/misc/autogen/pkg-config-use-var.patch deleted file mode 100644 index 69476f62c6db..000000000000 --- a/pkgs/development/tools/misc/autogen/pkg-config-use-var.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index c3f761d1c3f..14b101f67c1 ---- a/configure -+++ b/configure -@@ -16683,7 +16683,7 @@ fi - - - -- ag_gv=`gdir=\`pkg-config --cflags-only-I \ -+ ag_gv=`gdir=\`${PKG_CONFIG} --cflags-only-I \ - guile-${GUILE_EFFECTIVE_VERSION} | \ - sed 's/\(^\| \)-I/\1/g'\` - for d in $gdir diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53ec2d0fd439..e1a25d2224de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1133,9 +1133,7 @@ in atftp = callPackage ../tools/networking/atftp { }; - autogen = callPackage ../development/tools/misc/autogen { - guile = guile_2_0; - }; + autogen = callPackage ../development/tools/misc/autogen { }; autojump = callPackage ../tools/misc/autojump { }; From c4cd635283ca68797ef4d803f298c0d8ee1e82b7 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 10 Jun 2020 09:36:00 +0300 Subject: [PATCH 0772/3452] agrep: enable on darwin --- pkgs/tools/text/agrep/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix index c285b892b925..c0816f8ab76c 100644 --- a/pkgs/tools/text/agrep/default.nix +++ b/pkgs/tools/text/agrep/default.nix @@ -21,10 +21,12 @@ stdenv.mkDerivation { install -Dm 444 docs/* -t "$out/doc" ''; - meta = { + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + + meta = with stdenv.lib; { description = "Approximate grep for fast fuzzy string searching"; homepage = "https://www.tgries.de/agrep/"; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.linux; + license = licenses.isc; + platforms = with platforms; linux ++ darwin; }; } From 02f793bd8738447facbbefebd7617fa9434504c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 06:45:14 +0000 Subject: [PATCH 0773/3452] librsvg: 2.48.4 -> 2.48.7 --- pkgs/development/libraries/librsvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index afd1df51e5be..2c68d27323ff 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -4,14 +4,14 @@ let pname = "librsvg"; - version = "2.48.4"; + version = "2.48.7"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0vlmgisf87dz4vcl1ypcw7g211wkyvhydv6ksf1p6mgdbkw3mdi8"; + sha256 = "1h7yw9bszsi174lkq8ig15p1rll7fqafx72jligxiz32wa9mvpim"; }; outputs = [ "out" "dev" "installedTests" ]; From 02751f884362234c12c90228111d0c747b3500b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 10 Jun 2020 08:53:44 +0200 Subject: [PATCH 0774/3452] Revert "systemd: avoid rebuild from the parent commit for now" This reverts commit b59847b848079ba872e18b5f0683c1bff7e924ba. --- pkgs/os-specific/linux/systemd/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 722b4db9a80a..3235fb3b95cd 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -66,9 +66,6 @@ in stdenv.mkDerivation { postPatch = '' substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" - '' - # TODO: unconditionalize on the next rebuild - + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace src/boot/efi/meson.build \ --replace \ "find_program('ld'" \ From 0ba7e1ae981b7290d8934701eb67b56effd46146 Mon Sep 17 00:00:00 2001 From: Colin <486199+c00w@users.noreply.github.com> Date: Wed, 10 Jun 2020 02:59:57 -0400 Subject: [PATCH 0775/3452] helm: Use vendor instead of redownloading modules (#89695) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- 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 2e4f68d6bfa7..5e51fe4267d4 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 = "0j25m56cwzjd9b75v7xlb26q81bsmln77k23h9n8v2f2gqwwpkrl"; + vendorSha256 = null; subPackages = [ "cmd/helm" ]; buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ]; From f6482597318278cdc4d33b703effa4636d2875c6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 4 Jun 2020 09:59:56 +0200 Subject: [PATCH 0776/3452] =?UTF-8?q?ocaml-ng.ocamlPackages=5F4=5F11.ocaml?= =?UTF-8?q?:=204.11.0+=CE=B11=20=E2=86=92=204.11.0+=CE=B12?= 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 db77d989c1df..2702a19d3187 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+alpha1"; - sha256 = "02sbwm00h2zxzyq5q90lg2a6m93zr797azshkb2qcwcf1kr7ddqg"; + patch_version = "0+alpha2"; + sha256 = "131ixp5kkgk9y42vrprhc2x0gpxhkapmdmb26pwkyl58vrbr8xqg"; } From b621677c882810df06b40177c763a9696442d936 Mon Sep 17 00:00:00 2001 From: Armin Leuprecht Date: Wed, 10 Jun 2020 07:32:33 +0000 Subject: [PATCH 0777/3452] maintains: add mir06 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 08db4549733d..9c64bf1da295 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4520,6 +4520,12 @@ github = "minijackson"; name = "Rémi Nicole"; }; + mir06 = { + email = "armin.leuprecht@uni-graz.at"; + github = "mir06"; + githubId = 8479244; + name = "Armin Leuprecht"; + }; mirdhyn = { email = "mirdhyn@gmail.com"; github = "mirdhyn"; From 5fe5be3d8690f9cb89ec34c829862572994fb216 Mon Sep 17 00:00:00 2001 From: Armin Leuprecht Date: Wed, 10 Jun 2020 07:34:26 +0000 Subject: [PATCH 0778/3452] liberfa: init at 1.7.0 --- .../development/libraries/liberfa/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/liberfa/default.nix diff --git a/pkgs/development/libraries/liberfa/default.nix b/pkgs/development/libraries/liberfa/default.nix new file mode 100644 index 000000000000..097b0b85e3e8 --- /dev/null +++ b/pkgs/development/libraries/liberfa/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "erfa"; + version = "1.7.0"; + + buildInputs = [ autoreconfHook ]; + + src = fetchFromGitHub { + owner = "liberfa"; + repo = "erfa"; + rev = "v${version}"; + sha256 = "1z4k2phrw6wwi0kax6ac80jk9c036gi7pmhmg6gaf3lk81k6xz2r"; + }; + + configureFlags = [ "--enable-shared" ]; + + meta = with stdenv.lib; { + description = "Essential Routines for Fundamental Astronomy"; + homepage = "https://github.com/liberfa/erfa"; + maintainers = with maintainers; [ mir06 ]; + license = { + url = "https://github.com/liberfa/erfa/blob/master/LICENSE"; + free = true; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d71a039199cb..0c72c8daa8ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4670,6 +4670,8 @@ in libepc = callPackage ../development/libraries/libepc { }; + liberfa = callPackage ../development/libraries/liberfa { }; + libestr = callPackage ../development/libraries/libestr { }; libevdev = callPackage ../development/libraries/libevdev { }; From 10acf9ae002563b1bc6519eb50a4d65c6c684e98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 8 Jun 2020 16:09:13 +0100 Subject: [PATCH 0779/3452] nixos/redis: add redis group --- nixos/modules/services/databases/redis.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 799c3db62166..f1777854e141 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -218,6 +218,7 @@ in description = "Redis database user"; isSystemUser = true; }; + users.groups.redis = {}; environment.systemPackages = [ cfg.package ]; @@ -240,6 +241,7 @@ in StateDirectory = "redis"; Type = "notify"; User = "redis"; + Group = "redis"; }; }; }; From ffa51372780ef12c5b198a9124841cf8c200d0f2 Mon Sep 17 00:00:00 2001 From: Geoffrey Huntley Date: Wed, 10 Jun 2020 18:16:31 +1000 Subject: [PATCH 0780/3452] docs: increase awareness of NIXPKGS_ALLOW_INSECURE=1 https://github.com/NixOS/nixpkgs/blob/496bc90c6c9b54e8200a069862e3c4fad21f9f58/doc/using/configuration.xml#L190 --- pkgs/stdenv/generic/check-meta.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 21ae809a2225..c6c5be39d09b 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -107,8 +107,13 @@ let You can install it anyway by whitelisting this package, using the following methods: + + a) To temporarily allow all insecure packages, you can use an environment variable + for a single invocation of the nix tools: + + $ export NIXPKGS_ALLOW_INSECURE=1 - a) for `nixos-rebuild` you can add ‘${getName attrs}’ to + b) for `nixos-rebuild` you can add ‘${getName attrs}’ to `nixpkgs.config.permittedInsecurePackages` in the configuration.nix, like so: @@ -118,7 +123,7 @@ let ]; } - b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add + c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add ‘${getName attrs}’ to `permittedInsecurePackages` in ~/.config/nixpkgs/config.nix, like so: From af4491f26c7b03e9952ebb697dc4fdfebb1dfa95 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 10 Jun 2020 10:48:29 +0200 Subject: [PATCH 0781/3452] slurm: 19.05.5.1 -> 19.05.7.1 --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 1554fb69f196..cd0d67ecfed6 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "19.05.5.1"; + version = "19.05.7.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "0f0gv3sirp6sxdrbwydsbcqicjbmrpm58yhgbsar8v6nx3g6y3hx"; + sha256 = "115f40k8y7d569nbl6g0mkyshgv925lawlwar7ib5296g30p97f0"; }; outputs = [ "out" "dev" ]; From 83e6b6d906e85d61d3f6f24c431830d29efb062b Mon Sep 17 00:00:00 2001 From: misuzu Date: Wed, 10 Jun 2020 12:09:22 +0300 Subject: [PATCH 0782/3452] python3Packages.python-engineio: build on macOS --- pkgs/development/python-modules/python-engineio/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 128fb8961d4d..cb3fe1a9f38d 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -47,7 +47,6 @@ buildPythonPackage rec { description = "Engine.IO server"; homepage = "https://github.com/miguelgrinberg/python-engineio/"; license = licenses.mit; - platforms = platforms.linux; maintainers = [ maintainers.mic92 ]; }; } From 8b2d735d1a04ad7bac167433fbad6d010a76944d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 10 Jun 2020 04:20:00 -0500 Subject: [PATCH 0783/3452] nss: fix build on darwin --- pkgs/development/libraries/nss/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 5251c680361a..622d11c31605 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -66,6 +66,7 @@ in stdenv.mkDerivation rec { "USE_SYSTEM_ZLIB=1" "NSS_USE_SYSTEM_SQLITE=1" "NATIVE_CC=${buildPackages.stdenv.cc}/bin/cc" + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ # Pass in CPU even if we're not cross compiling, because otherwise it tries to guess with # uname, which can be wrong if e.g. we're compiling for aarch32 on aarch64 "OS_TEST=${cpu}" From e466ea721c460e5c0591a2ab3fbb671267ba3726 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 8 Jun 2020 13:54:31 +0200 Subject: [PATCH 0784/3452] chromium{Beta,Dev}: Fix the builds Fix #89615. --- .../applications/networking/browsers/chromium/common.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 6e3c0ee65e7a..ffd0f018f87c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -13,6 +13,7 @@ , bison, gperf , glib, gtk3, dbus-glib , glibc +, xorg , libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups , ffmpeg, libxslt, libxml2, at-spi2-core @@ -123,7 +124,8 @@ let ninja which python2Packages.python perl pkgconfig python2Packages.ply python2Packages.jinja2 nodejs gnutar - ] ++ optional (versionAtLeast version "83") python2Packages.setuptools; + ] ++ optional (versionAtLeast version "83") python2Packages.setuptools + ++ optional (versionAtLeast version "84") (xorg.xcbproto.override { python = python2Packages.python; }); buildInputs = defaultDependencies ++ [ nspr nss systemd @@ -224,6 +226,11 @@ let ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++ ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar + '' + optionalString (versionAtLeast version "84") '' + substituteInPlace ui/gfx/x/BUILD.gn \ + --replace \ + '/usr/share/xcb' \ + '${xorg.xcbproto}/share/xcb/' ''; gnFlags = mkGnFlags (optionalAttrs (versionRange "0" "84") { From df7e52814d8d578a948e8e7b15404e982971e5d1 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 14 May 2020 20:29:59 +0300 Subject: [PATCH 0785/3452] nixos/mysql: enable sandbox mode --- nixos/doc/manual/release-notes/rl-2009.xml | 16 ++++++++++ nixos/modules/services/databases/mysql.nix | 35 ++++++++++++++++++---- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 8bf9c16e6f8a..a7bf189c417c 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -89,6 +89,22 @@ services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' When MariaDB data directory is just upgraded (not initialized), the users are not created or modified. + + + MySQL server is now started with additional systemd sandbox/hardening options for better security. The PrivateTmp, ProtectHome, and ProtectSystem options + may be problematic when MySQL is attempting to read from or write to your filesystem anywhere outside of its own state directory, for example when + calling LOAD DATA INFILE or SELECT * INTO OUTFILE. In this scenario a variant of the following may be required: + - allow MySQL to read from /home and /tmp directories when using LOAD DATA INFILE + +systemd.services.mysql.serviceConfig.ProtectHome = lib.mkForce "read-only"; + + - allow MySQL to write to custom folder /var/data when using SELECT * INTO OUTFILE, assuming the mysql user has write + access to /var/data + +systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ]; + + + diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 51885881cf73..0052094697b2 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -367,11 +367,7 @@ in ''; serviceConfig = { - User = cfg.user; - Group = "mysql"; Type = if hasNotify then "notify" else "simple"; - RuntimeDirectory = "mysqld"; - RuntimeDirectoryMode = "0755"; Restart = "on-abort"; RestartSec = "5s"; # The last two environment variables are used for starting Galera clusters @@ -452,7 +448,7 @@ in cat ${toString cfg.initialScript} | ${mysql}/bin/mysql -u root -N ''} - rm /tmp/mysql_init + rm ${cfg.dataDir}/mysql_init fi ${optionalString (cfg.ensureDatabases != []) '' @@ -476,6 +472,35 @@ in # ensureDatbases & ensureUsers depends on this script being run as root # when the user has secured their mysql install "+${setupScript}"; + # User and group + User = cfg.user; + Group = "mysql"; + # Runtime directory and mode + RuntimeDirectory = "mysqld"; + RuntimeDirectoryMode = "0755"; + # Access write directories + ReadWritePaths = [ cfg.dataDir ]; + # Capabilities + CapabilityBoundingSet = ""; + # Security + NoNewPrivileges = true; + # Sandboxing + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectHostname = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + PrivateMounts = true; + # System Call Filtering + SystemCallArchitectures = "native"; }; }; From a9d5f088b56c80e32ae7cdaaa4391b19e82fe6fc Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 14 May 2020 20:32:19 +0300 Subject: [PATCH 0786/3452] nixos/mysql: update tmpfiles rules --- nixos/modules/services/databases/mysql.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 0052094697b2..1caedf1fc5fb 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -334,7 +334,8 @@ in environment.etc."my.cnf".source = cfg.configFile; systemd.tmpfiles.rules = [ - "d '${cfg.dataDir}' 0700 ${cfg.user} mysql -" + "d '${cfg.dataDir}' 0700 ${cfg.user} mysql - -" + "z '${cfg.dataDir}' 0700 ${cfg.user} mysql - -" ]; systemd.services.mysql = let From eed170d9ab643424d0771b6b4fea771e138e901b Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 14 May 2020 20:34:14 +0300 Subject: [PATCH 0787/3452] nixos/mysql: fix init databases on first start in sandbox mode --- nixos/modules/services/databases/mysql.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 1caedf1fc5fb..2e8c5b7640b2 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -358,12 +358,12 @@ in preStart = if isMariaDB then '' if ! test -e ${cfg.dataDir}/mysql; then ${mysql}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${mysqldOptions} - touch /tmp/mysql_init + touch ${cfg.dataDir}/mysql_init fi '' else '' if ! test -e ${cfg.dataDir}/mysql; then ${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} --initialize-insecure - touch /tmp/mysql_init + touch ${cfg.dataDir}/mysql_init fi ''; @@ -395,7 +395,7 @@ in done ''} - if [ -f /tmp/mysql_init ] + if [ -f ${cfg.dataDir}/mysql_init ] then ${concatMapStrings (database: '' # Create initial databases From 4a1ef63c55a6dca0a06547c7738369c690ba6032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 9 Jun 2020 22:27:05 -0300 Subject: [PATCH 0788/3452] buildenv: paths to link resolving to the same absolute path is not a conflict When building an environment if two paths conflict but one or both are symbolic links and they resolve to the same real path, the conflict is discarded because the contents of both paths are the same. One of them is chosen and there is no need to recur into them in order to build deeper symbolic links. --- pkgs/build-support/buildenv/builder.pl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index fc6ffce735cc..411b147cc58e 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -129,6 +129,15 @@ sub findFiles { return; } + # If target already exists and both targets resolves to the same path, skip + if (defined $oldTarget && $oldTarget ne "" && abs_path($target) eq abs_path($oldTarget)) { + # Prefer the target that is not a symlink, if any + if (-l $oldTarget && ! -l $target) { + $symlinks{$relName} = [$target, $priority]; + } + return; + } + # If target already exists as a symlink to a file (not a # directory) in a higher-priority package, skip. if (defined $oldTarget && $priority > $oldPriority && $oldTarget ne "" && ! -d $oldTarget) { From 207f5f36f1faf5b8d09a2242c4ab3ba6d4f1d24e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 10:10:51 +0000 Subject: [PATCH 0789/3452] libosinfo: 1.7.1 -> 1.8.0 --- pkgs/development/libraries/libosinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 39a3bf6b2c55..6e7512535949 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "libosinfo"; - version = "1.7.1"; + version = "1.8.0"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1s97sv24bybggjx6hgqba2qdqz3ivfpd4cmkh4zm5y59sim109mv"; + sha256 = "1988l5rykpzvml1l7bi2hcax0gdc811vja0f92cnr7r01nz35zs9"; }; outputs = [ "out" "dev" "devdoc" ]; From 37eba9055b245cb1281cf376d2a850df3524001f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 10:31:35 +0000 Subject: [PATCH 0790/3452] libcloudproviders: 0.3.0 -> 0.3.1 --- pkgs/development/libraries/libcloudproviders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix index f48ee9e5df06..87c86ea2fbea 100644 --- a/pkgs/development/libraries/libcloudproviders/default.nix +++ b/pkgs/development/libraries/libcloudproviders/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libcloudproviders"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { url = "https://gitlab.gnome.org/World/${pname}/repository/archive.tar.gz?ref=${version}"; - sha256 = "1hby7vhxn6fw4ih3xbx6ab9vqp3a3dmlhr0z7mrwr73b7ankly0l"; + sha256 = "0zazjhj3xbwxyzi2b2aws7qdnwn092zg9yrk9v3wd19m3mxq5na3"; }; outputs = [ "out" "dev" "devdoc" ]; From 5d8f61f3bfb8f93751c1e455f51393f10d507e0f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 10 Jun 2020 10:55:05 +0200 Subject: [PATCH 0791/3452] slurm: bugifx, add su/echo paths slurmd requires su and echo to work with "--get-user-env". If slurmd does not find /bin/su or /bin/echo, it crashes. --- pkgs/servers/computing/slurm/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index cd0d67ecfed6..9e610579d739 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl -, python, munge, perl, pam, openssl, zlib +, python, munge, perl, pam, openssl, zlib, shadow, coreutils , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , readline, freeipmi, libssh2, xorg, lz4, rdma-core # enable internal X11 support via libssh2 @@ -22,10 +22,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - prePatch = stdenv.lib.optional enableX11 '' + prePatch = '' + substituteInPlace src/common/env.c \ + --replace "/bin/echo" "${coreutils}/bin/echo" + '' + (stdenv.lib.optionalString enableX11 '' substituteInPlace src/common/x11_util.c \ --replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"' - ''; + ''); # nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode' # https://groups.google.com/forum/#!topic/slurm-devel/QHOajQ84_Es @@ -36,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl python munge perl pam openssl zlib libmysqlclient ncurses gtk2 lz4 rdma-core - lua hwloc numactl readline freeipmi + lua hwloc numactl readline freeipmi shadow.su ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; configureFlags = with stdenv.lib; From b981b77c2c2b0a1c7e47e390e2838fc2e1999147 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 10 Jun 2020 12:45:51 +0200 Subject: [PATCH 0792/3452] pipewire: 0.3.5 -> 0.3.6 should fix bad v0 clients, such as google-chrome-stable etc: https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/014e48c1f1c47404653f597e500314cbf021056d --- pkgs/development/libraries/pipewire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index a6599bd8a35b..0b8759053eec 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -32,7 +32,7 @@ let in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.5"; + version = "0.3.6"; outputs = [ "out" "lib" "dev" "doc" ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "1x0rsq68vsl39bps2g397pa097q37mdjh595bjf7rd2lm9yf21ws"; + sha256 = "0g149vyaigf4gzm764fcgxxci9niw19z0af9afs4diwq5xzr1qd3"; }; nativeBuildInputs = [ From 9dd9bc7bcc2a54f7dc0cb23cef701439dfb9d0ca Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 26 May 2020 14:09:20 +0200 Subject: [PATCH 0793/3452] linux: fix kernel config options Some of the options didn't have correct kernel version constraints, others had been removed or made optional unnecessarily in #84032. --- .../linux/kernel/common-config.nix | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d239455ad344..59056ef338cf 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -63,7 +63,7 @@ let PM_WAKELOCKS = yes; # Power-capping framework and support for INTEL RAPL POWERCAP = yes; - INTEL_RAPL = module; + INTEL_RAPL = whenAtLeast "5.3" module; }; external-firmware = { @@ -120,7 +120,7 @@ let HAVE_EBPF_JIT = whenPlatformHasEBPFJit yes; BPF_STREAM_PARSER = whenAtLeast "4.19" yes; XDP_SOCKETS = whenAtLeast "4.19" yes; - XDP_SOCKETS_DIAG = whenAtLeast "4.19" yes; + XDP_SOCKETS_DIAG = whenAtLeast "5.1" yes; WAN = yes; TCP_CONG_CUBIC = yes; # This is the default congestion control algorithm since 2.6.19 # Required by systemd per-cgroup firewalling @@ -167,13 +167,18 @@ let NF_CONNTRACK_TIMEOUT = yes; NF_CONNTRACK_TIMESTAMP = yes; NETFILTER_NETLINK_GLUE_CT = yes; - NF_TABLES_INET = whenAtLeast "4.19" yes; - NF_TABLES_NETDEV = whenAtLeast "4.19" yes; + NF_TABLES_INET = mkMerge [ (whenOlder "4.17" module) + (whenAtLeast "4.17" yes) ]; + NF_TABLES_NETDEV = mkMerge [ (whenOlder "4.17" module) + (whenAtLeast "4.17" yes) ]; # IP: Netfilter Configuration - NF_TABLES_IPV4 = yes; - NF_TABLES_ARP = whenAtLeast "4.19" yes; + NF_TABLES_IPV4 = mkMerge [ (whenOlder "4.17" module) + (whenAtLeast "4.17" yes) ]; + NF_TABLES_ARP = mkMerge [ (whenOlder "4.17" module) + (whenAtLeast "4.17" yes) ]; # IPv6: Netfilter Configuration - NF_TABLES_IPV6 = yes; + NF_TABLES_IPV6 = mkMerge [ (whenOlder "4.17" module) + (whenAtLeast "4.17" yes) ]; # Bridge Netfilter Configuration NF_TABLES_BRIDGE = mkMerge [ (whenBetween "4.19" "5.3" yes) (whenAtLeast "5.3" module) ]; @@ -183,7 +188,8 @@ let NET_DROP_MONITOR = yes; # needed for ss - INET_DIAG = yes; + INET_DIAG = module; + INET_TCP_DIAG = module; INET_UDP_DIAG = module; INET_RAW_DIAG = whenAtLeast "4.14" module; INET_DIAG_DESTROY = whenAtLeast "4.9" yes; @@ -364,7 +370,7 @@ let CIFS_STATS = whenOlder "4.19" yes; CIFS_WEAK_PW_HASH = yes; CIFS_UPCALL = yes; - CIFS_ACL = option yes; + CIFS_ACL = whenOlder "5.3" yes; CIFS_DFS_UPCALL = yes; CIFS_SMB2 = whenOlder "4.13" yes; @@ -395,7 +401,7 @@ let DEBUG_SET_MODULE_RONX = { optional = true; tristate = whenOlder "4.11" "y"; }; RANDOMIZE_BASE = option yes; STRICT_DEVMEM = option yes; # Filter access to /dev/mem - SECURITY_SELINUX_BOOTPARAM_VALUE = option (freeform "0"); # Disable SELinux by default + SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default # Prevent processes from ptracing non-children processes SECURITY_YAMA = option yes; DEVKMEM = mkIf (!features.grsecurity) no; # Disable /dev/kmem @@ -707,8 +713,9 @@ let KEXEC_FILE = option yes; KEXEC_JUMP = option yes; + PARTITION_ADVANCED = yes; # Needed for LDM_PARTITION # Windows Logical Disk Manager (Dynamic Disk) support - LDM_PARTITION = option yes; + LDM_PARTITION = yes; LOGIRUMBLEPAD2_FF = yes; # Logitech Rumblepad 2 force feedback LOGO = no; # not needed MEDIA_ATTACH = yes; @@ -793,7 +800,7 @@ let SUN8I_DE2_CCU = whenAtLeast "4.13" yes; # See comments on https://github.com/NixOS/nixpkgs/commit/9b67ea9106102d882f53d62890468071900b9647 - CRYPTO_AEGIS128_SIMD = no; + CRYPTO_AEGIS128_SIMD = whenAtLeast "5.4" no; }; }; in From 77d18851b98c7e5edef470a5683a81c9b2232f12 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 11:18:28 +0000 Subject: [PATCH 0794/3452] metabase: 0.35.3 -> 0.35.4 --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 5d50f8c9b0c8..a85e6bbf71ea 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.35.3"; + version = "0.35.4"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1iax99id47a8mkdyr5wp2dwvl0d1lfh9gsamd1m0qpxw9mbvpkbq"; + sha256 = "1mggrkd4ih8fak4nk3a8z5677nblvihjvkvgmix080cps44bcfd8"; }; nativeBuildInputs = [ makeWrapper ]; From 46d0ce45dd6ba0e3ba54daa9a146e70bac53ef7e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 11:40:15 +0000 Subject: [PATCH 0795/3452] lyx: 2.3.4.3 -> 2.3.5.1 --- pkgs/applications/misc/lyx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index b96e6b2a02d5..4f6b73d592c2 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: mkDerivation rec { - version = "2.3.4.3"; + version = "2.3.5.1"; pname = "lyx"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz"; - sha256 = "1rpp6wq0dc0bxwc0pipajv98vi7cpg391nq10d3c4pmpq38m08wx"; + sha256 = "0mv32s26igm0pd8vs7d2mk1240dpr83y0a2wyh3xz6b67ph0w157"; }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs From 57012daff98b0701dc4a6b2c232a8f088fd421c1 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Mon, 8 Jun 2020 14:25:16 +0200 Subject: [PATCH 0796/3452] 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 0f890be4049e4097422a74d66b4276794a29e4f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 12:01:26 +0000 Subject: [PATCH 0797/3452] marvin: 20.12.0 -> 20.13.0 --- pkgs/applications/science/chemistry/marvin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 1a22544c270a..c090fbee377b 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.12.0"; + version = "20.13.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "1imfr56nbq2mbcyapwa8xmcmj5rjhbjz9r438387s73kd1avd6yl"; + sha256 = "1mbbl7z215l6z4acwdrmqnvlvc2hv4znz4dmng9iw7rrqns3jjlv"; }; nativeBuildInputs = [ dpkg makeWrapper ]; From c494fc51dc44a192d07aec9c67e4a44eca11160a Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Wed, 13 May 2020 20:43:02 +0100 Subject: [PATCH 0798/3452] python2Packages.nixpart0/cryptsetup: patch for glibc >= 2.28 --- pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix | 11 ++++++++++- pkgs/tools/filesystems/nixpart/0.4/default.nix | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index 3feed2388809..88a1716a0e1e 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lvm2, libgcrypt, libuuid, pkgconfig, popt +{ stdenv, fetchurl, fetchpatch, lvm2, libgcrypt, libuuid, pkgconfig, popt , enablePython ? true, python ? null }: @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { sha256 = "1n1qk5chyjspbiianrdb55fhb4wl0vfyqz2br05vfb24v4qlgbx2"; }; + patches = [ + # Fix build with glibc >= 2.28 + # https://github.com/NixOS/nixpkgs/issues/86403 + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/cryptsetup/files/cryptsetup-1.7.1-sysmacros.patch?id=d72316f97ebcc7fe622b21574442a9ac59b9115f"; + sha256 = "0xbhazgl44bimqhcrhajk016w9wi7bkrgwyfq13xmrvyrllqvgdx"; + }) + ]; + configureFlags = [ "--enable-cryptsetup-reencrypt" ] ++ stdenv.lib.optional enablePython "--enable-python"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 5d7a9dd14ec0..68122eaaf08e 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -18,7 +18,7 @@ let cryptsetup = import ./cryptsetup.nix { inherit stdenv fetchurl python; - inherit (pkgs) pkgconfig libgcrypt libuuid popt lvm2; + inherit (pkgs) fetchpatch pkgconfig libgcrypt libuuid popt lvm2; }; dmraid = import ./dmraid.nix { From 0776d9043c6a7335db46f2fde96ef9a08387ef7c Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Wed, 13 May 2020 20:45:10 +0100 Subject: [PATCH 0799/3452] python2Packages.nixpart0/lvm2: patch for glibc >= 2.28 --- pkgs/tools/filesystems/nixpart/0.4/default.nix | 2 +- pkgs/tools/filesystems/nixpart/0.4/lvm2.nix | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 68122eaaf08e..ce1b4455117d 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -27,7 +27,7 @@ let lvm2 = import ./lvm2.nix { inherit stdenv fetchurl; - inherit (pkgs) pkgconfig utillinux systemd coreutils; + inherit (pkgs) fetchpatch pkgconfig utillinux systemd coreutils; }; multipath_tools = import ./multipath-tools.nix { diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index c8c748b4c45f..fc0005a14d45 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, utillinux, coreutils }: let v = "2.02.106"; @@ -12,6 +12,18 @@ stdenv.mkDerivation { sha256 = "0nr833bl0q4zq52drjxmmpf7bs6kqxwa5kahwwxm9411khkxz0vc"; }; + patches = [ + # Fix build with glibc >= 2.28 + # https://github.com/NixOS/nixpkgs/issues/86403 + (fetchpatch { + url = "https://github.com/lvmteam/lvm2/commit/92d5a8441007f578e000b492cecf67d6b8a87405.patch"; + sha256 = "1yqd6jng0b370k53vks1shg57yhfyribhpmv19km5zsjqf0qqx2d"; + excludes = [ + "libdm/libdm-stats.c" + ]; + }) + ]; + configureFlags = [ "--disable-readline" "--enable-udev_rules" From eb696ef672716567c8e1c22675ac4b53352e8dfb Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Wed, 13 May 2020 20:45:58 +0100 Subject: [PATCH 0800/3452] python2Packages.nixpart0/multipath_tools: patch for glibc >= 2.28 --- pkgs/tools/filesystems/nixpart/0.4/default.nix | 2 +- .../filesystems/nixpart/0.4/multipath-tools.nix | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index ce1b4455117d..6512c21a8610 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -32,7 +32,7 @@ let multipath_tools = import ./multipath-tools.nix { inherit stdenv fetchurl lvm2; - inherit (pkgs) readline systemd libaio gzip; + inherit (pkgs) fetchpatch readline systemd libaio gzip; }; parted = import ./parted.nix { diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index b3b18579334f..14f179386cfa 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -1,6 +1,6 @@ # FIXME: unify with pkgs/os-specific/linux/multipath-tools/default.nix. -{ stdenv, fetchurl, lvm2, libaio, gzip, readline, systemd }: +{ stdenv, fetchurl, fetchpatch, lvm2, libaio, gzip, readline, systemd }: stdenv.mkDerivation rec { name = "multipath-tools-0.4.9"; @@ -10,6 +10,18 @@ stdenv.mkDerivation rec { sha256 = "04n7kazp1zrlqfza32phmqla0xkcq4zwn176qff5ida4a60whi4d"; }; + patches = [ + # Fix build with glibc >= 2.28 + # https://github.com/NixOS/nixpkgs/issues/86403 + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch?id=eb22b954c177b5c1e2b6ed5c7cdd02f40f40d757"; + sha256 = "1an0cgmz7g03c4qjimhpm9fcf2iswws18lwqxi688k87qm3xb5qd"; + excludes = [ + "libmultipath/util.c" + ]; + }) + ]; + sourceRoot = "."; buildInputs = [ lvm2 libaio readline gzip ]; From 64f4073f8d068fe0f226287c2c1045e08e3e7333 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Wed, 13 May 2020 20:46:16 +0100 Subject: [PATCH 0801/3452] python2Packages.nixpart0/parted: patch for glibc >= 2.28 --- pkgs/tools/filesystems/nixpart/0.4/default.nix | 2 +- pkgs/tools/filesystems/nixpart/0.4/parted.nix | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix index 6512c21a8610..1f672701d382 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/default.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -37,7 +37,7 @@ let parted = import ./parted.nix { inherit stdenv fetchurl; - inherit (pkgs) utillinux readline libuuid gettext check lvm2; + inherit (pkgs) fetchpatch utillinux readline libuuid gettext check lvm2; }; pyblock = import ./pyblock.nix { diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index 2a0ffe326dcb..16f3a57ea147 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lvm2, libuuid, gettext, readline +{ stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline , utillinux, check, enableStatic ? false }: stdenv.mkDerivation rec { @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y"; }; + patches = [ + # Fix build with glibc >= 2.28 + # https://github.com/NixOS/nixpkgs/issues/86403 + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-block/parted/files/parted-3.2-sysmacros.patch?id=8e2414f551c14166f259f9a25a594aec7a5b9ea0"; + sha256 = "0fdgifjbri7n28hv74zksac05gw72p2czzvyar0jp62b9dnql3mp"; + }) + ]; + buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext From 912e1e87c0509d6f75acb33a9c21423eb6bffba6 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Wed, 13 May 2020 21:37:22 +0100 Subject: [PATCH 0802/3452] python2Packages.nixpart0/pyblock: patch for glibc >= 2.28 --- .../nixpart/0.4/pyblock-sysmacros.h.patch | 12 ++++++++++++ pkgs/tools/filesystems/nixpart/0.4/pyblock.nix | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/tools/filesystems/nixpart/0.4/pyblock-sysmacros.h.patch diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock-sysmacros.h.patch b/pkgs/tools/filesystems/nixpart/0.4/pyblock-sysmacros.h.patch new file mode 100644 index 000000000000..b8ab7bd53b2b --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock-sysmacros.h.patch @@ -0,0 +1,12 @@ +diff --git a/dm.c b/dm.c +index 5daa0e5..d5b84c8 100644 +--- a/dm.c ++++ b/dm.c +@@ -19,6 +19,7 @@ + #define _GNU_SOURCE + #include + #include ++#include + #include + #include + #include diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix index 2abab9057376..f087edd853d7 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; }; + patches = [ + # Fix build with glibc >= 2.28 + # https://github.com/NixOS/nixpkgs/issues/86403 + ./pyblock-sysmacros.h.patch + ]; + postPatch = '' sed -i -e 's|/usr/include/python|${python}/include/python|' \ -e 's/-Werror *//' -e 's|/usr/|'"$out"'/|' Makefile From 05f1bcce4949fe2a6fc9472051f39a002cbab133 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 14 May 2020 22:04:18 +0100 Subject: [PATCH 0803/3452] python2Packages.nixpart0/multipath_tools: fixup path to internal libraries --- pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index 14f179386cfa..ffed57e6345e 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -38,6 +38,11 @@ stdenv.mkDerivation rec { substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${systemd.lib}/lib/udev/scsi_id substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${systemd.lib}/lib/udev/scsi_id + + sed -i -re ' + s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", + ' libmultipath/defaults.h + ''; meta = { From bbe71613b6e656e707acdf9c279736c900bf4e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 10 Jun 2020 14:07:15 +0200 Subject: [PATCH 0804/3452] linux: fix kernel config options for 5.7 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 59056ef338cf..06ed2cf15598 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -274,7 +274,7 @@ let SND_SOC_SOF_ELKHARTLAKE_SUPPORT = yes; SND_SOC_SOF_GEMINILAKE_SUPPORT = yes; SND_SOC_SOF_HDA_AUDIO_CODEC = yes; - SND_SOC_SOF_HDA_COMMON_HDMI_CODEC = yes; + SND_SOC_SOF_HDA_COMMON_HDMI_CODEC = whenOlder "5.7" yes; SND_SOC_SOF_HDA_LINK = yes; SND_SOC_SOF_ICELAKE_SUPPORT = yes; SND_SOC_SOF_INTEL_TOPLEVEL = yes; From 59ceaf7e33935313f0ae33400e69a24f6285fab0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 12:16:00 +0000 Subject: [PATCH 0805/3452] mkvtoolnix: 46.0.0 -> 47.0.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 87b4a5418cef..68f3cac1bfac 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "46.0.0"; + version = "47.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "1vyfvpsllnzhzaaz3s9lqlnkmnqchyhxj2d47bfyizs982r5kg24"; + sha256 = "1s8y9khyfjg06mr7rmm26pk0b3nbkcrs56r29a9l57wbkqyl7qp9"; }; nativeBuildInputs = [ From a28ef69cb20746a9a7cd1c2880227c8fb822a718 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 12:30:50 +0000 Subject: [PATCH 0806/3452] matterbridge: 1.17.1 -> 1.17.5 --- pkgs/servers/matterbridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 7f1868af4c35..ee58671a8549 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "matterbridge"; - version = "1.17.1"; + version = "1.17.5"; goPackagePath = "github.com/42wim/matterbridge"; vendorSha256 = null; src = fetchurl { url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz"; - sha256 = "0xf0s1bvlzqnxz2kvqx1h9gmgqxdlf34s27s3zradi8fwd8hriv6"; + sha256 = "1p89ik5zr1qq1abd9k1xfa4j62b11zdnl2gm52y0s5yx8slap4w0"; }; meta = with stdenv.lib; { From 97c6e005ac67aa7b9867267d076af1afa310e6dc Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 10 Jun 2020 14:37:20 +0200 Subject: [PATCH 0807/3452] slurm: add passthru.tests --- pkgs/servers/computing/slurm/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 9e610579d739..1f09c98377f1 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl , python, munge, perl, pam, openssl, zlib, shadow, coreutils , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl -, readline, freeipmi, libssh2, xorg, lz4, rdma-core +, readline, freeipmi, libssh2, xorg, lz4, rdma-core, nixosTests # enable internal X11 support via libssh2 , enableX11 ? true }: @@ -67,6 +67,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests.slurm = nixosTests.slurm; + meta = with stdenv.lib; { homepage = "http://www.schedmd.com/"; description = "Simple Linux Utility for Resource Management"; From a3698d9f36b4135143fd61dcd04c09823d2c2fcc Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 10 Jun 2020 00:03:19 +0200 Subject: [PATCH 0808/3452] execline: 2.6.0.0 -> 2.6.1.0 Hello, execline-2.6.1.0 is out. This version features a more expressive format for the envfile binary. Most of the files that are suitable for a systemd EnvironmentFile= directive are now parsable with envfile: double quotes are supported, backslashed newlines are supported, a few C escape sequences are supported (including octal and hexadecimal). So it is now possible to read most existing /etc/default configuration files without spawning a shell. Additionally, envfile now comes with a -I option that makes it ignore a nonexistent file, instead of failing. git://git.skarnet.org/execline https://skarnet.org/software/execline/ Enjoy, Bug-reports welcome. --- pkgs/tools/misc/execline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index d3a6990a1f83..ecedd2b0b417 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -7,8 +7,8 @@ with skawarePackages; buildPackage { pname = "execline"; - version = "2.6.0.0"; - sha256 = "1m6pvawxqaqjr49456vyjyl8dnqwvr19v77sjj7dnglfijwza5al"; + version = "2.6.1.0"; + sha256 = "0mj565xml3hvw27finydms0s9abbbpgbr29vnr8gwi7zjzq7ck52"; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; From a421af29e46854fd1327585e269e60d510300024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 10 Jun 2020 10:08:36 -0300 Subject: [PATCH 0809/3452] nixos/opensmtpd: add a setgid wrapper for smtpctl (#89962) The setgid is currently required for offline enqueuing, and unfortunately smtpctl is currently not split from sendmail so there's little running around it. --- nixos/modules/services/mail/opensmtpd.nix | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index 1fabe2da45c5..c838d3b949db 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -17,6 +17,10 @@ in { ###### interface + imports = [ + (mkRenamedOptionModule [ "services" "opensmtpd" "addSendmailToSystemPath" ] [ "services" "opensmtpd" "setSendmail" ]) + ]; + options = { services.opensmtpd = { @@ -34,13 +38,10 @@ in { description = "The OpenSMTPD package to use."; }; - addSendmailToSystemPath = mkOption { + setSendmail = mkOption { type = types.bool; default = true; - description = '' - Whether to add OpenSMTPD's sendmail binary to the - system path or not. - ''; + description = "Whether to set the system sendmail to OpenSMTPD's."; }; extraServerArgs = mkOption { @@ -82,7 +83,7 @@ in { ###### implementation - config = mkIf cfg.enable { + config = mkIf cfg.enable rec { users.groups = { smtpd.gid = config.ids.gids.smtpd; smtpq.gid = config.ids.gids.smtpq; @@ -101,6 +102,14 @@ in { }; }; + security.wrappers.smtpctl = { + group = "smtpq"; + setgid = true; + source = "${cfg.package}/bin/smtpctl"; + }; + + services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail security.wrappers.smtpctl; + systemd.tmpfiles.rules = [ "d /var/spool/smtpd 711 root - - -" "d /var/spool/smtpd/offline 770 root smtpq - -" @@ -119,7 +128,5 @@ in { serviceConfig.ExecStart = "${cfg.package}/sbin/smtpd -d -f ${conf} ${args}"; environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd"; }; - - environment.systemPackages = mkIf cfg.addSendmailToSystemPath [ sendmail ]; }; } From 1e0f101947bb097a8c46bf3a1667ad7d3f6b89c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 13:13:29 +0000 Subject: [PATCH 0810/3452] mm-common: 1.0.0 -> 1.0.1 --- pkgs/development/libraries/mm-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index 890ab6fca11c..3c02e537d2a3 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "mm-common"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1m4w33da9f4rx2d6kdj3ix3kl0gn16ml82v2mdn4hljr3q29nzdr"; + sha256 = "1jasx9a9g7nqf7jcv3mrg4qh5cp9sq724jxjaz4wa1dzmxsxg8i8"; }; nativeBuildInputs = [ From dc318b393feb004890c18a6683fe66af25a54ad2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 10 Jun 2020 15:19:13 +0200 Subject: [PATCH 0811/3452] networkmanager-fortisslvpn: clean up * format with nixpkgs-fmt * reorder the expression * move pname into the main attrset * use pkg-config instead of pkgconfig alias --- .../network-manager/fortisslvpn/default.nix | 50 ++++++++++++++----- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index 0ce50a3b2d4b..c0bb2a4276b5 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -1,10 +1,23 @@ -{ stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, file, gtk3, -networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch, libnma }: +{ stdenv +, fetchurl +, substituteAll +, openfortivpn +, intltool +, pkg-config +, file +, gtk3 +, networkmanager +, ppp +, libsecret +, withGnome ? true +, gnome3 +, fetchpatch +, libnma +}: -let +stdenv.mkDerivation rec { pname = "NetworkManager-fortisslvpn"; version = "1.2.10"; -in stdenv.mkDerivation { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { @@ -17,6 +30,7 @@ in stdenv.mkDerivation { src = ./fix-paths.patch; inherit openfortivpn; }) + # Don't use etc/dbus-1/system.d (fetchpatch { url = "https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/merge_requests/11.patch"; @@ -24,10 +38,21 @@ in stdenv.mkDerivation { }) ]; - buildInputs = [ openfortivpn networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ]; + nativeBuildInputs = [ + intltool + pkg-config + file + ]; - nativeBuildInputs = [ intltool pkgconfig file ]; + buildInputs = [ + openfortivpn + networkmanager + ppp + ] ++ stdenv.lib.optionals withGnome [ + gtk3 + libsecret + libnma + ]; configureFlags = [ "--without-libnm-glib" @@ -36,9 +61,11 @@ in stdenv.mkDerivation { "--enable-absolute-paths" ]; - # the installer only create an empty directory in localstatedir, so - # we can drop it - installFlags = [ "localstatedir=." ]; + installFlags = [ + # the installer only creates an empty directory in localstatedir, so + # we can drop it + "localstatedir=." + ]; passthru = { updateScript = gnome3.updateScript { @@ -48,9 +75,8 @@ in stdenv.mkDerivation { }; meta = with stdenv.lib; { - description = "NetworkManager's FortiSSL plugin"; + description = "NetworkManager’s FortiSSL plugin"; inherit (networkmanager.meta) maintainers platforms; license = licenses.gpl2; }; } - From 9b47854f24b5235a7ed300c4039793875eb807ad Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 10 Jun 2020 15:22:35 +0200 Subject: [PATCH 0812/3452] networkmanager-fortisslvpn: more clean ups and fixes * add GLib dependency (it works with graphical variant because it is propagated by GTK but we should include it explicitly). * Since 1.2.10, libnm-glib support is disabled by default. * Since 1.2.10, intltool is not used. Closes: https://github.com/NixOS/nixpkgs/issues/90015 --- .../networking/network-manager/fortisslvpn/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index c0bb2a4276b5..3cc4133b41cf 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -2,9 +2,10 @@ , fetchurl , substituteAll , openfortivpn -, intltool +, gettext , pkg-config , file +, glib , gtk3 , networkmanager , ppp @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - intltool + gettext pkg-config file ]; @@ -48,6 +49,7 @@ stdenv.mkDerivation rec { openfortivpn networkmanager ppp + glib ] ++ stdenv.lib.optionals withGnome [ gtk3 libsecret @@ -55,7 +57,6 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/var" "--enable-absolute-paths" From 337da9e74c8fe5e32d4a72bcdef467c28b1cacd6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 13:50:37 +0000 Subject: [PATCH 0813/3452] libwhereami: 0.3.1 -> 0.5.0 --- pkgs/development/libraries/libwhereami/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index 8e190f998d56..9238827d70ea 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "libwhereami"; - version = "0.3.1"; + version = "0.5.0"; src = fetchFromGitHub { - sha256 = "16xjb6zp60ma76aa3kq3q8i8zn0n61gf39fny12cny8nggwjpbww"; + sha256 = "05fc28dri2h858kxbvldk5b6wd5is3fjcdsiqj3nxf95i66bb3xp"; rev = version; repo = "libwhereami"; owner = "puppetlabs"; From 841705284c85e82258dcc852a9ca1b4e057ddd7e Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 10 Jun 2020 16:05:17 +0200 Subject: [PATCH 0814/3452] linux: fix kernel config options for linux_*hardened Fix config options for linux_hardened and linux_latest_hardened due to #84302. This is a continuation of #88946. --- pkgs/os-specific/linux/kernel/hardened/config.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index 95510fe218e3..c817f1044271 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -40,11 +40,12 @@ assert (versionAtLeast version "4.9"); # Perform additional validation of commonly targeted structures. DEBUG_CREDENTIALS = yes; DEBUG_NOTIFIERS = yes; - DEBUG_PI_LIST = yes; # doesn't BUG() + DEBUG_PI_LIST = whenOlder "5.2" yes; # doesn't BUG() + DEBUG_PLIST = whenAtLeast "5.2" yes; DEBUG_SG = yes; SCHED_STACK_END_CHECK = yes; - REFCOUNT_FULL = whenAtLeast "4.13" yes; + REFCOUNT_FULL = whenBetween "4.13" "5.5" yes; # Randomize page allocator when page_alloc.shuffle=1 SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes; From bc8f008d7c142fdffb4a58f0856cbf9561c1e489 Mon Sep 17 00:00:00 2001 From: steve-chavez Date: Wed, 10 Jun 2020 09:35:58 -0500 Subject: [PATCH 0815/3452] haskellPackages.hasql-notifications: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 1 + pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d15c37a65fbe..18c8c11beddd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1450,6 +1450,7 @@ self: super: { }; # Test suite requires running a database server. Testing is done upstream. + hasql-notifications = dontCheck super.hasql-notifications; hasql-pool = dontCheck super.hasql-pool; # This bumps optparse-applicative to <0.16 in the cabal file, as otherwise diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1b02c07bbc20..a1d9b297751c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5673,7 +5673,6 @@ broken-packages: - hasql-generic - hasql-implicits - hasql-migration - - hasql-notifications - hasql-optparse-applicative - hasql-postgres - hasql-postgres-options From a691394d18a182e9e564c380125b542acfb03931 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 9 Jun 2020 16:02:02 -0400 Subject: [PATCH 0816/3452] starship: 0.41.3 -> 0.42.0 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index d6ff65adb4ca..3fec20f95bb6 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.41.3"; + version = "0.42.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0f3d95abivbmjqdzw9pbdbis96sfds26xv3k8k9skxml8iqzq29c"; + sha256 = "17wc9f07308a97dsmrkq74w2r639sqms0hwh8gavwxycj7wq7xz2"; }; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "10h0arvl3gf5hg530d24ypj4yzk3zhm8mgkhz0v61y0jcdy2zdrm"; + cargoSha256 = "1nvs68qxygi2l43vxw890r40px35dvzbcg6qmrm09g60ykd8pjv2"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { From 8c22f783549d836bef033c07926306526c1c2eed Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Wed, 10 Jun 2020 17:16:35 +0200 Subject: [PATCH 0817/3452] maintainers: add fabianhauser --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 97123feaafc9..6a175cd7c5fa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2540,6 +2540,16 @@ githubId = 11909469; name = "Fabian Geiselhart"; }; + fabianhauser = { + email = "fabian.nixos@fh2.ch"; + github = "fabianhauser"; + githubId = 368799; + name = "Fabian Hauser"; + keys = [{ + longkeyid = "rsa4096/0x8A52A140BEBF7D2C"; + fingerprint = "50B7 11F4 3DFD 2018 DCE6 E8D0 8A52 A140 BEBF 7D2C"; + }]; + }; fadenb = { email = "tristan.helmich+nixos@gmail.com"; github = "fadenb"; From c588f51f51d75c49cf4e636eb82bb69cf2927c50 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 15:51:22 +0000 Subject: [PATCH 0818/3452] mpop: 1.4.9 -> 1.4.10 --- pkgs/applications/networking/mpop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index 8a0980286df9..f6c979b5173b 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.9"; + version = "1.4.10"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "0hinmyd4lipy9wi3grwm72vv6xrpf4m08i9g9nlxzxnwfanw885q"; + sha256 = "1243hazpiwgvz2m3p48cdh0yw1019i6xjxgc7qyhmxcdy0inb6wy"; }; nativeBuildInputs = [ pkgconfig ]; From 01b73a01e7ee1cb3a3e507fc9bae8b55de6683a4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 15:58:12 +0000 Subject: [PATCH 0819/3452] msmtp: 1.8.10 -> 1.8.11 --- pkgs/applications/networking/msmtp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 9e990dcdf33d..e21cd5b3f0fc 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.10"; + version = "1.8.11"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "041g921rdjiv8bapp61gp4rylq8cckfkcwzyh8bs7xwxs4wpzfna"; + sha256 = "0q0fg235qk448l1xjcwyxr7vcpzk6w57jzhjbkb0m7nffyhhypzj"; }; patches = [ From 8c57cfff105f64e426379977be776d859be0dd4f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 16:03:28 +0000 Subject: [PATCH 0820/3452] ocamlPackages.ppx_deriving: 4.4.1 -> 4.5 --- pkgs/development/ocaml-modules/ppx_deriving/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 612a12bb4183..37a3a55229d4 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -4,11 +4,11 @@ buildDunePackage rec { pname = "ppx_deriving"; - version = "4.4.1"; + version = "4.5"; src = fetchzip { url = "https://github.com/ocaml-ppx/ppx_deriving/archive/v${version}.tar.gz"; - sha256 = "1map50w2a35y83bcd19p9yakdkhp04z5as2j2wlygi0b6s0a9vba"; + sha256 = "1v2xldag54n0xk69vv3j4nln9bzkkpq3rildq118sydzsc9v239z"; }; buildInputs = [ ppxfind cppo ounit ]; From 51da4293f5fbcd7766bfc832ebf283b5e288e1b9 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Tue, 9 Jun 2020 16:48:40 -0400 Subject: [PATCH 0821/3452] prometheus-keylight-exporter: remove unnecessary goPackagePath Co-authored-by: zowoq <59103226+zowoq@users.noreply.github.com> --- pkgs/servers/monitoring/prometheus/keylight-exporter.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix index b4d716bcdcb8..e1be2a0bddc7 100644 --- a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix @@ -4,8 +4,6 @@ buildGoModule rec { pname = "keylight-exporter"; version = "0.1.1"; - goPackagePath = "github.com/mdlayher/keylight_exporter"; - src = fetchFromGitHub { owner = "mdlayher"; repo = "keylight_exporter"; From 2d92ecf84ccfdd81a6a3a35ca2732cb27ed34446 Mon Sep 17 00:00:00 2001 From: Mrmaxmeier Date: Wed, 10 Jun 2020 18:19:34 +0200 Subject: [PATCH 0822/3452] thelounge: re-apply 'write out default path' restores part of df2f8d915051d3d494ba7cb572c66c84bef84dcf after 6602f87384eb0e6f8caf0a23eca48f896fedb8b7 --- pkgs/development/node-packages/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 7ff3db8894ec..4b0d4ac92cae 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -160,6 +160,9 @@ let thelounge = super.thelounge.override { buildInputs = [ self.node-pre-gyp ]; + postInstall = '' + echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home + ''; }; }; in self From 2d544307e58c6e42b08ae6b0b12b4b8f30bbf3a3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 6 Jun 2020 10:55:27 +0200 Subject: [PATCH 0823/3452] pipewire: apply patch providing absolute path to pipewire-media-session So pipewire-daemon is able to locate pipewire-media-session (which it's executing). Context: https://github.com/NixOS/nixpkgs/issues/89528#issuecomment-640013433 --- pkgs/development/libraries/pipewire/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 0b8759053eec..8fd83c59e56d 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkgconfig @@ -44,6 +45,13 @@ stdenv.mkDerivation rec { sha256 = "0g149vyaigf4gzm764fcgxxci9niw19z0af9afs4diwq5xzr1qd3"; }; + patches = [ (fetchpatch { + # Brought by https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/263, + # should be part of > 0.3.6 + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d1162f28efd502fcb973e172867970f5cc8d7a6b.patch"; + sha256 = "0ng34yin5726cvv0nll1b2xigyq6mj6j516l3xi0ys1i2g2fyby9"; + })]; + nativeBuildInputs = [ doxygen graphviz From 7d424a400d5eed099b4d1d8ab6221cceebe8b708 Mon Sep 17 00:00:00 2001 From: Jonathan Jeppener-Haltenhoff Date: Sun, 7 Jun 2020 19:42:19 +0200 Subject: [PATCH 0824/3452] paraview: 5.6.3 -> 5.8.0 --- .../graphics/paraview/default.nix | 74 ++++++++++++------- 1 file changed, 47 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 15d70d143081..b201f9dbf0da 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,26 +1,33 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, qtbase , qttools, python -, libGLU, libGL , libXt, qtx11extras, qtxmlpatterns , mkDerivation }: +{ boost, cmake, fetchFromGitHub, ffmpeg, qtbase, qtx11extras, + qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper, + mkDerivation, ninja, openmpi, python3, stdenv, tbb, libGLU, libGL }: mkDerivation rec { pname = "paraview"; - version = "5.6.3"; + version = "5.8.0"; - # fetching from GitHub instead of taking an "official" source - # tarball because of missing submodules there src = fetchFromGitHub { owner = "Kitware"; repo = "ParaView"; rev = "v${version}"; - sha256 = "0zcij59pg47c45gfddnpbin13w16smzhcbivzm1k4pg4366wxq1q"; + sha256 = "1mka6wwg9mbkqi3phs29mvxq6qbc44sspbm4awwamqhilh4grhrj"; fetchSubmodules = true; }; - cmakeFlags = [ - "-DPARAVIEW_ENABLE_PYTHON=ON" - "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" - "-DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION=OFF" - "-DOpenGL_GL_PREFERENCE=GLVND" - ]; + # Avoid error: format not a string literal and + # no format arguments [-Werror=format-security] + preConfigure = '' + substituteInPlace VTK/Common/Core/vtkLogger.h \ + --replace 'vtkLogScopeF(verbosity_name, __func__)' 'vtkLogScopeF(verbosity_name, "%s", __func__)' + + substituteInPlace VTK/Common/Core/vtkLogger.h \ + --replace 'vtkVLogScopeF(level, __func__)' 'vtkVLogScopeF(level, "%s", __func__)' + ''; + + # Find the Qt platform plugin "minimal" + patchPhase = '' + export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} + ''; # During build, binaries are called that rely on freshly built # libraries. These reside in build/lib, and are not found by @@ -29,37 +36,50 @@ mkDerivation rec { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib:$PWD/VTK/ThirdParty/vtkm/vtk-m/lib ''; - enableParallelBuilding = true; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DPARAVIEW_ENABLE_FFMPEG=ON" + "-DPARAVIEW_ENABLE_GDAL=ON" + "-DPARAVIEW_ENABLE_MOTIONFX=ON" + "-DPARAVIEW_ENABLE_VISITBRIDGE=ON" + "-DPARAVIEW_ENABLE_XDMF3=ON" + "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON" + "-DPARAVIEW_USE_MPI=ON" + "-DPARAVIEW_USE_PYTHON=ON" + "-DVTK_SMP_IMPLEMENTATION_TYPE=TBB" + "-DVTKm_ENABLE_MPI=ON" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_BINDIR=bin" + "-DOpenGL_GL_PREFERENCE=GLVND" + "-GNinja" + ]; nativeBuildInputs = [ cmake makeWrapper + ninja + gfortran ]; buildInputs = [ - python - python.pkgs.numpy libGLU libGL libXt + openmpi + (python3.withPackages (ps: with ps; [ numpy matplotlib mpi4py ])) + tbb + boost + ffmpeg + gdal qtbase qtx11extras qttools qtxmlpatterns + qtsvg ]; - # Paraview links into the Python library, resolving symbolic links on the way, - # so we need to put the correct sitePackages (with numpy) back on the path - preFixup = '' - wrapQtApp $out/bin/paraview \ - --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" - wrapQtApp $out/bin/pvbatch \ - --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" - wrapQtApp $out/bin/pvpython \ - --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" - ''; - meta = with stdenv.lib; { - homepage = "http://www.paraview.org/"; + homepage = "https://www.paraview.org/"; description = "3D Data analysis and visualization application"; license = licenses.free; maintainers = with maintainers; [ guibert ]; From e77426822ff234a50bf959384e86d78c0cf9a240 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Wed, 10 Jun 2020 13:12:43 -0400 Subject: [PATCH 0825/3452] nixos/prometheus-keylight-exporter: new module Signed-off-by: Matt Layher --- .../monitoring/prometheus/exporters.nix | 1 + .../prometheus/exporters/keylight.nix | 19 +++++++++++++++++++ nixos/tests/prometheus-exporters.nix | 19 +++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/keylight.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index f9ad1457fc85..b62a68860da8 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -28,6 +28,7 @@ let "dovecot" "fritzbox" "json" + "keylight" "mail" "mikrotik" "minio" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/keylight.nix b/nixos/modules/services/monitoring/prometheus/exporters/keylight.nix new file mode 100644 index 000000000000..dfa56343b871 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/keylight.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.keylight; +in +{ + port = 9288; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-keylight-exporter}/bin/keylight_exporter \ + -metrics.addr ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 4fc3668cfafb..e2221352dcfe 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -202,6 +202,25 @@ let ''; }; + keylight = { + # A hardware device is required to properly test this exporter, so just + # perform a couple of basic sanity checks that the exporter is running + # and requires a target, but cannot reach a specified target. + exporterConfig = { + enable = true; + }; + exporterTest = '' + wait_for_unit("prometheus-keylight-exporter.service") + wait_for_open_port(9288) + succeed( + "curl -sS --write-out '%{http_code}' -o /dev/null http://localhost:9288/metrics | grep -q '400'" + ) + succeed( + "curl -sS --write-out '%{http_code}' -o /dev/null http://localhost:9288/metrics?target=nosuchdevice | grep -q '500'" + ) + ''; + }; + mail = { exporterConfig = { enable = true; From 93ebfdad49e8985792c0d1af43ff1be6c87c9a9e Mon Sep 17 00:00:00 2001 From: MetaDark Date: Sun, 7 Jun 2020 21:26:44 -0400 Subject: [PATCH 0826/3452] cmake-language-server: 0.1.1 -> 0.1.2 --- pkgs/development/tools/cmake-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cmake-language-server/default.nix b/pkgs/development/tools/cmake-language-server/default.nix index 943655b881c2..135fdccd7c53 100644 --- a/pkgs/development/tools/cmake-language-server/default.nix +++ b/pkgs/development/tools/cmake-language-server/default.nix @@ -5,14 +5,14 @@ buildPythonApplication rec { pname = "cmake-language-server"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; src = fetchFromGitHub { owner = "regen100"; repo = pname; rev = "v${version}"; - sha256 = "09rijjksx07inbwxjinrsqihkxb011l2glysasmwpkhy0rmmhbcm"; + sha256 = "0vz7bjxkk0phjhz3h9kj6yr7wnk3g7lqmkqraa0kw12mzcfck837"; }; nativeBuildInputs = [ poetry ]; From 9a91be049a4a6be1c2cd82a50e53baeded16711b Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 6 Jun 2020 23:59:51 -0400 Subject: [PATCH 0827/3452] anki: format to fix indentation Indentation was off the coding standards, so ran it through nixpkgs-fmt to sanitize; no manual changes. --- pkgs/games/anki/default.nix | 330 ++++++++++++++++++------------------ 1 file changed, 169 insertions(+), 161 deletions(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 1548a9de63af..489e72768ea4 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -22,179 +22,187 @@ , setuptools , send2trash , CoreAudio -# This little flag adds a huge number of dependencies, but we assume that -# everyone wants Anki to draw plots with statistics by default. + # This little flag adds a huge number of dependencies, but we assume that + # everyone wants Anki to draw plots with statistics by default. , plotsSupport ? true -# manual + # manual , asciidoc }: let - # when updating, also update rev-manual to a recent version of - # https://github.com/dae/ankidocs - # The manual is distributed independently of the software. - version = "2.1.15"; - sha256-pkg = "12dvyf3j9df4nrhhnqbzd9b21rpzkh4i6yhhangn2zf7ch0pclss"; - rev-manual = "8f6387867ac37ef3fe9d0b986e70f898d1a49139"; - sha256-manual = "0pm5slxn78r44ggvbksz7rv9hmlnsvn9z811r6f63dsc8vm6mfml"; + # when updating, also update rev-manual to a recent version of + # https://github.com/dae/ankidocs + # The manual is distributed independently of the software. + version = "2.1.15"; + sha256-pkg = "12dvyf3j9df4nrhhnqbzd9b21rpzkh4i6yhhangn2zf7ch0pclss"; + rev-manual = "8f6387867ac37ef3fe9d0b986e70f898d1a49139"; + sha256-manual = "0pm5slxn78r44ggvbksz7rv9hmlnsvn9z811r6f63dsc8vm6mfml"; - manual = stdenv.mkDerivation { - pname = "anki-manual"; - inherit version; - src = fetchFromGitHub { - owner = "dae"; - repo = "ankidocs"; - rev = rev-manual; - sha256 = sha256-manual; - }; - phases = [ "unpackPhase" "patchPhase" "buildPhase" ]; - nativeBuildInputs = [ asciidoc ]; - patchPhase = '' - # rsync isnt needed - # WEB is the PREFIX - # We remove any special ankiweb output generation - # and rename every .mako to .html - sed -e 's/rsync -a/cp -a/g' \ - -e "s|\$(WEB)/docs|$out/share/doc/anki/html|" \ - -e '/echo asciidoc/,/mv $@.tmp $@/c \\tasciidoc -b html5 -o $@ $<' \ - -e 's/\.mako/.html/g' \ - -i Makefile - # patch absolute links to the other language manuals - sed -e 's|https://apps.ankiweb.net/docs/|link:./|g' \ - -i {manual.txt,manual.*.txt} - # there’s an artifact in most input files - sed -e '/<%def.*title.*/d' \ - -i *.txt - mkdir -p $out/share/doc/anki/html - ''; + manual = stdenv.mkDerivation { + pname = "anki-manual"; + inherit version; + src = fetchFromGitHub { + owner = "dae"; + repo = "ankidocs"; + rev = rev-manual; + sha256 = sha256-manual; }; + phases = [ "unpackPhase" "patchPhase" "buildPhase" ]; + nativeBuildInputs = [ asciidoc ]; + patchPhase = '' + # rsync isnt needed + # WEB is the PREFIX + # We remove any special ankiweb output generation + # and rename every .mako to .html + sed -e 's/rsync -a/cp -a/g' \ + -e "s|\$(WEB)/docs|$out/share/doc/anki/html|" \ + -e '/echo asciidoc/,/mv $@.tmp $@/c \\tasciidoc -b html5 -o $@ $<' \ + -e 's/\.mako/.html/g' \ + -i Makefile + # patch absolute links to the other language manuals + sed -e 's|https://apps.ankiweb.net/docs/|link:./|g' \ + -i {manual.txt,manual.*.txt} + # there’s an artifact in most input files + sed -e '/<%def.*title.*/d' \ + -i *.txt + mkdir -p $out/share/doc/anki/html + ''; + }; in buildPythonApplication rec { - pname = "anki"; - inherit version; + pname = "anki"; + inherit version; - src = fetchurl { - urls = [ - "https://apps.ankiweb.net/downloads/current/${pname}-${version}-source.tgz" - # "https://apps.ankiweb.net/downloads/current/${name}-source.tgz" - # "http://ankisrs.net/download/mirror/${name}.tgz" - # "http://ankisrs.net/download/mirror/archive/${name}.tgz" - ]; - sha256 = sha256-pkg; - }; - - outputs = [ "out" "doc" "man" ]; - - propagatedBuildInputs = [ - pyqtwebengine sqlalchemy beautifulsoup4 send2trash pyaudio requests decorator - markdown jsonschema setuptools - ] - ++ lib.optional plotsSupport matplotlib - ++ lib.optional stdenv.isDarwin [ CoreAudio ] - ; - - checkInputs = [ pytest glibcLocales nose ]; - - nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; - buildInputs = [ lame mplayer libpulseaudio ]; - - patches = [ - # Disable updated version check. - ./no-version-check.patch + src = fetchurl { + urls = [ + "https://apps.ankiweb.net/downloads/current/${pname}-${version}-source.tgz" + # "https://apps.ankiweb.net/downloads/current/${name}-source.tgz" + # "http://ankisrs.net/download/mirror/${name}.tgz" + # "http://ankisrs.net/download/mirror/archive/${name}.tgz" ]; + sha256 = sha256-pkg; + }; - buildPhase = '' - # Dummy build phase - # Anki does not use setup.py + outputs = [ "out" "doc" "man" ]; + + propagatedBuildInputs = [ + pyqtwebengine + sqlalchemy + beautifulsoup4 + send2trash + pyaudio + requests + decorator + markdown + jsonschema + setuptools + ] + ++ lib.optional plotsSupport matplotlib + ++ lib.optional stdenv.isDarwin [ CoreAudio ] + ; + + checkInputs = [ pytest glibcLocales nose ]; + + nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; + buildInputs = [ lame mplayer libpulseaudio ]; + + patches = [ + # Disable updated version check. + ./no-version-check.patch + ]; + + buildPhase = '' + # Dummy build phase + # Anki does not use setup.py + ''; + + postPatch = '' + # Remove unused starter. We'll create our own, minimalistic, + # starter. + # rm anki/anki + + # Remove QT translation files. We'll use the standard QT ones. + rm "locale/"*.qm + + # hitting F1 should open the local manual + substituteInPlace anki/consts.py \ + --replace 'HELP_SITE="http://ankisrs.net/docs/manual.html"' \ + 'HELP_SITE="${manual}/share/doc/anki/html/manual.html"' + ''; + + # UTF-8 locale needed for testing + LC_ALL = "en_US.UTF-8"; + + checkPhase = '' + # - Anki writes some files to $HOME during tests + # - Skip tests using network + env HOME=$TMP pytest --ignore tests/test_sync.py + ''; + + installPhase = '' + pp=$out/lib/${python.libPrefix}/site-packages + + mkdir -p $out/bin + mkdir -p $out/share/applications + mkdir -p $doc/share/doc/anki + mkdir -p $man/share/man/man1 + mkdir -p $out/share/mime/packages + mkdir -p $out/share/pixmaps + mkdir -p $pp + + cat > $out/bin/anki < $out/bin/anki < Date: Fri, 5 Jun 2020 11:41:56 +0200 Subject: [PATCH 0828/3452] transmission: add libstdc++ and libgcc_s permissions to apparmor profile --- nixos/modules/services/torrent/transmission.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index e7f5aaed844e..1bfcf2de82f8 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -179,6 +179,8 @@ in ${getLib pkgs.utillinuxMinimal.out}/lib/libblkid.so.* mr, ${getLib pkgs.utillinuxMinimal.out}/lib/libmount.so.* mr, ${getLib pkgs.utillinuxMinimal.out}/lib/libuuid.so.* mr, + ${getLib pkgs.gcc.cc.lib}/lib/libstdc++.so.* mr, + ${getLib pkgs.gcc.cc.lib}/lib/libgcc_s.so.* mr, @{PROC}/sys/kernel/random/uuid r, @{PROC}/sys/vm/overcommit_memory r, From 9930b8fd3d98a6d44c4518a10056ee0b9f0866fc Mon Sep 17 00:00:00 2001 From: Justin Gerhardt Date: Thu, 4 Jun 2020 02:29:38 -0400 Subject: [PATCH 0829/3452] wireshark: Add Bluetooth Only applies to Linux --- .../networking/sniffers/wireshark/default.nix | 3 ++- pkgs/development/libraries/libpcap/default.nix | 16 +++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 7166ebe93d71..c6dc66a0ca78 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,6 +12,7 @@ with stdenv.lib; let version = "3.2.4"; variant = if withQt then "qt" else "cli"; + pcap = libpcap.override { withBluez = stdenv.isLinux; }; in stdenv.mkDerivation { pname = "wireshark-${variant}"; @@ -35,7 +36,7 @@ in stdenv.mkDerivation { ] ++ optional withQt qt5.wrapQtAppsHook; buildInputs = [ - gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt + gettext pcre perl pcap lua5 libssh nghttp2 openssl libgcrypt libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ++ optionals stdenv.isLinux [ libcap libnl ] diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 123c2f2f0676..35cf4485f72e 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, flex, bison }: +{ stdenv, fetchurl, flex, bison, bluez, pkgconfig, withBluez ? false }: + +with stdenv.lib; stdenv.mkDerivation rec { pname = "libpcap"; @@ -9,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "153h1378diqyc27jjgz6gg5nxmb4ddk006d9xg69nqavgiikflk3"; }; - nativeBuildInputs = [ flex bison ]; + nativeBuildInputs = [ flex bison ] + ++ optionals withBluez [ bluez.dev pkgconfig ]; # We need to force the autodetection because detection doesn't # work in pure build enviroments. @@ -18,17 +21,16 @@ stdenv.mkDerivation rec { linux = "linux"; darwin = "bpf"; }.${stdenv.hostPlatform.parsed.kernel.name}) - ] ++ stdenv.lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ - "ac_cv_linux_vers=2" - ]; + ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) + [ "ac_cv_linux_vers=2" ]; dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = optionalString stdenv.isDarwin '' substituteInPlace configure --replace " -arch i386" "" ''; - meta = with stdenv.lib; { + meta = { homepage = "https://www.tcpdump.org"; description = "Packet Capture Library"; platforms = platforms.unix; From 700eed636c99de8a2a5f23cc20e745fc13a44bc2 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 10 Jun 2020 20:15:10 +0200 Subject: [PATCH 0830/3452] python.pkgs.gidgethub: 3.2.0 -> 4.1.1 --- pkgs/development/python-modules/gidgethub/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 634d7c2ddc04..a9214cf49f70 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -11,22 +11,26 @@ , tornado , aiohttp , uritemplate +, pyjwt }: buildPythonPackage rec { pname = "gidgethub"; - version = "3.2.0"; + version = "4.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8f4b69063a256994d38243cc0eba4e1453017b5b8b04a173216d02d47ffc3989"; + sha256 = "13nzc40c71kxvjxahgnc6c974xp5fpm02gqymwgfjbj2dmlzmayg"; }; nativeBuildInputs = [ setuptools pytestrunner ]; checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ]; - propagatedBuildInputs = [ uritemplate ]; + propagatedBuildInputs = [ + uritemplate + pyjwt + ]; postPatch = '' substituteInPlace setup.py \ From 2cb97c36ae153c8d3d83aa115943a6c4fabbab9d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 10 May 2020 12:05:49 +0200 Subject: [PATCH 0831/3452] arduino: 1.8.9 -> 1.8.12 --- .../arduino/arduino-core/default.nix | 118 +++++++----- .../arduino/arduino-core/downloads.nix | 180 ++++++++++-------- 2 files changed, 178 insertions(+), 120 deletions(-) diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 3512dcbd2bcf..2a7387c4378a 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -1,22 +1,36 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, jdk, ant -, libusb-compat-0_1, libusb1, unzip, zlib, ncurses, readline -, withGui ? false, gtk2 ? null, withTeensyduino ? false +{ stdenv +, lib +, fetchFromGitHub +, fetchurl +, jdk +, ant +, libusb-compat-0_1 +, libusb1 +, unzip +, zlib +, ncurses +, readline +, withGui ? false +, gtk2 ? null +, withTeensyduino ? false /* Packages needed for Teensyduino */ -, upx, fontconfig, xorg, gcc -, atk, glib, pango, gdk-pixbuf, libpng12, expat, freetype -, cairo, udev +, upx +, fontconfig +, xorg +, gcc +, atk +, glib +, pango +, gdk-pixbuf +, libpng12 +, expat +, freetype +, cairo +, udev }: assert withGui -> gtk2 != null; assert withTeensyduino -> withGui; - -# TODO: Teensyduino is disabled for i686-linux due to an indefinite hang in the -# xdotool script; the cause of this hang is not yet known. -# TODO: There is a fair chance that Teensyduino works with arm-linux, but it -# has not yet been tested. -if withTeensyduino && (stdenv.hostPlatform.system != "x86_64-linux") then throw - "Teensyduino is only supported on x86_64-linux at this time (patches welcome)." -else let externalDownloads = import ./downloads.nix { inherit fetchurl; @@ -25,12 +39,13 @@ let }; # Some .so-files are later copied from .jar-s to $HOME, so patch them beforehand patchelfInJars = - lib.optional (stdenv.hostPlatform.system == "x86_64-linux") {jar = "share/arduino/lib/jssc-2.8.0-arduino3.jar"; file = "libs/linux/libjSSC-2.8_x86_64.so";} - ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") {jar = "share/arduino/lib/jssc-2.8.0-arduino3.jar"; file = "libs/linux/libjSSC-2.8_x86.so";} + lib.optional (stdenv.hostPlatform.system == "aarch64-linux") { jar = "share/arduino/lib/jssc-2.8.0-arduino4.jar"; file = "libs/linux/libjSSC-2.8_aarch64.so"; } + ++ lib.optional (builtins.match "armv[67]l-linux" stdenv.hostPlatform.system != null) { jar = "share/arduino/lib/jssc-2.8.0-arduino4.jar"; file = "libs/linux/libjSSC-2.8_armhf.so"; } + ++ lib.optional (stdenv.hostPlatform.system == "x86_64-linux") { jar = "share/arduino/lib/jssc-2.8.0-arduino4.jar"; file = "libs/linux/libjSSC-2.8_x86_64.so"; } + ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") { jar = "share/arduino/lib/jssc-2.8.0-arduino4.jar"; file = "libs/linux/libjSSC-2.8_x86.so"; } ; # abiVersion 6 is default, but we need 5 for `avrdude_bin` executable ncurses5 = ncurses.override { abiVersion = "5"; }; - teensy_libpath = stdenv.lib.makeLibraryPath [ atk cairo @@ -54,49 +69,61 @@ let zlib ]; teensy_architecture = - lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "linux64" - + lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "linux32" - + lib.optionalString (stdenv.hostPlatform.system == "arm-linux") "linuxarm"; - - flavor = (if withTeensyduino then "teensyduino" else "arduino") - + stdenv.lib.optionalString (!withGui) "-core"; + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "linux64" + + lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "linux32" + + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") "linuxaarch64" + + lib.optionalString (builtins.match "armv[67]l-linux" stdenv.hostPlatform.system != null) "linuxarm"; + flavor = ( if withTeensyduino then "teensyduino" else "arduino") + + stdenv.lib.optionalString (!withGui) "-core"; in stdenv.mkDerivation rec { - version = "1.8.9"; + version = "1.8.12"; name = "${flavor}-${version}"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = version; - sha256 = "0kblq0bqap2zzkflrj6rmdi8dvqxa28fcwwrc3lfmbz2893ni3w4"; + sha256 = "0lxkyvsh55biz2q20ba4qabraind5cpxznl41zfq027vl22j6kd2"; }; - teensyduino_version = "147"; + teensyduino_version = "151"; teensyduino_src = fetchurl { url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}"; sha256 = lib.optionalString (teensy_architecture == "linux64") - "09ysanip5d2f5axzd81z2l74ayng60zqhjxmxs7xa5098fff46il" + "0q8mw9bm2vb5vwa98gwcs6ad164i98hc1qqh2qw029yhwm599pn0" + lib.optionalString (teensy_architecture == "linux32") - "1zw3cfv2p62dwg8838vh0gd1934b18cyx7c13azvwmrpj601l0xx" + "1rq6sx0048ab200jy0cz5vznwxi99avidngj42rjnh7kcfas5c4m" + + lib.optionalString (teensy_architecture == "linuxaarch64") + "09k78dycn1vcpcx37c1dak8bgjv8gs34l89n9r9s0c3rqmv3pg4x" + lib.optionalString (teensy_architecture == "linuxarm") - "12421z26ksx84aldw1pq0cakh8jhs33mwafgvfij0zfgn9x0i877"; - }; + "19j55bq36040rpdpfxcqimda76rkbx137q15bs8nvxj13wrbl4ip"; + }; # Used because teensyduino requires jars be a specific size arduino_dist_src = fetchurl { url = "http://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz"; sha256 = lib.optionalString (teensy_architecture == "linux64") - "1lv4in9j0r8s0cis4zdvbk2637vlj12w69wdxgcxcrwvkcdahkpa" + "128f34kkxz7ab6ir5mqyr8d1mgxig8f9jygwxy44pdnq2rk6gmh9" + lib.optionalString (teensy_architecture == "linux32") - "0zla3a6gd9prclgrbbgsmhf8ds8zb221m65x21pvz0y1cwsdvjpm" + "11n85lwsn1w4ysfacyw08v85s3f3zvl8j8ac7rld19yxgjslvisi" + + lib.optionalString (teensy_architecture == "linuxaarch64") + "04v2nhyjhahml6nmz23bfb63c0an4a7zxgcgxqqq442i8vd304wa" + lib.optionalString (teensy_architecture == "linuxarm") - "1w5m49wfd68zazli0lf3w4zykab8n7mzp3wnbjqfpx2vip80bqnz"; + "1k8yjivaydm6y16mplrjyblgx7l0wjzm3mjxh5saxrjq7drswmxx"; }; - buildInputs = [ jdk ant libusb-compat-0_1 libusb1 unzip zlib ncurses5 readline + buildInputs = [ + jdk + ant + libusb-compat-0_1 + libusb1 + unzip + zlib + ncurses5 + readline ] ++ stdenv.lib.optionals withTeensyduino [ upx ]; downloadSrcList = builtins.attrValues externalDownloads; downloadDstList = builtins.attrNames externalDownloads; @@ -116,7 +143,8 @@ stdenv.mkDerivation rec { # Deliberately break build.xml's download statement in order to cause # an error if anything needed is missing from download.nix. - substituteInPlace build/build.xml --replace "get src" "get error" + substituteInPlace build/build.xml \ + --replace 'ignoreerrors="true"' 'ignoreerrors="false"' cd ./arduino-core && ant cd ../build && ant @@ -125,11 +153,11 @@ stdenv.mkDerivation rec { # This will be patched into `arduino` wrapper script # Java loads gtk dynamically, so we need to provide it using LD_LIBRARY_PATH - dynamicLibraryPath = lib.makeLibraryPath [gtk2]; - javaPath = lib.makeBinPath [jdk]; + dynamicLibraryPath = lib.makeLibraryPath [ gtk2 ]; + javaPath = lib.makeBinPath [ jdk ]; # Everything else will be patched into rpath - rpath = (lib.makeLibraryPath [zlib libusb-compat-0_1 libusb1 readline ncurses5 stdenv.cc.cc]); + rpath = (lib.makeLibraryPath [ zlib libusb-compat-0_1 libusb1 readline ncurses5 stdenv.cc.cc ]); installPhase = '' mkdir -p $out/share/arduino @@ -192,19 +220,19 @@ stdenv.mkDerivation rec { done ${lib.concatMapStringsSep "\n" - ({jar, file}: + ({ jar, file }: '' - jar xvf $out/${jar} ${file} - patchelf --set-rpath $rpath ${file} - jar uvf $out/${jar} ${file} - rm -f ${file} + jar xvf $out/${jar} ${file} + patchelf --set-rpath $rpath ${file} + jar uvf $out/${jar} ${file} + rm -f ${file} '' ) - patchelfInJars} + patchelfInJars} # avrdude_bin is linked against libtinfo.so.5 mkdir $out/lib/ - ln -s ${lib.makeLibraryPath [ncurses5]}/libtinfo.so.5 $out/lib/libtinfo.so.5 + ln -s ${lib.makeLibraryPath [ ncurses5 ]}/libtinfo.so.5 $out/lib/libtinfo.so.5 ${stdenv.lib.optionalString withTeensyduino '' # Patch the Teensy loader binary diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/arduino/arduino-core/downloads.nix index 9c4f795d2936..f2edf64ceb6f 100644 --- a/pkgs/development/arduino/arduino-core/downloads.nix +++ b/pkgs/development/arduino/arduino-core/downloads.nix @@ -1,4 +1,7 @@ -{fetchurl, optionalAttrs, system}: +{ fetchurl +, optionalAttrs +, system +}: # This file preloads all the archives which Arduino's build/build.xml # would otherwise try to download itself. When updating this for a new # version of Arduino, check build.xml for version numbers and new @@ -56,9 +59,9 @@ url = "https://github.com/arduino-libraries/RobotIRremote/archive/2.0.0.zip"; sha256 = "0j5smap74j8p3wc6k0h73b1skj4gkr7r25jbjh1j1cg052dxri86"; }; - "build/SpacebrewYun-1.0.1.zip" = fetchurl { - url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip"; - sha256 = "1zs6ymlzw66bglrm0x6d3cvr52q85c8rlm525x0wags111xx3s90"; + "build/SpacebrewYun-1.0.2.zip" = fetchurl { + url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.2.zip"; + sha256 = "1d8smmsx12qhf2ldvmi93h48cvdyz4id5gd68cvf076wfyv6dks8"; }; "build/Temboo-1.2.1.zip" = fetchurl { url = "https://github.com/arduino-libraries/Temboo/archive/1.2.1.zip"; @@ -76,108 +79,135 @@ url = "https://github.com/arduino-libraries/Keyboard/archive/1.0.2.zip"; sha256 = "17yfj95r1i7fb87q4krmxmaq07b4x2xf8cjngrj5imj68wgjck53"; }; - "build/SD-1.2.3.zip" = fetchurl { - url = "https://github.com/arduino-libraries/SD/archive/1.2.3.zip"; - sha256 = "0i5hb5hmrsrhfgxx8w7zzrfrkc751vs63vhxrj6qvwazhfcdpjw2"; + "build/SD-1.2.4.zip" = fetchurl { + url = "https://github.com/arduino-libraries/SD/archive/1.2.4.zip"; + sha256 = "123g9px9nqcrsx696wqwzjd5s4hr55nxgfz95b7ws3v007i1f3fz"; }; - "build/Servo-1.1.3.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Servo/archive/1.1.3.zip"; - sha256 = "1m019a75cdn1fg0cwlzbahmaqvg8sgzr6v1812rd7rjh8ismiah6"; + "build/Servo-1.1.6.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Servo/archive/1.1.6.zip"; + sha256 = "1z9k9lxzj5d3f8h9hy86f4k5wgfr2a9zcvjh76qmpvv6clcv3js3"; }; "build/LiquidCrystal-1.0.7.zip" = fetchurl { url = "https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7.zip"; sha256 = "1wrxrqz3n4yrj9j1a2b7pdd7a1rlyi974ra7crv5amjng8817x9n"; }; - "build/Adafruit_Circuit_Playground-1.8.1.zip" = fetchurl { - url = "https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.8.1.zip"; - sha256 = "1fl24px4c42f6shpb3livwsxgpj866yy285274qrj4m1zl07f18q"; + "build/Adafruit_Circuit_Playground-1.10.4.zip" = fetchurl { + url = "https://github.com/adafruit/Adafruit_CircuitPlayground/archive/1.10.4.zip"; + sha256 = "194az5pxxzs0wg4ng7w0zqrdw93qdyv02y0q2yy57dr4kwfrm6nl"; }; - "build/libastylej-2.05.1-4.zip" = fetchurl { - url = "https://downloads.arduino.cc/libastylej-2.05.1-4.zip"; - sha256 = "0q307b85xba7izjh344kqby3qahg3f5zy18gg52sjk1lbkl9i39s"; + "build/libastylej-2.05.1-5.zip" = fetchurl { + url = "https://downloads.arduino.cc/libastylej-2.05.1-5.zip"; + sha256 = "11mlprwvqfq3nvmz6hdf1fcg02a7xi2a9qhffa1d8a4w15s2iwny"; }; - "build/liblistSerials-1.4.2.zip" = fetchurl { - url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.2.zip"; - sha256 = "1p58b421k92rbgwfgbihy0d04mby7kfssghpmjb4gk9yix09za3m"; + "build/liblistSerials-1.4.2-2.zip" = fetchurl { + url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.2-2.zip"; + sha256 = "0sqzwp1lfjy452z3d4ma5c4blwsj7za72ymxf7crpq9dh9qd8f53"; }; - "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.10.6.zip" = fetchurl { - url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.10.6/WiFi101-Updater-ArduinoIDE-Plugin-0.10.6.zip"; - sha256 = "1k23xyr5dmr60y8hb9x24wrgd4mfgvrzky621p6fvawn5xbdq8a3"; + "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip" = fetchurl { + url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.10.10/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip"; + sha256 = "0bs5qdglsfc2q5c48m6wdjpzhz4ya4askh1g8364dp6p7jmg6w0d"; + }; + "build/avr-1.8.2.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/cores/avr-1.8.2.tar.bz2"; + sha256 = "06zl8fwphknd0qdx87fcr1003gid1yqsazaj674mm9widqfd84v2"; }; } + // optionalAttrs (system == "x86_64-linux") { - "build/arduino-builder-linux64-1.4.4.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.4.4.tar.bz2"; - sha256 = "1m5b4rc9i235ra6isqdpjj9llddb5sldkhidb8c4i14mcqbdci1n"; + "build/arduino-builder-linux64-1.5.2.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.5.2.tar.bz2"; + sha256 = "0wypr9a2cbv9r0ignsr13raw09i3vfc5zvkjxp2xwb7mv35y77z3"; }; - "build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-x86_64-pc-linux-gnu.tar.bz2"; - sha256 = "11ciwv9sw900wxb2fwm4i4ml4a85ylng0f595v0mf0xifc6jnhh5"; + "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "1yq6a811dabrkcgzfi3jsys41r19qsna46kglkjbcy0rza7yvzry"; }; - "build/linux/avrdude-6.3.0-arduino14-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-x86_64-pc-linux-gnu.tar.bz2"; - sha256 = "1z4b6pvn1823h8mg0iph88igmcnrk2y7skr3z44dqlwk0pryi1kr"; + "build/linux/avrdude-6.3.0-arduino17-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "0gfic26af9vlcpkw8v914psn05vmq1rsrlk1fi7vzapj1a9gpkdc"; }; - "build/linux/arduinoOTA-1.2.1-linux_amd64.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduinoOTA-1.2.1-linux_amd64.tar.bz2"; - sha256 = "1ya834p2cqjj8k1ad3yxcnzd4bcgrlqsqsli9brq1138ac6k30jv"; - }; - "build/avr-1.6.23.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/cores/avr-1.6.23.tar.bz2"; - sha256 = "1al449r8hcdck7f4y295g7q388qvbn6qhk2zqdvws9kg4mzqsq8q"; + "build/linux/arduinoOTA-1.3.0-linux_amd64.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.3.0-linux_amd64.tar.bz2"; + sha256 = "1ylz4pfa9np0nn0w9igmmm3sr8hz3na04n7cv8ia3hzz84jfwida"; }; } + // optionalAttrs (system == "i686-linux") { - "build/arduino-builder-linux32-1.4.4.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.4.4.tar.bz2"; - sha256 = "0q3i1ba7vh14616d9ligizcz89yadr0skazxbrcq3mvvjqzbifw8"; + "build/arduino-builder-linux32-1.5.2.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.5.2.tar.bz2"; + sha256 = "1slzw8fzxkqsp2izjisjd1rxxbqkrq6n72jc4frk5z2gdm6zfa0l"; }; - "build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-pc-linux-gnu.tar.bz2"; - sha256 = "13skspybzq80ndsi93s7v15900lf26n5243mbib77andyc27xy2i"; + "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino5-i686-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-i686-pc-linux-gnu.tar.bz2"; + sha256 = "078f3rbpdrghk63mbaq73bd5p6znimp14b1wdf6nh2gdswwjgw9g"; }; - "build/linux/avrdude-6.3.0-arduino14-i686-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-i686-pc-linux-gnu.tar.bz2"; - sha256 = "1jklpk1sgrmbh1r25ynps4qcs5dbg6hd54fzjx4hcdf68cw0w42g"; + "build/linux/avrdude-6.3.0-arduino17-i686-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-i686-pc-linux-gnu.tar.bz2"; + sha256 = "0py0jvpim0frmv0dnvzfj122ni5hg1qwshgya4a0wc5rgp0wd32w"; }; - "build/linux/arduinoOTA-1.2.1-linux_386.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduinoOTA-1.2.1-linux_386.tar.bz2"; - sha256 = "1m56ps58h0fs8rr4ifc45slmrdvalc63vhldy85isv28g15zdz9g"; + "build/linux/arduinoOTA-1.3.0-linux_386.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.3.0-linux_386.tar.bz2"; + sha256 = "1cl79019ldsq0sc3fd4pm0vx2kqcklld7w03hdcj99y7zgb5jzry"; }; } + // optionalAttrs (system == "x86_64-darwin") { - "build/arduino-builder-macosx-1.4.4.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.4.4.tar.bz2"; - sha256 = "1jp5kg32aiw062kcxlv660w38iaprifm8h3g2798izpwyfj0dmwg"; + "build/arduino-builder-macosx-1.5.2-signed.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.5.2-signed.tar.bz2"; + sha256 = "1pa795vwly1z9h1bp5qzbx2c2pq4n6p7ab5ivhmd3q89z0ywyqgz"; }; - "build/macosx/avr-gcc-5.4.0-atmel3.6.1-arduino2-i386-apple-darwin11.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-i386-apple-darwin11.tar.bz2"; - sha256 = "1y2972b08ac59xwjqkyjmi5lf2pmzw88a6sdgci3x9rvahvh3idb"; + "build/macosx/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2"; + sha256 = "0lcnp525glnc2chcynnz2nllm4q6ar4n9nrjqd1jbj4m706zbv67"; }; - "build/macosx/avrdude-6.3.0-arduino14-i386-apple-darwin11.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-i386-apple-darwin11.tar.bz2"; - sha256 = "0qsa3sb3f480fm2z75fq14cqddw5hq8w8q0c2a9cw8i7aa8kkl27"; + "build/macosx/avrdude-6.3.0-arduino17-x86_64-apple-darwin12-signed.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-x86_64-apple-darwin12-signed.tar.bz2"; + sha256 = "1m24dci8mjf70yrf033mp1834pbp870m8sns2jxs3iy2i4qviiki"; }; - "build/macosx/appbundler/appbundler-1.0ea-arduino4.jar.zip" = fetchurl { - url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip"; - sha256 = "1vz0g98ancfqdf7yx5m3zrxmzb3fwp18zh5lkh2nyl5xlr9m368z"; + "build/linux/arduinoOTA-1.3.0-darwin_amd64-signed.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.3.0-darwin_amd64-signed.tar.bz2"; + sha256 = "12pwfnikq3z3ji5wgjhzx1mfyaha5cym7mr63r8kfl5a85fhk8nz"; + }; + "build/macosx/appbundler/appbundler-1.0ea-arduino5.jar.zip" = fetchurl { + url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino5.jar.zip"; + sha256 = "1ims951z7ajprqms7yd8ll83c79n7krhd9ljw30yn61f6jk46x82"; }; } -// optionalAttrs (system == "armv6l-linux") { - "build/arduino-builder-linuxarm-1.4.4.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.4.4.tar.bz2"; - sha256 = "03bhlhdkg1jx0d3lh9194xgaqsbank9njhlnwy8braa7pw4p58gn"; + +// optionalAttrs (system == "aarch64-linux") { + "build/arduino-builder-linuxaarch64-1.5.2.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linuxaarch64-1.5.2.tar.bz2"; + sha256 = "14k7h7anjizbs2h04phw784slpfbi6hch9skvhy5ll805dmr24ci"; }; - "build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-armhf-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-armhf-pc-linux-gnu.tar.bz2"; - sha256 = "17z9li387mx2acgad733h7l1jnnwv09ynw4nrwlqfahqqdfgjhb7"; + "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino5-aarch64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-aarch64-pc-linux-gnu.tar.bz2"; + sha256 = "040cspc41iv59fb2g9fzc6w5523dvqa1bavxni7s8w731ccp176x"; }; - "build/linux/avrdude-6.3.0-arduino14-armhf-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-armhf-pc-linux-gnu.tar.bz2"; - sha256 = "12amp8hqcj6gcdga7hfs22asgmgzafy8ny0rqhqs8n8d95sn586i"; + "build/linux/avrdude-6.3.0-arduino17-aarch64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-aarch64-pc-linux-gnu.tar.bz2"; + sha256 = "1z59dx2j2j4675awjzag9fswhvkn3hlz4ds5d2b7pzmca7vliybc"; }; - "build/linux/arduinoOTA-1.2.1-linux_arm.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduinoOTA-1.2.1-linux_arm.tar.bz2"; - sha256 = "1q79w1d0h2lp3jcg58qrlh3k5lak7dbsnawrzm0jj8c6spfb6m5d"; + "build/linux/arduinoOTA-1.3.0-linux_aarch64.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.3.0-linux_aarch64.tar.bz2"; + sha256 = "04s1is2w8xhvc7lg0lmyk0yjsnar2l2gdc6ig7lkgb7zgkrxhpl3"; + }; +} + +// optionalAttrs (builtins.match "armv[67]l-linux" system != null) { + "build/arduino-builder-linuxarm-1.5.2.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.5.2.tar.bz2"; + sha256 = "1vs2s5px07jb2sdv83qxkf9lxmsy8j4dm7bn3vpw5dcjqd3qdyww"; + }; + "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino5-arm-linux-gnueabihf.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-arm-linux-gnueabihf.tar.bz2"; + sha256 = "0fcn0s0fdgbz3yma2gjv16s1idrzn6nhmypdw8awg0kb3i9xbb7l"; + }; + "build/linux/avrdude-6.3.0-arduino17-armhf-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-armhf-pc-linux-gnu.tar.bz2"; + sha256 = "1lah9wvwvliajrrf5jw5blkjhk1sxivz26gj5s86zah3v32ni3ia"; + }; + "build/linux/arduinoOTA-1.3.0-linux_arm.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduinoOTA-1.3.0-linux_arm.tar.bz2"; + sha256 = "0mm6spjlg0lhkfx5c9q27b6agjywnc1nf3mbl15yysmm15s5i20q"; }; } From ac07cb0b6752c8434a36bacfea4eafd53acc83ba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 19:00:33 +0000 Subject: [PATCH 0832/3452] mpg123: 1.25.13 -> 1.26.1 --- pkgs/applications/audio/mpg123/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 53e66e580da8..30f40e226de9 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "mpg123-1.25.13"; + name = "mpg123-1.26.1"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "02l915jq0ymndb082g6w89bpf66z04ifa1lr7ga3yycw6m46hc4h"; + sha256 = "0cp01wdy77ggzqzzasxd5jd9iypcly5m4c89idc9mpgknyd65mkl"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; From c898b5c05739dbfc86fd5f3cc15639fed6244e89 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 10 Jun 2020 21:15:14 +0200 Subject: [PATCH 0833/3452] hostapd: add hexa as maintainer --- pkgs/os-specific/linux/hostapd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 964de0f47b21..991dcbe26152 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { repositories.git = "git://w1.fi/hostap.git"; description = "A user space daemon for access point and authentication servers"; license = licenses.gpl2; - maintainers = with maintainers; [ phreedom ninjatrappeur ]; + maintainers = with maintainers; [ phreedom ninjatrappeur hexa ]; platforms = platforms.linux; }; } From 09cda2de69fd4a31b35dc11a8457a42c3399fce7 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 10 Jun 2020 19:56:00 +0300 Subject: [PATCH 0834/3452] mp3blaster: fix build on darwin --- pkgs/applications/audio/mp3blaster/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index 2943a31454a6..74814a1b7ceb 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchFromGitHub, ncurses, libvorbis, SDL }: + stdenv.mkDerivation rec { - - version = "3.2.6"; - pname = "mp3blaster"; + version = "3.2.6"; src = fetchFromGitHub { owner = "stragulus"; - repo = "mp3blaster"; + repo = pname; rev = "v${version}"; sha256 = "0pzwml3yhysn8vyffw9q9p9rs8gixqkmg4n715vm23ib6wxbliqs"; }; @@ -17,14 +16,17 @@ stdenv.mkDerivation rec { libvorbis ] ++ stdenv.lib.optional stdenv.isDarwin SDL; - buildFlags = [ "CXXFLAGS=-Wno-narrowing" ]; + NIX_CFLAGS_COMPILE = toString ([ + "-Wno-narrowing" + ] ++ stdenv.lib.optionals stdenv.cc.isClang [ + "-Wno-reserved-user-defined-literal" + ]); meta = with stdenv.lib; { description = "An audio player for the text console"; homepage = "http://www.mp3blaster.org/"; license = licenses.gpl2; maintainers = with maintainers; [ earldouglas ]; - platforms = platforms.all; + platforms = with platforms; linux ++ darwin; }; - } From f71490bd1d0ad95cda667e55f121cee2953cf8be Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Sat, 6 Jun 2020 22:16:11 +0200 Subject: [PATCH 0835/3452] Add gopls to vim-go binaries --- pkgs/misc/vim-plugins/overrides.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 73c5690b1927..d9a68b90041e 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -24,6 +24,7 @@ , gomodifytags, gotags, gotools, go-motion , gnused, reftools, gogetdoc, golangci-lint , impl, iferr, gocode, gocode-gomod, go-tools +, gopls # direnv-vim dependencies , direnv @@ -593,6 +594,7 @@ self: super: { golint golangci-lint gomodifytags + gopls gotags gotools iferr From 9c95e8150ab98e6ea68304c0f9cbdcfe04020890 Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Wed, 10 Jun 2020 17:31:46 +0200 Subject: [PATCH 0836/3452] hamster: init at 3.0.2 --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/hamster.nix | 15 ++++++ pkgs/applications/misc/hamster/default.nix | 62 ++++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 + 5 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/programs/hamster.nix create mode 100644 pkgs/applications/misc/hamster/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 978d33e75852..2e82424d58db 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -126,6 +126,7 @@ ./programs/gpaste.nix ./programs/gnupg.nix ./programs/gphoto2.nix + ./programs/hamster.nix ./programs/iftop.nix ./programs/iotop.nix ./programs/java.nix diff --git a/nixos/modules/programs/hamster.nix b/nixos/modules/programs/hamster.nix new file mode 100644 index 000000000000..ddf26a22fb53 --- /dev/null +++ b/nixos/modules/programs/hamster.nix @@ -0,0 +1,15 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + meta.maintainers = maintainers.fabianhauser; + + options.programs.hamster.enable = + mkEnableOption "Whether to enable hamster time tracking."; + + config = lib.mkIf config.programs.hamster.enable { + environment.systemPackages = [ pkgs.hamster ]; + services.dbus.packages = [ pkgs.hamster ]; + }; +} diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix new file mode 100644 index 000000000000..57b36e00436e --- /dev/null +++ b/pkgs/applications/misc/hamster/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchFromGitHub, python3Packages, intltool, glib, itstool +, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: + +python3Packages.buildPythonApplication rec { + pname = "hamster"; + version = "3.0.2"; + + format = "other"; + + src = fetchFromGitHub { + owner = "projecthamster"; + repo = pname; + rev = "v${version}"; + sha256 = "09ikiwc2izjvwqbbyp8knn190x5y4anwslkmb9k2h3r3jwrg2vd2"; + }; + + nativeBuildInputs = [ + python3Packages.setuptools + wrapGAppsHook + intltool + itstool + wafHook + glib + gobject-introspection + ]; + + buildInputs = [ + pango + gdk-pixbuf + atk + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + pycairo + pyxdg + dbus-python + ]; + + # Setup hooks have trouble with strict deps. + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + dontWrapGApps = true; + + # Arguments to be passed to `makeWrapper`, only used by buildPython* + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = '' + wrapPythonProgramsIn $out/libexec "$out $pythonPath" + ''; + + meta = with stdenv.lib; { + description = "Time tracking application"; + homepage = "http://projecthamster.org/"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.fabianhauser ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 30d9ce5bcfd8..2b0b1c70fd71 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -198,7 +198,6 @@ mapAliases ({ gupnp_igd = gupnp-igd; # added 2018-02-25 gupnptools = gupnp-tools; # added 2015-12-19 gutenberg = zola; # added 2018-11-17 - hamster-time-traker = throw "hamster-time-tracker has been removed from nixpkgs, as it was unmaintained."; # added 2019-12-10 heimdalFull = heimdal; # added 2018-05-01 hepmc = hepmc2; # added 2019-08-05 hexen = throw "hexen (SDL port) has been removed: Abandoned by upstream."; # added 2019-12-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04d090040832..0bca332c3941 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19996,6 +19996,8 @@ in hakuneko = callPackage ../tools/misc/hakuneko { }; + hamster = callPackage ../applications/misc/hamster { }; + hashit = callPackage ../tools/misc/hashit { }; hactool = callPackage ../tools/compression/hactool { }; From 31a301a1d69850ec6720ca65c30355f7a8c6a4e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 20:20:53 +0000 Subject: [PATCH 0837/3452] pciutils: 3.6.4 -> 3.7.0 --- pkgs/tools/system/pciutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index e76ab496ef98..4bbe2bdcee0a 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, kmod, which }: stdenv.mkDerivation rec { - name = "pciutils-3.6.4"; # with release-date database + name = "pciutils-3.7.0"; # with release-date database src = fetchurl { url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz"; - sha256 = "0mb0f2phdcmp4kfiqsszn2k6nlln0w160ffzrjjv4bbfjwrgfzzn"; + sha256 = "1ss0rnfsx8gvqjxaji4mvbhf9xyih4cadmgadbwwv8mnx1xvjh4x"; }; nativeBuildInputs = [ pkgconfig ]; From ddb49be96e27c4cae3e04f8f9e58df673ae72913 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 10 Jun 2020 22:28:03 +0200 Subject: [PATCH 0838/3452] roundcubePlugins.persistent_login: 5.1.0 -> 5.2.0 https://github.com/mfreiholz/persistent_login/releases/tag/version-5.2.0 --- pkgs/servers/roundcube/plugins/persistent_login/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/plugins/persistent_login/default.nix b/pkgs/servers/roundcube/plugins/persistent_login/default.nix index b66386222f76..e210c1006845 100644 --- a/pkgs/servers/roundcube/plugins/persistent_login/default.nix +++ b/pkgs/servers/roundcube/plugins/persistent_login/default.nix @@ -2,12 +2,12 @@ roundcubePlugin rec { pname = "persistent_login"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "mfreiholz"; repo = pname; rev = "version-${version}"; - sha256 = "1k2jgbshwig8q5l440y59pgwbfbc0pdrjbpihba834a4pm0y6anl"; + sha256 = "0aasc2ns318s1g8vf2hhqwsplchhrhv5cd725rnfldim1y8k0n1i"; }; } From 62523f3388f0034dfb0906fc5e6260c064f4dc90 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 10 Jun 2020 22:29:13 +0200 Subject: [PATCH 0839/3452] packer: 1.5.6 -> 1.6.0 https://github.com/hashicorp/packer/releases/tag/v1.6.0 --- pkgs/development/tools/packer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 32ac95cff6a4..382fda72a4cd 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; - version = "1.5.6"; + version = "1.6.0"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,14 +11,14 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0pwygrh6pjmx8a1jc12929x0slj7w3b8p3pzswnbk7klyhj4jkp8"; + sha256 = "0qddljg330i7059kvij84pjzz67g6qh1w2zcmsj6rv58ix8xsfx7"; }; meta = with stdenv.lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = "https://www.packer.io"; license = licenses.mpl20; - maintainers = with maintainers; [ cstrahan zimbatm ]; + maintainers = with maintainers; [ cstrahan zimbatm ma27 ]; platforms = platforms.unix; }; } From 61ec84f7f97f63778091faf08ae853ae30dd465b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 10 Jun 2020 22:36:15 +0200 Subject: [PATCH 0840/3452] python3Packages.mautrix: 0.5.0 -> 0.5.4 --- 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 1bf23111422d..362e34157676 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.0"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "0hcm2hwryfr6js33zcl2k95wbjrgcj89pi90lka0hjw9vs9bmdz6"; + sha256 = "0csvk3y0y2r9gnfqj91fiqprgp8dxiv4n80b6myraab5s7zn1mvv"; }; propagatedBuildInputs = [ From 89f0e0a2fa202f0336c11ed789d8ece0436afb97 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 10 Jun 2020 22:36:56 +0200 Subject: [PATCH 0841/3452] mautrix-telegram: 0.8.0 -> 0.8.1 https://github.com/tulir/mautrix-telegram/releases/tag/v0.8.1 --- pkgs/servers/mautrix-telegram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 2b8c418a261e..da4f77e3394c 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -4,12 +4,12 @@ with python3.pkgs; buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.8.0"; + version = "0.8.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "10r644ddprnhadv2jfb1xxp0rcqi65n3hv7dv7j9znnnykgnwvls"; + sha256 = "1gz6d28dq3ykvr3wp85wkc05lbppdzf5j9i62pgx0blmx3jh0yrk"; }; postPatch = '' From 557d075d7ba4d9a0715115a4599a1dc8d25337c3 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Wed, 10 Jun 2020 09:55:53 +0200 Subject: [PATCH 0842/3452] wasmtime: 0.16.0 -> 0.17.0 https://github.com/bytecodealliance/wasmtime/releases/tag/v0.17.0 --- pkgs/development/interpreters/wasmtime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index dd6e3eb4a7f4..5e8cba94e1ab 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "${pname}"; rev = "v${version}"; - sha256 = "1zlljqkkcw8h94ff1w47sqn9pn0zal06s06i8nciv5i2d1xaqg5n"; + sha256 = "18kmxc53jz1rlbmgdvffpvvsr8m399lgv62kwhciv5pif857qbb4"; fetchSubmodules = true; }; - cargoSha256 = "1hb7l7a76lgbji0qm9qd80m35cp346hyi4rphfk6p80v142cw8hh"; + cargoSha256 = "149nav392wf4sr50dpdlnvfq3vfrrl9lqgr98g5dyzfjrf5jbzm3"; nativeBuildInputs = [ python cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ From 789db72b2e34075d7a079ecae84682a6b1569f5c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 20:52:58 +0000 Subject: [PATCH 0843/3452] orca: 3.36.2 -> 3.36.3 --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 0ca4f11e548b..849e156b5292 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.36.2"; + version = "3.36.3"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hxz8wlyjn6w3zqg1p56pwdj0p23d6vynzczklyc6n91dyvma06g"; + sha256 = "1x0xrcyxlvcjlqp6wcsx5d951i500079wqs04scssjzwqggy330n"; }; patches = [ From 6635e78fad0996c71fb67d0ac7cf8baca7f532e0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 10 Jun 2020 22:43:09 +0200 Subject: [PATCH 0844/3452] gjs: Fix tests Installed tests require GSettings schemas. And the build-time tests are now passing. --- pkgs/development/libraries/gjs/default.nix | 12 +++++++++--- .../libraries/gjs/installed-tests-path.patch | 15 ++++++++++++++- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 8e298e64ce6d..8cc5aca348a5 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -74,9 +74,7 @@ in stdenv.mkDerivation rec { ./installed-tests-path.patch ]; - # Gio test is failing - # https://github.com/NixOS/nixpkgs/pull/81626#issuecomment-599325843 - doCheck = false; + doCheck = true; postPatch = '' substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console @@ -95,7 +93,15 @@ in stdenv.mkDerivation rec { ''; postInstall = '' + # TODO: make the glib setup hook handle this + installedTestsSchemaDatadir="$installedTests/share/gsettings-schemas/${pname}-${version}" + mkdir -p "$installedTestsSchemaDatadir" + mv "$installedTests/share/glib-2.0" "$installedTestsSchemaDatadir" + ''; + + postFixup = '' wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \ + --prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \ --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}" ''; diff --git a/pkgs/development/libraries/gjs/installed-tests-path.patch b/pkgs/development/libraries/gjs/installed-tests-path.patch index 11a39b2dd9a5..f9b1515b68e3 100644 --- a/pkgs/development/libraries/gjs/installed-tests-path.patch +++ b/pkgs/development/libraries/gjs/installed-tests-path.patch @@ -1,5 +1,5 @@ diff --git a/installed-tests/meson.build b/installed-tests/meson.build -index 294d20c6..1e5029e0 100644 +index 7e842025..1e5029e0 100644 --- a/installed-tests/meson.build +++ b/installed-tests/meson.build @@ -1,7 +1,7 @@ @@ -12,6 +12,19 @@ index 294d20c6..1e5029e0 100644 # Simple shell script tests # +diff --git a/meson.build b/meson.build +index 084d5396..e5d73fcd 100644 +--- a/meson.build ++++ b/meson.build +@@ -540,7 +540,7 @@ install_data('installed-tests/extra/lsan.supp', + install_dir: get_option('datadir') / api_name / 'lsan') + + if get_option('installed_tests') +- schemadir = abs_datadir / 'glib-2.0' / 'schemas' ++ schemadir = get_option('installed_test_prefix') / 'share' / 'glib-2.0' / 'schemas' + install_data('installed-tests/js/org.gnome.GjsTest.gschema.xml', install_dir: schemadir) + meson.add_install_script('build/compile-gschemas.py', schemadir) + endif diff --git a/meson_options.txt b/meson_options.txt index 66f66024..008687cb 100644 --- a/meson_options.txt From ffe966a3359ad7a8b7e14bc20f64ff7b2b77e573 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 21:00:38 +0000 Subject: [PATCH 0845/3452] osinfo-db-tools: 1.7.0 -> 1.8.0 --- pkgs/tools/misc/osinfo-db-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index a93ec0ab573f..c0921a496cc2 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db-tools"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "08x8mrafphyll0d35xdc143rip3ahrz6bmzhc85nwhq7yk2vxpab"; + sha256 = "038q3gzdbkfkhpicj0755mw1q4gbvn57pslpw8n2dp3lds9im0g9"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext perl python3 ]; From 736363d715fb277c61098185bb1209b4ca3bdf28 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 14:11:05 -0700 Subject: [PATCH 0846/3452] opensmtpd: 6.7.0p1 -> 6.7.1p1 (#90090) --- pkgs/servers/mail/opensmtpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 0c2cd68cb1be..c489f2b14f73 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "opensmtpd"; - version = "6.7.0p1"; + version = "6.7.1p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib libressl db pam ]; src = fetchurl { url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; - sha256 = "1f8bp40ywyixflg5qbnang6l210bv4vqa1k2pgm2356bp7bmsgy1"; + sha256 = "1jh8vxfajm1mvp1v5yh6llrhjzv0n9fgab88mlwllwqynhcfjy3l"; }; patches = [ From 5d39d988dcfba645909b182b2943105342ee8b3c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 10 Jun 2020 23:13:08 +0200 Subject: [PATCH 0847/3452] gjs: Fix locale detection The build was complaining: meson.build:660: WARNING: Your libc does not have the C.UTF-8 locale and no other suitable UTF-8 fallback locale could be found. You can still build GJS, but some tests will fail. The tests do not actually seem to be affected but still. --- pkgs/development/libraries/gjs/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 8cc5aca348a5..357bf076459a 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -17,6 +17,7 @@ , dbus , gdk-pixbuf , makeWrapper +, which , xvfb_run , nixosTests }: @@ -42,6 +43,7 @@ in stdenv.mkDerivation rec { ninja pkgconfig makeWrapper + which # for locale detection libxml2 # for xml-stripblanks ]; @@ -77,6 +79,7 @@ in stdenv.mkDerivation rec { doCheck = true; postPatch = '' + patchShebangs build/choose-tests-locale.sh substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console ''; From 043fb602938dd305fc66efe8a2ad5e3b6a0628c2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 10 Jun 2020 23:18:04 +0200 Subject: [PATCH 0848/3452] intel-media-driver: 19.4.0r -> 20.1.1 --- .../libraries/intel-media-driver/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index ac4bdb4b14c9..366e34ddf4d9 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub -, cmake, pkgconfig +, cmake, pkg-config , libva, libpciaccess, intel-gmmlib, libX11 }: stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "19.4.0r"; + version = "20.1.1"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "0gnd82z0wgiw5my1hnqlk9hcjjqpsgasqq5xcdrbkfa40wpb132a"; + sha256 = "1mww20c9r7a57njqa2835ayjvk46lrv2yks9a2y8i0s5qzdi8m1i"; }; cmakeFlags = [ @@ -21,15 +21,21 @@ stdenv.mkDerivation rec { "-DMEDIA_RUN_TEST_SUITE=OFF" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libva libpciaccess intel-gmmlib libX11 ]; meta = with stdenv.lib; { - homepage = "https://github.com/intel/media-driver"; - license = with licenses; [ bsd3 mit ]; description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs"; + longDescription = '' + The Intel Media Driver for VAAPI is a new VA-API (Video Acceleration API) + user mode driver supporting hardware accelerated decoding, encoding, and + video post processing for GEN based graphics hardware. + ''; + homepage = "https://github.com/intel/media-driver"; + changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}"; + license = with licenses; [ bsd3 mit ]; platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ primeos jfrankenau ]; }; } From e45146d94bf6d27cbde107e82a2520b007344055 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Wed, 10 Jun 2020 14:13:07 -0400 Subject: [PATCH 0849/3452] nixos/prometheus-apcupsd-exporter: new module Signed-off-by: Matt Layher --- .../monitoring/prometheus/exporters.nix | 1 + .../prometheus/exporters/apcupsd.nix | 38 +++++++++++++++++++ nixos/tests/prometheus-exporters.nix | 15 ++++++++ 3 files changed, 54 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/apcupsd.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index f9ad1457fc85..18a714360cf0 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -21,6 +21,7 @@ let # `serviceOpts.script` or `serviceOpts.serviceConfig.ExecStart` exporterOpts = genAttrs [ + "apcupsd" "bind" "blackbox" "collectd" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/apcupsd.nix b/nixos/modules/services/monitoring/prometheus/exporters/apcupsd.nix new file mode 100644 index 000000000000..57c35a742c5f --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/apcupsd.nix @@ -0,0 +1,38 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.apcupsd; +in +{ + port = 9162; + extraOpts = { + apcupsdAddress = mkOption { + type = types.str; + default = ":3551"; + description = '' + Address of the apcupsd Network Information Server (NIS). + ''; + }; + + apcupsdNetwork = mkOption { + type = types.enum ["tcp" "tcp4" "tcp6"]; + default = "tcp"; + description = '' + Network of the apcupsd Network Information Server (NIS): one of "tcp", "tcp4", or "tcp6". + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-apcupsd-exporter}/bin/apcupsd_exporter \ + -telemetry.addr ${cfg.listenAddress}:${toString cfg.port} \ + -apcupsd.addr ${cfg.apcupsdAddress} \ + -apcupsd.network ${cfg.apcupsdNetwork} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 4fc3668cfafb..caed263fe46c 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -56,6 +56,21 @@ let */ exporterTests = { + apcupsd = { + exporterConfig = { + enable = true; + }; + metricProvider = { + services.apcupsd.enable = true; + }; + exporterTest = '' + wait_for_unit("apcupsd.service") + wait_for_open_port(3551) + wait_for_unit("prometheus-apcupsd-exporter.service") + wait_for_open_port(9162) + succeed("curl -sSf http://localhost:9162/metrics | grep -q 'apcupsd_info'") + ''; + }; bind = { exporterConfig = { From 5b8a78a972092f7236179293c5cdcd7fb9358d45 Mon Sep 17 00:00:00 2001 From: Michael Maclean Date: Wed, 10 Jun 2020 22:27:14 +0100 Subject: [PATCH 0850/3452] rtl-ais: init at 0.8.1 --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/radio/rtl-ais/default.nix | 24 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 pkgs/applications/radio/rtl-ais/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8260f6fb27d4..e16a7ed02f80 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5027,6 +5027,12 @@ githubId = 223323; name = "Miguel de la Cruz"; }; + mgdm = { + email = "michael@mgdm.net"; + github = "mgdm"; + githubId = 71893; + name = "Michael Maclean"; + }; mgregoire = { email = "gregoire@martinache.net"; github = "M-Gregoire"; diff --git a/pkgs/applications/radio/rtl-ais/default.nix b/pkgs/applications/radio/rtl-ais/default.nix new file mode 100644 index 000000000000..f806f07d597d --- /dev/null +++ b/pkgs/applications/radio/rtl-ais/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, pkgconfig, libusb1, rtl-sdr }: + +stdenv.mkDerivation { + name = "rtl-ais"; + version = "0.8.1"; + buildInputs = [ pkgconfig rtl-sdr libusb1 ]; + + src = fetchFromGitHub { + owner = "dgiardini"; + repo = "rtl-ais"; + rev = "0e85f4e5f9ce7378834c3129bc894580efc24291"; + sha256 = "0wm4zai1vs89mf0zgz52q5w5rj8f3i3v6zg42hfb7aqabi25r3jf"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "A simple AIS tuner and generic dual-frequency FM demodulator"; + homepage = "https://github.com/dgiardini/rtl-ais"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ mgdm ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc405432704d..83f43a6cdef4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21911,6 +21911,8 @@ in rtl_433 = callPackage ../applications/radio/rtl_433 { }; + rtl-ais = callPackage ../applications/radio/rtl-ais { }; + rtl-sdr = callPackage ../applications/radio/rtl-sdr { }; rtv = callPackage ../applications/misc/rtv { }; From 38a4af7d19787b05e76fbb744c98b733d6783042 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 11 Jun 2020 00:26:05 +0200 Subject: [PATCH 0851/3452] gitlab: 13.0.4 -> 13.0.6 CI Token Access Control An authorization issue discovered in the mirroring logic allowed read access to private repositories. This issue is now mitigated in the latest release and is waiting for a CVE ID to be assigned. https://about.gitlab.com/releases/2020/06/10/critical-security-release-13-0-6-released/ --- pkgs/applications/version-management/gitlab/data.json | 10 +++++----- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 308a2399458b..bc342ff2b5ef 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.0.4", - "repo_hash": "15pfg3ss1diqsnlf0xpx4ixlpjnvzghzjfvs6y3bv21qnjfwkp0g", + "version": "13.0.6", + "repo_hash": "0iyzx5lnkwp6m8q5p60gzsjmpf6qflvzl0vzfw37hymnxwq646zy", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.0.4-ee", + "rev": "v13.0.6-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.0.4", + "GITALY_SERVER_VERSION": "13.0.6", "GITLAB_PAGES_VERSION": "1.18.0", "GITLAB_SHELL_VERSION": "13.2.0", - "GITLAB_WORKHORSE_VERSION": "8.31.1" + "GITLAB_WORKHORSE_VERSION": "8.31.2" } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 374bf953f786..8f51b33fbd4f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -19,14 +19,14 @@ let }; }; in buildGoPackage rec { - version = "13.0.4"; + version = "13.0.6"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1hnjv2q98016srvjmyjpd5fkpg68mra6qk0asl1l83z2vin2xrkm"; + sha256 = "14vp73z9f0p3m1bjykkfzrmw9miyjxiqm79rns477xbm2dbmwa4s"; }; # Fix a check which assumes that hook files are writeable by their diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index f6710643f6d8..6386a9cc5aa7 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.31.1"; + version = "8.31.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1c2y1icil98qay9d95q1rlpi0ffhll990grkkib9srsn55b2i86v"; + sha256 = "0wvhhjfb490mjdrmc9xwr3qfh3941xn3b02c757ghrvzwv329wvg"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; From 6df8995af94751be183903cf4dc4650a10373d3e Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Wed, 10 Jun 2020 15:42:15 -0700 Subject: [PATCH 0852/3452] 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 541f92f24e15c03ee4121d7a6128a3cdb9a536c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 00:59:18 +0000 Subject: [PATCH 0853/3452] haproxy: 2.1.4 -> 2.1.6 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index c5aeaaa7bb43..c43edd040e7b 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.1.4"; + version = "2.1.6"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "1kcizs5r538chhpwqykdngxyqfi98i03akfjnii721npjvv0y0si"; + sha256 = "1pyz4gckdn8982vpb1iiw9agwp2s5p8wc0nn1qh1ic0wq3lrnpg6"; }; buildInputs = [ openssl zlib ] From 5312ff04208f59c8c81bfbc282181f5dccb17974 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 03:08:58 +0000 Subject: [PATCH 0854/3452] jdupes: 1.15.0 -> 1.16.0 --- pkgs/tools/misc/jdupes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index ae0b32d2120d..ba509d945e16 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "05q2ys7ii6mqiddl9ixzqhbvk4xy5ckh3yfz26vycxiyh9cp7yls"; + sha256 = "0z8banifsp6325j572grpghf69j92zz9cxdnvb6pqjsknc96mrf6"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. From f183f8817ba99e34af03c67db07870a38cdab48b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 20:33:22 +0000 Subject: [PATCH 0855/3452] gcalcli: 4.2.1 -> 4.3.0 --- pkgs/applications/misc/gcalcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index d7d6ad5302d3..20aefe2ab1d6 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -5,13 +5,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "gcalcli"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "insanum"; repo = pname; rev = "v${version}"; - sha256 = "1xwrgmy2azvr99b7df92m2imj0wy4fh53bn7lvcrnghjbnh7n0l0"; + sha256 = "0s5fhcmz3n0dwh3vkqr4aigi59q43v03ch5jhh6v75149icwr0df"; }; postPatch = lib.optionalString stdenv.isLinux '' From 7d131f6112643a406711c7643644b50490e46563 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 20:59:15 +0000 Subject: [PATCH 0856/3452] fossil: 2.11 -> 2.11.1 --- pkgs/applications/version-management/fossil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index c7f523861c11..d23728a060f9 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.11"; + version = "2.11.1"; src = fetchurl { urls = @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${pname}-${version}.tar.gz"; - sha256 = "0c9nzx42wxfmym9vf1pnbdb1c7gp7a7zqky60izxsph7w2xh8nix"; + sha256 = "1sxq1hn87fdikhbg9y3v4sjy4gxaifnx4dig8nx6xwd5mm7z74dk"; }; buildInputs = [ zlib openssl readline sqlite which ed ] From 759de38807e689c48fe997741d2173e00ed6fa84 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 19:46:47 +0000 Subject: [PATCH 0857/3452] gdcm: 3.0.5 -> 3.0.6 --- pkgs/development/libraries/gdcm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 968ee3a09d08..745c96f57943 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, vtk_7, darwin }: stdenv.mkDerivation rec { - version = "3.0.5"; + version = "3.0.6"; pname = "gdcm"; src = fetchurl { url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2"; - sha256 = "16d3sf81n4qhwbbx1d80jg6fhrla5paan384c4bbbqvbhm222yby"; + sha256 = "048ycvhk143cvsf09r7vwmp4sm9ah9bh5pbbrl366m5a4sp7fr89"; }; dontUseCmakeBuildDir = true; From d5a5009e1f802d02e0eb2ae49306eaad09240002 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 10 Jun 2020 09:00:38 -0400 Subject: [PATCH 0858/3452] nodePackages: update --- .../node-packages/node-packages.nix | 398 +++++++++--------- 1 file changed, 201 insertions(+), 197 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 57913cc581b9..90341fa93166 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -2623,13 +2623,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-4.1.9" = { + "@octokit/types-4.1.10" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "4.1.9"; + version = "4.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-4.1.9.tgz"; - sha512 = "hinM/BA2c1vebN2HSR3JtVdYtrSbmvn/doUBZXXuQuh/9o60hYwitQQAGTpJu+k6pjtjURskDHQxUFvqLvYCeA=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-4.1.10.tgz"; + sha512 = "/wbFy1cUIE5eICcg0wTKGXMlKSbaAxEr00qaBXzscLXpqhcwgXeS6P8O0pkysBhRfyjkKjJaYrvR1ExMO5eOXQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -2857,13 +2857,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.30.13" = { + "@serverless/components-2.30.14" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.30.13"; + version = "2.30.14"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.13.tgz"; - sha512 = "0IUJ6O7UywHpNgEFE7Ym06HhxbebTl767v/J4TMwTaftTJP5e4/ezxdJPxtZe75CdWUCCy+aaHP7VUAqqJdYVA=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.14.tgz"; + sha512 = "sWCuALO55BhdJAPJSN4KgifRJUCkr44FE/Bhw6hpz+3vK49mfnjDF6iHdNi6wNx85BRRgXGz1z/015epwqRtnA=="; }; }; "@serverless/core-1.1.2" = { @@ -3082,13 +3082,13 @@ let sha512 = "IUq5bHRL0vtVKtfvd4GOccAIaLYHbcertug2UVZzk5+yY6R/CxfYsnFUTho1h4BdkfNdin2tPjE/5jRF4SKSrw=="; }; }; - "@snyk/java-call-graph-builder-1.8.1" = { + "@snyk/java-call-graph-builder-1.10.0" = { name = "_at_snyk_slash_java-call-graph-builder"; packageName = "@snyk/java-call-graph-builder"; - version = "1.8.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.8.1.tgz"; - sha512 = "2G96dChYYXV73G8y9U0fi45dH6ybOjUSRBTJrMnmNkHJoOp1bzz8L4p5rkRypHQqr4SBS1EdCQeRw1eWRLm+Lg=="; + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.10.0.tgz"; + sha512 = "x3vKElHJRsPjlMBRACeD6kHtki54ffahYeAm4ny5epVpxm16/OT6f6AjNjPuX8DbxcauaD7wqirtc62OPH3YqA=="; }; }; "@snyk/lodash-4.17.15-patch" = { @@ -3100,13 +3100,13 @@ let sha512 = "e4+t34bGyjjRnwXwI14hqye9J/nRbG9iwaqTgXWHskm5qC+iK0UrjgYdWXiHJCf3Plbpr+1rpW+4LPzZnCGMhQ=="; }; }; - "@snyk/rpm-parser-1.2.0" = { + "@snyk/rpm-parser-2.0.0" = { name = "_at_snyk_slash_rpm-parser"; packageName = "@snyk/rpm-parser"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-1.2.0.tgz"; - sha512 = "9D2Vjg9LAONz9hHNPd/ORYF5Mv1Yw/uhJpJbwI3YRxKjlB3JY2UNLSVl1XWWr03hA1M+3rNAwVeOZNm3IJajgw=="; + url = "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.0.0.tgz"; + sha512 = "bWjQY5Xk3TcfVpeo8M5BhhSUEdPr2P19AWW13CHPu6sFZkckLWEcjQycnBsVD6RBmxGXecJ1YNui8dq6soHoYQ=="; }; }; "@snyk/ruby-semver-2.2.0" = { @@ -3649,13 +3649,13 @@ let sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A=="; }; }; - "@types/istanbul-lib-coverage-2.0.2" = { + "@types/istanbul-lib-coverage-2.0.3" = { name = "_at_types_slash_istanbul-lib-coverage"; packageName = "@types/istanbul-lib-coverage"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz"; - sha512 = "rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w=="; + url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; + sha512 = "sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="; }; }; "@types/istanbul-lib-report-3.0.0" = { @@ -3694,13 +3694,13 @@ let sha512 = "fYMgzN+9e28R81weVN49inn/u798ruU91En1ZnGvSZzCRc5jXx9B2EDhlRaWmcO1RIxFHL8AajRXzxDuJu93+A=="; }; }; - "@types/json-schema-7.0.4" = { + "@types/json-schema-7.0.5" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.4"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz"; - sha512 = "8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz"; + sha512 = "7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ=="; }; }; "@types/keygrip-1.0.2" = { @@ -3793,31 +3793,31 @@ let sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; - "@types/node-10.17.25" = { + "@types/node-10.17.26" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.25"; + version = "10.17.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.25.tgz"; - sha512 = "EWPw3jDB0jip4HafDkoezNOwG00TtVZ1TOe74MaxIBWgpyM60UF/LXzFVx9+8AdSYNNOPgx7TuJoRmgnhHZ/7g=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.26.tgz"; + sha512 = "myMwkO2Cr82kirHY8uknNRHEVtn0wV3DTQfkrjx17jmkstDRZ24gNUdl8AHXVyVclTYI/bNjgTPTAWvWLqXqkw=="; }; }; - "@types/node-13.13.11" = { + "@types/node-13.13.12" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.11"; + version = "13.13.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.11.tgz"; - sha512 = "FX7mIFKfnGCfq10DGWNhfCNxhACEeqH5uulT6wRRA1KEt7zgLe0HdrAd9/QQkObDqp2Z0KEV3OAmNgs0lTx5tQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.12.tgz"; + sha512 = "zWz/8NEPxoXNT9YyF2osqyA9WjssZukYpgI4UYZpOjcyqwIUqWGkcCionaEb9Ki+FULyPyvNFpg/329Kd2/pbw=="; }; }; - "@types/node-14.0.12" = { + "@types/node-14.0.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.0.12"; + version = "14.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.12.tgz"; - sha512 = "/sjzehvjkkpvLpYtN6/2dv5kg41otMGuHQUt9T2aiAuIfleCQRQHXXzF1eAw/qkZTj5Kcf4JSTf7EIizHocy6Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.0.13.tgz"; + sha512 = "rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA=="; }; }; "@types/node-6.14.10" = { @@ -7069,13 +7069,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.692.0" = { + "aws-sdk-2.693.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.692.0"; + version = "2.693.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.692.0.tgz"; - sha512 = "fQRbZq+urzE4VjciEr6KNY7vbzougcVg7UqbHKGcgBT7EPtSbog9C2i9YY9Yum8PRuP1GAmfvC2Vthlw6dVTGw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.693.0.tgz"; + sha512 = "/0zy5IlE8wHrTXCxPYMSJGaqTKN1ulBBOSuWYeGxHU8pnTT6ZHpDdHlS83DHrVbsXnO/zq9prEf1nXRWlwgARw=="; }; }; "aws-sign2-0.6.0" = { @@ -9490,13 +9490,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001079" = { + "caniuse-lite-1.0.30001081" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001079"; + version = "1.0.30001081"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001079.tgz"; - sha512 = "2KaYheg0iOY+CMmDuAB3DHehrXhhb4OZU4KBVGDr/YKyYAcpudaiUQ9PJ9rxrPlKEoJ3ATasQ5AN48MqpwS43Q=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001081.tgz"; + sha512 = "iZdh3lu09jsUtLE6Bp8NAbJskco4Y3UDtkR3GTCJGsbMowBU5IWDFF79sV2ws7lSqTzWyKazxam2thasHymENQ=="; }; }; "capture-exit-2.0.0" = { @@ -9697,6 +9697,15 @@ let sha512 = "N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A=="; }; }; + "chalk-4.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; + sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; + }; + }; "chance-1.0.18" = { name = "chance"; packageName = "chance"; @@ -15242,13 +15251,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.465" = { + "electron-to-chromium-1.3.466" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.465"; + version = "1.3.466"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.465.tgz"; - sha512 = "K/lUeT3NLAsJ5SHRDhK3/zd0tw7OUllYD8w+fTOXm6ljCPsp2qq+vMzxpLo8u1M27ZjZAjRbsA6rirvne2nAMQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.466.tgz"; + sha512 = "eieqkoM2hCkZZRhETKyCouMziDV3l4XEKHRLuzcHG+HV+P7PeODU/z9HAmBgMQkzvHg2DoyQhfIDmmeguLZT/Q=="; }; }; "elegant-spinner-1.0.1" = { @@ -16494,6 +16503,15 @@ let sha512 = "YVFs6dPpZIgH665kKckDktEVvSBccSYJmoZUfhNUdv5d3Xv+Q+SKF4Xis1jolq9aBzuW1ZZhQh/m/zU/TPdDhw=="; }; }; + "event-loop-spinner-2.0.0" = { + name = "event-loop-spinner"; + packageName = "event-loop-spinner"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/event-loop-spinner/-/event-loop-spinner-2.0.0.tgz"; + sha512 = "1y4j/Mhttr8ordvHkbDsGzGrlQaSYJoXD/3YKUxiOXIk7myEn9UPfybEk/lLtrcU3D4QvCNmVUxVQaPtvAIaUw=="; + }; + }; "event-pubsub-4.3.0" = { name = "event-pubsub"; packageName = "event-pubsub"; @@ -18429,13 +18447,13 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "fp-ts-2.6.3" = { + "fp-ts-2.6.5" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.6.3"; + version = "2.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.6.3.tgz"; - sha512 = "d/djF6VTApJB9DwD/yec2dlKd7h3oqiOv+6vtBnC1pKbHrhz7aEAGcKd4luraUQDJ3pt3C6W4Npd8s+l5xIquQ=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.6.5.tgz"; + sha512 = "lQNzOMJj98b623+UZLQ+tnN/8qtNXz/vRoR9k7L/9OlUIyYH3qVzSUVZBDXYsAd7nOWzzdQALCX1ZqcF70altQ=="; }; }; "fraction.js-4.0.12" = { @@ -20149,13 +20167,13 @@ let sha512 = "/tq02ayMQjrG4oDFDRLLrPk0KvJXue0nVXoItBe7uAdbNXjQUu+HYCBdAmPLQoseVzUKKMzrhq2P/sfI76ON6w=="; }; }; - "graphql-type-json-0.3.1" = { + "graphql-type-json-0.3.2" = { name = "graphql-type-json"; packageName = "graphql-type-json"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.3.1.tgz"; - sha512 = "1lPkUXQ2L8o+ERLzVAuc3rzc/E6pGF+6HnjihCVTK0VzR0jCuUd92FqNxoHdfILXqOn2L6b4y47TBxiPyieUVA=="; + url = "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.3.2.tgz"; + sha512 = "J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg=="; }; }; "graphql-upload-8.1.0" = { @@ -30515,15 +30533,6 @@ let sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg=="; }; }; - "node-alias-1.0.4" = { - name = "node-alias"; - packageName = "node-alias"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/node-alias/-/node-alias-1.0.4.tgz"; - sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; - }; - }; "node-appc-0.2.49" = { name = "node-appc"; packageName = "node-appc"; @@ -40220,13 +40229,13 @@ let sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg=="; }; }; - "snyk-docker-plugin-3.6.3" = { + "snyk-docker-plugin-3.10.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "3.6.3"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.6.3.tgz"; - sha512 = "+9pQc9+tetzMiUIV42WA3LAUkrZh6hhkhURv1X4kKyo2c1C8PSbCmpvycx/irilzfmH7dqBv0RXmb4vONPBXHA=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.10.0.tgz"; + sha512 = "0OIIqBOq76wBZ/09oB+L+5CdyNXEeDAgLH92TRydEj5iuJwjddAfzWtoqeCIeh3d09DidsHBRP8mMhXKAht7Sg=="; }; }; "snyk-go-parser-1.4.1" = { @@ -40283,13 +40292,13 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.15.2" = { + "snyk-mvn-plugin-2.17.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.15.2"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.15.2.tgz"; - sha512 = "2TTRizQxfUrA9w0pjxxsvGE+FgFSgog2wwpm378jNiKAZazGgV0txVMM4CoZJMz/tbUmzaJSS8DMQe1C7wlBFQ=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.17.0.tgz"; + sha512 = "Yl/d7CPJ0LRgHL5dciz/MbjnmsnwAEHA3uBE7Rr5bxZRJ1/ssot9e2OC9ORLJztK86Dggd9ReFocrzD5CWT5PA=="; }; }; "snyk-nodejs-lockfile-parser-1.22.0" = { @@ -47133,13 +47142,13 @@ let sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; }; - "vsce-1.76.0" = { + "vsce-1.76.1" = { name = "vsce"; packageName = "vsce"; - version = "1.76.0"; + version = "1.76.1"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.76.0.tgz"; - sha512 = "Agvw37yFXxOtCM5HRk7jdtCzLMvrVKWG0TJ+7NZHrQcHVe0ad79/WAvVSm8E58RSENj0dcmG/x1Ln5yRNVr9aw=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.76.1.tgz"; + sha512 = "WNx6JzRywxAOuhVpjmrsI0eHMK0mCA0YKD8u++7sprmhwCHsoQIBpSf0vp6kVMHBmafknr1Z6K7IC5jIjsNL9Q=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -50315,7 +50324,7 @@ in sources."@apollo/federation-0.16.2" (sources."@apollo/protobufjs-1.0.4" // { dependencies = [ - sources."@types/node-10.17.25" + sources."@types/node-10.17.26" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -50467,7 +50476,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -50999,7 +51008,7 @@ in sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.3" sources."graphql-tools-4.0.8" - sources."graphql-type-json-0.3.1" + sources."graphql-type-json-0.3.2" sources."graphql-upload-8.1.0" sources."growly-1.3.0" sources."har-schema-2.0.0" @@ -52125,7 +52134,7 @@ in dependencies = [ sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -52668,7 +52677,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.11" + sources."@types/node-13.13.12" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.2" @@ -53156,10 +53165,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "1.7.13"; + version = "1.7.14"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.13.tgz"; - sha512 = "sSONrN4MpxZmQ1+oprl9fZgTymxod9u4euEkoA4Dhb7/h5zuKeEJXfHbEoDzQIYejqq34ElFVMJHfogMOHjVhg=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.14.tgz"; + sha512 = "LOq7zTp2mb2omi1Pc0r1PEK2N+bwuPYpSfszm78Rsvvht9cU+o/YuC0HagG4VZ7iwuiy9VRvpNz218sMZJqm7Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -53347,7 +53356,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.11.0" - sources."fp-ts-2.6.3" + sources."fp-ts-2.6.5" sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" @@ -53469,7 +53478,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" - sources."@types/json-schema-7.0.4" + sources."@types/json-schema-7.0.5" sources."@typescript-eslint/experimental-utils-3.2.0" sources."@typescript-eslint/parser-3.2.0" sources."@typescript-eslint/typescript-estree-3.2.0" @@ -53535,7 +53544,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001079" + sources."caniuse-lite-1.0.30001081" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -53631,7 +53640,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.465" + sources."electron-to-chromium-1.3.466" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -54461,10 +54470,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.2.tgz"; - sha512 = "HJg4Y0gRqzxYkVZGZECjfTvC2sctBLKkvPZYIRUb/dVedsNqhO/NLA1xTdNZ0J3sU55sVOzqN2oKmwEEHNMs6A=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.3.tgz"; + sha512 = "VgL/6zKfm+ASlpNnCl7xY8CYMqycbK3ZEmn0ApVa+CITTkSLOBVFW5B9n53djq5HpPr9QxvGORbxYMQ0INo3kg=="; }; buildInputs = globalBuildInputs; meta = { @@ -54497,10 +54506,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.1.26"; + version = "2.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.26.tgz"; - sha512 = "4/XHrxJV5kN0aCrW/Kkw6s19ORs/V26zzZzQ/jFP8BT+HWZegbqPZIP9c+xB9nwknCwa9Tovx3mzcUMq0w0KMw=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.28.tgz"; + sha512 = "okVbjhKbFH6iTPeTpjxhtYtBBTFy5neOQYtn1H9CrbPpjnjodWzBDq3izoXCsC4BMMyBRzOwmwmJ0eA65S6JnQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -54560,7 +54569,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -54611,7 +54620,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001079" + sources."caniuse-lite-1.0.30001081" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -54670,7 +54679,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.465" + sources."electron-to-chromium-1.3.466" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -55270,10 +55279,10 @@ in sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" sources."@types/glob-7.1.2" - sources."@types/json-schema-7.0.4" + sources."@types/json-schema-7.0.5" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -56508,7 +56517,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.12.2" @@ -57120,7 +57129,7 @@ in sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.0.1" sources."ansi-styles-3.2.1" @@ -57488,7 +57497,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -58677,7 +58686,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.692.0" + sources."aws-sdk-2.693.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" sources."base64-js-1.3.1" @@ -58859,7 +58868,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -59188,7 +59197,7 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."callsites-3.1.0" - (sources."chalk-4.0.0" // { + (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."color-convert-2.0.1" @@ -59335,15 +59344,19 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "8.1.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-8.1.1.tgz"; - sha512 = "eYr8vOwCQynnI8b5e5R07D2JI6jCItT9QZzWKGZnqMs9lKN+z0bvn1ULCNKp0u4mz1V+lLRglIDiSGIkIDDcLw=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-9.0.0.tgz"; + sha512 = "yWXSiBvn6u4pLpGrLuebCtSQ8fJ8jUkUdfD6QqqYp7fSuY4+YW6mW1UusY/gCgfByrgU518o6DCeBmPg6HLkcw=="; }; dependencies = [ sources."@babel/code-frame-7.10.1" sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" + (sources."@babel/highlight-7.10.1" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) sources."@types/color-name-1.1.1" sources."acorn-7.2.0" sources."acorn-jsx-5.2.0" @@ -59360,7 +59373,15 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."callsites-3.1.0" - sources."chalk-2.4.2" + (sources."chalk-4.1.0" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.1.0" + ]; + }) sources."chardet-0.7.0" sources."cli-cursor-3.1.0" sources."cli-width-2.2.1" @@ -59368,21 +59389,17 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."core_d-1.0.1" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."cross-spawn-7.0.3" sources."debug-4.2.0" sources."deep-is-0.1.3" sources."doctrine-3.0.0" sources."emoji-regex-8.0.0" sources."escape-string-regexp-1.0.5" - sources."eslint-6.8.0" + sources."eslint-7.2.0" sources."eslint-scope-5.1.0" - sources."eslint-utils-1.4.3" + sources."eslint-utils-2.0.0" sources."eslint-visitor-keys-1.2.0" - sources."espree-6.2.1" + sources."espree-7.1.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ @@ -59419,7 +59436,6 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."strip-ansi-6.0.0" sources."supports-color-7.1.0" ]; }) @@ -59431,7 +59447,7 @@ in sources."js-yaml-3.14.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."levn-0.3.0" + sources."levn-0.4.1" sources."lodash-4.17.15" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" @@ -59441,19 +59457,18 @@ in sources."mute-stream-0.0.8" sources."nanolru-1.0.0" sources."natural-compare-1.4.0" - sources."nice-try-1.0.5" sources."once-1.4.0" sources."onetime-5.1.0" - sources."optionator-0.8.3" + sources."optionator-0.9.1" sources."os-tmpdir-1.0.2" sources."parent-module-1.0.1" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" + sources."path-key-3.1.1" sources."path-parse-1.0.6" - sources."prelude-ls-1.1.2" + sources."prelude-ls-1.2.1" sources."progress-2.0.3" sources."punycode-2.1.1" - sources."regexpp-2.0.1" + sources."regexpp-3.1.0" sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" @@ -59461,9 +59476,9 @@ in sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safer-buffer-2.1.2" - sources."semver-6.3.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."semver-7.3.2" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" (sources."slice-ansi-2.1.0" // { dependencies = [ @@ -59471,34 +59486,28 @@ in ]; }) sources."sprintf-js-1.0.3" - (sources."string-width-4.2.0" // { - dependencies = [ - sources."strip-ansi-6.0.0" - ]; - }) - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.0" sources."supports-color-5.5.0" (sources."table-5.4.6" // { dependencies = [ + sources."ansi-regex-4.1.0" sources."emoji-regex-7.0.3" sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" sources."tslib-1.13.0" - sources."type-check-0.3.2" + sources."type-check-0.4.0" sources."type-fest-0.8.1" sources."uri-js-4.2.2" sources."v8-compile-cache-2.1.1" - sources."which-1.3.1" + sources."which-2.0.2" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-1.0.3" @@ -61666,7 +61675,7 @@ in (sources."marked-terminal-4.1.0" // { dependencies = [ sources."ansi-styles-4.2.1" - sources."chalk-4.0.0" + sources."chalk-4.1.0" sources."supports-color-7.1.0" ]; }) @@ -63621,10 +63630,10 @@ in jake = nodeEnv.buildNodePackage { name = "jake"; packageName = "jake"; - version = "10.8.1"; + version = "10.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/jake/-/jake-10.8.1.tgz"; - sha512 = "eSp5h9S7UFzKdQERTyF+KuPLjDZa1Tbw8gCVUn98n4PbIkLEDGe4zl7vF4Qge9kQj06HcymnksPk8jznPZeKsA=="; + url = "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz"; + sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A=="; }; dependencies = [ sources."ansi-styles-3.2.1" @@ -65813,11 +65822,11 @@ in ]; }) sources."@octokit/rest-16.43.1" - sources."@octokit/types-4.1.9" + sources."@octokit/types-4.1.10" sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -67776,11 +67785,11 @@ in sources."@types/color-name-1.1.1" sources."@types/estree-0.0.44" sources."@types/graceful-fs-4.1.3" - sources."@types/istanbul-lib-coverage-2.0.2" + sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/json-schema-7.0.4" - sources."@types/node-14.0.12" + sources."@types/json-schema-7.0.5" + sources."@types/node-14.0.13" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.5" @@ -67961,7 +67970,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001079" + sources."caniuse-lite-1.0.30001081" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -68083,7 +68092,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.465" + sources."electron-to-chromium-1.3.466" (sources."elliptic-6.5.2" // { dependencies = [ sources."bn.js-4.11.9" @@ -68866,7 +68875,7 @@ in sources."aws4-1.10.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."chalk-4.0.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" @@ -71365,10 +71374,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "6.0.1"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-6.0.1.tgz"; - sha512 = "lzoVW35KWaBn0m1O1AVr0G9/20niK13mYftoAr09WuQszoeTdlrjCNyC0pRNiTfb5ZxubZaUAi7HdVzkEihwwA=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-7.0.1.tgz"; + sha512 = "z/i1nhxW1OJ2a8wZtm92PS+4vCZ5Y5d86pLDPJScWf8G3vTYJlxd11UqUymnaZWK2nYPMmgxnneAKnFGODDxjw=="; }; dependencies = [ sources."@npmcli/ci-detect-1.2.0" @@ -71428,7 +71437,7 @@ in }) sources."camelcase-5.3.1" sources."caseless-0.12.0" - sources."chalk-4.0.0" + sources."chalk-4.1.0" sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cint-8.2.1" @@ -71466,7 +71475,6 @@ in sources."env-paths-2.2.0" sources."err-code-1.1.2" sources."escape-goat-2.1.1" - sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" @@ -71488,7 +71496,6 @@ in sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-ansi-2.0.0" sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" @@ -71582,13 +71589,6 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."nested-error-stacks-2.0.1" - (sources."node-alias-1.0.4" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."supports-color-2.0.0" - ]; - }) (sources."node-gyp-6.1.0" // { dependencies = [ sources."chownr-1.1.4" @@ -71732,7 +71732,7 @@ in ]; buildInputs = globalBuildInputs; meta = { - description = "Find newer versions of dependencies than what your package.json or bower.json allows"; + description = "Find newer versions of dependencies than what your package.json allows"; homepage = https://github.com/raineorshine/npm-check-updates; license = "Apache-2.0"; }; @@ -72185,7 +72185,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001079" + sources."caniuse-lite-1.0.30001081" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -72326,7 +72326,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.465" + sources."electron-to-chromium-1.3.466" (sources."elliptic-6.5.2" // { dependencies = [ sources."bn.js-4.11.9" @@ -73933,10 +73933,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.1.5"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.1.5.tgz"; - sha512 = "yKNHD9xXeT1v7h4ExFDib7CWzNvHzuyUX4T+ItgWIJAnG0331WNCZHXAbcvMWazJASGb+NYWgcERCkwSWnHRcg=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.1.6.tgz"; + sha512 = "BMY+RH2ggxY27pSlO5RtGAtTUcUfFVetQZHJdZURWu9tankNO0iDuqSx4w9iBGdIm9+Gd5eQqNYylqTksu2ueA=="; }; buildInputs = globalBuildInputs; meta = { @@ -73973,7 +73973,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."camelcase-5.3.1" - sources."chalk-4.0.0" + sources."chalk-4.1.0" sources."chokidar-3.4.0" sources."cliui-6.0.0" sources."color-convert-2.0.1" @@ -74650,10 +74650,10 @@ in sources."@types/eslint-visitor-keys-1.0.0" sources."@types/estree-0.0.39" sources."@types/glob-7.1.2" - sources."@types/json-schema-7.0.4" + sources."@types/json-schema-7.0.5" sources."@types/minimatch-3.0.3" sources."@types/mocha-7.0.2" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/node-fetch-2.5.7" sources."@types/resolve-0.0.8" sources."@types/vscode-1.45.0" @@ -74696,7 +74696,7 @@ in sources."builtin-modules-3.1.0" sources."callsites-3.1.0" sources."camelcase-5.3.1" - (sources."chalk-4.0.0" // { + (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."color-convert-2.0.1" @@ -74999,7 +74999,7 @@ in sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.1.1" - (sources."vsce-1.76.0" // { + (sources."vsce-1.76.1" // { dependencies = [ sources."chalk-2.4.2" sources."semver-5.7.1" @@ -75339,7 +75339,7 @@ in sources."@protobufjs/utf8-1.1.0" sources."@serverless/cli-1.4.0" sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-2.30.13" // { + (sources."@serverless/components-2.30.14" // { dependencies = [ sources."globby-10.0.2" sources."semver-7.3.2" @@ -75381,7 +75381,7 @@ in sources."@types/lodash-4.14.155" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.11" + sources."@types/node-13.13.12" (sources."@typescript-eslint/typescript-estree-2.34.0" // { dependencies = [ sources."semver-7.3.2" @@ -75444,7 +75444,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.692.0" // { + (sources."aws-sdk-2.693.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -77065,10 +77065,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.336.0"; + version = "1.338.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.336.0.tgz"; - sha512 = "Dzk2xpaHZahZmjM8s3VHRPJgU1q28MAZr1TfnuRLIGDRT4eRiUdiFWdFMC6xqto7VJGJr31HYn1Di4Luv/1Bgg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.338.0.tgz"; + sha512 = "kygisp/bsNVLnATEdHeb3ASQS58b8DKOju9BcVNC3OpUi0Ajjiqy5o7RdfNPfCzp9lYglLT9grIM59zJuC2sFg=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -77088,13 +77088,17 @@ in sources."@snyk/gemfile-1.2.0" sources."@snyk/graphlib-2.1.9-patch" sources."@snyk/inquirer-6.2.2-patch" - (sources."@snyk/java-call-graph-builder-1.8.1" // { + (sources."@snyk/java-call-graph-builder-1.10.0" // { dependencies = [ sources."debug-4.2.0" ]; }) sources."@snyk/lodash-4.17.15-patch" - sources."@snyk/rpm-parser-1.2.0" + (sources."@snyk/rpm-parser-2.0.0" // { + dependencies = [ + sources."event-loop-spinner-2.0.0" + ]; + }) sources."@snyk/ruby-semver-2.2.0" (sources."@snyk/snyk-cocoapods-plugin-2.3.0" // { dependencies = [ @@ -77111,7 +77115,7 @@ in sources."@types/debug-4.1.5" sources."@types/hosted-git-info-2.7.0" sources."@types/js-yaml-3.12.4" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.5" sources."@yarnpkg/lockfile-1.1.0" @@ -77411,7 +77415,7 @@ in sources."debug-4.2.0" ]; }) - (sources."snyk-docker-plugin-3.6.3" // { + (sources."snyk-docker-plugin-3.10.0" // { dependencies = [ sources."debug-4.2.0" ]; @@ -77447,7 +77451,7 @@ in sources."debug-4.2.0" ]; }) - (sources."snyk-mvn-plugin-2.15.2" // { + (sources."snyk-mvn-plugin-2.17.0" // { dependencies = [ sources."@snyk/cli-interface-2.5.0" sources."debug-4.2.0" @@ -78780,7 +78784,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.692.0" // { + (sources."aws-sdk-2.693.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -81416,7 +81420,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" @@ -82354,7 +82358,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-13.13.11" + sources."@types/node-13.13.12" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -83050,7 +83054,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -84001,7 +84005,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."JSONSelect-0.2.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" @@ -85961,7 +85965,7 @@ in dependencies = [ sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."accepts-1.3.7" sources."ajv-6.12.2" sources."ajv-errors-1.0.1" @@ -86557,7 +86561,7 @@ in sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."@npmcli/move-file-1.0.1" - sources."@types/json-schema-7.0.4" + sources."@types/json-schema-7.0.5" sources."aggregate-error-3.0.1" sources."ajv-6.12.2" sources."ajv-keywords-3.4.1" @@ -86686,7 +86690,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.11" + sources."@types/node-13.13.12" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -87096,7 +87100,7 @@ in sources."@types/color-name-1.1.1" sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.12" + sources."@types/node-14.0.13" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.0.1" From 74ff4f65ca4b0fd9a88da1f0910cbd6eda62bad8 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Fri, 1 May 2020 12:53:33 +0800 Subject: [PATCH 0859/3452] nodePackages.escape-string-regexp: init at 4.0.0 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 76b24cf1f23d..94da2b87e887 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -66,6 +66,7 @@ , "elm-oracle" , "emoj" , "emojione" +, "escape-string-regexp" , "eslint" , "eslint_d" , {"fast-cli": "1.x"} diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 90341fa93166..0df9c505d89b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -59165,6 +59165,24 @@ in bypassCache = true; reconstructLock = true; }; + escape-string-regexp = nodeEnv.buildNodePackage { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Escape RegExp special characters"; + homepage = "https://github.com/sindresorhus/escape-string-regexp#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; From d6c0115cee9507b1908e7e1b4ce08995e429611d Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Fri, 1 May 2020 12:53:43 +0800 Subject: [PATCH 0860/3452] nodePackages.he: init at 1.2.0 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 94da2b87e887..5beb8dc7c6a1 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -81,6 +81,7 @@ , "gtop" , "gulp" , "gulp-cli" +, "he" , "html-minifier" , "htmlhint" , "http-server" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 0df9c505d89b..69045fa7d615 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -62544,6 +62544,24 @@ in bypassCache = true; reconstructLock = true; }; + he = nodeEnv.buildNodePackage { + name = "he"; + packageName = "he"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "A robust HTML entities encoder/decoder with full Unicode support."; + homepage = https://mths.be/he; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; html-minifier = nodeEnv.buildNodePackage { name = "html-minifier"; packageName = "html-minifier"; From 2265f3828b986b8815de68a9671d5a246306af99 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Jun 2020 00:42:20 +0000 Subject: [PATCH 0861/3452] piper: 0.4 -> 0.5 --- pkgs/os-specific/linux/piper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index f097f3e5465c..0da972316788 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -4,7 +4,7 @@ python3.pkgs.buildPythonApplication rec { pname = "piper"; - version = "0.4"; + version = "0.5"; format = "other"; @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { owner = "libratbag"; repo = "piper"; rev = version; - sha256 = "17h06j8lxpbfygq8fzycl7lml4vv7r05bsyhh3gga2hp0zms4mvg"; + sha256 = "00vrcsbsv2477l1ncpyzc61lhxgac84dsgr3sjs8qxw3nh1gaasv"; }; nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; From cc87aef2284f4259ce8090e10aa26754024e3f91 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 20:04:37 +0000 Subject: [PATCH 0862/3452] ffado: 2.4.2 -> 2.4.3 --- pkgs/os-specific/linux/ffado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 5dc5086a8c61..e814091d59e2 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -24,11 +24,11 @@ let in mkDerivation rec { pname = "ffado"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { url = "http://www.ffado.org/files/libffado-${version}.tgz"; - sha256 = "09dxy6fkfnvzk45lpr74hkqymii8a45jzlq6054f3jz65m8qvj3d"; + sha256 = "08bygzv1k6ai0572gv66h7gfir5zxd9klfy74z2pxqp6s5hms58r"; }; prePatch = '' From 44089bebbf89ee250415fc14ae4d32e468615424 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Jun 2020 00:55:56 +0000 Subject: [PATCH 0863/3452] pkgconf-unwrapped: 1.7.0 -> 1.7.3 --- pkgs/development/tools/misc/pkgconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix index 153257c85ae1..6fca02ad788b 100644 --- a/pkgs/development/tools/misc/pkgconf/default.nix +++ b/pkgs/development/tools/misc/pkgconf/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pkgconf"; - version = "1.7.0"; + version = "1.7.3"; nativeBuildInputs = [ removeReferencesTo ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0sb1a2lgiqaninv5s3zq09ilrkpsamcl68dyhqyz7yi9vsgb0vhy"; + sha256 = "1h7rf5cch0cbxp8nmjkkf272zrz2jgpqpr8a58ww75pn3jjswimq"; }; # Debian has outputs like these too: From d0f93d051584c08b226a6492a875f70db55d2422 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Jun 2020 01:02:08 +0000 Subject: [PATCH 0864/3452] phoronix-test-suite: 9.6.0 -> 9.6.1 --- pkgs/tools/misc/phoronix-test-suite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index 0abbcd5c3a28..83e96d8f9e65 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "9.6.0"; + version = "9.6.1"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "1wgw5lwpm3ylby2llnjiq356cdb3v1jghj7xq659c722wj617i88"; + sha256 = "1qnci0bipzq68mwfgmm7kcxjxcpfdrqf705am2jsj1mfd82y7yla"; }; buildInputs = [ php ]; From 470798c2cdf0110e0b437bd05c8d8053c947a903 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Jun 2020 01:11:27 +0000 Subject: [PATCH 0865/3452] pipenv: 2020.5.28 -> 2020.6.2 --- pkgs/development/tools/pipenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 4176db2940cf..5f9e122c16a9 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -18,11 +18,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2020.5.28"; + version = "2020.6.2"; src = fetchPypi { inherit pname version; - sha256 = "072lc4nywcf9q9irvanwcz7w0sd9dcyannz208jm6glyj8a271l1"; + sha256 = "12s7c3f3k5v1szdhklsxwisf9v3dk4mb9fh7762afpgs8mrrmm3x"; }; LC_ALL = "en_US.UTF-8"; From 4a162144911f0b9f5809cd3d7b169cc7a3515ed5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Jun 2020 01:34:04 +0000 Subject: [PATCH 0866/3452] gnome3.polari: 3.36.2 -> 3.36.3 --- pkgs/desktops/gnome-3/apps/polari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index 363d3c49af85..514eecc17365 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -5,13 +5,13 @@ let pname = "polari"; - version = "3.36.2"; + version = "3.36.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "12i0gp2kwp0b7af135q32qygkhh2025f74dqbaylfbmzacbdpz5c"; + sha256 = "0fpmrvhd40yay051bzn4x3gsrzdv42nav0pm5ps0np8wk1z689jg"; }; patches = [ From 58a4f737c61861a25ca754057b2868cc7231ddd8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Jun 2020 01:44:15 +0000 Subject: [PATCH 0867/3452] poezio: 0.13 -> 0.13.1 --- .../networking/instant-messengers/poezio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/pkgs/applications/networking/instant-messengers/poezio/default.nix index 485ceb2080fd..8dc70d6d7921 100644 --- a/pkgs/applications/networking/instant-messengers/poezio/default.nix +++ b/pkgs/applications/networking/instant-messengers/poezio/default.nix @@ -2,7 +2,7 @@ , pytest, aiodns, slixmpp, pyinotify, potr, mpd2, cffi, pkgconfig, setuptools }: buildPythonApplication rec { pname = "poezio"; - version = "0.13"; + version = "0.13.1"; disabled = pythonOlder "3.4"; @@ -14,7 +14,7 @@ buildPythonApplication rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "14ig7va0yf5wdhi8hk00f1wni8pj37agggdnvsicvcw2rz1cdw0x"; + sha256 = "041y61pcbdb86s04qwp8s1g6bp84yskc7vdizwpi2hz18y01x5fy"; }; checkPhase = '' From b78a0348d309068e0ea473cfd4e4c2f4a522089c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 11 Jun 2020 12:25:07 +1000 Subject: [PATCH 0868/3452] stdenv/check-meta: alignment/width --- pkgs/stdenv/generic/check-meta.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index c6c5be39d09b..c06f17b6fc19 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -107,11 +107,11 @@ let You can install it anyway by whitelisting this package, using the following methods: - - a) To temporarily allow all insecure packages, you can use an environment variable - for a single invocation of the nix tools: - - $ export NIXPKGS_ALLOW_INSECURE=1 + + a) To temporarily allow all insecure packages, you can use an environment + variable for a single invocation of the nix tools: + + $ export NIXPKGS_ALLOW_INSECURE=1 b) for `nixos-rebuild` you can add ‘${getName attrs}’ to `nixpkgs.config.permittedInsecurePackages` in the configuration.nix, @@ -124,8 +124,8 @@ let } c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add - ‘${getName attrs}’ to `permittedInsecurePackages` in - ~/.config/nixpkgs/config.nix, like so: + ‘${getName attrs}’ to `permittedInsecurePackages` in + ~/.config/nixpkgs/config.nix, like so: { permittedInsecurePackages = [ From fad8a8ebb4381a6221854fdac79f0c3f45fbeb28 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Jun 2020 04:04:28 +0000 Subject: [PATCH 0869/3452] protozero: 1.6.8 -> 1.7.0 --- pkgs/development/libraries/protozero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix index 0bbfab62fcd8..1c8e7e99313a 100644 --- a/pkgs/development/libraries/protozero/default.nix +++ b/pkgs/development/libraries/protozero/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "protozero"; - version = "1.6.8"; + version = "1.7.0"; src = fetchFromGitHub { owner = "mapbox"; repo = "protozero"; rev = "v${version}"; - sha256 = "1hfijpfylf1c71wa3mk70gjc88b6k1q7cxb87cwqdflw5q2x8ma6"; + sha256 = "0fdihfl5j68wayjjxvpvhvnjq1anzcfnfl09f68wpzbkg3zmhblz"; }; nativeBuildInputs = [ cmake ]; From 3eb34023369ee15015e8e818c491f8f20989cabf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Jun 2020 04:12:41 +0000 Subject: [PATCH 0870/3452] poppler: 0.88.0 -> 0.89.0 --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 93b49524dc1d..71ff58eaebeb 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "0.88.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "0.89.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "1isns9s484irq9ir4hbhpyqf6af2xzswh2pfrvk1k9d5x423hidl"; + sha256 = "0p4vxyl5cw8jgcy6hjb35236bhv9xy9xc21vsk2jqy1p8lv318pv"; }; outputs = [ "out" "dev" ]; From afb5de44bc28a605c3e39f8aeaf524be9248ccd0 Mon Sep 17 00:00:00 2001 From: Jason Miller Date: Wed, 20 May 2020 09:33:21 -0700 Subject: [PATCH 0871/3452] gnucash: Add libdbiDrivers env var to wrapper The GNU Cash package clearly *wants* to be able to use the libdbi backends, since it pulls them in as dependencies. However, you can only open xml formatted GNU cash files. The CMake scripts hard-code the DVD path to be basically /dbd. However GNU Cash does check the environment variable GNC_DBD_DIR, so I set that environment variable in the wrapper script. With this change, you should be able to e.g. "Save As" in the sqlite format. Fixes issue #57445 --- pkgs/applications/office/gnucash/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index a8630381ebf2..641d400886f9 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" \ --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ --prefix PERL5LIB ":" "$PERL5LIB" \ + --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd \ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" ''; From 40c3a8eeadcf096236d2f96727cde17ea35d8e22 Mon Sep 17 00:00:00 2001 From: Evils Date: Thu, 14 May 2020 19:36:23 +0200 Subject: [PATCH 0872/3452] sway-contrib.grimshot: init at 2020-05-08 --- .../window-managers/sway/contrib.nix | 79 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/applications/window-managers/sway/contrib.nix diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/window-managers/sway/contrib.nix new file mode 100644 index 000000000000..6ab8ea4ec8ec --- /dev/null +++ b/pkgs/applications/window-managers/sway/contrib.nix @@ -0,0 +1,79 @@ +{ stdenv +, fetchurl +, coreutils +, makeWrapper +, sway-unwrapped +, installShellFiles +, wl-clipboard +, libnotify +, slurp +, grim +, jq +}: + +{ + +grimshot = stdenv.mkDerivation rec { + pname = "grimshot"; + version = "2020-05-08"; + rev = "b1d08db5f5112ab562f89564825e3e791b0682c4"; + + # master has new fixes and features, and a man page + # after sway-1.5 these may be switched to sway-unwrapped.src + bsrc = fetchurl { + url = "https://raw.githubusercontent.com/swaywm/sway/${rev}/contrib/grimshot"; + sha256 = "1awzmzkib8a7q5s78xyh8za03lplqfpbasqp3lidqqmjqs882jq9"; + }; + + msrc = fetchurl { + url = "https://raw.githubusercontent.com/swaywm/sway/${rev}/contrib/grimshot.1"; + sha256 = "191xxjfhf61gkxl3b0f694h0nrwd7vfnyp5afk8snhhr6q7ia4jz"; + }; + + dontBuild = true; + dontUnpack = true; + dontConfigure = true; + + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + installPhase = '' + installManPage ${msrc} + + install -Dm 0755 ${bsrc} $out/bin/grimshot + wrapProgram $out/bin/grimshot --set PATH \ + "${stdenv.lib.makeBinPath [ + sway-unwrapped + wl-clipboard + coreutils + libnotify + slurp + grim + jq + ] }" + ''; + + doInstallCheck = true; + + installCheckPhase = '' + # check always returns 0 + if [[ $($out/bin/grimshot check | grep "NOT FOUND") ]]; then false + else + echo "grimshot check passed" + fi + ''; + + meta = with stdenv.lib; { + description = "A helper for screenshots within sway"; + homepage = "https://github.com/swaywm/sway/tree/master/contrib"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ + sway-unwrapped.meta.maintainers + evils + ]; + }; +}; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc405432704d..f73e398aab0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20187,6 +20187,7 @@ in swaybg = callPackage ../applications/window-managers/sway/bg.nix { }; swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; swaylock = callPackage ../applications/window-managers/sway/lock.nix { }; + sway-contrib = recurseIntoAttrs (callPackages ../applications/window-managers/sway/contrib.nix { }); swaylock-fancy = callPackage ../applications/window-managers/sway/lock-fancy.nix { }; From 1db748ef6aa41ec9777a9bf97963d3a4f38866c0 Mon Sep 17 00:00:00 2001 From: Evils Date: Mon, 18 May 2020 19:18:34 +0200 Subject: [PATCH 0873/3452] sway-contrib.inactive-windows-transparency: init at sway-unwrapped.version --- .../window-managers/sway/contrib.nix | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/window-managers/sway/contrib.nix index 6ab8ea4ec8ec..e2c27fb470f7 100644 --- a/pkgs/applications/window-managers/sway/contrib.nix +++ b/pkgs/applications/window-managers/sway/contrib.nix @@ -1,4 +1,5 @@ { stdenv + , fetchurl , coreutils , makeWrapper @@ -9,6 +10,8 @@ , slurp , grim , jq + +, python3Packages }: { @@ -76,4 +79,29 @@ grimshot = stdenv.mkDerivation rec { }; }; + +inactive-windows-transparency = python3Packages.buildPythonApplication rec { + # long name is long + lname = "inactive-windows-transparency"; + pname = "sway-${lname}"; + version = sway-unwrapped.version; + + src = sway-unwrapped.src; + + format = "other"; + dontBuild = true; + dontConfigure = true; + + propagatedBuildInputs = [ python3Packages.i3ipc ]; + + installPhase = '' + install -Dm 0755 $src/contrib/${lname}.py $out/bin/${lname}.py + ''; + + meta = sway-unwrapped.meta // { + description = "It makes inactive sway windows transparent"; + homepage = "https://github.com/swaywm/sway/tree/${sway-unwrapped.version}/contrib"; + }; +}; + } From b8f7c6e397c771ef63695b3b608c2e64ae0fb9ca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 08:24:40 +0200 Subject: [PATCH 0874/3452] python3.pkgs.aiohttp: disable failing python 3.8 tests --- .../python-modules/aiohttp/default.nix | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 7d164cf5e4f0..2f623dd0f0ef 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -12,7 +12,7 @@ , idna-ssl , typing-extensions , pytestrunner -, pytest +, pytestCheckHook , gunicorn , pytest-timeout , async_generator @@ -22,13 +22,14 @@ , trustme , brotlipy , freezegun +, isPy38 }: buildPythonPackage rec { pname = "aiohttp"; version = "3.6.2"; # https://github.com/aio-libs/aiohttp/issues/4525 python3.8 failures - disabled = pythonOlder "3.5" || pythonAtLeast "3.8"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; @@ -36,28 +37,38 @@ buildPythonPackage rec { }; checkInputs = [ - pytestrunner pytest gunicorn async_generator pytest_xdist + pytestrunner pytestCheckHook gunicorn async_generator pytest_xdist pytest-mock pytestcov trustme brotlipy freezegun ]; propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ] ++ lib.optionals (pythonOlder "3.7") [ idna-ssl typing-extensions ]; - # disable tests which attempt to do loopback connections - checkPhase = '' + disabledTests = [ + # disable tests which attempt to do loopback connections + "get_valid_log_format_exc" + "test_access_logger_atoms" + "aiohttp_request_coroutine" + "server_close_keepalive_connection" + "connector" + "client_disconnect" + "handle_keepalive_on_closed_connection" + "proxy_https_bad_response" + "partially_applied_handler" + "middleware" + ] ++ lib.optionals stdenv.is32bit [ + "test_cookiejar" + ] ++ lib.optionals isPy38 [ + # Python 3.8 https://github.com/aio-libs/aiohttp/issues/4525 + "test_read_boundary_with_incomplete_chunk" + "test_read_incomplete_chunk" + "test_request_tracing_exception" + ]; + + # aiohttp in current folder shadows installed version + # Probably because we run `python -m pytest` instead of `pytest` in the hook. + preCheck = '' cd tests - pytest -k "not get_valid_log_format_exc \ - and not test_access_logger_atoms \ - and not aiohttp_request_coroutine \ - and not server_close_keepalive_connection \ - and not connector \ - and not client_disconnect \ - and not handle_keepalive_on_closed_connection \ - and not proxy_https_bad_response \ - and not partially_applied_handler \ - ${lib.optionalString stdenv.is32bit "and not test_cookiejar"} \ - and not middleware" \ - --ignore=test_connector.py ''; meta = with lib; { From 210cc1633b8f55ff6236cf20c125a0e00bf748ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 26 May 2020 08:48:36 +0100 Subject: [PATCH 0875/3452] home-assistant: 0.110.1 -> 0.111.0 --- .../home-assistant/component-packages.nix | 19 +++++++++---------- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index aff2e9dc0cb9..a87c6947a1a1 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,10 +2,11 @@ # Do not edit! { - version = "0.110.1"; + version = "0.111.0"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; + "acmeda" = ps: with ps; [ ]; # missing inputs: aiopulse "actiontec" = ps: with ps; [ ]; "adguard" = ps: with ps; [ ]; # missing inputs: adguardhome "ads" = ps: with ps; [ ]; # missing inputs: pyads @@ -56,7 +57,6 @@ "aurora" = ps: with ps; [ ]; "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy "auth" = ps: with ps; [ aiohttp-cors]; - "automatic" = ps: with ps; [ aiohttp-cors]; # missing inputs: aioautomatic "automation" = ps: with ps; [ ]; "avea" = ps: with ps; [ ]; # missing inputs: avea "avion" = ps: with ps; [ ]; # missing inputs: avion @@ -107,6 +107,7 @@ "cast" = ps: with ps; [ PyChromecast]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ ]; # missing inputs: pychannels + "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook "cisco_ios" = ps: with ps; [ pexpect]; "cisco_mobility_express" = ps: with ps; [ ]; # missing inputs: ciscomobilityexpress "cisco_webex_teams" = ps: with ps; [ ]; # missing inputs: webexteamssdk @@ -276,7 +277,6 @@ "garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 "gdacs" = ps: with ps; [ ]; # missing inputs: aio_georss_gdacs - "gearbest" = ps: with ps; [ ]; # missing inputs: gearbest_parser "geizhals" = ps: with ps; [ ]; # missing inputs: geizhals "generic" = ps: with ps; [ ]; "generic_thermostat" = ps: with ps; [ ]; @@ -294,7 +294,7 @@ "glances" = ps: with ps; [ ]; # missing inputs: glances_api "gntp" = ps: with ps; [ ]; # missing inputs: gntp "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher - "gogogate2" = ps: with ps; [ ]; # missing inputs: pygogogate2 + "gogogate2" = ps: with ps; [ ]; # missing inputs: gogogate2-api "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client]; "google_assistant" = ps: with ps; [ aiohttp-cors]; "google_cloud" = ps: with ps; [ google_cloud_texttospeech]; @@ -315,6 +315,7 @@ "growatt_server" = ps: with ps; [ ]; # missing inputs: growattServer "gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player "gtfs" = ps: with ps; [ ]; # missing inputs: pygtfs + "guardian" = ps: with ps; [ ]; # missing inputs: aioguardian "habitica" = ps: with ps; [ ]; # missing inputs: habitipy "hangouts" = ps: with ps; [ ]; # missing inputs: hangups "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr @@ -372,7 +373,7 @@ "input_number" = ps: with ps; [ ]; "input_select" = ps: with ps; [ ]; "input_text" = ps: with ps; [ ]; - "insteon" = ps: with ps; [ ]; # missing inputs: insteonplm + "insteon" = ps: with ps; [ ]; # missing inputs: pyinsteon "integration" = ps: with ps; [ ]; "intent" = ps: with ps; [ aiohttp-cors]; "intent_script" = ps: with ps; [ ]; @@ -599,7 +600,7 @@ "plaato" = ps: with ps; [ aiohttp-cors]; "plant" = ps: with ps; [ ]; "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket]; - "plugwise" = ps: with ps; [ ]; # missing inputs: haanna + "plugwise" = ps: with ps; [ ]; # missing inputs: Plugwise_Smile "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts "point" = ps: with ps; [ aiohttp-cors]; # missing inputs: pypoint @@ -732,7 +733,7 @@ "soma" = ps: with ps; [ ]; # missing inputs: pysoma "somfy" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymfy "somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy - "sonarr" = ps: with ps; [ ]; + "sonarr" = ps: with ps; [ ]; # missing inputs: sonarr "songpal" = ps: with ps; [ ]; # missing inputs: python-songpal "sonos" = ps: with ps; [ pysonos]; "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp @@ -904,9 +905,8 @@ "worxlandroid" = ps: with ps; [ ]; "wsdot" = ps: with ps; [ ]; "wunderground" = ps: with ps; [ ]; - "wunderlist" = ps: with ps; [ ]; # missing inputs: wunderpy2 - "wwlln" = ps: with ps; [ ]; # missing inputs: aiowwlln "x10" = ps: with ps; [ ]; + "xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper "xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi "xeoma" = ps: with ps; [ ]; # missing inputs: pyxeoma "xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway @@ -934,7 +934,6 @@ "zestimate" = ps: with ps; [ xmltodict]; "zha" = ps: with ps; [ pyserial zha-quirks zigpy-deconz]; # missing inputs: bellows zigpy-cc zigpy-xbee zigpy-zigate zigpy "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac - "zigbee" = ps: with ps; [ ]; # missing inputs: xbee-helper "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl "zone" = ps: with ps; [ ]; "zoneminder" = ps: with ps; [ zm-py]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2d6d73474558..33fbbf663102 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.110.1"; + hassVersion = "0.111.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -86,7 +86,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1495kl997mvk9k11lk1ahv5w0yc0185qmxwa1h51j6d0zyqwz749"; + sha256 = "0zg7fng3cfksn4hr8vixsmj8cbag8h4dg4qi69n56hc71rnpl9kw"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 3481a2d1bd90..a2445dad324b 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 = "20200519.1"; + version = "20200603.2"; src = fetchPypi { inherit pname version; - sha256 = "149v56q5anzdfxf0dw1h39vdmcigx732a7abqjfb0xny5484iq8w"; + sha256 = "1p99f5q8frk5k5lh1gjxyq539p1iv9fslpbfirh8njx3d0a85l84"; }; # no Python tests implemented From 8b44404fd8a118a28d9242d38fe3d83517cebe3c Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Wed, 8 Apr 2020 15:03:05 -0700 Subject: [PATCH 0876/3452] pythonPackages.pyyaml: 5.2 -> 5.3.1 --- pkgs/development/python-modules/pyyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index 4d1d16b0f123..95ceeab3a04b 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyYAML"; - version = "5.2"; + version = "5.3.1"; src = fetchPypi { inherit pname version; - sha256 = "c0ee8eca2c582d29c3c2ec6e2c4f703d1b7f1fb10bc72317355a746057e7346c"; + sha256 = "0pb4zvkfxfijkpgd1b86xjsqql97ssf1knbd1v53wkg1qm9cgsmq"; }; # force regeneration using Cython From 6d2d76a7b789b6df19e133e8d19bda76f1313924 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:45:11 +0200 Subject: [PATCH 0877/3452] python: scikit-learn: 0.22.2.post1 -> 0.23.1 --- pkgs/development/python-modules/scikitlearn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 454e631634bf..d806e562b5d5 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.22.2.post1"; + version = "0.23.1"; # UnboundLocalError: local variable 'message' referenced before assignment disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "0z81n13dxvd6qwq5lsnzw2machmxbirhdhr73v90fi55ic9qslsp"; + sha256 = "e3fec1c8831f8f93ad85581ca29ca1bb88e2da377fb097cf8322aa89c21bc9b8"; }; buildInputs = [ From 778c74ee76ea1d1a4401605159bfee690486894a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:55 +0200 Subject: [PATCH 0878/3452] python: HTSeq: 0.11.4 -> 0.12.4 --- pkgs/development/python-modules/HTSeq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/HTSeq/default.nix b/pkgs/development/python-modules/HTSeq/default.nix index 8158c675898e..abb0c8520dd0 100644 --- a/pkgs/development/python-modules/HTSeq/default.nix +++ b/pkgs/development/python-modules/HTSeq/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, cython, numpy, pysam, matplotlib }: buildPythonPackage rec { - version = "0.11.4"; + version = "0.12.4"; pname = "HTSeq"; src = fetchPypi { inherit pname version; - sha256 = "1ncn30yvc18aiv1qsa0bvcbjwqy21s0a0kv3v0vghzsn8vbfzq7h"; + sha256 = "e3980bb4f12899442b4fa6f24f0ba149090f71cedb1eaf7128249afe4eb921ff"; }; buildInputs = [ cython numpy pysam ]; From 6c09a5c5e0a56ca1ee8c195b2363514a4b627a09 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:55 +0200 Subject: [PATCH 0879/3452] python: JayDeBeApi: 1.1.1 -> 1.2.2 --- pkgs/development/python-modules/JayDeBeApi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/JayDeBeApi/default.nix b/pkgs/development/python-modules/JayDeBeApi/default.nix index 738419e8c5c8..55b05d431e82 100644 --- a/pkgs/development/python-modules/JayDeBeApi/default.nix +++ b/pkgs/development/python-modules/JayDeBeApi/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "JayDeBeApi"; - version = "1.1.1"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "0a189xs9zw81jvwwglvf2qyqnk6ra0biljssx9n4ffayqn9glbds"; + sha256 = "e9847e437ad293ee3cc47767b74c387068cd21607842de8470d5d3f13d613083"; }; propagatedBuildInputs = [ From 88a8ad1af799f2e9374bf4ec6823b86788c08a77 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:56 +0200 Subject: [PATCH 0880/3452] python: Pygments: 2.5.2 -> 2.6.1 --- pkgs/development/python-modules/Pygments/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index a0c40550c9a9..e0c5539299dd 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.5.2"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe"; + sha256 = "647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44"; }; propagatedBuildInputs = [ docutils ]; From 68d92306f727dd27362fa1e4d2582baf336c9c49 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:56 +0200 Subject: [PATCH 0881/3452] python: WSME: 0.9.3 -> 0.10.0 --- pkgs/development/python-modules/WSME/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix index ac04861b41d7..f587d186bfd4 100644 --- a/pkgs/development/python-modules/WSME/default.nix +++ b/pkgs/development/python-modules/WSME/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "WSME"; - version = "0.9.3"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "e24fcff24392a0b176e560ffc6591b1f658342bbc992f84e0e8a3c53fd92580a"; + sha256 = "965b9ce48161e5c50d84aedcf50dca698f05bf07e9d489201bccaec3141cd304"; }; postPatch = '' From d59539367b4318d425738637e24a7193f662bf10 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:56 +0200 Subject: [PATCH 0882/3452] python: accupy: 0.2.0 -> 0.3.1 --- pkgs/development/python-modules/accupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index 07805c470c36..66edb53655e1 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "accupy"; - version = "0.2.0"; + version = "0.3.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "e27ca7eed8a1bde2e6e040f8f3ee94a5d7522f42c4360756c9ec8931cf13ca98"; + sha256 = "b568de740e1cd137a96af1801b4d3d5f795e0f97be25c29957f39f004fbcdf9a"; }; buildInputs = [ From 7aab950713ef53982e78aa114f05c3899d51e9b7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:56 +0200 Subject: [PATCH 0883/3452] python: adal: 1.2.3 -> 1.2.4 --- pkgs/development/python-modules/adal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 2fe70864c197..58a8ce72cb98 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "adal"; - version = "1.2.3"; + version = "1.2.4"; src = fetchPypi { inherit pname version; - sha256 = "2ae7e02cea4552349fed6d8c9912da400f7e643fc30098defe0dcd01945e7c54"; + sha256 = "7a15d22b1ee7ce1be92441199958748982feba6b7dec35fbf60f9b607bad1bc0"; }; propagatedBuildInputs = [ requests pyjwt dateutil ]; From 1ebdba0cdaa4d00ad388f98bb01bdb04cdb0d389 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:56 +0200 Subject: [PATCH 0884/3452] python: aioftp: 0.13.0 -> 0.16.0 --- pkgs/development/python-modules/aioftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index 91dbdc05a9e4..0ae39db36a52 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "aioftp"; - version = "0.13.0"; + version = "0.16.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5711c03433b510c101e9337069033133cca19b508b5162b414bed24320de6c18"; + sha256 = "94648d17dd3ca44614b59e8f795991b447258d82aa1b4cfecc0aceccf01b7495"; }; checkInputs = [ From 42abb5091155949dfaece46dd38e31966d9d3e2b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:56 +0200 Subject: [PATCH 0885/3452] python: aiohue: 1.10.1 -> 2.1.0 --- pkgs/development/python-modules/aiohue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 91c059497fca..68354cee0b27 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "1.10.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "d95e51f15c442d769004774e7b4220155e32dc6c8ae834b035a2f0d8ff783ff0"; + sha256 = "bdd08ad65505057b9dc8fc1b5558250bd13aeba681a493080f710ffffc4260a3"; }; propagatedBuildInputs = [ aiohttp ]; From 496837de44415626af53feeca115007822a392e0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:56 +0200 Subject: [PATCH 0886/3452] python: aiounifi: 11 -> 22 --- pkgs/development/python-modules/aiounifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index e6a9afcc2c99..589ebc08ef49 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "11"; + version = "22"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "e751cfd002f54dda76dfd498dcc53cb6fab6bff79773ca7d18c9c7b392046b12"; + sha256 = "ad2625c8a62e28781d50644f4a4df5a97a32174b965cd3b329820ae85e2dfcc3"; }; propagatedBuildInputs = [ aiohttp ]; From 79ef1ecc1fa074cc91e43e2c48a8c25e4fd18dc0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:56 +0200 Subject: [PATCH 0887/3452] python: alembic: 1.3.3 -> 1.4.2 --- pkgs/development/python-modules/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 4161dfbedfe4..18a56936d9db 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.3.3"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "d412982920653db6e5a44bfd13b1d0db5685cbaaccaf226195749c706e1e862a"; + sha256 = "035ab00497217628bf5d0be82d664d8713ab13d37b630084da8e1f98facf4dbf"; }; buildInputs = [ pytest pytestcov mock coverage ]; From 527a2ebed7c4edc775c86ed5d23519138779c8f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:56 +0200 Subject: [PATCH 0888/3452] python: alerta-server: 7.4.6 -> 7.5.5 --- pkgs/development/python-modules/alerta-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index 5f545c6ee2fe..f603de71855c 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta-server"; - version = "7.4.6"; + version = "7.5.5"; src = fetchPypi { inherit pname version; - sha256 = "f91889777a4d01f8ffca2f01d35cad3996a61178c26e8819c6d8eb746b951dd4"; + sha256 = "f6d80654f063af45167c6b4f5f25a9015e728f3f600c5565ddb85964b8c9874b"; }; propagatedBuildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 pyyaml]; From 280e05cc7c2ac4d41a40b6c9e00517653e0b0fee Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:56 +0200 Subject: [PATCH 0889/3452] python: alerta: 7.4.5 -> 7.5.1 --- pkgs/development/python-modules/alerta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index 4a4d61bff7d6..ae984bbd38b5 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta"; - version = "7.4.5"; + version = "7.5.1"; src = fetchPypi { inherit pname version; - sha256 = "926f1101a1b57a9fad611f1e1d5af751693efcc344a9db01af50e2fe0d362d84"; + sha256 = "e903d4b097d4650983faecedc4e2dffd27a962b671643098f8425f9a19884d0f"; }; propagatedBuildInputs = [ six click requests pytz tabulate ]; From ea058a52204cd10e3c9a80a79abfc7084bec4f57 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:57 +0200 Subject: [PATCH 0890/3452] python: amqp: 2.5.2 -> 2.6.0 --- pkgs/development/python-modules/amqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index bfd3cd7055e3..20dc0d397122 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "amqp"; - version = "2.5.2"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "77f1aef9410698d20eaeac5b73a87817365f457a507d82edf292e12cbb83b08d"; + sha256 = "24dbaff8ce4f30566bb88976b398e8c4e77637171af3af6f1b9650f48890e60b"; }; checkInputs = [ pytest case pytest-sugar ]; From e2af1da630d144b18ed8ebe1a68ff5644bb1448e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:57 +0200 Subject: [PATCH 0891/3452] python: anytree: 2.7.3 -> 2.8.0 --- pkgs/development/python-modules/anytree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index b07b585573de..6b25952493be 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "anytree"; - version = "2.7.3"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "05736hamjv4f38jw6z9y4wckc7mz18ivbizm1s3pb0n6fp1sy4zk"; + sha256 = "3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"; }; patches = lib.optionals withGraphviz [ From 723723e5a41adc23639630bc196d6cf62921f41e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:57 +0200 Subject: [PATCH 0892/3452] python: apispec: 3.1.1 -> 3.3.0 --- pkgs/development/python-modules/apispec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index fa8b14853aa3..7128f9a96d0a 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apispec"; - version = "3.1.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "24b8490c22310b0779a058ccb24ec2fef33d571bb5aba1f525ab5963b0eabcdd"; + sha256 = "419d0564b899e182c2af50483ea074db8cb05fee60838be58bb4542095d5c08d"; }; checkInputs = [ From 56dd865d9951465b0207d5c90222a2695351fe25 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:57 +0200 Subject: [PATCH 0893/3452] python: aresponses: 1.1.2 -> 2.0.0 --- pkgs/development/python-modules/aresponses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix index 472911340ad8..c790f4804105 100644 --- a/pkgs/development/python-modules/aresponses/default.nix +++ b/pkgs/development/python-modules/aresponses/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aresponses"; - version = "1.1.2"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "20a63536d86af6f31f9b0720c561bdc595b6bfe071940e347ab58b11caff9e1b"; + sha256 = "58693a6b715edfa830a20903ee1d1b2a791251923f311b3bebf113e8ff07bb35"; }; propagatedBuildInputs = [ From d689cfeef066a590c6be7075d628a80e2e40efc7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:57 +0200 Subject: [PATCH 0894/3452] python: astral: 1.10.1 -> 2.2 --- pkgs/development/python-modules/astral/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 84ce4d1d5b7b..11a29f5d37a9 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "astral"; - version = "1.10.1"; + version = "2.2"; src = fetchPypi { inherit pname version; - sha256 = "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1"; + sha256 = "e41d9967d5c48be421346552f0f4dedad43ff39a83574f5ff2ad32b6627b6fbe"; }; propagatedBuildInputs = [ pytz requests ]; From 1ddbc1f042f254a63f42e6e233141d5e1b88ff72 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:57 +0200 Subject: [PATCH 0895/3452] python: astroid: 2.3.3 -> 2.4.1 --- pkgs/development/python-modules/astroid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 2084065c8d5c..9a8b3c7a1d78 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.3.3"; + version = "2.4.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "71ea07f44df9568a75d0f354c49143a4575d90645e9fead6dfb52c26a85ed13a"; + sha256 = "4c17cea3e592c21b6e222f673868961bad77e1f985cb1694ed077475a89229c1"; }; # From astroid/__pkginfo__.py From 73cbf2aed16f94d54c831631bee4b22df0851335 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:57 +0200 Subject: [PATCH 0896/3452] python: asyncssh: 2.1.0 -> 2.2.1 --- pkgs/development/python-modules/asyncssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index ab647935364f..ad7612259df0 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.1.0"; + version = "2.2.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "19d0b4c65115d09b42ed21c748884157babfb3055a6e130ea349dfdcbcef3380"; + sha256 = "baf9f1aa397a104a0c3923bae927796ca57063ce62330767131b418cd833338e"; }; patches = [ From 4b101def786a311d2e910fd46ea6b533722c9556 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:57 +0200 Subject: [PATCH 0897/3452] python: atom: 0.4.3 -> 0.5.1 --- pkgs/development/python-modules/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index 465681a71f3f..a100cf178268 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "atom"; - version = "0.4.3"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "ce96fb50326a3bfa084463dbde1cf2e02c92735e5bc324d836355c25af87e0ae"; + sha256 = "ce0c600e4b26b7553c926b3b8253df7ae19bbf2678bdc2d46eb29b5f9149f172"; }; propagatedBuildInputs = [ future ]; From b0d0aeea11d88fbe58caaaece48fe50c4b991070 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:57 +0200 Subject: [PATCH 0898/3452] python: atomicwrites: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/atomicwrites/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix index 019dcbe9bed7..03401f226a2e 100644 --- a/pkgs/development/python-modules/atomicwrites/default.nix +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "atomicwrites"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6"; + sha256 = "ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"; }; # Tests depend on pytest but atomicwrites is a dependency of pytest From 315688537c36591230ba3fe8fe4aa3d415135db6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:57 +0200 Subject: [PATCH 0899/3452] python: audio-metadata: 0.9.0 -> 0.11.1 --- pkgs/development/python-modules/audio-metadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index d4f97dd4ce50..f477cbfc0a88 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "audio-metadata"; - version = "0.9.0"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "1v7ww3csyxrhnpvpynla64hfn1wp37vbw7srh9343n4wc02mh65l"; + sha256 = "9e7ba79d49cf048a911d5f7d55bb2715c10be5c127fe5db0987c5fe1aa7335eb"; }; postPatch = '' From ccb984199c823a62c9b9b24265bcdad3e8eca441 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:57 +0200 Subject: [PATCH 0900/3452] python: auth0-python: 3.9.2 -> 3.10.0 --- pkgs/development/python-modules/auth0-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 4efe1f50ef2c..e2fafb3aef75 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "3.9.2"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "12870b4806095b707c4eed7bf8cdfeb3722d990366bc6a9772d1520e90efa73b"; + sha256 = "e02525fd60d4b1e7e08bdc539b536db635da28ee25cc882412be4296802d0281"; }; propagatedBuildInputs = [ From fe57d9bbcfdfdf72ed90e9ed970360bef9960743 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:58 +0200 Subject: [PATCH 0901/3452] python: authheaders: 0.12.2 -> 0.13.0 --- pkgs/development/python-modules/authheaders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix index c8938c649b97..1780f552679a 100644 --- a/pkgs/development/python-modules/authheaders/default.nix +++ b/pkgs/development/python-modules/authheaders/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "authheaders"; - version = "0.12.2"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "a6f96d1dfb7a6cffcdd78d1582914d4f9a0b25d66e1cf5ce959446c92cd8b74f"; + sha256 = "935726b784cc636cbcfed2c977f1a6887dc60056806da4eff60db932c5896692"; }; propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix ] From 324ee168f40785b6601667f469e74810512bd684 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:58 +0200 Subject: [PATCH 0902/3452] python: autobahn: 19.11.2 -> 20.4.3 --- pkgs/development/python-modules/autobahn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 1f2972c7663b..4ad97ebc93fa 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "autobahn"; - version = "19.11.2"; + version = "20.4.3"; src = fetchPypi { inherit pname version; - sha256 = "64fa063b3a1ab16588037d4713f13f66167f7ad2a2e95fd675decbc3bc85c089"; + sha256 = "c6fe745d52ba9f9eecf791cd31f558df42aebfc4f9ee558a8f1d18c707e1ae1f"; }; propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++ From b65e65bfe49508a5f545ba2d3bc8c67ba6ec3939 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:58 +0200 Subject: [PATCH 0903/3452] python: Automat: 0.8.0 -> 20.2.0 --- pkgs/development/python-modules/automat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index 8a9f85b54fdd..78a3259a2878 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -2,12 +2,12 @@ m2r, setuptools_scm, six, attrs }: buildPythonPackage rec { - version = "0.8.0"; + version = "20.2.0"; pname = "Automat"; src = fetchPypi { inherit pname version; - sha256 = "269a09dfb063a3b078983f4976d83f0a0d3e6e7aaf8e27d8df1095e09dc4a484"; + sha256 = "7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33"; }; buildInputs = [ m2r setuptools_scm ]; From 0ecabf652260f09898d543123c526879095d5011 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:58 +0200 Subject: [PATCH 0904/3452] python: av: 7.0.1 -> 8.0.2 --- pkgs/development/python-modules/av/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 7ccc569a87e5..123a53d5cf3a 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "av"; - version = "7.0.1"; + version = "8.0.2"; src = fetchPypi { inherit pname version; - sha256 = "10qav9dryly9h6n8vypx5m334v2lh88fsvgfg0zjy4bxjslay4zv"; + sha256 = "a3bba6bf68766b8a1a057f28869c7078cf0a1ec3207c7788c2ce8fe6f6bd8267"; }; checkInputs = [ numpy ]; From c42b0e737215694915f0816850799a38b0001848 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:58 +0200 Subject: [PATCH 0905/3452] python: awkward1: 0.2.22 -> 0.2.23 --- pkgs/development/python-modules/awkward1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward1/default.nix b/pkgs/development/python-modules/awkward1/default.nix index 0c2b3338690f..e3549e0a4a85 100644 --- a/pkgs/development/python-modules/awkward1/default.nix +++ b/pkgs/development/python-modules/awkward1/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward1"; - version = "0.2.22"; + version = "0.2.23"; src = fetchPypi { inherit pname version; - sha256 = "c64a8ad0204743d49cf2f8775f92d9c23dd9d7eb6996a61f4a9de57a53d429f9"; + sha256 = "d7458b499959af66e0a640e29e6b676a39cc9614cd504e5a2e8f8d0c7f546597"; }; nativeBuildInputs = [ cmake ]; From c92ab41dc4d387928c4d8d4f73d0821c2f55e95f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:58 +0200 Subject: [PATCH 0906/3452] python: aws-sam-translator: 1.21.0 -> 1.24.0 --- .../development/python-modules/aws-sam-translator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 13bc3cdbbbb6..a9b8834be260 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.21.0"; + version = "1.24.0"; src = fetchPypi { inherit pname version; - sha256 = "0diyqiwas9fhkj7p5hm08lvkd5h9yn9zqilwww2av04mclfk82ij"; + sha256 = "f6b67545a87ec1e276bd5bf06abcc84332c4eb9dfa2fd415113e07a908fe55bb"; }; # Tests are not included in the PyPI package From 84dd868adda24f29bb96df549487613db698d6c3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:58 +0200 Subject: [PATCH 0907/3452] python: aws-xray-sdk: 2.4.3 -> 2.5.0 --- pkgs/development/python-modules/aws-xray-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 6e12a1bcb31a..6364fe77f11b 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.4.3"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "263a38f3920d9dc625e3acb92e6f6d300f4250b70f538bd009ce6e485676ab74"; + sha256 = "8dfa785305fc8dc720d8d4c2ec6a58e85e467ddc3a53b1506a2ed8b5801c8fc7"; }; propagatedBuildInputs = [ From 59da9728b1a37501f07d905ab8283a368b74dd62 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:58 +0200 Subject: [PATCH 0908/3452] python: azure-core: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/azure-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index dc31669f7182..8e4fa9666e4b 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.6.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "181iyigm11y56lf1kwv7pcdyppavpwjb1b6k3qp3jnbqaypad9mg"; + sha256 = "d10b74e783cff90d56360e61162afdd22276d62dc9467e657ae866449eae7648"; }; propagatedBuildInputs = [ From 1f5b107f750f51c293660872965e29b2c6bef176 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:58 +0200 Subject: [PATCH 0909/3452] python: azure-mgmt-cognitiveservices: 6.1.0 -> 6.2.0 --- .../python-modules/azure-mgmt-cognitiveservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index c16814760985..98ca58e43407 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "6.1.0"; + version = "6.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e0c4bbe656ababb942d708ee04f3f3305a2023e322a8b3fb1d8503aa682f59c4"; + sha256 = "93503507ba87c18fe24cd3dfcd54e6e69a4daf7636f38b7537e09cee9a4c13ce"; }; propagatedBuildInputs = [ From defc2d1afa7c34d3fb53dd264189073a64ccbb96 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:58 +0200 Subject: [PATCH 0910/3452] python: azure-mgmt-hdinsight: 1.4.0 -> 1.5.0 --- .../python-modules/azure-mgmt-hdinsight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 4b8aef08f1c5..8ca128dad87b 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.4.0"; + version = "1.5.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0zmmfj7z1zrayjqwqybcn3bwm47d2ngyxm1g6fh2iw5c2f9czycv"; + sha256 = "d13088bb506700a7aecf59faf042cb48dc82c423082482b2f50cc2403ac43e55"; extension = "zip"; }; From cc52ccb77dd1610b682e28b4d01651bc41dd1cd7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:59 +0200 Subject: [PATCH 0911/3452] python: azure-mgmt-kusto: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/azure-mgmt-kusto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index 08a9b6b507ef..edcfde1d1abb 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.8.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "40f8e62db145d31731018b83baf2d1a78b585514c373dd3c095f1f6835d17d23"; + sha256 = "b12388df60982265c9f18e7382c5cc0e389c071227865cadc626b9ff9c6e3871"; extension = "zip"; }; From ca44774478204d41318efeba58e28a31d1281c0f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:59 +0200 Subject: [PATCH 0912/3452] python: azure-mgmt-resource: 9.0.0 -> 10.0.0 --- .../python-modules/azure-mgmt-resource/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 81f8e15953dc..45fabcb88af1 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { - version = "9.0.0"; + version = "10.0.0"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "00bmdbr7hdwb3ibr9sfbgbmmr6626qlz19cdi84d87rcisczf4nw"; + sha256 = "bd9a3938f5423741329436d2da09693845c2fad96c35fadbd7c5ae5213208345"; }; postInstall = if isPy3k then "" else '' From 4ac788fb1fcdfe66e25599f4763c8e53f7fabef5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:59 +0200 Subject: [PATCH 0913/3452] python: base58: 1.0.3 -> 2.0.0 --- pkgs/development/python-modules/base58/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix index 8f26a3340a7a..e0d4d59fc035 100644 --- a/pkgs/development/python-modules/base58/default.nix +++ b/pkgs/development/python-modules/base58/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "base58"; - version = "1.0.3"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "9a793c599979c497800eb414c852b80866f28daaed5494703fc129592cc83e60"; + sha256 = "c83584a8b917dc52dd634307137f2ad2721a9efb4f1de32fc7eaaaf87844177e"; }; checkInputs = [ pytest pyhamcrest ]; From 97086e7bf10a629873012397be25d4b16e5f4e93 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:59 +0200 Subject: [PATCH 0914/3452] python: beautifulsoup4: 4.8.2 -> 4.9.1 --- pkgs/development/python-modules/beautifulsoup4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index fc07c4ae96e9..f804ea9b282d 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "beautifulsoup4"; - version = "4.8.2"; + version = "4.9.1"; src = fetchPypi { inherit pname version; - sha256 = "05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a"; + sha256 = "73cc4d115b96f79c7d77c1c7f7a0a8d4c57860d1041df407dd1aae7f07a77fd7"; }; checkInputs = [ pytest ]; From 99c1069ce2c28d2a95e256bf9231c9786c1b4ea4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:59 +0200 Subject: [PATCH 0915/3452] python: BespON: 0.3.0 -> 0.4.0 --- pkgs/development/python-modules/bespon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bespon/default.nix b/pkgs/development/python-modules/bespon/default.nix index 7949675d6517..cb6dbcf0d9c6 100644 --- a/pkgs/development/python-modules/bespon/default.nix +++ b/pkgs/development/python-modules/bespon/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.4.0"; pname = "BespON"; src = fetchPypi { inherit pname version; - sha256 = "0698vx1kh8c84f5qfhl4grdlyn1lljvdih8yczdz0pql8wkn8i7v"; + sha256 = "4acfa3f918d416654beccd4db69290f498edb78bf39941287dcbc068b9a7ce2f"; }; propagatedBuildInputs = [ ]; From 7c6c27566d80e3f9642aa22a791763320220d5af Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:59 +0200 Subject: [PATCH 0916/3452] python: biopython: 1.76 -> 1.77 --- pkgs/development/python-modules/biopython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 76de4c390546..773d8193cb02 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.76"; + version = "1.77"; src = fetchPypi { inherit pname version; - sha256 = "0wlch9xpa0fpgjzyxi6jsfca6iakaq9a05927xg8vqnmvaccnwrq"; + sha256 = "fb1936e9ca9e7af8de1050e84375f23328e04b801063edf0ad73733494d8ec42"; }; propagatedBuildInputs = [ numpy ]; From 01da502dacfb86e1674c94e898c14e418a0a7880 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:59 +0200 Subject: [PATCH 0917/3452] python: BoltzTraP2: 19.11.1 -> 20.2.1 --- pkgs/development/python-modules/boltztrap2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index d89cf3c615d9..e1b9bc165216 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "19.11.1"; + version = "20.2.1"; pname = "BoltzTraP2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "3927ae782b7329dede2bf85ff5ff328c88f0514ecb592267e28912340f395d3e"; + sha256 = "1cbf17c5479eec82efd1e8a26202c3320b1986597a08706cafa46bfb80cc3001"; }; dontUseCmakeConfigure = true; From 9dd296b3b8f7bd693b548a650078bd5022b89c19 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:59 +0200 Subject: [PATCH 0918/3452] python: boto3: 1.13.23 -> 1.13.24 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 1baa668d3c89..2c42bf75a5e3 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.13.23"; # N.B: if you change this, change botocore too + version = "1.13.24"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "bcaa88b2f81b88741c47da52f3414c876236700441df87b6198f860e6a200d6f"; + sha256 = "5df1f3f84587b4d812f6f178031119b80920822b459bbb70ad49f431128655dc"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 1bc1f8493b0f5575750e44d5c7ca7183573530d8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:59 +0200 Subject: [PATCH 0919/3452] python: botocore: 1.16.23 -> 1.16.24 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 060abad204b0..90f608e38645 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.16.23"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.16.24"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "5831068c9b49b4c91b0733e0ec784a7733d8732359d73c67a07a0b0868433cae"; + sha256 = "17bc71415186efb86a25dd674f78064cdd85139485967d5a0741c7b83d62cf5b"; }; propagatedBuildInputs = [ From 93f2863bb41b31da70e70631c8ed0befafd11c87 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:46:59 +0200 Subject: [PATCH 0920/3452] python: breathe: 4.14.2 -> 4.18.1 --- pkgs/development/python-modules/breathe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 842c8289f777..0f06e34a54d1 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.14.2"; + version = "4.18.1"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1vj2yylff07hh4l3sh3srhpnrk1q6pxznvwqzgmbplhn8gf5rimb"; + sha256 = "03f56cc6dd0bf5ac3d8e8eb380d212257e16de79fce5e6186afd5c1835561e22"; }; propagatedBuildInputs = [ docutils six sphinx ]; From 7354ebef1aae91c0655e6757477518565d68aadd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:00 +0200 Subject: [PATCH 0921/3452] python: broadlink: 0.12.0 -> 0.14.0 --- pkgs/development/python-modules/broadlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix index 971b56d8b885..9efcd660c0dc 100644 --- a/pkgs/development/python-modules/broadlink/default.nix +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "broadlink"; - version = "0.12.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "6448327f8f1cd0c103971a724a3e60629ccb5e8c302e7fdcbde6464e8edef2d8"; + sha256 = "f771456ed990187f170d1561e2fd3d490ef646a2570a0286fe709a7115abcb49"; }; postPatch = '' From 694018628e28a241a073737e7b447a14fff57624 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:00 +0200 Subject: [PATCH 0922/3452] python: browser-cookie3: 0.9.1 -> 0.11.1 --- pkgs/development/python-modules/browser-cookie3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index 909641a9ffdf..61e50246a139 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}: buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.9.1"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "42e73e0276083ff162080860cd039138760921a56a0f316775cecee37d444c3f"; + sha256 = "5d1f825fc9cc6f98fe0ee3f97cdb4947c22d59ac8a11643da5837ebd8c873f05"; }; disabled = !isPy3k; From ffff619c9dbb8d29f99151ffe4664f4a66e66626 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:00 +0200 Subject: [PATCH 0923/3452] python: BTrees: 4.6.1 -> 4.7.2 --- pkgs/development/python-modules/btrees/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index e51d0e75a0bb..08f2c1eeb2ff 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "BTrees"; - version = "4.6.1"; + version = "4.7.2"; buildInputs = [ transaction ]; propagatedBuildInputs = [ persistent zope_interface ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b3a0e1d073800bf7bcca6cbb97a6b3c9ec485a4ba3ee0b354da1ed076cfb9f30"; + sha256 = "7ce4a5eb5c135bcb5c06b5bd1ca6fd7fd39d8631306182307ed8bc30d3033846"; }; meta = with stdenv.lib; { From 6c3b1571ed4ffbcef2ebc9f60c0ac676b063b457 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:00 +0200 Subject: [PATCH 0924/3452] python: cachetools: 4.0.0 -> 4.1.0 --- pkgs/development/python-modules/cachetools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 30f0d9132bb1..f22d4fc08852 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cachetools"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "9a52dd97a85f257f4e4127f15818e71a0c7899f121b34591fcc1173ea79a0198"; + sha256 = "1d057645db16ca7fe1f3bd953558897603d6f0b9c51ed9d11eb4d071ec4e2aab"; }; meta = with stdenv.lib; { From 857c3524c2b097c2b3e5b33793c6d1cf7a9d2dfd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:00 +0200 Subject: [PATCH 0925/3452] python: caldav: 0.6.2 -> 0.7.0 --- pkgs/development/python-modules/caldav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 7a7a175362ac..15c2dd2b0fe0 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "caldav"; - version = "0.6.2"; + version = "0.7.0"; propagatedBuildInputs = [ tzlocal requests vobject lxml nose ]; src = fetchPypi { inherit pname version; - sha256 = "80c33b143539da3a471148ac89512f67d9df3a5286fae5a023e2ad3923246c0d"; + sha256 = "f5982b204fcfac8598381e35e46b667542bd728009971271463f81100e6e5943"; }; # xandikos is only a optional test dependency, not available for python3 From b0d75c3403f9887728f9fd315b52c4f3d829a41a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:00 +0200 Subject: [PATCH 0926/3452] python: cassandra-driver: 3.20.2 -> 3.23.0 --- pkgs/development/python-modules/cassandra-driver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 6fe80e16e129..7829afa83f92 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "cassandra-driver"; - version = "3.20.2"; + version = "3.23.0"; src = fetchPypi { inherit pname version; - sha256 = "03nycyn5nd1pnrg6fffq3wcjqnw13lgja137zq5zszx68mc15wnl"; + sha256 = "a3b075bfd36677024b1dcf55a561fac161fc4f4065f01557b21a0b02ebad05c2"; }; nativeBuildInputs = [ cython ]; From 7d13579c640b72ad87478a988e437c648eb5c332 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:00 +0200 Subject: [PATCH 0927/3452] python: catalogue: 0.2.1 -> 2.0.0 --- pkgs/development/python-modules/catalogue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index cfc66376d9b2..0697a4e61179 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "catalogue"; - version = "0.2.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1720242b2d0c11e666f9ceed39f0611236815b06af5421f7d8cbca48a4cff3af"; + sha256 = "34f8416ec5e7ed08e55c10414416e67c3f4d66edf83bc67320c3290775293816"; }; propagatedBuildInputs = [ importlib-metadata ]; From 3e4f6d85c34214eb95942fc53f267e4c58da4bfb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:00 +0200 Subject: [PATCH 0928/3452] python: cfgv: 2.0.1 -> 3.1.0 --- pkgs/development/python-modules/cfgv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix index a58669e58a8b..c040ae7a5f3f 100644 --- a/pkgs/development/python-modules/cfgv/default.nix +++ b/pkgs/development/python-modules/cfgv/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cfgv"; - version = "2.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0i1iam461bd6bphd402r7payr2m71xivy5zp6k2gjnv67fa8gczd"; + sha256 = "c8e8f552ffcc6194f4e18dd4f68d9aef0c0d58ae7e7be8c82bee3c5e9edfa513"; }; propagatedBuildInputs = [ six ]; From 7de53e1fa423f250e959b732e17e4c243a1fe0b9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:00 +0200 Subject: [PATCH 0929/3452] python: cfn-lint: 0.26.3 -> 0.33.0 --- pkgs/development/python-modules/cfn-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 79482ae5c168..6806ecb5054a 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.26.3"; + version = "0.33.0"; src = fetchPypi { inherit pname version; - sha256 = "384c37d239579c7b9f61a3aaadb92ebe81f37cd6ee6a161485401179af6c7a44"; + sha256 = "b74bb89a3d0da4a744179b07bc186b9fbc4800f929bf635bb6246e80fb91a953"; }; propagatedBuildInputs = [ From 451bbefc9ce90f5a45c97a3ed96763abb1423a6f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:00 +0200 Subject: [PATCH 0930/3452] python: cgen: 2019.1 -> 2020.1 --- pkgs/development/python-modules/cgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cgen/default.nix b/pkgs/development/python-modules/cgen/default.nix index 30ecb8d1b33b..06beebc2f326 100644 --- a/pkgs/development/python-modules/cgen/default.nix +++ b/pkgs/development/python-modules/cgen/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "cgen"; - version = "2019.1"; + version = "2020.1"; src = fetchPypi { inherit pname version; - sha256 = "04gxzfjy2f9qsg3scg1sx4q4rhw5p036dyqngxyfsai0wvj5ya6m"; + sha256 = "4ec99d0c832d9f95f5e51dd18a629ad50df0b5464ce557ef42c6e0cd9478bfcf"; }; checkInputs = [ pytest ]; From 68ef6ad468802e7d12c00bef57c94a54565a100f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:01 +0200 Subject: [PATCH 0931/3452] python: chalice: 1.13.1 -> 1.14.1 --- pkgs/development/python-modules/chalice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 1cf489d7fa5c..cb5fab46140d 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.13.1"; + version = "1.14.1"; src = fetchPypi { inherit pname version; - sha256 = "c898c8726ed008615f0b1988b9cd1e1f74fd230e7b24bca53bfd5f96af6e55a1"; + sha256 = "457e71fd84951574ccbe72d1389d9c89aaf5e69a552b01d1f1585faa63459c26"; }; checkInputs = [ watchdog pytest hypothesis mock ]; From ca3d0799e91e02738016b138b63c8f44129f2876 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:01 +0200 Subject: [PATCH 0932/3452] python: Chameleon: 3.6.2 -> 3.7.2 --- pkgs/development/python-modules/chameleon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index c2a3db6820d6..56cbae2befa0 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Chameleon"; - version = "3.6.2"; + version = "3.7.2"; src = fetchPypi { inherit pname version; - sha256 = "0aw6cqnychmsxjjgihwr7df92xw6ac1wr4x70mvq28z3iq35x7ls"; + sha256 = "7adc331eb039d5c458cd78e42a76f8e470953f004ddf297bd57aa1501392aec9"; }; meta = with stdenv.lib; { From 17067aae4d9736d5fc2959e27fd0108c651f31ea Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:01 +0200 Subject: [PATCH 0933/3452] python: check-manifest: 0.40 -> 0.42 --- pkgs/development/python-modules/check-manifest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 3de542a8bb0c..a4e396780aad 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "check-manifest"; - version = "0.40"; + version = "0.42"; src = fetchPypi { inherit pname version; - sha256 = "42de6eaab4ed149e60c9b367ada54f01a3b1e4d6846784f9b9710e770ff5572c"; + sha256 = "0d8e1b0944a667dd4a75274f6763e558f0d268fde2c725e894dfd152aae23300"; }; propagatedBuildInputs = [ toml ]; From 10342ffd6448288dcdd4084e8dc8410b1a45d4d2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:01 +0200 Subject: [PATCH 0934/3452] python: cheroot: 8.2.1 -> 8.3.0 --- pkgs/development/python-modules/cheroot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 54c502b815cb..269e59b9c184 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -8,13 +8,13 @@ let inherit (stdenv) lib; in buildPythonPackage rec { pname = "cheroot"; - version = "8.2.1"; + version = "8.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "5b525b3e4a755adf78070ab54c1821fb860d4255a9317dba2b88eb2df2441cff"; + sha256 = "a0577e1f28661727d472671a7cc4e0c12ea0cbc5220265e70f00a8b8cb628931"; }; nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; From ce43cfcaec678afdd3fbdc9a302b1c1c03e5a6a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:01 +0200 Subject: [PATCH 0935/3452] python: cleo: 0.7.6 -> 0.8.1 --- pkgs/development/python-modules/cleo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index 2809fb33e92b..3e46b900dc7c 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "cleo"; - version = "0.7.6"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "99cf342406f3499cec43270fcfaf93c126c5164092eca201dfef0f623360b409"; + sha256 = "3d0e22d30117851b45970b6c14aca4ab0b18b1b53c8af57bed13208147e4069f"; }; propagatedBuildInputs = [ From 5d09924b4cf2cd7dcb3b3b620aff25c4267ede53 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:01 +0200 Subject: [PATCH 0936/3452] python: cli_helpers: 1.2.1 -> 2.0.1 --- pkgs/development/python-modules/cli-helpers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index ba7ca3d5b209..5fff93b5bc68 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "cli_helpers"; - version = "1.2.1"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0rd194l06aw4612j09b44pgh8b8l4cwmz7xgwsgdj9v8m3m25nwq"; + sha256 = "18f7d8c5a22d85fc685d56a9f301d8b9f7f0d7d4e9033a27563b066c2ab41833"; }; propagatedBuildInputs = [ From bc65941a472c2f12704ee7597d527fb02af0cdc4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:01 +0200 Subject: [PATCH 0937/3452] python: clifford: 1.2.0 -> 1.3.1 --- pkgs/development/python-modules/clifford/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index 71b9c4899aba..b7ed70f84601 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "clifford"; - version = "1.2.0"; + version = "1.3.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b27fdec70574ac928c91fe333a70ece153d75cd0499cce09acea5980ae349bee"; + sha256 = "ade11b20d0631dfc9c2f18ce0149f1e61e4baf114108b27cfd68e5c1619ecc0c"; }; propagatedBuildInputs = [ From 4e96135b66516b6718c9add9f15f1c92e370b455 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:01 +0200 Subject: [PATCH 0938/3452] python: clikit: 0.4.3 -> 0.6.1 --- pkgs/development/python-modules/clikit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 98533f95f922..7bab3a93e551 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "clikit"; - version = "0.4.3"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0glppxx0pyppjcigzs8h16srlbxb6nci0282xfy3ayvwbq8pwbbf"; + sha256 = "0603e3c19fa106f5df5f224826c92e57221f48ec969e42744173e0458d359354"; }; propagatedBuildInputs = [ From 48304c648509e944974ce9e83d04a8f76c5185ab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:01 +0200 Subject: [PATCH 0939/3452] python: cloudpickle: 1.2.2 -> 1.4.1 --- pkgs/development/python-modules/cloudpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index 279571c157c9..e59f1d8afc42 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "1.2.2"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "922401d7140e133253ff5fab4faa4a1166416066453a783b00b507dca93f8859"; + sha256 = "0b6258a20a143603d53b037a20983016d4e978f554ec4f36b3d0895b947099ae"; }; buildInputs = [ pytest mock ]; From 984de97e3bb7dab341b61c1d1e230591b9b21c8b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:01 +0200 Subject: [PATCH 0940/3452] python: codecov: 2.0.22 -> 2.1.4 --- pkgs/development/python-modules/codecov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix index e994c6663cde..1151e395c69e 100644 --- a/pkgs/development/python-modules/codecov/default.nix +++ b/pkgs/development/python-modules/codecov/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "codecov"; - version = "2.0.22"; + version = "2.1.4"; src = fetchPypi { inherit pname version; - sha256 = "aeeefa3a03cac8a78e4f988e935b51a4689bb1f17f20d4e827807ee11135f845"; + sha256 = "bf30a41f65e747b159e2a749d1f9c92042d358bba0905fd94d3def3a368e592c"; }; checkInputs = [ unittest2 ]; # Tests only From 0026092213b837bbefeb5cb3ccb46c975ca79284 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:01 +0200 Subject: [PATCH 0941/3452] python: configparser: 4.0.2 -> 5.0.0 --- pkgs/development/python-modules/configparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 9c6c631d9c27..046cb0d57d91 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "configparser"; - version = "4.0.2"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "c7d282687a5308319bf3d2e7706e575c635b0a470342641c93bea0ea3b5331df"; + sha256 = "2ca44140ee259b5e3d8aaf47c79c36a7ab0d5e94d70bd4105c03ede7a20ea5a1"; }; # No tests available From 77b58fd01aa7abcdce97da16ba55d2dd5527ebc2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:02 +0200 Subject: [PATCH 0942/3452] python: confluent-kafka: 1.3.0 -> 1.4.2 --- pkgs/development/python-modules/confluent-kafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 029171fea2f6..6aab0f45b38c 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: buildPythonPackage rec { - version = "1.3.0"; + version = "1.4.2"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "4025ccddbc79443a4e2342de0d770f669558eb737fca2e7851558cd45f78ef78"; + sha256 = "c2660807e5c1ecd723e280f76918794c3fd84595000c1e8de1f254f5d89a785c"; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; From cd41d569fd1ebc287682c745d9865a4ff82f137b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:02 +0200 Subject: [PATCH 0943/3452] python: cornice: 4.0.1 -> 5.0.1 --- pkgs/development/python-modules/cornice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index 4307b3f6f4ff..442a06061ecd 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cornice"; - version = "4.0.1"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "d083832e9db65da4784436deabd7d37959de88c3b8ba51d539fa1e1f8313439d"; + sha256 = "4efa77a0d0402f1b92481a53853d65936956a568d64a4f6a703b62feb5b8cf62"; }; propagatedBuildInputs = [ pyramid simplejson six venusian ]; From ce82e83d5da7e0e00508de7de55622db9aec3942 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:02 +0200 Subject: [PATCH 0944/3452] python: coveralls: 1.9.2 -> 2.0.0 --- pkgs/development/python-modules/coveralls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 96f3782ab8d0..c7d046eb0196 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "coveralls"; name = "${pname}-python-${version}"; - version = "1.9.2"; + version = "2.0.0"; # wanted by tests src = fetchPypi { inherit pname version; - sha256 = "8e3315e8620bb6b3c6f3179a75f498e7179c93b3ddc440352404f941b1f70524"; + sha256 = "d213f5edd49053d03f0db316ccabfe17725f2758147afc9a37eaca9d8e8602b5"; }; checkInputs = [ From 58b468ad4becd3188edfe3a861b7f60855997db0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:02 +0200 Subject: [PATCH 0945/3452] python: credstash: 1.16.2 -> 1.17.1 --- pkgs/development/python-modules/credstash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 75ab8b739d8d..07547b280f5b 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "credstash"; - version = "1.16.2"; + version = "1.17.1"; src = fetchPypi { inherit pname version; - sha256 = "1l3g76dm9csmx0z8s7zd75wfzw9dcyvrq0a81gfzwxk0c0w8c79r"; + sha256 = "6c04e8734ef556ab459018da142dd0b244093ef176b3be5583e582e9a797a120"; }; # The install phase puts an executable and a copy of the library it imports in From 22124d5b98713b49525983ba7a5dccb3e85d9216 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:02 +0200 Subject: [PATCH 0946/3452] python: cssselect2: 0.2.2 -> 0.3.0 --- pkgs/development/python-modules/cssselect2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index dfa08dfe0b0c..3aa8ab622400 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cssselect2"; - version = "0.2.2"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0skymzb4ncrm2zdsy80f53vi0arf776lvbp51hzh4ayp1il5lj3h"; + sha256 = "5c2716f06b5de93f701d5755a9666f2ee22cbcd8b4da8adddfc30095ffea3abc"; }; # We're not interested in code quality tests From 9b71a0ab9f976b6a17bef0e07220b0f23a0a240d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:02 +0200 Subject: [PATCH 0947/3452] python: cupy: 7.0.0 -> 7.5.0 --- pkgs/development/python-modules/cupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index d2db8dcd9eeb..94ec349e038f 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "7.0.0"; + version = "7.5.0"; src = fetchPypi { inherit pname version; - sha256 = "7230b25052b2b9074cc338b44338b4bd43575a48ad7b9c2ce7f36d7e0d117012"; + sha256 = "243254a1607e19ca55191c4cca4c0f2b143e1d5914e2a1bc9e3f715e7ccafc41"; }; checkInputs = [ From d696bfb16932706af8819f4d59e9f9cdfde36f17 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:02 +0200 Subject: [PATCH 0948/3452] python: curio: 0.9 -> 1.2 --- pkgs/development/python-modules/curio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index 31dc8327fc41..16162b27dc6a 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "curio"; - version = "0.9"; + version = "1.2"; src = fetchPypi { inherit pname version; - sha256 = "51d1a7b49b4f8dd1486ac785c72d522962e93ccfdcfc1f818f5c7553a307b5ef"; + sha256 = "90f320fafb3f5b791f25ffafa7b561cc980376de173afd575a2114380de7939b"; }; disabled = !isPy3k; From ca5cbf6f829efc21fc0bba817f63ffc1eb0d65b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:02 +0200 Subject: [PATCH 0949/3452] python: cvxpy: 1.0.31 -> 1.1.1 --- pkgs/development/python-modules/cvxpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index b0bab9c7ee03..2d8fc384cc97 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.0.31"; + version = "1.1.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "17g6xcy99icrdcmb4pa793kqvzchbzl5lsw00xms9slwkr7pb65k"; + sha256 = "b8e90af9c0046394a73144ef1b93f1f69df1ba00779bb3d607add006179ba9d9"; }; propagatedBuildInputs = [ From 3a96234e2ea7da4cc82af6aca5f101e1e34d8029 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:02 +0200 Subject: [PATCH 0950/3452] python: cx_Freeze: 6.0 -> 6.1 --- pkgs/development/python-modules/cx_freeze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index dae3e032a39a..98d3460d7578 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.0"; + version = "6.1"; src = fetchPypi { inherit pname version; - sha256 = "067bgkgx7i3kw31vaviwysbb1lk91cjw9q90vklsr7nsygjxi0fa"; + sha256 = "a0181bdb0ed16b292f4cfb8cd3afc84e956fc187431f25392bd981460dd73da0"; }; propagatedBuildInputs = [ ncurses ]; From 278b2bf2f9b0766fc6090650bdd494120c2227d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:03 +0200 Subject: [PATCH 0951/3452] python: dask-ml: 1.2.0 -> 1.5.0 --- pkgs/development/python-modules/dask-ml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index f47515d5543a..7aca68b396ce 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -20,13 +20,13 @@ }: buildPythonPackage rec { - version = "1.2.0"; + version = "1.5.0"; pname = "dask-ml"; disabled = pythonOlder "3.6"; # >= 3.6 src = fetchPypi { inherit pname version; - sha256 = "0ppg8licvkxz1af2q87cxms2p6ss2r5d4fdkbcivph56r0v0ci2k"; + sha256 = "8a9879b7d1642ed8cd48115d81f92a246eb7ffeadc42748053c5339a56f569b4"; }; propagatedBuildInputs = [ From ab71187115c24ce0900cbb756efddbead4078246 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:03 +0200 Subject: [PATCH 0952/3452] python: databricks-cli: 0.10.0 -> 0.11.0 --- pkgs/development/python-modules/databricks-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index 3ed52a28287d..952f0723c7c2 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "databricks-cli"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "1w0my86r9fl0xqlczaqyp7v9rg7mpc42kp9swhids4qk4r5ncr2i"; + sha256 = "b3c7205dd8cb9935c475794ebd41b53aba79a53e028d3cf6b5871eec83c89ec0"; }; checkInputs = [ From a144902e25799d1b5a9a921d25c11946ed8a4487 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:03 +0200 Subject: [PATCH 0953/3452] python: datatable: 0.9.0 -> 0.10.1 --- pkgs/development/python-modules/datatable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix index 81a53ac15f47..345903932bd4 100644 --- a/pkgs/development/python-modules/datatable/default.nix +++ b/pkgs/development/python-modules/datatable/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "datatable"; - version = "0.9.0"; + version = "0.10.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1shwjkm9nyaj6asn57vwdd74pn13pggh14r6dzv729lzxm7nm65f"; + sha256 = "3ce5257c0c4afa96e2b14ca47a0aaf73add195b11de48f4adda50b5ede927436"; }; patches = lib.optionals stdenv.isDarwin [ From 6f5ef9d1b4103eea177318068a1595b45bf2fda1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:03 +0200 Subject: [PATCH 0954/3452] python: ddt: 1.2.2 -> 1.4.1 --- pkgs/development/python-modules/ddt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix index a660aaafca8a..94928e684d9d 100644 --- a/pkgs/development/python-modules/ddt/default.nix +++ b/pkgs/development/python-modules/ddt/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "ddt"; - version = "1.2.2"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "9f79cf234064cf9b43492b72da35c473de3f03163d37bd13cec5bd8d200dda6b"; + sha256 = "0595e70d074e5777771a45709e99e9d215552fb1076443a25fad6b23d8bf38da"; }; checkInputs = [ nose six pyyaml mock ]; From 7894e020ae89365f3457141b91bdb9e3aad8481c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:03 +0200 Subject: [PATCH 0955/3452] python: deepdiff: 4.0.9 -> 4.3.2 --- pkgs/development/python-modules/deepdiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 64d82e17466e..228d5a78239b 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "4.0.9"; + version = "4.3.2"; src = fetchPypi { inherit pname version; - sha256 = "5e2343398e90538edaa59c0c99207e996a3a834fdc878c666376f632a760c35a"; + sha256 = "91360be1d9d93b1d9c13ae9c5048fa83d9cff17a88eb30afaa0d7ff2d0fee17d"; }; # # Extra packages (may not be necessary) From 69dd80b673763b9bb276c3d6aff681cb350bea1d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:03 +0200 Subject: [PATCH 0956/3452] python: deluge-client: 1.8.0 -> 1.9.0 --- pkgs/development/python-modules/deluge-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index 127fe07f3736..8a2bdee1d922 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deluge-client"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "4eac169b4b08008cacf4e5e26e82302a7ccd43c07846d1a1228f3e271a128de2"; + sha256 = "0d2f12108a147d44590c8df63997fcb32f8b2fbc18f8cbb221f0136e2e372b85"; }; # it will try to connect to a running instance From 231398c43a483153548fe12260e40520b225190e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:03 +0200 Subject: [PATCH 0957/3452] python: dependency-injector: 3.14.12 -> 3.15.6 --- .../python-modules/dependency-injector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 121175c50857..63fad6467c22 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -9,11 +9,11 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "3.14.12"; + version = "3.15.6"; src = fetchPypi { inherit pname version; - sha256 = "c0b593d30a9dcafd71459075fac14ccf52fcefa2094d5062dfc2e174c469dc03"; + sha256 = "fcca1464f567d902983bff507b9e2e3fda0f932ee009e36f74ed5b8c348d17f4"; }; propagatedBuildInputs = [ six ]; From d7e4960bb521e0288fbcc76b94f1eca84c4376b2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:03 +0200 Subject: [PATCH 0958/3452] python: devpi-common: 3.4.0 -> 3.5.0 --- pkgs/development/python-modules/devpi-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 25d9353e155e..39ea809381a1 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "devpi-common"; - version = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1pfl29pnfn120rqv3zwxc22i1hyywwg60rcck9hzxsllbhmfbjqh"; + sha256 = "4f1eb1bf85a5dabd4f4ecc11ad99588e01cc204989a9f424c2dbe5809c6c3745"; }; propagatedBuildInputs = [ requests py ]; From d89527fd97d2041f6b4b5a62d1ef26a62eb72c8b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:03 +0200 Subject: [PATCH 0959/3452] python: diff_cover: 2.6.1 -> 3.0.1 --- pkgs/development/python-modules/diff_cover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 3058f3e40091..9f96c7644dfb 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "diff_cover"; - version = "2.6.1"; + version = "3.0.1"; preCheck = '' export LC_ALL=en_US.UTF-8; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0a6ylkfqr95awp6za0var0nysmnbgwn46np8cmi1bkldil2407lz"; + sha256 = "13768c8bc755dd8e1184ce79b95bbc8115ea566282f4b06efbeca72a4d00427b"; }; propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; From 1058bcccc0f0bbb3bed974a02b68f05936df7305 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:03 +0200 Subject: [PATCH 0960/3452] python: discogs-client: 2.2.2 -> 2.3.0 --- pkgs/development/python-modules/discogs_client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/discogs_client/default.nix b/pkgs/development/python-modules/discogs_client/default.nix index c39bede9e093..8d8fb12d4d9b 100644 --- a/pkgs/development/python-modules/discogs_client/default.nix +++ b/pkgs/development/python-modules/discogs_client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "discogs-client"; - version = "2.2.2"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1n23xy33fdp3dq0hhfdg0lx4z7rhdi74ik8v1mc7rql1jbxl7bmf"; + sha256 = "cc979fcbb5283f74d388c7111c8ed6bef920b01614a014d6b1c5d6fbb554bfc3"; }; propagatedBuildInputs = [ requests oauthlib ]; From 115829f78d0c6ff8378fe5886307eb255699b9f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:04 +0200 Subject: [PATCH 0961/3452] python: distributed: 2.9.3 -> 2.18.0 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 1104834d879e..ba1151214412 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "2.9.3"; + version = "2.18.0"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "70e29fed075270df4ca7dda2b26a79523b753fe90fb278b2a7d6b0290ba53d9a"; + sha256 = "902f098fb7558f035333804a5aeba2fb26a2a715388808205a17cbb2e02e0558"; }; checkInputs = [ pytest pytest-repeat pytest-timeout mock joblib ]; From 1e2295315afd87a748c11b9ab61cc7cd6ba56be2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:04 +0200 Subject: [PATCH 0962/3452] python: distro: 1.4.0 -> 1.5.0 --- pkgs/development/python-modules/distro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index 8880ec7235dc..b444e19d84bc 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distro"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0mrg75w4ap7mdzyga75yaid9n8bgb345ih5mwjp3plj6v1jxwb9n"; + sha256 = "0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92"; }; # TODO: Enable more tests on NixOS (20 out of 173 are failing, 10 due to the From 708c36ae6a5e9e674493c1d7d3b086a9d5f22cfb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:04 +0200 Subject: [PATCH 0963/3452] python: dj-email-url: 0.2.0 -> 1.0.1 --- pkgs/development/python-modules/dj-email-url/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix index cd01ddf1e823..711eee059caa 100644 --- a/pkgs/development/python-modules/dj-email-url/default.nix +++ b/pkgs/development/python-modules/dj-email-url/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.2.0"; + version = "1.0.1"; pname = "dj-email-url"; src = fetchPypi { inherit pname version; - sha256 = "0362e390c17cc377f03bcbf6daf3f671797c929c1bf78a9f439d78f215ebe3fd"; + sha256 = "32dc567c5cc3d4106710ec36dd645c8c1b20e2d8f588a17ab88bcc23e347d00a"; }; checkPhase = '' From 3fc948d171ffb47ee3751065c86fe8a95e565a4b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:04 +0200 Subject: [PATCH 0964/3452] python: django-auth-ldap: 2.1.1 -> 2.2.0 --- pkgs/development/python-modules/django-auth-ldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index 9f50a7ea22b9..c419fff79024 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-auth-ldap"; - version = "2.1.1"; + version = "2.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1j1fwinbkr4khn9i869r22jfdgw2kli0jqrz5shyd36jllsvrfzs"; + sha256 = "11af1773b08613339d2c3a0cec1308a4d563518f17b1719c3759994d0b4d04bf"; }; propagatedBuildInputs = [ ldap django ]; From cd45aa10366204696d42c256cd7d0645e55a871b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:04 +0200 Subject: [PATCH 0965/3452] python: django-cache-url: 3.0.0 -> 3.1.2 --- pkgs/development/python-modules/django-cache-url/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix index 6c5ac1039125..6abe92c43f76 100644 --- a/pkgs/development/python-modules/django-cache-url/default.nix +++ b/pkgs/development/python-modules/django-cache-url/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "3.0.0"; + version = "3.1.2"; pname = "django-cache-url"; src = fetchPypi { inherit pname version; - sha256 = "235950e2d7cb16164082167c2974301e2f0fb2313d40bfacc9d24f5b09c3514b"; + sha256 = "d0ee0d6c5daab92787bff47a4a6f5a6cf97c3c80d81a990820b2af16e12ad65a"; }; checkInputs = [ pytest ]; From a25c90195e8e4ccf8dc895b513d0f153391a14de Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:04 +0200 Subject: [PATCH 0966/3452] python: django-cors-headers: 3.2.1 -> 3.3.0 --- .../python-modules/django-cors-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 879e73c11e22..11c935df9964 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "3.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "a5960addecc04527ab26617e51b8ed42f0adab4594b24bb0f3c33e2bd3857c3f"; + sha256 = "73d654950b5f5e7e4f67c05183d2169d4f7518ceb87734eb0d68f9e43be59f1c"; }; propagatedBuildInputs = [ django ]; From 2ec2b62997566353a4d2606b78fd70c2ffcb5eea Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:04 +0200 Subject: [PATCH 0967/3452] python: django-dynamic-preferences: 1.8.1 -> 1.9 --- .../python-modules/django-dynamic-preferences/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index d18f5924fdcc..d472a595568d 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-dynamic-preferences"; - version = "1.8.1"; + version = "1.9"; src = fetchPypi { inherit pname version; - sha256 = "727f71f865ff29df93c01a0a1686af0dca19776ee786f876ea0ae7e062719b24"; + sha256 = "407db27bf55d391c4c8a4944e0521f35eff82c2f2fd5a2fc843fb1b4cc1a31f4"; }; propagatedBuildInputs = [ six django persisting-theory ]; From bbe8e84cacc03037a94e49401484ad0ef6a275d1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:04 +0200 Subject: [PATCH 0968/3452] python: django-filter: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/django-filter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix index 496ccd268f95..2079d336737d 100644 --- a/pkgs/development/python-modules/django-filter/default.nix +++ b/pkgs/development/python-modules/django-filter/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-filter"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "057xiijig8r2nxrd9gj1nki168422rsh8ap5vkbr9zyp1mzvbpn3"; + sha256 = "11e63dd759835d9ba7a763926ffb2662cf8a6dcb4c7971a95064de34dbc7e5af"; }; propagatedBuildInputs = [ django ]; From 611d04da6bb988f1d6a4448f85e0604dc4d37529 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:04 +0200 Subject: [PATCH 0969/3452] python: django-jinja: 2.4.1 -> 2.6.0 --- pkgs/development/python-modules/django-jinja2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix index 7b49ddb53999..97a9608cff73 100644 --- a/pkgs/development/python-modules/django-jinja2/default.nix +++ b/pkgs/development/python-modules/django-jinja2/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "django-jinja"; - version = "2.4.1"; + version = "2.6.0"; meta = { description = "Simple and nonobstructive jinja2 integration with Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8a49d73de616a12075eee14c6d3bbab936261a463457d40348d8b8e2995cfbed"; + sha256 = "7459985c25ddb6584c6bab345761c8c5557713448e6fbb322af1b6dd7f5512bd"; }; buildInputs = [ django pytz tox ]; From 8a4217964d1409648c81cd064c2b7fb5c26bcc29 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:04 +0200 Subject: [PATCH 0970/3452] python: django-mailman3: 1.3.3 -> 1.3.4 --- pkgs/development/python-modules/django-mailman3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index c8fdd57c98e1..afa504f1bc71 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-mailman3"; - version = "1.3.3"; + version = "1.3.4"; src = fetchPypi { inherit pname version; - sha256 = "1q9ciy2yawgvbha5kwlzwdmdqvas287dc0i60ygp2799jnfr5dr6"; + sha256 = "7e37b68bb47e9ae196ca19018f576e2c8c90189c5bd82d4e549d0c2f2f3f35fb"; }; propagatedBuildInputs = [ From 60a4e5a4b1ca922dbd4291f2e80832cd0b89d92b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:04 +0200 Subject: [PATCH 0971/3452] python: django-picklefield: 2.1.1 -> 3.0.1 --- .../development/python-modules/django-picklefield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 90772b503af5..a9a03e9066c4 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-picklefield"; - version = "2.1.1"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0imncys5s3vsy2q79nn7k5d670da1xgmcr9gmhn06fry6ibf39b7"; + sha256 = "15ccba592ca953b9edf9532e64640329cd47b136b7f8f10f2939caa5f9ce4287"; }; propagatedBuildInputs = [ django ]; From 120b8f7e9ea73513a233e2e9a86e044683eab2ba Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:05 +0200 Subject: [PATCH 0972/3452] python: django-q: 1.0.2 -> 1.2.3 --- pkgs/development/python-modules/django-q/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index 89a883482440..cf5a518c6d09 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "django-q"; - version = "1.0.2"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "70081f58c6d78748d8664acbf028fb641687c36df38d3d31e9f1b6fcfac1079f"; + sha256 = "aa17950a75dc1fe4636b24ddba37ad3a7b660ce279b2f70f2a301135364fbe58"; }; propagatedBuildInputs = [ From 4b5e1c0ee7efcb47aa50e84af52dcc69ec0b0d10 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:05 +0200 Subject: [PATCH 0973/3452] python: django-raster: 0.7 -> 0.8 --- pkgs/development/python-modules/django-raster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index 03310afa0279..056f8dffdcfc 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -6,14 +6,14 @@ if stdenv.lib.versionOlder django.version "2.0" then throw "django-raster requires Django >= 2.0. Consider overiding the python package set to use django_2." else buildPythonPackage rec { - version = "0.7"; + version = "0.8"; pname = "django-raster"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "d23089d56f5f435c01a001af6f8ff7905636f87085b13035b4c5b3ace203d98a"; + sha256 = "9417d8a17930dffee4719f79a38c6ab5d20ac7145d4edf88df0abcb5a360de51"; }; # Tests require a postgresql + postgis server From 64618f9dd489d1770588f53f856789dfeff38875 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:05 +0200 Subject: [PATCH 0974/3452] python: django-sampledatahelper: 0.4.1 -> 0.5 --- .../python-modules/django-sampledatahelper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-sampledatahelper/default.nix b/pkgs/development/python-modules/django-sampledatahelper/default.nix index edeb914946e3..faad550d4391 100644 --- a/pkgs/development/python-modules/django-sampledatahelper/default.nix +++ b/pkgs/development/python-modules/django-sampledatahelper/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "django-sampledatahelper"; - version = "0.4.1"; + version = "0.5"; meta = { description = "Helper class for generate sample data for django apps development"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1795zg73lajcsfyd8i8cprb2v93d4csifjnld6bfnya90ncsbl4n"; + sha256 = "3fbc5533f1055f9d1944097f6271e8b18fcf4ed5cc582b518616445145300015"; }; buildInputs = [ django nose pillow sampledata six versiontools ]; From 808541f05ee80d946a906e19332be99a6449dcb4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:05 +0200 Subject: [PATCH 0975/3452] python: django-versatileimagefield: 1.11 -> 2.0 --- .../python-modules/django-versatileimagefield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index 4eb9a8da773e..de5854192d20 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "django-versatileimagefield"; - version = "1.11"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "8322ee9d7bf5ffa5360990320d2cc2efc7017feff35422636d49f625721edf82"; + sha256 = "b197e7066f23bb73b001a61525f2b1cae3dd654bf208a944a7ff5a3fe6107b51"; }; propagatedBuildInputs = [ pillow python_magic ]; From 177e98ba330e51a89550d8d2f9bebaa5d9285284 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:05 +0200 Subject: [PATCH 0976/3452] python: django-guardian: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/django_guardian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index e276c6b656bb..b03524aa5909 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "django-guardian"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "8cf4efd67a863eb32beafd4335a38ffb083630f8ab2045212d27f8f9c3abe5a6"; + sha256 = "8cacf49ebcc1e545f0a8997971eec0fe109f5ed31fc2a569a7bf5615453696e2"; }; checkInputs = [ pytest pytestrunner pytest-django django_environ mock ]; From 61fea06ce686de6185c5f4640019a1bcead824dc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:05 +0200 Subject: [PATCH 0977/3452] python: django-redis: 4.11.0 -> 4.12.1 --- pkgs/development/python-modules/django_redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index 26fb504e0e99..114962477fd6 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -2,11 +2,11 @@ mock, django, redis, msgpack }: buildPythonPackage rec { pname = "django-redis"; - version = "4.11.0"; + version = "4.12.1"; src = fetchPypi { inherit pname version; - sha256 = "a5b1e3ffd3198735e6c529d9bdf38ca3fcb3155515249b98dc4d966b8ddf9d2b"; + sha256 = "306589c7021e6468b2656edc89f62b8ba67e8d5a1c8877e2688042263daa7a63"; }; doCheck = false; From 86ed0d2490ff9690f71818b7641f9a6fec14d3b3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:05 +0200 Subject: [PATCH 0978/3452] python: django-tagging: 0.4.6 -> 0.5.0 --- pkgs/development/python-modules/django_tagging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix index b54186b4fa29..4bcaa549a12f 100644 --- a/pkgs/development/python-modules/django_tagging/default.nix +++ b/pkgs/development/python-modules/django_tagging/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-tagging"; - version = "0.4.6"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "210b32af8372b8f68f261fdb7394075669222608d1e6a3bbf2031d59c826eb68"; + sha256 = "28d68fa4831705e51ad7d1e845ed6dd9e354f9b6f8a5f63b655a430646ef4e8d"; }; # error: invalid command 'test' From 4e667bb6424de36154ce94e439ced33c729d82f7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:05 +0200 Subject: [PATCH 0979/3452] python: django-taggit: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/django_taggit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index d73596269140..80ee899b1832 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "django-taggit"; - version = "1.2.0"; + version = "1.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4186a6ce1e1e9af5e2db8dd3479c5d31fa11a87d216a2ce5089ba3afde24a2c5"; + sha256 = "4a833bf71f4c2deddd9745924eee53be1c075d7f0020a06f12e29fa3d752732d"; }; propagatedBuildInputs = [ isort django ]; From f959df431a3f2728605112a00de49464c85ef197 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:05 +0200 Subject: [PATCH 0980/3452] python: djmail: 1.1.0 -> 2.0.0 --- pkgs/development/python-modules/djmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/djmail/default.nix b/pkgs/development/python-modules/djmail/default.nix index 516a2163f44e..8efb9788e127 100644 --- a/pkgs/development/python-modules/djmail/default.nix +++ b/pkgs/development/python-modules/djmail/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "djmail"; - version = "1.1.0"; + version = "2.0.0"; meta = { description = "Simple, powerfull and nonobstructive django email middleware"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "87d2a8b4bdf67ae9b312e127ccc873a53116cf297ec786460d782ce82eaa76b5"; + sha256 = "cf3ce7626305d218a8bf2b6a219266ef8061aceeefc1c70a54170f4105465202"; }; nativeBuildInputs = [ glibcLocales ]; From 06186d21ab1a111fa20e7bfebcee0ae1be9c9a66 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:05 +0200 Subject: [PATCH 0981/3452] python: docplex: 2.12.182 -> 2.14.186 --- pkgs/development/python-modules/docplex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 42f1270dc1b5..d79aec5b8d19 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.12.182"; + version = "2.14.186"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "aaf150b06d44f07639aca48be1fca69c7732d57507e6adc4e8451c7a93489116"; + sha256 = "ba78897869e938c9ad1cb58e7d82bcf693f5e9a0dfa5e2dbfcee2ae5ea5e87f8"; }; propagatedBuildInputs = [ From d304616d817595f91e88ad2a581f9e85f25bf20c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:06 +0200 Subject: [PATCH 0982/3452] python: dpath: 1.4.2 -> 2.0.1 --- pkgs/development/python-modules/dpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index c526d9aedc6c..1601148876d5 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "dpath"; - version = "1.4.2"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0gr7816pnzbyh9h1ia0qz0q1f9zfzacwb8dc36js8hw8x14myqqg"; + sha256 = "bea06b5f4ff620a28dfc9848cf4d6b2bfeed34238edeb8ebe815c433b54eb1fa"; }; checkInputs = [ mock nose ]; From deb27780e330c00fe351bcf2eaa7eae304c7dd13 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:06 +0200 Subject: [PATCH 0983/3452] python: drf-yasg: 1.16.1 -> 1.17.1 --- pkgs/development/python-modules/drf-yasg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index d1a349d79a2d..0f5f0bc56e05 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "drf-yasg"; - version = "1.16.1"; + version = "1.17.1"; src = fetchPypi { inherit pname version; - sha256 = "0ri5h5xsacm99c6gvb4ldwisbqgiv2vq8qbn7vrh6vplzlpyvzb8"; + sha256 = "5572e9d5baab9f6b49318169df9789f7399d0e3c7bdac8fdb8dfccf1d5d2b1ca"; }; nativeBuildInputs = [ From 37d53320b0c6a7677550b03ced480696aca68286 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:06 +0200 Subject: [PATCH 0984/3452] python: dropbox: 9.5.0 -> 10.2.0 --- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 3ca9d59e27f0..401437ceec4c 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "9.5.0"; + version = "10.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0iz9hg1j7q9chka6fyzgpzqg2v4nbjx61xfvn9ixprxrdhvhr2hi"; + sha256 = "4372916da70aad82e7227e7c31a8cfa2310e41c9d34d32883daedf43ed403f86"; }; # Set DROPBOX_TOKEN environment variable to a valid token. From ac195d603611f88453a6167b96130d1b6f336e7e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:06 +0200 Subject: [PATCH 0985/3452] python: dulwich: 0.19.16 -> 0.20.2 --- pkgs/development/python-modules/dulwich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 82b9bed492cc..9a0f275cff7d 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -4,12 +4,12 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.19.16"; + version = "0.20.2"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "f74561c448bfb6f04c07de731c1181ae4280017f759b0bb04fa5770aa84ca850"; + sha256 = "273fa401e11c215ed81a4a0c8474ed06aeae31900974fdd4a87af5df0e458115"; }; LC_ALL = "en_US.UTF-8"; From f80f3ac4ffbc5108d677d5194f4b55e3943871d7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:06 +0200 Subject: [PATCH 0986/3452] python: ecdsa: 0.14.1 -> 0.15 --- pkgs/development/python-modules/ecdsa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index aa69b7e2fcde..7c991c528cdd 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "ecdsa"; - version = "0.14.1"; + version = "0.15"; src = fetchPypi { inherit pname version; - sha256 = "64c613005f13efec6541bb0a33290d0d03c27abab5f15fbab20fb0ee162bdd8e"; + sha256 = "8f12ac317f8a1318efa75757ef0a651abe12e51fc1af8838fb91079445227277"; }; propagatedBuildInputs = [ six ]; From 9d89bc66a1efc2992fadf781f8135d8fdb09877e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:06 +0200 Subject: [PATCH 0987/3452] python: ECPy: 0.10.0 -> 1.2.3 --- pkgs/development/python-modules/ecpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix index c6109d5c084d..153fcd08d25a 100644 --- a/pkgs/development/python-modules/ecpy/default.nix +++ b/pkgs/development/python-modules/ecpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ECPy"; - version = "0.10.0"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "8889122d3a8bc1a08b4bda42c073dd22305d770b7876356de806ff91748983bd"; + sha256 = "6dd09f8cda5a1d673228ff9ef41aea8f036ee5ef3183198de83c14957d68c3e0"; }; propagatedBuildInputs = lib.optional (!isPy3k) future; From 8420fbf0bd5850acc0498192e4ed727d9fe568c6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:06 +0200 Subject: [PATCH 0988/3452] python: email_validator: 1.0.2 -> 1.1.1 --- pkgs/development/python-modules/email-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index 3ad0c34685ba..215584aa8cdb 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "email_validator"; - version = "1.0.2"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1ja9149l9ck5n45a72h3is7v476hjny5ybxbcamx1nw6iplsm7k6"; + sha256 = "63094045c3e802c3d3d575b18b004a531c36243ca8d1cec785ff6bfcb04185bb"; }; doCheck = false; From 9b3954665c8315e55592495d6718999410e975fe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:06 +0200 Subject: [PATCH 0989/3452] python: etelemetry: 0.1.2 -> 0.2.1 --- pkgs/development/python-modules/etelemetry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/etelemetry/default.nix b/pkgs/development/python-modules/etelemetry/default.nix index 2323a4dcd579..0b9879ea715a 100644 --- a/pkgs/development/python-modules/etelemetry/default.nix +++ b/pkgs/development/python-modules/etelemetry/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "0.1.2"; + version = "0.2.1"; pname = "etelemetry"; src = fetchPypi { inherit pname version; - sha256 = "0m3dqvs3xbckmjiwppy366qmgzx0z917j1d7dadfl3bprgipy51j"; + sha256 = "bfb58f58e98f63eae20caffb8514fb68c572332aa6e773cf3fcbde9b408d88e7"; }; propagatedBuildInputs = [ requests ]; From ee37289c05374d463e7ce719fcf0b573c45a3f7b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:06 +0200 Subject: [PATCH 0990/3452] python: eyeD3: 0.8.12 -> 0.9.5 --- pkgs/development/python-modules/eyed3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index ee0c426bdedd..11aeca8127bd 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -13,13 +13,13 @@ }: buildPythonPackage rec { - version = "0.8.12"; + version = "0.9.5"; pname = "eyeD3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "e54eec0a03fb8e7e9e8b509546c6d92efbc871ea7597611fe2c16f03e1c94b6d"; + sha256 = "faf5806197f2093e82c2830d41f2378f07b3a9da07a16fafb14fc6fbdebac50a"; }; # https://github.com/nicfit/eyeD3/pull/284 From 2f71c41d673a22606273b7c881854c3d86ee5cf5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:06 +0200 Subject: [PATCH 0991/3452] python: face: 19.1.2 -> 20.1.1 --- pkgs/development/python-modules/face/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/face/default.nix b/pkgs/development/python-modules/face/default.nix index 34d91ceda988..71fbca916104 100644 --- a/pkgs/development/python-modules/face/default.nix +++ b/pkgs/development/python-modules/face/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "face"; - version = "19.1.2"; + version = "20.1.1"; src = fetchPypi { inherit pname version; - sha256 = "38c94ec17a4d6f9628f094b697faca0f802f4028071ce8cbdb3116d4cde772a3"; + sha256 = "7d59ca5ba341316e58cf72c6aff85cca2541cf5056c4af45cb63af9a814bed3e"; }; propagatedBuildInputs = [ boltons ]; From 83178e7f7e4e20b03700a948c63b90f4db277c42 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:07 +0200 Subject: [PATCH 0992/3452] python: Faker: 3.0.1 -> 4.1.0 --- pkgs/development/python-modules/faker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 5691c9764db0..df05d5cc40a8 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -17,11 +17,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "3.0.1"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "c7f7466cb9ba58d582f713494acdb5ebcc462336c5e38c5230b0cdab37069985"; + sha256 = "103c46b9701a151299c5bffe6fefcd4fb5fb04c3b5d06bee4952d36255d44ea2"; }; nativeBuildInputs = [ pytestrunner ]; From 5ab7e3b2e1a80116cc5f134c6bc567ebf387c714 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:07 +0200 Subject: [PATCH 0993/3452] python: fastrlock: 0.4 -> 0.5 --- pkgs/development/python-modules/fastrlock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix index 8271bec090b2..e44639942a0d 100644 --- a/pkgs/development/python-modules/fastrlock/default.nix +++ b/pkgs/development/python-modules/fastrlock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fastrlock"; - version = "0.4"; + version = "0.5"; src = fetchPypi { inherit pname version; - sha256 = "6abdbb35205792e2d2a8c441aaa41a613d43ee2d88b3af4fd9735ae7a5f7db6b"; + sha256 = "9ae1a31f6e069b5f0f28ba63c594d0c952065de0a375f7b491d21ebaccc5166f"; }; meta = with stdenv.lib; { From a00ba777e4d4f7ee94ae4b2daacd8d8c89341ed3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:07 +0200 Subject: [PATCH 0994/3452] python: flake8: 3.7.9 -> 3.8.2 --- pkgs/development/python-modules/flake8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index c6cf1bf2ab1f..d4f78e41bb67 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "flake8"; - version = "3.7.9"; + version = "3.8.2"; src = fetchPypi { inherit pname version; - sha256 = "45681a117ecc81e870cbf1262835ae4af5e7a8b08e40b944a8a6e6b895914cfb"; + sha256 = "c69ac1668e434d37a2d2880b3ca9aafd54b3a10a3ac1ab101d22f29e29cf8634"; }; checkInputs = [ pytest mock pytestrunner ]; From 9f83455cc450d5fd765a88854a74237a8b0c1222 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:07 +0200 Subject: [PATCH 0995/3452] python: Flask-Assets: 0.12 -> 2.0 --- pkgs/development/python-modules/flask-assets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix index 2fbfb17def4f..12a295ca65a8 100644 --- a/pkgs/development/python-modules/flask-assets/default.nix +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-Assets"; - version = "0.12"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0"; + sha256 = "1dfdea35e40744d46aada72831f7613d67bf38e8b20ccaaa9e91fdc37aa3b8c2"; }; patchPhase = '' From 5b8fe32e1da3b09cc93ee6a61b504391ff8a9f41 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:07 +0200 Subject: [PATCH 0996/3452] python: Flask-Caching: 1.8.0 -> 1.9.0 --- pkgs/development/python-modules/flask-caching/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index 64c3e3384dcc..9cb4bad7a71e 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-Caching"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "3d0bd13c448c1640334131ed4163a12aff7df2155e73860f07fc9e5e75de7126"; + sha256 = "a0356ad868b1d8ec2d0e675a6fe891c41303128f8904d5d79e180d8b3f952aff"; }; propagatedBuildInputs = [ flask ]; From 3625da8994a8bf3f8ed61a7a0384d7d3f1a2d76e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:07 +0200 Subject: [PATCH 0997/3452] python: Flask-Compress: 1.4.0 -> 1.5.0 --- pkgs/development/python-modules/flask-compress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index b602fcfd4947..b9c73d7048e2 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchPypi, buildPythonPackage, flask }: buildPythonPackage rec { - version = "1.4.0"; + version = "1.5.0"; pname = "Flask-Compress"; src = fetchPypi { inherit pname version; - sha256 = "1cxdbdiyxkspg7vkchfmaqr7c6q79gwvakna3fjcc6nivps971j6"; + sha256 = "f367b2b46003dd62be34f7fb1379938032656dca56377a9bc90e7188e4289a7c"; }; propagatedBuildInputs = [ flask ]; From 35ce8f108653db3f16d83bb962f363f79cb06fb1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:07 +0200 Subject: [PATCH 0998/3452] python: Flask-HTTPAuth: 4.0.0 -> 4.1.0 --- pkgs/development/python-modules/flask-httpauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-httpauth/default.nix b/pkgs/development/python-modules/flask-httpauth/default.nix index d2e6cf3e47bf..7981428c42ac 100644 --- a/pkgs/development/python-modules/flask-httpauth/default.nix +++ b/pkgs/development/python-modules/flask-httpauth/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-HTTPAuth"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1z3ad8sm24xl2lazdia92br1a2nigqwaf1lfsa77j5pz6gf2xmj7"; + sha256 = "9e028e4375039a49031eb9ecc40be4761f0540476040f6eff329a31dabd4d000"; }; propagatedBuildInputs = [ flask ]; From 60bbb8d664f27bd64403fa35392266623604dd55 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:07 +0200 Subject: [PATCH 0999/3452] python: Flask-Limiter: 1.1.0 -> 1.3.1 --- pkgs/development/python-modules/flask-limiter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 041935e28e30..c3db5094aef9 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-Limiter"; - version = "1.1.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "905c35cd87bf60c92fd87922ae23fe27aa5fb31980bab31fc00807adee9f5a55"; + sha256 = "08d6d7534a847c532fd36d0df978f93908d8616813085941c862bbcfcf6811aa"; }; propagatedBuildInputs = [ flask limits ]; From 067a47cd9287900d55ada962f9f0630bf860d115 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:07 +0200 Subject: [PATCH 1000/3452] python: Flask-Login: 0.4.1 -> 0.5.0 --- pkgs/development/python-modules/flask-login/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index 8a48bbdd7da6..a4cd86ee69d4 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "Flask-Login"; - version = "0.4.1"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1v2j8zd558xfmgn3rfbw0xz4vizjcnk8kqw52q4f4d9ygfnc25f8"; + sha256 = "6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b"; }; checkInputs = [ nose mock semantic-version ]; From 7d08baea61689bc0aa67f3c4736ef86c2c29b63f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:07 +0200 Subject: [PATCH 1001/3452] python: flask-marshmallow: 0.10.1 -> 0.12.0 --- pkgs/development/python-modules/flask-marshmallow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index b03f3307d085..bd28280a47a9 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "flask-marshmallow"; - version = "0.10.1"; + version = "0.12.0"; meta = { homepage = "https://github.com/marshmallow-code/flask-marshmallow"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0hbp0lrdlzpcdjv1jn2hk98z9gg624nswcm0hi48k4rk28x9xsb9"; + sha256 = "6e6aec171b8e092e0eafaf035ff5b8637bf3a58ab46f568c4c1bab02f2a3c196"; }; propagatedBuildInputs = [ flask marshmallow ]; From 3517566754afb53c63553c6794482b1624c154d3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:07 +0200 Subject: [PATCH 1002/3452] python: Flask-SocketIO: 4.2.1 -> 4.3.0 --- pkgs/development/python-modules/flask-socketio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index e0e56aa6e92a..41c828eefe99 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "Flask-SocketIO"; - version = "4.2.1"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "2172dff1e42415ba480cee02c30c2fc833671ff326f1598ee3d69aa02cf768ec"; + sha256 = "7f9b54ac9cd92e28a657c58f51943d97e76b988840c8795784e7b2bafb13103f"; }; propagatedBuildInputs = [ From ec5c4f42d51fdc87d53d800833348cb2ddf25688 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:08 +0200 Subject: [PATCH 1003/3452] python: flask-swagger-ui: 3.20.9 -> 3.25.0 --- pkgs/development/python-modules/flask-swagger-ui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-swagger-ui/default.nix b/pkgs/development/python-modules/flask-swagger-ui/default.nix index a281864117bc..f2908f43b00a 100644 --- a/pkgs/development/python-modules/flask-swagger-ui/default.nix +++ b/pkgs/development/python-modules/flask-swagger-ui/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-swagger-ui"; - version = "3.20.9"; + version = "3.25.0"; src = fetchPypi { inherit pname version; - sha256 = "3282c770764c8053360f33b2fc120e1d169ecca2138537d0e6e1135b1f9d4ff2"; + sha256 = "42d098997e06b04f992609c4945cc990738b269c153d8388fc59a91a5dfcee9e"; }; doCheck = false; # there are no tests From c71bf2c3eda2fba1182169aebb277ee7fc9f0de3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:08 +0200 Subject: [PATCH 1004/3452] python: flowlogs_reader: 2.0.0 -> 2.2.1 --- pkgs/development/python-modules/flowlogs_reader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix index 38faa5f12db4..44f347edb8ee 100644 --- a/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "flowlogs_reader"; - version = "2.0.0"; + version = "2.2.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "256c67afabc1783e8a378c7589877f76660c6a645aa6dfe1759e26f4a93a22d0"; + sha256 = "7c24156a3d6887b641ceb37b57d91805bee6c3352e8a3ca97a3274217ead9294"; }; propagatedBuildInputs = [ botocore boto3 docutils ]; From 9ca26f61613ea4a53cae3a7a6bea905cf570f0fc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:08 +0200 Subject: [PATCH 1005/3452] python: fonttools: 4.2.5 -> 4.11.0 --- pkgs/development/python-modules/fonttools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index ddcf2878334c..8aae67443ae1 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.2.5"; + version = "4.11.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f05bff703e31d5f28e713afe89aed0e6649b02c09d8df958e8a02df9c9b2fc0e"; + sha256 = "7fe5937206099ef284055b8c94798782e0993a740eed87f0dd262ed9870788aa"; extension = "zip"; }; From bf60a0dcf62f5eceaadca7c2a081ddf8f6aa7898 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:08 +0200 Subject: [PATCH 1006/3452] python: genzshcomp: 0.5.2 -> 0.6.0 --- pkgs/development/python-modules/genzshcomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/genzshcomp/default.nix b/pkgs/development/python-modules/genzshcomp/default.nix index 99d89e79d125..5917d71c4408 100644 --- a/pkgs/development/python-modules/genzshcomp/default.nix +++ b/pkgs/development/python-modules/genzshcomp/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "genzshcomp"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "d28ae62b1b2727f32dc7606bc58201b8c12894ad3d1d4fdb40e1f951e3ae8f85"; + sha256 = "b582910d36f9ad0992756d7e9ccbe3e5cf811934b1002b51f25b99d3dda9d573"; }; buildInputs = [ setuptools ]; From 8d748c54edce4b8d5e1897f46b76a93929486c65 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:08 +0200 Subject: [PATCH 1007/3452] python: gevent: 1.4.0 -> 20.5.2 --- pkgs/development/python-modules/gevent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 56467523a17d..4140b0893e04 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "gevent"; - version = "1.4.0"; + version = "20.5.2"; src = fetchPypi { inherit pname version; - sha256 = "1eb7fa3b9bd9174dfe9c3b59b7a09b768ecd496debfc4976a9530a3e15c990d1"; + sha256 = "2756de36f56b33c46f6cc7146a74ba65afcd1471922c95b6771ce87b279d689c"; }; buildInputs = [ libev ]; From a7331f956a7d107ba3a5d85ef2d126ef19bbcd25 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:08 +0200 Subject: [PATCH 1008/3452] python: geventhttpclient: 1.3.1 -> 1.4.2 --- pkgs/development/python-modules/geventhttpclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 59b11e0f6ac4..2bcccbec8e48 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "geventhttpclient"; - version = "1.3.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "bd87af8854f5fb05738916c8973671f7035568aec69b7c842887d6faf9c0a01d"; + sha256 = "967b11c4a37032f98c08f58176e4ac8de10473ab0c1f617acb8202d44b97fe21"; }; buildInputs = [ pytest ]; From 97da334c860c4418622e56eb819c2049b8a909c3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:08 +0200 Subject: [PATCH 1009/3452] python: gidgethub: 3.2.0 -> 4.1.1 --- pkgs/development/python-modules/gidgethub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 634d7c2ddc04..b72440c286a8 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "gidgethub"; - version = "3.2.0"; + version = "4.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8f4b69063a256994d38243cc0eba4e1453017b5b8b04a173216d02d47ffc3989"; + sha256 = "cfabfa696d422ee91eaf1e3f01ea75e576721233cc3ea8badc7d86c30061df8e"; }; nativeBuildInputs = [ setuptools pytestrunner ]; From d3ea557ede013e535c0619e82477a688d9041e36 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:08 +0200 Subject: [PATCH 1010/3452] python: gin-config: 0.2.1 -> 0.3.0 --- pkgs/development/python-modules/gin-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gin-config/default.nix b/pkgs/development/python-modules/gin-config/default.nix index 39a64781c8f9..412b0c159498 100644 --- a/pkgs/development/python-modules/gin-config/default.nix +++ b/pkgs/development/python-modules/gin-config/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "gin-config"; - version = "0.2.1"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "6305325d5afe470fa5a7130883035e51950478b317750205a1532e5413d4ba4c"; + sha256 = "6a83b7639ae76c276c0380d71d583f151b327a7c37978add314180ec1280a6cc"; }; From c8f216f3d43e462a3ba22c78894e64002072d196 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:08 +0200 Subject: [PATCH 1011/3452] python: gipc: 1.0.1 -> 1.1.0 --- pkgs/development/python-modules/gipc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index df1bd590d374..3fe26f4a934b 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "gipc"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1zg5bm30lqqd8x0jqbvr4yi8i4rzzk2hdnh280qnj2bwm5nqpghi"; + sha256 = "06116628e9cb7b2c34c8f248d0e4859fa5943e1e07381ad2b234ae9c7ed6f4cc"; }; propagatedBuildInputs = [ gevent ]; From 2b37876a3a11a53cd48913adc090defdedc6c7b4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:08 +0200 Subject: [PATCH 1012/3452] python: glom: 19.10.0 -> 20.5.0 --- pkgs/development/python-modules/glom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index cc73b26d7972..4188bdccf91a 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "glom"; - version = "19.10.0"; + version = "20.5.0"; src = fetchPypi { inherit pname version; - sha256 = "c8a50cb9fcf0c84807836c6a73cf61285557834b9050d7bde7732b936aceb7dd"; + sha256 = "e753d2e8d16647ffcd9f0f99ac85d3db523ff0a1f097cf0a154a60702bca7e42"; }; propagatedBuildInputs = [ boltons attrs face ]; From db1536434c82e2533c5a5db02e2bc4ebc4a3cbac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:09 +0200 Subject: [PATCH 1013/3452] python: google-music-proto: 2.8.0 -> 2.10.0 --- .../development/python-modules/google-music-proto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix index 2645c4efad80..af57e3209d1e 100644 --- a/pkgs/development/python-modules/google-music-proto/default.nix +++ b/pkgs/development/python-modules/google-music-proto/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "google-music-proto"; - version = "2.8.0"; + version = "2.10.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "10qraipdr18pwnr1dz6ai5vxs9lmww5wbavbh1xyg4lsggmlsrqb"; + sha256 = "91b78c0de4f59b1e5503fd6d49cb3fec029d9199cca0794c87667e643342e987"; }; postPatch = '' From 59aa97672eb3ef254032dee92ae5f42bb74e165e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:09 +0200 Subject: [PATCH 1014/3452] python: google-music: 3.5.0 -> 3.7.0 --- pkgs/development/python-modules/google-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix index f6b53aeebea3..9d2f0def99b2 100644 --- a/pkgs/development/python-modules/google-music/default.nix +++ b/pkgs/development/python-modules/google-music/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-music"; - version = "3.5.0"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1agqsbnn72gx88sk736k1pzdn2j8fi7flwqhj5g2qhz3wvkx90yq"; + sha256 = "b79956cc0df86345c74436ae6213b700345403c91d51947288806b174322573b"; }; postPatch = '' From 0b21012408ddd3d958812d7816d55b18efd99b72 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:09 +0200 Subject: [PATCH 1015/3452] python: google-cloud-asset: 0.6.0 -> 0.10.0 --- .../development/python-modules/google_cloud_asset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/pkgs/development/python-modules/google_cloud_asset/default.nix index 6c565d0f8206..5d4328ead522 100644 --- a/pkgs/development/python-modules/google_cloud_asset/default.nix +++ b/pkgs/development/python-modules/google_cloud_asset/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "0.6.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "35eeb50c101968b4b5eecc840002a6f83af6789b6a947f27f0b2787e30cc1835"; + sha256 = "d25ab222daaa0b827b00dae8c76e4c1b13ba5c687f0acdfd66529b805d41b7f3"; }; checkInputs = [ pytest mock ]; From 10bb6584c1f4e1e72c8b82f5cddf6b8b09e811cd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:09 +0200 Subject: [PATCH 1016/3452] python: google-cloud-bigquery-datatransfer: 0.4.1 -> 1.0.0 --- .../google_cloud_bigquery_datatransfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix index ef76c1e0aae1..dc5098fd67ab 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "0.4.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "9ef431c0747d92dd5d5d4038aab96215dfd20c59235ece99a96d8329792cbcdb"; + sha256 = "6eae79e6950f70d48b0578ae95f93530b4eac28216b96e2279cb2f94c5f2ba33"; }; checkInputs = [ pytest mock ]; From 9405021f4fc4c5b1f6c9404000447d3008cac8e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:09 +0200 Subject: [PATCH 1017/3452] python: google-cloud-container: 0.4.0 -> 0.5.0 --- .../python-modules/google_cloud_container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_container/default.nix b/pkgs/development/python-modules/google_cloud_container/default.nix index 5afaf97cfaad..e79a3ac56fe8 100644 --- a/pkgs/development/python-modules/google_cloud_container/default.nix +++ b/pkgs/development/python-modules/google_cloud_container/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "07zjwwliz8wx83l3bv7244qzrv0s3fchp8kgsy5xy41kmkg79a2d"; + sha256 = "9dd4523291401d8d872f89a87fa5a1d2bcbf6b8ceb1ec0659098fec37d9250e4"; }; checkInputs = [ pytest mock ]; From 0d515bbe3283086d76300221a185529a26fd46a1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:09 +0200 Subject: [PATCH 1018/3452] python: google-cloud-dataproc: 0.6.1 -> 0.8.0 --- .../python-modules/google_cloud_dataproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix index b4eed7e54934..79d24694bc6e 100644 --- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ b/pkgs/development/python-modules/google_cloud_dataproc/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "0.6.1"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "302bc448e77f1de958ba7413fb85819eda911043f219d8fc030a356848bc6f31"; + sha256 = "f37327079f6bc59fafcfb7ba4855137d26190a8d31fe8ee5180460a5eebd645f"; }; checkInputs = [ pytest mock ]; From d6e98c3c792849f55ae8a9419a94d4ddf5605ae5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:09 +0200 Subject: [PATCH 1019/3452] python: google-cloud-datastore: 1.11.0 -> 1.12.0 --- .../python-modules/google_cloud_datastore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_datastore/default.nix b/pkgs/development/python-modules/google_cloud_datastore/default.nix index 859e2271824f..6305da93d8c4 100644 --- a/pkgs/development/python-modules/google_cloud_datastore/default.nix +++ b/pkgs/development/python-modules/google_cloud_datastore/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "1.11.0"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1p0ifkhj48fa3m1y5990412s8msnn6mbz5p5g8ffln7jq7dvn57j"; + sha256 = "c98690833ee2e6341a4b802f278ba17d582ce58eb2e73152516ebc77522d82d7"; }; checkInputs = [ pytest mock ]; From ca5cdaf1dd93821bcb4fcacd4494af5786441d57 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:10 +0200 Subject: [PATCH 1020/3452] python: google-cloud-dlp: 0.13.0 -> 0.15.0 --- pkgs/development/python-modules/google_cloud_dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_dlp/default.nix b/pkgs/development/python-modules/google_cloud_dlp/default.nix index 5c285ca0b1b8..b0d3aa5a6346 100644 --- a/pkgs/development/python-modules/google_cloud_dlp/default.nix +++ b/pkgs/development/python-modules/google_cloud_dlp/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "0.13.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "844f5e63597c2a15561eec68397ee5f425e9be7728d2d7072f50f983fab31b9a"; + sha256 = "9abef093fb344ec556a94e5466b480046c18b8bb0a12f1d202f06c43f3e01f7d"; }; checkInputs = [ pytest mock ]; From ea8ef565ce8c62e53627e7ba7d55bf571e430844 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:10 +0200 Subject: [PATCH 1021/3452] python: google-cloud-error-reporting: 0.33.0 -> 0.34.0 --- .../python-modules/google_cloud_error_reporting/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix b/pkgs/development/python-modules/google_cloud_error_reporting/default.nix index 724539c55a0f..72502a4f4ad1 100644 --- a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix +++ b/pkgs/development/python-modules/google_cloud_error_reporting/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "0.33.0"; + version = "0.34.0"; src = fetchPypi { inherit pname version; - sha256 = "845c4d7252f21403a5634a4047c3d77a645df92f6724911a5faf6f5e1bba51fd"; + sha256 = "34edd11601b17c87a89c2e1cefdc27d975e1e9243a88ba3c0c48bfe6a05c404f"; }; checkInputs = [ pytest mock ]; From 25cd7e7c293fe221aff56bbd352ee9a4090a93c5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:10 +0200 Subject: [PATCH 1022/3452] python: google-cloud-firestore: 1.6.2 -> 1.7.0 --- .../python-modules/google_cloud_firestore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/pkgs/development/python-modules/google_cloud_firestore/default.nix index 04b767eaf025..abb849f63a89 100644 --- a/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ b/pkgs/development/python-modules/google_cloud_firestore/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "1.6.2"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "5ad4835c3a0f6350bcbbc42fd70e90f7568fca289fdb5e851888df394c4ebf80"; + sha256 = "afd986bc4bb5a92d6ebe02977cc1d5dc56bf401590d1df43c07609dbec21155d"; }; checkInputs = [ pytest ]; From d9324d8422b84a5a1436008730d9dcc75c65410c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:10 +0200 Subject: [PATCH 1023/3452] python: google-cloud-iot: 0.3.1 -> 1.0.0 --- pkgs/development/python-modules/google_cloud_iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_iot/default.nix b/pkgs/development/python-modules/google_cloud_iot/default.nix index e474207634e1..8f14f7eeb87f 100644 --- a/pkgs/development/python-modules/google_cloud_iot/default.nix +++ b/pkgs/development/python-modules/google_cloud_iot/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "0.3.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "ab1070003027e28c6956cee3f11228277830d191a1c38a809c96eb0baf8be670"; + sha256 = "bfd1511a7bcc7d23c2ea30253dd86b2b2247576d1345d895d7153dc0b262f06e"; }; checkInputs = [ pytest mock ]; From 97bc89881f1ff7d6cd628f9bdb0d1703209625c0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:10 +0200 Subject: [PATCH 1024/3452] python: google-cloud-kms: 1.2.1 -> 1.4.0 --- pkgs/development/python-modules/google_cloud_kms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google_cloud_kms/default.nix index e9f8275deb94..c333a1fa137a 100644 --- a/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/pkgs/development/python-modules/google_cloud_kms/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "1.2.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "bb2cf9bff554df05f32c9a51cc50cdd0d6fbabcdc20526460df5306ea28547ff"; + sha256 = "9d108b2754cb2c6ccc60604d27855c7139dad4b2455342e1e7bfffc27c5193bd"; }; checkInputs = [ pytest mock ]; From 0b97eb7bf35715277df36bc54ebcef25d3918290 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:10 +0200 Subject: [PATCH 1025/3452] python: google-cloud-monitoring: 0.34.0 -> 1.0.0 --- .../python-modules/google_cloud_monitoring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_monitoring/default.nix b/pkgs/development/python-modules/google_cloud_monitoring/default.nix index c29b31eb50da..8815d8246d16 100644 --- a/pkgs/development/python-modules/google_cloud_monitoring/default.nix +++ b/pkgs/development/python-modules/google_cloud_monitoring/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "0.34.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "75370af645dd815c234561e7b356fa5d99b0ee6448c0e5d013455c72af961d0b"; + sha256 = "2feee2cc56b60ed1316175af0974668041c6480803542d3711e4365882dc79cd"; }; checkInputs = [ pytest mock ]; From f8e0429cdcedf38769d5d9aca75a51255a93d640 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:10 +0200 Subject: [PATCH 1026/3452] python: google-cloud-pubsub: 1.1.0 -> 1.5.0 --- .../python-modules/google_cloud_pubsub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/pkgs/development/python-modules/google_cloud_pubsub/default.nix index 683f5807a0ce..e5d62dd8f464 100644 --- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix +++ b/pkgs/development/python-modules/google_cloud_pubsub/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "1.1.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "bdead87e40eba93043c6704578e946cf2794366312f936da0a2b3754234dde29"; + sha256 = "d396ae1938e966e1ac3b981d14db7b0f9fabab553b0876c3202e187e4b477ab6"; }; checkInputs = [ pytest mock ]; From 81aecd19fe8b185f90cccbd49a12f413794ef41d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:10 +0200 Subject: [PATCH 1027/3452] python: google-cloud-redis: 0.3.0 -> 1.0.0 --- .../development/python-modules/google_cloud_redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_redis/default.nix b/pkgs/development/python-modules/google_cloud_redis/default.nix index d3c12d29f2b3..92f2027bf4e9 100644 --- a/pkgs/development/python-modules/google_cloud_redis/default.nix +++ b/pkgs/development/python-modules/google_cloud_redis/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "0.3.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "e24a5eeb126a3e8fcf990806c7a853a27bb9b830c2f03fda42a499894b7614c6"; + sha256 = "73057750d6afcfc90c224ee4ffa3262b5e85e866b4db676f74a07b49713f2c3a"; }; checkInputs = [ pytest mock ]; From 64ca58c24e23feceb0201e0fd40a1f249500b6b7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:10 +0200 Subject: [PATCH 1028/3452] python: google-cloud-runtimeconfig: 0.30.0 -> 0.31.0 --- .../python-modules/google_cloud_runtimeconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix index f8962e6fa5d9..c953407af8f4 100644 --- a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.30.0"; + version = "0.31.0"; src = fetchPypi { inherit pname version; - sha256 = "02075724535b3d6e1d9a6df8a2340190e195faea2f9e91f48d6ae9006993d636"; + sha256 = "3e0218abc438f2f43605db27189fa7a48c3ca3defc45054dac01835527058a4c"; }; checkInputs = [ pytest mock ]; From 275520c229217a3037340a7facd3e7426fdc3a4c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:10 +0200 Subject: [PATCH 1029/3452] python: google-cloud-securitycenter: 0.3.0 -> 0.5.0 --- .../python-modules/google_cloud_securitycenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix index 42dccd608052..e6b0fe5f221c 100644 --- a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix +++ b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "0.3.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "6a0a878db990d657b88ac34942b0a66df24da4643aa181274e602ac337de5d0c"; + sha256 = "e2c14e01697e54aef9d755bd8abff01af748f42f4e3559efcbb3b0db659f66ac"; }; checkInputs = [ pytest mock ]; From 808ab2a8025459169a3f7a4e023d86150a383eb5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:11 +0200 Subject: [PATCH 1030/3452] python: google-cloud-spanner: 1.15.1 -> 1.17.0 --- .../python-modules/google_cloud_spanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_spanner/default.nix b/pkgs/development/python-modules/google_cloud_spanner/default.nix index a0c5a10d86c4..e0158dfbaad6 100644 --- a/pkgs/development/python-modules/google_cloud_spanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_spanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "1.15.1"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "76f98f2614b503c8808f37b979602aca4d772b356f85c1f4b2a00b0d0d548472"; + sha256 = "299e08faf2402d9c6a8e2f2b62f6eade729cecb3d27b1b635bb1f126e0ddc77e"; }; checkInputs = [ pytest mock ]; From aab0221ff99eafc3e5f666c061207db494a95bae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:11 +0200 Subject: [PATCH 1031/3452] python: google-cloud-storage: 1.26.0 -> 1.28.1 --- .../python-modules/google_cloud_storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index b253a4c71ed7..d3e4b8fd932f 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.26.0"; + version = "1.28.1"; src = fetchPypi { inherit pname version; - sha256 = "0caxqf6vda89cmc81fxhmfk3n61aypqz2sswnbsylzf436rsxpzz"; + sha256 = "a7b5c326e7307a83fa1f1f0ef71aba9ad1f3a2bc6a768401e13fc02369fd8612"; }; propagatedBuildInputs = [ From 4e62aeca6c597741b14087ed25df52531c84c1ec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:11 +0200 Subject: [PATCH 1032/3452] python: google-cloud-tasks: 1.3.0 -> 1.5.0 --- .../development/python-modules/google_cloud_tasks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_tasks/default.nix b/pkgs/development/python-modules/google_cloud_tasks/default.nix index b4dc1e83ca83..b7f827dd4802 100644 --- a/pkgs/development/python-modules/google_cloud_tasks/default.nix +++ b/pkgs/development/python-modules/google_cloud_tasks/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "1.3.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "221388d1dd4bf21ba46ead499bbb3dfba9151b852c4fdca70935ba36e5c3631a"; + sha256 = "d751b97c1e84980a1646702d3fc1b45bab3284bc3388181f1dc9ba3d204b5a39"; }; checkInputs = [ pytest mock ]; From c96106ffd71e45da853de6c7033f350b46d3996c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:11 +0200 Subject: [PATCH 1033/3452] python: google-cloud-texttospeech: 0.5.0 -> 2.0.0 --- .../python-modules/google_cloud_texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix index 0f448440ca4a..2c3ef0d39fe2 100644 --- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix +++ b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "0.5.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "75562a8db2b0268f57c64e448d697fe82c0ffa889f09be8cbc6ba5369c9a0c59"; + sha256 = "4ed3d9f17fa7b8d53dbc4992d976f72d845266786a81938444315e5a7b194b53"; }; checkInputs = [ pytest mock ]; From ea1193e2870b7082abaa2a3cbb08526c63283338 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:11 +0200 Subject: [PATCH 1034/3452] python: google-cloud-videointelligence: 1.12.1 -> 1.14.0 --- .../python-modules/google_cloud_videointelligence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix index 38ecb8bcc21e..07fb02ea5958 100644 --- a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix +++ b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "1.12.1"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "66d0a63d27e83656b1b4e0205d32725e4c58db174118badba164bb7d05a66981"; + sha256 = "c91f605d00926416bcd4d32d6ca195e0e5bd6fb794bc67b09910a19ee2ca6570"; }; checkInputs = [ pytest mock ]; From 71c0665dd41bf1c8a166ae00dcda17b391c525e1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:11 +0200 Subject: [PATCH 1035/3452] python: google-cloud-vision: 0.41.0 -> 1.0.0 --- .../python-modules/google_cloud_vision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/pkgs/development/python-modules/google_cloud_vision/default.nix index c2bdc652c7c1..585abc8cc48e 100644 --- a/pkgs/development/python-modules/google_cloud_vision/default.nix +++ b/pkgs/development/python-modules/google_cloud_vision/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "0.41.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "fd7adcfd8f1bddc19797b25ba3287a4f0cf42e208f330fffb7f1cd125e4d6cd3"; + sha256 = "18e78b190c81d200ae4f6a46d4af57422d68b3b05b0540d5cd1806e3874142bf"; }; checkInputs = [ mock ]; From 61d46c13c05ad5f4c8252c2b63b1f7f33f029895 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:11 +0200 Subject: [PATCH 1036/3452] python: google-cloud-websecurityscanner: 0.3.0 -> 0.4.0 --- .../google_cloud_websecurityscanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix index a68bd9df570e..55c370717e13 100644 --- a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "26a29657e20fda4302275b92c84c16228381998797e203f85d612f93d4c62358"; + sha256 = "1c8031e6eec59ee3e2d4af88090ba36521ceb67d79cb297d3c128d2a16af0798"; }; checkInputs = [ pytest mock ]; From e92e73cbab8ed3464dd141f46b3abb7d55f3d218 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:11 +0200 Subject: [PATCH 1037/3452] python: googleapis-common-protos: 1.51.0 -> 1.52.0 --- .../python-modules/googleapis_common_protos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix index 08d31b6920bb..507c3ba229a6 100644 --- a/pkgs/development/python-modules/googleapis_common_protos/default.nix +++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.51.0"; + version = "1.52.0"; src = fetchPypi { inherit pname version; - sha256 = "0vi2kr0daivx2q1692lp3y61bfnvdw471xsfwi8924br89q92g01"; + sha256 = "560716c807117394da12cecb0a54da5a451b5cf9866f1d37e9a5e2329a665351"; }; propagatedBuildInputs = [ protobuf setuptools ]; From d6245a8dccf8b9f3a48e2447b2adc636abd3b8e4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:11 +0200 Subject: [PATCH 1038/3452] python: graph_nets: 1.0.5 -> 1.1.0 --- pkgs/development/python-modules/graph_nets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graph_nets/default.nix b/pkgs/development/python-modules/graph_nets/default.nix index 4e83be64d03a..4f7b8c52e9ee 100644 --- a/pkgs/development/python-modules/graph_nets/default.nix +++ b/pkgs/development/python-modules/graph_nets/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "graph_nets"; - version = "1.0.5"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "73e98a5930c6c7b609257ada2cf4523db70810343e0593bf0fa710b77e991933"; + sha256 = "278a040674bef295aaf8bb5b0d1b3f207144dc68f0bcfe3f14912b9b85eb0927"; }; postPatch = '' From 6c65cf13175bd3c87afcceac9bcce285ea185dda Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:11 +0200 Subject: [PATCH 1039/3452] python: green: 3.0.0 -> 3.1.4 --- pkgs/development/python-modules/green/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index 1bf59a24dd41..de1831e3317a 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "green"; - version = "3.0.0"; + version = "3.1.4"; src = fetchPypi { inherit pname version; - sha256 = "17cfgq0s02p5cjrsvcicqxiq6kflahjsd9pm03f054x7lpvqi5cv"; + sha256 = "65f87e4c0d2aca63eb32b01c78233e6f920a58ebabc4f85dd9d8f1c6a92a5184"; }; propagatedBuildInputs = [ From b05f8eb1ab8635f701d9d54412fc0bdec42288e8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:12 +0200 Subject: [PATCH 1040/3452] python: gspread: 3.3.1 -> 3.6.0 --- pkgs/development/python-modules/gspread/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 5a25d81d0173..4cb2d1f9b675 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "3.3.1"; + version = "3.6.0"; pname = "gspread"; src = fetchPypi { inherit pname version; - sha256 = "0mpvhndr38hb5x95xk2mqqasvcy6pa7ck8801bvpg5y3lwn5nka0"; + sha256 = "e04f1a6267b3929fc1600424c5ec83906d439672cafdd61a9d5b916a139f841c"; }; propagatedBuildInputs = [ requests ]; From 57dad81e4e1b377cd1f55154450ea96ae9a94c15 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:12 +0200 Subject: [PATCH 1041/3452] python: gym: 0.16.0 -> 0.17.2 --- pkgs/development/python-modules/gym/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index fd08f71aa2bb..7588135e33c3 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "gym"; - version = "0.16.0"; + version = "0.17.2"; src = fetchPypi { inherit pname version; - sha256 = "06h5b639nmzhmy4m1j3vigm86iv5pv7k8jy6xpldyd4jdlf37nn5"; + sha256 = "bb495aa56995b01274a2213423bf5ba05b8f4fd51c6dc61e9d4abddd1189718e"; }; postPatch = '' From 8b150b5e82b214f1fae3475e6b46c2f4d977be03 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:12 +0200 Subject: [PATCH 1042/3452] python: h3: 3.4.3 -> 3.6.3 --- pkgs/development/python-modules/h3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index d98a053c4189..bad2e9260a41 100644 --- a/pkgs/development/python-modules/h3/default.nix +++ b/pkgs/development/python-modules/h3/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "h3"; - version = "3.4.3"; + version = "3.6.3"; src = fetchPypi { inherit pname version; - sha256 = "07dlqpr1r4kzb3gci395plpss8gxvvrij40l6w0mylyg7fkab4m2"; + sha256 = "7928303e39eb962cfbca38b35e289ddc5e04b0d3ef56532e1747a19450e13263"; }; patches = [ From 5fd8445141112907c44777ef51f6b9c7ed5d6228 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:12 +0200 Subject: [PATCH 1043/3452] python: hcloud: 1.6.3 -> 1.7.0 --- pkgs/development/python-modules/hcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index bb57c0fbf96f..672c4b94f36e 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.6.3"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0idm73k144lk4aw07r8gwxlb0281j09d6l16a0nrn82r36lwq9fy"; + sha256 = "d249ab784b23026fcde21e4d69b46eaf9f3559ba3612f1d896a4092ecfc06a75"; }; propagatedBuildInputs = [ future requests python-dateutil ]; From 0c010fd4ff8b46164109f99e51d2b17b7deffaf9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:12 +0200 Subject: [PATCH 1044/3452] python: hidapi: 0.7.99.post21 -> 0.9.0.post2 --- pkgs/development/python-modules/hidapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index cd70a7ba2ff5..4b23ec0b74c1 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hidapi"; - version = "0.7.99.post21"; + version = "0.9.0.post2"; src = fetchPypi { inherit pname version; - sha256 = "e0be1aa6566979266a8fc845ab0e18613f4918cf2c977fe67050f5dc7e2a9a97"; + sha256 = "a71dd3c153cb6bb2b73d2612b5ab262830d78c6428f33f0c06818749e64c9320"; }; propagatedBuildInputs = From e4a1f56692b8d7f13b8bb5040a1e4aed3453c4d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:12 +0200 Subject: [PATCH 1045/3452] python: htmllaundry: 2.0 -> 2.2 --- pkgs/development/python-modules/htmllaundry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/htmllaundry/default.nix b/pkgs/development/python-modules/htmllaundry/default.nix index df3bdb216a4f..33d3691e85ad 100644 --- a/pkgs/development/python-modules/htmllaundry/default.nix +++ b/pkgs/development/python-modules/htmllaundry/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "htmllaundry"; - version = "2.0"; + version = "2.2"; src = fetchPypi { inherit pname version; - sha256 = "e428cba78d5a965e959f5dac2eb7d5f7d627dd889990d5efa8d4e03f3dd768d9"; + sha256 = "9124f067d3c06ef2613e2cc246b2fde2299802280a8b0e60dc504137085f0334"; }; buildInputs = [ nose ]; From cc4cd90445769e572217f3a6b22a873c777a1243 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:12 +0200 Subject: [PATCH 1046/3452] python: httplib2: 0.17.4 -> 0.18.1 --- pkgs/development/python-modules/httplib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 5495c806dc0f..b23d501f1e53 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.17.4"; + version = "0.18.1"; src = fetchPypi { inherit pname version; - sha256 = "1e9340ecf0187a621bdcfb407c32e04e8e09fc6ab28b050efa38f20eae0e975f"; + sha256 = "8af66c1c52c7ffe1aa5dc4bcd7c769885254b0756e6e69f953c7f0ab49a70ba3"; }; # Needs setting up From 10ebfb83ab289a0d11e51160d5629e4a9188491a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:12 +0200 Subject: [PATCH 1047/3452] python: httpretty: 0.9.7 -> 1.0.2 --- pkgs/development/python-modules/httpretty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index ee0e598a9ac2..3dd5b63bbf7d 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "httpretty"; - version = "0.9.7"; + version = "1.0.2"; # drop this for version > 0.9.7 # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394 @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"; + sha256 = "24a6fd2fe1c76e94801b74db8f52c0fb42718dc4a199a861b305b1a492b9d868"; }; propagatedBuildInputs = [ six ]; From 69d7c304696fb59436cbf5442d93615d8ecb2dc2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:12 +0200 Subject: [PATCH 1048/3452] python: httptools: 0.0.13 -> 0.1.1 --- pkgs/development/python-modules/httptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix index b5d7f8cdb102..e14374449f05 100644 --- a/pkgs/development/python-modules/httptools/default.nix +++ b/pkgs/development/python-modules/httptools/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "httptools"; - version = "0.0.13"; + version = "0.1.1"; src = fetchPypi { inherit pname version; - sha256 = "e00cbd7ba01ff748e494248183abc6e153f49181169d8a3d41bb49132ca01dfc"; + sha256 = "41b573cf33f64a8f8f3400d0a7faf48e1888582b6f6e02b82b9bd4f0bf7497ce"; }; meta = with lib; { From 837d57848e4be853eca5f32d930ae2b0e9e99ebf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:12 +0200 Subject: [PATCH 1049/3452] python: humanfriendly: 4.18 -> 8.2 --- pkgs/development/python-modules/humanfriendly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix index 8674231bc308..49cb31b7d030 100644 --- a/pkgs/development/python-modules/humanfriendly/default.nix +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "humanfriendly"; - version = "4.18"; + version = "8.2"; src = fetchPypi { inherit pname version; - sha256 = "33ee8ceb63f1db61cce8b5c800c531e1a61023ac5488ccde2ba574a85be00a85"; + sha256 = "bf52ec91244819c780341a3438d5d7b09f431d3f113a475147ac9b7b167a3d12"; }; propagatedBuildInputs = lib.optional (pythonOlder "3.3") monotonic; From 97650b51b1a608ff4b1d28ef470d676644f49e2e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:13 +0200 Subject: [PATCH 1050/3452] python: humanize: 0.5.1 -> 2.4.0 --- pkgs/development/python-modules/humanize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index d54c932ae32c..8967e030f6d0 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.5.1"; + version = "2.4.0"; pname = "humanize"; src = fetchPypi { inherit pname version; - sha256 = "a43f57115831ac7c70de098e6ac46ac13be00d69abbf60bdcac251344785bb19"; + sha256 = "42ae7d54b398c01bd100847f6cb0fc9e381c21be8ad3f8e2929135e48dbff026"; }; buildInputs = [ mock ]; From 16f34f0e6bc96e98bd372e589f7bd574f4df13aa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:13 +0200 Subject: [PATCH 1051/3452] python: hupper: 1.9.1 -> 1.10.2 --- pkgs/development/python-modules/hupper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index 33f76f0a2486..b70202138d41 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "hupper"; - version = "1.9.1"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "3b1c2222ec7b8159e7ad059e4493c6cc634c86184af0bf2ce5aba6edd241cf5f"; + sha256 = "3818f53dabc24da66f65cf4878c1c7a9b5df0c46b813e014abdd7c569eb9a02a"; }; checkPhase = '' From f978efc3d6d733962b6bea16da35bfc26280b163 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:13 +0200 Subject: [PATCH 1052/3452] python: idna: 2.8 -> 2.9 --- pkgs/development/python-modules/idna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index 5e5d623ff10e..13e8fb43bb20 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "idna"; - version = "2.8"; + version = "2.9"; src = fetchPypi { inherit pname version; - sha256 = "c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407"; + sha256 = "7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb"; }; meta = { From 7d8783339b6ce63f0e5e0875bb0cb7ab324bb4c5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:13 +0200 Subject: [PATCH 1053/3452] python: ijson: 2.6.1 -> 3.0.4 --- pkgs/development/python-modules/ijson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index 9374d8939c39..4bcbe6a061a7 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ijson"; - version = "2.6.1"; + version = "3.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1l034zq23315icym2n0zppa5lwpdll3mvavmyjbiryxb4c5wdsvm"; + sha256 = "6e25448318cda55e82a5de52beb6813b003cb8e4a7b5753305912a30055a29f8"; }; doCheck = false; # something about yajl From 217433ead1ea28dd08614edd9046241b3ef95005 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:13 +0200 Subject: [PATCH 1054/3452] python: imageio-ffmpeg: 0.3.0 -> 0.4.2 --- pkgs/development/python-modules/imageio-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index e3a6e3bfd8db..d9991ee7845f 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -6,10 +6,10 @@ buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.3.0"; + version = "0.4.2"; src = fetchPypi { - sha256 = "1hnn00xz9jyksnx1g0r1icv6ynbdnxq4cfnmb58ikg6ymi20al18"; + sha256 = "13b05b17a941a9f4a90b16910b1ffac159448cff051a153da8ba4b4343ffa195"; inherit pname version; }; From d7a7002d6dd74b4983160f3469e4fb551adcf233 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:13 +0200 Subject: [PATCH 1055/3452] python: imageio: 2.6.1 -> 2.8.0 --- pkgs/development/python-modules/imageio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 5433e1ea9e41..c4d9fc0ee842 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -15,10 +15,10 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.6.1"; + version = "2.8.0"; src = fetchPypi { - sha256 = "1bk7pijmrspdfj9nnlbnw1yiww9w1kyjvlpzy9s5hj6zp4qv4kpl"; + sha256 = "fb5fd6d3d17126bbaac9af29fe340e2c97a196eb9416d4f28c0e543744a152cf"; inherit pname version; }; From 12b22d9dc72a8c69ac06542dd5706c103b32a759 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:13 +0200 Subject: [PATCH 1056/3452] python: imagesize: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/imagesize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imagesize/default.nix b/pkgs/development/python-modules/imagesize/default.nix index aa7f1ea47249..ab3ee46c1b83 100644 --- a/pkgs/development/python-modules/imagesize/default.nix +++ b/pkgs/development/python-modules/imagesize/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "imagesize"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "f3832918bc3c66617f92e35f5d70729187676313caa60c187eb0f28b8fe5e3b5"; + sha256 = "b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"; }; meta = with stdenv.lib; { From e052cf73cd1750bf5b19e0ef94e4cf00de8a7e71 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:13 +0200 Subject: [PATCH 1057/3452] python: inflect: 3.0.2 -> 4.1.0 --- pkgs/development/python-modules/inflect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 2b856b35f7c3..31617283ee66 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "inflect"; - version = "3.0.2"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "ee7c9b7c3376d06828b205460afb3c447b5d25dd653171db249a238f3fc2c18a"; + sha256 = "def6f3791be9181f0c01e0bf5949304007ec6e04c6674fbef7cc49c657b8a9a5"; }; nativeBuildInputs = [ setuptools_scm ]; From 551b730a379986c3df6306e06d05549b6e19d67c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:13 +0200 Subject: [PATCH 1058/3452] python: inflection: 0.3.1 -> 0.4.0 --- pkgs/development/python-modules/inflection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix index bc2a24abe593..f41e72def8d1 100644 --- a/pkgs/development/python-modules/inflection/default.nix +++ b/pkgs/development/python-modules/inflection/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "inflection"; - version = "0.3.1"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1jhnxgnw8y3mbzjssixh6qkc7a3afc4fygajhqrqalnilyvpzshq"; + sha256 = "32a5c3341d9583ec319548b9015b7fbdf8c429cbcb575d326c33ae3a0e90d52c"; }; checkInputs = [ pytest ]; From d4b6bb8c3b02520589d075110997b9f8f34a408e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:13 +0200 Subject: [PATCH 1059/3452] python: influxdb: 5.2.3 -> 5.3.0 --- pkgs/development/python-modules/influxdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index cb86e18eb6e7..0cc32dbc874d 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "influxdb"; - version = "5.2.3"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0dlddhbmd37qsdfyqn9w3xx4v07hladj6fvk9i15jxmz0iz6q9rh"; + sha256 = "9bcaafd57ac152b9824ab12ed19f204206ef5df8af68404770554c5b55b475f6"; }; # ImportError: No module named tests From b0991585977582facd256a36210759da62700f71 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:14 +0200 Subject: [PATCH 1060/3452] python: iniparse: 0.4 -> 0.5 --- pkgs/development/python-modules/iniparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iniparse/default.nix b/pkgs/development/python-modules/iniparse/default.nix index 1fdae967a42f..d292196ff536 100644 --- a/pkgs/development/python-modules/iniparse/default.nix +++ b/pkgs/development/python-modules/iniparse/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "iniparse"; - version = "0.4"; + version = "0.5"; src = fetchPypi { inherit pname version; - sha256 = "0m60k46vr03x68jckachzsipav0bwhhnqb8715hm1cngs89fxhdb"; + sha256 = "932e5239d526e7acb504017bb707be67019ac428a6932368e6851691093aa842"; }; checkPhase = '' From 1d4ad4baf6ba4f07e7c8626c6948bc1061aa6c82 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:14 +0200 Subject: [PATCH 1061/3452] python: intake: 0.5.5 -> 0.6.0 --- pkgs/development/python-modules/intake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index ca22dc4a9f97..91c779c292a2 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -23,13 +23,13 @@ buildPythonPackage rec { pname = "intake"; - version = "0.5.5"; + version = "0.6.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0ypgf0046hln27gjcy7gjh4diblgmivkf7kxbcy1mjvwka55bdmw"; + sha256 = "0c284abeb74927a7366dcab6cefc010c4d050365b8af61c37326a2473a490a4e"; }; checkInputs = [ pyarrow pytest ]; From 6e6af2743846ac8d980e63ad2e70840cb266f7dd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:14 +0200 Subject: [PATCH 1062/3452] python: invoke: 1.3.1 -> 1.4.1 --- pkgs/development/python-modules/invoke/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index 8c1ca760df84..45f3ee7a04db 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "invoke"; - version = "1.3.1"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "dae041ff458e1ef05448aae3b76e8c2a176c4b7c6a9d5e8ce880f16251803661"; + sha256 = "de3f23bfe669e3db1085789fd859eb8ca8e0c5d9c20811e2407fa042e8a5e15d"; }; patchPhase = '' From 36411c530fcd0ec6bf06858ddc1eb5adc6bf34ae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:14 +0200 Subject: [PATCH 1063/3452] python: ipyvuetify: 1.2.2 -> 1.4.0 --- pkgs/development/python-modules/ipyvuetify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index dc9df34c0d01..b1ccc22ac6d9 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.2.2"; + version = "1.4.0"; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - sha256 = "0vg3sdkdhba917xs6gyzwpp10gi2gszihf45cw2llwsfgb7kpfw8"; + sha256 = "663ad97a30cd449117639e4af37d535d7383b2014b88338d12392ac7f62bdb2b"; }; propagatedBuildInputs = [ ipyvue ]; From c73b2592ef30a19497ea179f042a64b3ce7b6749 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:14 +0200 Subject: [PATCH 1064/3452] python: janus: 0.4.0 -> 0.5.0 --- pkgs/development/python-modules/janus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/janus/default.nix b/pkgs/development/python-modules/janus/default.nix index da0f43811f23..6fe188fbf849 100644 --- a/pkgs/development/python-modules/janus/default.nix +++ b/pkgs/development/python-modules/janus/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "janus"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "cfc221683160b91b35bae1917e2957b78dad10a2e634f4f8ed119ed72e2a88ef"; + sha256 = "0700f5537d076521851d19b7625545c5e76f6d5792ab17984f28230adcc3b34c"; }; disabled = pythonOlder "3.6"; From 579cf9de2693ed44129241ca079e41e82c138976 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:14 +0200 Subject: [PATCH 1065/3452] python: jaraco.collections: 2.1 -> 3.0.0 --- .../development/python-modules/jaraco_collections/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index ceaa46a7847e..9f6e6e2aa7e9 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "2.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0z1kmgf8jahx42bmflmj030wl8yrksw5b5ghcpayrqd5221jfk0f"; + sha256 = "be570ef4f2e7290b757449395238fa63d70a9255574624e73c5ff9f1ee554721"; }; doCheck = false; From 49912d5409564e306818554c888cb26dce789a78 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:14 +0200 Subject: [PATCH 1066/3452] python: jaraco.functools: 2.0 -> 3.0.1 --- pkgs/development/python-modules/jaraco_functools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index ac6eb936e628..638d2b14e985 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.functools"; - version = "2.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "35ba944f52b1a7beee8843a5aa6752d1d5b79893eeb7770ea98be6b637bf9345"; + sha256 = "9fedc4be3117512ca3e03e1b2ffa7a6a6ffa589bfb7d02bfb324e55d493b94f4"; }; propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; From 7795c90d2964359c61c8cd5ae5edb3385f990fc9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:14 +0200 Subject: [PATCH 1067/3452] python: jaraco.itertools: 4.4.2 -> 5.0.0 --- pkgs/development/python-modules/jaraco_itertools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 446a3874c48e..1932f672b014 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.itertools"; - version = "4.4.2"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0zxx8ffk5ycapy2d41dfgzskl5jfwjc10hsd91jsrax5alkhrh7x"; + sha256 = "6447d567f57efe5efea386265c7864652e9530830a1b80f43e60b4f222b9ab84"; }; patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ]; From e783ffe9cb5323f35dcae2ac0b1731ad59e0212e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:14 +0200 Subject: [PATCH 1068/3452] python: jaraco.logging: 2.0 -> 3.0.0 --- pkgs/development/python-modules/jaraco_logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix index 1ac7b48c0fab..cf4ae4e435cc 100644 --- a/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/pkgs/development/python-modules/jaraco_logging/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.logging"; - version = "2.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1lb846j7qs1hgqwkyifv51nhl3f8jimbc4lk8yn9nkaynw0vyzcg"; + sha256 = "31716fe84d3d5df39d95572942513bd4bf8ae0a478f64031eff4c2ea9e83434e"; }; patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ]; From aaec156d64292541c9e7465367f8b262c61a264e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:14 +0200 Subject: [PATCH 1069/3452] python: javaobj-py3: 0.3.0 -> 0.4.1 --- pkgs/development/python-modules/javaobj-py3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/javaobj-py3/default.nix b/pkgs/development/python-modules/javaobj-py3/default.nix index 54656e1ea993..e82f4c2511fd 100644 --- a/pkgs/development/python-modules/javaobj-py3/default.nix +++ b/pkgs/development/python-modules/javaobj-py3/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "javaobj-py3"; - version = "0.3.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0j9532i7bnjd0v4a8c36mjj9rsdnbmckk65dh9sbmvnhy3j6jx55"; + sha256 = "419ff99543469e68149f875abb0db5251cecd350c03d2bfb4c94a5796f1cbc14"; }; # Tests assume network connectivity From a1795a2f3a734cf5344672c6bc06cbbf2d182784 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:15 +0200 Subject: [PATCH 1070/3452] python: jedi: 0.15.2 -> 0.17.0 --- pkgs/development/python-modules/jedi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 3a8da882d125..7abcc81e5936 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.15.2"; + version = "0.17.0"; src = fetchPypi { inherit pname version; - sha256 = "e909527104a903606dd63bea6e8e888833f0ef087057829b89a18364a856f807"; + sha256 = "df40c97641cb943661d2db4c33c2e1ff75d491189423249e989bcea4464f3030"; }; postPatch = '' From 6fc26639849f1c0517d886fc3a45d2a5f7fcc887 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:15 +0200 Subject: [PATCH 1071/3452] python: jenkins-job-builder: 3.3.0 -> 3.4.0 --- .../python-modules/jenkins-job-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 26b7ab5d622f..e5f4fae63d36 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0znnw1vnvnm8a6gfrk479s2b9hzlxi4qy57c9a47qphvx3mklm8x"; + sha256 = "80a7e8d3bebb1e792ff347e9dd072879ce105424224fe804e6671c32a2e8e4bf"; }; postPatch = '' From 9d2e1e80a5e19d28d24659c43dd87dd6bf8f2509 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:15 +0200 Subject: [PATCH 1072/3452] python: jmespath: 0.9.5 -> 0.10.0 --- pkgs/development/python-modules/jmespath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix index ebea3546d9ec..993955f2a032 100644 --- a/pkgs/development/python-modules/jmespath/default.nix +++ b/pkgs/development/python-modules/jmespath/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jmespath"; - version = "0.9.5"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1nf2ipzvigspy17r16dpkhzn1bqdmlak162rm8dy4wri2n6mr9fc"; + sha256 = "b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"; }; buildInputs = [ nose ]; From 7d729dce9435e4691e1161867096844d3942be76 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:15 +0200 Subject: [PATCH 1073/3452] python: joblib: 0.14.1 -> 0.15.1 --- pkgs/development/python-modules/joblib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index d0c875cfa3bf..da6e53fa129c 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "joblib"; - version = "0.14.1"; + version = "0.15.1"; src = fetchPypi { inherit pname version; - sha256 = "0630eea4f5664c463f23fbf5dcfc54a2bc6168902719fa8e19daf033022786c8"; + sha256 = "61e49189c84b3c5d99a969d314853f4d1d263316cc694bec17548ebaa9c47b6e"; }; checkInputs = [ sphinx numpydoc pytest ]; From 76c885e9ea419027a82b3871d680ca32d5ca56cb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:15 +0200 Subject: [PATCH 1074/3452] python: jsbeautifier: 1.10.3 -> 1.11.0 --- pkgs/development/python-modules/jsbeautifier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index b30d2ee7e0fd..225fa48c72c3 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.10.3"; + version = "1.11.0"; propagatedBuildInputs = [ six editorconfig ]; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "0aaxi56qm2wmccsdj4v1lc158625c2g6ikqq950yv43i0pyyi3lp"; + sha256 = "4f670c6f4f8d4caca9a348271010742f494becb96fe0a9be6ffac8b3d46350ca"; }; meta = with lib; { From 91403074bf10eca1d99a3f5ba0f58894621f5d68 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:15 +0200 Subject: [PATCH 1075/3452] python: jsonpatch: 1.24 -> 1.25 --- pkgs/development/python-modules/jsonpatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index 7345c8f723a9..82ef58bab5df 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jsonpatch"; - version = "1.24"; + version = "1.25"; src = fetchPypi { inherit pname version; - sha256 = "cbb72f8bf35260628aea6b508a107245f757d1ec839a19c34349985e2c05645a"; + sha256 = "ddc0f7628b8bfdd62e3cbfbc24ca6671b0b6265b50d186c2cf3659dc0f78fd6a"; }; # test files are missing From b96c3b474981a39ccf69da7aa52d53ef2d65e9d8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:15 +0200 Subject: [PATCH 1076/3452] python: jsonpickle: 1.2 -> 1.4.1 --- pkgs/development/python-modules/jsonpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index 528287028a22..4415d90654ad 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "1.2"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "16xj4r31pnd90slax5mmd5wps5s73wp9mn6sy9nhkl5ih7bj5sfk"; + sha256 = "e8d4b7cd0bd6826001a74377df1079a76ad8bae0f909282de2554164c837c8ba"; }; checkInputs = [ pytest ]; From 1dc16123229663bb681d32f8b506aa8b2d4f7423 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:15 +0200 Subject: [PATCH 1077/3452] python: junos-eznc: 2.3.1 -> 2.4.1 --- pkgs/development/python-modules/junos-eznc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 9c98895a8b2e..1f92045c41a3 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.3.1"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0f8c4763fe2281979bc00350b93d510368992dbae0dae4fea0bafee5904a7e68"; + sha256 = "8f3ecf06ab4d630f27e7ed7a7b605122ee5c5e5386b1f5186f6cb52810750b18"; }; From 0276d8abc8f798131cd89092ca4e052c01c6d2fb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:15 +0200 Subject: [PATCH 1078/3452] python: jupyter-repo2docker: 0.10.0 -> 0.11.0 --- .../python-modules/jupyter-repo2docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 2a5e1a988da3..4dc878e26701 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "0.10.0"; + version = "0.11.0"; pname = "jupyter-repo2docker"; disabled = !(pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "7965262913be6be60e64c8016f5f3d4bf93701f2787209215859d73b2adbc05a"; + sha256 = "7fc2edf0cda1e46f2e7553bfb84a47e6d141b8dac393268ef01ee3504ca6ad94"; }; propagatedBuildInputs = [ From e4a2b8e95b1f77a6c62c6fcad4ab3a141747edfe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:15 +0200 Subject: [PATCH 1079/3452] python: jupyterhub-ldapauthenticator: 1.2.2 -> 1.3.0 --- .../python-modules/jupyterhub-ldapauthenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index d6c505c4a173..9d5d2a4c23fa 100644 --- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupyterhub-ldapauthenticator"; - version = "1.2.2"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "5bba2ee246834130c9f86c13d39585b1af21563b814fa03aacb26b6696dd7e20"; + sha256 = "920b115babdc32e7b159fc497a0a794bb0f57b222ce2c26c74a23594892f9d3c"; }; # No tests implemented From a386d41c89b98072a3f12b9228eac91a0e4f9f6e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:16 +0200 Subject: [PATCH 1080/3452] python: keyring: 20.0.1 -> 21.2.1 --- pkgs/development/python-modules/keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 8f7ae56de049..a8e71040eaa5 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "keyring"; - version = "20.0.1"; + version = "21.2.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "963bfa7f090269d30bdc5e25589e5fd9dad2cf2a7c6f176a7f2386910e5d0d8d"; + sha256 = "c53e0e5ccde3ad34284a40ce7976b5b3a3d6de70344c3f8ee44364cc340976ec"; }; nativeBuildInputs = [ setuptools_scm ]; From 77811a3b3a4b4c03d65781c66b076b135f696c75 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:16 +0200 Subject: [PATCH 1081/3452] python: kiwisolver: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/kiwisolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index c54cad1987aa..e55a85748193 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "kiwisolver"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "53eaed412477c836e1b9522c19858a8557d6e595077830146182225613b11a75"; + sha256 = "247800260cd38160c362d211dcaf4ed0f7816afb5efe56544748b21d6ad6d17f"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; From 89f53d9d499e4be6a3bb4d49d6ed1277a374a828 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:16 +0200 Subject: [PATCH 1082/3452] python: knack: 0.6.3 -> 0.7.1 --- pkgs/development/python-modules/knack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index fc65361b35c7..083d810f6965 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "knack"; - version = "0.6.3"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "08g15kwfppdr7vhbsg6qclpqbf11d9k3hwgrmvhh5fa1jrk95b5i"; + sha256 = "fcef6040164ebe7d69629e4e089b398c9b980791446496301befcf8381dba0fc"; }; propagatedBuildInputs = [ From d5bfabfb8a5bda95c351819659e80c70c122c9b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:16 +0200 Subject: [PATCH 1083/3452] python: kubernetes: 10.0.1 -> 11.0.0 --- pkgs/development/python-modules/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 62b745169718..15c8a8144c6c 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "10.0.1"; + version = "11.0.0"; prePatch = '' sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "14l5mj0yjmqsq084pdh8g8hlagvvjkdylpk6xwfsv5ikcsba8w1p"; + sha256 = "1a2472f8b01bc6aa87e3a34781f859bded5a5c8ff791a53d889a8bd6cc550430"; }; checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; From e355c4264cf7809bdeaaadde252dec4350c05e3a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:16 +0200 Subject: [PATCH 1084/3452] python: labelbox: 2.3 -> 2.4 --- pkgs/development/python-modules/labelbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 783faa7b5f61..d42ca3d8f1c9 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.3"; + version = "2.4"; src = fetchPypi { inherit pname version; - sha256 = "6b515dc29329e8a3adac9d6b4fef84d80c513743be57ae66b54bcb30060172c6"; + sha256 = "cb1c5adfbdc76560bed57d44f272f9306987a0865be9017fc520dca1e9649d5b"; }; propagatedBuildInputs = [ jinja2 requests pillow rasterio shapely ]; From f711d8aed0e177295825e75b8ee938752b6c6704 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:16 +0200 Subject: [PATCH 1085/3452] python: lazy-object-proxy: 1.4.3 -> 1.5.0 --- pkgs/development/python-modules/lazy-object-proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 043e3e1123e0..02ff59e6c21d 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lazy-object-proxy"; - version = "1.4.3"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0"; + sha256 = "a0aed261060cd0372abf08d16399b1224dbb5b400312e6b00f2b23eabe1d4e96"; }; nativeBuildInputs = [ setuptools_scm ]; From b1357bd3bc34b3157d90dfc3849bbaacccb48f44 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:16 +0200 Subject: [PATCH 1086/3452] python: libagent: 0.13.1 -> 0.14.1 --- pkgs/development/python-modules/libagent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 7fb3d873e742..82d04dc87f17 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "libagent"; - version = "0.13.1"; + version = "0.14.1"; src = fetchPypi{ inherit pname version; - sha256 = "b9afa0851f668612702fcd648cee47af4dc7cfe4f86d4c4a84b1a6b4a4960b41"; + sha256 = "dc979a564cb68cf7c6fa235bf747eb4555deb84f3a8d716940a1709377f140e7"; }; propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse From a734ad6fb6d0fbe4947add4f06229a48151cd1e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:16 +0200 Subject: [PATCH 1087/3452] python: apache-libcloud: 2.7.0 -> 3.0.0 --- pkgs/development/python-modules/libcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index f78501b8ced4..222016701119 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "2.7.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "29ee7d13b9b12d1335e752a489c01eed0c270940147f418cfff89ab66faf1305"; + sha256 = "b9eef1a61383fd401a537cf0796a1067a265288b7ab89be93f5571961a8a2902"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; From 6cd591f0603ff7a87fad182c84584e530a68f250 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:17 +0200 Subject: [PATCH 1088/3452] python: libthumbor: 1.3.2 -> 2.0.1 --- pkgs/development/python-modules/libthumbor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libthumbor/default.nix b/pkgs/development/python-modules/libthumbor/default.nix index c8fab0797152..e8b7c45417a1 100644 --- a/pkgs/development/python-modules/libthumbor/default.nix +++ b/pkgs/development/python-modules/libthumbor/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "libthumbor"; - version = "1.3.2"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1vjhszsf8wl9k16wyg2rfjycjnawzl7z8j39bhiysbz5x4lqg91b"; + sha256 = "ed4fe5f27f8f90e7285b7e6dce99c1b67d43a140bf370e989080b43d80ce25f0"; }; buildInputs = [ django ]; From e478525f8760d1afcb135afb9fa366ca8b6acd92 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:17 +0200 Subject: [PATCH 1089/3452] python: libusb1: 1.7.1 -> 1.8 --- pkgs/development/python-modules/libusb1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index 2d9438374595..396f8c5b5c53 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "1.7.1"; + version = "1.8"; src = fetchPypi { inherit pname version; - sha256 = "adf64a4f3f5c94643a1286f8153bcf4bc787c348b38934aacd7fe17fbeebc571"; + sha256 = "240f65ac70ba3fab77749ec84a412e4e89624804cb80d6c9d394eef5af8878d6"; }; postPatch = '' From ae43e6386b49d39bf85b76ca5a0024cbb5ee8b9f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:17 +0200 Subject: [PATCH 1090/3452] python: limits: 1.4.1 -> 1.5.1 --- pkgs/development/python-modules/limits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 5d0b1aacb555..22bd6607fb6b 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "limits"; - version = "1.4.1"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "c071295307c447f85aaa3c3ab3ce058e29d67010f4fabf278a8e163916e4deab"; + sha256 = "f0c3319f032c4bfad68438ed1325c0fac86dac64582c7c25cddc87a0b658fa20"; }; propagatedBuildInputs = [ six ]; From 189163b38ff50c20cc01edf046cda4212bbd3c68 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:17 +0200 Subject: [PATCH 1091/3452] python: limnoria: 2019.11.22 -> 2020.04.11 --- pkgs/development/python-modules/limnoria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 7cd3ef85822a..567cd3b22066 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2019.11.22"; + version = "2020.04.11"; src = fetchPypi { inherit pname version; - sha256 = "6ccc6906fd644444a1edd0984d10bddf5abf4dd91c94eeeaa4660f7dc3eca320"; + sha256 = "41e27cae66aeb1e811bebe64140a9b5eb3ccb208103a0f42ac61369d9a7ca339"; }; patchPhase = '' From 347187aecd2e4840670180223d07e607a696a2f3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:17 +0200 Subject: [PATCH 1092/3452] python: loguru: 0.4.1 -> 0.5.0 --- pkgs/development/python-modules/loguru/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index 410ca27c8aa0..bb605407de5c 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "loguru"; - version = "0.4.1"; + version = "0.5.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "a6101fd435ac89ba5205a105a26a6ede9e4ddbb4408a6e167852efca47806d11"; + sha256 = "1e0e6ff59be5e22f863d909ca989e34bb14c21b374f6af45281e603d003dbb96"; }; checkInputs = [ pytestCheckHook colorama ]; From e301428786f9404637c33c2feb59cb597027468f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:17 +0200 Subject: [PATCH 1093/3452] python: Markdown: 3.1.1 -> 3.2.2 --- pkgs/development/python-modules/markdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 1438391dc406..ba77a4264a6b 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "Markdown"; - version = "3.1.1"; + version = "3.2.2"; src = fetchPypi { inherit pname version; - sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"; + sha256 = "1fafe3f1ecabfb514a5285fca634a53c1b32a81cb0feb154264d55bf2ff22c17"; }; propagatedBuildInputs = [ setuptools ]; From 29e6ee16f352642743859a871e2132ab60945095 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:17 +0200 Subject: [PATCH 1094/3452] python: marshmallow-sqlalchemy: 0.21.0 -> 0.23.1 --- .../python-modules/marshmallow-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 2f85c33e757e..60a2704894b9 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.21.0"; + version = "0.23.1"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "93fd8fad2b33d92a1ae58328eeb0f39ed174858d82f9e7084a174df7b41fd3a4"; + sha256 = "0ef59c8da8da2e18e808e3880158049e9d72f3031c84cc804b6c533a0eb668a9"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; From b3fdd4c39067e3984dbc802b125fb12a45a4574d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:17 +0200 Subject: [PATCH 1095/3452] python: marshmallow: 3.3.0 -> 3.6.1 --- pkgs/development/python-modules/marshmallow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 7b7cadc98894..4dd2ac8bcaa9 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.3.0"; + version = "3.6.1"; disabled = isPy27; meta = { @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0ba81b6da4ae69eb229b74b3c741ff13fe04fb899824377b1aff5aaa1a9fd46e"; + sha256 = "35ee2fb188f0bd9fc1cf9ac35e45fd394bd1c153cee430745a465ea435514bd5"; }; propagatedBuildInputs = [ dateutil simplejson ]; From 9f4a7db300a8b4a4dbaff6936f911b103c95800b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:18 +0200 Subject: [PATCH 1096/3452] python: MDP: 3.5 -> 3.6 --- pkgs/development/python-modules/mdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index 854622f20648..a93b00a0f91e 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "MDP"; - version = "3.5"; + version = "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0aw1zxmyvx6gfmmnixbqmdaah28jl7rmqkzhxv53091asc23iw9k"; + sha256 = "ac52a652ccbaed1857ff1209862f03bf9b06d093b12606fb410787da3aa65a0e"; }; checkInputs = [ pytest ]; From 927f8f4bdf58335220ad17a757189913314339e0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:18 +0200 Subject: [PATCH 1097/3452] python: mlflow: 1.4.0 -> 1.8.0 --- pkgs/development/python-modules/mlflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 5aaeb09b894d..4687b97284f0 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.4.0"; + version = "1.8.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9116d82be380c32fa465049d14b217c4c200ad11614f4c6674e6b524b2935206"; + sha256 = "bab1b95da17ffb1856fec35fc1a0bc9d16e1811e41610a97c2c955884eb6ac53"; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config From 61b7d9bf67fba09d72c1eef7d4ee9e245a4bbbab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:18 +0200 Subject: [PATCH 1098/3452] python: more-itertools: 8.0.2 -> 8.3.0 --- pkgs/development/python-modules/more-itertools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index cd128fb21649..8806bdf11cf4 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "8.0.2"; + version = "8.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b84b238cce0d9adad5ed87e745778d20a3f8487d0f0cb8b8a586816c7496458d"; + sha256 = "558bb897a2232f5e4f8e2399089e35aecb746e1f9191b6584a151647e89267be"; }; checkInputs = [ nose ]; From 0e11921ebf69cdac54963df27915e50c311b7bda Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:18 +0200 Subject: [PATCH 1099/3452] python: mox3: 0.28.0 -> 1.1.0 --- pkgs/development/python-modules/mox3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix index bdbccc790cfd..b3e1f9e6011d 100644 --- a/pkgs/development/python-modules/mox3/default.nix +++ b/pkgs/development/python-modules/mox3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "mox3"; - version = "0.28.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "17d4vglb71s96hhi6d30vnkr7g1pahv95igc4sjv857qf278d540"; + sha256 = "8a526b7b9b6341f541a9aef3e08c93fd84a5373fe89d4cc51dd571f085b2363c"; }; buildInputs = [ subunit testrepository testtools six ]; From 0c3e5957cd208c2fcf7efc25ddd957542c8b272e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:18 +0200 Subject: [PATCH 1100/3452] python: msal-extensions: 0.1.3 -> 0.2.2 --- pkgs/development/python-modules/msal-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix index c866382b1033..6f3a8b89245c 100644 --- a/pkgs/development/python-modules/msal-extensions/default.nix +++ b/pkgs/development/python-modules/msal-extensions/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal-extensions"; - version = "0.1.3"; + version = "0.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1p05cbfksnhijx1il7s24js2ydzgxbpiasf607qdpb5sljlp3qar"; + sha256 = "31414753c484679bb3b6c6401623eb4c3ccab630af215f2f78c1d5c4f8e1d1a9"; }; propagatedBuildInputs = [ From b5c04f1c6ce5eadf8f95451d27ff7402f00cd74b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:18 +0200 Subject: [PATCH 1101/3452] python: msal: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/msal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 705ae9b61ccb..e07be20b2642 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0pqprfgcsns89gmlm284zcvqnlsn3a5c46n1p33kdk53gyyym66y"; + sha256 = "5442a3a9d006506e653d3c4daff40538bdf067bf07b6b73b32d1b231d5e77a92"; }; propagatedBuildInputs = [ From 7c3002f18a025b60fd20022a32fa20523f14992a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:18 +0200 Subject: [PATCH 1102/3452] python: mt-940: 4.19.0 -> 4.21.0 --- pkgs/development/python-modules/mt-940/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index c41b472a6938..d28cda99d748 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "4.19.0"; + version = "4.21.0"; pname = "mt-940"; src = fetchPypi { inherit pname version; - sha256 = "5d109e8dc4b490a4b92ec0153713710eb067b36b350ce1ff60c406afddc7d3cd"; + sha256 = "7cbd88fd7252d5a2694593633b31f819eb302423058fecb9f9959e74c01c2b86"; }; propagatedBuildInputs = lib.optional (!isPy3k) enum34; From 09cfa4dbdb0c8cd7a20914eebf6e316de6e03270 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:18 +0200 Subject: [PATCH 1103/3452] python: mutagen: 1.43.0 -> 1.44.0 --- pkgs/development/python-modules/mutagen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 304aeead76ff..4aacc0891db3 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "mutagen"; - version = "1.43.0"; + version = "1.44.0"; src = fetchPypi { inherit pname version; - sha256 = "3a982d39f1b800520a32afdebe3543f972e83a6ddd0c0198739a161ee705b588"; + sha256 = "56065d8a9ca0bc64610a4d0f37e2bd4453381dde3226b8835ee656faa3287be4"; }; propagatedBuildInputs = [ setuptools ]; From 902e64e11348a09307355587858a3b729bb9b70d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:18 +0200 Subject: [PATCH 1104/3452] python: myfitnesspal: 1.13.4 -> 1.14.0 --- pkgs/development/python-modules/myfitnesspal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index 14834923954f..a4a937d18d24 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "myfitnesspal"; - version = "1.13.4"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "552cc696e170f12f75fd12b1447be01fa2d0bfd85e14da5928afd9aab2277b98"; + sha256 = "66bf61c3d782cd80f380d3856da5f635f5b8de032e62d916c26d48dc322846a6"; }; # Remove overly restrictive version constraints on keyring and keyrings.alt From b585f53cf6c3dc1c741de8a8257e222a45f45e30 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:19 +0200 Subject: [PATCH 1105/3452] python: mypy-protobuf: 1.20 -> 1.21 --- pkgs/development/python-modules/mypy-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 5cc192313acd..5eda75d9c7fa 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "1.20"; + version = "1.21"; src = fetchPypi { inherit pname version; - sha256 = "03j2i9vhpdxbvwlqg6zghlzzq46s1x2jbx20fwninb6kss0ps3rg"; + sha256 = "0eb8db49b014d1082f370a39eeaf272d1cc9978f728b64ee6fcc822d00a8793c"; }; propagatedBuildInputs = [ protobuf ]; From 37619385b8141c6337663a80facb7a71362057e6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:19 +0200 Subject: [PATCH 1106/3452] python: mypy: 0.770 -> 0.780 --- pkgs/development/python-modules/mypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index bcd0ab4a6c62..bdc032a942ba 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.770"; + version = "0.780"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1bm40nx9g1n4nj1309cijnh0ns4qbhym3agyl537nc4vxw3paqla"; + sha256 = "4ef13b619a289aa025f2273e05e755f8049bb4eaba6d703a425de37d495d178d"; }; propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ]; From 3e9cad145fba82efe1784ab370b67e61946fafa0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:19 +0200 Subject: [PATCH 1107/3452] python: natsort: 6.2.1 -> 7.0.1 --- pkgs/development/python-modules/natsort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 3df8ce7c5ba6..805f5dc5de47 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "natsort"; - version = "6.2.1"; + version = "7.0.1"; checkInputs = [ pytest @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c5944ffd2343141fa5679b17991c398e15105f3b35bb11beefe66c67e08289d5"; + sha256 = "a633464dc3a22b305df0f27abcb3e83515898aa1fd0ed2f9726c3571a27258cf"; }; # testing based on project's tox.ini From e533bb7b97f5de78c5cd830eee80bda14e519ab8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:19 +0200 Subject: [PATCH 1108/3452] python: nbsphinx: 0.5.1 -> 0.7.0 --- pkgs/development/python-modules/nbsphinx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 06a210db6c47..551837cf29ea 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.5.1"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0kh0d83xavpffdp4xp4hq8xy43l6lyv3d1a25rnc15jcbdf1nghw"; + sha256 = "77545508fff12fed427fffbd9eae932712fe3db7cc6729b0af5bbd122d7146cf"; }; propagatedBuildInputs = [ From 6ff6f2f08aa2d87e763627b555c2d6096b909e13 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:19 +0200 Subject: [PATCH 1109/3452] python: netdisco: 2.6.0 -> 2.7.0 --- pkgs/development/python-modules/netdisco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index b5353a5842d3..9d471144644d 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "netdisco"; - version = "2.6.0"; + version = "2.7.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2b3aca14a1807712a053f11fd80dc251dd821ee4899aefece515287981817762"; + sha256 = "46839e47c57554241971fbf3ba7e0077cadd22dd2bcf7eec4f72b243de2e062d"; }; propagatedBuildInputs = [ requests zeroconf netifaces ]; From 20d1a5414bde6f3a9355905fe3ed0d75967749d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:19 +0200 Subject: [PATCH 1110/3452] python: nibabel: 3.0.2 -> 3.1.0 --- pkgs/development/python-modules/nibabel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 7ea6978b1cb5..2ca6635674cc 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "nibabel"; - version = "3.0.2"; + version = "3.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "40cc615801c8876306af1009a312f9c90752f1d79610fc1146917585b6f374dd"; + sha256 = "774adcff834f22915afb68c6cdd7acbcb5d0240b7f87f6da6c63ff405480884b"; }; propagatedBuildInputs = [ numpy scipy h5py pydicom ]; From aaff890d12b7c765bc5d349bf859f9c1ee72d660 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:19 +0200 Subject: [PATCH 1111/3452] python: nine: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/nine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nine/default.nix b/pkgs/development/python-modules/nine/default.nix index 8882b6ae7456..e0d1cb173ea7 100644 --- a/pkgs/development/python-modules/nine/default.nix +++ b/pkgs/development/python-modules/nine/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "nine"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "3064fbeb512e756a415606a1399f49c22de867d5ac7e2b6c91c35e757d3af42d"; + sha256 = "e8a96b6326341637d25ca9c257c1d2af4033c957946438d9d37bf6eb798d3bbe"; }; meta = with stdenv.lib; { From 20300834572fdc7352a75ee4ac0cf426624003d8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:19 +0200 Subject: [PATCH 1112/3452] python: nipype: 1.4.2 -> 1.5.0 --- pkgs/development/python-modules/nipype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 06c6f9cb0c1f..4e47a4a9314a 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -50,11 +50,11 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.4.2"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1nr0z0k4xx1vswkp03g1lf8141mr4j2fbwd7wmpay4vz46qcp786"; + sha256 = "8c837eafdaa68e85d911aca20c8a2cd9210e4fffabbcbc5bd2eb6e26f8553da9"; }; postPatch = '' From 3b2ace961f9f2dd869cb39b4bb8c4aad9d5d787b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:20 +0200 Subject: [PATCH 1113/3452] python: nltk: 3.4.5 -> 3.5 --- pkgs/development/python-modules/nltk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 4f0a90a36af8..cdbf2c49af80 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,13 +1,13 @@ { fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k }: buildPythonPackage rec { - version = "3.4.5"; + version = "3.5"; pname = "nltk"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "153x2clrnigs74jdgnn3qmljdjj4gprmvpdvh49i18ls4m8mbm5y"; + sha256 = "845365449cd8c5f9731f7cb9f8bd6fd0767553b9d53af9eb1b3abf7700936b35"; }; propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) singledispatch; From 299d2f837c7351f923dd0aeff0b9c58fb9acefd1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:20 +0200 Subject: [PATCH 1114/3452] python: numpydoc: 0.9.2 -> 1.0.0 --- pkgs/development/python-modules/numpydoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index fb3b9af76f60..725d1f9968b8 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "numpydoc"; - version = "0.9.2"; + version = "1.0.0"; src = fetchPypi { inherit pname; inherit version; - sha256 = "9140669e6b915f42c6ce7fef704483ba9b0aaa9ac8e425ea89c76fe40478f642"; + sha256 = "e481c0799dfda208b6a2c2cb28757fa6b6cbc4d6e43722173697996cf556df7f"; }; checkInputs = [ nose pytest ]; From 6f3266fff72081ca803d599e0a6b47f15d0b733c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:20 +0200 Subject: [PATCH 1115/3452] python: nvchecker: 1.5 -> 1.6.post1 --- pkgs/development/python-modules/nvchecker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index 9046a75260ad..bfb15bbc6d60 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "nvchecker"; - version = "1.5"; + version = "1.6.post1"; src = fetchPypi { inherit pname version; - sha256 = "0973f7c3ea5ad65fb19837e8915882a9f2c2f21f5c2589005478697391fea2fd"; + sha256 = "7d2e889a4ba2eeb75dd6649ed5e99f8cbfed45b2194657e8f46c978ec58d4175"; }; propagatedBuildInputs = [ setuptools structlog tornado pycurl ]; From 217264bf573aa67a0f74fc94355d69daf3365389 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:20 +0200 Subject: [PATCH 1116/3452] python: oauthenticator: 0.10.0 -> 0.11.0 --- pkgs/development/python-modules/oauthenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index d3617f25a9a7..56c9eece4e82 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "cb4e23fcfe8dc9099c4ca005f8991b0f605b03a3e1cf4fed654b2470f6065bdf"; + sha256 = "ff1b4ba2458a6ee460c3c4161d780a12e94811b2daaa5d13acdb354fa21a9916"; }; checkPhase = '' From 7927029e54e69e01c87b093193fc870e80fe1b03 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:20 +0200 Subject: [PATCH 1117/3452] python: ordered-set: 3.1.1 -> 4.0.1 --- pkgs/development/python-modules/ordered-set/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix index 924a2d31b769..0bc91ec7f15c 100644 --- a/pkgs/development/python-modules/ordered-set/default.nix +++ b/pkgs/development/python-modules/ordered-set/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "ordered-set"; - version = "3.1.1"; + version = "4.0.1"; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "094pww79pawgmjgwi47r0fji9irb7sr4xc9xwjbb0wwcficaigx7"; + sha256 = "a31008c57f9c9776b12eb8841b1f61d1e4d70dfbbe8875ccfa2403c54af3d51b"; }; checkPhase = '' From d8036baccd1b301f26222c2a06d42de2f5559a62 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:20 +0200 Subject: [PATCH 1118/3452] python: OWSLib: 0.19.2 -> 0.20.0 --- pkgs/development/python-modules/owslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index b19e41116f02..c82668008eab 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest, pyyaml } : buildPythonPackage rec { pname = "OWSLib"; - version = "0.19.2"; + version = "0.20.0"; src = fetchPypi { inherit pname version; - sha256 = "605a742d088f1ed9c946e824d0b3be94b5256931f8b230dae63e27a52c781b6d"; + sha256 = "334988857b260c8cdf1f6698d07eab61839c51acb52ee10eed1275439200a40e"; }; buildInputs = [ pytest ]; From b487ce43f5e2cc8820a547a48c2876cb7d4df2c7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:20 +0200 Subject: [PATCH 1119/3452] python: packaging: 20.3 -> 20.4 --- pkgs/development/python-modules/packaging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index 6a144478e94a..abe58d03ef37 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "packaging"; - version = "20.3"; + version = "20.4"; src = fetchPypi { inherit pname version; - sha256 = "3c292b474fda1671ec57d46d739d072bfd495a4f51ad01a055121d81e952b7a3"; + sha256 = "4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8"; }; propagatedBuildInputs = [ pyparsing six ]; From 4fabb6e8629ea31b681b86b1c2e1e6ba2a9219c1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:20 +0200 Subject: [PATCH 1120/3452] python: packet-python: 1.41.0 -> 1.42.0 --- pkgs/development/python-modules/packet-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index 2c56372c2faf..747b4c14cd22 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -12,10 +12,10 @@ buildPythonPackage rec { pname = "packet-python"; - version = "1.41.0"; + version = "1.42.0"; src = fetchPypi { inherit pname version; - sha256 = "685021502293f6b2e733376bcd0fef3f082c1a66c27072d92f483e27e387ad43"; + sha256 = "c3342085b2b96591b9d214d10fe39d85e1a2487c5b0883a90ff0bf6123086f07"; }; nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ requests ]; From f266a259d94d982045bf050025dd441a1ff9f096 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:20 +0200 Subject: [PATCH 1121/3452] python: papermill: 1.2.1 -> 2.1.1 --- pkgs/development/python-modules/papermill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index baa2ae7e4498..591401be226b 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "papermill"; - version = "1.2.1"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "04dadaabdeb129c7414079f77b9f9a4a08f1322549aa99e20e4a12700ee23509"; + sha256 = "5e599992317f761c5e0543430402b24faac89292d7770c3e20b520fa2a25f75a"; }; propagatedBuildInputs = [ From ad23c89904bd58800eae801651501635b0b31db4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:20 +0200 Subject: [PATCH 1122/3452] python: parfive: 1.0.2 -> 1.1.0 --- pkgs/development/python-modules/parfive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index 790c7ef5cdbf..7ce02fb96ab4 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "parfive"; - version = "1.0.2"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "90dfb05d0a65d00669f5245371a4b33cbebcb5cfba86f4aad7f956984394eefd"; + sha256 = "faa60c34dfbd080f011c1af0587f932874dcdf602d0336227d540899dbc41b50"; }; buildInputs = [ From 340d03cd7540472ab8568f8afdf11a751b93056d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:21 +0200 Subject: [PATCH 1123/3452] python: parsedatetime: 2.5 -> 2.6 --- pkgs/development/python-modules/parsedatetime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index 914d5e2680fd..413955c6a368 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "parsedatetime"; - version = "2.5"; + version = "2.6"; src = fetchPypi { inherit pname version; - sha256 = "d2e9ddb1e463de871d32088a3f3cea3dc8282b1b2800e081bd0ef86900451667"; + sha256 = "4cb368fbb18a0b7231f4d76119165451c8d2e35951455dfee97c62a87b04d455"; }; buildInputs = [ pytest pytestrunner ]; From 766d8c5e70f7ea9c5c72509c8f29495fcf754777 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:21 +0200 Subject: [PATCH 1124/3452] python: parso: 0.5.2 -> 0.7.0 --- pkgs/development/python-modules/parso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index c6a15b8c99fc..b5c75c31b385 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "parso"; - version = "0.5.2"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "55cf25df1a35fd88b878715874d2c4dc1ad3f0eebd1e0266a67e1f55efccfbe1"; + sha256 = "908e9fae2144a076d72ae4e25539143d40b8e3eafbaeae03c1bfe226f4cdf12c"; }; checkInputs = [ pytest ]; From cabd413e75e12d7435d8d2f69be595386cd430de Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:21 +0200 Subject: [PATCH 1125/3452] python: PasteDeploy: 2.0.1 -> 2.1.0 --- pkgs/development/python-modules/pastedeploy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index d2ca8d445e42..b82192267d02 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.1.0"; pname = "PasteDeploy"; src = fetchPypi { inherit pname version; - sha256 = "d423fb9d51fdcf853aa4ff43ac7ec469b643ea19590f67488122d6d0d772350a"; + sha256 = "e7559878b6e92023041484be9bcb6d767cf4492fc3de7257a5dae76a7cc11a9b"; }; buildInputs = [ pytestrunner ]; From fc4d294536c26442c4e76283a6b80a2b56cddbf9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:21 +0200 Subject: [PATCH 1126/3452] python: pathspec: 0.6.0 -> 0.8.0 --- pkgs/development/python-modules/pathspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index caef384d2796..1cba07ba6bca 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pathspec"; - version = "0.6.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0p7ab7jx3wgg7xdj2q8yk99cz3xv2a5p1r8q9kfylnvqn34cr1g2"; + sha256 = "da45173eb3a6f2a5a487efba21f050af2b41948be6ab52b6a1e3ff22bb8b7061"; }; meta = { From 01871fd3ca6942587d95a018a1d86101297cf92e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:21 +0200 Subject: [PATCH 1127/3452] python: pendulum: 2.0.5 -> 2.1.0 --- pkgs/development/python-modules/pendulum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index 77217d1c38d6..f7e235f40363 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pendulum"; - version = "2.0.5"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "d3078e007315a959989c41cee5cfd63cfeeca21dd3d8295f4bc24199489e9b6c"; + sha256 = "093cab342e10516660e64b935a6da1a043e0286de36cc229fb48471415981ffe"; }; propagatedBuildInputs = [ dateutil pytzdata ] ++ lib.optional (pythonOlder "3.5") typing; From 737d9441477d9d59915eb5318c9ddef8ff247648 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:21 +0200 Subject: [PATCH 1128/3452] python: persistent: 4.5.1 -> 4.6.4 --- pkgs/development/python-modules/persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index 76d5441c048a..07ba3ecd1cf9 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "persistent"; - version = "4.5.1"; + version = "4.6.4"; nativeBuildInputs = [ sphinx manuel ]; propagatedBuildInputs = [ zope_interface cffi ]; src = fetchPypi { inherit pname version; - sha256 = "73862779577cb8637f2b68e7edee9a9b95cf33d0b83cb6e762f0f3fc12897aa6"; + sha256 = "f83f54355a44cf8ec38c29ce47b378a8c70444e9a745581dbb13d201a24cb546"; }; meta = { From 2d7baeea0a9057a9af49688f81c6083926743ac8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:21 +0200 Subject: [PATCH 1129/3452] python: pex: 2.0.3 -> 2.1.11 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 10001d1d6027..9c327555f65b 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.0.3"; + version = "2.1.11"; src = fetchPypi { inherit pname version; - sha256 = "a8a35e7eb212616b2964d70d8a134d41d16649c943ab206b90c749c005e60999"; + sha256 = "9fc8f1562676c537b4c7fe4a62ecaaa2803fa43b56aba2f2435d833eb6b6036a"; }; nativeBuildInputs = [ setuptools ]; From 3e9348ef192195a23ca8d44137e9f7ed360912ed Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:21 +0200 Subject: [PATCH 1130/3452] python: pexpect: 4.7.0 -> 4.8.0 --- pkgs/development/python-modules/pexpect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix index 4c287cfc37cc..651c48dbeb7b 100644 --- a/pkgs/development/python-modules/pexpect/default.nix +++ b/pkgs/development/python-modules/pexpect/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pexpect"; - version = "4.7.0"; + version = "4.8.0"; src = fetchPypi { inherit pname version; - sha256 = "9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb"; + sha256 = "fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"; }; # Wants to run pythonin a subprocess From e3c9d20027207a503f252d75b1efb670fa0f7b3a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:21 +0200 Subject: [PATCH 1131/3452] python: pg8000: 1.13.2 -> 1.15.2 --- pkgs/development/python-modules/pg8000/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 9131d8adaa22..9e7595e64a44 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.13.2"; + version = "1.15.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "eebcb4176a7e407987e525a07454882f611985e0becb2b73f76efb93bbdc0aab"; + sha256 = "eb42ba62fbc048c91d5cf1ac729e0ea4ee329cc526bddafed4e7a8aa6b57fbbb"; }; propagatedBuildInputs = [ passlib ]; From 4aacac1dcc5f860fbff2a2adf0f7d012d1f77130 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:21 +0200 Subject: [PATCH 1132/3452] python: phik: 0.9.12 -> 0.10.0 --- pkgs/development/python-modules/phik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index ca1b5ba65da7..969c80f1fe18 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "phik"; - version = "0.9.12"; + version = "0.10.0"; format = "wheel"; disabled = !isPy3k; src = fetchPypi { inherit pname version format; python = "py3"; - sha256 = "c4f86e5587e5b456e69bf69d95d07fe7aafc341c40f8f3a21dd5b52272e9ae7b"; + sha256 = "b745313c5ff9d6a3092eefa97f83fa4dbed178c9ce69161b655e95497cb2f38b"; }; checkInputs = [ From 737e2ce178c85e56e40a452ea5422b3494aac3fa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:22 +0200 Subject: [PATCH 1133/3452] python: pikepdf: 1.13.0 -> 1.14.0 --- pkgs/development/python-modules/pikepdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 86aef0d6adf9..e34989238563 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "1.13.0"; + version = "1.14.0"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0fpsjrppka0mrmkbzysi1s072d18ilsnch4lhd21k2qmvxp2hpmk"; + sha256 = "5b371c71b0da42d87371ed39973f07c7eb67d939ca5031f0c1637cfb3a2d79f5"; }; buildInputs = [ From 950974e11b4e3288979e1ee663835dd15033dfd9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:22 +0200 Subject: [PATCH 1134/3452] python: pip-tools: 4.5.1 -> 5.2.0 --- pkgs/development/python-modules/pip-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 02e6edfffce2..c49c77ad91ec 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "4.5.1"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "166crncd9zrk9wgk9dss9968mx2c1dzj80sjnaqrcmw7a7j30gv9"; + sha256 = "be6190405e4206526607aa4813bd6d7a949e4fdc180d0db4f3221f3778846cf7"; }; LC_ALL = "en_US.UTF-8"; From 4091cb578a07de4af1542ae7598a0248947ddd8d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:22 +0200 Subject: [PATCH 1135/3452] python: pipdate: 0.3.5 -> 0.5.1 --- pkgs/development/python-modules/pipdate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index 8dff09655799..021b0f543ecc 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pipdate"; - version = "0.3.5"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "240c0f270ddb7470ad7b8c8fba4106e3dbd8817a370624fd8c32cf19155c9547"; + sha256 = "d10bd408e4b067a2a699badf87629a12838fa42ec74dc6140e64a09eb0dc28cf"; }; propagatedBuildInputs = [ From 01014650d1aa76c4d0a75598c4c01c0b4aed6fc8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:22 +0200 Subject: [PATCH 1136/3452] python: plac: 1.1.3 -> 1.2.0 --- pkgs/development/python-modules/plac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index 789f1ca1ff22..dbcd7f213008 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -5,11 +5,11 @@ }: buildPythonPackage rec { pname = "plac"; - version = "1.1.3"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "398cb947c60c4c25e275e1f1dadf027e7096858fb260b8ece3b33bcff90d985f"; + sha256 = "ca03587234e5bdd2a3fa96f19a04a01ebb5b0cd66d48ecb5a54d42bc9b287320"; }; checkPhase = '' From 5e34622d591117fa1ecc24970561e2c5e43e16ec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:22 +0200 Subject: [PATCH 1137/3452] python: plaid-python: 3.4.0 -> 4.0.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index a41265165c7d..3556db7ddb8d 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "3.4.0"; + version = "4.0.0"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "bbfad84b8c827a14bc5b0ab93e1e5c7117908e5fa4cdecaa44a037298a20b7de"; + sha256 = "2bf91e4c1054c920ec8911038f86efdc76067bf6b55a9787bd846129ce01ff4a"; }; checkInputs = [ pytest ]; From 8b505e2075ea1c2fcbbf8e116234a013c4c22103 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:22 +0200 Subject: [PATCH 1138/3452] python: plone.testing: 7.0.3 -> 8.0.0 --- pkgs/development/python-modules/plone-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index 45e22a8788e1..c7b4ff350df9 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plone.testing"; - version = "7.0.3"; + version = "8.0.0"; src = fetchPypi { inherit pname version; - sha256 = "160f130f641578fbede2e47686f1b58179efa9ff98ccdd1ad198b5d0c7e02474"; + sha256 = "71f22cb8cc169360786ec468a0ab5d403abe5bacc13754c251dd6b9eeedd1d83"; }; propagatedBuildInputs = [ six setuptools zope_testing ]; From 0304914cf917583023e09dd3d645ba9a1a4893a8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:22 +0200 Subject: [PATCH 1139/3452] python: plotly: 4.7.1 -> 4.8.1 --- pkgs/development/python-modules/plotly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index eff9e5d8629a..1b8c2a0af0dc 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "4.7.1"; + version = "4.8.1"; src = fetchPypi { inherit pname version; - sha256 = "1s0hg91dvsklgdk3bi483f8in7vr51lx49smvr2ngvrws7nwsj3s"; + sha256 = "d3fea527fe3dfdd55d7334318f107b05a8407474a0fffe6cd4726c9b99e624f1"; }; propagatedBuildInputs = [ From a9e825002bb900fc523d996b353038801189cc4b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:22 +0200 Subject: [PATCH 1140/3452] python: prance: 0.17.0 -> 0.18.3 --- pkgs/development/python-modules/prance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index efa12433c8a2..5fffbae45fee 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "prance"; - version = "0.17.0"; + version = "0.18.3"; src = fetchPypi { inherit pname version; - sha256 = "a128d0d5f639a6a19eefedd787a6ce9603634c3908927b1215653e4a8375195f"; + sha256 = "4600ec749ade4f10d1cc8b07cd7a372f02985efd66100e287e67ccb1d48b5fc5"; }; buildInputs = [ From b77ee5b72e25b093554508172d275caf5ab9a5b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:22 +0200 Subject: [PATCH 1141/3452] python: prawcore: 1.0.1 -> 1.4.0 --- pkgs/development/python-modules/prawcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 71f34b6ec4d9..aebe5766e9ce 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "prawcore"; - version = "1.0.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "ab5558efb438aa73fc66c4178bfc809194dea3ce2addf4dec873de7e2fd2824e"; + sha256 = "cf71388d869becbcbdfd90258b19d2173c197a457f2dd0bef0566b6cfb9b95a1"; }; propagatedBuildInputs = [ From 6e6ccf50d54d10d40412417719acb66bf22daf63 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:22 +0200 Subject: [PATCH 1142/3452] python: premailer: 3.6.2 -> 3.7.0 --- pkgs/development/python-modules/premailer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index bbe350b03c2a..ec0e959c7a5c 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "premailer"; - version = "3.6.2"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "8240bfb8ff94db3ae581d8434b7eea5005872d5779394ed8f4223dfb0f58afd2"; + sha256 = "5eec9603e84cee583a390de69c75192e50d76e38ef0292b027bd64923766aca7"; }; buildInputs = [ mock nose ]; From dde7db9324d4189dcbfee9c4004ce1c8e4d93a57 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:23 +0200 Subject: [PATCH 1143/3452] python: progressbar2: 3.47.0 -> 3.51.3 --- pkgs/development/python-modules/progressbar2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 69200d54571d..a7671d0356a7 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.47.0"; + version = "3.51.3"; src = fetchPypi { inherit pname version; - sha256 = "7538d02045a1fd3aa2b2834bfda463da8755bd3ff050edc6c5ddff3bc616215f"; + sha256 = "ecf687696dd449067f69ef6730c4d4a0189db1f8d1aad9e376358354631d5b2c"; }; propagatedBuildInputs = [ python-utils ]; From 4fe0c41d4b3fb5a197253bebca4118b3a2fb6da3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:23 +0200 Subject: [PATCH 1144/3452] python: prometheus_client: 0.7.1 -> 0.8.0 --- pkgs/development/python-modules/prometheus_client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix index 2c6bef0c201e..8f608666d720 100644 --- a/pkgs/development/python-modules/prometheus_client/default.nix +++ b/pkgs/development/python-modules/prometheus_client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "prometheus_client"; - version = "0.7.1"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "71cd24a2b3eb335cb800c7159f423df1bd4dcd5171b234be15e3f31ec9f622da"; + sha256 = "c6e6b706833a6bd1fd51711299edee907857be10ece535126a158f911ee80915"; }; doCheck = false; From e624ad840c5723e089c13d262da3b8bf1c164bef Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:23 +0200 Subject: [PATCH 1145/3452] python: psd-tools: 1.8.38 -> 1.9.13 --- pkgs/development/python-modules/psd-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index 4cdf528193f3..c4f043aada5c 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.8.38"; + version = "1.9.13"; src = fetchPypi { inherit pname version; - sha256 = "7fa81ba38388ac1760ae61229681f46a7fc2ed96cb2d435b616873a73e668b64"; + sha256 = "9b1ca602b63b7bcb9f53e9f3d4b815839926533112bc6e3ecf1d37cb125259f3"; }; propagatedBuildInputs = [ From e34d00e1ba490f0c57fe2f3950a100a3f35d7450 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:23 +0200 Subject: [PATCH 1146/3452] python: pulsectl: 20.4.3 -> 20.5.1 --- pkgs/development/python-modules/pulsectl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index dec80abda151..2a66357f8494 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "20.4.3"; + version = "20.5.1"; src = fetchPypi { inherit pname version; - sha256 = "1m5fz740r4rk2i8qsnblsn16hai7givqxbx21swhpflan1yzvzzm"; + sha256 = "39b0a0e7974a7d6468d826a838822f78b00ac9c3803f0d7bfa9b1cad08ee22db"; }; patches = [ From 8e21925db7169f31bc695fcad10f3714fa059f0e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:23 +0200 Subject: [PATCH 1147/3452] python: pwntools: 4.0.0b0 -> 4.1.1 --- pkgs/development/python-modules/pwntools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 72ab1b5c405f..e591d4a5f462 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -5,12 +5,12 @@ , requests, tox, unicorn, intervaltree, fetchpatch }: buildPythonPackage rec { - version = "4.0.0b0"; + version = "4.1.1"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "11f7x7rjad1nawn3r524lzxgz3nk89c6s3xycrscn3n86hh0zgid"; + sha256 = "694ce7a6cfca0ad40eae36c1d2663c44eb953f84785c63daa9752b4dfa7f39d8"; }; propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pyserial dateutil requests tox unicorn intervaltree ]; From 6990c109c33ae971692397d75914dcddd6991f2f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:23 +0200 Subject: [PATCH 1148/3452] python: py3status: 3.22 -> 3.28 --- pkgs/development/python-modules/py3status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index fda91e8a3053..a99dacf6204b 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.22"; + version = "3.28"; src = fetchPypi { inherit pname version; - sha256 = "5e9884dde128e1bd82f8746e8f8806c8d7d89d95ce9ed7bacf7cc5fdb094aa21"; + sha256 = "103c63f43ddfd86e5a3f0bebb34b0f2eaaf6dbd58281d25c8a16937eb8e7f194"; }; doCheck = false; From 62ab5b2c74a46975d400948dd841bf33b8080c34 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:23 +0200 Subject: [PATCH 1149/3452] python: pyTelegramBotAPI: 3.6.7 -> 3.7.1 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index e07db8ec7267..9a61fa1f543f 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "3.6.7"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - sha256 = "0spn3gjbppyl4b7kqnc8g30qss72dcb1d6ap2bizyam5wn591z8f"; + sha256 = "8ef8e54098efd29a6bcac28d127480ae2b7491c1d33e4e0c7bbf0fc8949e0fae"; }; propagatedBuildInputs = [ requests ]; From 2e9bdc2b5ef5f787ceb7d4e5311474dd59a90ae3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:23 +0200 Subject: [PATCH 1150/3452] python: pyaml: 19.12.0 -> 20.4.0 --- pkgs/development/python-modules/pyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 1d0168b6bfa3..524d34c68d4a 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyaml"; - version = "19.12.0"; + version = "20.4.0"; src = fetchPypi { inherit pname version; - sha256 = "b3f636b467864319d7ded1558f86bb305b8612a274f5d443a62dc5eceb1b7176"; + sha256 = "29a5c2a68660a799103d6949167bd6c7953d031449d08802386372de1db6ad71"; }; propagatedBuildInputs = [ pyyaml ]; From 9c2f9bbf0813641775db5e4c949932295fbc33a3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:23 +0200 Subject: [PATCH 1151/3452] python: pyatmo: 3.1.0 -> 3.3.1 --- pkgs/development/python-modules/pyatmo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index d9f602aa7e21..4013ea789af3 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "3.1.0"; + version = "3.3.1"; src = fetchPypi { inherit pname version; - sha256 = "8fbcc3a88f8c51d190b697c80515e67530143de71f89cc6ecf99bbf2cbf3ef30"; + sha256 = "9949338833a27b6c3251b52bf70b73aa99c43c56153541338cb63001afafdd1e"; }; propagatedBuildInputs = [ requests ]; From cc22c34d899a8ec917d8cf787f15d3dab52712ca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:23 +0200 Subject: [PATCH 1152/3452] python: PyBindGen: 0.20.1 -> 0.21.0 --- pkgs/development/python-modules/pybindgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index ee880fda3987..136917c68371 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: buildPythonPackage rec { pname = "PyBindGen"; - version = "0.20.1"; + version = "0.21.0"; src = fetchPypi { inherit pname version; - sha256 = "5615f6b5d9b8aec86d69acedd050ecb5eb7d1338436c3667e345f800a2658f9f"; + sha256 = "4501aa3954fdac7bb4c049894f8aa1f0f4e1c1f50cc2303feef9bbe3aecfe364"; }; buildInputs = [ setuptools_scm ]; From c7c5f4b8f3d65d698012f475f2a847d439645527 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:24 +0200 Subject: [PATCH 1153/3452] python: pybullet: 2.6.9 -> 2.8.1 --- pkgs/development/python-modules/pybullet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 3c5d28c40d6c..36b71704a92a 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "2.6.9"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "5924371a47625252d8566bbc662befc55e1d35c6c1375c8236e6f8a626293fa6"; + sha256 = "836d80660920f0696645738367b8c8359878387ba582adb8b37d59d60adedadd"; }; buildInputs = [ From 015b177d1ce52aad3437a8fef8b48a90b610e408 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:24 +0200 Subject: [PATCH 1154/3452] python: PyChromecast: 5.2.0 -> 6.0.0 --- pkgs/development/python-modules/pychromecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index c291e6e47fdd..fe6f191f6111 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "5.2.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "052q25k3v5fwa02hf5zdpjpfb94ml9g67cqwjjvf6vdana8w3gwh"; + sha256 = "15beaafdb155885794443d99fa687a2787d8bad8ba440ecda10bb72bd6c8c815"; }; disabled = !isPy3k; From 0b2c0bafc544ed75d844e5b0111ba142dff21223 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:24 +0200 Subject: [PATCH 1155/3452] python: pycodestyle: 2.5.0 -> 2.6.0 --- pkgs/development/python-modules/pycodestyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 289332eb7c48..cb3fd12a4b19 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pycodestyle"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0v4prb05n21bm8650v0a01k1nyqjdmkrsm3zycfxh2j5k9n962p4"; + sha256 = "c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e"; }; # https://github.com/PyCQA/pycodestyle/blob/2.5.0/tox.ini#L14 From d4e43f777bfc10b5ed54b9dd0c740451f36c32fc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:24 +0200 Subject: [PATCH 1156/3452] python: pycparser: 2.19 -> 2.20 --- pkgs/development/python-modules/pycparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index ea7caba5eb4f..f3fa6f883fb6 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pycparser"; - version = "2.19"; + version = "2.20"; src = fetchPypi { inherit pname version; - sha256 = "a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3"; + sha256 = "2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"; }; checkPhase = '' From 1228cea1700e2d9da416ebe04de021f7b72de1cd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:24 +0200 Subject: [PATCH 1157/3452] python: pydicom: 1.4.2 -> 2.0.0 --- pkgs/development/python-modules/pydicom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 6f4e4c97fd1c..de6f672e27ca 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "1.4.2"; + version = "2.0.0"; pname = "pydicom"; src = fetchPypi { inherit pname version; - sha256 = "1483hv74fhfk4q18r4rda7yixqqdxrd1djzp3492s81ykxd4k24l"; + sha256 = "594c91f715c415ef439f498351ae68fb770c776fc5aa72f3c87eb500dc2a7470"; }; propagatedBuildInputs = [ numpy pillow ]; From f5f7dbb4e1f52555c41a8cd8bef636f1a909871e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:24 +0200 Subject: [PATCH 1158/3452] python: pyface: 6.1.2 -> 7.0.0 --- pkgs/development/python-modules/pyface/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index db0ee541e09c..6cf96f93a8f5 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyface"; - version = "6.1.2"; + version = "7.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1g2g3za64rfffbivlihbf5njrqbv63ln62rv9d8fi1gcrgaw6akw"; + sha256 = "9e00aba15de9c0e553dfcc7b346c3541c54f35054dd05b72a9e2343e340adf6f"; }; propagatedBuildInputs = [ setuptools six traits ]; From 777b6940464799457970a35463db5d13d41922df Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:24 +0200 Subject: [PATCH 1159/3452] python: pyfakefs: 3.7.2 -> 4.0.2 --- pkgs/development/python-modules/pyfakefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 16d9abe812b6..14c69fd799a4 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales, isPy37 }: buildPythonPackage rec { - version = "3.7.2"; + version = "4.0.2"; pname = "pyfakefs"; src = fetchPypi { inherit pname version; - sha256 = "735ce6a71f26ead335df8a1f2c1cc8355ef091d98ffdc3bf73a5a3b0214e055e"; + sha256 = "c415e1c737e3aa72b92af41832a7e0a2c325eb8d3a72a210750714e00fcaeace"; }; postPatch = '' From d8f914f5fdd7719498580b1ed0dc717381e8b416 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:24 +0200 Subject: [PATCH 1160/3452] python: pyflakes: 2.1.1 -> 2.2.0 --- pkgs/development/python-modules/pyflakes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 85176d9ccca2..d8cc45119482 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyflakes"; - version = "2.1.1"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2"; + sha256 = "35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8"; }; checkInputs = [ unittest2 ]; From 6013ffada72acc62b03711041e810bc79eb448fd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:24 +0200 Subject: [PATCH 1161/3452] python: PyHamcrest: 1.9.0 -> 2.0.2 --- pkgs/development/python-modules/pyhamcrest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index 98ef4afacc19..40469bd0deba 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "PyHamcrest"; - version = "1.9.0"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "8ffaa0a53da57e89de14ced7185ac746227a8894dbd5a3c718bf05ddbd1d56cd"; + sha256 = "412e00137858f04bde0729913874a48485665f2d36fe9ee449f26be864af9316"; }; checkInputs = [ mock pytest ]; From 3da2e586de668bd9a8968f2efffb2dbc872dca65 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:24 +0200 Subject: [PATCH 1162/3452] python: pyhaversion: 3.1.0 -> 3.3.0 --- pkgs/development/python-modules/pyhaversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index 7717706561da..381ec45388bf 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -13,11 +13,11 @@ }: buildPythonPackage rec { pname = "pyhaversion"; - version = "3.1.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1d4smpzlaw0sqfgkgvhxsn8h7bmwj8h9gj98sdzvkzhp5vhd96b2"; + sha256 = "376a1b232a26035bc82d64affa1c4f312d782234fe5453e8d0f9e1350a97be5b"; }; propagatedBuildInputs = [ From 3ab3dc2b61648134ab581c92a21fe0892a3a8429 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:24 +0200 Subject: [PATCH 1163/3452] python: pyjet: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/pyjet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyjet/default.nix b/pkgs/development/python-modules/pyjet/default.nix index 4a20b5142b68..c535ddad1089 100644 --- a/pkgs/development/python-modules/pyjet/default.nix +++ b/pkgs/development/python-modules/pyjet/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyjet"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "b334fb9a01854165629d49a2df43c81c880fc231a8a27c156beccf42f223fe47"; + sha256 = "ab6e63f8a8fd73bbd76ef2a384eea69bc1c201f2ce876faa4151ade6c0b20615"; }; # fix for python37 From 5760ed2eb4e4e9d356f74312a6a2eb4ed8e4fc40 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:25 +0200 Subject: [PATCH 1164/3452] python: pyjks: 19.0.0 -> 20.0.0 --- pkgs/development/python-modules/pyjks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyjks/default.nix b/pkgs/development/python-modules/pyjks/default.nix index d9e2074fb28a..a05dcadeb84d 100644 --- a/pkgs/development/python-modules/pyjks/default.nix +++ b/pkgs/development/python-modules/pyjks/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pyjks"; - version = "19.0.0"; + version = "20.0.0"; src = fetchPypi { inherit pname version; - sha256 = "06h1cybsdj2wi0jf7igbr722xfm87crqn4g7m3bgrpxwi41b9rcw"; + sha256 = "0378cec15fb11b2ed27ba54dad9fd987d48e6f62f49fcff138f5f7a8b312b044"; }; propagatedBuildInputs = [ From 58643bd5ec6f347246eea13f1efefdb3e321da9e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:25 +0200 Subject: [PATCH 1165/3452] python: pylast: 3.1.0 -> 3.2.1 --- pkgs/development/python-modules/pylast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 6a6853e55994..a85c0be6b680 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pylast"; - version = "3.1.0"; + version = "3.2.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0sk08l8dq0r4xgmqkxq6jzlbam34k95adaw468n0bh6cps18ddby"; + sha256 = "3c984be04c9a22a884c3106a7f75749466d27c68870d6fb7e1f56b71becea7c0"; }; propagatedBuildInputs = [ certifi six ]; From d8db80c1a48893d45e570e77c109da7bd659e286 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:25 +0200 Subject: [PATCH 1166/3452] python: pylint: 2.4.4 -> 2.5.2 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index c596b4042cc3..f648d525442c 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.4.4"; + version = "2.5.2"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "3db5468ad013380e987410a8d6956226963aed94ecb5f9d3a28acca6d9ac36cd"; + sha256 = "b95e31850f3af163c2283ed40432f053acbc8fc6eba6a069cb518d9dbf71848c"; }; nativeBuildInputs = [ pytestrunner ]; From 516a2f43295a0b0c5236ebb3ccfd37d813ff50d6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:25 +0200 Subject: [PATCH 1167/3452] python: pymatgen: 2019.12.22 -> 2020.4.29 --- pkgs/development/python-modules/pymatgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index f9869cc2c7f4..12d9daf5b3d7 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2019.12.22"; + version = "2020.4.29"; src = fetchPypi { inherit pname version; - sha256 = "0ffc6efcc2ba15bff22cca29c07b93b01fac400f649c41d5dd01bfff7915f80b"; + sha256 = "cf9c89f2c742acf524f3a778cd269164abf582e87ab5f297cd83802fe00c309d"; }; nativeBuildInputs = [ glibcLocales ]; From 09718f4d29ffdf62dabe11aebe7c810e30857c9d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:25 +0200 Subject: [PATCH 1168/3452] python: pymbolic: 2019.2 -> 2020.1 --- pkgs/development/python-modules/pymbolic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index 853799497296..23c88ca28d45 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pymbolic"; - version = "2019.2"; + version = "2020.1"; src = fetchPypi { inherit pname version; - sha256 = "a7507864a76574d72bf5732497b247661c6ad73bb277cd9c8aae09e90a62e05a"; + sha256 = "ca029399f9480f6d51fbac0349fddbb42d937620deb03befa0ba94ac08895e6b"; }; postConfigure = '' From c80c6601b8a322583b1290951784932d429c657c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:25 +0200 Subject: [PATCH 1169/3452] python: pynamodb: 4.2.0 -> 4.3.2 --- pkgs/development/python-modules/pynamodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index 5016cfb741c5..7e83976cc4d2 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "4.2.0"; + version = "4.3.2"; src = fetchPypi { inherit pname version; - sha256 = "0njbh3h6696nq5palqa0b8s0fbsvhbawpzl923dnfsa9kgq5m294"; + sha256 = "58bd62089741ef689f845d6ca826ab50e39b9a0a8ae3bd7a84dc167c1a4ec8fa"; }; propagatedBuildInputs = [ python-dateutil botocore ]; From 64be58286cbfaeab6643c4fe7213372978150ea8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:25 +0200 Subject: [PATCH 1170/3452] python: pyobjc: 6.1 -> 6.2 --- pkgs/development/python-modules/pyobjc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index 8b35ef4b3da2..af0c784bbf59 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyobjc"; - version = "6.1"; + version = "6.2"; # Gives "No matching distribution found for # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "53ae86caaedc48350c6e93d6e778a0c5044e802340b6d6a679e55014758be540"; + sha256 = "6b514136f538fb5c9c80e310641907d0196c8381602395ac2ee407f32f07ba13"; }; meta = { From b9fc15ea1f511e47faeb108af218a646594c7203 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:25 +0200 Subject: [PATCH 1171/3452] python: pyowm: 2.10.0 -> 3.0.0 --- pkgs/development/python-modules/pyowm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index 731bba046e85..04e683ee6e05 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyowm"; - version = "2.10.0"; + version = "3.0.0"; disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; - sha256 = "8fd41a18536f4d6c432bc6d9ea69994efb1ea9b43688cf19523659b6f4d86cf7"; + sha256 = "f06ac5f2356f0964f088b1f840a6d382499054bd18539ffb1e7c84f29c2c39b6"; }; propagatedBuildInputs = [ requests geojson ]; From a3a4c664dcffbc63dee2112d3f4711f38d58d390 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:25 +0200 Subject: [PATCH 1172/3452] python: pyperclip: 1.7.0 -> 1.8.0 --- pkgs/development/python-modules/pyperclip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix index 9709aea1d185..2c3b3e56a93f 100644 --- a/pkgs/development/python-modules/pyperclip/default.nix +++ b/pkgs/development/python-modules/pyperclip/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.7.0"; + version = "1.8.0"; pname = "pyperclip"; src = fetchPypi { inherit pname version; - sha256 = "979325468ccf682104d5dcaf753f869868100631301d3e72f47babdea5700d1c"; + sha256 = "b75b975160428d84608c26edba2dec146e7799566aea42c1fe1b32e72b6028f2"; }; doCheck = false; From 6b4c8456fd49a2fc2258267acbbeff589aaea4ee Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:26 +0200 Subject: [PATCH 1173/3452] python: pyperf: 1.7.1 -> 2.0.0 --- pkgs/development/python-modules/pyperf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index 430181cb574e..f17f83bd17b9 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyperf"; - version = "1.7.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "c37690e810116a83a244dfeec47885e2f0475b4c450313904be3bc2cdaf6d50a"; + sha256 = "2189fbc4af08d519f85468e70e32c902eab0f1341b2c41028b94b2832d3169a7"; }; checkInputs = [ nose psutil ] ++ From 0343805601fafee23cc8759594d2d9e0504c1875 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:26 +0200 Subject: [PATCH 1174/3452] python: pyro-ppl: 1.1.0 -> 1.3.1 --- pkgs/development/python-modules/pyro-ppl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index a11c2cad9282..81d4c47652ac 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, pytorch, contextlib2 , graphviz, networkx, six, opt-einsum, tqdm }: buildPythonPackage rec { - version = "1.1.0"; + version = "1.3.1"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "5ca2fd19276fcfcf52babb48d22892a41d6238d7a6c65e63f704b070a3816479"; + sha256 = "a034d9311d4715a2e8e127e0a4dd2996cbd34c4b85ac57b02b277c176b0a62ff"; }; propagatedBuildInputs = [ From c316b4dfa21c7ebcde48c6466c5bb55779aeb443 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:26 +0200 Subject: [PATCH 1175/3452] python: Pyro4: 4.77 -> 4.80 --- pkgs/development/python-modules/pyro4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index 64f1aa56546d..3cf9d3f31437 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "Pyro4"; - version = "4.77"; + version = "4.80"; src = fetchPypi { inherit pname version; - sha256 = "2bfe12a22f396474b0e57c898c7e2c561a8f850bf2055d8cf0f7119f0c7a523f"; + sha256 = "46847ca703de3f483fbd0b2d22622f36eff03e6ef7ec7704d4ecaa3964cb2220"; }; propagatedBuildInputs = [ From f4bc827cdf09c8f680fa36d8f33726736ee552f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:26 +0200 Subject: [PATCH 1176/3452] python: Pyro5: 5.7 -> 5.10 --- pkgs/development/python-modules/pyro5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix index 36559a032390..38730e7baaee 100644 --- a/pkgs/development/python-modules/pyro5/default.nix +++ b/pkgs/development/python-modules/pyro5/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "Pyro5"; - version = "5.7"; + version = "5.10"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "08n9jqm81pjw9hvzk6kgxwqvh29q3glgccf77kxih5nn77pwdnni"; + sha256 = "e518e2a3375bc04c073f7c8c82509d314b00fa2f65cead9f134ebe42a922b360"; }; propagatedBuildInputs = [ serpent ]; From 2108e6c67b8e5bf352474f2cc8f3c8b311b4eb24 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:26 +0200 Subject: [PATCH 1177/3452] python: pyrsistent: 0.15.7 -> 0.16.0 --- pkgs/development/python-modules/pyrsistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index da255645f443..edc1bb73f5a9 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.15.7"; + version = "0.16.0"; src = fetchPypi { inherit pname version; - sha256 = "cdc7b5e3ed77bed61270a47d35434a30617b9becdf2478af76ad2c6ade307280"; + sha256 = "28669905fe725965daa16184933676547c5bb40a5153055a8dee2a4bd7933ad3"; }; propagatedBuildInputs = [ six ]; From 9b4c8614862a8321d4c393dfbc8b0a7095a276a9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:26 +0200 Subject: [PATCH 1178/3452] python: pyscreenshot: 0.6 -> 2.2 --- pkgs/development/python-modules/pyscreenshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/pkgs/development/python-modules/pyscreenshot/default.nix index 2865380076ae..23aa092641f1 100644 --- a/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/pkgs/development/python-modules/pyscreenshot/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyscreenshot"; - version = "0.6"; + version = "2.2"; src = fetchPypi { inherit pname version; - sha256 = "7322ad9454652b1702a3689646ce53ef01ed2b14869ea557030bd4e03a06fc0e"; + sha256 = "dec8517cb18faf4f983dd2ee6636924e472a5644da1480ae871786dfcac244e9"; }; propagatedBuildInputs = [ From fd82b84d5e4585c4f18635c4aae46d3429f794f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:26 +0200 Subject: [PATCH 1179/3452] python: pyspark: 2.4.5 -> 2.4.6 --- pkgs/development/python-modules/pyspark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 50c2bafb7aef..8c7e0f64c1f1 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "2.4.5"; + version = "2.4.6"; src = fetchPypi { inherit pname version; - sha256 = "0deed5687828efdaf4091e748f0ba1ae8aad6e4c3a5f07aa07e19487397e0e07"; + sha256 = "b4b319a3ffd187a3019f654ae1c8ac38048bcec2940f8cecdef829302d166feb"; }; # pypandoc is broken with pandoc2, so we just lose docs. From bd0e8162ee0a897f81fa0eeee27f0e74939bf04d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:26 +0200 Subject: [PATCH 1180/3452] python: pyspread: 1.1.3 -> 1.99.2 --- pkgs/development/python-modules/pyspread/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix index 14abe9ff02d3..16f1e2c215e1 100644 --- a/pkgs/development/python-modules/pyspread/default.nix +++ b/pkgs/development/python-modules/pyspread/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pyspread"; - version = "1.1.3"; + version = "1.99.2"; src = fetchPypi { inherit pname version; - sha256 = "6e5d0eb49750eed7734852e15727e190270880c75dcc5f6c8fb1bfdaa59c48fc"; + sha256 = "117268cbeb225e0aca4c59381b7bdf5333bf95ca85c1db410a326a887a74f3da"; }; propagatedBuildInputs = [ numpy wxPython matplotlib pycairo python-gnupg xlrd xlwt jedi pyenchant basemap pygtk ]; From 77675d951478ae09177756f6bebae810b35df250 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:26 +0200 Subject: [PATCH 1181/3452] python: PyStemmer: 1.3.0 -> 2.0.0.1 --- pkgs/development/python-modules/pystemmer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix index 1d3df7dfc349..d48dc5e8cd62 100644 --- a/pkgs/development/python-modules/pystemmer/default.nix +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyStemmer"; - version = "1.3.0"; + version = "2.0.0.1"; src = fetchPypi { inherit pname version; - sha256 = "d1ac14eb64978c1697fcfba76e3ac7ebe24357c9428e775390f634648947cb91"; + sha256 = "57d1e353b11c5f90566efec7037deaa0e411b1df1e4e5522ce97d7be34b49478"; }; nativeBuildInputs = [ cython ]; From 621d184e902e0fbd81d004c3077788b00ceb4833 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:26 +0200 Subject: [PATCH 1182/3452] python: pytest-astropy: 0.5.0 -> 0.8.0 --- pkgs/development/python-modules/pytest-astropy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index 1365c43b03a7..3e03460ec2d5 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-astropy"; - version = "0.5.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "6f28fb81dcdfa745f423b8f6d0303d97357d775b4128bcc2b3668f1602fd5a0b"; + sha256 = "619800eb2cbf64548fbea25268efe7c6f6ae206cb4825f34abd36f27bcf946a2"; }; propagatedBuildInputs = [ From 8c8c07b9a570818343c05d2916e3ce58508bc70b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:27 +0200 Subject: [PATCH 1183/3452] python: pytest-cov: 2.8.1 -> 2.9.0 --- pkgs/development/python-modules/pytest-cov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 420afd3c5555..5affa8ae35ba 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "2.8.1"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "cc6742d8bac45070217169f5f72ceee1e0e55b0221f54bcf24845972d3a47f2b"; + sha256 = "b6a814b8ed6247bd81ff47f038511b57fe1ce7f4cc25b9106f1a4b106f1d9322"; }; buildInputs = [ pytest ]; From e1dcc4d60229dd28b1df0f7b9fbf4625ab842bc3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:27 +0200 Subject: [PATCH 1184/3452] python: pytest-django: 3.7.0 -> 3.9.0 --- pkgs/development/python-modules/pytest-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 2417bdd4ac09..9763e074cee9 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -10,11 +10,11 @@ }: buildPythonPackage rec { pname = "pytest-django"; - version = "3.7.0"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "17592f06d51c2ef4b7a0fb24aa32c8b6998506a03c8439606cb96db160106659"; + sha256 = "664e5f42242e5e182519388f01b9f25d824a9feb7cd17d8f863c8d776f38baf9"; }; nativeBuildInputs = [ pytest setuptools_scm ]; From 12db6fea62d79e592d432210c94e49bb076b92b4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:27 +0200 Subject: [PATCH 1185/3452] python: pytest-doctestplus: 0.5.0 -> 0.7.0 --- .../development/python-modules/pytest-doctestplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index ed71592361cc..216be4fc5203 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.5.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "41386187b9261cd59a3ffe4cf9df58d517288a1d3f11d96749b39b4e38b0a02c"; + sha256 = "ed440f43e33191f09aed7bbc4f60db3dfb8f295ab33e04c59302af7eda9e29aa"; }; propagatedBuildInputs = [ From 17124ea6adfc21bc59b38f392895a131c8cd679a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:27 +0200 Subject: [PATCH 1186/3452] python: pytest-flask: 0.15.1 -> 1.0.0 --- pkgs/development/python-modules/pytest-flask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index 0ad858444403..047b06d97929 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-flask"; - version = "0.15.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1ri3p3hibb1r2wcblpvs64s4jz40ci4jki4s2nf3xf7iz2wwbn6b"; + sha256 = "4d5678a045c07317618d80223ea124e21e8acc89dae109542dd1fdf6783d96c2"; }; doCheck = false; From fe280f4070dcbf945c5b6eb3cee0dbea8cfc2080 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:27 +0200 Subject: [PATCH 1187/3452] python: pytest-isort: 0.3.1 -> 1.0.0 --- pkgs/development/python-modules/pytest-isort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index 9aa4410ec030..4c380b312e5e 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-isort"; - version = "0.3.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "4bfee60dad1870b51700d55a85f5ceda766bd9d3d2878c1bbabee80e61b1be1a"; + sha256 = "758156cb4dc1db72adc1b7e253011f5eea117fab32af03cedb4cbfc6058b5f8f"; }; propagatedBuildInputs = [ isort ]; From e6dbc21e2d37cc22e5b15070c7add1b7c310aab1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:27 +0200 Subject: [PATCH 1188/3452] python: pytest-mock: 1.13.0 -> 3.1.1 --- pkgs/development/python-modules/pytest-mock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index c65e617b7950..ff08efc12be2 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.13.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "e24a911ec96773022ebcc7030059b57cd3480b56d4f5d19b7c370ec635e6aed5"; + sha256 = "636e792f7dd9e2c80657e174c04bf7aa92672350090736d82e97e92ce8f68737"; }; propagatedBuildInputs = lib.optional (!isPy3k) mock; From 645add108557f12530ba343233d239819d69cda3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:27 +0200 Subject: [PATCH 1189/3452] python: pytest-mypy: 0.4.2 -> 0.6.2 --- pkgs/development/python-modules/pytest-mypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 2e1bd1b626d9..6eb2a17ed387 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-mypy"; - version = "0.4.2"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "5a5338cecff17f005b181546a13e282761754b481225df37f33d37f86ac5b304"; + sha256 = "2560a9b27d59bb17810d12ec3402dfc7c8e100e40539a70d2814bcbb27240f27"; }; propagatedBuildInputs = [ pytest mypy ]; From 241869b9b8a5ba42acf8d6345facabf9edffa543 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:27 +0200 Subject: [PATCH 1190/3452] python: pytest-openfiles: 0.4.0 -> 0.5.0 --- pkgs/development/python-modules/pytest-openfiles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/pkgs/development/python-modules/pytest-openfiles/default.nix index daa55f91cd29..de20a35d30a8 100644 --- a/pkgs/development/python-modules/pytest-openfiles/default.nix +++ b/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-openfiles"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "af591422f2bfa95f7690d83aeb8d76bd5421cb8b1dcaf085d58cd92e8d92058d"; + sha256 = "179c2911d8aee3441fee051aba08e0d9b4dab61b829ae4811906d5c49a3b0a58"; }; propagatedBuildInputs = [ From b9014342e889b072d6116327ffed8374e2ff1ddd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:27 +0200 Subject: [PATCH 1191/3452] python: pytest-pylint: 0.15.1 -> 0.17.0 --- pkgs/development/python-modules/pytest-pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix index 40ab69c5735d..dba087bf6909 100644 --- a/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/pkgs/development/python-modules/pytest-pylint/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytest-pylint"; - version = "0.15.1"; + version = "0.17.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0sbmnw3bly4pry5lp6q6g0r8xzaxwbdlf0k19k8pygkhllnj6gnx"; + sha256 = "b0c177d63f6e3f5b82fa2720a6570dd2ecff1616c26ed6d02d0cbf75fd98ddf9"; }; buildInputs = [ pytestrunner ]; From 6a078d588418c678c8167a04161e1e43f3bfdaea Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:27 +0200 Subject: [PATCH 1192/3452] python: pytest-rerunfailures: 8.0 -> 9.0 --- .../python-modules/pytest-rerunfailures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index f772fb131d84..79631824b927 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "8.0"; + version = "9.0"; src = fetchPypi { inherit pname version; - sha256 = "04p8rfvv7yi3gsdm1dw1mfhjwg6507rhgj7nbm5gfqw4kxmj7h8p"; + sha256 = "895ac2a6486c0da0468ae31768b818d9f3f7fceddef110970c7dbb09e7b4b8e4"; }; checkInputs = [ mock pytest ]; From d60441a20e4307d4866c2983de14cefd99519fd4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:27 +0200 Subject: [PATCH 1193/3452] python: pytest-sanic: 1.1.2 -> 1.6.1 --- pkgs/development/python-modules/pytest-sanic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-sanic/default.nix b/pkgs/development/python-modules/pytest-sanic/default.nix index 68f8fd4fcee7..147ce6a19597 100644 --- a/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/pkgs/development/python-modules/pytest-sanic/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-sanic"; - version = "1.1.2"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "61a60e1b0456b2ceaeeb7173783f3450332c3609017fb6b18176b307f7186d3a"; + sha256 = "99e02c28cfa18a0a9af0cd151dddf0eca373279b9bac808733746f7ed7030ecc"; }; propagatedBuildInputs = [ From a05015d6315c67c70acc53cd8754040e8f2604da Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:28 +0200 Subject: [PATCH 1194/3452] python: pytest-xdist: 1.30.0 -> 1.32.0 --- pkgs/development/python-modules/pytest-xdist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index d71d28612eec..d5fc8ce25b12 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-xdist"; - version = "1.30.0"; + version = "1.32.0"; src = fetchPypi { inherit pname version; - sha256 = "5d1b1d4461518a6023d56dab62fb63670d6f7537f23e2708459a557329accf48"; + sha256 = "1d4166dcac69adb38eeaedb88c8fada8588348258a3492ab49ba9161f2971129"; }; nativeBuildInputs = [ setuptools_scm pytest ]; From 3116d93bec376e56a16795818845aa813201e3e0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:28 +0200 Subject: [PATCH 1195/3452] python: pytest-xprocess: 0.12.1 -> 0.13.1 --- pkgs/development/python-modules/pytest-xprocess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index 840a096a085e..c6b9557fc57f 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.12.1"; + version = "0.13.1"; src = fetchPypi { inherit pname version; - sha256 = "06w2acg0shy0vxrmnxpqclimhgfjys5ql5kmmzr7r1lai46x1q2h"; + sha256 = "779aeca517cd9c996d1544bdc510cb3cff40c48136d94bbce6148e27f30a93ff"; }; propagatedBuildInputs = [ psutil pytest ]; From 379c83d59e2b480831e8996e93320ce68d934a93 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:28 +0200 Subject: [PATCH 1196/3452] python: python-dotenv: 0.10.5 -> 0.13.0 --- pkgs/development/python-modules/python-dotenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index bc71a662f3ec..e72c27acc345 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.10.5"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "1p6xk0f1yj1s4n8wjs9m8xqilc5bcwvfzsy9nv5lrmkhr78bym7j"; + sha256 = "3b9909bc96b0edc6b01586e1eed05e71174ef4e04c71da5786370cebea53ad74"; }; propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ]; From 769e0438dcca2b0fc05337bc1578ffd567112bfa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:28 +0200 Subject: [PATCH 1197/3452] python: python-hosts: 0.4.7 -> 1.0.0 --- pkgs/development/python-modules/python-hosts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix index e7dbaa1d64e3..cf1314e0d4c2 100644 --- a/pkgs/development/python-modules/python-hosts/default.nix +++ b/pkgs/development/python-modules/python-hosts/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-hosts"; - version = "0.4.7"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0jdpihj8ajn6pqqa9viw0043l5wvbzgk81rnyk2134iyzhg06z80"; + sha256 = "850998704ba9025ce4c8ffd45dc4fbea2b5e30247bf3b574872ac5df90426b4d"; }; # win_inet_pton is required for windows support From c6496c80d1edcada208ad01447489975a82bef8a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:28 +0200 Subject: [PATCH 1198/3452] python: python-igraph: 0.7.1.post6 -> 0.8.2 --- pkgs/development/python-modules/python-igraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index 0f20a01e0b22..a2bf20188ff1 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "python-igraph"; - version = "0.7.1.post6"; + version = "0.8.2"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ igraph ]; src = fetchPypi { inherit pname version; - sha256 = "0xp61zz710qlzhmzbfr65d5flvsi8zf2xy78s6rsszh719wl5sm5"; + sha256 = "4601638d7d22eae7608cdf793efac75e6c039770ec4bd2cecf76378c84ce7d72"; }; doCheck = !isPy3k; From 00d2f258e42ba1477cb54ba15d28ca9bbb379bff Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:28 +0200 Subject: [PATCH 1199/3452] python: python-mnist: 0.6 -> 0.7 --- pkgs/development/python-modules/python-mnist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-mnist/default.nix b/pkgs/development/python-modules/python-mnist/default.nix index 3b0ecf237702..0004c297b619 100644 --- a/pkgs/development/python-modules/python-mnist/default.nix +++ b/pkgs/development/python-modules/python-mnist/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-mnist"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "5d59a44335eccb4b310efb2ebb76f44e8588a1732cfb4923f4a502b61d8b653a"; + sha256 = "a0cced01e83b5b844cff86109280df7a672a8e4e38fc19fa68999a17f8a9fbd8"; }; meta = with stdenv.lib; { From 384d204041f2e7c2ae95b8091f8a25e747277421 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:28 +0200 Subject: [PATCH 1200/3452] python: python-periphery: 2.0.1 -> 2.1.0 --- pkgs/development/python-modules/python-periphery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix index d1f5de83a4c8..298fbaed0f86 100644 --- a/pkgs/development/python-modules/python-periphery/default.nix +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-periphery"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1v0qpv0i2kqhjvl6wvvvy29hazjdcym7nn14qzv4r5zq1zsdb92x"; + sha256 = "57baa82e6bc59b67747317d16ad0cf9626826e8d43233af13bce924660500bd6"; }; # Some tests require physical probing and additional physical setup From 00370ef6ae75bcfa5db5af46e1688e4d581db273 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:28 +0200 Subject: [PATCH 1201/3452] python: python-redis-lock: 3.4.0 -> 3.5.0 --- pkgs/development/python-modules/python-redis-lock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 8aad5a1a7d2f..f3e58a1a621e 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "python-redis-lock"; - version = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "8e3ef458b9424daf35d587e69b63416a0c55ac46303f3aaff1bab4fe5a8f1e92"; + sha256 = "06f28f63bf4ea3d739ff5c472e76563e24aa5c887002a85cbdb7a5b13aa05897"; }; checkInputs = [ pytest process-tests pkgs.redis ]; From 27b503b51f092fd46b7342e7efa1f289525ac69c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:28 +0200 Subject: [PATCH 1202/3452] python: python-socketio: 4.4.0 -> 4.6.0 --- pkgs/development/python-modules/python-socketio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 23c806c3bab3..cbddc023a152 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "4.4.0"; + version = "4.6.0"; src = fetchPypi { inherit pname version; - sha256 = "48cba5b827ac665dbf923a4f5ec590812aed5299a831fc43576a9af346272534"; + sha256 = "358d8fbbc029c4538ea25bcaa283e47f375be0017fcba829de8a3a731c9df25a"; }; propagatedBuildInputs = [ From 3dc149db29c0fa14760667b2e726fc3cd8bcd9eb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:28 +0200 Subject: [PATCH 1203/3452] python: python-vipaccess: 0.12 -> 0.13 --- pkgs/development/python-modules/python-vipaccess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix index ca82f8aa1870..cdafd3cd2a0f 100644 --- a/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "python-vipaccess"; - version = "0.12"; + version = "0.13"; src = fetchPypi { inherit pname version; - sha256 = "0g6mmf896wp036263zkkvi3ff59zcrzssjsw7csfmbisiszgdnrj"; + sha256 = "f148d4534e3a4dda9050a6a038868594c1216ea2413f2144ca6697e0e20c9cad"; }; propagatedBuildInputs = [ From 370474b4b1dad1798935a29ba4fc622547942895 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:29 +0200 Subject: [PATCH 1204/3452] python: python-fedora: 0.10.0 -> 1.0.0 --- pkgs/development/python-modules/python_fedora/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix index ca4aa726d50d..8c9cac757615 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "python-fedora"; - version = "0.10.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "5516b8c066bb2eb5d604ae8e84c3d31e27753795c5d84f6a792979363756405c"; + sha256 = "efb675929ebf588c2deffa2058ff407e65d1889bca1b545a58f525135367c9e4"; }; propagatedBuildInputs = [ kitchen requests bunch paver lockfile six munch urllib3 beautifulsoup4 openidc-client ]; From 3a1fbb65e90684e94d7fea48f6a45d65dd57cd3d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:29 +0200 Subject: [PATCH 1205/3452] python: pytools: 2019.1.1 -> 2020.2 --- pkgs/development/python-modules/pytools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 7321fbef0d6e..965f7f350883 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytools"; - version = "2019.1.1"; + version = "2020.2"; src = fetchPypi { inherit pname version; - sha256 = "ce2d702ae4ef10a70197b00b93141461140d00578f2a862fa946ca1446a300db"; + sha256 = "3cacefed54148aafb07502c7c907cae8d9327ea35df16e3366c883a706ed5601"; }; checkInputs = [ pytest ]; From f0e5141b4a11008e78ee918d9bf3062ff42414b9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:29 +0200 Subject: [PATCH 1206/3452] python: pytz: 2019.3 -> 2020.1 --- pkgs/development/python-modules/pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index e7ce3b62b5b8..8680a4f8e1d4 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2019.3"; + version = "2020.1"; src = fetchPypi { inherit pname version; - sha256 = "b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be"; + sha256 = "c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048"; }; checkPhase = '' From 91d2e8564d5f99bd33f37a19aa5a59e5676b9f64 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:29 +0200 Subject: [PATCH 1207/3452] python: pyunifi: 2.19.0 -> 2.20.1 --- pkgs/development/python-modules/pyunifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix index ea9cedeeae19..ed2dd4cc2564 100644 --- a/pkgs/development/python-modules/pyunifi/default.nix +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyunifi"; - version = "2.19.0"; + version = "2.20.1"; src = fetchPypi { inherit pname version; - sha256 = "f022eb2135b88a9d391f4553fac1bf90f3808d660fd0058203f6f9e57214626b"; + sha256 = "b52d1b0d87365fcfed8572b5dbd8d675bffece4ab3484bf083863f278c727d3d"; }; propagatedBuildInputs = [ requests ]; From 06473b92578efcfd67ef17dc4b87cf7be8a5319d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:29 +0200 Subject: [PATCH 1208/3452] python: pyvcd: 0.1.7 -> 0.2.1 --- pkgs/development/python-modules/pyvcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index ae41d1965430..aa780ad17896 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.1.7"; + version = "0.2.1"; pname = "pyvcd"; src = fetchPypi { inherit pname version; - sha256 = "1ixpdl0qiads81h8s9h9r9z0cyc9dlmvi01nfjggxixvbb17305y"; + sha256 = "fad6b9e2cd68049968a43fd9f465a1f924050c0a654e28cc5aa04c1908f283ab"; }; buildInputs = [ setuptools_scm ]; From f00b39af74fe954ab729ec50e2b1410ce11acab7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:29 +0200 Subject: [PATCH 1209/3452] python: pywbem: 0.15.0 -> 0.17.2 --- pkgs/development/python-modules/pywbem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index 82370faf7ef2..603aff8ec4aa 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "pywbem"; - version = "0.15.0"; + version = "0.17.2"; # Support added in master https://github.com/pywbem/pywbem/commit/b2f2f1a151a30355bbc6652dca69a7b30bfe941e awaiting release disabled = isPy37; src = fetchPypi { inherit pname version; - sha256 = "6f4304518b2ba89a97bd4f5f0decc8ad382b38a9303032ae17a1a601d95d24b8"; + sha256 = "84dac33f77d5ff2c3d8eb42fc7de2ffb6d33f5e4954ef89db0dbf3fe646a2809"; }; propagatedBuildInputs = [ From e7897e3101fffc06f6b4e8130c318e5b52311ea8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:29 +0200 Subject: [PATCH 1210/3452] python: pywebpush: 1.10.2 -> 1.11.0 --- pkgs/development/python-modules/pywebpush/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index bf8a23f3baae..5bb8989506f2 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pywebpush"; - version = "1.10.2"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "61e6b92ee23ea3f7afbb427508e51c789a0c10cbc962fab9de582ad48b5792e4"; + sha256 = "596c74020f9cbabc99f7964127ab0bb6cc045fcfe781b7c73cffb3ea45947820"; }; propagatedBuildInputs = [ From 0cacb2510861c84ab609da4dff8b5e58cce79047 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:29 +0200 Subject: [PATCH 1211/3452] python: pyxl3: 1.3 -> 1.4 --- pkgs/development/python-modules/pyxl3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/pkgs/development/python-modules/pyxl3/default.nix index 2fa5ef766699..8cdfe6436e35 100644 --- a/pkgs/development/python-modules/pyxl3/default.nix +++ b/pkgs/development/python-modules/pyxl3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pyxl3"; - version = "1.3"; + version = "1.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "23831c6d60b2ce3fbb39966f6fb21a5e053d6ce0bd08b00bb50fa388631b69ee"; + sha256 = "ad4cc56bf4b35def33783e6d4783882702111fe8f9a781c63228e2114067c065"; }; checkInputs = [ unittest2 ]; From 569738bcbfaab3b5cdcf9952808306af9c1ad00d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:29 +0200 Subject: [PATCH 1212/3452] python: pyzmq: 18.1.1 -> 19.0.1 --- pkgs/development/python-modules/pyzmq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index f1ecdf7c4f4f..834ad4d3d6e8 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "18.1.1"; + version = "19.0.1"; src = fetchPypi { inherit pname version; - sha256 = "8c69a6cbfa94da29a34f6b16193e7c15f5d3220cb772d6d17425ff3faa063a6d"; + sha256 = "13a5638ab24d628a6ade8f794195e1a1acd573496c3b85af2f1183603b7bf5e0"; }; checkInputs = [ pytest tornado ]; From bee99a59e572c7d201278d59dd8836e99b1d3c49 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:29 +0200 Subject: [PATCH 1213/3452] python: readme_renderer: 24.0 -> 26.0 --- pkgs/development/python-modules/readme_renderer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index 8d36df3d980a..9ffb986b9f5a 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "readme_renderer"; - version = "24.0"; + version = "26.0"; src = fetchPypi { inherit pname version; - sha256 = "0br0562lnvj339f1nwz4nfl4ay49rw05xkqacigzf9wz4mdza5mv"; + sha256 = "cbe9db71defedd2428a1589cdc545f9bd98e59297449f69d721ef8f1cfced68d"; }; checkInputs = [ pytest mock ]; From 4b4a791ed7880205f079eaac6316b5a60794795a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:30 +0200 Subject: [PATCH 1214/3452] python: redis: 3.3.11 -> 3.5.3 --- pkgs/development/python-modules/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 2da7470a8387..35109e836fa4 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "redis"; - version = "3.3.11"; + version = "3.5.3"; src = fetchPypi { inherit pname version; - sha256 = "8d0fc278d3f5e1249967cba2eb4a5632d19e45ce5c09442b8422d15ee2c22cc2"; + sha256 = "0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2"; }; # tests require a running redis From 1c4259acd7b9f8eac74e65f201054bf62495b3e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:30 +0200 Subject: [PATCH 1215/3452] python: regex: 2019.12.20 -> 2020.5.14 --- pkgs/development/python-modules/regex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index a9456ac963c7..038d6d2c90a3 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2019.12.20"; + version = "2020.5.14"; src = fetchPypi { inherit pname version; - sha256 = "106e25a841921d8259dcef2a42786caae35bc750fb996f830065b3dfaa67b77e"; + sha256 = "ce450ffbfec93821ab1fea94779a8440e10cf63819be6e176eb1973a6017aff5"; }; postCheck = '' From ae391d16a41f4cae31a8ff279f4f19bb1da1c006 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:30 +0200 Subject: [PATCH 1216/3452] python: repoze.who: 2.3 -> 2.4 --- pkgs/development/python-modules/repoze_who/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/repoze_who/default.nix b/pkgs/development/python-modules/repoze_who/default.nix index 20001ff7ef88..7f4a89f3d24e 100644 --- a/pkgs/development/python-modules/repoze_who/default.nix +++ b/pkgs/development/python-modules/repoze_who/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "repoze.who"; - version = "2.3"; + version = "2.4"; src = fetchPypi { inherit pname version; - sha256 = "b95dadc1242acc55950115a629cfb1352669774b46d22def51400ca683efea28"; + sha256 = "cf97450de3c8eb5c03b4037be75b018db91befab1094204e452a0b1c0f7a94a6"; }; propagatedBuildInputs = [ zope_interface webob ]; From ed78296c98f37a7a8a5b8e81c14e9dfc3d0b6bc3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:30 +0200 Subject: [PATCH 1217/3452] python: requests-file: 1.4.3 -> 1.5.1 --- pkgs/development/python-modules/requests-file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix index 6c94144ef154..fb375fd501a8 100644 --- a/pkgs/development/python-modules/requests-file/default.nix +++ b/pkgs/development/python-modules/requests-file/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "requests-file"; - version = "1.4.3"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "1yp2jaxg3v86pia0q512dg3hz6s9y5vzdivsgrba1kds05ial14g"; + sha256 = "07d74208d3389d01c38ab89ef403af0cfec63957d53a0081d8eca738d0247d8e"; }; propagatedBuildInputs = [ requests six ]; From 2cb47949ede2b714bb42aef5ced6f2cccf9d4391 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:30 +0200 Subject: [PATCH 1218/3452] python: requests-mock: 1.7.0 -> 1.8.0 --- pkgs/development/python-modules/requests-mock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix index 9728639e0ef7..9a08480827dc 100644 --- a/pkgs/development/python-modules/requests-mock/default.nix +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "requests-mock"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0ij6ir5cy0gpy5xw4sykxz320ndi26np6flx9yg9mimkv0nl1lw8"; + sha256 = "e68f46844e4cee9d447150343c9ae875f99fa8037c6dcf5f15bf1fe9ab43d226"; }; patchPhase = '' From 2cb160027cfac808f1fe171b88053e1dc570c5f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:30 +0200 Subject: [PATCH 1219/3452] python: robotframework-requests: 0.6.6 -> 0.7.0 --- .../python-modules/robotframework-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index bd6b884ed7dc..e62087628a0b 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.6.6"; + version = "0.7.0"; pname = "robotframework-requests"; src = fetchPypi { inherit pname version; - sha256 = "01b6d02052349663b7faae5e9363877b1e5ea1f181bd52b1a29df3b03a348bcf"; + sha256 = "da7bf998f9cbf8261199db7c96b95be1bf29d1db7f59dfbc77c435761698dc75"; }; buildInputs = [ unittest2 ]; From 7c64bc968566f94a435bca7a2f8baef70c0b797f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:30 +0200 Subject: [PATCH 1220/3452] python: robotframework: 3.1.2 -> 3.2.1 --- pkgs/development/python-modules/robotframework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index a1251fa0093a..cf9f4ea86f92 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "robotframework"; - version = "3.1.2"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "f10dd7c0c8c7962a4f80dd1e026b5db731b9391bc6e1f9ebb96d685eb1230dbc"; + sha256 = "d693e6d06b17f48669e2a8c4cb6c1f0d56e5f1a74835d18b8ea2118da7bf2d79"; extension = "zip"; }; From c28ffbc1cc6c1d907ad46a14cc82dddb574fbc76 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:30 +0200 Subject: [PATCH 1221/3452] python: robotsuite: 2.0.0 -> 2.2.1 --- pkgs/development/python-modules/robotsuite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix index 75b7fac0cfc0..e9d4ddbed116 100644 --- a/pkgs/development/python-modules/robotsuite/default.nix +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "robotsuite"; - version = "2.0.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "15iw7g6gspf1ill0mzjrj71dirqfc86f1j14wphdvs2lazv8d50z"; + sha256 = "8764e01990ac6774e0c983579bcb9cb79f44373a61ad47fbae9a1dc7eedbdd61"; }; buildInputs = [ unittest2 ]; From 6ba58c0756113f3b5f40a5401914aa677ba94a50 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:30 +0200 Subject: [PATCH 1222/3452] python: rope: 0.16.0 -> 0.17.0 --- pkgs/development/python-modules/rope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 6bcc05fb34d6..c7b75bab7424 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "rope"; - version = "0.16.0"; + version = "0.17.0"; disabled = pythonAtLeast "3.8"; # 0.17 should support Python 3.8 src = fetchPypi { inherit pname version; - sha256 = "1zlxdrs6ww2hm41izz67h67z9dkm0rlgw8m04vygaip0q91030yj"; + sha256 = "658ad6705f43dcf3d6df379da9486529cf30e02d9ea14c5682aa80eb33b649e1"; }; checkInputs = [ nose ]; From e6c20801e013d7be07a0b76b6af238588f086a3a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:30 +0200 Subject: [PATCH 1223/3452] python: rq: 1.3.0 -> 1.4.2 --- pkgs/development/python-modules/rq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 9f57fb486d91..ea377489bf96 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rq"; - version = "1.3.0"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "0xr38j35iqmhx0f2l8ix34vjs9flpqv2y17k33crh7rhm6gi9ja9"; + sha256 = "f680c52c7079266465d5e5c49679fab0d14db11d70fec6f1470423408b6bbcf6"; }; # test require a running redis rerver, which is something we can't do yet From b4487c09ea54cc642789d32afce4d0c25dd0bca8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:31 +0200 Subject: [PATCH 1224/3452] python: runway-python: 0.5.9 -> 0.6.0 --- pkgs/development/python-modules/runway-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index d2d63b2b5c4c..23455ae89400 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "runway-python"; - version = "0.5.9"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1d75c44008275213034977c75bc2dc6f419e7f11d087984e3faea1e0cf6da69d"; + sha256 = "695d78f8edeb6a7ca98d8351adb36948d56cceeffe8a84896c9fbfd349fc4cb8"; }; propagatedBuildInputs = [ flask flask-compress flask-cors flask-sockets numpy scipy pillow gevent wget six colorcet unidecode urllib3 ]; From 6333baf8df8c593ffd7dc62bffd621f243e6aa61 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:31 +0200 Subject: [PATCH 1225/3452] python: scikit-image: 0.16.2 -> 0.17.2 --- pkgs/development/python-modules/scikit-image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 41f2609df781..35ba4f53cd27 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "scikit-image"; - version = "0.16.2"; + version = "0.17.2"; src = fetchPypi { inherit pname version; - sha256 = "dd7fbd32da74d4e9967dc15845f731f16e7966cee61f5dc0e12e2abb1305068c"; + sha256 = "bd954c0588f0f7e81d9763dc95e06950e68247d540476e06cb77bcbcd8c2d8b3"; }; buildInputs = [ cython ]; From fe991503b111b3b5a017a3cf237663865ad76918 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:31 +0200 Subject: [PATCH 1226/3452] python: seekpath: 1.9.7 -> 2.0.1 --- pkgs/development/python-modules/seekpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix index 61668bd6a0a6..af74649899bf 100644 --- a/pkgs/development/python-modules/seekpath/default.nix +++ b/pkgs/development/python-modules/seekpath/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "seekpath"; - version = "1.9.7"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "b83ea23b54209b7f34f3fcabe7248cebbcc3cc164c394f1659b35942edaedb1c"; + sha256 = "188513ee187fbbace49066a29ecea9bbd351f23da3bea33d507d0f590856b082"; }; LC_ALL = "en_US.utf-8"; From beb74e3fbf7a2f45542b1a56b0c5554b43a02e7f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:31 +0200 Subject: [PATCH 1227/3452] python: sentry-sdk: 0.13.5 -> 0.14.4 --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index d556dcb74cf2..ef2680bc4c6c 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "0.13.5"; + version = "0.14.4"; src = fetchPypi { inherit pname version; - sha256 = "c6b919623e488134a728f16326c6f0bcdab7e3f59e7f4c472a90eea4d6d8fe82"; + sha256 = "0e5e947d0f7a969314aa23669a94a9712be5a688ff069ff7b9fc36c66adc160c"; }; checkInputs = [ django flask tornado bottle rq falcon sqlalchemy ] From c0a9aea47e737132c30506202c191157f7afc953 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:31 +0200 Subject: [PATCH 1228/3452] python: serpent: 1.28 -> 1.30.2 --- pkgs/development/python-modules/serpent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index 701de5200461..cfb734e54759 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "serpent"; - version = "1.28"; + version = "1.30.2"; src = fetchPypi { inherit pname version; - sha256 = "1arnckykpkvv2qrp49l1k7q5mr5pisswl0rvdx98x8wsl1n361pk"; + sha256 = "72753820246a7d8486e8b385353e3bbf769abfceec2e850fa527a288b084ff7a"; }; propagatedBuildInputs = lib.optionals isPy27 [ enum34 ]; From cff2da07e41217e6b87610e0aa38181dbd6b0877 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:31 +0200 Subject: [PATCH 1229/3452] python: setuptools_scm: 3.4.3 -> 4.1.2 --- pkgs/development/python-modules/setuptools_scm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index 54622c36e6b7..fb527a1336d9 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "setuptools_scm"; - version = "3.4.3"; + version = "4.1.2"; src = fetchPypi { inherit pname version; - sha256 = "26b8a108783cd88f4b15ff1f0f347d6b476db25d0c226159b835d713f9487320"; + sha256 = "a8994582e716ec690f33fec70cca0f85bd23ec974e3f783233e4879090a7faa8"; }; # Requires pytest, circular dependency From 1f9922dfbc75442f9832f4516ce1efe270fe3d82 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:31 +0200 Subject: [PATCH 1230/3452] python: shortuuid: 0.5.0 -> 1.0.1 --- pkgs/development/python-modules/shortuuid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix index fc2a25dab5ce..4798bc4ff7e6 100644 --- a/pkgs/development/python-modules/shortuuid/default.nix +++ b/pkgs/development/python-modules/shortuuid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "shortuuid"; - version = "0.5.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "d08fd398f40f8baf87e15eef8355e92fa541bca4eb8465fefab7ee22f92711b9"; + sha256 = "3c11d2007b915c43bee3e10625f068d8a349e04f0d81f08f5fa08507427ebf1f"; }; buildInputs = [pep8]; From 65ea4375d02addacf41fc3cfc46c79fafda63844 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:31 +0200 Subject: [PATCH 1231/3452] python: simpy: 3.0.13 -> 4.0.1 --- pkgs/development/python-modules/simpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index bcf853e999ce..656d330cd589 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "simpy"; - version = "3.0.13"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "dd8c16ca3cff1574c99fe9f5ea4019c631c327f2bdc842e8b1a5c55f5e3e9d27"; + sha256 = "b36542e2faab612f861c5ef4da17220ac1553f5892b3583c67281dbe4faad404"; }; meta = with lib; { From 9956e6896c6d48f2eac6cf6103954b9baaa88214 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:31 +0200 Subject: [PATCH 1232/3452] python: six: 1.14.0 -> 1.15.0 --- pkgs/development/python-modules/six/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix index 46f7f6d38b6b..8d8cd790cdef 100644 --- a/pkgs/development/python-modules/six/default.nix +++ b/pkgs/development/python-modules/six/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "six"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a"; + sha256 = "30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"; }; checkInputs = [ pytest ]; From f71c557fe393895d8cccf3d285b8388c54383685 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:31 +0200 Subject: [PATCH 1233/3452] python: smart_open: 1.11.1 -> 2.0.0 --- pkgs/development/python-modules/smart_open/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index fadeb93f0a13..c3cac404d107 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; - version = "1.11.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "221cc08ae926af6ad72d141f208d228e1e801b1ee9b15f3e466eecf89d931002"; + sha256 = "555962abf982faff8a8aeb65e0695474e3091f604826055782beffa8400e4e4e"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build From acf8e2983e86fb92aa0026266571f81f1c805ddf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:32 +0200 Subject: [PATCH 1234/3452] python: snowflake-sqlalchemy: 1.1.18 -> 1.2.3 --- .../python-modules/snowflake-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 9e4bab5284c0..4a44c3207058 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.1.18"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "5c19890d94bc4e5b76e7ac1a3e4c9e2b49b4d95214156d140a781042b8389725"; + sha256 = "2c598ef37623ef4d035a827f1e84725b3239a47f4366417d089de88f72fc4ac9"; }; propagatedBuildInputs = [ From de1652256557ccb467e557303ff3f17968dd8c47 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:32 +0200 Subject: [PATCH 1235/3452] python: sopel: 6.6.9 -> 7.0.4 --- pkgs/development/python-modules/sopel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index d01fd722ab83..e5720d9620d7 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sopel"; - version = "6.6.9"; + version = "7.0.4"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1arldn3p2yp09wnn2cw50r5ri303d5jdsjnf6lgfl82jhfmk49a2"; + sha256 = "c8fc7186ff34c5f86ebbf2bff734503e92ce29aaf5a242eaf93875983617c6d0"; }; propagatedBuildInputs = [ From a03c092c22cd404ebb131f801e90de9a5c3c2da8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:32 +0200 Subject: [PATCH 1236/3452] python: sorl-thumbnail: 12.5.0 -> 12.6.3 --- pkgs/development/python-modules/sorl_thumbnail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl_thumbnail/default.nix index 1979daf85be3..c847459f1879 100644 --- a/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sorl-thumbnail"; - version = "12.5.0"; + version = "12.6.3"; src = fetchPypi { inherit pname version; - sha256 = "8dfe5fda91a5047d1d35a0b9effe7b000764a01d648e15ca076f44e9c34b6dbd"; + sha256 = "66771521f3c0ed771e1ce8e1aaf1639ebff18f7f5a40cfd3083da8f0fe6c7c99"; }; # Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl. From 2b5b105aefecb6e674fa39efd31b3163a32eb9c9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:32 +0200 Subject: [PATCH 1237/3452] python: soupsieve: 1.9.6 -> 2.0.1 --- pkgs/development/python-modules/soupsieve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index bb5ecbc839c2..22d1926d8bb4 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "soupsieve"; - version = "1.9.6"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "7985bacc98c34923a439967c1a602dc4f1e15f923b6fcf02344184f86cc7efaa"; + sha256 = "a59dc181727e95d25f781f0eb4fd1825ff45590ec8ff49eadfd7f1a537cc0232"; }; checkPhase = '' From 48ed23c9bd16e21b2202d885282241eba4ee77d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:32 +0200 Subject: [PATCH 1238/3452] python: sparse: 0.9.1 -> 0.10.0 --- pkgs/development/python-modules/sparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index 355453ed26e6..f60d7383ba1f 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sparse"; - version = "0.9.1"; + version = "0.10.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "04gfwm1y9knryx992biniqa3978n3chr38iy3y4i2b8wy52fzy3d"; + sha256 = "ffbca00a53f938e4f04230f582b210440efb54d74d60af1d1ced3864f61677ac"; }; checkInputs = [ pytest ]; From db113a302b7f4b7559938ea1f86c261cdffbd8ee Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:32 +0200 Subject: [PATCH 1239/3452] python: sphinxcontrib-openapi: 0.6.0 -> 0.7.0 --- .../python-modules/sphinxcontrib-openapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index a60a36413ac1..7c5c95d6ad42 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-openapi"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "02pkzcmxikcfvkvcfsclnhymzl1lc84jz6vmdaslbgh4j5vlp5ym"; + sha256 = "1c1bd10d7653912c59a42f727c62cbb7b75f7905ddd9ccc477ebfd1bc69f0cf3"; }; propagatedBuildInputs = [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain]; From a6d89358db6cb0a16f7881ab9e56e4c5e856f139 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:32 +0200 Subject: [PATCH 1240/3452] python: sphinxcontrib-spelling: 4.3.0 -> 5.1.0 --- .../python-modules/sphinxcontrib-spelling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 79b2aa42e36b..f9987789ea7b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "4.3.0"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0304dac9286378f9c608af8d885a08fe03a9c62b3ebfa8802008018d92371c19"; + sha256 = "312386e2b622830230611871ae507c5f73ec141d4a28aa97aaefed65fe579905"; }; propagatedBuildInputs = [ sphinx pyenchant pbr ]; From 20eb5e40a7a57d22523bb74d23b59088f0ae2a39 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:32 +0200 Subject: [PATCH 1241/3452] python: sphinxcontrib-websupport: 1.1.2 -> 1.2.2 --- .../python-modules/sphinxcontrib-websupport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index b1bdf6a0dff6..2f4c3764a35d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-websupport"; - version = "1.1.2"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "1501befb0fdf1d1c29a800fdbf4ef5dc5369377300ddbdd16d2cd40e54c6eefc"; + sha256 = "33c0db6c0635b9dc3e72629b7278ca3b9fa24c156eeeaf1674be8f268831d951"; }; propagatedBuildInputs = [ six ]; From 8529531aa44f0387fc1fd76974f56759e2c78e8f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:32 +0200 Subject: [PATCH 1242/3452] python: spotipy: 2.10.0 -> 2.12.0 --- pkgs/development/python-modules/spotipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index 74ab81c2f08a..fb1c84746959 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.10.0"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "0s2f9yxhfkfipbb06965gfjq4lg0khp5vcykijrx6dzxyh20vggm"; + sha256 = "f3a08edd516ffaf0731d40fdb7943445fe7b1b412700d042cbd168a726685222"; }; propagatedBuildInputs = [ requests ]; From 06572524752eb7a683a0ad8d58966a5894db4e1c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:32 +0200 Subject: [PATCH 1243/3452] python: sqlalchemy-citext: 1.3-0 -> 1.6.3 --- pkgs/development/python-modules/sqlalchemy-citext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-citext/default.nix b/pkgs/development/python-modules/sqlalchemy-citext/default.nix index 1f0dd5eb7eae..300941e26171 100644 --- a/pkgs/development/python-modules/sqlalchemy-citext/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-citext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlalchemy-citext"; - version = "1.3-0"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "7d7343037a35153d6f94c3c2f6baf391f88a57651c3bde5d6749d216859ae4c5"; + sha256 = "1d66e7d49826fec28a9ce69053fdf82d3a5ff397968c5bf38a0d83dcb4bf2303"; }; propagatedBuildInputs = [ From 148102aa3c1289a14ad79e675f82d597778b10e3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:32 +0200 Subject: [PATCH 1244/3452] python: srsly: 1.0.2 -> 2.0.1 --- pkgs/development/python-modules/srsly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 39765f06a50e..37b233574b20 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "srsly"; - version = "1.0.2"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1n0f9kbbz5akpbiqqz4j3p7zqai3zasw8cqai9zj1pv7sn0qn9ar"; + sha256 = "fa3c7375be8fe75f23c27feafbfb5f738d55ffdbf02964c6896fb7684f519a52"; }; propagatedBuildInputs = lib.optional (pythonOlder "3.4") pathlib; From 7b61f9b7250620add36462ae9b4b2998552f8432 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:33 +0200 Subject: [PATCH 1245/3452] python: starfish: 0.1.10 -> 0.2.0 --- pkgs/development/python-modules/starfish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/starfish/default.nix b/pkgs/development/python-modules/starfish/default.nix index 1affd797c13d..13517aceb221 100644 --- a/pkgs/development/python-modules/starfish/default.nix +++ b/pkgs/development/python-modules/starfish/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "starfish"; - version = "0.1.10"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0340e37b732e184081b150f21bbbd4eed3643ab49f74633b9c4d827bda663235"; + sha256 = "73202fbc560519dc3b61f1f5e4341c598f6bf50b4509bb09dc22a729591a1042"; }; propagatedBuildInputs = [ From cb2c441dc7b2bb07c64898b2737f8cc6fe4365d2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:33 +0200 Subject: [PATCH 1246/3452] python: stevedore: 1.32.0 -> 2.0.0 --- pkgs/development/python-modules/stevedore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 0f73f8e8163b..be4063c7722c 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "stevedore"; - version = "1.32.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "02shnm8r8c0bv494m8sjnrrlqy0pz5q5xrzpq069bx9sc8fszbqq"; + sha256 = "001e90cd704be6470d46cc9076434e2d0d566c1379187e7013eb296d3a6032d9"; }; doCheck = false; From 48c7101f600b277d4fff9129c04791b3f2293475 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:33 +0200 Subject: [PATCH 1247/3452] python: structlog: 19.2.0 -> 20.1.0 --- pkgs/development/python-modules/structlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 2156c7f28021..89b37bc8cf3a 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "structlog"; - version = "19.2.0"; + version = "20.1.0"; src = fetchPypi { inherit pname version; - sha256 = "4287058cf4ce1a59bc5dea290d6386d37f29a37529c9a51cdf7387e51710152b"; + sha256 = "7a48375db6274ed1d0ae6123c486472aa1d0890b08d314d2b016f3aa7f35990b"; }; checkInputs = [ pytest pretend freezegun simplejson twisted ] From 6e028919aa481c7d79995cc206798db954faeb2c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:33 +0200 Subject: [PATCH 1248/3452] python: supervisor: 4.1.0 -> 4.2.0 --- pkgs/development/python-modules/supervisor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index 93dc91b4d10a..343aaddfbb5d 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "supervisor"; - version = "4.1.0"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "2dc86fe0476e945e61483d614ceb2cf4f93b95282eb243bdf792621994360383"; + sha256 = "64082ebedf6d36ff409ab2878f1aad5c9035f916c5f15a9a1ec7dffc6dfbbed8"; }; # wants to write to /tmp/foo which is likely already owned by another From 2d1ac526f4538b5e2611cffb1fa242746b5e8a85 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:33 +0200 Subject: [PATCH 1249/3452] python: sympy: 1.5.1 -> 1.6 --- pkgs/development/python-modules/sympy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index 3a03fae154d7..59605f555d36 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.5.1"; # Upgrades may break sage. Please test or ping @timokau. + version = "1.6"; # Upgrades may break sage. Please test or ping @timokau. src = fetchPypi { inherit pname version; - sha256 = "d77901d748287d15281f5ffe5b0fef62dd38f357c2b827c44ff07f35695f4e7e"; + sha256 = "9769e3d2952e211b1245f1d0dfdbfbdde1f7779a3953832b7dd2b88a21ca6cc6"; }; checkInputs = [ glibcLocales ]; From 0839dece4f99586138a702f08c66661e3b30b953 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:33 +0200 Subject: [PATCH 1250/3452] python: tasklib: 1.3.0 -> 2.1.1 --- pkgs/development/python-modules/tasklib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tasklib/default.nix b/pkgs/development/python-modules/tasklib/default.nix index 9e37df17bf29..a49ba37e91a4 100644 --- a/pkgs/development/python-modules/tasklib/default.nix +++ b/pkgs/development/python-modules/tasklib/default.nix @@ -8,11 +8,11 @@ wsl_stub = writeShellScriptBin "wsl" "true"; in buildPythonPackage rec { pname = "tasklib"; - version = "1.3.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "19yra86g3wz2xgk22dnrjjh3gla969vb8jrps5rf0cdmsm9qqisv"; + sha256 = "e2cfe5073b9d30c564e6c547fdb0f45eb66da5d4d138c20fb87d549315892f2c"; }; propagatedBuildInputs = [ From 039f1daa9fd39a6d6d817ad80389477f3f506f0d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:33 +0200 Subject: [PATCH 1251/3452] python: tbm-utils: 2.5.1 -> 2.6.0 --- pkgs/development/python-modules/tbm-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix index f3199f7e5d11..bb3cd9462068 100644 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "tbm-utils"; - version = "2.5.1"; + version = "2.6.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5909852f8ce350631cdaaecaf0aee45569148d22bd429360a1c92a203ba5706b"; + sha256 = "235748cceeb22c042e32d2fdfd4d710021bac9b938c4f2c35e1fce1cfd58f7ec"; }; propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ]; From 9a9cd60f2a88baf029bce599c6c036e242a018e3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:33 +0200 Subject: [PATCH 1252/3452] python: tempora: 1.14.1 -> 3.0.0 --- pkgs/development/python-modules/tempora/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index ebc79212c25d..d1f40f349f4f 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tempora"; - version = "1.14.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "cb60b1d2b1664104e307f8e5269d7f4acdb077c82e35cd57246ae14a3427d2d6"; + sha256 = "e370d822cf48f5356aab0734ea45807250f5120e291c76712a1d766b49ae34f8"; }; buildInputs = [ setuptools_scm ]; From e3a54f3d54a2e5b2671d8943bef01401e8fc308d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:33 +0200 Subject: [PATCH 1253/3452] python: testtools: 2.3.0 -> 2.4.0 --- pkgs/development/python-modules/testtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index 8264314c96a6..8ef3d9c4320f 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "testtools"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559"; + sha256 = "64c974a6cca4385d05f4bbfa2deca1c39ce88ede31c3448bee86a7259a9a61c8"; }; propagatedBuildInputs = [ pbr python_mimeparse extras unittest2 ]; From 843fa07a49e18f200a1ae00637cad6b7233126d7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:33 +0200 Subject: [PATCH 1254/3452] python: textacy: 0.9.1 -> 0.10.0 --- pkgs/development/python-modules/textacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 9d44ce98898e..2079dc1b9434 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "textacy"; - version = "0.9.1"; + version = "0.10.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1jhj02g6kh5vc0z4az7n547siav3gj5571bqpzdryskj6bsma2z1"; + sha256 = "0a824333f53d19d24ca864c92da52f3fecd412f4ef3e1448864c45f06189fd6d"; }; propagatedBuildInputs = [ From 184c4699605878a94a79fb67ca91cff4be6c1543 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:34 +0200 Subject: [PATCH 1255/3452] python: tifffile: 2019.7.26.2 -> 2020.6.3 --- pkgs/development/python-modules/tifffile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index fbf36b4ef97e..6317f12e8a87 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2019.7.26.2"; + version = "2020.6.3"; src = fetchPypi { inherit pname version; - sha256 = "2abb91c3a23a61593c5635ac1a19f67e732b46291c305fcee0eeaad41181a13f"; + sha256 = "e79403a8b98b0df7ade8d43469151b959fd56239001471fac62beabca6f56377"; }; patches = lib.optional isPy27 ./python2-regex-compat.patch; From 712b2fff3a286e00079cbf580971417d6cab769a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:34 +0200 Subject: [PATCH 1256/3452] python: timezonefinder: 4.2.0 -> 4.4.0 --- pkgs/development/python-modules/timezonefinder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index f4339bbce4a8..895ebd130ea2 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "4.2.0"; + version = "4.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0q8nd279labn03dz17s4xrglk1d31q9y8wcx99l51i5cxx53zsap"; + sha256 = "ccb7ee58f5da4b05eae2154eb615eb791487d3cfeaa2a690877737a898580a9e"; }; propagatedBuildInputs = [ From 9c4413db72751cf8d10900ea8140f9730260a600 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:34 +0200 Subject: [PATCH 1257/3452] python: tld: 0.11.11 -> 0.12.2 --- pkgs/development/python-modules/tld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 1256ee7ff963..a8d00d075142 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -2,11 +2,11 @@ python.pkgs.buildPythonPackage rec { pname = "tld"; - version = "0.11.11"; + version = "0.12.2"; src = fetchPypi { inherit pname version; - sha256 = "72c7170f68ade92a07be43b363afc8e42a98ffa3700d899a984fdbeedb339bac"; + sha256 = "cf8410a7ed7b9477f563fa158dabef5117d8374cba55f65142ba0af6dcd15d4d"; }; propagatedBuildInputs = with python.pkgs; [ six ]; From 2c2d36cfa09df8e94b219cadcf589fd58edf4854 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:34 +0200 Subject: [PATCH 1258/3452] python: tomlkit: 0.5.11 -> 0.6.0 --- pkgs/development/python-modules/tomlkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index deff7769dfb4..2e3a50bfd941 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.5.11"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1kq1663iqxgwrmb883n55ypi5axnixla2hrby9g2x227asifsi7h"; + sha256 = "74f976908030ff164c0aa1edabe3bf83ea004b3daa5b0940b9c86a060c004e9a"; }; propagatedBuildInputs = From 87c13f07495955c3147e5bad7f5f48a76e94e738 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:34 +0200 Subject: [PATCH 1259/3452] python: tox: 3.14.6 -> 3.15.1 --- pkgs/development/python-modules/tox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 7300597c56e1..fe51fe1cad7c 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.14.6"; + version = "3.15.1"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a4a6689045d93c208d77230853b28058b7513f5123647b67bf012f82fa168303"; + sha256 = "8c9ad9b48659d291c5bc78bcabaa4d680d627687154b812fa52baedaa94f9f83"; }; meta = with lib; { From a2f245ffb073a67be40a37965d191cb7866c79cb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:34 +0200 Subject: [PATCH 1260/3452] python: traits: 5.2.0 -> 6.1.0 --- pkgs/development/python-modules/traits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index 5bd849908356..2c343daf5504 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "traits"; - version = "5.2.0"; + version = "6.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1b71vp0l4523428aw098xw6rmkl8vlcy2aag40akijbyz1nnk541"; + sha256 = "97fca523374ae85e3d8fd78af9a9f488aee5e88e8b842e1cfd6d637a6f310fac"; }; # Use pytest because its easier to discover tests From c5d44bdda91f9fe6ec1b45c570a7f3fe27a14de6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:34 +0200 Subject: [PATCH 1261/3452] python: traitsui: 6.1.3 -> 7.0.0 --- pkgs/development/python-modules/traitsui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix index 617ba227c41e..b4d009e630ea 100644 --- a/pkgs/development/python-modules/traitsui/default.nix +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "traitsui"; - version = "6.1.3"; + version = "7.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0kw1xy5ax6l0lzmk7pfzjw6qs0idv78k3118my7cbvw1n5iiff28"; + sha256 = "e569f359a58e4567b14265abe89b3de4b0f95bbbf8f491a9a7d45219628735ec"; }; propagatedBuildInputs = [ traits pyface six ]; From 37cd52eaf580511f1a45c59ad6a20a776f62ac0a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:34 +0200 Subject: [PATCH 1262/3452] python: transitions: 0.7.2 -> 0.8.1 --- pkgs/development/python-modules/transitions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index e292c77c8c86..13eeaf9f805c 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "transitions"; - version = "0.7.2"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "5566c9d32e438ee9eb1f046e3ac1a0b2689f32807b47859210162084d4c84ab7"; + sha256 = "2b8cf2078ed189ffbb0f29421798d7a63ff0d7823682a0d69c01bd8240363cac"; }; postPatch = '' From bf08f19873cd4173ac24fdc233fa09cbe29e0710 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:34 +0200 Subject: [PATCH 1263/3452] python: trezor_agent: 0.10.0 -> 0.11.0 --- pkgs/development/python-modules/trezor_agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix index 2c254aa25bbf..82cb14b31cb1 100644 --- a/pkgs/development/python-modules/trezor_agent/default.nix +++ b/pkgs/development/python-modules/trezor_agent/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "trezor_agent"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "e82bf000c1178b1a7612f2a90487eb34c6234d2edb15dc8e310ad875d8298690"; + sha256 = "139d917d6495bf290bcc21da457f84ccd2e74c78b4d59a649e0cdde4288cd20c"; }; propagatedBuildInputs = [ setuptools trezor libagent ecdsa ed25519 mnemonic keepkey semver wheel pinentry ]; From fa6a40c178b3fc5963d5e04b42384def5a00447a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:34 +0200 Subject: [PATCH 1264/3452] python: trio: 0.13.0 -> 0.15.1 --- pkgs/development/python-modules/trio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 135142529a95..9a63850e53e7 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "trio"; - version = "0.13.0"; + version = "0.15.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "f1cf00054ad974c86d9b7afa187a65d79fd5995340abe01e8e4784d86f4acb30"; + sha256 = "3010864ab8d8b2ae44d3bc97b0e8924d8f5170bf32f07c7638a930a129687f33"; }; checkInputs = [ astor pytest pyopenssl trustme jedi pylint yapf ]; From 325d5f073261a1890ff729f394c7162f1cfc5632 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:34 +0200 Subject: [PATCH 1265/3452] python: tvdb_api: 2.0 -> 3.0.2 --- pkgs/development/python-modules/tvdb_api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tvdb_api/default.nix b/pkgs/development/python-modules/tvdb_api/default.nix index 6c298dce7c7b..beabc8c23106 100644 --- a/pkgs/development/python-modules/tvdb_api/default.nix +++ b/pkgs/development/python-modules/tvdb_api/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "tvdb_api"; - version = "2.0"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "b1de28a5100121d91b1f6a8ec7e86f2c4bdf48fb22fab3c6fe21e7fb7346bf8f"; + sha256 = "6a0135815cb680da38d78121d4d659d8e54a25f4db2816cd86d62916b92f23b2"; }; propagatedBuildInputs = [ requests-cache ]; From 31209f7358bf519ebc4eca3a25785988f473cad6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:35 +0200 Subject: [PATCH 1266/3452] python: Twiggy: 0.4.7 -> 0.5.0 --- pkgs/development/python-modules/twiggy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twiggy/default.nix b/pkgs/development/python-modules/twiggy/default.nix index 6c502ebe011c..01cd945fdc40 100644 --- a/pkgs/development/python-modules/twiggy/default.nix +++ b/pkgs/development/python-modules/twiggy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Twiggy"; - version = "0.4.7"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "44d8aa51110efaab0712b5ec2b015149ad4f28e28f729004aac45d0ad8e19be0"; + sha256 = "259ae96cb22e80c49e75c37dc2f7497028c5dc19018958f05fa00ec08fc2569f"; }; doCheck = false; From 13b389ebd369543546b1a57230fa4096fb60791a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:35 +0200 Subject: [PATCH 1267/3452] python: twill: 1.8.0 -> 2.0 --- pkgs/development/python-modules/twill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index e11d7392e1c0..15953a923b81 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -1,13 +1,13 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, nose }: buildPythonPackage rec { pname = "twill"; - version = "1.8.0"; + version = "2.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "d63e8b09aa4f6645571c70cd3ba47a911abbae4d7baa4b38fc7eb72f6cfda188"; + sha256 = "225e114da85555d50433a1e242ed4215fe613c30072d13fbe4c4aacf0ad53b0a"; }; checkInputs = [ nose ]; From 98cc47c44c4f479b673346184f19cf084cb82fce Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:35 +0200 Subject: [PATCH 1268/3452] python: txaio: 18.8.1 -> 20.4.1 --- pkgs/development/python-modules/txaio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 7fb1b9e5b5cd..efadddade1e1 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "txaio"; - version = "18.8.1"; + version = "20.4.1"; src = fetchPypi { inherit pname version; - sha256 = "67e360ac73b12c52058219bb5f8b3ed4105d2636707a36a7cdafb56fe06db7fe"; + sha256 = "17938f2bca4a9cabce61346758e482ca4e600160cbc28e861493eac74a19539d"; }; checkInputs = [ pytest mock ]; From 9993c38682d2889b784c845145d7b00c1fb126ec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:35 +0200 Subject: [PATCH 1269/3452] python: typeguard: 2.7.1 -> 2.8.0 --- pkgs/development/python-modules/typeguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 042bd2e76547..da75b7f18dca 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.7.1"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "2d545c71e9439c21bcd7c28f5f55b3606e6106f7031ab58375656a1aed483ef2"; + sha256 = "e718f493d805d596cba238a61aa83b874530a333783ca9d597fe5bf27143f042"; }; buildInputs = [ setuptools_scm ]; From fff2887cd412e264f7a35a75c376ba6f69540898 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:35 +0200 Subject: [PATCH 1270/3452] python: tzlocal: 2.0.0 -> 2.1 --- pkgs/development/python-modules/tzlocal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index f10f76d53cf3..e5ab11595303 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "2.0.0"; + version = "2.1"; propagatedBuildInputs = [ pytz ]; src = fetchPypi { inherit pname version; - sha256 = "949b9dd5ba4be17190a80c0268167d7e6c92c62b30026cf9764caf3e308e5590"; + sha256 = "643c97c5294aedc737780a49d9df30889321cbe1204eac2c2ec6134035a92e44"; }; # test fail (timezone test fail) From 2429e617cb129e9b945d89c104da40f533c656cf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:35 +0200 Subject: [PATCH 1271/3452] python: u-msgpack-python: 2.5.2 -> 2.6.0 --- pkgs/development/python-modules/u-msgpack-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix index 93cd1a21a94d..a41351916b74 100644 --- a/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "u-msgpack-python"; - version = "2.5.2"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "09c85a8af77376034396681e76bf30c249a4fd8e5ebb239f8a468d3655f210d0"; + sha256 = "754edb07eaee39a9686a99823892e3a1be4e0948d9cc5c717946750c27643c9c"; }; LC_ALL="en_US.UTF-8"; From ccdacfab6ad89573b90f8d6325d47b28d87e2f7d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:35 +0200 Subject: [PATCH 1272/3452] python: uarray: 0.5.1 -> 0.6.0 --- pkgs/development/python-modules/uarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index 7e03017ce56b..37ba1ab25e2f 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "uarray"; - version = "0.5.1"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0j2pin54pwm1vdgza8irxcjb2za7h41c0ils04afssdn59cixslx"; + sha256 = "fa63ae7034833a99bc1628d3cd5501d4d00f2e6437b6cbe73f710dcf212a6bea"; }; doCheck = false; # currently has circular dependency module import, remove when bumping to >0.5.1 From e5751137dbb4bb888ede4bf46329505d90856262 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:35 +0200 Subject: [PATCH 1273/3452] python: ujson: 1.35 -> 3.0.0 --- pkgs/development/python-modules/ujson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index d60ec743032e..ac5f122068ac 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "1.35"; + version = "3.0.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "11jz5wi7mbgqcsz52iqhpyykiaasila4lq8cmc2d54bfa3jp6q7n"; + sha256 = "e0199849d61cc6418f94d52a314c6a27524d65e82174d2a043fb718f73d1520d"; }; meta = with stdenv.lib; { From 03306f4c0df0d0baa98c2b6ea99030add82f3889 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:35 +0200 Subject: [PATCH 1274/3452] python: uncompyle6: 3.6.7 -> 3.7.0 --- pkgs/development/python-modules/uncompyle6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index fd76813ea712..535f0f03c3e6 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.6.7"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "6f5ae93cfb0ccf22b6b10b608c982bc0fa9bed2481ead57242c02ac64a573db7"; + sha256 = "cb0d5dd28ed6b82da17bcb29b84f5823dc8398d9dafb0e4ee8e6f958db220134"; }; checkInputs = [ nose pytest hypothesis six ]; From e4beafdd55466072d49f378aab44900589c1a09f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:35 +0200 Subject: [PATCH 1275/3452] python: unittest-xml-reporting: 2.5.2 -> 3.0.2 --- .../python-modules/unittest-xml-reporting/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index f39876d6396a..4481aedfaf91 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "unittest-xml-reporting"; - version = "2.5.2"; + version = "3.0.2"; propagatedBuildInputs = [six]; @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "9d28ddf6524cf0ff9293f61bd12e792de298f8561a5c945acea63fb437789e0e"; + sha256 = "e09b8ae70cce9904cdd331f53bf929150962869a5324ab7ff3dd6c8b87e01f7d"; }; meta = with lib; { homepage = "https://github.com/xmlrunner/unittest-xml-reporting/tree/master/"; From 9e9ee272d14d931d69b83547aa05b29c766a31db Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:36 +0200 Subject: [PATCH 1276/3452] python: us: 1.0.0 -> 2.0.2 --- pkgs/development/python-modules/us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/us/default.nix b/pkgs/development/python-modules/us/default.nix index 307f6fd75245..4e7d97068f25 100644 --- a/pkgs/development/python-modules/us/default.nix +++ b/pkgs/development/python-modules/us/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "us"; - version = "1.0.0"; + version = "2.0.2"; propagatedBuildInputs = [ jellyfish ]; src = fetchPypi { inherit pname version; - sha256 = "1niglalkp7pinibzbxjdz9mxx9qmwkrh8884dag3kr72cfkrpp09"; + sha256 = "cb11ad0d43deff3a1c3690c74f0c731cff5b862c73339df2edd91133e1496fbc"; }; # Upstream requires jellyfish==0.5.6 but we have 0.6.1 From 1ac403cd4a6b0d24c21f233079237615625cea00 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:36 +0200 Subject: [PATCH 1277/3452] python: validators: 0.14.3 -> 0.15.0 --- pkgs/development/python-modules/validators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index b9be035135fb..cc62eb37df78 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "validators"; - version = "0.14.3"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "6a0d9502219aee486f1ee12d8a9635e4a56f3dbcfa204b4e0de3a038ae35f34f"; + sha256 = "31e8bb01b48b48940a021b8a9576b840f98fa06b91762ef921d02cb96d38727a"; }; propagatedBuildInputs = [ From 5f0d149848e8612f2c0765a90816318f8112a49e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:36 +0200 Subject: [PATCH 1278/3452] python: vcrpy: 3.0.0 -> 4.0.2 --- pkgs/development/python-modules/vcrpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index ddd4015aad1e..0dd88ba19798 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "3.0.0"; + version = "4.0.2"; src = fetchPypi { inherit pname version; - sha256 = "21168d5ae14263a833d4b71acfd8278d8841114f24be1b4ab4a5719d0c7f07bc"; + sha256 = "9740c5b1b63626ec55cefb415259a2c77ce00751e97b0f7f214037baaf13c7bf"; }; checkInputs = [ From 3eba59e24fae1e135ec4a731e66a7c11406f6a8f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:36 +0200 Subject: [PATCH 1279/3452] python: vega: 2.6.0 -> 3.4.0 --- pkgs/development/python-modules/vega/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 4bd3f1b99318..6f445e9474e4 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "vega"; - version = "2.6.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "c66354d6d164cc3d7254bcd129d8d861daf4a9e9cb8738b1724791777f6c29f0"; + sha256 = "f343ceb11add58d24cd320d69e410b111a56c98c9069ebb4ef89c608c4c1950d"; }; buildInputs = [ pytest ]; From afb1fcac60976eaf31145e9b68aed3d2ab51fc42 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:36 +0200 Subject: [PATCH 1280/3452] python: PyVirtualDisplay: 0.2.5 -> 1.3.2 --- pkgs/development/python-modules/virtual-display/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix index 1b56f0466106..958f8a01704c 100644 --- a/pkgs/development/python-modules/virtual-display/default.nix +++ b/pkgs/development/python-modules/virtual-display/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "PyVirtualDisplay"; - version = "0.2.5"; + version = "1.3.2"; propagatedBuildInputs = [ EasyProcess ]; src = fetchPypi { inherit pname version; - sha256 = "5b267c8ffc98fcbd084ba852ab4caef3f22e9362bc5d117e1697e767553eaf41"; + sha256 = "3fa85a6e490e45eab64e6be19841e0ab15ec8054c97f162079a061da6a93eba0"; }; # requires X server From 05efc2fff2f8fa0b86d88c3f91fbaca198a8849c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:36 +0200 Subject: [PATCH 1281/3452] python: waitress: 1.3.1 -> 1.4.4 --- pkgs/development/python-modules/waitress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index 72da3204a646..3812ed06b60c 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "waitress"; - version = "1.3.1"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "278e09d6849acc1365404bbf7d790d0423b159802e850c726e8cd0a126a2dac7"; + sha256 = "1bb436508a7487ac6cb097ae7a7fe5413aefca610550baf58f0940e51ecfb261"; }; doCheck = false; From 3b01e937bdcc6945fa39d780c64bf850366f0e5d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:36 +0200 Subject: [PATCH 1282/3452] python: wcwidth: 0.1.9 -> 0.2.3 --- pkgs/development/python-modules/wcwidth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index 30b966cdf8c8..b51e13df2e83 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "wcwidth"; - version = "0.1.9"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "ee73862862a156bf77ff92b09034fc4825dd3af9cf81bc5b360668d425f3c5f1"; + sha256 = "edbc2b718b4db6cdf393eefe3a420183947d6aa312505ce6754516f458ff8830"; }; checkInputs = [ pytest ]; From f28611be89af7d86b1bebbb5ae8d5ef9717c8931 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:36 +0200 Subject: [PATCH 1283/3452] python: web.py: 0.40 -> 0.51 --- pkgs/development/python-modules/web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix index ea1ffc7826fb..6749ed2b8386 100644 --- a/pkgs/development/python-modules/web/default.nix +++ b/pkgs/development/python-modules/web/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.40"; + version = "0.51"; pname = "web.py"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "dc5e42ffbc42d77d07f75b7acca9975a3368ae609774e49ddebb497a784131f3"; + sha256 = "b50343941360984d37270186453bb897d13630028a739394fedf38f9cde2fd07"; }; meta = with stdenv.lib; { From 17da84a49151133e88106920d800b03cd25097f7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:36 +0200 Subject: [PATCH 1284/3452] python: webcolors: 1.10 -> 1.11.1 --- pkgs/development/python-modules/webcolors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix index e0e2f97501be..4acc5a369b0a 100644 --- a/pkgs/development/python-modules/webcolors/default.nix +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "webcolors"; - version = "1.10"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "7b11194c414dcf4b9bd8fb5ceaafc9da183b27430883c62f620589eb79b91b6e"; + sha256 = "76f360636957d1c976db7466bc71dcb713bb95ac8911944dffc55c01cb516de6"; }; propagatedBuildInputs = [ six ]; From 324a854215c408ae3e2ae83793f0aa8bea396506 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:36 +0200 Subject: [PATCH 1285/3452] python: websocket_client: 0.56.0 -> 0.57.0 --- pkgs/development/python-modules/websocket_client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/websocket_client/default.nix b/pkgs/development/python-modules/websocket_client/default.nix index ad830a0890ae..dacae3e81e1f 100644 --- a/pkgs/development/python-modules/websocket_client/default.nix +++ b/pkgs/development/python-modules/websocket_client/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "0.56.0"; + version = "0.57.0"; pname = "websocket_client"; src = fetchPypi { inherit pname version; - sha256 = "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z"; + sha256 = "d735b91d6d1692a6a181f2a8c9e0238e5f6373356f561bb9dc4c7af36f452010"; }; propagatedBuildInputs = [ From c658299bb5d6b2cb4fa8034c5e884ff0e24b53ca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:37 +0200 Subject: [PATCH 1286/3452] python: Werkzeug: 0.16.1 -> 1.0.1 --- pkgs/development/python-modules/werkzeug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 5e0d6df0af0d..c3778609e576 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Werkzeug"; - version = "0.16.1"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "b353856d37dec59d6511359f97f6a4b2468442e454bd1c98298ddce53cac1f04"; + sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; }; propagatedBuildInputs = [ itsdangerous ]; From 4a720aa5fe6d75173661059905c053994c59997c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:37 +0200 Subject: [PATCH 1287/3452] python: whitenoise: 5.0.1 -> 5.1.0 --- pkgs/development/python-modules/whitenoise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index 9ef4fd14979d..cf24f7fb1d3a 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "whitenoise"; - version = "5.0.1"; + version = "5.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0f9137f74bd95fa54329ace88d8dc695fbe895369a632e35f7a136e003e41d73"; + sha256 = "60154b976a13901414a25b0273a841145f77eb34a141f9ae032a0ace3e4d5b27"; }; # No tests From 900251bed138e43b8793899b16e976048dbaf4ec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:37 +0200 Subject: [PATCH 1288/3452] python: word2vec: 0.10.6 -> 0.11.1 --- pkgs/development/python-modules/word2vec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index 77cea74f6691..367c299a70c7 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "word2vec"; - version = "0.10.6"; + version = "0.11.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "95aa222ff2d5c2559192414b794870d14a022016ba83f1bef0cf8cc185e41483"; + sha256 = "222d8ffb47f385c43eba45e3f308e605fc9736b2b7137d74979adf1a31e7c8b4"; }; propagatedBuildInputs = [ cython numpy scikitlearn six ]; From 19e34f1a0c28c1733e4e86e1f37667cf402df917 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:37 +0200 Subject: [PATCH 1289/3452] python: wptserve: 2.0 -> 3.0 --- pkgs/development/python-modules/wptserve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix index 65e3669734f6..7caf36fa6b2b 100644 --- a/pkgs/development/python-modules/wptserve/default.nix +++ b/pkgs/development/python-modules/wptserve/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "wptserve"; - version = "2.0"; + version = "3.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9d0c6adc279748abea81ac12b7a2cac97ebbdd87826dc11f6dbd85b781e9442a"; + sha256 = "11990a92b07e4535c2723c34a88bd905c66acec9cda6efa7a7b61371bfe8d87a"; }; postPatch = '' From e4ad125b41e77867905df86c3c1c5b1cba87be56 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:37 +0200 Subject: [PATCH 1290/3452] python: wrapt: 1.11.2 -> 1.12.1 --- pkgs/development/python-modules/wrapt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index a380e6ac3798..0d5376e10047 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "wrapt"; - version = "1.11.2"; + version = "1.12.1"; # No tests in archive doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1"; + sha256 = "b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7"; }; meta = { From f4034c4bed767dff2d92a5898bcda80d09db79b0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:37 +0200 Subject: [PATCH 1291/3452] python: xml2rfc: 2.41.0 -> 2.45.2 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index b2bd5af56c8c..960c544740cc 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.41.0"; + version = "2.45.2"; src = fetchPypi { inherit pname version; - sha256 = "0xmhgn62a8a7282yd003zz63mrgyajb6sg29bfyllx3mxmdlb0iz"; + sha256 = "16e4d27040f7cb10171fb747e0193ff71b035597c63837133beee6ce4ba6ad6e"; }; propagatedBuildInputs = [ From c68730872b2ae8da8b48149181f903629c23f18b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:37 +0200 Subject: [PATCH 1292/3452] python: yapf: 0.29.0 -> 0.30.0 --- pkgs/development/python-modules/yapf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index f4e154f2cbcd..65a4e9abcb29 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.29.0"; + version = "0.30.0"; src = fetchPypi { inherit pname version; - sha256 = "712e23c468506bf12cadd10169f852572ecc61b266258422d45aaf4ad7ef43de"; + sha256 = "3000abee4c28daebad55da6c85f3cd07b8062ce48e2e9943c8da1b9667d48427"; }; meta = with stdenv.lib; { From 5aeb36ac1a972ca59b27ac22aa925d803d600d2b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:37 +0200 Subject: [PATCH 1293/3452] python: yattag: 1.12.2 -> 1.13.2 --- pkgs/development/python-modules/yattag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index 32b378ddd57b..f9b597e9f785 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yattag"; - version = "1.12.2"; + version = "1.13.2"; src = fetchPypi { inherit pname version; - sha256 = "1g0zhf09vs8cq0l5lx10dnqpimvg5mzh9k0z12n6nnfsw11cila7"; + sha256 = "41c1182f81e69bc53d8763c5bb9d27f54ae05ce581ee4e41c7931cc2f2479262"; }; meta = with lib; { From 2989bc70ec94af346356a0cea1d1fde632e4e5c2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:37 +0200 Subject: [PATCH 1294/3452] python: yt: 3.5.1 -> 3.6.0 --- pkgs/development/python-modules/yt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yt/default.nix b/pkgs/development/python-modules/yt/default.nix index ce89ec0fd3d4..353400120f3c 100644 --- a/pkgs/development/python-modules/yt/default.nix +++ b/pkgs/development/python-modules/yt/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "yt"; - version = "3.5.1"; + version = "3.6.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c8ef8eceb934dc189d63dc336109fad3002140a9a32b19f38d1812d5d5a30d71"; + sha256 = "effb00536f19fd2bdc18f67dacd5550b82066a6adce5b928f27a01d7505109ec"; }; buildInputs = [ From 4d12357dee75fde389735b517293cbb099a26cd2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:37 +0200 Subject: [PATCH 1295/3452] python: yubico-client: 1.12.0 -> 1.13.0 --- pkgs/development/python-modules/yubico-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yubico-client/default.nix b/pkgs/development/python-modules/yubico-client/default.nix index f679c54f96ca..e8457055c180 100644 --- a/pkgs/development/python-modules/yubico-client/default.nix +++ b/pkgs/development/python-modules/yubico-client/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yubico-client"; - version = "1.12.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "1d74c6341210c94b639f7c7c8930550e73d5c1be60402e418e9dc95e038f8527"; + sha256 = "e3b86cd2a123105edfacad40551c7b26e9c1193d81ffe168ee704ebfd3d11162"; }; propagatedBuildInputs = [ requests ]; From e5a6b00f82363b52c4333402b7397e627c524745 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:37 +0200 Subject: [PATCH 1296/3452] python: zarr: 2.3.2 -> 2.4.0 --- pkgs/development/python-modules/zarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index ac7c2b6af010..d7d1df5993b7 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.3.2"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "c62d0158fb287151c978904935a177b3d2d318dea3057cfbeac8541915dfa105"; + sha256 = "53aa21b989a47ddc5e916eaff6115b824c0864444b1c6f3aaf4f6cf9a51ed608"; }; nativeBuildInputs = [ From 9898902d9fc82962499e2ccdb5aa23c01b428d63 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:38 +0200 Subject: [PATCH 1297/3452] python: zeroconf: 0.26.3 -> 0.27.1 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index e9d3c6e038ea..1e51db1ab528 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.26.3"; + version = "0.27.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "43ad5006c00be2040cdca1fe768206f4a25356d3cc87eff8b66bd7ead2a82440"; + sha256 = "51a8bc581036cabcf82523c81b72f6a11b2c7913eb7eb418b6dad60cd40f9ef2"; }; propagatedBuildInputs = [ ifaddr ] From 1e2a6e992f26a354caf59de1f1026ac9d3c4c9d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:38 +0200 Subject: [PATCH 1298/3452] python: zict: 1.0.0 -> 2.0.0 --- pkgs/development/python-modules/zict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index 9208b54981bc..0aa379322ee6 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zict"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "04532600mnsvzv43l2jvjrn7sflg0wkjqzy7nj7m3vvxm5gd4kg3"; + sha256 = "8e2969797627c8a663575c2fc6fcb53a05e37cdb83ee65f341fc6e0c3d0ced16"; }; buildInputs = [ pytest ]; From 828e43f785bc2d8b695f6ab011c76168bd5d02ee Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:38 +0200 Subject: [PATCH 1299/3452] python: zigpy-deconz: 0.7.0 -> 0.9.2 --- pkgs/development/python-modules/zigpy-deconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index c9df7824093f..80667cf6ec50 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.7.0"; + version = "0.9.2"; nativeBuildInputs = [ pytest ]; buildInputs = [ aiohttp crccheck pycryptodome ]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "049k6lvgf6yjkinbbzm7gqrzqljk2ky9kfw8n53x8kjyfmfp71i2"; + sha256 = "f4256136d714c00d22f6d2abf975438e2bc080cc43b8afef0decb80ed8066ef6"; }; meta = with stdenv.lib; { From 0f6a55aec257db09d5c839b039f853fb9c73dbdd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:38 +0200 Subject: [PATCH 1300/3452] python: zigpy-homeassistant: 0.11.0 -> 0.19.0 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 726f1fde4e64..dfe1a5c547da 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "zigpy-homeassistant"; - version = "0.11.0"; + version = "0.19.0"; nativeBuildInputs = [ pytest pytest-asyncio asynctest ]; buildInputs = [ aiohttp pycryptodome ]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "021wg9yhz8dsif60r8s5621mf63bsayjjb2bimhq0am03ql0fysl"; + sha256 = "779cff7affb86b7141aa641c188342b22be0ec766adee0d180c93e74e2b10adc"; }; meta = with stdenv.lib; { From 2a3f9bc1216c8b11f5990289cf9e23c73deaea3f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:38 +0200 Subject: [PATCH 1301/3452] python: zipp: 0.6.0 -> 3.1.0 --- pkgs/development/python-modules/zipp/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 13cb2131a4d7..5d4bc589d361 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -5,18 +5,19 @@ , pytest , pytest-flake8 , more-itertools +, toml }: buildPythonPackage rec { pname = "zipp"; - version = "0.6.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e"; + sha256 = "c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm toml ]; propagatedBuildInputs = [ more-itertools ]; From b74a99728b4d449fe16c5ead57a92568f934af85 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:38 +0200 Subject: [PATCH 1302/3452] python: zope.configuration: 4.3.1 -> 4.4.0 --- .../development/python-modules/zope_configuration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix index 664aa0af6e88..587cbf60d88c 100644 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ b/pkgs/development/python-modules/zope_configuration/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.configuration"; - version = "4.3.1"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "6e16747f9fd6b9d8f09d78edf2a6f539cad0fa4ad49d8deb9cf63447cc4168e1"; + sha256 = "e9f02bac44405ad1526399d6574b91d792f9694f9c67df8b64e91fe10fcddb3c"; }; checkInputs = [ zope_testrunner manuel ]; From 94f5f782b1d6cafcfefce9236ddda3ab3915cea0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:38 +0200 Subject: [PATCH 1303/3452] python: zope.filerepresentation: 4.2.0 -> 5.0.0 --- .../python-modules/zope_filerepresentation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_filerepresentation/default.nix b/pkgs/development/python-modules/zope_filerepresentation/default.nix index 0a7e959e11fe..82a981402ebe 100644 --- a/pkgs/development/python-modules/zope_filerepresentation/default.nix +++ b/pkgs/development/python-modules/zope_filerepresentation/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.filerepresentation"; - version = "4.2.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "c9bff2b2492b2fe716ee54538441a98d6145d1de87dd921eaa44ac834fbb63b6"; + sha256 = "3fbca4730c871d8e37b9730763c42b69ba44117cf6d0848014495bb301cae2d6"; }; propagatedBuildInputs = [ zope_schema ]; From 3e28db9eb8d58ccadf0b45415df349338fa46614 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 6 Jun 2020 08:47:38 +0200 Subject: [PATCH 1304/3452] python: zope.schema: 4.9.3 -> 6.0.0 --- pkgs/development/python-modules/zope_schema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix index 8ecbf0a9907b..d32fb05ef94a 100644 --- a/pkgs/development/python-modules/zope_schema/default.nix +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.schema"; - version = "4.9.3"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "2d971da8707cab47b1916534b9929dcd9d7f23aed790e6b4cbe3103d5b18069d"; + sha256 = "20fbbce8a0726ba34f0e3958676498feebb818f06575193254e139d8d7214f26"; }; propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ]; From 5c08320af6ed0f19b42fe970ac7d5fede1233891 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 09:33:46 +0200 Subject: [PATCH 1305/3452] python.pkgs.pycodestyle: fixup tests --- .../python-modules/pycodestyle/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index cb3fd12a4b19..e1d21a6a2eb1 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -1,6 +1,7 @@ { buildPythonPackage , fetchPypi , lib +, python }: buildPythonPackage rec { @@ -12,12 +13,14 @@ buildPythonPackage rec { sha256 = "c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e"; }; + dontUseSetuptoolsCheck = true; + # https://github.com/PyCQA/pycodestyle/blob/2.5.0/tox.ini#L14 checkPhase = '' - python pycodestyle.py --max-doc-length=72 --testsuite testsuite - python pycodestyle.py --statistics pycodestyle.py - python pycodestyle.py --max-doc-length=72 --doctest - python setup.py test + ${python.interpreter} pycodestyle.py --max-doc-length=72 --testsuite testsuite + ${python.interpreter} pycodestyle.py --statistics pycodestyle.py + ${python.interpreter} pycodestyle.py --max-doc-length=72 --doctest + ${python.interpreter} -m unittest discover testsuite -vv ''; meta = with lib; { From 07cc118adb026509c9853742269f663ba89f27be Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 09:37:42 +0200 Subject: [PATCH 1306/3452] python2.pkgs.zipp: init at 1.0.0 --- pkgs/development/python-modules/zipp/1.nix | 38 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 ++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/zipp/1.nix diff --git a/pkgs/development/python-modules/zipp/1.nix b/pkgs/development/python-modules/zipp/1.nix new file mode 100644 index 000000000000..d7447a26159e --- /dev/null +++ b/pkgs/development/python-modules/zipp/1.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pytest +, pytest-flake8 +, more-itertools +, toml +}: + +buildPythonPackage rec { + pname = "zipp"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0v3qayhqv7vyzydpydwcp51bqciw8p2ajddw68x5k8zppc0vx3yk"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ more-itertools ]; + + checkInputs = [ pytest pytest-flake8 ]; + + checkPhase = '' + pytest + ''; + + # Prevent infinite recursion with pytest + doCheck = false; + + meta = with lib; { + description = "Pathlib-compatible object wrapper for zip files"; + homepage = "https://github.com/jaraco/zipp"; + license = licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0aa27ff933ea..f16c0110a63d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6493,7 +6493,10 @@ in { zha-quirks = callPackage ../development/python-modules/zha-quirks { }; - zipp = callPackage ../development/python-modules/zipp { }; + zipp = if pythonOlder "3.6" then + callPackage ../development/python-modules/zipp/1.nix { } + else + callPackage ../development/python-modules/zipp { }; zope_broken = callPackage ../development/python-modules/zope_broken { }; From 953f66dcc7f8e59e6ead6c0027f339564f6ad8f4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 09:42:41 +0200 Subject: [PATCH 1307/3452] awscli: 1.18.56 -> 1.18.74 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 7acfd7c710e9..56cafb2cec21 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -19,11 +19,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.56"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.74"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "3a442ea0d18d8a60228f1115850b5b8bdc739cd436d34a279bdf711fb918aaa0"; + sha256 = "1681945m9wxzqx4yv09zxskkbs2fd8rz1r3krjpwrpar3iiq1nmj"; }; postPatch = '' From b1d78acc034572753bd5175a69d7dfaf29d3abb3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 09:48:12 +0200 Subject: [PATCH 1308/3452] python2.pkgs.jaraco_stream: keep at 2.0 for python 2 --- pkgs/development/python-modules/jaraco_stream/2.nix | 13 +++++++++++++ pkgs/top-level/python-packages.nix | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/jaraco_stream/2.nix diff --git a/pkgs/development/python-modules/jaraco_stream/2.nix b/pkgs/development/python-modules/jaraco_stream/2.nix new file mode 100644 index 000000000000..e1737083c86c --- /dev/null +++ b/pkgs/development/python-modules/jaraco_stream/2.nix @@ -0,0 +1,13 @@ +{ buildPythonPackage, fetchPypi, setuptools_scm, six }: + +buildPythonPackage rec { + pname = "jaraco.stream"; + version = "2.0"; + src = fetchPypi { + inherit pname version; + sha256 = "196synw4g76yagcflmavi7wakf5cdgsflmvbj7zs616gv03xbsf2"; + }; + doCheck = false; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ six ]; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f16c0110a63d..c5d030e0697f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7041,7 +7041,10 @@ in { jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; - jaraco_stream = callPackage ../development/python-modules/jaraco_stream { }; + jaraco_stream = if pythonOlder "3.6" + then callPackage ../development/python-modules/jaraco_stream/2.nix { } + else + callPackage ../development/python-modules/jaraco_stream { }; javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { }; From 91e035056a9478f8a164ddab6f9a25c1e725a2f3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 09:50:43 +0200 Subject: [PATCH 1309/3452] python2.pkgs.jaraco_functools: keep at 2.0 for python 2 --- .../python-modules/jaraco_functools/2.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/jaraco_functools/2.nix diff --git a/pkgs/development/python-modules/jaraco_functools/2.nix b/pkgs/development/python-modules/jaraco_functools/2.nix new file mode 100644 index 000000000000..e0bbde47d250 --- /dev/null +++ b/pkgs/development/python-modules/jaraco_functools/2.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi +, setuptools_scm +, more-itertools, backports_functools_lru_cache }: + +buildPythonPackage rec { + pname = "jaraco.functools"; + version = "2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ickpwvvdrlbm477gdzfjfcbgmfia9ksm9a3i3pbx9xia97r9fim"; + }; + + propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; + + doCheck = false; + + buildInputs = [ setuptools_scm ]; + + meta = with lib; { + description = "Additional functools in the spirit of stdlib's functools"; + homepage = "https://github.com/jaraco/jaraco.functools"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c5d030e0697f..bca892f06c3e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7037,7 +7037,10 @@ in { morphys = callPackage ../development/python-modules/morphys { }; - jaraco_functools = callPackage ../development/python-modules/jaraco_functools { }; + jaraco_functools = if pythonOlder "3.6" then + callPackage ../development/python-modules/jaraco_functools/2.nix { } + else + callPackage ../development/python-modules/jaraco_functools { }; jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; From 9dfb5e415515b1ddc438fc60e966612bd228be59 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 10:02:16 +0200 Subject: [PATCH 1310/3452] python2.pkgs.configparser: keep at 4.0.2 for python 2 --- .../python-modules/configparser/4.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/configparser/4.nix diff --git a/pkgs/development/python-modules/configparser/4.nix b/pkgs/development/python-modules/configparser/4.nix new file mode 100644 index 000000000000..038ee49d2c60 --- /dev/null +++ b/pkgs/development/python-modules/configparser/4.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: + +buildPythonPackage rec { + pname = "configparser"; + version = "4.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "c7d282687a5308319bf3d2e7706e575c635b0a470342641c93bea0ea3b5331df"; + }; + + # No tests available + doCheck = false; + + nativeBuildInputs = [ setuptools_scm ]; + + preConfigure = '' + export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 + ''; + + meta = with stdenv.lib; { + description = "Updated configparser from Python 3.7 for Python 2.6+."; + license = licenses.mit; + homepage = "https://github.com/jaraco/configparser"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bca892f06c3e..82ac287b918e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2278,7 +2278,10 @@ in { colander = callPackage ../development/python-modules/colander { }; # Backported version of the ConfigParser library of Python 3.3 - configparser = callPackage ../development/python-modules/configparser { }; + configparser = if pythonOlder "3.6" then + callPackage ../development/python-modules/configparser/4.nix { } + else + callPackage ../development/python-modules/configparser { }; ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { }; From 163cd1ae01303104f08068908aca5e3a6807f6c7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 10:11:18 +0200 Subject: [PATCH 1311/3452] python3.pkgs.nltk: fixup build --- pkgs/development/python-modules/nltk/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index cdbf2c49af80..298b32ed8b8e 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,4 +1,9 @@ -{ fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k }: +{ fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k +, click +, joblib +, regex +, tqdm +}: buildPythonPackage rec { version = "3.5"; @@ -10,7 +15,12 @@ buildPythonPackage rec { sha256 = "845365449cd8c5f9731f7cb9f8bd6fd0767553b9d53af9eb1b3abf7700936b35"; }; - propagatedBuildInputs = [ six ] ++ lib.optional (!isPy3k) singledispatch; + propagatedBuildInputs = [ + click + joblib + regex + tqdm + ] ++ lib.optional (!isPy3k) singledispatch; # Tests require some data, the downloading of which is impure. It would # probably make sense to make the data another derivation, but then feeding From b928bbeeee88b7091c5bd9e5df9d258aa4c61cc9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 10:13:10 +0200 Subject: [PATCH 1312/3452] python.pkgs.autopep8: fixup build --- pkgs/development/python-modules/autopep8/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 7b7131f2a7fc..2dabb70197b5 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales }: +{ stdenv, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales +, toml +}: buildPythonPackage rec { pname = "autopep8"; @@ -9,7 +11,7 @@ buildPythonPackage rec { sha256 = "60fd8c4341bab59963dafd5d2a566e94f547e660b9b396f772afe67d8481dbf0"; }; - propagatedBuildInputs = [ pycodestyle ]; + propagatedBuildInputs = [ pycodestyle toml ]; # One test fails: # FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests) From 5146c7b0cf33dea9225e76af5032290e465a2031 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 10:15:35 +0200 Subject: [PATCH 1313/3452] python3.pkgs.markdown: fixup build --- pkgs/development/python-modules/markdown/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index ba77a4264a6b..aa076cddadc1 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -4,6 +4,9 @@ , setuptools , nose , pyyaml +, pythonOlder +, importlib-metadata +, isPy3k }: buildPythonPackage rec { @@ -15,7 +18,13 @@ buildPythonPackage rec { sha256 = "1fafe3f1ecabfb514a5285fca634a53c1b32a81cb0feb154264d55bf2ff22c17"; }; - propagatedBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ + setuptools + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + disabled = !isPy3k; checkInputs = [ nose pyyaml ]; From 1ed7eb71b7bd4fc2b29bb610de167c8376ed8be0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 10:16:32 +0200 Subject: [PATCH 1314/3452] python3.pkgs.configparser: fix build --- pkgs/development/python-modules/configparser/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 046cb0d57d91..7322a6891cd8 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -1,4 +1,6 @@ -{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm }: +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm +, toml +}: buildPythonPackage rec { pname = "configparser"; @@ -12,7 +14,7 @@ buildPythonPackage rec { # No tests available doCheck = false; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm toml ]; preConfigure = '' export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 From f1a4e82a1aaf39133959b57a78c010084f5b3e7d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 10:39:08 +0200 Subject: [PATCH 1315/3452] python.pkgs.wcwidth: fix build --- .../python-modules/wcwidth/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index b51e13df2e83..b93ca1dbb4d0 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchPypi, buildPythonPackage, pytest }: +{ lib, fetchPypi, buildPythonPackage, pytestCheckHook +, isPy3k +, backports_functools_lru_cache +}: buildPythonPackage rec { pname = "wcwidth"; @@ -9,15 +12,15 @@ buildPythonPackage rec { sha256 = "edbc2b718b4db6cdf393eefe3a420183947d6aa312505ce6754516f458ff8830"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; + + propagatedBuildInputs = lib.optionals (!isPy3k) [ + backports_functools_lru_cache + ]; # To prevent infinite recursion with pytest doCheck = false; - checkPhase = '' - pytest - ''; - meta = with lib; { description = "Measures number of Terminal column cells of wide-character codes"; longDescription = '' From 141e15d8e01f5d88150837906ac97f8cf6911603 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 10:39:17 +0200 Subject: [PATCH 1316/3452] python.pkgs.ddt: fix build --- pkgs/development/python-modules/ddt/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix index 94928e684d9d..f993c3844b85 100644 --- a/pkgs/development/python-modules/ddt/default.nix +++ b/pkgs/development/python-modules/ddt/default.nix @@ -1,7 +1,10 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi -, nose, six, pyyaml, mock +, six, pyyaml, mock +, pytestCheckHook +, enum34 +, isPy3k }: buildPythonPackage rec { @@ -13,13 +16,13 @@ buildPythonPackage rec { sha256 = "0595e70d074e5777771a45709e99e9d215552fb1076443a25fad6b23d8bf38da"; }; - checkInputs = [ nose six pyyaml mock ]; + checkInputs = [ six pyyaml mock pytestCheckHook ]; - checkPhase = '' - nosetests -s - ''; + propagatedBuildInputs = lib.optionals (!isPy3k) [ + enum34 + ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Data-Driven/Decorated Tests, a library to multiply test cases"; homepage = "https://github.com/txels/ddt"; license = licenses.mit; From f336f7096877efa27f14390536a72284dec3824a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 10:57:05 +0200 Subject: [PATCH 1317/3452] python.pkgs.pyzmq: disable failing test --- pkgs/development/python-modules/pyzmq/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 834ad4d3d6e8..96c100ace88a 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -30,7 +30,8 @@ buildPythonPackage rec { and not test_callable_check \ and not test_on_recv_basic \ and not test_on_recv_wake \ - and not test_monitor" + and not test_monitor \ + and not test_cython" ''; # Some of the tests use localhost networking. From 1895ef4dbd6d6c293a64fb4a68dc0d023170b094 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 11:14:17 +0200 Subject: [PATCH 1318/3452] python.pkgs.odo: remove broken and unmaintained upstream --- .../python-modules/blaze/default.nix | 2 - .../python-modules/odo/default.nix | 59 ------------------- pkgs/top-level/python-packages.nix | 2 - 3 files changed, 63 deletions(-) delete mode 100644 pkgs/development/python-modules/odo/default.nix diff --git a/pkgs/development/python-modules/blaze/default.nix b/pkgs/development/python-modules/blaze/default.nix index 0707c431f1b4..cff84775aecb 100644 --- a/pkgs/development/python-modules/blaze/default.nix +++ b/pkgs/development/python-modules/blaze/default.nix @@ -12,7 +12,6 @@ , multipledispatch , numba , numpy -, odo , pandas , psutil , pymongo @@ -46,7 +45,6 @@ buildPythonPackage rec { multipledispatch numba numpy - odo pandas psutil pymongo diff --git a/pkgs/development/python-modules/odo/default.nix b/pkgs/development/python-modules/odo/default.nix deleted file mode 100644 index 4badad33a08f..000000000000 --- a/pkgs/development/python-modules/odo/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytest -, datashape -, numpy -, pandas -, toolz -, multipledispatch -, networkx -, dask -}: - -buildPythonPackage rec { - pname = "odo"; - version= "unstable-2018-09-21"; - - src = fetchFromGitHub { - owner = "blaze"; - repo = pname; - rev = "9fce6690b3666160681833540de6c55e922de5eb"; - sha256 = "0givkd5agr05wrf72fbghdaav6gplx7c069ngs1ip385v72ifsl9"; - }; - - checkInputs = [ - pytest - dask - ]; - - propagatedBuildInputs = [ - datashape - numpy - pandas - toolz - multipledispatch - networkx - ]; - - postConfigure = '' - substituteInPlace setup.py \ - --replace "versioneer.get_version()" "'0.5.1'" - ''; - - # disable 6/315 tests - checkPhase = '' - pytest odo -k "not test_insert_to_ooc \ - and not test_datetime_index \ - and not test_different_encoding \ - and not test_numpy_asserts_type_after_dataframe" - ''; - - meta = with lib; { - homepage = "https://github.com/ContinuumIO/odo"; - description = "Data migration utilities"; - license = licenses.bsdOriginal; - maintainers = with maintainers; [ fridh costrouc ]; - broken = true; # no longer compatible with dask>=2.0 - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 82ac287b918e..4ed5ef465710 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4824,8 +4824,6 @@ in { graphvizPkg = pkgs.graphviz; }; - odo = callPackage ../development/python-modules/odo { }; - offtrac = callPackage ../development/python-modules/offtrac { }; openpyxl = if pythonAtLeast "3.6" then From d43a33333d216a5c8da7646373088c68fa11909e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 11:15:01 +0200 Subject: [PATCH 1319/3452] python.pkgs.blaze: remove broken and unmaintained upstream --- .../python-modules/blaze/default.nix | 69 ------------------- pkgs/top-level/python-packages.nix | 2 - 2 files changed, 71 deletions(-) delete mode 100644 pkgs/development/python-modules/blaze/default.nix diff --git a/pkgs/development/python-modules/blaze/default.nix b/pkgs/development/python-modules/blaze/default.nix deleted file mode 100644 index cff84775aecb..000000000000 --- a/pkgs/development/python-modules/blaze/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytest -, contextlib2 -, cytoolz -, dask -, datashape -, flask -, flask-cors -, h5py -, multipledispatch -, numba -, numpy -, pandas -, psutil -, pymongo -, pyyaml -, requests -, sqlalchemy -, tables -, toolz -}: - -buildPythonPackage rec { - pname = "blaze"; - version = "0.11.3"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = version; - sha256 = "0w916k125058p40cf7i090f75pgv3cqdb8vwjzqhb9r482fa6717"; - }; - - checkInputs = [ pytest ]; - propagatedBuildInputs = [ - contextlib2 - cytoolz - dask - datashape - flask - flask-cors - h5py - multipledispatch - numba - numpy - pandas - psutil - pymongo - pyyaml - requests - sqlalchemy - tables - toolz - ]; - - checkPhase = '' - rm pytest.ini # Not interested in coverage - py.test blaze/tests - ''; - - meta = { - homepage = "https://github.com/ContinuumIO/blaze"; - description = "Allows Python users a familiar interface to query data living in other data storage systems"; - license = lib.licenses.bsdOriginal; - maintainers = with lib.maintainers; [ fridh ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ed5ef465710..d8852e04ebfa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2100,8 +2100,6 @@ in { bitstring = callPackage ../development/python-modules/bitstring { }; - blaze = callPackage ../development/python-modules/blaze { }; - html5-parser = callPackage ../development/python-modules/html5-parser { inherit (pkgs) pkgconfig; }; From 936b2b8782e43f6a1c6e7dc802127129a8379aa7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 11:15:26 +0200 Subject: [PATCH 1320/3452] python.pkgs.cppy: init at 1.1.0 --- .../python-modules/cppy/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/cppy/default.nix diff --git a/pkgs/development/python-modules/cppy/default.nix b/pkgs/development/python-modules/cppy/default.nix new file mode 100644 index 000000000000..c6477c155332 --- /dev/null +++ b/pkgs/development/python-modules/cppy/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +}: + +buildPythonPackage rec { + pname = "cppy"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "4eda6f1952054a270f32dc11df7c5e24b259a09fddf7bfaa5f33df9fb4a29642"; + }; + + # Headers-only library, no tests + doCheck = false; + + # Not supported + disabled = !isPy3k; + + meta = { + description = "C++ headers for C extension development"; + homepage = "https://github.com/nucleic/cppy"; + license = lib.licenses.bsd3; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d8852e04ebfa..8617f13be49d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2323,6 +2323,8 @@ in { cytoolz = callPackage ../development/python-modules/cytoolz { }; + cppy = callPackage ../development/python-modules/cppy { }; + cryptacular = callPackage ../development/python-modules/cryptacular { }; cryptography = callPackage ../development/python-modules/cryptography { }; From 9a49beb08d02b74c6440896fd55a18b260a7f305 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 11:15:34 +0200 Subject: [PATCH 1321/3452] python.pkgs.kiwisolver: fix build --- .../python-modules/kiwisolver/1_1.nix | 28 +++++++++++++++++++ .../python-modules/kiwisolver/default.nix | 5 ++++ pkgs/top-level/python-packages.nix | 5 +++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/kiwisolver/1_1.nix diff --git a/pkgs/development/python-modules/kiwisolver/1_1.nix b/pkgs/development/python-modules/kiwisolver/1_1.nix new file mode 100644 index 000000000000..f4621c9c54de --- /dev/null +++ b/pkgs/development/python-modules/kiwisolver/1_1.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, stdenv +, libcxx +}: + +buildPythonPackage rec { + pname = "kiwisolver"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "53eaed412477c836e1b9522c19858a8557d6e595077830146182225613b11a75"; + }; + + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + + # Does not include tests + doCheck = false; + + meta = { + description = "A fast implementation of the Cassowary constraint solver"; + homepage = "https://github.com/nucleic/kiwi"; + license = lib.licenses.bsd3; + }; + +} diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index e55a85748193..23cff218e83a 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -3,6 +3,7 @@ , fetchPypi , stdenv , libcxx +, cppy }: buildPythonPackage rec { @@ -16,6 +17,10 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + nativeBuildInputs = [ + cppy + ]; + # Does not include tests doCheck = false; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8617f13be49d..4b1d0ff01fc6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4265,7 +4265,10 @@ in { keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; }; - kiwisolver = callPackage ../development/python-modules/kiwisolver { }; + kiwisolver = if isPy3k then + callPackage ../development/python-modules/kiwisolver { } + else + callPackage ../development/python-modules/kiwisolver/1_1.nix { }; klaus = callPackage ../development/python-modules/klaus {}; From 535ae9d44ead71cf362122e341485eb48238d3eb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 11:25:20 +0200 Subject: [PATCH 1322/3452] python.pkgs.pygments: fixup --- .../python-modules/Pygments/2_5.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/Pygments/2_5.nix diff --git a/pkgs/development/python-modules/Pygments/2_5.nix b/pkgs/development/python-modules/Pygments/2_5.nix new file mode 100644 index 000000000000..a0c40550c9a9 --- /dev/null +++ b/pkgs/development/python-modules/Pygments/2_5.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, docutils +}: + +buildPythonPackage rec { + pname = "Pygments"; + version = "2.5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe"; + }; + + propagatedBuildInputs = [ docutils ]; + + # Circular dependency with sphinx + doCheck = false; + + meta = { + homepage = "https://pygments.org/"; + description = "A generic syntax highlighter"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b1d0ff01fc6..d6b46fa9e76a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5267,7 +5267,10 @@ in { pyglet = callPackage ../development/python-modules/pyglet {}; - pygments = callPackage ../development/python-modules/Pygments { }; + pygments = if isPy3k then + callPackage ../development/python-modules/Pygments { } + else + callPackage ../development/python-modules/Pygments/2_5.nix { }; pygpgme = callPackage ../development/python-modules/pygpgme { }; From 224d7b129cc600bd0e3c6325f016fa43533b781f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 11:28:47 +0200 Subject: [PATCH 1323/3452] python.pkgs.pytest-mock: use 2.0.0 for python 2 --- .../python-modules/pytest-mock/2.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 ++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/pytest-mock/2.nix diff --git a/pkgs/development/python-modules/pytest-mock/2.nix b/pkgs/development/python-modules/pytest-mock/2.nix new file mode 100644 index 000000000000..3764a05af057 --- /dev/null +++ b/pkgs/development/python-modules/pytest-mock/2.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, isPy3k +, pytest +, mock +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "pytest-mock"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b35eb281e93aafed138db25c8772b95d3756108b601947f89af503f8c629413f"; + }; + + propagatedBuildInputs = lib.optional (!isPy3k) mock; + + nativeBuildInputs = [ + setuptools_scm + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Thin-wrapper around the mock package for easier use with py.test."; + homepage = "https://github.com/pytest-dev/pytest-mock"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d6b46fa9e76a..3d795669d2c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2527,7 +2527,10 @@ in { pytest-mpl = callPackage ../development/python-modules/pytest-mpl { }; - pytest-mock = callPackage ../development/python-modules/pytest-mock { }; + pytest-mock = if isPy3k then + callPackage ../development/python-modules/pytest-mock { } + else + callPackage ../development/python-modules/pytest-mock/2.nix { }; pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; From c75fec1a79ec435a4a223b8336add6188f6236a7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 11:33:47 +0200 Subject: [PATCH 1324/3452] python.pkgs.jsonpickle: fixup build --- .../python-modules/jsonpickle/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index 4415d90654ad..9c8410a79384 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , pytest +, setuptools_scm +, toml }: buildPythonPackage rec { @@ -15,7 +17,15 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - checkPhase = "pytest tests/jsonpickle_test.py"; + nativeBuildInputs = [ + setuptools_scm + toml + ]; + + checkPhase = '' + rm pytest.ini + pytest tests/jsonpickle_test.py + ''; meta = { description = "Python library for serializing any arbitrary object graph into JSON"; From 82c8cfe12c0a417b3102703003b5375ef9e07d61 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 11:37:27 +0200 Subject: [PATCH 1325/3452] python2.pkgs.catalogue: keep 1.0.0 for python 2 --- .../python-modules/catalogue/1.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++- 2 files changed, 28 insertions(+), 1 deletion(-) create 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 new file mode 100644 index 000000000000..9376377e9c77 --- /dev/null +++ b/pkgs/development/python-modules/catalogue/1.nix @@ -0,0 +1,24 @@ +{ 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d795669d2c7..31cfe3cd60a8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -566,7 +566,10 @@ in { cadquery = callPackage ../development/python-modules/cadquery { }; - catalogue = callPackage ../development/python-modules/catalogue { }; + catalogue = if isPy3k then + callPackage ../development/python-modules/catalogue { } + else + callPackage ../development/python-modules/catalogue/1.nix { }; cbeams = callPackage ../misc/cbeams { }; From 5b0379ba90121a9a16354e9dff9ec51956de2483 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 11:41:27 +0200 Subject: [PATCH 1326/3452] python.pkgs.sphinxcontrib-websupport: keep 1.1.2 for python 2 --- .../sphinxcontrib-websupport/1_1.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/sphinxcontrib-websupport/1_1.nix diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/1_1.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/1_1.nix new file mode 100644 index 000000000000..b1bdf6a0dff6 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/1_1.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-websupport"; + version = "1.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1501befb0fdf1d1c29a800fdbf4ef5dc5369377300ddbdd16d2cd40e54c6eefc"; + }; + + propagatedBuildInputs = [ six ]; + + doCheck = false; + + meta = { + description = "Sphinx API for Web Apps"; + homepage = "http://sphinx-doc.org/"; + license = lib.licenses.bsd2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 31cfe3cd60a8..3612ff772a97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5862,7 +5862,10 @@ in { sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; - sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { }; + sphinxcontrib-websupport = if isPy3k then + callPackage ../development/python-modules/sphinxcontrib-websupport { } + else + callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { }; hieroglyph = callPackage ../development/python-modules/hieroglyph { }; From 3611cc77f918e1bca219c4d84d056cc7a9bf2cf3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 11:50:01 +0200 Subject: [PATCH 1327/3452] python.pkgs.astroid: fixup build --- pkgs/development/python-modules/astroid/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 9a8b3c7a1d78..c11de9c94191 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -14,6 +14,10 @@ buildPythonPackage rec { sha256 = "4c17cea3e592c21b6e222f673868961bad77e1f985cb1694ed077475a89229c1"; }; + postPatch = '' + substituteInPlace astroid/__pkginfo__.py --replace "lazy_object_proxy==1.4.*" "lazy_object_proxy" + ''; + # From astroid/__pkginfo__.py propagatedBuildInputs = [ lazy-object-proxy six wrapt ] ++ lib.optional (pythonOlder "3.5") typing From 8263989d119557a43b7d2a5b4d55169828770a47 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 14:28:06 +0200 Subject: [PATCH 1328/3452] python2.pkgs.httpretty: keep 0.9.7 for python 2 --- .../python-modules/httpretty/0.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/httpretty/0.nix diff --git a/pkgs/development/python-modules/httpretty/0.nix b/pkgs/development/python-modules/httpretty/0.nix new file mode 100644 index 000000000000..ee0e598a9ac2 --- /dev/null +++ b/pkgs/development/python-modules/httpretty/0.nix @@ -0,0 +1,52 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, tornado +, requests +, httplib2 +, sure +, nose +, nose-exclude +, coverage +, rednose +, nose-randomly +, six +, mock +}: + +buildPythonPackage rec { + pname = "httpretty"; + version = "0.9.7"; + + # drop this for version > 0.9.7 + # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394 + doCheck = stdenv.lib.versionAtLeast version "0.9.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ nose sure coverage mock rednose + # Following not declared in setup.py + nose-randomly requests tornado httplib2 nose-exclude + ]; + + __darwinAllowLocalNetworking = true; + + # Those flaky tests are failing intermittently on all platforms + NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ + "tests.functional.test_httplib2.test_callback_response" + "tests.functional.test_requests.test_streaming_responses" + "tests.functional.test_httplib2.test_callback_response" + "tests.functional.test_requests.test_httpretty_should_allow_adding_and_overwritting_by_kwargs_u2" + ]; + + meta = with stdenv.lib; { + homepage = "https://httpretty.readthedocs.org/"; + description = "HTTP client request mocking tool"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3612ff772a97..06ab8621f3f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4135,7 +4135,10 @@ in { hkdf = callPackage ../development/python-modules/hkdf { }; - httpretty = callPackage ../development/python-modules/httpretty { }; + httpretty = if isPy3k then + callPackage ../development/python-modules/httpretty { } + else + callPackage ../development/python-modules/httpretty/0.nix { }; iapws = callPackage ../development/python-modules/iapws { }; From 93c3c181fa066294518aec8a080db6093058e013 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 14:32:43 +0200 Subject: [PATCH 1329/3452] python3.pkgs.pylast: add missing dep --- pkgs/development/python-modules/pylast/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index a85c0be6b680..060dc02a03a1 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -1,4 +1,6 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, certifi, six }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, certifi, six +, setuptools_scm +}: buildPythonPackage rec { pname = "pylast"; @@ -11,6 +13,7 @@ buildPythonPackage rec { sha256 = "3c984be04c9a22a884c3106a7f75749466d27c68870d6fb7e1f56b71becea7c0"; }; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ certifi six ]; # tests require last.fm credentials From c1faf4efd8753747f322f6eeddac65fafc88f09c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 14:46:11 +0200 Subject: [PATCH 1330/3452] python3.pkgs.httpretty: only run unit tests --- pkgs/development/python-modules/httpretty/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index 3dd5b63bbf7d..895a28356ee5 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -12,6 +12,9 @@ , nose-randomly , six , mock +, eventlet +, pytest +, freezegun }: buildPythonPackage rec { @@ -29,11 +32,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ nose sure coverage mock rednose + checkInputs = [ nose sure coverage mock rednose pytest # Following not declared in setup.py - nose-randomly requests tornado httplib2 nose-exclude + nose-randomly requests tornado httplib2 nose-exclude freezegun ]; + checkPhase = '' + nosetests tests/unit # functional tests cause trouble requiring /etc/protocol + ''; + __darwinAllowLocalNetworking = true; # Those flaky tests are failing intermittently on all platforms From 81fc2ad582d0c7cd2b9d31fcac4d9a68c9612286 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 15:04:13 +0200 Subject: [PATCH 1331/3452] python2.pkgs.pyhamcrest: keep 1.10.1 for python 2 --- .../python-modules/pyhamcrest/1.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/pyhamcrest/1.nix diff --git a/pkgs/development/python-modules/pyhamcrest/1.nix b/pkgs/development/python-modules/pyhamcrest/1.nix new file mode 100644 index 000000000000..592172c6550d --- /dev/null +++ b/pkgs/development/python-modules/pyhamcrest/1.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, mock, pytest +, six +}: +buildPythonPackage rec { + pname = "PyHamcrest"; + version = "1.10.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0x08lfcnsak7pkym32xrdn0sn3wcf26n1jff3d11mwbizpfikbpp"; + }; + + checkInputs = [ mock pytest ]; + propagatedBuildInputs = [ six ]; + + doCheck = false; # pypi tarball does not include tests + + meta = with stdenv.lib; { + homepage = "https://github.com/hamcrest/PyHamcrest"; + description = "Hamcrest framework for matcher objects"; + license = licenses.bsd3; + maintainers = with maintainers; [ + alunduil + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 06ab8621f3f6..7ca53e402d6e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7278,7 +7278,10 @@ in { behave = callPackage ../development/python-modules/behave { }; - pyhamcrest = callPackage ../development/python-modules/pyhamcrest { }; + pyhamcrest = if isPy3k then + callPackage ../development/python-modules/pyhamcrest { } + else + callPackage ../development/python-modules/pyhamcrest/1.nix { }; pyhaversion = callPackage ../development/python-modules/pyhaversion { }; From 5249b7029ccbad4b44b77d06b868e35f46c0b06d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 15:06:52 +0200 Subject: [PATCH 1332/3452] python.pkgs.iniparse: fix build --- pkgs/development/python-modules/iniparse/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/iniparse/default.nix b/pkgs/development/python-modules/iniparse/default.nix index d292196ff536..e240b0863c23 100644 --- a/pkgs/development/python-modules/iniparse/default.nix +++ b/pkgs/development/python-modules/iniparse/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , python +, six }: buildPythonPackage rec { @@ -17,6 +18,8 @@ buildPythonPackage rec { ${python.interpreter} runtests.py ''; + propagatedBuildInputs = [ six ]; + # Does not install tests doCheck = false; From 02f7e6c767dd0eb9275a27c8b75d9d616badceb0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 15:10:45 +0200 Subject: [PATCH 1333/3452] python3.pkgs.zconfig: does not support 3.8 and 3.9 --- pkgs/development/python-modules/zconfig/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index 75f8647730cc..706db8243714 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -4,6 +4,7 @@ , zope_testrunner , manuel , docutils +, pythonAtLeast }: buildPythonPackage rec { @@ -20,6 +21,8 @@ buildPythonPackage rec { buildInputs = [ manuel docutils ]; propagatedBuildInputs = [ zope_testrunner ]; + disabled = pythonAtLeast "3.8"; # 3.6.0 introduces compatibility for 3.8 and 3.9 + meta = with stdenv.lib; { description = "Structured Configuration Library"; homepage = "https://pypi.python.org/pypi/ZConfig"; From 6d863b2c989f8fdf14cce66b37a4b3b117eb1e11 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 15:36:06 +0200 Subject: [PATCH 1334/3452] python.pkgs.dateparser: disable tests --- .../python-modules/dateparser/default.nix | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 730e1456a5f6..aa3d5b3e1190 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -11,7 +11,10 @@ , pytz , tzlocal , regex -, ruamel_yaml }: +, ruamel_yaml +, python +, isPy3k +}: buildPythonPackage rec { pname = "dateparser"; @@ -22,12 +25,27 @@ buildPythonPackage rec { sha256 = "fb5bfde4795fa4b179fe05c2c25b3981f785de26bec37e247dee1079c63d5689"; }; - checkInputs = [ flake8 nose mock parameterized six glibcLocales ]; + checkInputs = [ + flake8 + nose + mock + parameterized + six + glibcLocales + ]; preCheck ='' # skip because of missing convertdate module, which is an extra requirement rm tests/test_jalali.py ''; + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests + ''; + + # Strange + # AttributeError: 'module' object has no attribute 'config' + doCheck = false; + propagatedBuildInputs = [ # install_requires dateutil pytz regex tzlocal From 0a344f99e0889c60134ee9592e237db5dcd361e1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 15:38:16 +0200 Subject: [PATCH 1335/3452] python.pkgs.arrow: disable failing test --- pkgs/development/python-modules/arrow/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 4fdf55bc2bd3..60a9572f1c8e 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, buildPythonPackage, fetchPypi, isPy27 , nose, chai, simplejson, backports_functools_lru_cache -, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov, pytest +, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov +, pytestCheckHook }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ dateparser - pytest + pytestCheckHook pytestcov pytest-mock pytz @@ -25,9 +26,10 @@ buildPythonPackage rec { sphinx ]; - checkPhase = '' - pytest - ''; + # ParserError: Could not parse timezone expression "America/Nuuk" + disabledTests = [ + "test_parse_tz_name_zzz" + ]; meta = with lib; { description = "Python library for date manipulation"; From 1bb2cf2bb1f13ffa0c2d81a4094108de5650a64c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 16:19:17 +0200 Subject: [PATCH 1336/3452] python.pkgs.gevent: fix build --- pkgs/development/python-modules/gevent/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 4140b0893e04..4eb5c7cdbb9f 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -1,8 +1,11 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet }: +{ stdenv, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet +, zope_interface +}: buildPythonPackage rec { pname = "gevent"; version = "20.5.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; @@ -10,7 +13,9 @@ buildPythonPackage rec { }; buildInputs = [ libev ]; - propagatedBuildInputs = stdenv.lib.optionals (!isPyPy) [ greenlet ]; + propagatedBuildInputs = [ + zope_interface + ] ++ stdenv.lib.optionals (!isPyPy) [ greenlet ]; checkPhase = '' cd greentest From 93db78ddfd3c20fe097dd2f70c33b9acb0d7b5a3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 19:11:17 +0200 Subject: [PATCH 1337/3452] python.pkgs.pytest-xprocess: fix --- pkgs/development/python-modules/pytest-xprocess/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index c6b9557fc57f..8548dba8d8c0 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, fetchPypi , psutil , pytest +, setuptools_scm }: buildPythonPackage rec { @@ -12,6 +13,7 @@ buildPythonPackage rec { sha256 = "779aeca517cd9c996d1544bdc510cb3cff40c48136d94bbce6148e27f30a93ff"; }; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ psutil pytest ]; # Remove test QoL package from install_requires From 0fd6b52880b91848b4417d414f3a913b9507f632 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 7 Jun 2020 19:21:43 +0200 Subject: [PATCH 1338/3452] python3.pkgs.curio: fix build --- pkgs/development/python-modules/curio/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index 16162b27dc6a..5852f518ab52 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -24,9 +24,7 @@ buildPythonPackage rec { # test_aside_basic times out, # test_aside_cancel fails because modifies PYTHONPATH and cant find pytest checkPhase = '' - # __pycache__ was packaged accidentally, https://github.com/dabeaz/curio/issues/301 - rm -r tests/__pycache__ - pytest --deselect tests/test_task.py::test_aside_basic --deselect tests/test_task.py::test_aside_cancel + pytest --deselect tests/test_task.py::test_aside_basic --deselect tests/test_task.py::test_aside_cancel -k "not test_ssl_outgoing" ''; meta = with lib; { From 7670a03a6394037e1a49932ee1376d5c8ddd196d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 11:43:20 -0700 Subject: [PATCH 1339/3452] pythonPackages.txaio: disabled python2 Processing ./txaio-20.4.1-py2.py3-none-any.whl ERROR: Package 'txaio' requires a different Python: 2.7.18 not in '>=3.5' --- pkgs/development/python-modules/txaio/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index efadddade1e1..7e87a2d59ea4 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted,isPy37 }: +{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted, isPy37, isPy27 }: buildPythonPackage rec { pname = "txaio"; version = "20.4.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 536b1c02f8ffb672c8ca01ad75ab98ea957fcb9f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 11:44:47 -0700 Subject: [PATCH 1340/3452] python3Packages.twiggy: add missing six dependency --- pkgs/development/python-modules/twiggy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/twiggy/default.nix b/pkgs/development/python-modules/twiggy/default.nix index 01cd945fdc40..fdff4a90f9e1 100644 --- a/pkgs/development/python-modules/twiggy/default.nix +++ b/pkgs/development/python-modules/twiggy/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, six }: buildPythonPackage rec { @@ -12,6 +13,7 @@ buildPythonPackage rec { sha256 = "259ae96cb22e80c49e75c37dc2f7497028c5dc19018958f05fa00ec08fc2569f"; }; + propagatedBuildInputs = [ six ]; doCheck = false; meta = with stdenv.lib; { From 3e9fcf33c6da3d22cd5e1db6f8863b4cc7cf24c4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 11:45:56 -0700 Subject: [PATCH 1341/3452] python3Packages.check-manifest: mark broken needs pep517 package, which isn't available in nixpkgs --- pkgs/development/python-modules/check-manifest/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index a4e396780aad..ae5ee106f5c2 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -18,5 +18,6 @@ buildPythonPackage rec { description = "Check MANIFEST.in in a Python source package for completeness"; license = licenses.mit; maintainers = with maintainers; [ lewo ]; + broken = true; # pep517 package doesn't exist in nixpkgs }; } From d8d6cfdf06568be830f1b5692a8dcc90c02db8ad Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 11:48:05 -0700 Subject: [PATCH 1342/3452] python3Packages.atom: add missing cppy dependency --- pkgs/development/python-modules/atom/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index a100cf178268..91c14756f482 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, future }: +{ lib, buildPythonPackage, fetchPypi, future, cppy }: buildPythonPackage rec { pname = "atom"; @@ -9,6 +9,7 @@ buildPythonPackage rec { sha256 = "ce0c600e4b26b7553c926b3b8253df7ae19bbf2678bdc2d46eb29b5f9149f172"; }; + buildInputs = [ cppy ]; propagatedBuildInputs = [ future ]; # Tests not released to pypi From 3e597721fd809f6d6e90d69d665e3138064311e6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 11:49:31 -0700 Subject: [PATCH 1343/3452] python38Packages.httptools: disable tests, no longer on pypi --- pkgs/development/python-modules/httptools/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix index e14374449f05..c63b098d324c 100644 --- a/pkgs/development/python-modules/httptools/default.nix +++ b/pkgs/development/python-modules/httptools/default.nix @@ -12,6 +12,11 @@ buildPythonPackage rec { sha256 = "41b573cf33f64a8f8f3400d0a7faf48e1888582b6f6e02b82b9bd4f0bf7497ce"; }; + # tests are not included in pypi tarball + doCheck = false; + + pythonImportsCheck = [ "httptools" ]; + meta = with lib; { description = "A collection of framework independent HTTP protocol utils"; homepage = "https://github.com/MagicStack/httptools"; From 4942204374b181c0b203c8a16fd617973bdac6f1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 11:53:41 -0700 Subject: [PATCH 1344/3452] python3Packages.simpy: fix --- pkgs/development/python-modules/simpy/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index 656d330cd589..2ea72441d105 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, lib }: +{ buildPythonPackage, fetchPypi, lib, setuptools_scm, pytestCheckHook }: buildPythonPackage rec { pname = "simpy"; @@ -9,6 +9,9 @@ buildPythonPackage rec { sha256 = "b36542e2faab612f861c5ef4da17220ac1553f5892b3583c67281dbe4faad404"; }; + nativeBuildInputs = [ setuptools_scm ]; + checkInputs = [ pytestCheckHook ]; + meta = with lib; { homepage = "https://simpy.readthedocs.io/en/latest/"; description = "A process-based discrete-event simulation framework based on standard Python."; From 88264ac51a925070972f061c911c8d4e83c3b25c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 11:54:53 -0700 Subject: [PATCH 1345/3452] python3Packages.sorl_thumbnail: add missing dependencies --- pkgs/development/python-modules/sorl_thumbnail/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl_thumbnail/default.nix index c847459f1879..6aaabaf19d95 100644 --- a/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, setuptools_scm }: buildPythonPackage rec { @@ -12,6 +13,7 @@ buildPythonPackage rec { sha256 = "66771521f3c0ed771e1ce8e1aaf1639ebff18f7f5a40cfd3083da8f0fe6c7c99"; }; + nativeBuildInputs = [ setuptools_scm ]; # Disabled due to an improper configuration error when tested against django. This looks like something broken in the test cases for sorl. doCheck = false; From 78d0cda943961f4fdf4f8a32e87b44adafa54a26 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 11:57:36 -0700 Subject: [PATCH 1346/3452] python3Packages.srsly: add missing cython dependency --- pkgs/development/python-modules/srsly/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 37b233574b20..92e6b84afdfe 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, cython , mock , numpy , pathlib @@ -19,6 +20,8 @@ buildPythonPackage rec { sha256 = "fa3c7375be8fe75f23c27feafbfb5f738d55ffdbf02964c6896fb7684f519a52"; }; + nativeBuildInputs = [ cython ]; + propagatedBuildInputs = lib.optional (pythonOlder "3.4") pathlib; checkInputs = [ From a4386dbd7e7512a542c496788636308dff5e2783 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 11:58:33 -0700 Subject: [PATCH 1347/3452] python3Packages.ujson: add missing setuptools_scm dependency --- pkgs/development/python-modules/ujson/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index ac5f122068ac..0c68fe9bb1bc 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , isPyPy +, setuptools_scm }: buildPythonPackage rec { @@ -14,6 +15,8 @@ buildPythonPackage rec { sha256 = "e0199849d61cc6418f94d52a314c6a27524d65e82174d2a043fb718f73d1520d"; }; + nativeBuildInputs = [ setuptools_scm ]; + meta = with stdenv.lib; { homepage = "https://pypi.python.org/pypi/ujson"; description = "Ultra fast JSON encoder and decoder for Python"; From fca2d726e09a0155e4debca6d50aa863e58b33f0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 12:02:48 -0700 Subject: [PATCH 1348/3452] python3Packages.humanize: fix missing dependencies --- pkgs/development/python-modules/humanize/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 8967e030f6d0..10f1b8000688 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , mock +, setuptools_scm }: buildPythonPackage rec { @@ -13,7 +14,8 @@ buildPythonPackage rec { sha256 = "42ae7d54b398c01bd100847f6cb0fc9e381c21be8ad3f8e2929135e48dbff026"; }; - buildInputs = [ mock ]; + nativeBuildInputs = [ setuptools_scm ]; + checkInputs = [ mock ]; doCheck = false; From 4e299b06f77077d9848378b736aaf44198438534 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 12:03:19 -0700 Subject: [PATCH 1349/3452] python3Packages.dpath: fix tests --- pkgs/development/python-modules/dpath/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index 1601148876d5..c9c9ad179811 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchPypi, buildPythonPackage -, mock, nose +, mock, pytestCheckHook, nose, hypothesis }: buildPythonPackage rec { @@ -11,10 +11,8 @@ buildPythonPackage rec { sha256 = "bea06b5f4ff620a28dfc9848cf4d6b2bfeed34238edeb8ebe815c433b54eb1fa"; }; - checkInputs = [ mock nose ]; - checkPhase = '' - nosetests - ''; + # use pytest as nosetests hangs + checkInputs = [ mock nose pytestCheckHook hypothesis ]; meta = with stdenv.lib; { homepage = "https://github.com/akesterson/dpath-python"; From 62c8d83b0a7e24ae21238fb3cb1c2b2fa92270ab Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 12:04:54 -0700 Subject: [PATCH 1350/3452] python3Packages.croniter: fix build --- pkgs/development/python-modules/croniter/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index 15aaf97d15c0..42964fc797c2 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -4,6 +4,8 @@ , python-dateutil , pytest , pytz +, natsort +, tzlocal }: buildPythonPackage rec { @@ -17,11 +19,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ python-dateutil + natsort ]; checkInputs = [ pytest pytz + tzlocal ]; checkPhase = '' From d21f05216e5927b65dc7e58c3c9ce208d7f0c499 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 12:11:11 -0700 Subject: [PATCH 1351/3452] python3Packages.pyscss: 1.3.5 -> 1.3.7 --- pkgs/development/python-modules/pyscss/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix index f268566fb544..30b5205050dd 100644 --- a/pkgs/development/python-modules/pyscss/default.nix +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -9,15 +9,15 @@ , pythonOlder }: -buildPythonPackage { +buildPythonPackage rec { pname = "pyScss"; - version = "1.3.5"; + version = "1.3.7"; src = fetchFromGitHub { - sha256 = "0lfsan74vcw6dypb196gmbprvlbran8p7w6czy8hyl2b1l728mhz"; - rev = "v1.3.5"; repo = "pyScss"; owner = "Kronuz"; + rev = version; + sha256 = "0701hziiiw67blafgpmjhzspmrss8mfvif7fw0rs8fikddwwc9g6"; }; checkInputs = [ pytest ]; From 3c347d558572bc6c62ed46a1c7b80cc178b65ea0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 12:15:14 -0700 Subject: [PATCH 1352/3452] python3Packages.pytest-check: 0.3.7 -> 0.3.9, use pypi --- .../python-modules/pytest-check/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index 104a2ae64906..9636d20c73b7 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -1,24 +1,22 @@ { stdenv , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pytest , pytestCheckHook }: buildPythonPackage rec { pname = "pytest-check"; - version = "0.3.5"; + version = "0.3.9"; - src = fetchFromGitHub { - owner = "okken"; - repo = "pytest-check"; - rev = version; - sha256 = "11wb4f4sp4cr5mzqdakrbycwgfr2p1sx1l91fa6525wnfvgc0qy3"; + src = fetchPypi { + pname = "pytest_check"; + inherit version; + sha256 = "0asrrz0fgk6wqffsz1ffd6z9xyw314fwh5bwjzcq75w8w1g4ass9"; }; - buildInputs = [ pytest ]; - - checkInputs = [ pytest pytestCheckHook ]; + propagatedBuildInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; meta = with stdenv.lib; { description = "pytest plugin allowing multiple failures per test"; From 49137f7b3ff68df483df9392128f41ce409d61d8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 12:17:01 -0700 Subject: [PATCH 1353/3452] python3Packages.inflect: add missing dependencies --- pkgs/development/python-modules/inflect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 31617283ee66..d4e544ad8d43 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm, nose, six, importlib-metadata }: +{ buildPythonPackage, fetchPypi, setuptools_scm, nose, six, importlib-metadata, toml }: buildPythonPackage rec { pname = "inflect"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "def6f3791be9181f0c01e0bf5949304007ec6e04c6674fbef7cc49c657b8a9a5"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm toml ]; propagatedBuildInputs = [ six importlib-metadata ]; checkInputs = [ nose ]; } From 5bb40ab7979a6e0f096d9f1c68415e19ae3ee01b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 12:19:41 -0700 Subject: [PATCH 1354/3452] python3Packages.python-dotenv: fix tests --- pkgs/development/python-modules/python-dotenv/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index e72c27acc345..51ca3be32c7d 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -4,6 +4,7 @@ , pytest , sh , typing +, mock }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ]; - checkInputs = [ ipython pytest sh ]; + checkInputs = [ ipython mock pytest sh ]; # cli tests are impure checkPhase = '' From 0a1edca2c70541782fe823f85ddf2024f6b3081c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 12:20:42 -0700 Subject: [PATCH 1355/3452] python3Packages.pytest-mypy: fix build --- pkgs/development/python-modules/pytest-mypy/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 6eb2a17ed387..368d13a91394 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -1,8 +1,10 @@ { lib , buildPythonPackage , fetchPypi +, filelock , pytest , mypy +, setuptools_scm }: buildPythonPackage rec { @@ -14,7 +16,8 @@ buildPythonPackage rec { sha256 = "2560a9b27d59bb17810d12ec3402dfc7c8e100e40539a70d2814bcbb27240f27"; }; - propagatedBuildInputs = [ pytest mypy ]; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ pytest mypy filelock ]; meta = with lib; { description = "Mypy static type checker plugin for Pytest"; From 15a17af2487c40051eecf3b28262570171980e70 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 12:21:54 -0700 Subject: [PATCH 1356/3452] python3Packages.authheaders: fix dependencies --- pkgs/development/python-modules/authheaders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix index 1780f552679a..a1d049ebb151 100644 --- a/pkgs/development/python-modules/authheaders/default.nix +++ b/pkgs/development/python-modules/authheaders/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, isPy27, lib -, authres, dnspython, dkimpy, ipaddress, publicsuffix +, authres, dnspython, dkimpy, ipaddress, publicsuffix2 }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "935726b784cc636cbcfed2c977f1a6887dc60056806da4eff60db932c5896692"; }; - propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix ] + propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ] ++ lib.optional isPy27 ipaddress; meta = { From e3174f06fbd60c6af2e1ee72c847f79d2f121581 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 12:23:52 -0700 Subject: [PATCH 1357/3452] python3Packages.restview: fix build --- pkgs/development/python-modules/restview/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index 715a4cfb43fe..acce48c45d04 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -4,6 +4,7 @@ , fetchpatch , docutils , readme_renderer +, packaging , pygments , mock }: @@ -17,7 +18,7 @@ buildPythonPackage rec { sha256 = "de87c84f19526bd4a76505f6d40b51b7bb03ca43b6067c93f82f1c7237ac9e84"; }; - propagatedBuildInputs = [ docutils readme_renderer pygments ]; + propagatedBuildInputs = [ docutils readme_renderer packaging pygments ]; checkInputs = [ mock ]; patches = [ From f25b128071f8260f2ead377979f143bf19a7f6b7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 12:31:29 -0700 Subject: [PATCH 1358/3452] python37Packages.pep8-naming: add missing importlib-metadata dep --- pkgs/development/python-modules/pep8-naming/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix index 4b85ba47ab36..5f3f0a5145dd 100644 --- a/pkgs/development/python-modules/pep8-naming/default.nix +++ b/pkgs/development/python-modules/pep8-naming/default.nix @@ -1,5 +1,7 @@ -{ lib, fetchPypi, buildPythonPackage -, flake8-polyfill }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder +, flake8-polyfill +, importlib-metadata +}: buildPythonPackage rec { pname = "pep8-naming"; @@ -12,6 +14,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ flake8-polyfill + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; meta = with lib; { From 27f0dabfbfbc15a4233827f08fa36e725f27ca54 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 12:42:14 -0700 Subject: [PATCH 1359/3452] python3Packages.pylint: fix build and tests --- pkgs/development/python-modules/pylint/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index f648d525442c..1986dd4936c1 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, astroid, - isort, mccabe, pytestCheckHook, pytestrunner }: + isort, mccabe, pytestCheckHook, pytest-benchmark, pytestrunner, toml }: buildPythonPackage rec { pname = "pylint"; @@ -12,9 +12,9 @@ buildPythonPackage rec { sha256 = "b95e31850f3af163c2283ed40432f053acbc8fc6eba6a069cb518d9dbf71848c"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytestrunner toml ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ pytestCheckHook pytest-benchmark ]; propagatedBuildInputs = [ astroid isort mccabe ]; @@ -26,11 +26,18 @@ buildPythonPackage rec { disabledTests = [ # https://github.com/PyCQA/pylint/issues/3198 "test_by_module_statement_value" + # has issues with local directories + "test_version" ] ++ lib.optionals stdenv.isDarwin [ "test_parallel_execution" "test_py3k_jobs_option" ]; + # calls executable in one of the tests + preCheck = '' + export PATH=$PATH:$out/bin + ''; + dontUseSetuptoolsCheck = true; postInstall = '' From 9196ced8706952afd0dc0957528a91effb117ec3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 12:44:21 -0700 Subject: [PATCH 1360/3452] python37Packages.orderedmultidict: add missing dependencies --- .../python-modules/orderedmultidict/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/orderedmultidict/default.nix b/pkgs/development/python-modules/orderedmultidict/default.nix index 82c08d655356..1a3ab347945a 100644 --- a/pkgs/development/python-modules/orderedmultidict/default.nix +++ b/pkgs/development/python-modules/orderedmultidict/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, flake8, six }: +{ stdenv, buildPythonPackage, fetchPypi, flake8, six, pythonOlder, importlib-metadata }: buildPythonPackage rec { pname = "orderedmultidict"; @@ -11,7 +11,10 @@ buildPythonPackage rec { checkInputs = [ flake8 ]; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six ] + ++ stdenv.lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; meta = with stdenv.lib; { description = "Ordered Multivalue Dictionary."; From 7b9c13e749f4790ca258509df184e74521392ec3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 12:46:02 -0700 Subject: [PATCH 1361/3452] python37Packages.flake8-future-import: fix dependencies --- .../python-modules/flake8-future-import/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 0a60761b9433..e819422c572f 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -1,4 +1,4 @@ -{ lib, isPy27, fetchFromGitHub, buildPythonPackage, fetchpatch, flake8, six }: +{ lib, isPy27, fetchFromGitHub, buildPythonPackage, pythonOlder, fetchpatch, flake8, importlib-metadata, six }: buildPythonPackage rec { pname = "flake8-future-import"; @@ -12,7 +12,10 @@ buildPythonPackage rec { sha256 = "00q8n15xdnvqj454arn7xxksyrzh0dw996kjyy7g9rdk0rf8x82z"; }; - propagatedBuildInputs = [ flake8 six ]; + propagatedBuildInputs = [ flake8 six ] + ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; # Upstream disables this test case naturally on python 3, but it also fails # inside NixPkgs for python 2. Since it's going to be deleted, we just skip it From 175f317277fda2dd3d0a468549e73cf7bb603436 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 12:51:50 -0700 Subject: [PATCH 1362/3452] python3Packages.distro: disable tests, remove patch --- .../python-modules/distro/default.nix | 13 +++----- .../python-modules/distro/nixos.patch | 31 ------------------- 2 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 pkgs/development/python-modules/distro/nixos.patch diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index b444e19d84bc..cee4e6deb38a 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov }: +{ stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "distro"; @@ -9,15 +9,10 @@ buildPythonPackage rec { sha256 = "0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92"; }; - # TODO: Enable more tests on NixOS (20 out of 173 are failing, 10 due to the - # missing lsb_release binary): - patches = [ ./nixos.patch ]; + # tests are very targeted at individual linux distributions + doCheck = false; - checkInputs = [ pytest pytestcov ]; - - checkPhase = '' - py.test - ''; + pythonImportcheck = [ "distro" ]; meta = with stdenv.lib; { homepage = "https://github.com/nir0s/distro"; diff --git a/pkgs/development/python-modules/distro/nixos.patch b/pkgs/development/python-modules/distro/nixos.patch deleted file mode 100644 index 21aa4827b635..000000000000 --- a/pkgs/development/python-modules/distro/nixos.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/tests/test_distro.py b/tests/test_distro.py -index 5521068..4e1bab8 100644 ---- a/tests/test_distro.py -+++ b/tests/test_distro.py -@@ -432,7 +432,7 @@ class TestOSRelease: - self._test_outcome(desired_outcome) - - --@pytest.mark.skipif(not IS_LINUX, reason='Irrelevant on non-linux') -+@pytest.mark.skip(reason='lsb_release is not available and would return exit code 3') - class TestLSBRelease(DistroTestCase): - - def setup_method(self, test_method): -@@ -919,7 +919,7 @@ class TestDistroRelease: - self._test_outcome(desired_outcome, 'cloudlinux', '7', 'redhat') - - --@pytest.mark.skipif(not IS_LINUX, reason='Irrelevant on non-linux') -+@pytest.mark.skip(reason='Unknown (TODO)') - class TestOverall(DistroTestCase): - """Test a LinuxDistribution object created with default arguments. - -@@ -1618,7 +1618,7 @@ def _bad_os_listdir(path='.'): - raise OSError() - - --@pytest.mark.skipIf(not IS_LINUX, reason='Irrelevant on non-linx') -+@pytest.mark.skip(reason='Unknown (TODO)') - class TestOverallWithEtcNotReadable(TestOverall): - def setup_method(self, test_method): - self._old_listdir = os.listdir From cc6e701b33f0f8275822cc7cb9bf972abc800983 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 12:55:14 -0700 Subject: [PATCH 1363/3452] python3Packages.pytest-openfiles: fix build --- .../pytest-openfiles/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/pkgs/development/python-modules/pytest-openfiles/default.nix index de20a35d30a8..64fd8422ea8d 100644 --- a/pkgs/development/python-modules/pytest-openfiles/default.nix +++ b/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -2,7 +2,9 @@ , buildPythonPackage , fetchPypi , pytest +, pytestCheckHook , psutil +, setuptools_scm }: buildPythonPackage rec { @@ -14,24 +16,14 @@ buildPythonPackage rec { sha256 = "179c2911d8aee3441fee051aba08e0d9b4dab61b829ae4811906d5c49a3b0a58"; }; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ pytest psutil ]; - checkInputs = [ - pytest - ]; - - postConfigure = '' - # remove on next release - substituteInPlace setup.cfg \ - --replace "[pytest]" "[tool:pytest]" - ''; - - checkPhase = '' - pytest - ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Pytest plugin for detecting inadvertent open file handles"; From 25719e3db867e8d0aa78ea6193672a0adfe18520 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 13:22:10 -0700 Subject: [PATCH 1364/3452] python3Packages.nix-prefetch-github: fix tests --- .../nix-prefetch-github/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 56387835cc6e..fbcaa1d1dc45 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -1,10 +1,16 @@ { fetchPypi , lib , buildPythonPackage +, pythonOlder , attrs , click , effect , jinja2 +, git +, pytestCheckHook +, pytest-black +, pytestcov +, pytest-isort }: buildPythonPackage rec { @@ -27,6 +33,15 @@ buildPythonPackage rec { jinja2 ]; + checkInputs = [ pytestCheckHook pytest-black pytestcov pytest-isort git ]; + + # aiohttp is not supported on 3.8 yet + doCheck = pythonOlder "3.8"; + + # latest version of isort will cause tests to fail + # ignore tests which are impure + disabledTests = [ "isort" "life" "outputs" "fetch_submodules" ]; + meta = with lib; { description = "Prefetch sources from github"; homepage = "https://github.com/seppeljordan/nix-prefetch-github"; From 725c27a867e69a44d0f6627af8917b8fb39b2723 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 13:29:58 -0700 Subject: [PATCH 1365/3452] azure-cli: fix dependencies --- .../tools/admin/azure-cli/python-packages.nix | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 157da72a73b5..820659c68a23 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -342,6 +342,26 @@ let }; }); + msal-extensions = super.msal-extensions.overridePythonAttrs(oldAttrs: rec { + version = "0.1.3"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "1p05cbfksnhijx1il7s24js2ydzgxbpiasf607qdpb5sljlp3qar"; + }; + }); + + websocket_client = super.websocket_client.overridePythonAttrs(oldAttrs: rec { + version = "0.56.0"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z"; + }; + }); + }; }; in From ccbe89a14b5318954a4ab22f29efd5feac0524ef Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 13:40:18 -0700 Subject: [PATCH 1366/3452] python37Packages.aws-xray-sdk: fix dependencies --- pkgs/development/python-modules/aws-xray-sdk/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 6364fe77f11b..607118564c5a 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, importlib-metadata , jsonpickle , wrapt , requests @@ -19,6 +21,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ jsonpickle wrapt requests future botocore + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; meta = { From 382883a4cb1cb3c0f71bdfb7cf4d52bf2a0118bd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 13:45:50 -0700 Subject: [PATCH 1367/3452] kargo: use python3 --- pkgs/tools/misc/kargo/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix index bcc19770155d..eb9805b22d80 100644 --- a/pkgs/tools/misc/kargo/default.nix +++ b/pkgs/tools/misc/kargo/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, python2Packages }: +{ stdenv, fetchurl, python3Packages }: -python2Packages.buildPythonApplication rec { +with python3Packages; + +buildPythonApplication rec { version = "0.4.8"; pname = "kargo"; @@ -9,9 +11,7 @@ python2Packages.buildPythonApplication rec { sha256 = "1iq3vrmglag9gpsir03yz7556m0bz99nwb2mf594378cqzbr6db3"; }; - doCheck = false; - - propagatedBuildInputs = with python2Packages; [ + propagatedBuildInputs = [ ansible boto cffi @@ -24,12 +24,15 @@ python2Packages.buildPythonApplication rec { setuptools ]; + checkPhase = '' + HOME=$TMPDIR $out/bin/kargo -v + ''; + meta = with stdenv.lib; { homepage = "https://github.com/kubespray/kargo-cli"; description = "A tool helps to deploy a kubernetes cluster with Ansible."; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with maintainers; [ - ]; + maintainers = with maintainers; [ ]; }; } From 9d6f00dc98ac9fa7220ad62f9e53394f9d0e6e50 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 8 Jun 2020 14:05:51 -0700 Subject: [PATCH 1368/3452] pythonPackages.libcloud: freeze at 2.8.2 --- .../development/python-modules/libcloud/2.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 ++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/libcloud/2.nix diff --git a/pkgs/development/python-modules/libcloud/2.nix b/pkgs/development/python-modules/libcloud/2.nix new file mode 100644 index 000000000000..e680e45391fc --- /dev/null +++ b/pkgs/development/python-modules/libcloud/2.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, mock +, pycrypto +, requests +, pytestrunner +, pytest +, requests-mock +, typing +, backports_ssl_match_hostname +}: + +buildPythonPackage rec { + pname = "apache-libcloud"; + version = "2.8.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wvm8vixhcapkfv5k6xaf8c8w647kx2rdifarg6j0s34r4jzblfg"; + }; + + checkInputs = [ mock pytest pytestrunner requests-mock ]; + propagatedBuildInputs = [ pycrypto requests ] + ++ lib.optionals isPy27 [ typing backports_ssl_match_hostname ]; + + preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; + + # requires a certificates file + doCheck = false; + + meta = with lib; { + description = "A unified interface to many cloud providers"; + homepage = "http://incubator.apache.org/libcloud/"; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ca53e402d6e..76067f7559fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4342,7 +4342,10 @@ in { libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; }; - libcloud = callPackage ../development/python-modules/libcloud { }; + libcloud = if isPy27 then + callPackage ../development/python-modules/libcloud/2.nix { } + else + callPackage ../development/python-modules/libcloud { }; libgpuarray = callPackage ../development/python-modules/libgpuarray { clblas = pkgs.clblas.override { boost = self.boost; }; From 829d30b4bb595601d09c110d0444bb2e04d2e916 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 10:02:38 +0200 Subject: [PATCH 1369/3452] python: rsa: 4.0 -> 4.1 --- pkgs/development/python-modules/rsa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index 459ca0437968..76b4582787a9 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "rsa"; - version = "4.0"; + version = "4.1"; src = fetchPypi { inherit pname version; - sha256 = "1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487"; + sha256 = "6fa6a54eb72bfc0abca7f27880b978b14a643ba2a6ad9f4a56a95be82129ca1b"; }; checkInputs = [ unittest2 mock ]; From 858a96035c023f2710e9b3a4015e0c7999498fcd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 10:07:58 +0200 Subject: [PATCH 1370/3452] python3.pkgs.rsa: 4.0 -> 4.1 keep python2 at 4.0 --- pkgs/development/python-modules/rsa/4_0.nix | 33 +++++++++++++++++++ .../python-modules/rsa/default.nix | 4 +++ pkgs/top-level/python-packages.nix | 5 ++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/rsa/4_0.nix diff --git a/pkgs/development/python-modules/rsa/4_0.nix b/pkgs/development/python-modules/rsa/4_0.nix new file mode 100644 index 000000000000..459ca0437968 --- /dev/null +++ b/pkgs/development/python-modules/rsa/4_0.nix @@ -0,0 +1,33 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, unittest2 +, pyasn1 +, mock +, isPy3k +, pythonOlder +}: + +buildPythonPackage rec { + pname = "rsa"; + version = "4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487"; + }; + + checkInputs = [ unittest2 mock ]; + propagatedBuildInputs = [ pyasn1 ]; + + preConfigure = stdenv.lib.optionalString (isPy3k && pythonOlder "3.7") '' + substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')" + ''; + + meta = with stdenv.lib; { + homepage = "https://stuvel.eu/rsa"; + license = licenses.asl20; + description = "A pure-Python RSA implementation"; + }; + +} diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index 76b4582787a9..cedb852deefc 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -6,6 +6,7 @@ , mock , isPy3k , pythonOlder +, poetry }: buildPythonPackage rec { @@ -24,6 +25,9 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')" ''; + # No tests in archive + doCheck = false; + meta = with stdenv.lib; { homepage = "https://stuvel.eu/rsa"; license = licenses.asl20; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76067f7559fd..9d3c597184fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6174,7 +6174,10 @@ in { rpyc = callPackage ../development/python-modules/rpyc { }; - rsa = callPackage ../development/python-modules/rsa { }; + rsa = if isPy3k then + callPackage ../development/python-modules/rsa { } + else + callPackage ../development/python-modules/rsa/4_0.nix { }; squaremap = callPackage ../development/python-modules/squaremap { }; From 8deeeb02197d67234ca8549d6876383a368f47f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Jun 2020 10:11:50 +0200 Subject: [PATCH 1371/3452] abcmidi: 2020.03.25 -> 2020.06.07 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 0ccfaa081c9a..1987b0a87c28 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2020.03.25"; + version = "2020.06.07"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "0rzif8idsja8ryhx0y4zdk8lhn36h10ahfjqa8bmif0rdbyab0kv"; + sha256 = "06jpawwm4zcss9mi2bjdbdkkfr8cw1q9cpzplq5r83z8pljqb12l"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase From f387cc88b4d8e7b93f4a3c1d073ce9ae012b675d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 10:20:34 +0200 Subject: [PATCH 1372/3452] nix-prefetch-github: remove duplicate doCheck --- .../development/python-modules/nix-prefetch-github/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index fbcaa1d1dc45..6ee4d937cfb7 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -35,9 +35,6 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-black pytestcov pytest-isort git ]; - # aiohttp is not supported on 3.8 yet - doCheck = pythonOlder "3.8"; - # latest version of isort will cause tests to fail # ignore tests which are impure disabledTests = [ "isort" "life" "outputs" "fetch_submodules" ]; From 92aa60918f75dd0d2e72011fb52466a1917094ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 11 Jun 2020 10:22:20 +0200 Subject: [PATCH 1373/3452] nixos i18n.supportedLocales: increase systemPackages priority https://discourse.nixos.org/t/conflict-between-glibc-and-glibclocales-workaround-inside/7608 --- nixos/modules/config/i18n.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index cc2ddda9d32f..feb76581a720 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -68,7 +68,8 @@ with lib; config = { environment.systemPackages = - optional (config.i18n.supportedLocales != []) config.i18n.glibcLocales; + # We increase the priority a little, so that plain glibc in systemPackages can't win. + optional (config.i18n.supportedLocales != []) (lib.setPrio (-1) config.i18n.glibcLocales); environment.sessionVariables = { LANG = config.i18n.defaultLocale; From 30f2b771b58aaf8860adabb6d18e313fd446b910 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 10:22:40 +0200 Subject: [PATCH 1374/3452] python: google-api-python-client: 1.9.1 -> 1.9.3 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index c70496b2b9fa..98e0c8712b34 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.9.1"; + version = "1.9.3"; src = fetchPypi { inherit pname version; - sha256 = "0nfqf62g3l7ij779ind41p800ahdjijkhqx8nq6y029p98672c52"; + sha256 = "220349ce189a85229fc46875d467101318495a4a735c0ff2f165b9bdbc7511a0"; }; # No tests included in archive From 2a1ad53bd879ba162e19c1a9ac6d3b8317e7df78 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 10:23:01 +0200 Subject: [PATCH 1375/3452] python: google-api-core: 1.17.0 -> 1.20.0 --- pkgs/development/python-modules/google_api_core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index 1efec99d8f72..233ba6ff0cbd 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.17.0"; + version = "1.20.0"; disabled = isPy27; # google namespace no longer works on python2 src = fetchPypi { inherit pname version; - sha256 = "12fn05x2fdhqmcaspjkkny2lh66hnnl0xf6pz3idxhlx8w5jl274"; + sha256 = "eec2c302b50e6db0c713fb84b71b8d75cfad5dc6d4dffc78e9f69ba0008f5ede"; }; propagatedBuildInputs = [ From 7e39a62745f46fc6f58f7d78b0254ea03b673c4c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 10:23:54 +0200 Subject: [PATCH 1376/3452] python: google-auth: 1.16.0 -> 1.17.0 --- pkgs/development/python-modules/google_auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix index 92369abec6d3..240804e8080a 100644 --- a/pkgs/development/python-modules/google_auth/default.nix +++ b/pkgs/development/python-modules/google_auth/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "1.16.0"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "1xd7fi7vhqbbkvwjg5fgj8bkbfjwxx4f2bb0zsnj8wci46qk4dqv"; + sha256 = "2f35b33801a41e4115cd93ff0aeb152f383edc0e27277ae28be2dccf238611b9"; }; propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ]; From 9c9826eb44e4ed86aee65bfd09fc126ebb7dc69b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 10:39:36 +0200 Subject: [PATCH 1377/3452] python.pkgs.python-jose: disable failing test --- .../python-modules/python-jose/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index d6986f06975a..09a424583110 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -1,6 +1,7 @@ { stdenv, buildPythonPackage, fetchFromGitHub , future, six, ecdsa, rsa -, pycrypto, pytest, pytestcov, pytestrunner, cryptography +, pycrypto, pytestcov, pytestrunner, cryptography +, pytestCheckHook }: buildPythonPackage rec { @@ -16,17 +17,16 @@ buildPythonPackage rec { checkInputs = [ pycrypto - pytest + pytestCheckHook pytestcov pytestrunner cryptography # optional dependency, but needed in tests ]; - checkPhase = '' - py.test - ''; - # https://github.com/mpdavis/python-jose/issues/149 - PYTEST_ADDOPTS = "-k 'not test_invalid_claims_json and not test_invalid_claims'"; + disabledTests = [ + # https://github.com/mpdavis/python-jose/issues/176 + "test_key_too_short" + ]; propagatedBuildInputs = [ future six ecdsa rsa ]; From cc49cadbba470b6f37d59d738f6b901d37a901c1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 10:48:00 +0200 Subject: [PATCH 1378/3452] python.pkgs.junit-xml: 1.8 -> 1.9 --- .../python-modules/junit-xml/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/junit-xml/default.nix b/pkgs/development/python-modules/junit-xml/default.nix index 7c5ffc9fad5a..84acd49792d2 100644 --- a/pkgs/development/python-modules/junit-xml/default.nix +++ b/pkgs/development/python-modules/junit-xml/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , six , pytest , pytest-sugar @@ -8,11 +8,15 @@ buildPythonPackage rec { pname = "junit-xml"; - version = "1.8"; + version = "1.9"; - src = fetchPypi { - inherit pname version; - sha256 = "08fw86azza6d3l3nx34kq69cpwmmfqpn7xrb8pdlxmhr1941qbv0"; + # Only a wheel on PyPI + src = fetchFromGitHub { + owner = "kyrus"; + repo = "python-junit-xml"; + # No tags...sigh + rev = "856414648cbab3f64e69b856bc25cea8b9aa0377"; + sha256 = "1sg03mv7dk3x4mjxjg127vqjmx0ms7v3a5aibxrclxlhmdqcgvb2"; }; propagatedBuildInputs = [ six ]; From 19a6a3fc9fcba2fe66d7bd44c5962fe7cd094e26 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 10:49:49 +0200 Subject: [PATCH 1379/3452] python.pkgs.cfn-lint: fix build --- pkgs/development/python-modules/cfn-lint/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 6806ecb5054a..1b940fa2c4e8 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -12,6 +12,8 @@ , jsonschema , pathlib2 , setuptools +, junit-xml +, networkx }: buildPythonPackage rec { @@ -32,6 +34,8 @@ buildPythonPackage rec { jsonschema pathlib2 setuptools + junit-xml + networkx ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ]; # No tests included in archive From 4162b7b08166327c6922d04d044eece291e45839 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 11:01:52 +0200 Subject: [PATCH 1380/3452] python.pkgs.jsonpickle: add missing dependency --- pkgs/development/python-modules/jsonpickle/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index 9c8410a79384..66e7d62aa839 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -4,6 +4,7 @@ , pytest , setuptools_scm , toml +, importlib-metadata }: buildPythonPackage rec { @@ -22,6 +23,10 @@ buildPythonPackage rec { toml ]; + propagatedBuildInputs = [ + importlib-metadata + ]; + checkPhase = '' rm pytest.ini pytest tests/jsonpickle_test.py From 0d72b5da2a84cc9a2d6f25080a0d803f1bf26506 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 11:06:56 +0200 Subject: [PATCH 1381/3452] python.pkgs.moto: fix build --- pkgs/development/python-modules/moto/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 0d45103a2952..3efc09bc0017 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -23,6 +23,7 @@ , werkzeug , xmltodict , parameterized +, idna }: buildPythonPackage rec { @@ -40,6 +41,14 @@ buildPythonPackage rec { sed -i '/datetime/d' setup.py # should be taken care of by std library ''; + patches = [ + # loosen idna upper limit + (fetchpatch { + url = "https://github.com/spulec/moto/commit/649b497f71cce95a6474a3ff6f3c9c3339efb68f.patch"; + sha256 = "03qdybzlskgbdadmlcg6ayxfp821b5iaa8q2542cwkcq7msqbbqc"; + }) + ]; + propagatedBuildInputs = [ aws-xray-sdk boto @@ -60,6 +69,7 @@ buildPythonPackage rec { sshpubkeys werkzeug xmltodict + idna ] ++ lib.optionals isPy27 [ backports_tempfile ]; checkInputs = [ boto3 freezegun nose sure parameterized ]; From 41010cf832f001b09cc0eec78b11f0c8f35f131c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 11:36:17 +0200 Subject: [PATCH 1382/3452] python.pkgs.pep517: init at 0.8.2 --- .../python-modules/pep517/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/pep517/default.nix diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix new file mode 100644 index 000000000000..1eb2895068a2 --- /dev/null +++ b/pkgs/development/python-modules/pep517/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flit-core +, toml +, pythonOlder +, importlib-metadata +, zipp +, pytestCheckHook +, testpath +, mock +, pip +}: + +buildPythonPackage rec { + pname = "pep517"; + version = "0.8.2"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "8e6199cf1288d48a0c44057f112acf18aa5ebabbf73faa242f598fbe145ba29e"; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + toml + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata zipp + ]; + + checkInputs = [ + pytestCheckHook + testpath + mock + pip + ]; + + preCheck = '' + rm pytest.ini # wants flake8 + rm tests/test_meta.py # wants to run pip + ''; + + meta = { + description = "Wrappers to build Python packages using PEP 517 hooks"; + license = lib.licenses.mit; + homepage = "https://github.com/pypa/pep517"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d3c597184fc..ed2c66320565 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5018,6 +5018,8 @@ in { pep257 = callPackage ../development/python-modules/pep257 { }; + pep517 = callPackage ../development/python-modules/pep517 { }; + percol = callPackage ../development/python-modules/percol { }; pexif = callPackage ../development/python-modules/pexif { }; From f3a693122c38f8baabebb97ac31bbb7d0237e0fa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 11:36:29 +0200 Subject: [PATCH 1383/3452] python.pkgs.build: init at 0.0.3.1 --- .../python-modules/build/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/build/default.nix diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix new file mode 100644 index 000000000000..baf583c45e0b --- /dev/null +++ b/pkgs/development/python-modules/build/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flit-core +, toml +, pep517 +, packaging +, isPy3k +, typing +, pythonOlder +, importlib-metadata +}: + +buildPythonPackage rec { + pname = "build"; + version = "0.0.3.1"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "757b5542168326b6f1898a1ce1131bb2cf306ee4c7e54e39c815c5be217ff87d"; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + toml + pep517 + packaging + ] ++ lib.optionals (!isPy3k) [ + typing + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "A simple, correct PEP517 package builder"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed2c66320565..69f1fdba77db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -534,6 +534,8 @@ in { breezy = callPackage ../development/python-modules/breezy { }; + build = callPackage ../development/python-modules/build { }; + ciso8601 = callPackage ../development/python-modules/ciso8601 { }; deepdiff = callPackage ../development/python-modules/deepdiff { }; From 418b67bad858dc064567cb783b8dcc89301e1c44 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 11:48:09 +0200 Subject: [PATCH 1384/3452] python.pkgs.lazy: init at 1.4 --- .../python-modules/lazy/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/lazy/default.nix diff --git a/pkgs/development/python-modules/lazy/default.nix b/pkgs/development/python-modules/lazy/default.nix new file mode 100644 index 000000000000..ff967d62dc6f --- /dev/null +++ b/pkgs/development/python-modules/lazy/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "lazy"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "2c6d27a5ab130fb85435320651a47403adcb37ecbcc501b0c6606391f65f5b43"; + extension = "zip"; + }; + + meta = { + description = "Lazy attributes for Python objects"; + license = lib.licenses.bsd2; + homepage = "https://github.com/stefanholek/lazy"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 69f1fdba77db..7cfe411f08d0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3069,6 +3069,8 @@ in { latexcodec = callPackage ../development/python-modules/latexcodec {}; + lazy = callPackage ../development/python-modules/lazy { }; + libmodulemd = pipe pkgs.libmodulemd [ toPythonModule From e8a60ee4120b0643cf4f4f941bf47227402354d2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 11:49:12 +0200 Subject: [PATCH 1385/3452] python.pkgs.devpi-common: fix build --- pkgs/development/python-modules/devpi-common/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 39ea809381a1..ac83c0dd938d 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -3,6 +3,7 @@ , py , pytest , pytest-flake8 +, lazy }: buildPythonPackage rec { @@ -14,7 +15,11 @@ buildPythonPackage rec { sha256 = "4f1eb1bf85a5dabd4f4ecc11ad99588e01cc204989a9f424c2dbe5809c6c3745"; }; - propagatedBuildInputs = [ requests py ]; + propagatedBuildInputs = [ + requests + py + lazy + ]; checkInputs = [ pytest pytest-flake8 ]; checkPhase = '' From 28a1fffbecc913c05d8fe6d57192bd6371159e98 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 12:05:21 +0200 Subject: [PATCH 1386/3452] python2.pkgs.dulwich: keep 0.19.16 for python 2 --- .../python-modules/dulwich/0_19.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 7 +++-- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/python-modules/dulwich/0_19.nix diff --git a/pkgs/development/python-modules/dulwich/0_19.nix b/pkgs/development/python-modules/dulwich/0_19.nix new file mode 100644 index 000000000000..82b9bed492cc --- /dev/null +++ b/pkgs/development/python-modules/dulwich/0_19.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi +, urllib3, certifi +, gevent, geventhttpclient, mock, fastimport +, git, glibcLocales }: + +buildPythonPackage rec { + version = "0.19.16"; + pname = "dulwich"; + + src = fetchPypi { + inherit pname version; + sha256 = "f74561c448bfb6f04c07de731c1181ae4280017f759b0bb04fa5770aa84ca850"; + }; + + LC_ALL = "en_US.UTF-8"; + + propagatedBuildInputs = [ urllib3 certifi ]; + + # Only test dependencies + checkInputs = [ git glibcLocales gevent geventhttpclient mock fastimport ]; + + doCheck = !stdenv.isDarwin; + + meta = with stdenv.lib; { + description = "Simple Python implementation of the Git file formats and protocols"; + homepage = "https://samba.org/~jelmer/dulwich/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7cfe411f08d0..e64626faaaf8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3652,9 +3652,10 @@ in { duckdb = pkgs.duckdb; }; - dulwich = callPackage ../development/python-modules/dulwich { - inherit (pkgs) git glibcLocales; - }; + dulwich = if isPy3k then + callPackage ../development/python-modules/dulwich { } + else + callPackage ../development/python-modules/dulwich/0_19.nix { }; hg-git = callPackage ../development/python-modules/hg-git { }; From 1a012f3fa7e9e9cb8f40d1e400f7cc90584e1a6e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 12:07:46 +0200 Subject: [PATCH 1387/3452] python2.pkgs.soupsieve: keep 1.9.6 for python 2 --- .../python-modules/soupsieve/1.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 ++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/soupsieve/1.nix diff --git a/pkgs/development/python-modules/soupsieve/1.nix b/pkgs/development/python-modules/soupsieve/1.nix new file mode 100644 index 000000000000..bb5ecbc839c2 --- /dev/null +++ b/pkgs/development/python-modules/soupsieve/1.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, beautifulsoup4 +, isPy3k +, backports_functools_lru_cache +}: + +buildPythonPackage rec { + pname = "soupsieve"; + version = "1.9.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "7985bacc98c34923a439967c1a602dc4f1e15f923b6fcf02344184f86cc7efaa"; + }; + + checkPhase = '' + py.test + ''; + + checkInputs = [ pytest beautifulsoup4 ]; + + propagatedBuildInputs = lib.optional (!isPy3k) backports_functools_lru_cache; + + # Circular test dependency on beautifulsoup4 + doCheck = false; + + meta = { + description = "A CSS4 selector implementation for Beautiful Soup"; + license = lib.licenses.mit; + homepage = "https://github.com/facelessuser/soupsieve"; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e64626faaaf8..d30076e2a23c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6349,7 +6349,10 @@ in { sorl_thumbnail = callPackage ../development/python-modules/sorl_thumbnail { }; - soupsieve = callPackage ../development/python-modules/soupsieve { }; + soupsieve = if isPy3k then + callPackage ../development/python-modules/soupsieve { } + else + callPackage ../development/python-modules/soupsieve/1.nix { }; sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { }; From 98381679c82bcd1970276f444ca37e806e80e43a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 12:10:11 +0200 Subject: [PATCH 1388/3452] python.pkgs.nbsphinx: python3 only --- pkgs/development/python-modules/nbsphinx/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 551837cf29ea..9b96bc12d647 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -8,6 +8,7 @@ , sphinx , traitlets , python +, isPy3k }: buildPythonPackage rec { @@ -32,6 +33,8 @@ buildPythonPackage rec { ${python.interpreter} -m nbsphinx ''; + disabled = !isPy3k; + meta = with lib; { description = "Jupyter Notebook Tools for Sphinx"; homepage = "https://nbsphinx.readthedocs.io/"; From 0b292e7ee3003b4c5b34d97f0be555797da1c205 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 12:13:11 +0200 Subject: [PATCH 1389/3452] python2.pkgs.sympy: keep 1.5.1 for python2 for sage --- pkgs/development/python-modules/sympy/1_5.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 ++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/sympy/1_5.nix diff --git a/pkgs/development/python-modules/sympy/1_5.nix b/pkgs/development/python-modules/sympy/1_5.nix new file mode 100644 index 000000000000..3a03fae154d7 --- /dev/null +++ b/pkgs/development/python-modules/sympy/1_5.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, glibcLocales +, mpmath +}: + +buildPythonPackage rec { + pname = "sympy"; + version = "1.5.1"; # Upgrades may break sage. Please test or ping @timokau. + + src = fetchPypi { + inherit pname version; + sha256 = "d77901d748287d15281f5ffe5b0fef62dd38f357c2b827c44ff07f35695f4e7e"; + }; + + checkInputs = [ glibcLocales ]; + + propagatedBuildInputs = [ mpmath ]; + + # tests take ~1h + doCheck = false; + pythonImportsCheck = [ "sympy" ]; + + preCheck = '' + export LANG="en_US.UTF-8" + ''; + + meta = with lib; { + description = "A Python library for symbolic mathematics"; + homepage = "https://www.sympy.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ lovek323 timokau ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d30076e2a23c..12440d53c2aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6299,7 +6299,10 @@ in { symengine = pkgs.symengine; }; - sympy = callPackage ../development/python-modules/sympy { }; + sympy = if isPy3k then + callPackage ../development/python-modules/sympy { } + else + callPackage ../development/python-modules/sympy/1_5.nix { }; pilkit = callPackage ../development/python-modules/pilkit { }; From 1becbef8d93ff2e7208a5573f4aa0fff06f40eca Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 12:38:23 +0200 Subject: [PATCH 1390/3452] python.pkgs.keyring: fix build --- pkgs/development/python-modules/keyring/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index a8e71040eaa5..9495245ea6cb 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -6,6 +6,7 @@ , pytest-flake8 , secretstorage , setuptools_scm +, toml }: buildPythonPackage rec { @@ -18,7 +19,10 @@ buildPythonPackage rec { sha256 = "c53e0e5ccde3ad34284a40ce7976b5b3a3d6de70344c3f8ee44364cc340976ec"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ + setuptools_scm + toml + ]; checkInputs = [ pytest pytest-flake8 ]; From 9181f79289204c4aca7bd38719947ca202b907f8 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 11 Jun 2020 12:41:59 +0200 Subject: [PATCH 1391/3452] linux: enable force feedback support in HID drivers --- pkgs/os-specific/linux/kernel/common-config.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 06ed2cf15598..a6b362ca35fd 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -639,6 +639,14 @@ let # enabled by default in x86_64 but not arm64, so we do that here HIDRAW = yes; + HID_ACRUX_FF = yes; + DRAGONRISE_FF = yes; + HOLTEK_FF = yes; + SONY_FF = yes; + SMARTJOYPLUS_FF = yes; + THRUSTMASTER_FF = yes; + ZEROPLUS_FF = yes; + MODULE_COMPRESS = yes; MODULE_COMPRESS_XZ = yes; KERNEL_XZ = yes; From 06ef649346b99be954f4ee8d130ddd3eae41c9a4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 12:46:16 +0200 Subject: [PATCH 1392/3452] mitmproxy: keep using python37 until asynctest is fixed --- 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 679f6a6c852c..8fe571976b2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5228,7 +5228,9 @@ in mirrorbits = callPackage ../servers/mirrorbits { }; - mitmproxy = callPackage ../tools/networking/mitmproxy { }; + mitmproxy = callPackage ../tools/networking/mitmproxy { + python3Packages = python37Packages; + }; mjpegtools = callPackage ../tools/video/mjpegtools { }; From df412d462f698d0ac1404c2bfe00c456354e1669 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 12:46:16 +0200 Subject: [PATCH 1393/3452] mitmproxy: keep using python37 until asynctest is fixed --- 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 679f6a6c852c..8fe571976b2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5228,7 +5228,9 @@ in mirrorbits = callPackage ../servers/mirrorbits { }; - mitmproxy = callPackage ../tools/networking/mitmproxy { }; + mitmproxy = callPackage ../tools/networking/mitmproxy { + python3Packages = python37Packages; + }; mjpegtools = callPackage ../tools/video/mjpegtools { }; From 890931af22a652696d7e2841029b0b1e8906cfb6 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 11 Jun 2020 13:24:53 +0200 Subject: [PATCH 1394/3452] carla: 2.1 -> 2.1.1 --- pkgs/applications/audio/carla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index bf297d8a83ca..357f30012880 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "074y40yrgl3qrdr3a5vn0scsw0qv77r5p5m6gc89zhf20ic8ajzc"; + sha256 = "0c3y4a6cgi4bv1mg57i3qn5ia6pqjqlaylvkapj6bmpsw71ig22g"; }; nativeBuildInputs = [ From dcc4324df471bd146e74b4555e29db1aca8e10ed Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 13:57:36 +0200 Subject: [PATCH 1395/3452] python2.pkgs.biopython: python2 no longer supported --- pkgs/development/python-modules/biopython/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 773d8193cb02..f96b8447e8a8 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , numpy +, isPy3k }: buildPythonPackage rec { @@ -13,6 +14,8 @@ buildPythonPackage rec { sha256 = "fb1936e9ca9e7af8de1050e84375f23328e04b801063edf0ad73733494d8ec42"; }; + disabled = !isPy3k; + propagatedBuildInputs = [ numpy ]; # Checks try to write to $HOME, which does not work with nix doCheck = false; From f49764d8b52539b3b841b407931bb2983af2341a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 14:01:09 +0200 Subject: [PATCH 1396/3452] python.pkgs.twill: fix build --- pkgs/development/python-modules/twill/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index 15953a923b81..4466724ffe19 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -1,10 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, nose }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, nose +, lxml +, requests +, pyparsing +}: buildPythonPackage rec { pname = "twill"; version = "2.0"; - disabled = isPy3k; - src = fetchPypi { inherit pname version; sha256 = "225e114da85555d50433a1e242ed4215fe613c30072d13fbe4c4aacf0ad53b0a"; @@ -12,6 +14,12 @@ buildPythonPackage rec { checkInputs = [ nose ]; + propagatedBuildInputs = [ + lxml + requests + pyparsing + ]; + doCheck = false; # pypi package comes without tests, other homepage does not provide all verisons meta = with lib; { From 2f72c426e19b07915e706e2c615e07ea72e9d7e4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 14:09:51 +0200 Subject: [PATCH 1397/3452] python.pkgs.apsw: 3.30.1-r1 -> 3.32.2-r1 --- pkgs/development/python-modules/apsw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index cd6e40c119c0..48aa68f30540 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.30.1-r1"; + version = "3.32.2-r1"; disabled = isPyPy; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = version; - sha256 = "1zp38gj44bmzfxxpvgd7nixkp8vs2fpl839ag8vrh9z70dax22f0"; + sha256 = "0gwhcvklrgng8gg6in42h0aj2bsq522bhhs2pp3cqdrmypkjdm59"; }; buildInputs = [ sqlite ]; From 6594184e1e326ffcacbb47e8c12eb8e765826365 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 14:13:08 +0200 Subject: [PATCH 1398/3452] python3.pkgs.pytest-pylint: fix build --- pkgs/development/python-modules/pytest-pylint/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix index dba087bf6909..f7a9a3143065 100644 --- a/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/pkgs/development/python-modules/pytest-pylint/default.nix @@ -6,6 +6,7 @@ , pylint , six , pytestrunner +, toml }: buildPythonPackage rec { @@ -18,12 +19,13 @@ buildPythonPackage rec { sha256 = "b0c177d63f6e3f5b82fa2720a6570dd2ecff1616c26ed6d02d0cbf75fd98ddf9"; }; - buildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ pytest pylint six + toml ]; # tests not included with release From 35556acf6e49d6768f7c7f28d848579caad19e78 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 14:18:20 +0200 Subject: [PATCH 1399/3452] python.pkgs.python-daemon: use older pytest It was supposedly working with 5.3, but now the only older version we have is 4, so let's use that. --- pkgs/development/python-modules/python-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index e33aee6c1c91..d8b501d62e5a 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -2,7 +2,7 @@ , docutils , lockfile , mock -, pytest +, pytest_4 , testscenarios , twine }: @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ twine ]; propagatedBuildInputs = [ docutils lockfile ]; - checkInputs = [ pytest mock testscenarios ]; + checkInputs = [ pytest_4 mock testscenarios ]; checkPhase = '' pytest -k 'not detaches_process_context \ and not standard_stream_file_descriptors' From 77d893eea3a5dcc035b92123be44aae82b5014c8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 14:18:20 +0200 Subject: [PATCH 1400/3452] python.pkgs.python-daemon: use older pytest It was supposedly working with 5.3, but now the only older version we have is 4, so let's use that. --- pkgs/development/python-modules/python-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index e33aee6c1c91..d8b501d62e5a 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -2,7 +2,7 @@ , docutils , lockfile , mock -, pytest +, pytest_4 , testscenarios , twine }: @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ twine ]; propagatedBuildInputs = [ docutils lockfile ]; - checkInputs = [ pytest mock testscenarios ]; + checkInputs = [ pytest_4 mock testscenarios ]; checkPhase = '' pytest -k 'not detaches_process_context \ and not standard_stream_file_descriptors' From c0a7634bba995aa97579978ab5280d21a80c6d96 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 14:25:54 +0200 Subject: [PATCH 1401/3452] python.pkgs.scikitlearn: fix build --- pkgs/development/python-modules/scikitlearn/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index d806e562b5d5..a9bbad04ea78 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -8,6 +8,7 @@ , cython , joblib , llvmPackages +, threadpoolctl }: buildPythonPackage rec { @@ -38,6 +39,7 @@ buildPythonPackage rec { scipy numpy.blas joblib + threadpoolctl ]; checkInputs = [ pytest ]; From 271b696d931c369118dbfd2d28c20faeeb337b6a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 14:28:50 +0200 Subject: [PATCH 1402/3452] python.pkgs.flask-compress: fix build --- pkgs/development/python-modules/flask-compress/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index b9c73d7048e2..cf9abdc596ab 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchPypi, buildPythonPackage, flask }: +{ stdenv, fetchPypi, buildPythonPackage, flask +, brotli +}: buildPythonPackage rec { version = "1.5.0"; @@ -9,7 +11,7 @@ buildPythonPackage rec { sha256 = "f367b2b46003dd62be34f7fb1379938032656dca56377a9bc90e7188e4289a7c"; }; - propagatedBuildInputs = [ flask ]; + propagatedBuildInputs = [ flask brotli ]; meta = with stdenv.lib; { description = "Compress responses in your Flask app with gzip"; From 31e1a8b002c8f1f296da7eff887433febd430d27 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 11 Jun 2020 14:43:01 +0200 Subject: [PATCH 1403/3452] python.pkgs.requests-mock: fix build --- pkgs/development/python-modules/requests-mock/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/requests-mock/default.nix b/pkgs/development/python-modules/requests-mock/default.nix index 9a08480827dc..5e85ba7d38bd 100644 --- a/pkgs/development/python-modules/requests-mock/default.nix +++ b/pkgs/development/python-modules/requests-mock/default.nix @@ -5,6 +5,7 @@ , six , testrepository , testtools +, pytest }: buildPythonPackage rec { @@ -22,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests six ]; - checkInputs = [ mock purl testrepository testtools ]; + checkInputs = [ mock purl testrepository testtools pytest ]; meta = with lib; { description = "Mock out responses from the requests package"; From 0cbf4c87f975385f751ba90e6e88c0014538cf2c Mon Sep 17 00:00:00 2001 From: Philipp Mildenberger Date: Thu, 11 Jun 2020 12:50:37 +0200 Subject: [PATCH 1404/3452] nushell: 0.14.0 -> 0.15.0 --- pkgs/shells/nushell/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index ecef2fc436e5..5994e2829ed6 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -10,21 +10,20 @@ , AppKit , Security , withStableFeatures ? true -, withTestBinaries ? true }: rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1g289zma19mh85xl5ffq1f3cv76piqavbhzs9m55mkg9wrhmgljd"; + sha256 = "1s08shhg826hbpcjzlhwj0r5qqckz8rv2xjg22rz1qvsjyhkmv7r"; }; - cargoSha256 = "16a32q2la7f4628m947dwif3j3wszsy603sj29ch6l2vdab40i3p"; + cargoSha256 = "0lz7119znpxyaj9ac1skfbx0s0dkh3hwk00g0zjn3r6k8fh9gj4d"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; @@ -36,19 +35,10 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = lib.optional withStableFeatures "--features stable"; - cargoTestFlags = lib.optional withTestBinaries "--features test-bins"; - preCheck = '' export HOME=$TMPDIR ''; - checkPhase = '' - runHook preCheck - echo "Running cargo cargo test ${lib.strings.concatStringsSep " " cargoTestFlags} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" - cargo test ${lib.strings.concatStringsSep " " cargoTestFlags} -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} - runHook postCheck - ''; - meta = with lib; { description = "A modern shell written in Rust"; homepage = "https://www.nushell.sh/"; From 20f710cac5ef8bbe7bf40192c13dcc74c756a8de Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 11 Jun 2020 14:31:44 +0200 Subject: [PATCH 1405/3452] unetbootin: 677 -> 681 --- pkgs/tools/cd-dvd/unetbootin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index d81790d66a85..ae9e6724facc 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "unetbootin"; - version = "677"; + version = "681"; src = fetchFromGitHub { owner = "unetbootin"; repo = "unetbootin"; rev = version; - sha256 = "1mk6179r2lz2d0pvln1anvf5p4l7vfrnnnlhgyx2dlx6pfacsspy"; + sha256 = "0ppqb7ywh4cpcjr5nw6f65dx4s8kx09gnhihnby3zjhxdf4l99fm"; }; setSourceRoot = '' From 5a416c00498512ce9ddced8f3b43ca165c3e11e4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 11 Jun 2020 15:48:07 +0200 Subject: [PATCH 1406/3452] gdk-pixbuf-xlib: fix pc file It had incorrect include path and did not propagate dependencies correctly. --- pkgs/development/libraries/gdk-pixbuf/xlib.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/xlib.nix b/pkgs/development/libraries/gdk-pixbuf/xlib.nix index e5f1718f0751..53414d921288 100644 --- a/pkgs/development/libraries/gdk-pixbuf/xlib.nix +++ b/pkgs/development/libraries/gdk-pixbuf/xlib.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "Archive"; repo = "gdk-pixbuf-xlib"; - rev = "dc22ea36f69755007c66877284596df270532cc1"; - sha256 = "XhBQ4wano+MtGaqF6JNKoWgYQN6eBW+b8ZCGEBGt8IM="; + rev = "19482794a621d542b223219940e836257d4ae2c9"; + sha256 = "7Qv6tyjR0/iFXYHx5jPhvLLLt0Ms2nzpyWw02oXTkZc="; }; nativeBuildInputs = [ @@ -33,12 +33,9 @@ stdenv.mkDerivation rec { gtk-doc ]; - buildInputs = [ - libX11 - ]; - propagatedBuildInputs = [ gdk-pixbuf + libX11 ]; mesonFlags = [ From 4bb1995cab59d32beb5c50288aed801de060bfb9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 11 Jun 2020 15:50:38 +0200 Subject: [PATCH 1407/3452] icewm: fix build gdk-pixbuf-xlib was split into a separate package. --- pkgs/applications/window-managers/icewm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index b6b07d8d7278..05cca88e6195 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, gettext, perl, asciidoc , libjpeg, libtiff, libungif, libpng, imlib, expat -, freetype, fontconfig, pkgconfig, gdk-pixbuf +, freetype, fontconfig, pkgconfig, gdk-pixbuf, gdk-pixbuf-xlib, glib , mkfontdir, libX11, libXft, libXext, libXinerama , libXrandr, libICE, libSM, libXpm, libXdmcp, libxcb , libpthreadstubs, pcre, libXdamage, libXcomposite, libXfixes @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext libjpeg libtiff libungif libpng imlib expat - freetype fontconfig gdk-pixbuf mkfontdir libX11 + freetype fontconfig gdk-pixbuf gdk-pixbuf-xlib glib mkfontdir libX11 libXft libXext libXinerama libXrandr libICE libSM libXpm libXdmcp libxcb libpthreadstubs pcre libsndfile fribidi libXdamage libXcomposite libXfixes From 6fb11e5227ec84acee9ac9e28694583783ce0b61 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 11 Jun 2020 14:42:40 +0100 Subject: [PATCH 1408/3452] nixos/undervolt: add a warning for the `enable` option Also use the convenience `mkEnableOption` function for simplicity. --- nixos/modules/services/hardware/undervolt.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index e5ef0601de3c..284440975fe3 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -1,18 +1,13 @@ { config, pkgs, lib, ... }: with lib; - let cfg = config.services.undervolt; -in { +in +{ options.services.undervolt = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to undervolt intel cpus. - ''; - }; + enable = mkEnableOption + "Intel CPU undervolting service (WARNING: may permanently damage your hardware!)"; verbose = mkOption { type = types.bool; From f224b243db40b79d8d6bc65916cc7b419c555c12 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 11 Jun 2020 14:51:35 +0100 Subject: [PATCH 1409/3452] nixos/undervolt: fix up options' descriptions The default `undervolt` package does not accept floating point numbers for any of its numeric arguments. This also mentions in what units are the values expressed. --- nixos/modules/services/hardware/undervolt.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index 284440975fe3..1e89e74cad08 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -30,7 +30,7 @@ in type = types.nullOr types.str; default = null; description = '' - The amount of voltage to offset the CPU cores by. Accepts a floating point number. + The amount of voltage in mV to offset the CPU cores by. ''; }; @@ -38,7 +38,7 @@ in type = types.nullOr types.str; default = null; description = '' - The amount of voltage to offset the GPU by. Accepts a floating point number. + The amount of voltage in mV to offset the GPU by. ''; }; @@ -46,7 +46,7 @@ in type = types.nullOr types.str; default = null; description = '' - The amount of voltage to offset uncore by. Accepts a floating point number. + The amount of voltage in mV to offset uncore by. ''; }; @@ -54,7 +54,7 @@ in type = types.nullOr types.str; default = null; description = '' - The amount of voltage to offset analogio by. Accepts a floating point number. + The amount of voltage in mV to offset analogio by. ''; }; @@ -62,7 +62,7 @@ in type = types.nullOr types.str; default = null; description = '' - The temperature target. Accepts a floating point number. + The temperature target in Celsius degrees. ''; }; @@ -70,7 +70,7 @@ in type = types.nullOr types.str; default = null; description = '' - The temperature target on AC power. Accepts a floating point number. + The temperature target on AC power in Celsius degrees. ''; }; @@ -78,7 +78,7 @@ in type = types.nullOr types.str; default = null; description = '' - The temperature target on battery power. Accepts a floating point number. + The temperature target on battery power in Celsius degrees. ''; }; }; From 24e0e056541369dd8559c74bdf0f5060eb518b8c Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 11 Jun 2020 14:55:14 +0100 Subject: [PATCH 1410/3452] nixos/undervolt: use `int` type for numeric options --- nixos/modules/services/hardware/undervolt.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index 1e89e74cad08..2e6fadc26fc1 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -27,7 +27,7 @@ in }; coreOffset = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.int; default = null; description = '' The amount of voltage in mV to offset the CPU cores by. @@ -35,7 +35,7 @@ in }; gpuOffset = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.int; default = null; description = '' The amount of voltage in mV to offset the GPU by. @@ -43,7 +43,7 @@ in }; uncoreOffset = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.int; default = null; description = '' The amount of voltage in mV to offset uncore by. @@ -51,7 +51,7 @@ in }; analogioOffset = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.int; default = null; description = '' The amount of voltage in mV to offset analogio by. @@ -59,7 +59,7 @@ in }; temp = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.int; default = null; description = '' The temperature target in Celsius degrees. @@ -67,7 +67,7 @@ in }; tempAc = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.int; default = null; description = '' The temperature target on AC power in Celsius degrees. @@ -75,7 +75,7 @@ in }; tempBat = mkOption { - type = types.nullOr types.str; + type = types.nullOr types.int; default = null; description = '' The temperature target on battery power in Celsius degrees. @@ -104,14 +104,14 @@ in ExecStart = '' ${pkgs.undervolt}/bin/undervolt \ ${optionalString cfg.verbose "--verbose"} \ - ${optionalString (cfg.coreOffset != null) "--core ${cfg.coreOffset}"} \ - ${optionalString (cfg.coreOffset != null) "--cache ${cfg.coreOffset}"} \ - ${optionalString (cfg.gpuOffset != null) "--gpu ${cfg.gpuOffset}"} \ - ${optionalString (cfg.uncoreOffset != null) "--uncore ${cfg.uncoreOffset}"} \ - ${optionalString (cfg.analogioOffset != null) "--analogio ${cfg.analogioOffset}"} \ - ${optionalString (cfg.temp != null) "--temp ${cfg.temp}"} \ - ${optionalString (cfg.tempAc != null) "--temp-ac ${cfg.tempAc}"} \ - ${optionalString (cfg.tempBat != null) "--temp-bat ${cfg.tempBat}"} + ${optionalString (cfg.coreOffset != null) "--core ${toString cfg.coreOffset}"} \ + ${optionalString (cfg.coreOffset != null) "--cache ${toString cfg.coreOffset}"} \ + ${optionalString (cfg.gpuOffset != null) "--gpu ${toString cfg.gpuOffset}"} \ + ${optionalString (cfg.uncoreOffset != null) "--uncore ${toString cfg.uncoreOffset}"} \ + ${optionalString (cfg.analogioOffset != null) "--analogio ${toString cfg.analogioOffset}"} \ + ${optionalString (cfg.temp != null) "--temp ${toString cfg.temp}"} \ + ${optionalString (cfg.tempAc != null) "--temp-ac ${toString cfg.tempAc}"} \ + ${optionalString (cfg.tempBat != null) "--temp-bat ${toString cfg.tempBat}"} ''; }; }; From afae933693b8909caf758fed6e90f3d61c503dd6 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 11 Jun 2020 15:16:28 +0100 Subject: [PATCH 1411/3452] nixos/undervolt: simplify CLI args generation --- nixos/modules/services/hardware/undervolt.nix | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index 2e6fadc26fc1..da627af73bc6 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -3,6 +3,25 @@ with lib; let cfg = config.services.undervolt; + cliArgs = lib.cli.toGNUCommandLineShell {} { + inherit (cfg) + verbose + temp + ; + # `core` and `cache` are both intentionally set to `cfg.coreOffset` as according to the undervolt docs: + # + # Core or Cache offsets have no effect. It is not possible to set different offsets for + # CPU Core and Cache. The CPU will take the smaller of the two offsets, and apply that to + # both CPU and Cache. A warning message will be displayed if you attempt to set different offsets. + core = cfg.coreOffset; + cache = cfg.coreOffset; + gpu = cfg.gpuOffset; + uncore = cfg.uncoreOffset; + analogio = cfg.analogioOffset; + + temp-bat = cfg.tempBat; + temp-ac = cfg.tempAc; + }; in { options.services.undervolt = { @@ -95,24 +114,7 @@ in serviceConfig = { Type = "oneshot"; Restart = "no"; - - # `core` and `cache` are both intentionally set to `cfg.coreOffset` as according to the undervolt docs: - # - # Core or Cache offsets have no effect. It is not possible to set different offsets for - # CPU Core and Cache. The CPU will take the smaller of the two offsets, and apply that to - # both CPU and Cache. A warning message will be displayed if you attempt to set different offsets. - ExecStart = '' - ${pkgs.undervolt}/bin/undervolt \ - ${optionalString cfg.verbose "--verbose"} \ - ${optionalString (cfg.coreOffset != null) "--core ${toString cfg.coreOffset}"} \ - ${optionalString (cfg.coreOffset != null) "--cache ${toString cfg.coreOffset}"} \ - ${optionalString (cfg.gpuOffset != null) "--gpu ${toString cfg.gpuOffset}"} \ - ${optionalString (cfg.uncoreOffset != null) "--uncore ${toString cfg.uncoreOffset}"} \ - ${optionalString (cfg.analogioOffset != null) "--analogio ${toString cfg.analogioOffset}"} \ - ${optionalString (cfg.temp != null) "--temp ${toString cfg.temp}"} \ - ${optionalString (cfg.tempAc != null) "--temp-ac ${toString cfg.tempAc}"} \ - ${optionalString (cfg.tempBat != null) "--temp-bat ${toString cfg.tempBat}"} - ''; + ExecStart = "${pkgs.undervolt}/bin/undervolt ${cliArgs}"; }; }; From f86167fb12aa03a4b76900a55a8a8fe3d688fdd2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 08:37:18 +0000 Subject: [PATCH 1412/3452] abcl: 1.6.1 -> 1.7.0 --- pkgs/development/compilers/abcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index 005e4186b152..543ba6036e4a 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ant, jre, jdk}: stdenv.mkDerivation rec { pname = "abcl"; - version = "1.6.1"; + version = "1.7.0"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "04myiba6g0vij2ym2dmb0156k20ki2lz13dxwp2bk9kvjn2zg88b"; + sha256 = "0pbn5s22zygk6k0rzjc9g76220628lj1b3057gr0n4grl11p4lx5"; }; configurePhase = '' mkdir nix-tools From 21836f48599127d7e708dbf4bfbbe1d469a2cc8c Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Jun 2020 15:59:18 +0200 Subject: [PATCH 1413/3452] lsp-plugins: 1.1.19 -> 1.1.22 --- pkgs/applications/audio/lsp-plugins/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index ae3deccf8630..435da6440736 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,29 +1,19 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, makeWrapper +{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper , libsndfile, jack2Full , libGLU, libGL, lv2, cairo , ladspaH, php }: stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.1.19"; + version = "1.1.22"; src = fetchFromGitHub { owner = "sadko4u"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1wiph3vxhydc6mr9hn2c6crd4cx592l2zv0wrzgmpnlm1lflzpbg"; + sha256 = "0s0i0kf5nqxxywckg03fds1w7696ly60rnlljzqvp7qfgzps1r6c"; }; - patches = [ - # Fix build - # https://github.com/sadko4u/lsp-plugins/issues/104 - (fetchpatch { - url = "https://github.com/sadko4u/lsp-plugins/commit/4d901135fb82fa95e668b4d55d05e405f5e620d2.patch"; - excludes = [ "TODO.txt" ]; - sha256 = "1s028gqvahvwm1px4xxxawrw2zrwyszb1aq93f0kspf3g7lq27f1"; - }) - ]; - nativeBuildInputs = [ pkgconfig php makeWrapper ]; buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ]; From d838d2fdf9ea27c5e1fbbccc9204d583f6d07bfc Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Jun 2020 15:08:07 +0200 Subject: [PATCH 1414/3452] guitarix: 0.39.0 -> 0.40.0 --- pkgs/applications/audio/guitarix/default.nix | 106 +++++++++++++----- .../audio/guitarix/fix-build.patch | 10 ++ 2 files changed, 90 insertions(+), 26 deletions(-) create mode 100644 pkgs/applications/audio/guitarix/fix-build.patch diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index f94d27565e91..9b8475006ccf 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,8 +1,38 @@ -{ stdenv, fetchurl, fetchpatch, faust, gettext, intltool, pkgconfig, python2 -, avahi, bluez, boost, eigen, fftw, glib, glib-networking -, glibmm, gsettings-desktop-schemas, gtkmm2, libjack2 -, ladspaH, libav, libsndfile, lilv, lrdf, lv2, serd, sord, sratom -, wrapGAppsHook, zita-convolver, zita-resampler, curl, wafHook +{ stdenv +, fetchurl +, avahi +, bluez +, boost +, curl +, eigen +, fftw +, gettext +, glib +, glib-networking +, glibmm +, gnome3 +, gsettings-desktop-schemas +, gtk3 +, gtkmm3 +, hicolor-icon-theme +, intltool +, ladspaH +, libav +, libjack2 +, libsndfile +, lilv +, lrdf +, lv2 +, pkgconfig +, python2 +, sassc +, serd +, sord +, sratom +, wafHook +, wrapGAppsHook +, zita-convolver +, zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions }: @@ -12,43 +42,67 @@ in stdenv.mkDerivation rec { pname = "guitarix"; - version = "0.39.0"; + version = "0.40.0"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "1nn80m1qagfhvv69za60f0w6ck87vmk77qmqarj7fbr8avwg63s9"; + sha256 = "0q9050499hcj19hvbxb069vxh5yclawjg04vryh46lxm4sfy9g57"; }; - patches = [ - (fetchpatch { - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/guitarix-0.39.0-fix_faust_and_lv2_plugins.patch?id=8579b4dfe85e04303ad2d9771ed699f04ea7b7cf"; - stripLen = 1; - sha256 = "0pgkhi4v4vrzjnig0ggmz207q4x5iyk2n6rjj8s5lv15fia7qzp4"; - }) - ]; + # see: https://sourceforge.net/p/guitarix/bugs/105 + patches = [ ./fix-build.patch ]; - nativeBuildInputs = [ faust gettext intltool wrapGAppsHook pkgconfig python2 wafHook ]; + nativeBuildInputs = [ + gettext + hicolor-icon-theme + intltool + pkgconfig + python2 + wafHook + wrapGAppsHook + ]; buildInputs = [ - avahi bluez boost eigen fftw glib glibmm glib-networking.out - gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav - libsndfile lilv lrdf lv2 serd sord sratom zita-convolver - zita-resampler curl + avahi + bluez + boost + curl + eigen + fftw + glib + glib-networking.out + glibmm + gnome3.adwaita-icon-theme + gsettings-desktop-schemas + gtk3 + gtkmm3 + ladspaH + libav + libjack2 + libsndfile + lilv + lrdf + lv2 + sassc + serd + sord + sratom + zita-convolver + zita-resampler ]; - postPatch = '' - # Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72 - find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \ - -exec sed -i {} -e 's/const struct _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \; - ''; - + # this doesnt build, probably because we have the wrong faust version: + # "--faust" + # aproved versions are 2.20.2 and 2.15.11 wafConfigureFlags = [ + "--no-faust" + "--no-font-cache-update" "--shared-lib" "--no-desktop-update" "--enable-nls" "--install-roboto-font" "--includeresampler" - "--convolver-ffmpeg" + "--includeconvolver" ] ++ optional optimizationSupport "--optimization"; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/guitarix/fix-build.patch b/pkgs/applications/audio/guitarix/fix-build.patch new file mode 100644 index 000000000000..4a0e42677765 --- /dev/null +++ b/pkgs/applications/audio/guitarix/fix-build.patch @@ -0,0 +1,10 @@ +--- a/src/LV2/xputty/xfilepicker.cpp ++++ b/src/LV2/xputty/xfilepicker.cpp +@@ -191,6 +191,6 @@ + filepicker->selected_file = NULL; + filepicker->path = NULL; + filepicker->filter = NULL; +- asprintf(&filepicker->path, path); ++ asprintf(&filepicker->path, "%s", path); + assert(filepicker->path != NULL); + } From 5bb1c43fc6962b0625cbedf22a83939a12eaaa7b Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Jun 2020 14:16:48 +0200 Subject: [PATCH 1415/3452] yoshimi: 1.7.0.1 -> unstable-2020-01-19 fix build with lv2 1.18.0 --- pkgs/applications/audio/yoshimi/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index f8ea58fef3ce..2b0a89bbaf5b 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre +{ stdenv, fetchFromGitHub , alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre , libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkgconfig, zlib, xorg }: @@ -6,13 +6,15 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { pname = "yoshimi"; - version = "1.7.0.1"; + # Fix build with lv2 1.18: https://github.com/Yoshimi/yoshimi/pull/102/commits/86996cbb235f0fe138ae814a6758c2c8ba1c2a38 + version = "unstable-2020-05-10"; - src = fetchurl { - url = "mirror://sourceforge/yoshimi/${pname}-${version}.tar.bz2"; - sha256 = "1pkqrrr51vlxh96vy0c0rf5ijjvymys4brsw9rv1bdp1bb8izw6c"; + src = fetchFromGitHub { + owner = "Yoshimi"; + repo = pname; + rev = "86996cbb235f0fe138ae814a6758c2c8ba1c2a38"; + sha256 = "0bgcc5fbgwpdjircq00wlii30pakf45yzligpbnf02a554hh4j01"; }; - buildInputs = [ alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU libGL minixml zlib xorg.libpthreadstubs pcre From 269b95810b022a9728611bb31ecddceacf90e3d9 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Jun 2020 13:27:25 +0200 Subject: [PATCH 1416/3452] sorcer: fix build with lv2 1.18.0 --- pkgs/applications/audio/sorcer/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix index 7601f942868f..ad5f8fda1a99 100644 --- a/pkgs/applications/audio/sorcer/default.nix +++ b/pkgs/applications/audio/sorcer/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost cairomm cmake libsndfile lv2 ntk python ]; + postPatch = '' + # Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72 + find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \ + -exec sed -i {} -e 's/const struct _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \; + ''; + installPhase = '' make install cp -a ../presets/* "$out/lib/lv2" From 002e3cfbce62a8b55eba52af9c72d770e5b31547 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Jun 2020 13:17:46 +0200 Subject: [PATCH 1417/3452] ir.lv2: fix build with lv2 1.18.0 --- pkgs/applications/audio/ir.lv2/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index f9f58ab5ec1a..aa5eeae0a46c 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; + postPatch = '' + # Fix build with lv2 1.18: https://github.com/tomszilagyi/ir.lv2/pull/20 + find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \ + -exec sed -i {} -e 's/const struct _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \; + ''; + + postBuild = "make convert4chan"; installPhase = '' From 30e7c21e994f3a220099946bf09bcbf8a55c8d7c Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Jun 2020 13:13:25 +0200 Subject: [PATCH 1418/3452] infamousPlugins: fix build with lv2 1.18.0 --- pkgs/applications/audio/infamousPlugins/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix index 2cfe77ec291f..9ba835eb7eae 100644 --- a/pkgs/applications/audio/infamousPlugins/default.nix +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }: stdenv.mkDerivation rec { pname = "infamousPlugins"; @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1r72agk5nxf5k0mghcc2j90z43j5d9i7rqjmf49jfyqnd443isip"; }; + patches = [ + (fetchpatch { + url = "https://github.com/ssj71/infamousPlugins/commit/06dd967b4736ea886dc1dc07f882cb1563961582.patch"; + sha256 = "08xwh6px13y1gykaw103nhvjms7vgbgkcm0avh9f5d2d7aadq0l2"; + }) + ]; nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ]; From 63657a163d724861efcc8f0d506513082692f52d Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 5 Jun 2020 13:11:32 +0200 Subject: [PATCH 1419/3452] drumgizmo: fix build with lv2 1.18.0 --- pkgs/applications/audio/drumgizmo/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index 454befd55f9d..9e24c4a1c295 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, expat, glib, libjack2, libXext, libX11, libpng +{ stdenv, fetchurl, fetchpatch, alsaLib, expat, glib, libjack2, libXext, libX11, libpng , libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig, zita-resampler }: @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0bpbkzcr3znbwfdk79c14n5k5hh80iqlk2nc03q95vhimbadk8k7"; }; + patches = [ + # Fix build for lv2 1.18.0 + (fetchpatch { + url = "http://cgit.drumgizmo.org/plugingizmo.git/patch/?id=be64ddf9da525cd5c6757464efc966052731ba71"; + sha256 = "17w8g78i5avssc7m8rpw64ka3rai8dff81wfzir9cpxp8s2h44qf"; + extraPrefix = "plugin/plugingizmo/"; + stripLen = 1; + }) + ]; + configureFlags = [ "--enable-lv2" ]; buildInputs = [ From 955701709f8fff53fb0e9b09926b82f91b2f53c8 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 11 Jun 2020 14:29:15 +0200 Subject: [PATCH 1420/3452] p7zip: switch to maintained fork This the fork that true-upstream seems to prefer, see: https://www.7-zip.org/links.html --- .../archivers/p7zip/12-CVE-2016-9296.patch | 23 --------- .../archivers/p7zip/13-CVE-2017-17969.patch | 35 -------------- pkgs/tools/archivers/p7zip/default.nix | 47 +++++++------------ 3 files changed, 16 insertions(+), 89 deletions(-) delete mode 100644 pkgs/tools/archivers/p7zip/12-CVE-2016-9296.patch delete mode 100644 pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch diff --git a/pkgs/tools/archivers/p7zip/12-CVE-2016-9296.patch b/pkgs/tools/archivers/p7zip/12-CVE-2016-9296.patch deleted file mode 100644 index 42245c92c0aa..000000000000 --- a/pkgs/tools/archivers/p7zip/12-CVE-2016-9296.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Robert Luberda -Date: Sat, 19 Nov 2016 08:48:08 +0100 -Subject: Fix nullptr dereference (CVE-2016-9296) - -Patch taken from https://sourceforge.net/p/p7zip/bugs/185/ ---- - CPP/7zip/Archive/7z/7zIn.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CPP/7zip/Archive/7z/7zIn.cpp b/CPP/7zip/Archive/7z/7zIn.cpp -index b0c6b98..7c6dde2 100644 ---- a/CPP/7zip/Archive/7z/7zIn.cpp -+++ b/CPP/7zip/Archive/7z/7zIn.cpp -@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedStreams( - if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i]) - ThrowIncorrect(); - } -- HeadersSize += folders.PackPositions[folders.NumPackStreams]; -+ if (folders.PackPositions) -+ HeadersSize += folders.PackPositions[folders.NumPackStreams]; - return S_OK; - } - diff --git a/pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch b/pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch deleted file mode 100644 index a9787c4a9088..000000000000 --- a/pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: =?utf-8?q?Antoine_Beaupr=C3=A9?= -Date: Fri, 2 Feb 2018 11:11:41 +0100 -Subject: Heap-based buffer overflow in 7zip/Compress/ShrinkDecoder.cpp - -Origin: vendor, https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/27d7/attachment/CVE-2017-17969.patch -Forwarded: https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/#27d7 -Bug: https://sourceforge.net/p/p7zip/bugs/204/ -Bug-Debian: https://bugs.debian.org/888297 -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-17969 -Reviewed-by: Salvatore Bonaccorso -Last-Update: 2018-02-01 -Applied-Upstream: 18.00-beta ---- - CPP/7zip/Compress/ShrinkDecoder.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp -index 80b7e67..ca37764 100644 ---- a/CPP/7zip/Compress/ShrinkDecoder.cpp -+++ b/CPP/7zip/Compress/ShrinkDecoder.cpp -@@ -121,8 +121,13 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * - { - _stack[i++] = _suffixes[cur]; - cur = _parents[cur]; -+ if (cur >= kNumItems || i >= kNumItems) -+ break; - } -- -+ -+ if (cur >= kNumItems || i >= kNumItems) -+ break; -+ - _stack[i++] = (Byte)cur; - lastChar2 = (Byte)cur; - diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index d6ad699eaa8d..773d37f0b758 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,28 +1,17 @@ -{ stdenv, fetchurl, fetchpatch, lib, enableUnfree ? false }: +{ stdenv, fetchFromGitHub, lib, enableUnfree ? false }: stdenv.mkDerivation rec { pname = "p7zip"; - version = "16.02"; + version = "17.01"; - src = fetchurl { - url = "mirror://sourceforge/p7zip/p7zip_${version}_src_all.tar.bz2"; - sha256 = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f"; - }; - patches = [ - ./12-CVE-2016-9296.patch - ./13-CVE-2017-17969.patch - (fetchpatch { - name = "3-CVE-2018-5996.patch"; - url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/3-CVE-2018-5996.patch"; - sha256 = "1zivvkazmza0653i498ccp3zbpbpc7dvxl3zxwllbx41b6n589yp"; - }) - (fetchpatch { - name = "4-CVE-2018-10115.patch"; - url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/4-CVE-2018-10115.patch"; - sha256 = "1cr7q8gnrk9yp6dcvxaqi1yhdbgp964nkv65ls41mw1kdfm44zn6"; - }) - ]; + src = fetchFromGitHub { + owner = "szcnick"; + repo = pname; + rev = "v${version}"; + sha256 = "0gczdmypwbfnxzb11rjrrndjkkb3jzxfby2cchn5j8ysny13mfps"; + } + ; # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional postPatch = '' @@ -39,14 +28,15 @@ stdenv.mkDerivation rec { # (see DOC/License.txt, https://fedoraproject.org/wiki/Licensing:Unrar) rm -r CPP/7zip/Compress/Rar* find . -name makefile'*' -exec sed -i '/Rar/d' {} + + chmod +x install.sh ''; preConfigure = '' makeFlagsArray=(DEST_HOME=$out) - buildFlags=all3 - '' + stdenv.lib.optionalString stdenv.isDarwin '' - cp makefile.macosx_llvm_64bits makefile.machine - ''; + buildFlags=all3 + '' + stdenv.lib.optionalString stdenv.isDarwin '' + cp makefile.macosx_llvm_64bits makefile.machine +''; enableParallelBuilding = true; @@ -55,15 +45,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = { - homepage = "http://p7zip.sourceforge.net/"; - description = "A port of the 7-zip archiver"; + homepage = "https://github.com/szcnick/p7zip"; + description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)"; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.raskin ]; - knownVulnerabilities = [ - # p7zip is abandoned, according to this thread on its forums: - # https://sourceforge.net/p/p7zip/discussion/383043/thread/fa143cf2/#1817 - "p7zip is abandoned and may not receive important security fixes" - ]; # RAR code is under non-free UnRAR license, but we remove it license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus; }; From d60b5aaa2fbc68fa1609c30ee2f805f575c4a3f5 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 7 Jun 2020 09:02:13 +0300 Subject: [PATCH 1421/3452] wrapMpv: Use lib.strings.escapeShellArgs Instead of manually quoting the strings, use the library function to do it more reliably. --- pkgs/applications/video/mpv/wrapper.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index 1658f922ab3b..ad6383046b1b 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -32,10 +32,10 @@ let # All arguments besides the input and output binaries (${mpv}/bin/mpv and # $out/bin/mpv). These are used by the darwin specific makeWrapper call # used to wrap $out/Applications/mpv.app/Contents/MacOS/mpv as well. - mostMakeWrapperArgs = builtins.concatStringsSep " " ([ "--argv0" "'$0'" + mostMakeWrapperArgs = lib.strings.escapeShellArgs ([ "--argv0" "'$0'" # These are always needed (TODO: Explain why) - "--prefix" "LUA_CPATH" "\\;" "${mpv.luaEnv}/lib/lua/${mpv.lua.luaversion}/\\?.so" - "--prefix" "LUA_PATH" "\\;" "${mpv.luaEnv}/share/lua/${mpv.lua.luaversion}/\\?.lua" + "--prefix" "LUA_CPATH" ";" "${mpv.luaEnv}/lib/lua/${mpv.lua.luaversion}/?.so" + "--prefix" "LUA_PATH" ";" "${mpv.luaEnv}/share/lua/${mpv.lua.luaversion}/?.lua" ] ++ lib.optionals mpv.vapoursynthSupport [ "--prefix" "PYTHONPATH" ":" "${mpv.vapoursynth}/lib/${mpv.vapoursynth.python3.sitePackages}" ] ++ lib.optionals (binPath != "") [ @@ -52,7 +52,7 @@ let ) scripts )) ++ extraMakeWrapperArgs) ; - umpvWrapperArgs = builtins.concatStringsSep " " ([ + umpvWrapperArgs = lib.strings.escapeShellArgs ([ "--argv0" "'$0'" "--set" "MPV" "$out/bin/mpv" ] ++ extraUmpvWrapperArgs) From 7be315a842b3980a36b757bdfdc53365fa924e1f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 11 Jun 2020 16:13:51 +0300 Subject: [PATCH 1422/3452] mpv-with-scripts: revive in aliases along with a warning To prevent a breaking change while providing fully backwards compatible interface to mpv-with-scripts, this replaces the harsh error using `mpv-with-scripts` had. --- pkgs/top-level/aliases.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 03b03ff2a842..b647face3903 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -309,7 +309,9 @@ mapAliases ({ msf = metasploit; # added 2018-04-25 libmsgpack = msgpack; # added 2018-08-17 mssys = ms-sys; # added 2015-12-13 - mpv-with-scripts = throw "Use wrapMpv for editing the environment of mpv"; # added 2012-05-22 + mpv-with-scripts = lib.warn "Use wrapMpv for editing the environment of mpv" ( + self.wrapMpv self.mpv-unwrapped { } + ); # added 2020-05-22 multipath_tools = multipath-tools; # added 2016-01-21 mupen64plus1_5 = mupen64plus; # added 2016-02-12 mysqlWorkbench = mysql-workbench; # added 2017-01-19 From 0a5eab269288d15ca9a8d5ca1fe7bb4b0d3efd1d Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 4 Jun 2020 01:35:57 +0200 Subject: [PATCH 1423/3452] prometheus-lnd-exporter: init at unstable-2020-01-09 --- .../monitoring/prometheus/lnd-exporter.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 23 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/lnd-exporter.nix diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix new file mode 100644 index 000000000000..225e7c575436 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "lndmon-unstable"; + version = "2020-01-09"; + + src = fetchFromGitHub { + owner = "lightninglabs"; + repo = "lndmon"; + sha256 = "0d4z8yv2459wsi4c91qs5an13acn73fd8s321xya5vxxiyf51q24"; + rev = "2c7c5ce0fcb4e7eef4df60efe8a644587a309f6c"; + }; + + vendorSha256 = "083h2ksnqmcr48958r5pag9a28xvljpc3prip6wn70ifp2wpjpin"; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Prometheus exporter for lnd (Lightning Network Daemon)"; + license = licenses.mit; + maintainers = with maintainers; [ mmilata ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2ee0786ee75..590c6a88f05a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16170,6 +16170,7 @@ in prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; prometheus-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { }; + prometheus-lnd-exporter = callPackage ../servers/monitoring/prometheus/lnd-exporter.nix { }; prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { }; From 876bf3abc9328d308e84a7826b44f08fe02a2db0 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 4 Jun 2020 01:38:09 +0200 Subject: [PATCH 1424/3452] nixos/prometheus-lnd-exporter: init --- .../monitoring/prometheus/exporters.nix | 1 + .../monitoring/prometheus/exporters/lnd.nix | 46 +++++++++++++++++++ nixos/tests/prometheus-exporters.nix | 44 ++++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/lnd.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index e006caecbb80..0318acae50f7 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -30,6 +30,7 @@ let "fritzbox" "json" "keylight" + "lnd" "mail" "mikrotik" "minio" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/lnd.nix b/nixos/modules/services/monitoring/prometheus/exporters/lnd.nix new file mode 100644 index 000000000000..35f972020574 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/lnd.nix @@ -0,0 +1,46 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.lnd; +in +{ + port = 9092; + extraOpts = { + lndHost = mkOption { + type = types.str; + default = "localhost:10009"; + description = '' + lnd instance gRPC address:port. + ''; + }; + + lndTlsPath = mkOption { + type = types.path; + description = '' + Path to lnd TLS certificate. + ''; + }; + + lndMacaroonDir = mkOption { + type = types.path; + description = '' + Path to lnd macaroons. + ''; + }; + }; + serviceOpts.serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-lnd-exporter}/bin/lndmon \ + --prometheus.listenaddr=${cfg.listenAddress}:${toString cfg.port} \ + --prometheus.logdir=/var/log/prometheus-lnd-exporter \ + --lnd.host=${cfg.lndHost} \ + --lnd.tlspath=${cfg.lndTlsPath} \ + --lnd.macaroondir=${cfg.lndMacaroonDir} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + LogsDirectory = "prometheus-lnd-exporter"; + ReadOnlyPaths = [ cfg.lndTlsPath cfg.lndMacaroonDir ]; + }; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 4dc6e1407e9a..4dbd64312224 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -236,6 +236,50 @@ let ''; }; + lnd = { + exporterConfig = { + enable = true; + lndTlsPath = "/var/lib/lnd/tls.cert"; + lndMacaroonDir = "/var/lib/lnd"; + }; + metricProvider = { + systemd.services.prometheus-lnd-exporter.serviceConfig.DynamicUser = false; + services.bitcoind.enable = true; + services.bitcoind.extraConfig = '' + rpcauth=bitcoinrpc:e8fe33f797e698ac258c16c8d7aadfbe$872bdb8f4d787367c26bcfd75e6c23c4f19d44a69f5d1ad329e5adf3f82710f7 + bitcoind.zmqpubrawblock=tcp://127.0.0.1:28332 + bitcoind.zmqpubrawtx=tcp://127.0.0.1:28333 + ''; + systemd.services.lnd = { + serviceConfig.ExecStart = '' + ${pkgs.lnd}/bin/lnd \ + --datadir=/var/lib/lnd \ + --tlscertpath=/var/lib/lnd/tls.cert \ + --tlskeypath=/var/lib/lnd/tls.key \ + --logdir=/var/log/lnd \ + --bitcoin.active \ + --bitcoin.mainnet \ + --bitcoin.node=bitcoind \ + --bitcoind.rpcuser=bitcoinrpc \ + --bitcoind.rpcpass=hunter2 \ + --bitcoind.zmqpubrawblock=tcp://127.0.0.1:28332 \ + --bitcoind.zmqpubrawtx=tcp://127.0.0.1:28333 \ + --readonlymacaroonpath=/var/lib/lnd/readonly.macaroon + ''; + serviceConfig.StateDirectory = "lnd"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + }; + }; + exporterTest = '' + wait_for_unit("lnd.service") + wait_for_open_port(10009) + wait_for_unit("prometheus-lnd-exporter.service") + wait_for_open_port(9092) + succeed("curl -sSf localhost:9092/metrics | grep -q '^promhttp_metric_handler'") + ''; + }; + mail = { exporterConfig = { enable = true; From e174d249df771929f540e0c2e9047aad4bb2ec5e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 11:37:41 +0200 Subject: [PATCH 1425/3452] hdf4: add license --- pkgs/tools/misc/hdf4/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index 8d694aa88b75..d5b8291d78ed 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -84,10 +84,11 @@ stdenv.mkDerivation rec { moveToOutput bin "$bin" ''; - meta = { + meta = with stdenv.lib; { description = "Data model, library, and file format for storing and managing data"; homepage = "https://support.hdfgroup.org/products/hdf4/"; - maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ knedlsepp ]; + platforms = platforms.unix; + license = licenses.bsdOriginal; }; } From 97f1c250288076a08e3a6f8bda53c13896df6386 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 12:00:49 +0200 Subject: [PATCH 1426/3452] mokeysAudio: add license and description --- pkgs/applications/audio/monkeys-audio/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 58bb4d3e3274..adc8eb2087e5 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + description = "Lossless audio codec"; platforms = platforms.linux; + license = licenses.lgpl2; maintainers = [ ]; }; } From 40a04df6fef3f9a156d7755f5a3c82bf4946edcf Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 12:03:41 +0200 Subject: [PATCH 1427/3452] rubyripper: add license and description --- pkgs/applications/audio/rubyripper/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix index 82aa86f795bb..eb6de8431803 100644 --- a/pkgs/applications/audio/rubyripper/default.nix +++ b/pkgs/applications/audio/rubyripper/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { --prefix PATH : "${cdparanoia}/bin" ''; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "High quality CD audio ripper"; + platforms = platforms.linux; + license = licenses.gpl3; }; } From 74fb58b60101ce9fa63234ac0a7f26cd9b0c2392 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 12:06:16 +0200 Subject: [PATCH 1428/3452] dashpay: add license --- pkgs/applications/blockchains/dashpay.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix index d0c3fed4350b..b88aa3af19e3 100644 --- a/pkgs/applications/blockchains/dashpay.nix +++ b/pkgs/applications/blockchains/dashpay.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://www.dash.org"; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + license = licenses.mit; }; } From d00013fd7cd27cd5dd90bada7bcbb1b6608769ac Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 12:08:38 +0200 Subject: [PATCH 1429/3452] jpeg-archive: add license --- pkgs/applications/graphics/jpeg-archive/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/pkgs/applications/graphics/jpeg-archive/default.nix index 97c15d2eec09..8beaf43c089c 100644 --- a/pkgs/applications/graphics/jpeg-archive/default.nix +++ b/pkgs/applications/graphics/jpeg-archive/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Utilities for archiving photos for saving to long term storage or serving over the web"; homepage = "https://github.com/danielgtaylor/jpeg-archive"; - # license = ...; # mixed? + license = licenses.mit; maintainers = [ maintainers.srghma ]; platforms = platforms.all; }; From d162c97a73bb81b0889f78d29e9a18d67690c08f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 12:11:56 +0200 Subject: [PATCH 1430/3452] gosmore: add license --- pkgs/applications/misc/gosmore/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 350cb56695f9..4da6c6d07cc4 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { patches = [ ./pointer_int_comparison.patch ]; patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol - + meta = with stdenv.lib; { description = "Open Street Map viewer"; homepage = "https://sourceforge.net/projects/gosmore/"; @@ -33,5 +33,6 @@ stdenv.mkDerivation { raskin ]; platforms = platforms.linux; + license = licenses.bsd2; }; } From 5d87992126fb9bd2b9b11bdce776b30f92c89985 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 17:41:52 +0200 Subject: [PATCH 1431/3452] qemu-utils: inherit meta data from qemu --- pkgs/applications/virtualization/qemu/utils.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/utils.nix b/pkgs/applications/virtualization/qemu/utils.nix index 430d71221797..436716e0a8c3 100644 --- a/pkgs/applications/virtualization/qemu/utils.nix +++ b/pkgs/applications/virtualization/qemu/utils.nix @@ -13,4 +13,6 @@ stdenv.mkDerivation rec { cp "${qemu}/bin/qemu-io" "$out/bin/qemu-io" cp "${qemu}/bin/qemu-nbd" "$out/bin/qemu-nbd" ''; + + inherit (qemu) meta; } From 22ff32d74087650d70e0464199b4d49c3f953189 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 17:43:47 +0200 Subject: [PATCH 1432/3452] xhyve: add license --- pkgs/applications/virtualization/xhyve/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index 921a54b11a2e..db9a7ef82577 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -27,10 +27,11 @@ stdenv.mkDerivation rec { cp build/xhyve $out/bin ''; - meta = { + meta = with lib; { description = "Lightweight Virtualization on macOS Based on bhyve"; homepage = "https://github.com/mist64/xhyve"; - maintainers = [ lib.maintainers.lnl7 ]; - platforms = lib.platforms.darwin; + maintainers = [ maintainers.lnl7 ]; + license = licenses.bsd2; + platforms = platforms.darwin; }; } From b2955e5000f54e89ec14fba648fb4589e09e0430 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 17:45:19 +0200 Subject: [PATCH 1433/3452] tinywm: add license --- pkgs/applications/window-managers/tinywm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/tinywm/default.nix b/pkgs/applications/window-managers/tinywm/default.nix index 0e30857267bd..d6ff4ad51a2e 100644 --- a/pkgs/applications/window-managers/tinywm/default.nix +++ b/pkgs/applications/window-managers/tinywm/default.nix @@ -42,10 +42,11 @@ stdenv.mkDerivation rec { - Resize windows interactively with Alt+Button3 drag (right mouse button) - Raise windows with Alt+F1 (not high on usability I know, but I needed a keybinding in there somewhere) - - Focus windows with the mouse pointer (X does this on its own) + - Focus windows with the mouse pointer (X does this on its own) ''; homepage = "http://incise.org/tinywm.html"; maintainers = with maintainers; [ AndersonTorres ]; platforms = libX11.meta.platforms; + license = licenses.publicDomain; }; } From d75a478ff24323ea32f29b740c77b414ae99f177 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 17:51:05 +0200 Subject: [PATCH 1434/3452] licenses: add GNU Free Documentation License v1.1 --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 4c07797b16c2..b799a6ae8a43 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -276,6 +276,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "European Union Public License 1.2"; }; + fdl11 = spdx { + spdxId = "GFDL-1.1-only"; + fullName = "GNU Free Documentation License v1.1 only"; + }; + fdl12 = spdx { spdxId = "GFDL-1.2-only"; fullName = "GNU Free Documentation License v1.2 only"; From 49ce43a460cf657ef4f977741a5ad852ed35fad7 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 11 Jun 2020 17:51:30 +0200 Subject: [PATCH 1435/3452] pan: add license --- pkgs/applications/networking/newsreaders/pan/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 454e19fd8974..6dc0630d2db2 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -37,10 +37,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "A GTK-based Usenet newsreader good at both text and binaries"; homepage = "http://pan.rebelbase.com/"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux; + license = with licenses; [ gpl2 fdl11 ]; }; } From 1683a5f146344d97d738f696997e587452c817a7 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 11 Jun 2020 14:39:48 +0200 Subject: [PATCH 1436/3452] Revert "dtrx: remove p7zip, since it's unsafe" This reverts commit 9b3ca0c6149bb222da800a89cf9b6b2bc838dc4c. p7zip is now switched to a maintained fork --- pkgs/tools/compression/dtrx/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index edca969a1e84..81a446066d97 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -1,18 +1,15 @@ {stdenv, lib, fetchurl, pythonPackages -, gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, cabextract, unrar, unshield +, gnutar, unzip, lhasa, rpm, binutils, cpio, gzip, p7zip, cabextract, unrar, unshield , bzip2, xz, lzip -# unsafe: -# ,p7zip -# unzip is no longer handled by p7zip, since it's unsafe -, unzipSupport ? true +# unzip is handled by p7zip +, unzipSupport ? false , unrarSupport ? false }: let - # p7zip - archivers = lib.makeBinPath ([ gnutar lhasa rpm binutils cpio gzip cabextract unshield ] - ++ lib.optional (unzipSupport) unzip - ++ lib.optional (unrarSupport) unrar - ++ [ bzip2 xz lzip ]); + archivers = lib.makeBinPath ([ gnutar lhasa rpm binutils cpio gzip p7zip cabextract unshield ] + ++ lib.optional (unzipSupport) unzip + ++ lib.optional (unrarSupport) unrar + ++ [ bzip2 xz lzip ]); in pythonPackages.buildPythonApplication rec { pname = "dtrx"; From 133e10fb8e5cd1dd0fd7d4a63b87d5f0f2f35544 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 11 Jun 2020 15:17:03 +0200 Subject: [PATCH 1437/3452] Revert "python.pkgs.binwalk: remove p7zip from propagatedBuildInputs" This reverts commit 9a2ec56ad4587b3aa3777e6fd480980c4d51b292. p7zip is now switched to a maintained fork --- pkgs/development/python-modules/binwalk/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index e8a20b6df47d..97c6b957a437 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -7,6 +7,7 @@ , gzip , bzip2 , gnutar +, p7zip , cabextract , lzma , nose @@ -28,7 +29,7 @@ buildPythonPackage { sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar cabextract lzma pycrypto ] + propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ] ++ stdenv.lib.optional visualizationSupport pyqtgraph; # setup.py only installs version.py during install, not test From 331fb4c9e2b6c001c3a7b8ec5d0379d39923c900 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 11 Jun 2020 15:19:33 +0200 Subject: [PATCH 1438/3452] Revert "ark: remove p7zip" This reverts commit 06fa14fd7d1b1a3a82644bd2a8d735ec6150d750. p7zip is now switched to a maintained fork --- pkgs/applications/kde/ark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index dbbfcf80c6b0..76cc423f5460 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -9,14 +9,14 @@ libarchive, libzip, # Archive tools - lrzip, + p7zip, lrzip, # Unfree tools unfreeEnableUnrar ? false, unrar, }: let - extraTools = [ lrzip ] ++ lib.optional unfreeEnableUnrar unrar; + extraTools = [ p7zip lrzip ] ++ lib.optional unfreeEnableUnrar unrar; in mkDerivation { From 334b347cd0591c05288f31b4495301f8a0738555 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 11 Jun 2020 15:20:27 +0200 Subject: [PATCH 1439/3452] Revert "woeusb: remove p7zip" This reverts commit 5e52a39c95e12a3a51b67d0dad02643fccf16919. p7zip is now switched to a maintained fork --- pkgs/tools/misc/woeusb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 991ab6224907..4c235b4866f2 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, makeWrapper -, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, utillinux, wget +, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, utillinux, wget , wxGTK30 }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # should be patched with a less useless default PATH, but for now # we add everything we need manually. wrapProgram "$out/bin/woeusb" \ - --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget ]}' + --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget p7zip ]}' ''; doInstallCheck = true; From 9de29f6dd7aa88ab4ea7878f463aa21ce129dc70 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 11 Jun 2020 18:42:37 +0200 Subject: [PATCH 1440/3452] aliases: Remove lib.warn call It makes ofborg evaluation fail. --- pkgs/top-level/aliases.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b647face3903..d96a16b13998 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -309,9 +309,7 @@ mapAliases ({ msf = metasploit; # added 2018-04-25 libmsgpack = msgpack; # added 2018-08-17 mssys = ms-sys; # added 2015-12-13 - mpv-with-scripts = lib.warn "Use wrapMpv for editing the environment of mpv" ( - self.wrapMpv self.mpv-unwrapped { } - ); # added 2020-05-22 + mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # added 2020-05-22 multipath_tools = multipath-tools; # added 2016-01-21 mupen64plus1_5 = mupen64plus; # added 2016-02-12 mysqlWorkbench = mysql-workbench; # added 2017-01-19 From 1a5dafcd5bebd2ad915876333b0ba94680148db7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 23 May 2020 22:38:16 +0100 Subject: [PATCH 1441/3452] services.x11.videoDrivers: Don't include vmware driver by default A better option for vmware guests is to set `virtualisation.vmware.guest.enable`. --- nixos/doc/manual/release-notes/rl-2009.xml | 6 ++++++ nixos/modules/services/x11/xserver.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 40316b980f3b..be7f176614c9 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -176,6 +176,12 @@ services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' security.duosec.integrationKey. + + + vmware has been removed from the services.x11.videoDrivers defaults. + For VMWare guests set virtualisation.vmware.guest.enable to true which will include the appropriate drivers. + + The initrd SSH support now uses OpenSSH rather than Dropbear to diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 6aec1c0753a2..400173745d3f 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -246,7 +246,7 @@ in videoDrivers = mkOption { type = types.listOf types.str; # !!! We'd like "nv" here, but it segfaults the X server. - default = [ "radeon" "cirrus" "vesa" "vmware" "modesetting" ]; + default = [ "radeon" "cirrus" "vesa" "modesetting" ]; example = [ "ati_unfree" "amdgpu" "amdgpu-pro" "nv" "nvidia" "nvidiaLegacy390" "nvidiaLegacy340" "nvidiaLegacy304" From 0daaed87309854e62424bf618380e146da7ad236 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 11 Jun 2020 12:05:14 -0500 Subject: [PATCH 1442/3452] Revert "Merge pull request #89726 from doronbehar/ruby-gcc-ref" This reverts commit 6590c338500a8e2939f0fd0bc21e23ab3dd41b91, reversing changes made to d659f968ba32395c7e2fce3b87b3047c7efd8d03. --- pkgs/development/interpreters/ruby/default.nix | 5 ----- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 1e6a81373bb5..1756c13b53d1 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -37,7 +37,6 @@ let , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , useRailsExpress ? true , rubygemsSupport ? true - , JitSupport ? true , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -119,7 +118,6 @@ let configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby_${tag}"] ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby" - ++ op (!JitSupport) "--disable-jit-support" ++ op (!docSupport) "--disable-install-doc" ++ ops stdenv.isDarwin [ # on darwin, we have /usr/include/tk.h -- so the configure script detects @@ -157,9 +155,6 @@ let ${removeReferencesTo}/bin/remove-references-to \ -t ${stdenv.cc} \ $out/lib/libruby* - ${removeReferencesTo}/bin/remove-references-to \ - -t ${stdenv.cc} \ - $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb '' } # Bundler tries to create this directory diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 590c6a88f05a..ed0aba3eca89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9788,8 +9788,6 @@ in rubyMinimal = ruby.override { # gem support is minimal overhead rubygemsSupport = true; - removeReferenceToCC = true; - JitSupport = false; useRailsExpress = false; zlibSupport = false; opensslSupport = false; From b44f547c53cd2d51a3cc991f0d8fee1f47acf8f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 23:36:01 +0000 Subject: [PATCH 1443/3452] ipfs-cluster: 0.12.1 -> 0.13.0 --- pkgs/applications/networking/ipfs-cluster/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index c41912794d06..ee9e368a6590 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "0.12.1"; + version = "0.13.0"; rev = "v${version}"; - vendorSha256 = "1n0zb3v83wsy8y3k7xbpjc2ykh1b2n6p10d5wkflhga49q7rf64h"; + vendorSha256 = "00fkyxxi4iz16v0j33270x8qrspqpsv9j6csnikjy0klyb038pfq"; src = fetchFromGitHub { owner = "ipfs"; repo = "ipfs-cluster"; inherit rev; - sha256 = "1jh6ynj50jd4w79widaqrgm3h3yz5h03vq0lbsx717a8d9073blh"; + sha256 = "0jf3ngxqkgss5f1kifp5lp3kllb21jxc475ysl01ma8l3smqdvya"; }; meta = with stdenv.lib; { From 0e90984ff0c0d0e76de3a0917e2fc85cb4d85b19 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 9 Jun 2020 05:43:11 +0200 Subject: [PATCH 1444/3452] faust: unstable-2020-03-20 -> unstable-2020-06-08 --- pkgs/applications/audio/faust/faust2.nix | 8 ++++---- pkgs/applications/audio/faust/faust2jack.nix | 1 - pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 33df1ce5d4ee..e65414b2bcab 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -20,19 +20,19 @@ with stdenv.lib.strings; let - version = "unstable-2020-03-20"; + version = "unstable-2020-06-08"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; - rev = "2782088d4485f1c572755f41e7a072b41cb7148a"; - sha256 = "1l7bi2mq10s5wm8g4cdipg8gndd478x897qv0h7nqi1s2q9nq99p"; + rev = "f0037e289987818b65d3f6fb1ad943aaad2a2b28"; + sha256 = "0h08902rgx7rhzpng4h1qw8i2nzv50f79vrlbzdk5d35wa4zibh4"; fetchSubmodules = true; }; meta = with stdenv.lib; { homepage = "http://faust.grame.fr/"; - downloadPage = "https://sourceforge.net/projects/faudiostream/files/"; + downloadPage = "https://github.com/grame-cncm/faust/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ magnetophon pmahoney ]; diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index 26478b2bb2e5..370c25ecd749 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -12,7 +12,6 @@ faust.wrapWithBuildEnv { scripts = [ "faust2jack" - "faust2jackinternal" "faust2jackconsole" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89817e1c9015..d40b54a12829 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25525,7 +25525,7 @@ in faust1 = callPackage ../applications/audio/faust/faust1.nix { }; faust2 = callPackage ../applications/audio/faust/faust2.nix { - llvm = llvm_9; + llvm = llvm_10; }; faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { }; From 9cf175fa5eebfd672170d99641366bc83ad6d32b Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 3 Jun 2020 16:36:42 +0200 Subject: [PATCH 1445/3452] artyFX: 1.3 -> unstable-2020-04-28 --- pkgs/applications/audio/artyFX/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 0265e0f75ecb..8cf9bec2e3df 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { pname = "artyFX"; - version = "1.3"; + # Fix build with lv2 1.18: https://github.com/openAVproductions/openAV-ArtyFX/pull/41/commits/492587461b50d140455aa3c98d915eb8673bebf0 + version = "unstable-2020-04-28"; src = fetchFromGitHub { owner = "openAVproductions"; repo = "openAV-ArtyFX"; - rev = "release-${version}"; - sha256 = "012hcy1mxl7gs2lipfcqp5x0xv1azb9hjrwf0h59yyxnzx96h7c9"; + rev = "492587461b50d140455aa3c98d915eb8673bebf0"; + sha256 = "0wwg8ivnpyy0235bapjy4g0ij85zq355jwi6c1nkrac79p4z9ail"; }; nativeBuildInputs = [ pkgconfig ]; From 2e264a89089f24c86cd544dd6befa422aed26c15 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 22:09:11 +0000 Subject: [PATCH 1446/3452] imagemagick7: 7.0.10-14 -> 7.0.10-17 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 4472e41e9d1a..9bcf517e1d9e 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.10-14"; - sha256 = "1qcsq5884iqis1adpfbx3cwki8v4q9wwh70fpcaqnwwmznmqfq4j"; + version = "7.0.10-17"; + sha256 = "15cj9qkikx13j6gfqaawi4nh09lnzg3asf5mdcswx6z6yhbf90zx"; patches = []; }; in From 45f21f7c8433f3e2b237c86e105fc81d00cfe56b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 11 Jun 2020 19:49:48 +0200 Subject: [PATCH 1447/3452] setzer: init at 0.2.8 (#90047) --- pkgs/applications/editors/setzer/default.nix | 60 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/applications/editors/setzer/default.nix diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix new file mode 100644 index 000000000000..5a0ef754db16 --- /dev/null +++ b/pkgs/applications/editors/setzer/default.nix @@ -0,0 +1,60 @@ +{ lib +, python3 +, fetchFromGitHub +, meson +, ninja +, gettext +, appstream +, appstream-glib +, wrapGAppsHook +, gobject-introspection +, gtksourceview4 +, gspell +, poppler_gi +, webkitgtk +, librsvg +}: + +python3.pkgs.buildPythonApplication rec { + pname = "setzer"; + version = "0.2.8"; + + src = fetchFromGitHub { + owner = "cvfosammmm"; + repo = "Setzer"; + rev = "v${version}"; + sha256 = "1llxxjj038nd2p857bjdyyhzskn56826qi259v47vaqlv9hkifil"; + }; + + format = "other"; + + nativeBuildInputs = [ + meson + ninja + gettext + appstream # for appstreamcli + appstream-glib + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + gtksourceview4 + gspell + poppler_gi + webkitgtk + librsvg + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + pyxdg + ]; + + meta = with lib; { + description = "LaTeX editor written in Python with Gtk"; + homepage = src.meta.homepage; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed0aba3eca89..128d580d1903 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6559,6 +6559,8 @@ in setserial = callPackage ../tools/system/setserial { }; + setzer = callPackage ../applications/editors/setzer { }; + seqdiag = with python3Packages; toPythonApplication seqdiag; sequoia = callPackage ../tools/security/sequoia { From 21c3245b673702ad9064318f95a1c002d1bb3dcd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 11 Jun 2020 20:06:07 +0200 Subject: [PATCH 1448/3452] winePackages.staging: mention staging patches in description --- pkgs/misc/emulators/wine/staging.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index 5c2469f8f44e..48ea93a97a8e 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -7,7 +7,7 @@ let patch = (callPackage ./sources.nix {}).staging; (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra; in assert stdenv.lib.getVersion wineUnstable == patch.version; -stdenv.lib.overrideDerivation wineUnstable (self: { +(stdenv.lib.overrideDerivation wineUnstable (self: { buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs; name = "${self.name}-staging"; @@ -21,4 +21,8 @@ stdenv.lib.overrideDerivation wineUnstable (self: { ./patchinstall.sh DESTDIR="$PWD/.." --all cd .. ''; -}) +})) // { + meta = wineUnstable.meta // { + description = wineUnstable.meta.description + " (with staging patches)"; + }; +} From 1f13d6506f3998e84f32ec92cc768b1d5562ad1e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 11 Jun 2020 16:01:58 +0300 Subject: [PATCH 1449/3452] mariadb: don't move pam files on Darwin --- pkgs/servers/sql/mariadb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 9c2134e211ff..d6e521343019 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -201,12 +201,12 @@ server = stdenv.mkDerivation (common // { chmod +x "$out"/bin/wsrep_sst_common rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} rm -r "$out"/data # Don't need testing data - mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security - mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security - rm -r "$out"/OFF '' + optionalString withStorageMroonga '' mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql '' + optionalString (!stdenv.hostPlatform.isDarwin) '' + mv "$out"/OFF/suite/plugins/pam/pam_mariadb_mtr.so "$out"/share/pam/lib/security + mv "$out"/OFF/suite/plugins/pam/mariadb_mtr "$out"/share/pam/etc/security + rm -r "$out"/OFF sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster ''; From e620b25bb7c43ba75052ba3f8ef0a3d854453e97 Mon Sep 17 00:00:00 2001 From: Shane Smith Date: Thu, 11 Jun 2020 14:39:27 -0400 Subject: [PATCH 1450/3452] shadowenv: 2.0.2 -> 2.0.3 --- pkgs/tools/misc/shadowenv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index 7c9352d33100..9becd52273e6 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowenv"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = version; - sha256 = "1x5i5km6wblqbc0fibdjdlqkamqswxwhy8p6cbfz2nvcia7fgsf1"; + sha256 = "1h8hfyxxl4bpx8azzxj0snmzccn6xjd9vc2iyp8i2ar7aiyhf5yd"; }; - cargoSha256 = "1hrsbd6025sfgnwr7smp43yzi7w2lfyfbdxhapgizrpwbq8y7xzd"; + cargoSha256 = "1bjkwn57vm3in8lajhm7p9fjwyqhmkrb3fyq1k7lqjvrrh9jysb2"; nativeBuildInputs = [ installShellFiles ]; From 37e50ca63513072d7024a3c44500684b4f2e032b Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Wed, 10 Jun 2020 21:17:09 -0400 Subject: [PATCH 1451/3452] 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 1452/3452] 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 1453/3452] 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 badb95586aa2a7cabbc7aae91dda68ec5c6fb412 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 11 Jun 2020 20:43:40 +0200 Subject: [PATCH 1454/3452] babl: 0.1.74 -> 0.1.78 --- pkgs/development/libraries/babl/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index dbf7afd596fb..12547bcb4c75 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -5,17 +5,18 @@ , pkgconfig , gobject-introspection , lcms2 +, vala }: stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.74"; + version = "0.1.78"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "03nfcvy3453xkfvsfcnsfcjf2vg2pin09qnr9jlssdysa1lhnwcs"; + sha256 = "F9VJNjO/9VhdnzdbxN9ZJRV80ccMzXwipjW+dcFyUjo="; }; nativeBuildInputs = [ @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { ninja pkgconfig gobject-introspection + vala ]; buildInputs = [ From 5a534325b41b096896b2b5e65b3974664499c840 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 11 Jun 2020 20:44:06 +0200 Subject: [PATCH 1455/3452] gegl: 0.4.22 -> 0.4.24 --- pkgs/development/libraries/gegl/4.0.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 3b48a0968ea1..85699a8828b0 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -35,26 +35,16 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.22"; + version = "0.4.24"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0q9cckf90fb82qc5d496fjz459f1xw4j4p3rff1f57yivx0yr20q"; + sha256 = "d2VJnyc0Gw0WAy5mUxnLwSh2SD/2qUT83ySpxY4+JUo="; }; - patches = [ - # Prevent deadlock making tests time-out - # https://gitlab.gnome.org/GNOME/gegl/issues/226 - # https://gitlab.gnome.org/GNOME/glib/issues/1941 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gegl/commit/1d530816266b52c8788bbe1504c5b2d6eceba036.patch"; - sha256 = "1d8nhrzvwq35c5ws00xy9y6bfd9wsj3dm0301hiwkfi4niq59ygh"; - }) - ]; - nativeBuildInputs = [ pkgconfig gettext From d7ffb5fa07fa67d69aeb763a4ca10c34ed30e5d2 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 11 Jun 2020 20:44:23 +0200 Subject: [PATCH 1456/3452] gimp: 2.10.18 -> 2.10.20 --- pkgs/applications/graphics/gimp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 56135c4bd3db..9e448fa23a43 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -50,13 +50,13 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { pname = "gimp"; - version = "2.10.18"; + version = "2.10.20"; outputs = [ "out" "dev" ]; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "05np26g61fyr72s7qjfrcck8v57r0yswq5ihvqyzvgzfx08y3gv5"; + sha256 = "4S+fh0saAHxCd7YKqB4LZzML5+YVPldJ6tg5uQL8ezw="; }; nativeBuildInputs = [ From c8a2e6324289db50b412b05e2f6235892ddce8ef Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 11 Jun 2020 13:47:06 -0500 Subject: [PATCH 1457/3452] ipfs: copy systemd support files to output --- pkgs/applications/networking/ipfs/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 5aa270aa8f0f..8f141b0eade3 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -26,6 +26,14 @@ buildGoModule rec { vendorSha256 = null; + postInstall = '' + install -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service + install -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket + install -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket + substituteInPlace $out/etc/systemd/system/ipfs.service \ + --replace /usr/bin/ipfs $out/bin/ipfs + ''; + meta = with stdenv.lib; { description = "A global, versioned, peer-to-peer filesystem"; homepage = "https://ipfs.io/"; From 74ff433320a6363a3a7e1fff5ac38a13fc737d94 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 11 Jun 2020 14:32:06 -0500 Subject: [PATCH 1458/3452] nixos/ipfs: remove unused auto migrate feature --- .../modules/services/network-filesystems/ipfs.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 1f5c14d777d7..1e97dcd1731f 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -7,7 +7,6 @@ let ipfsFlags = toString ([ (optionalString cfg.autoMount "--mount") - #(optionalString cfg.autoMigrate "--migrate") (optionalString cfg.enableGC "--enable-gc") (optionalString (cfg.serviceFdlimit != null) "--manage-fdlimit=false") (optionalString (cfg.defaultMode == "offline") "--offline") @@ -36,7 +35,6 @@ let baseService = recursiveUpdate commonEnv { wants = [ "ipfs-init.service" ]; - # NB: migration must be performed prior to pre-start, else we get the failure message! preStart = optionalString cfg.autoMount '' ipfs --local config Mounts.FuseAllowOther --json true ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir} @@ -98,18 +96,6 @@ in { description = "systemd service that is enabled by default"; }; - /* - autoMigrate = mkOption { - type = types.bool; - default = false; - description = '' - Whether IPFS should try to migrate the file system automatically. - - The daemon will need to be able to download a binary from https://ipfs.io to perform the migration. - ''; - }; - */ - autoMount = mkOption { type = types.bool; default = false; From c5f40198f384697bc96faf3e29a1e69c29e2ca6c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 11 Jun 2020 15:27:22 -0500 Subject: [PATCH 1459/3452] nixos/ipfs: consolidate services into one ipfs.service Previously we had three services for different config flavors. This is confusing because only one instance of IPFS can run on a host / port combination at once. So move all into ipfs.service, which contains the configuration specified in services.ipfs. Also remove the env wrapper and just use systemd env configuration. --- .../services/network-filesystems/ipfs.nix | 118 +++++++----------- 1 file changed, 44 insertions(+), 74 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 1e97dcd1731f..9b8fe6d5f10b 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -1,8 +1,6 @@ { config, lib, pkgs, ... }: with lib; let - inherit (pkgs) ipfs runCommand makeWrapper; - cfg = config.services.ipfs; ipfsFlags = toString ([ @@ -13,55 +11,6 @@ let (optionalString (cfg.defaultMode == "norouting") "--routing=none") ] ++ cfg.extraFlags); - defaultDataDir = if versionAtLeast config.system.stateVersion "17.09" then - "/var/lib/ipfs" else - "/var/lib/ipfs/.ipfs"; - - # Wrapping the ipfs binary with the environment variable IPFS_PATH set to dataDir because we can't set it in the user environment - wrapped = runCommand "ipfs" { buildInputs = [ makeWrapper ]; preferLocalBuild = true; } '' - mkdir -p "$out/bin" - makeWrapper "${ipfs}/bin/ipfs" "$out/bin/ipfs" \ - --set IPFS_PATH ${cfg.dataDir} \ - --prefix PATH : /run/wrappers/bin - ''; - - - commonEnv = { - environment.IPFS_PATH = cfg.dataDir; - path = [ wrapped ]; - serviceConfig.User = cfg.user; - serviceConfig.Group = cfg.group; - }; - - baseService = recursiveUpdate commonEnv { - wants = [ "ipfs-init.service" ]; - preStart = optionalString cfg.autoMount '' - ipfs --local config Mounts.FuseAllowOther --json true - ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir} - ipfs --local config Mounts.IPNS ${cfg.ipnsMountDir} - '' + concatStringsSep "\n" (collect - isString - (mapAttrsRecursive - (path: value: - # Using heredoc below so that the value is never improperly quoted - '' - read value < Date: Thu, 11 Jun 2020 16:37:53 -0400 Subject: [PATCH 1460/3452] linux: 4.14.183 -> 4.14.184 --- 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 e80b8f765748..7ee05ed47ded 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.183"; + version = "4.14.184"; # 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 = "11c0vd2pwplm8wafich4zg2mnp10vvnap987c5jh96w1avpsyra2"; + sha256 = "0h6r06c1d7amkfglsr66ic89p0zxpmk7jkq1ylcbknmkiwkixx9g"; }; } // (args.argsOverride or {})) From 1f1f6e72ac5c85bcab72f060804bb11baffaaf88 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 11 Jun 2020 16:38:14 -0400 Subject: [PATCH 1461/3452] linux: 4.19.127 -> 4.19.128 --- 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 2d673ba2f91f..92281ffdd3e6 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.127"; + version = "4.19.128"; # 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 = "0vsq5vjyh6n8acjnldfs0zny63l12fn2pssb8zbwidc8qmmqibw2"; + sha256 = "0g31ad3wziy4xqna0yvwjcnza3jhd93syjpfvmwh0b4pkj2adar9"; }; } // (args.argsOverride or {})) From 4cab0f5b16715bd7431604f1ae1ee89586cda880 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 11 Jun 2020 16:38:41 -0400 Subject: [PATCH 1462/3452] linux: 4.4.226 -> 4.4.227 --- 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 125f8f723c55..fe0406233169 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.226"; + version = "4.4.227"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1dwvm81i62b06jsl38spfn719zrsbwq5z8viwckrpw4ma4w9k0j1"; + sha256 = "196x57w740firg8zchypq4vq6a83ymmwn9amqrscym9zr0pcgm40"; }; } // (args.argsOverride or {})) From d2f4b27e70db5174079963473dd4eba3131ce87e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 11 Jun 2020 16:39:30 -0400 Subject: [PATCH 1463/3452] linux: 4.9.226 -> 4.9.227 --- 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 88809a74b7b8..5be2d7ac9bd9 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.226"; + version = "4.9.227"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1jj5ydz5cy87z7hrv54bkyl9739lpzja8580ngjhrip5iwb8q2j6"; + sha256 = "0pqc0wld4s4zjas95xm54mrkk00l9zkc59b6i9gq4km126s8bi1q"; }; } // (args.argsOverride or {})) From 32e76cbb956d6dda6ce9138a4d4699f17157a0e4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 11 Jun 2020 16:39:53 -0400 Subject: [PATCH 1464/3452] linux: 5.4.45 -> 5.4.46 --- 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 4a88e7938666..1c5bfad41681 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.45"; + version = "5.4.46"; # 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 = "0bpy2lb3bqmkaqxzdmssgmhbjsys7d3lyfv4x919q0596jgh6gqh"; + sha256 = "13hvnfdcbcb9a21zizq8d90mc8maxz03zmzsj6iqsjd2y7r4y1rh"; }; } // (args.argsOverride or {})) From 854359a5aa8066c47c69a652f09339f6a63bd437 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 11 Jun 2020 16:40:13 -0400 Subject: [PATCH 1465/3452] linux: 5.6.17 -> 5.6.18 --- pkgs/os-specific/linux/kernel/linux-5.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix index 61c960102a34..bf245442ecef 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6.17"; + version = "5.6.18"; # 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 = "17kzalz8z6svv6nwa3dbmf7nyvpb2wwwyabj19vdwf6v05a28fn3"; + sha256 = "0cpiyzr62sv2yz0mla7skalb04pnr4nlkpi1zfcfzyjf1gjz8h8h"; }; } // (args.argsOverride or {})) From fa736e19a6f4e5376339dfdf34fb8c570ae43de4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 11 Jun 2020 16:40:29 -0400 Subject: [PATCH 1466/3452] linux: 5.7.1 -> 5.7.2 --- 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 81f4d4b3553d..c7f1389f1128 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.1"; + version = "5.7.2"; # 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 = "1vcxrrb2i4366iciw0mfahwbdrzmhrrsr7gi4vdkzznfv2niils0"; + sha256 = "02brxm78n0kg4mh48acvjsr7mpvaqd279ycyaixaflid1s1awrb0"; }; } // (args.argsOverride or {})) From 909cdaf97ac117d71ce1bf4e6973763a29892b87 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 11 Jun 2020 16:50:03 -0400 Subject: [PATCH 1467/3452] linux/hardened/patches/4.19: 4.19.126.a -> 4.19.127.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 a25057043f84..94f1957c6f3e 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.183.a/linux-hardened-4.14.183.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.126.a.patch", - "sha256": "1wr4spaqgh404w0fqpys8xwj11as86j0cfzb903c0rx6lhqfp6sf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.126.a/linux-hardened-4.19.126.a.patch" + "name": "linux-hardened-4.19.127.a.patch", + "sha256": "00nfcs5yn2a70an3ygzzv4s3qa3hf7pni4ad70aw87vyvrqlyx3k", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.127.a/linux-hardened-4.19.127.a.patch" }, "5.4": { "name": "linux-hardened-5.4.44.a.patch", From 0d1be0c2dfb6663a9564d5139a0317a52b465153 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 11 Jun 2020 16:50:05 -0400 Subject: [PATCH 1468/3452] linux/hardened/patches/5.4: 5.4.44.a -> 5.4.45.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 94f1957c6f3e..33c222feb63c 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.127.a/linux-hardened-4.19.127.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.44.a.patch", + "name": "linux-hardened-5.4.45.a.patch", "sha256": "0gihrcxqg3hax20xhvna4lmgsivari6wwsyqz09w34v8p1fhd5nx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.44.a/linux-hardened-5.4.44.a.patch" + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.45.a/linux-hardened-5.4.45.a.patch" }, "5.6": { "name": "linux-hardened-5.6.16.a.patch", From 7296aae54f6dc7cbb960ec7cfce35010651b7fb8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 11 Jun 2020 16:50:08 -0400 Subject: [PATCH 1469/3452] linux/hardened/patches/5.6: 5.6.16.a -> 5.6.17.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 33c222feb63c..2e4ea7478065 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.45.a/linux-hardened-5.4.45.a.patch" }, "5.6": { - "name": "linux-hardened-5.6.16.a.patch", + "name": "linux-hardened-5.6.17.a.patch", "sha256": "0nci30k7xh56b6454cd0hkpvpkfqb98cqdpvjaamlnmiphz4sk1f", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.16.a/linux-hardened-5.6.16.a.patch" + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.17.a/linux-hardened-5.6.17.a.patch" } } From 8ee8a22e358d8ed3a0b829f346bc91e9aa31bdb6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 12 Jun 2020 00:57:19 +0200 Subject: [PATCH 1470/3452] signal-desktop: 1.34.1 -> 1.34.2 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 309da8f296c5..dae1513884ab 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.34.1"; # Please backport all updates to the stable channel. + version = "1.34.2"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0v9mqn43vn1w6wppzydkgpbx2752bp7mmpf50wqgvrmhchnywnkj"; + sha256 = "0l0i6v6n6iyq1zb2rlgfjnsk37kzjqgglk824vl5kp8qbq0li6b6"; }; nativeBuildInputs = [ From b479619da828d58bb6d98a434492ecd2c5511d13 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 12 Jun 2020 08:58:26 +1000 Subject: [PATCH 1471/3452] gitAndTools.gh: 0.9.0 -> 0.10.0 https://github.com/cli/cli/releases/tag/v0.10.0 --- .../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 300570f7efd2..36df07de465d 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.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "050wqjng0l42ilaiglwm1mzrrmnk0bg9icnzq9sm88axgl4xpmdy"; + sha256 = "0m4qgvhd4fzl83acfbpwff0sqshyfhqiy5q4i7ly8h6rdsjysdck"; }; - vendorSha256 = "0s99bjmsafnzhl3s2lcybxgsw1s4i1h3vh6p40gz4vsfhndidqrq"; + vendorSha256 = "0zkgdb69zm662p50sk1663lcbkw0vp8ip9blqfp6539mp9b87dn7"; nativeBuildInputs = [ installShellFiles ]; From 7b01d672e35cffeeae025f1da81b6d2b71f83e82 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 12 Jun 2020 09:24:58 +1000 Subject: [PATCH 1472/3452] yq-go: 3.3.0 -> 3.3.1 https://github.com/mikefarah/yq/releases/tag/3.3.1 --- pkgs/development/tools/yq-go/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 882199a82a93..fc6fcd234850 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -1,17 +1,26 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "yq-go"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "mikefarah"; rev = version; repo = "yq"; - sha256 = "1jll5nmskvs61031h3sizhv3scv8znrr9apyc4qlxcp4jiv7xpmp"; + sha256 = "0fr6zwnij3r53dqdw43qfmp4nw26gv6zmj066l44fazka4fl25i6"; }; - vendorSha256 = "0rlvbyhl53x1bhwr7f7zs4swa580saak19z3d3g58srq3jyw6zlc"; + vendorSha256 = "1bjy3qr26zndr3dhh9gd33rhm5gy779525qgzjw4a4mla0p2q6kl"; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/yq shell-completion --variation $shell > yq.$shell + installShellCompletion yq.$shell + done + ''; meta = with lib; { description = "Portable command-line YAML processor"; @@ -19,4 +28,4 @@ buildGoModule rec { license = [ licenses.mit ]; maintainers = [ maintainers.lewo ]; }; -} \ No newline at end of file +} From 13e52db31e532a16f75e216aa36c929417031f9e Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 11 Jun 2020 22:43:44 -0500 Subject: [PATCH 1473/3452] yosys: 2020.03.24 -> 2020.06.11 Also includes a bump to `abc-verifier`. Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/abc/default.nix | 6 +++--- pkgs/development/compilers/yosys/default.nix | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index a33cc92c7ce7..0bad0046e939 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "2020.03.05"; + version = "2020.04.30"; src = fetchFromGitHub { owner = "berkeley-abc"; repo = "abc"; - rev = "ed90ce20df9c7c4d6e1db5d3f786f9b52e06bab1"; - sha256 = "01sw67pkrb6wzflkxbkxzwsnli3nvp0yxwp3j1ngb3c0j86ri437"; + rev = "fd2c9b1c19216f6b756f88b18f5ca67b759ca128"; + sha256 = "1d18pkpsx0nlzl3a6lyfdnpk4kixjmgswy6cp5fbrkpp4rf1gahi"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 3a54d42498ce..332824185616 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -1,5 +1,6 @@ { stdenv , abc-verifier +, bash , bison , fetchFromGitHub , flex @@ -15,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "2020.03.24"; + version = "2020.06.11"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "c9555c9adeba886a308c60615ac794ec20d9276e"; - sha256 = "1fh118fv06jyfmkx6zy0w2k0rjj22m0ffyll3k5giaw8zzaf0j3a"; + rev = "a1785e988b2b51dac32985dd6b0afdcedc6bda1d"; + sha256 = "0987f5vm2zb0i02c3vlw21gihky2cfj5l9b78ddzhxfiv0qfkdfp"; }; enableParallelBuilding = true; @@ -38,6 +39,8 @@ stdenv.mkDerivation rec { --replace 'LD = gcc' 'LD = $(CXX)' \ --replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \ --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}' + substituteInPlace ./misc/yosys-config.in \ + --replace '/bin/bash' '${bash}/bin/bash' patchShebangs tests ''; From 23c9c3779d203aa20513a6f2542c09614c21a6f1 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 11 Jun 2020 22:59:53 -0500 Subject: [PATCH 1474/3452] symbiyosys: 2020.03.24 -> 2020.05.18 Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/symbiyosys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index b180cf307f0f..debdc56f0353 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "symbiyosys"; - version = "2020.03.24"; + version = "2020.05.18"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "SymbiYosys"; - rev = "8a62780b9df4d2584e41cdd42cab92fddcd75b31"; - sha256 = "0ss5mrzwff2dny8kfciqbrz67m6k52yvc1shd7gk3qb99x7g7fp8"; + rev = "13fef4a710d0e2cf0f109ca75a94fb7253ba6838"; + sha256 = "152nyxddiqbxvbd06cmwavvgi931v6i35zj9sh3z04m737grvb3d"; }; buildInputs = [ python3 ]; From 4cc48e5e0f7c9e661c75ba023f8919feaed355bd Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Mon, 8 Jun 2020 19:53:09 +0100 Subject: [PATCH 1475/3452] SDL2_mixer: add optional dependency mpg123 --- pkgs/development/libraries/SDL2_mixer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 4fa9df617a6a..c90c0fd08a83 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, autoreconfHook, pkgconfig, which -, SDL2, libogg, libvorbis, smpeg2, flac, libmodplug, opusfile +, SDL2, libogg, libvorbis, smpeg2, flac, libmodplug, opusfile, mpg123 , CoreServices, AudioUnit, AudioToolbox , enableNativeMidi ? false, fluidsynth ? null }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; - propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug opusfile ]; + propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug opusfile mpg123 ]; configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl" From dbdc5af9e8145dbc7ffe71cf1c7287d7497f1c16 Mon Sep 17 00:00:00 2001 From: Riley Inman Date: Tue, 9 Jun 2020 00:37:12 -0400 Subject: [PATCH 1476/3452] discord-canary: 0.0.103 -> 0.0.104 This update updates the necessary dependencies, and enables patchelf on the binary in order to make it launch again. --- .../instant-messengers/discord/base.nix | 26 ++++++++++++++----- .../instant-messengers/discord/default.nix | 4 +-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index 8f4f16673d25..653da669d386 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -1,16 +1,30 @@ { pname, version, src, binaryName, desktopName -, stdenv, fetchurl, makeDesktopItem, wrapGAppsHook -, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype -, gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid -, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb -, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }: +, autoPatchelfHook, fetchurl, makeDesktopItem, stdenv, wrapGAppsHook +, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig +, 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 +}: let inherit binaryName; in stdenv.mkDerivation rec { inherit pname version src; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ + alsaLib + autoPatchelfHook + cups + libdrm + libX11 + libXScrnSaver + libXtst + libxcb + mesa.drivers + nss + wrapGAppsHook + ]; dontWrapGApps = true; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 926ddeeb0483..bc76949e80ab 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.103"; + version = "0.0.104"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "1d95q75ak4z6wkxlgcmkl7yk20gl7zf568b0xslz42hwx032fn4z"; + sha256 = "17np1hqqygjlbmlln0d1ba2qlbjykwj156w5dw7g4lg77kfxicfk"; }; }; }.${branch} From 0693bed8eea074db1a052bbebe14e71b4994d774 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 11 Jun 2020 16:08:05 -0700 Subject: [PATCH 1477/3452] unifiStable: 5.12.72 -> 5.13.29 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 56141be5f0ab..a6e055dd0630 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -49,7 +49,7 @@ in { }; unifiStable = generic { - version = "5.12.72"; - sha256 = "00d7kxn3f1c0i4kg81hz2hf9bdbccb3d1zs7js414rpc5k3xg3kz"; + version = "5.13.29"; + sha256 = "0j1spid9q41l57gyphg8smn92iy52z4x4wy236a2a15p731gllh8"; }; } From b23c1abe9390b9384c241e16d4da0ea421547c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 12 Jun 2020 08:52:09 +0200 Subject: [PATCH 1478/3452] linux: fix kernel config options for i686 Even the default pkgsi686Linux.linux was broken. --- pkgs/os-specific/linux/kernel/common-config.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 06ed2cf15598..b1193c7fa734 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -116,7 +116,7 @@ let CLS_U32_PERF = yes; CLS_U32_MARK = yes; BPF_JIT = whenPlatformHasEBPFJit yes; - BPF_JIT_ALWAYS_ON = no; # whenPlatformHasEBPFJit yes; # see https://github.com/NixOS/nixpkgs/issues/79304 + BPF_JIT_ALWAYS_ON = whenPlatformHasEBPFJit no; # whenPlatformHasEBPFJit yes; # see https://github.com/NixOS/nixpkgs/issues/79304 HAVE_EBPF_JIT = whenPlatformHasEBPFJit yes; BPF_STREAM_PARSER = whenAtLeast "4.19" yes; XDP_SOCKETS = whenAtLeast "4.19" yes; @@ -771,8 +771,8 @@ let HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support # Enable AMD's ROCm GPU compute stack - HSA_AMD = whenAtLeast "4.20" yes; - ZONE_DEVICE = whenAtLeast "5.3" yes; + HSA_AMD = mkIf stdenv.hostPlatform.is64bit (whenAtLeast "4.20" yes); + ZONE_DEVICE = mkIf stdenv.hostPlatform.is64bit (whenAtLeast "5.3" yes); HMM_MIRROR = whenAtLeast "5.3" yes; DRM_AMDGPU_USERPTR = whenAtLeast "5.3" yes; From 0f1c3d51b70d43f8d1007f15a8abc7fa9fc7a572 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 12 Jun 2020 09:43:00 +0200 Subject: [PATCH 1479/3452] cypress: 4.5.0 -> 4.8.0 --- pkgs/development/web/cypress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 10701f6b445d..4787ce84513b 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec{ pname = "cypress"; - version = "4.5.0"; + version = "4.8.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "0pr9b36s63xplmyjgjdifw5pgas7bxwbnsckjix7djyln0j5ja3q"; + sha256 = "0wivvh3fhyhxx9f6vp0kgqkjj4957hj0b15r2igbxnyqvahwxgx7"; }; # don't remove runtime deps From c60e2bee7c514a422ebf74c766e9e18c936ad845 Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Fri, 12 Jun 2020 00:01:48 +0200 Subject: [PATCH 1480/3452] coqPackages.coq-elpi: 1.4.0 -> 1.4.1 --- pkgs/development/coq-modules/coq-elpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 333b89d0fad8..3857146ea605 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -2,9 +2,9 @@ let params = { "8.11" = rec { - version = "1.4.0"; + version = "1.4.1"; rev = "v${version}"; - sha256 = "1pzmjgvvdwki59rfsha3c1ik4gii39j44ijyb9m9as1cyfpxx906"; + sha256 = "12jwldcianai62y9jnghsjfya5dj6fvc6ilf37c7w037kylx45sd"; }; }; param = params.${coq.coq-version}; From 73ae41dedeac47645ad5c7711da3e15e95392e1f Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 12 Jun 2020 16:36:41 +0800 Subject: [PATCH 1481/3452] onedrive: build with ldc instead of dmd --- pkgs/applications/networking/sync/onedrive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index dd5e633c3f4a..be255a6c1465 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, dmd, installShellFiles, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoreconfHook, ldc, installShellFiles, pkgconfig , curl, sqlite, libnotify , withSystemd ? stdenv.isLinux, systemd ? null }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "10s33p1xzq9c5n1bxv9n7n31afxgx9i6c17w0xgxdrma75micm3a"; }; - nativeBuildInputs = [ autoreconfHook dmd installShellFiles pkgconfig ]; + nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkgconfig ]; buildInputs = [ curl sqlite libnotify From d1a51e415d25d85b1d2b0f28380e4de68b443d2f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 12 Jun 2020 04:20:00 -0500 Subject: [PATCH 1482/3452] ocamlPackages.merlin: 3.3.4 -> 3.3.6 --- pkgs/development/tools/ocaml/merlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index fa78e47951f3..4b11dd13983d 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "merlin"; - version = "3.3.4"; + version = "3.3.6"; minimumOCamlVersion = "4.02.1"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; - sha256 = "12wxric6n3rmsn0w16xm8vjd8p5aw24cj76zw2x87qfwwgmy1kdd"; + sha256 = "1360cm0jkn2v2y5p3yzdyw9661a1vpddcibkbfblmk95qafx4civ"; }; buildInputs = [ yojson ]; From 031ef5f64ed5d2e8c8d5fdc36b9082a0edd4dea7 Mon Sep 17 00:00:00 2001 From: kraem Date: Fri, 12 Jun 2020 12:27:21 +0200 Subject: [PATCH 1483/3452] facetimehd: 2019-12-10 -> 2020-04-16 --- pkgs/os-specific/linux/facetimehd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index 223f766aa228..7196f3ac929b 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -16,9 +16,9 @@ let # still works. srcParams = if (stdenv.lib.versionAtLeast kernel.version "4.8") then { # Use mainline branch - version = "unstable-2019-12-10"; - rev = "ea832ac486afb6dac9ef59aa37e90f332ab7f05a"; - sha256 = "1dg2i558hjnjnyk53xyg0ayykqaial9bm420v22s9a3khzzjnwq3"; + version = "unstable-2020-04-16"; + rev = "82626d4892eeb9eb704538bf0dc49a00725ff451"; + sha256 = "118z6vjvhhcwvs4n3sgwwdagys9w718b8nkh6l9ic93732vv7cqx"; } else { # Use master branch (broken on 4.8) From 66dcfc613ea7746102cc28f4d4739d5b4bca6ae4 Mon Sep 17 00:00:00 2001 From: Martin Baillie Date: Fri, 12 Jun 2020 20:35:06 +1000 Subject: [PATCH 1484/3452] terraform-ls: init at 0.3.2 Signed-off-by: Martin Baillie --- .../tools/misc/terraform-ls/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/misc/terraform-ls/default.nix diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix new file mode 100644 index 000000000000..cbbdd416ff8b --- /dev/null +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "terraform-ls"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = pname; + rev = "v${version}"; + sha256 = "11776nq1ixrg791xlmryjxldsc8gn69j1fc0wd6cdywy8yp2lh4w"; + }; + + goPackagePath = "github.com/hashicorp/terraform-ls"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + + meta = with lib; { + description = "Terraform Language Server (official)"; + homepage = "https://github.com/hashicorp/terraform-ls"; + license = licenses.mpl20; + maintainers = with maintainers; [ mbaillie ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 544fd90b24e8..421f03edc836 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11057,6 +11057,7 @@ in terracognita = callPackage ../development/tools/misc/terracognita { }; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; + terraform-ls = callPackage ../development/tools/misc/terraform-ls { }; texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; From ad2330f642bbd52749b51be917aa35b26eb1730a Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 6 Jun 2020 11:02:23 -0400 Subject: [PATCH 1485/3452] nixos/ssmtp: drop authPass option in favor of authPassFile, or services.ssmtp.settings.AuthPass if absolutely required --- nixos/modules/programs/ssmtp.nix | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix index eee36b6ae577..15d2750c193f 100644 --- a/nixos/modules/programs/ssmtp.nix +++ b/nixos/modules/programs/ssmtp.nix @@ -21,9 +21,11 @@ in (mkRenamedOptionModule [ "networking" "defaultMailServer" "useTLS" ] [ "services" "ssmtp" "useTLS" ]) (mkRenamedOptionModule [ "networking" "defaultMailServer" "useSTARTTLS" ] [ "services" "ssmtp" "useSTARTTLS" ]) (mkRenamedOptionModule [ "networking" "defaultMailServer" "authUser" ] [ "services" "ssmtp" "authUser" ]) - (mkRenamedOptionModule [ "networking" "defaultMailServer" "authPass" ] [ "services" "ssmtp" "authPass" ]) (mkRenamedOptionModule [ "networking" "defaultMailServer" "authPassFile" ] [ "services" "ssmtp" "authPassFile" ]) (mkRenamedOptionModule [ "networking" "defaultMailServer" "setSendmail" ] [ "services" "ssmtp" "setSendmail" ]) + + (mkRemovedOptionModule [ "networking" "defaultMailServer" "authPass" ] "authPass has been removed since it leaks the clear-text password into the world-readable store. Use authPassFile instead and make sure it's not a store path") + (mkRemovedOptionModule [ "services" "ssmtp" "authPass" ] "authPass has been removed since it leaks the clear-text password into the world-readable store. Use authPassFile instead and make sure it's not a store path") ]; options = { @@ -116,18 +118,6 @@ in ''; }; - authPass = mkOption { - type = types.str; - default = ""; - example = "correctHorseBatteryStaple"; - description = '' - Password used for SMTP auth. (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE) - - It's recommended to use - which takes precedence over . - ''; - }; - authPassFile = mkOption { type = types.nullOr types.str; default = null; @@ -136,11 +126,6 @@ in Path to a file that contains the password used for SMTP auth. The file should not contain a trailing newline, if the password does not contain one. This file should be readable by the users that need to execute ssmtp. - - takes precedence over . - - Warning: when is non-empty - defaults to a file in the WORLD-READABLE Nix store containing that password. ''; }; @@ -157,12 +142,6 @@ in config = mkIf cfg.enable { - services.ssmtp.authPassFile = mkIf (cfg.authPass != "") - (mkDefault (toString (pkgs.writeTextFile { - name = "ssmtp-authpass"; - text = cfg.authPass; - }))); - services.ssmtp.settings = mkMerge [ ({ MailHub = cfg.hostName; From c3cb2cac554b5409f8ee19792346031b353f1dd0 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 22 Apr 2020 15:50:26 +0200 Subject: [PATCH 1486/3452] 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 7380ad739df8ef490ee0b7525f1297835ad513d8 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 8 Jun 2020 12:00:27 +0200 Subject: [PATCH 1487/3452] haskellPackages.gitit: mark unbroken MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s finally got a new release. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d15c37a65fbe..fb9ff1d825f2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1405,6 +1405,9 @@ self: super: { # $HOME, which we don't have in our build sandbox. cabal-install-parsers = dontCheck super.cabal-install-parsers; + # gitit is unbroken in the latest release + gitit = markUnbroken super.gitit; + # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2. haskell-ci = doJailbreak super.haskell-ci; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1b02c07bbc20..a0b6338ab65a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5137,7 +5137,6 @@ broken-packages: - github-webhooks - githud - gitignore - - gitit - gitlab-api - gitlib - gitlib-cmdline From 91340aeea87aa25f8265b0a69af88d7d36fcf04f Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 8 Jun 2020 13:07:30 +0200 Subject: [PATCH 1488/3452] gitit: init at 0.13.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was broken in `haskellPackages` for a long time, but it’s back! Time to give it a place in the toplevel and a prope) treatment: * Semi-static binary * Remove all references to `Paths_` modules of dependencies * gitit tries very hard to have a runtime dependency on GHC, disable that by default. Also added myself as a maintainer, let’s try to keep this working from now on. Fixes https://github.com/NixOS/nixpkgs/issues/32377 --- pkgs/applications/misc/gitit/default.nix | 61 +++++++++++++++++++++++ pkgs/development/tools/pandoc/default.nix | 4 +- pkgs/top-level/all-packages.nix | 2 + 3 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/misc/gitit/default.nix diff --git a/pkgs/applications/misc/gitit/default.nix b/pkgs/applications/misc/gitit/default.nix new file mode 100644 index 000000000000..a4ffd3bf88d3 --- /dev/null +++ b/pkgs/applications/misc/gitit/default.nix @@ -0,0 +1,61 @@ +{ lib, haskellPackages, haskell, removeReferencesTo +# “Plugins” are a fancy way of saying gitit will invoke +# GHC at *runtime*, which in turn makes it pull GHC +# into its runtime closure. Only enable if you really need +# that feature. But if you do you’ll want to use gitit +# as a library anyway. +, pluginSupport ? false +}: + +# this is similar to what we do with the pandoc executable + +let + plain = haskellPackages.gitit; + plugins = + if pluginSupport + then plain + else haskell.lib.disableCabalFlag plain "plugins"; + static = haskell.lib.justStaticExecutables plugins; + +in + (haskell.lib.overrideCabal static (drv: { + buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ]; + })).overrideAttrs (drv: { + + # These libraries are still referenced, because they generate + # a `Paths_*` module for figuring out their version. + # The `Paths_*` module is generated by Cabal, and contains the + # version, but also paths to e.g. the data directories, which + # lead to a transitive runtime dependency on the whole GHC distribution. + # This should ideally be fixed in haskellPackages (or even Cabal), + # but a minimal gitit is important enough to patch it manually. + disallowedReferences = [ + haskellPackages.pandoc-types + haskellPackages.HTTP + haskellPackages.pandoc + haskellPackages.happstack-server + haskellPackages.filestore + ]; + postInstall = '' + remove-references-to \ + -t ${haskellPackages.pandoc-types} \ + $out/bin/gitit + remove-references-to \ + -t ${haskellPackages.HTTP} \ + $out/bin/gitit + remove-references-to \ + -t ${haskellPackages.pandoc} \ + $out/bin/gitit + remove-references-to \ + -t ${haskellPackages.happstack-server} \ + $out/bin/gitit + remove-references-to \ + -t ${haskellPackages.filestore} \ + $out/bin/gitit + ''; + + meta = drv.meta // { + maintainers = drv.meta.maintainers or [] + ++ [ lib.maintainers.Profpatsch ]; + }; + }) diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix index ce7132b0007b..0bf9ce71e481 100644 --- a/pkgs/development/tools/pandoc/default.nix +++ b/pkgs/development/tools/pandoc/default.nix @@ -10,8 +10,8 @@ in buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ]; })).overrideAttrs (drv: { - # These libraries are still referenced, because pandoc references - # their `Paths_*` module for figuring out their version. + # These libraries are still referenced, because they generate + # a `Paths_*` module for figuring out their version. # The `Paths_*` module is generated by Cabal, and contains the # version, but also paths to e.g. the data directories, which # lead to a transitive runtime dependency on the whole GHC distribution. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 544fd90b24e8..5d887dd4601b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19926,6 +19926,8 @@ in giada = callPackage ../applications/audio/giada {}; + gitit = callPackage ../applications/misc/gitit {}; + gkrellm = callPackage ../applications/misc/gkrellm { inherit (darwin) IOKit; }; From 3cd13f8b7eef1dc53c7baa1313b6709dce49cf08 Mon Sep 17 00:00:00 2001 From: kraem Date: Fri, 12 Jun 2020 14:05:06 +0200 Subject: [PATCH 1489/3452] facetimehd: remove patch in nixpkgs, patched upstream --- pkgs/os-specific/linux/facetimehd/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index 223f766aa228..ed7732d1d478 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -47,11 +47,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - preBuild = lib.optionalString (stdenv.lib.versionAtLeast kernel.version "5.6") - '' - sed -i 's/ioremap_nocache/ioremap_cache/g' fthd_drv.c - ''; - makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; From b7f55b30f5f7cba262f89fbce7ddcf4e45688341 Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Fri, 5 Jun 2020 01:12:53 +0200 Subject: [PATCH 1490/3452] coqPackages.mathcomp: 1.11.0 --- .../coq-modules/mathcomp/default.nix | 8 ++-- .../coq-modules/mathcomp/extra.nix | 37 ++++++++++++++----- 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 140bf8ab5364..d4d5f924f52f 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -66,7 +66,8 @@ let ####################################################################### # sha256 of released mathcomp versions sha256 = { - "1.11.0+beta1" = "12i3zznwajlihzpqsiqniv20rklj8d8401lhd241xy4s21fxkkjm"; + "1.11.0" = "06a71d196wd5k4wg7khwqb7j7ifr7garhwkd54s86i0j7d6nhl3c"; + "1.11+beta1" = "12i3zznwajlihzpqsiqniv20rklj8d8401lhd241xy4s21fxkkjm"; "1.10.0" = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv"; "1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r"; "1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp"; @@ -75,7 +76,8 @@ let }; # versions of coq compatible with released mathcomp versions coq-versions = { - "1.11.0+beta1" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; + "1.11.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; + "1.11+beta1" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; "1.10.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; "1.9.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" ]; "1.8.0" = flip elem [ "8.7" "8.8" "8.9" ]; @@ -94,7 +96,7 @@ let # mathcomp preferred versions by decreasing order # (the first version in the list will be tried first) version-preferences = - [ "1.10.0" "1.9.0" "1.11.0+beta1" "1.8.0" "1.7.0" "1.6.1" ]; + [ "1.10.0" "1.11.0" "1.9.0" "1.8.0" "1.7.0" "1.6.1" ]; # list of core mathcomp packages sorted by dependency order packages = _version: # unused in current versions of mathcomp diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix index a53caac621c3..6a2dfcda3456 100644 --- a/pkgs/development/coq-modules/mathcomp/extra.nix +++ b/pkgs/development/coq-modules/mathcomp/extra.nix @@ -112,7 +112,7 @@ let mathcomp-analysis = {version, coqPackages}: { propagatedBuildInputs = with coqPackages; - [ mathcomp.field mathcomp-finmap mathcomp-bigenough ]; + [ mathcomp.field mathcomp-finmap mathcomp-bigenough mathcomp-real-closed ]; meta = { description = "Analysis library compatible with Mathematical Components"; homepage = "https://github.com/math-comp/analysis"; @@ -168,12 +168,15 @@ let "1.0.0" = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg"; }; mathcomp-analysis = { + "0.3.1" = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8"; + "0.3.0" = "03klwi4fja0cqb4myp3kgycfbmdv00bznmxf8yg3zzzzw997hjqc"; "0.2.3" = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; "0.2.2" = "1d5dwg9di2ppdzfg21zr0a691zigb5kz0lcw263jpyli1nrq7cvk"; "0.2.0" = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd"; "0.1.0" = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al"; }; multinomials = { + "1.5.2" = "15aspf3jfykp1xgsxf8knqkxv8aav2p39c2fyirw7pwsfbsv2c4s"; "1.5.1" = "13nlfm2wqripaq671gakz5mn4r0xwm0646araxv0nh455p9ndjs3"; "1.5" = "064rvc0x5g7y1a0nip6ic91vzmq52alf6in2bc2dmss6dmzv90hw"; "1.4" = "0vnkirs8iqsv8s59yx1fvg1nkwnzydl42z3scya1xp1b48qkgn0p"; @@ -183,6 +186,8 @@ let "1.0" = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; }; mathcomp-real-closed = { + "1.1.1" = "0ksjscrgq1i79vys4zrmgvzy2y4ylxa8wdsf4kih63apw6v5ws6b"; + "1.1.0" = "0zgfmrlximw77bw5w6w0xg2nampp02pmrwnrzx8m1n5pqljnv8fh"; "1.0.5" = "0q8nkxr9fba4naylr5xk7hfxsqzq2pvwlg1j0xxlhlgr3fmlavg2"; "1.0.4" = "058v9dj973h9kfhqmvcy9a6xhhxzljr90cf99hdfcdx68fi2ha1b"; "1.0.3" = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb"; @@ -190,6 +195,7 @@ let "1.0.1" = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg"; }; coqeal = { + "1.0.4" = "1g5m26lr2lwxh6ld2gykailhay4d0ayql4bfh0aiwqpmmczmxipk"; "1.0.3" = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24"; "1.0.2" = "1brmf3gj03iky1bcl3g9vx8vknny7xfvs0y2rfr85am0296sxsfj"; "1.0.1" = "19jhdrv2yp9ww0h8q73ihb2w1z3glz4waf2d2n45klafxckxi7bm"; @@ -201,13 +207,21 @@ let # CONSISTENT sets of packages. # ################################ for-coq-and-mc = let + v6 = { + mathcomp-finmap = "1.5.0"; + mathcomp-bigenough = "1.0.0"; + mathcomp-analysis = "0.3.1"; + multinomials = "1.5.2"; + mathcomp-real-closed = "1.1.1"; + coqeal = "1.0.4"; + }; v5 = { mathcomp-finmap = "1.5.0"; mathcomp-bigenough = "1.0.0"; - mathcomp-analysis = "678d3cc37f5f3c71b1bd550836eb44e3ba2a5459"; - multinomials = "1.5.1"; + mathcomp-analysis = "0.3.0"; + multinomials = "1.5.1"; mathcomp-real-closed = "1.0.5"; - coqeal = "CohenCyril/bdfc96771644b082e41268edc43d61dc5fda2358"; + coqeal = "1.0.4"; }; v4 = v3 // { coqeal = "1.0.3"; }; v3 = { @@ -236,29 +250,34 @@ let in { "8.11" = { - "1.11.0+beta1" = v5; + "1.11.0" = v6; + "1.11+beta1" = v5; "1.10.0" = v4 // {mathcomp-finmap = "1.4.0+coq-8.11";}; }; "8.10" = { - "1.11.0+beta1" = removeAttrs v5 ["coqeal"]; + "1.11.0" = removeAttrs v6 ["coqeal"]; + "1.11+beta1" = removeAttrs v5 ["coqeal"]; "1.10.0" = v4; "1.9.0" = removeAttrs v3 ["coqeal"]; }; "8.9" = { - "1.11.0+beta1" = removeAttrs v5 ["mathcomp-analysis"]; + "1.11.0" = removeAttrs v6 ["mathcomp-analysis"]; + "1.11+beta1" = removeAttrs v5 ["mathcomp-analysis"]; "1.10.0" = v4; "1.9.0" = removeAttrs v3 ["coqeal"]; "1.8.0" = removeAttrs v2 ["coqeal"]; }; "8.8" = { - "1.11.0+beta1" = removeAttrs v5 ["mathcomp-analysis"]; + "1.11.0" = removeAttrs v6 ["mathcomp-analysis"]; + "1.11+beta1" = removeAttrs v5 ["mathcomp-analysis"]; "1.10.0" = removeAttrs v4 ["mathcomp-analysis"]; "1.9.0" = removeAttrs v3 ["coqeal"]; "1.8.0" = removeAttrs v2 ["coqeal"]; "1.7.0" = removeAttrs v1 ["coqeal" "multinomials"]; }; "8.7" = { - "1.11.0+beta1" = removeAttrs v5 ["mathcomp-analysis"]; + "1.11.0" = removeAttrs v6 ["mathcomp-analysis"]; + "1.11+beta1" = removeAttrs v5 ["mathcomp-analysis"]; "1.10.0" = removeAttrs v4 ["mathcomp-analysis"]; "1.9.0" = removeAttrs v3 ["coqeal" "mathcomp-analysis"]; "1.8.0" = removeAttrs v2 ["coqeal" "mathcomp-analysis"]; From aef898b0a2c5e0b6891919d995b40ebcde599662 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 12 Jun 2020 15:30:41 +0200 Subject: [PATCH 1491/3452] mplayer: fix build by forcing -lfreetype --- pkgs/applications/video/mplayer/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 1dd6b593f0fc..59642ee08446 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -199,6 +199,7 @@ stdenv.mkDerivation rec { optional fontconfigSupport "-lfontconfig" ++ optional fribidiSupport "-lfribidi" ++ optionals x11Support [ "-lX11" "-lXext" ] + ++ [ "-lfreetype" ] ); installTargets = [ "install" ] ++ stdenv.lib.optional x11Support "install-gui"; From 3cf2f4d6a336641a73a26f91e51fbcddcdc5e379 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 12 Jun 2020 09:59:34 -0400 Subject: [PATCH 1492/3452] linux_latest-libre: 17527 -> 17537 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 2daf3d4b8858..e531f878d029 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17527"; - sha256 = "0kijrflm1z6wnd4hg46lgm1sqps3fvnrrbzwjfwqq171a78sphhr"; + rev = "17537"; + sha256 = "15fj5ba28jw515fzfp4pbrkpq5xyvxvx7r9yh1l0qsxjzs2zml8b"; } , ... }: From cf29bf09530e18939410fc1f081b79624a095f5d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 12 Jun 2020 09:59:55 -0400 Subject: [PATCH 1493/3452] oh-my-zsh: 2020-06-08 -> 2020-06-10 --- 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 4838df3a6b1a..a062b346fda0 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-08"; + version = "2020-06-10"; pname = "oh-my-zsh"; - rev = "374b4e02ef80b14c0d70e99f52ee08cce68a1eeb"; + rev = "db94f60d342ba2be7dbe3bfd86f4edb335c2a6a7"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "053vc8if4p1a9ilrnyyw1417iriysmpiqa3ycafg01nm7qdm0bbj"; + sha256 = "14zvbnrnkcmqnjbw71j4jgfm7gkrgpchkfrpdw006q25gqxj0bgm"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 54c4223e55db678a36399d7cc853532bce6832c9 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Jun 2020 14:26:08 +0000 Subject: [PATCH 1494/3452] treewide: central.maven.org -> repo1.maven.org --- pkgs/applications/editors/jedit/default.nix | 4 ++-- .../git-and-tools/bfg-repo-cleaner/default.nix | 2 +- pkgs/build-support/fetchmavenartifact/default.nix | 2 +- pkgs/build-support/fetchurl/mirrors.nix | 1 - pkgs/servers/monitoring/prometheus/jmx-httpserver.nix | 2 +- pkgs/tools/networking/openapi-generator-cli/default.nix | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index fd8b53372510..178494b04981 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -3,11 +3,11 @@ let version = "5.2.0"; bcpg = fetchurl { - url = "http://central.maven.org/maven2/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.jar"; + url = "mirror://maven/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.jar"; sha256 = "16xhmwks4l65m5x150nd23y5lyppha9sa5fj65rzhxw66gbli82d"; }; jsr305 = fetchurl { - url = "http://central.maven.org/maven2/com/google/code/findbugs/jsr305/2.0.0/jsr305-2.0.0.jar"; + url = "mirror://maven/com/google/code/findbugs/jsr305/2.0.0/jsr305-2.0.0.jar"; sha256 = "0s74pv8qjc42c7q8nbc0c3b1hgx0bmk3b8vbk1z80p4bbgx56zqy"; }; in diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index b225782f2864..99c6323217ab 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -3,7 +3,7 @@ let version = "1.13.0"; jarName = "bfg-${version}.jar"; - mavenUrl = "http://central.maven.org/maven2/com/madgag/bfg/${version}/${jarName}"; + mavenUrl = "mirror://maven/com/madgag/bfg/${version}/${jarName}"; in stdenv.mkDerivation { inherit version jarName; diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix index d7ad406943be..583a9ea396cf 100644 --- a/pkgs/build-support/fetchmavenartifact/default.nix +++ b/pkgs/build-support/fetchmavenartifact/default.nix @@ -3,7 +3,7 @@ { fetchurl, stdenv }: let defaultRepos = [ - "http://central.maven.org/maven2" + "http://repo1.maven.org/maven2" "http://oss.sonatype.org/content/repositories/releases" "http://oss.sonatype.org/content/repositories/public" "http://repo.typesafe.com/typesafe/releases" diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 4e8b0aa99a8f..0eba8816b638 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -426,7 +426,6 @@ # Maven Central maven = [ "https://repo1.maven.org/maven2/" - "https://central.maven.org/maven2/" ]; # Alsa Project diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix index 05e0d4cb079f..8cb9dbb2382c 100644 --- a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix +++ b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix @@ -3,7 +3,7 @@ let version = "0.10"; jarName = "jmx_prometheus_httpserver-${version}-jar-with-dependencies.jar"; - mavenUrl = "http://central.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_httpserver/${version}/${jarName}"; + mavenUrl = "mirror://maven/io/prometheus/jmx/jmx_prometheus_httpserver/${version}/${jarName}"; in stdenv.mkDerivation { inherit version jarName; diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 2e5695ff4525..2b09fe901d07 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}"; + url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; sha256 = "1pafv432ll3pp52580pbnk0gnrm6byl5fkrf1rarhxfkpkr82yif"; }; From 4087d3fe41738cf73c347efebf96476e4c0798b4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 12 Jun 2020 08:55:57 +0200 Subject: [PATCH 1495/3452] python: don't use optimizations on Darwin Also, don't use autoreconfHook on Darwin with Python 3. Darwin builds are still impure and fail with ld: warning: directory not found for option '-L/nix/store/6yhj9djska835wb6ylg46d2yw9dl0sjb-configd-osx-10.8.5/lib' ld: warning: directory not found for option '-L/nix/store/6yhj9djska835wb6ylg46d2yw9dl0sjb-configd-osx-10.8.5/lib' ld: warning: object file (/nix/store/0lsij4jl35bnhqhdzla8md6xiswgig5q-Libsystem-osx-10.12.6/lib/crt1.10.6.o) was built for newer OSX version (10.12) than being linked (10.6) DYLD_LIBRARY_PATH=/private/tmp/nix-build-python3-3.8.3.drv-0/Python-3.8.3 ./python.exe -E -S -m sysconfig --generate-posix-vars ;\ if test $? -ne 0 ; then \ echo "generate-posix-vars failed" ; \ rm -f ./pybuilddir.txt ; \ exit 1 ; \ fi /nix/store/dsb7d4dwxk6bzlm845z2zx6wp9a8bqc1-bash-4.4-p23/bin/bash: line 5: 72015 Killed: 9 DYLD_LIBRARY_PATH=/private/tmp/nix-build-python3-3.8.3.drv-0/Python-3.8.3 ./python.exe -E -S -m sysconfig --generate-posix-vars generate-posix-vars failed make: *** [Makefile:592: pybuilddir.txt] Error 1 --- .../interpreters/python/cpython/2.7/default.nix | 4 +++- pkgs/development/interpreters/python/cpython/default.nix | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index db86b67835e3..62aae7b22129 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -23,6 +23,7 @@ , sha256 , passthruFun , static ? false +, enableOptimizations ? (!stdenv.isDarwin) }: assert x11Support -> tcl != null @@ -138,8 +139,9 @@ let --replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")' ''; - configureFlags = [ + configureFlags = optionals enableOptimizations [ "--enable-optimizations" + ] ++ [ "--enable-shared" "--with-threads" "--enable-unicode=ucs${toString ucsEncoding}" diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index ee77185cde65..694f661a9669 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -31,7 +31,9 @@ , stripBytecode ? false , includeSiteCustomize ? true , static ? false -, enableOptimizations ? true +# Not using optimizations on Darwin +# configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found. +, enableOptimizations ? (!stdenv.isDarwin) }: assert x11Support -> tcl != null @@ -54,8 +56,9 @@ let version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; - nativeBuildInputs = [ + nativeBuildInputs = optionals (!stdenv.isDarwin) [ autoreconfHook + ] ++ [ nukeReferences ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc From 3d746848477b0ee2173ac3039a59a8499ef73904 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 11 Jun 2020 16:54:01 -0700 Subject: [PATCH 1496/3452] pythonPackages.bravia-tv: 1.0.1 -> 1.0.5 --- pkgs/development/python-modules/bravia-tv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix index 2df937f4232c..8050f886db5a 100644 --- a/pkgs/development/python-modules/bravia-tv/default.nix +++ b/pkgs/development/python-modules/bravia-tv/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "bravia-tv"; - version = "1.0.1"; + version = "1.0.5"; disabled = isPy27; src = fetchFromGitHub { owner = "dcnielsen90"; repo = "python-bravia-tv"; rev = "v${version}"; - sha256 = "0jlrin5qw3ny2r961y5divd5xa9giprxhhxdc84rjlq9qdmnsk68"; + sha256 = "17nd0v3pgmbfafi3vypls9jnpg4dk7wyh7fl7gpzcnkq1f8pf087"; }; propagatedBuildInputs = [ requests ]; From 89307ea34d310c30f51fcdcf1ff952191eaa813c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Jun 2020 10:33:39 -0700 Subject: [PATCH 1497/3452] python3Packages.jaraco_functools: fix build --- .../development/python-modules/jaraco_functools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index 638d2b14e985..6ee4c2417109 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools_scm +, setuptools_scm, toml , more-itertools, backports_functools_lru_cache }: buildPythonPackage rec { @@ -11,12 +11,12 @@ buildPythonPackage rec { sha256 = "9fedc4be3117512ca3e03e1b2ffa7a6a6ffa589bfb7d02bfb324e55d493b94f4"; }; + nativeBuildInputs = [ setuptools_scm toml ]; + propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; doCheck = false; - buildInputs = [ setuptools_scm ]; - meta = with lib; { description = "Additional functools in the spirit of stdlib's functools"; homepage = "https://github.com/jaraco/jaraco.functools"; From ab1be09c943d45b1ceb3dbacd7319d3ca17dca50 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Jun 2020 10:40:43 -0700 Subject: [PATCH 1498/3452] python3Packages.pytest-doctestplus: fix tests --- pkgs/development/python-modules/pytest-doctestplus/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 216be4fc5203..36e0402dba28 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -25,8 +25,9 @@ buildPythonPackage rec { pytest ]; + # check_distribution incorrectly pulls pytest version checkPhase = '' - pytest + pytest -k 'not check_distribution' ''; meta = with lib; { From 107f7ba0263dc6225cc0d3bafa10f7581c5444d0 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Fri, 12 Jun 2020 14:01:43 -0400 Subject: [PATCH 1499/3452] musl: include libc.musl-$arch --- pkgs/os-specific/linux/musl/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 51dcf4cfca33..422ad5c1cb50 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -26,6 +26,12 @@ let sha256 = "1mzxnc2ncq8lw9x6n7p00fvfklc9p3wfv28m68j0dfz5l8q2k6pp"; }; + arch = if stdenv.hostPlatform.isx86_64 + then "x86_64" + else if stdenv.hostPlatform.isx86_32 + then "i386" + else null; + in stdenv.mkDerivation rec { pname = "musl"; @@ -102,6 +108,9 @@ stdenv.mkDerivation rec { -lc \ -B $out/lib \ -Wl,-dynamic-linker=$(ls $out/lib/ld-*) + '' + lib.optionalString (arch != null) '' + # Create 'libc.musl-$arch' symlink + ln -rs $out/lib/libc.so $out/lib/libc.musl-${arch}.so.1 '' + lib.optionalString useBSDCompatHeaders '' install -D ${queue_h} $dev/include/sys/queue.h install -D ${cdefs_h} $dev/include/sys/cdefs.h From 14eb90df78185c3a7c55ba2ad3786ec0b8d8de59 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Jun 2020 11:05:50 -0700 Subject: [PATCH 1500/3452] python3Packages.kombu: fix tests --- pkgs/development/python-modules/kombu/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 27d225c6f7cf..5c70fb5eee0a 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi , amqp +, botocore , case , Pyro4 , pytest @@ -31,7 +32,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ pytest case pytz Pyro4 sqlalchemy ]; + checkInputs = [ botocore pytest case pytz Pyro4 sqlalchemy ]; # test_redis requires fakeredis, which isn't trivial to package checkPhase = '' pytest --ignore t/unit/transport/test_redis.py From 8a67181b7c37b548d4bfb0652e4103549cb70785 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Jun 2020 11:06:22 -0700 Subject: [PATCH 1501/3452] python3Packages.scikitimage: add missing tifffile dep --- .../python-modules/scikit-image/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 35ba4f53cd27..44d2c240ce54 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -13,6 +13,7 @@ , cloudpickle , pytest , imageio +, tifffile }: buildPythonPackage rec { @@ -24,9 +25,21 @@ buildPythonPackage rec { sha256 = "bd954c0588f0f7e81d9763dc95e06950e68247d540476e06cb77bcbcd8c2d8b3"; }; - buildInputs = [ cython ]; + nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ numpy scipy matplotlib networkx six pillow pywavelets dask cloudpickle imageio ]; + propagatedBuildInputs = [ + cloudpickle + dask + imageio + matplotlib + networkx + numpy + pillow + pywavelets + scipy + six + tifffile + ]; checkInputs = [ pytest ]; From 41dc003692a625e67a54c127bbe23e235f399c38 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 12 Jun 2020 18:22:37 +0000 Subject: [PATCH 1502/3452] perlPackages.ExtUtilsPkgConfig: Fix build Fixes #90084 --- pkgs/top-level/perl-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 050419437143..bbc5277cd648 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5,7 +5,11 @@ for each package in a separate file: the call to the function would be almost as much code as the function itself. */ -{config, pkgs, fetchurl, fetchpatch, fetchFromGitHub, stdenv, perl, overrides, buildPerl, shortenPerlShebang}: +{ config +, stdenv, buildPackages, pkgs +, fetchurl, fetchpatch, fetchFromGitHub +, perl, overrides, buildPerl, shortenPerlShebang +}: # cpan2nix assumes that perl-packages.nix will be used only with perl 5.28.2 or above assert stdenv.lib.versionAtLeast perl.version "5.28.2"; @@ -6882,6 +6886,7 @@ let url = "mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-1.16.tar.gz"; sha256 = "bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e"; }; + nativeBuildInputs = [ buildPackages.pkgconfig ]; propagatedBuildInputs = [ pkgs.pkgconfig ]; meta = { homepage = "http://gtk2-perl.sourceforge.net"; From db59d205fefd1981ba80fe43dd7a0d1781ae7734 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Jun 2020 11:22:39 -0700 Subject: [PATCH 1503/3452] python3Packages.caldav: use github, fix build --- .../python-modules/caldav/default.nix | 39 +++++++++++++------ 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 15c2dd2b0fe0..0d96372abfcd 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -1,34 +1,51 @@ { lib , buildPythonPackage -, fetchPypi -, tzlocal -, requests -, vobject +, fetchFromGitHub +, pythonOlder +, icalendar , lxml , nose +, pytz +, requests +, six +, tzlocal +, vobject }: buildPythonPackage rec { pname = "caldav"; version = "0.7.0"; - propagatedBuildInputs = [ tzlocal requests vobject lxml nose ]; - - src = fetchPypi { - inherit pname version; - sha256 = "f5982b204fcfac8598381e35e46b667542bd728009971271463f81100e6e5943"; + src = fetchFromGitHub { + owner = "python-caldav"; + repo = pname; + rev = "v${version}"; + sha256 = "0m64maiqp3k8fsgkkvdx1dlfhkc70pqig4dclq6w8ajz82czrq83"; }; - # xandikos is only a optional test dependency, not available for python3 + propagatedBuildInputs = [ six requests vobject lxml ] + ++ lib.optionals (pythonOlder "3.6") [ pytz tzlocal ]; + + checkInputs = [ + icalendar + nose + tzlocal + ]; + + # xandikos and radicale is only a optional test dependency, not available for python3 postPatch = '' substituteInPlace setup.py \ - --replace ", 'xandikos'" "" + --replace ", 'xandikos'" "" \ + --replace ", 'radicale'" "" ''; + pythonImportsCheck = [ "caldav" ]; + meta = with lib; { description = "This project is a CalDAV (RFC4791) client library for Python."; homepage = "https://pythonhosted.org/caldav/"; license = licenses.asl20; maintainers = with maintainers; [ marenz ]; + #broken = true; # requires radicale which is not packaged yet }; } From b9ace1fb0555fc4c39e293fd303ce03bc8953223 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Jun 2020 11:29:06 -0700 Subject: [PATCH 1504/3452] python3Packages.uvicorn: 0.11.2 -> 0.11.5 --- .../python-modules/uvicorn/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index d839c421ea0a..ddf98d2d4921 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.11.2"; + version = "0.11.5"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "145c569j4511zw3wglyv9qgd7g1757ypi2blcckpcmahqw11l5p2"; + sha256 = "0cf0vw6kzxwlkvk5gw85wv3kg1kdil0wkq3s7rmxpvrk6gjk8jvq"; }; propagatedBuildInputs = [ @@ -35,18 +35,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "h11==0.8.*" "h11" + --replace "h11==0.8.*" "h11" \ + --replace "httptools==0.0.13" "httptools" ''; checkInputs = [ pytest requests ]; + # watchgod required the watchgod package, which isn't available in nixpkgs checkPhase = '' - pytest - ''; - - # LICENCE.md gets propagated without this, causing collisions - # see https://github.com/encode/uvicorn/issues/392 - postInstall = '' - rm $out/LICENSE.md + pytest --ignore=tests/supervisors/test_watchgodreload.py ''; meta = with lib; { From 619842581a9902e991adb52c55248f1dd46ab7d1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Jun 2020 11:40:55 -0700 Subject: [PATCH 1505/3452] Revert "python3Packages.PySDL2: 0.9.6 -> 0.9.7" This reverts commit 738424b7ea720fca72b1d3810f400941b24165f5. patches need to be updated to support new version --- pkgs/development/python-modules/pysdl2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index b22da8b83ac6..acc27811b284 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "PySDL2"; - version = "0.9.7"; + version = "0.9.6"; # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff # like "screensaver disabling", which would have to be cleverly @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e4fcc8aa1108e4917cb56794575ee08c2a3d9c2c52620474e3ecc8538dadf209"; + sha256 = "08r1v9wdq8pzds4g3sng2xgh1hlzfs2z7qgy5a6b0xrs96swlamm"; }; # Deliberately not in propagated build inputs; users can decide From 82036a6090e61eb4cc9df11e1ca26c1840f08671 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Jun 2020 11:42:20 -0700 Subject: [PATCH 1506/3452] python3Packages.libagent: use github for tests --- pkgs/development/python-modules/libagent/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 82d04dc87f17..4bc07e969330 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, +{ stdenv, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, unidecode, mock, pytest , backports-shutil-which, ConfigArgParse, python-daemon, pymsgbox }: @@ -6,9 +6,11 @@ buildPythonPackage rec { pname = "libagent"; version = "0.14.1"; - src = fetchPypi{ - inherit pname version; - sha256 = "dc979a564cb68cf7c6fa235bf747eb4555deb84f3a8d716940a1709377f140e7"; + src = fetchFromGitHub { + owner = "romanz"; + repo = "trezor-agent"; + rev = "v${version}"; + sha256 = "16y1y9ahcv3wj7f0v4mfiwzkmn2hz1iv7y13cgr57sxa3ymyqx6c"; }; propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse From 8e1dcea3d575dfd4ecdee336e5b95c093f3017cb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 31 May 2020 22:55:05 +0300 Subject: [PATCH 1507/3452] ffmpeg: default to ffmpeg_4 --- 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 fe2a3831c164..65ab2e5c0b8f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11712,7 +11712,9 @@ in # Aliases ffmpeg_2 = ffmpeg_2_8; ffmpeg_3 = ffmpeg_3_4; - ffmpeg = ffmpeg_3; + # Please make sure this is updated to the latest version on the next major + # update to ffmpeg + ffmpeg = ffmpeg_4; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { ffmpeg = ffmpeg_4; From 01d4e2fe332420684803170597d1b88e9f826303 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 7 Jun 2020 15:39:09 +0300 Subject: [PATCH 1508/3452] treewide: use ffmpeg_3 explicitly if not wanted otherwise After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that used `ffmpeg` without requiring a specific version now use ffmpeg_3 explicitly so they shouldn't change. --- pkgs/applications/audio/amarok/default.nix | 4 ++-- pkgs/applications/audio/ardour/default.nix | 8 ++++---- pkgs/applications/audio/audacious/default.nix | 4 ++-- pkgs/applications/audio/audacious/qt-5.nix | 4 ++-- pkgs/applications/audio/audacity/default.nix | 4 ++-- .../audio/bitwig-studio/bitwig-studio1.nix | 4 ++-- pkgs/applications/audio/bs1770gain/default.nix | 4 ++-- pkgs/applications/audio/cantata/default.nix | 4 ++-- pkgs/applications/audio/carla/default.nix | 4 ++-- pkgs/applications/audio/deadbeef/default.nix | 6 +++--- pkgs/applications/audio/dr14_tmeter/default.nix | 2 +- pkgs/applications/audio/kid3/default.nix | 4 ++-- pkgs/applications/audio/moc/default.nix | 4 ++-- pkgs/applications/audio/musikcube/default.nix | 4 ++-- pkgs/applications/audio/pianobar/default.nix | 4 ++-- pkgs/applications/audio/qmmp/default.nix | 4 ++-- pkgs/applications/audio/r128gain/default.nix | 4 ++-- pkgs/applications/audio/squeezelite/default.nix | 4 ++-- pkgs/applications/gis/grass/default.nix | 4 ++-- pkgs/applications/graphics/pqiv/default.nix | 4 ++-- pkgs/applications/kde/ffmpegthumbs.nix | 4 ++-- pkgs/applications/kde/k3b.nix | 4 ++-- pkgs/applications/misc/airtame/default.nix | 4 ++-- pkgs/applications/misc/blender/default.nix | 4 ++-- pkgs/applications/misc/get_iplayer/default.nix | 4 ++-- pkgs/applications/misc/goldendict/default.nix | 4 ++-- pkgs/applications/misc/lutris/chrootenv.nix | 2 +- pkgs/applications/misc/megacmd/default.nix | 4 ++-- pkgs/applications/misc/megasync/default.nix | 4 ++-- pkgs/applications/misc/moonlight-embedded/default.nix | 4 ++-- pkgs/applications/misc/sigal/default.nix | 4 ++-- .../networking/browsers/chromium/common.nix | 4 ++-- .../networking/browsers/firefox-bin/default.nix | 4 ++-- .../networking/browsers/palemoon/default.nix | 6 +++--- .../browsers/tor-browser-bundle-bin/default.nix | 4 ++-- .../networking/browsers/ungoogled-chromium/common.nix | 4 ++-- .../networking/browsers/vivaldi/default.nix | 4 ++-- .../networking/instant-messengers/baresip/default.nix | 4 ++-- .../networking/instant-messengers/linphone/default.nix | 4 ++-- .../networking/instant-messengers/qtox/default.nix | 4 ++-- .../instant-messengers/ring-daemon/default.nix | 4 ++-- .../networking/instant-messengers/sky/default.nix | 4 ++-- .../telegram/kotatogram-desktop/default.nix | 4 ++-- .../applications/networking/p2p/retroshare/default.nix | 4 ++-- .../applications/networking/remote/freerdp/default.nix | 4 ++-- pkgs/applications/video/aegisub/default.nix | 4 ++-- pkgs/applications/video/avxsynth/default.nix | 4 ++-- pkgs/applications/video/bombono/default.nix | 4 ++-- pkgs/applications/video/clipgrab/default.nix | 10 +++++----- pkgs/applications/video/devede/default.nix | 6 +++--- pkgs/applications/video/dvd-slideshow/default.nix | 4 ++-- pkgs/applications/video/ffmpeg-normalize/default.nix | 4 ++-- pkgs/applications/video/gnomecast/default.nix | 4 ++-- pkgs/applications/video/makemkv/default.nix | 4 ++-- pkgs/applications/video/manim/default.nix | 6 +++--- pkgs/applications/video/motion/default.nix | 4 ++-- pkgs/applications/video/mplayer/default.nix | 4 ++-- pkgs/applications/video/natron/default.nix | 4 ++-- pkgs/applications/video/openshot-qt/libopenshot.nix | 4 ++-- pkgs/applications/video/peek/default.nix | 4 ++-- pkgs/applications/video/qstopmotion/default.nix | 4 ++-- .../video/simplescreenrecorder/default.nix | 4 ++-- pkgs/applications/video/streamlink/default.nix | 4 ++-- pkgs/applications/video/vdr/plugins.nix | 4 ++-- pkgs/applications/video/vlc/default.nix | 4 ++-- pkgs/applications/video/vokoscreen/default.nix | 4 ++-- pkgs/applications/video/xscast/default.nix | 4 ++-- pkgs/desktops/deepin/deepin-movie-reborn/default.nix | 4 ++-- .../compilers/graalvm/enterprise-edition.nix | 4 ++-- pkgs/development/compilers/openjdk/openjfx/11.nix | 4 ++-- pkgs/development/compilers/openjdk/openjfx/14.nix | 4 ++-- .../development/compilers/oraclejdk/jdk-linux-base.nix | 4 ++-- pkgs/development/compilers/zulu/8.nix | 4 ++-- pkgs/development/compilers/zulu/default.nix | 4 ++-- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- pkgs/development/interpreters/renpy/default.nix | 6 +++--- pkgs/development/libraries/chromaprint/default.nix | 4 ++-- .../libraries/ffmpegthumbnailer/default.nix | 4 ++-- pkgs/development/libraries/ffms/default.nix | 4 ++-- .../libraries/kde-frameworks/kfilemetadata/default.nix | 4 ++-- pkgs/development/libraries/libextractor/default.nix | 6 +++--- pkgs/development/libraries/liblinphone/default.nix | 4 ++-- pkgs/development/libraries/libqtav/default.nix | 4 ++-- pkgs/development/libraries/libvdpau-va-gl/default.nix | 4 ++-- pkgs/development/libraries/mediastreamer/default.nix | 4 ++-- pkgs/development/libraries/opencv/3.x.nix | 4 ++-- pkgs/development/libraries/opencv/4.x.nix | 4 ++-- pkgs/development/libraries/opencv/default.nix | 4 ++-- pkgs/development/libraries/openscenegraph/default.nix | 4 ++-- pkgs/development/libraries/pangolin/default.nix | 4 ++-- pkgs/development/libraries/pipewire/0.2.nix | 4 ++-- pkgs/development/libraries/pipewire/default.nix | 4 ++-- .../development/libraries/qt-5/modules/qtwebengine.nix | 4 ++-- pkgs/development/libraries/wxSVG/default.nix | 4 ++-- pkgs/development/libraries/xine-lib/default.nix | 4 ++-- .../python-modules/ffmpeg-python/default.nix | 4 ++-- pkgs/development/python-modules/ha-ffmpeg/default.nix | 4 ++-- pkgs/development/python-modules/imageio/default.nix | 4 ++-- .../python-modules/infoqscraper/default.nix | 2 +- pkgs/development/python-modules/sipsimple/default.nix | 2 +- pkgs/development/python-modules/stytra/default.nix | 4 ++-- pkgs/development/python-modules/thumbor/default.nix | 2 +- pkgs/development/tools/nwjs/default.nix | 4 ++-- pkgs/games/chiaki/default.nix | 4 ++-- pkgs/games/hedgewars/default.nix | 4 ++-- pkgs/games/openmw/default.nix | 4 ++-- pkgs/games/openrw/default.nix | 4 ++-- pkgs/games/privateer/default.nix | 4 ++-- pkgs/misc/emulators/attract-mode/default.nix | 4 ++-- pkgs/misc/emulators/dolphin-emu/default.nix | 4 ++-- pkgs/misc/emulators/dolphin-emu/master.nix | 4 ++-- pkgs/misc/emulators/mgba/default.nix | 4 ++-- pkgs/misc/emulators/ppsspp/default.nix | 4 ++-- pkgs/misc/emulators/retroarch/cores.nix | 4 ++-- pkgs/misc/emulators/retroarch/default.nix | 4 ++-- pkgs/misc/emulators/rpcs3/default.nix | 4 ++-- pkgs/misc/lightspark/default.nix | 4 ++-- pkgs/misc/scrcpy/default.nix | 4 ++-- pkgs/os-specific/linux/guvcview/default.nix | 4 ++-- pkgs/servers/http/nginx/modules.nix | 2 +- pkgs/servers/livepeer/default.nix | 4 ++-- pkgs/servers/mediatomb/default.nix | 4 ++-- pkgs/servers/mpd/default.nix | 4 ++-- pkgs/servers/roon-server/default.nix | 6 +++--- pkgs/servers/tvheadend/default.nix | 4 ++-- pkgs/servers/zoneminder/default.nix | 6 +++--- pkgs/tools/audio/beets/default.nix | 8 ++++---- pkgs/tools/graphics/cfdg/default.nix | 4 ++-- pkgs/tools/graphics/yaxg/default.nix | 6 +++--- pkgs/tools/misc/capture/default.nix | 4 ++-- pkgs/tools/misc/gif-for-cli/default.nix | 4 ++-- pkgs/tools/misc/yle-dl/default.nix | 4 ++-- pkgs/tools/networking/minidlna/default.nix | 4 ++-- pkgs/tools/text/ripgrep-all/default.nix | 4 ++-- pkgs/tools/video/gopro/default.nix | 4 ++-- 135 files changed, 279 insertions(+), 279 deletions(-) diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 25fceb357cc5..29d97d8bc8ab 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -3,7 +3,7 @@ , qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine , karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem , fftw, phonon, plasma-framework, threadweaver -, curl, ffmpeg, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras +, curl, ffmpeg_3, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras }: mkDerivation rec { @@ -26,7 +26,7 @@ mkDerivation rec { qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem phonon plasma-framework threadweaver - curl fftw ffmpeg gdk-pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static + curl fftw ffmpeg_3 gdk-pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static pcre snappy taglib taglib_extras ]; diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index c99545bb74f1..5090ef6a2ec8 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -8,7 +8,7 @@ , curl , dbus , doxygen -, ffmpeg +, ffmpeg_3 , fftw , fftwSinglePrec , flac @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { cppunit curl dbus - ffmpeg + ffmpeg_3 fftw fftwSinglePrec flac @@ -149,8 +149,8 @@ stdenv.mkDerivation rec { sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript patchShebangs ./tools/ substituteInPlace libs/ardour/video_tools_paths.cc \ - --replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \ - --replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");' + --replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg_3}/bin/ffmpeg");' \ + --replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg_3}/bin/ffprobe");' ''; postInstall = '' diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index b06175f37f31..ba000d1ffb48 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3 , libmowgli, dbus-glib, libxml2, xorg, gnome3, alsaLib , libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis -, libcdio, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b +, libcdio, libcddb, flac, ffmpeg_3, mpg123, libcue, libmms, libbs2b , libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack , neon, faad2, lame, libnotify, libsidplayfp }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { gettext glib gtk3 libmowgli dbus-glib libxml2 xorg.libXcomposite gnome3.adwaita-icon-theme alsaLib libjack2 libpulseaudio fluidsynth libmad libogg libvorbis libcdio - libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile + libcddb flac ffmpeg_3 mpg123 libcue libmms libbs2b libsndfile libmodplug libsamplerate soxr lirc curl wavpack neon faad2 lame libnotify libsidplayfp ]; diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index 45525571a646..5c5cd65b4121 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -2,7 +2,7 @@ mkDerivation, lib, fetchurl, fetchpatch, gettext, pkgconfig, qtbase, - alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b, + alsaLib, curl, faad2, ffmpeg_3, flac, fluidsynth, gdk-pixbuf, lame, libbs2b, libcddb, libcdio, libcue, libjack2, libmad, libmms, libmodplug, libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, @@ -45,7 +45,7 @@ mkDerivation { qtbase # Plugin dependencies - alsaLib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb + alsaLib curl faad2 ffmpeg_3 flac fluidsynth gdk-pixbuf lame libbs2b libcddb libcdio libcue libjack2 libmad libmms libmodplug libmowgli libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 73d310468138..18f2b4f67cdb 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, - expat, libid3tag, ffmpeg, soundtouch, /*, portaudio - given up fighting their portaudio.patch */ + expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */ autoconf, automake, libtool }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { buildInputs = [ file gettext wxGTK30 expat alsaLib libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk - ffmpeg libmad lame libvorbis flac soundtouch + ffmpeg_3 libmad lame libvorbis flac soundtouch ]; #ToDo: detach sbsms enableParallelBuilding = true; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index 910c1cfe51b5..61d522f677fe 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk-pixbuf , wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg -, libbsd, libjack2, libpng, ffmpeg +, libbsd, libjack2, libpng, ffmpeg_3 , libxkbcommon , makeWrapper, pixman, autoPatchelfHook , xdg_utils, zenity, zlib }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; binPath = lib.makeBinPath [ - xdg_utils zenity ffmpeg + xdg_utils zenity ffmpeg_3 ]; installPhase = '' diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix index 76a789356193..47de14ecb25c 100644 --- a/pkgs/applications/audio/bs1770gain/default.nix +++ b/pkgs/applications/audio/bs1770gain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ffmpeg, sox }: +{ stdenv, fetchurl, ffmpeg_3, sox }: stdenv.mkDerivation rec { pname = "bs1770gain"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk"; }; - buildInputs = [ ffmpeg sox ]; + buildInputs = [ ffmpeg_3 sox ]; NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 799cefc78193..e5d62b15f450 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -10,7 +10,7 @@ , withTaglib ? true, taglib, taglib_extras , withHttpStream ? true, qtmultimedia -, withReplaygain ? true, ffmpeg, speex, mpg123 +, withReplaygain ? true, ffmpeg_3, speex, mpg123 , withMtp ? true, libmtp , withOnlineServices ? true , withDevices ? true, udisks2 @@ -50,7 +50,7 @@ in mkDerivation { buildInputs = [ qtbase qtsvg ] ++ lib.optionals withTaglib [ taglib taglib_extras ] - ++ lib.optionals withReplaygain [ ffmpeg speex mpg123 ] + ++ lib.optionals withReplaygain [ ffmpeg_3 speex mpg123 ] ++ lib.optional withHttpStream qtmultimedia ++ lib.optional withCdda cdparanoia ++ lib.optional withCddb libcddb diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 357f30012880..110507616616 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg, jack2, +{ stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg_3, jack2, liblo, libpulseaudio, libsndfile, pkgconfig, python3Packages, which, withFrontend ? true, withQt ? true, qtbase ? null, wrapQtAppsHook ? null, @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ] ++ optional withFrontend pyqt5; buildInputs = [ - file liblo alsaLib fluidsynth ffmpeg jack2 libpulseaudio libsndfile + file liblo alsaLib fluidsynth ffmpeg_3 jack2 libpulseaudio libsndfile ] ++ pythonPath ++ optional withQt qtbase ++ optional withGtk2 gtk2 diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 4c2323fbe8a5..c88b884444ef 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -17,7 +17,7 @@ , aacSupport ? true, faad2 ? null , opusSupport ? true, opusfile ? null , wavpackSupport ? false, wavpack ? null -, ffmpegSupport ? false, ffmpeg ? null +, ffmpegSupport ? false, ffmpeg_3 ? null , apeSupport ? true, yasm ? null # misc plugins , zipSupport ? true, libzip ? null @@ -45,7 +45,7 @@ assert cdaSupport -> (libcdio != null && libcddb != null); assert aacSupport -> faad2 != null; assert opusSupport -> opusfile != null; assert zipSupport -> libzip != null; -assert ffmpegSupport -> ffmpeg != null; +assert ffmpegSupport -> ffmpeg_3 != null; assert apeSupport -> yasm != null; assert artworkSupport -> imlib2 != null; assert hotkeysSupport -> libX11 != null; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ++ optional aacSupport faad2 ++ optional opusSupport opusfile ++ optional zipSupport libzip - ++ optional ffmpegSupport ffmpeg + ++ optional ffmpegSupport ffmpeg_3 ++ optional apeSupport yasm ++ optional artworkSupport imlib2 ++ optional hotkeysSupport libX11 diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix index fbf25384eef2..272701b36804 100644 --- a/pkgs/applications/audio/dr14_tmeter/default.nix +++ b/pkgs/applications/audio/dr14_tmeter/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with pkgs; [ - python3Packages.numpy flac vorbis-tools ffmpeg faad2 lame + python3Packages.numpy flac vorbis-tools ffmpeg_3 faad2 lame ]; # There are no tests diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index e4df8593cedc..589354cf2348 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, pkgconfig, cmake, python, ffmpeg, phonon, automoc4 +, pkgconfig, cmake, python, ffmpeg_3, phonon, automoc4 , chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt , id3lib, taglib, mp4v2, flac, libogg, libvorbis , zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapQtAppsHook ]; buildInputs = with stdenv.lib; - [ pkgconfig cmake python ffmpeg phonon automoc4 + [ pkgconfig cmake python ffmpeg_3 phonon automoc4 chromaprint docbook_xml_dtd_45 docbook_xsl libxslt id3lib taglib mp4v2 flac libogg libvorbis zlib readline qtbase qttools qtmultimedia qtquickcontrols ]; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 18b5a980633a..9f68f8bb8e8e 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -14,7 +14,7 @@ , musepackSupport ? true, libmpc, libmpcdec, taglib , vorbisSupport ? true, libvorbis , speexSupport ? true, speex -, ffmpegSupport ? true, ffmpeg +, ffmpegSupport ? true, ffmpeg_3 , sndfileSupport ? true, libsndfile , wavpackSupport ? true, wavpack # Misc @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals musepackSupport [ libmpc libmpcdec taglib ] ++ opt vorbisSupport libvorbis ++ opt speexSupport speex - ++ opt (ffmpegSupport && !withffmpeg4) ffmpeg + ++ opt (ffmpegSupport && !withffmpeg4) ffmpeg_3 ++ opt (ffmpegSupport && withffmpeg4) ffmpeg_4 ++ opt sndfileSupport libsndfile ++ opt wavpackSupport wavpack diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 52fc96bb681f..0c4e2c71dd95 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -4,7 +4,7 @@ , boost , curl , fetchFromGitHub -, ffmpeg +, ffmpeg_3 , lame , libev , libmicrohttpd @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { alsaLib boost curl - ffmpeg + ffmpeg_3 lame libev libmicrohttpd diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 28173d34b78d..4cdf415d26bf 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg, curl }: +{ fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg_3, curl }: stdenv.mkDerivation rec { name = "pianobar-2020.04.05"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libao json_c libgcrypt ffmpeg curl + libao json_c libgcrypt ffmpeg_3 curl ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 509c95ad5457..7b4d823006de 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -4,7 +4,7 @@ , curl, libmms # input plugins , libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile -, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi +, libcdio, cdparanoia, libcddb, faad2, ffmpeg_3, wildmidi # output plugins , alsaLib, libpulseaudio # effect plugins @@ -44,7 +44,7 @@ mkDerivation rec { curl libmms # input plugins libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile - libcdio cdparanoia libcddb faad2 ffmpeg wildmidi + libcdio cdparanoia libcddb faad2 ffmpeg_3 wildmidi # output plugins alsaLib libpulseaudio # effect plugins diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix index fb2b30632761..17f6840d4e22 100644 --- a/pkgs/applications/audio/r128gain/default.nix +++ b/pkgs/applications/audio/r128gain/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , substituteAll -, ffmpeg +, ffmpeg_3 , python3Packages , sox }: @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { ( substituteAll { src = ./ffmpeg-location.patch; - inherit ffmpeg; + ffmpeg = ffmpeg_3; } ) ]; diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index de135706ad3f..c6a78f090058 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -2,7 +2,7 @@ , alsaLib, flac, libmad, libvorbis, mpg123 , dsdSupport ? true , faad2Support ? true, faad2 -, ffmpegSupport ? true, ffmpeg +, ffmpegSupport ? true, ffmpeg_3 , opusSupport ? true, opusfile , resampleSupport ? true, soxr , sslSupport ? true, openssl @@ -35,7 +35,7 @@ in stdenv.mkDerivation { buildInputs = [ alsaLib flac libmad libvorbis mpg123 ] ++ optional faad2Support faad2 - ++ optional ffmpegSupport ffmpeg + ++ optional ffmpegSupport ffmpeg_3 ++ optional opusSupport opusfile ++ optional resampleSupport soxr ++ optional sslSupport openssl; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index cb574ffc8f18..420f57bb93fe 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw -, cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas +, cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj - readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas + readline ffmpeg_3 makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas libLAS proj-datumgrid ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 505f28a24510..bb29101b4c7f 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig -, ffmpeg, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler +, ffmpeg_3, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler }: stdenv.mkDerivation (rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation (rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ffmpeg gtk3 imagemagick libarchive libspectre libwebp poppler ]; + buildInputs = [ ffmpeg_3 gtk3 imagemagick libarchive libspectre libwebp poppler ]; prePatch = "patchShebangs ."; diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix index aa03425f36a0..225efba3768a 100644 --- a/pkgs/applications/kde/ffmpegthumbs.nix +++ b/pkgs/applications/kde/ffmpegthumbs.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - ffmpeg, kio + ffmpeg_3, kio }: mkDerivation { @@ -11,5 +11,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ffmpeg kio ]; + buildInputs = [ ffmpeg_3 kio ]; } diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index 9b16485cfa77..4bf707cd0430 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -5,7 +5,7 @@ , flac, lame, libmad, libmpcdec, libvorbis , libsamplerate, libsndfile, taglib , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager -, ffmpeg, libmusicbrainz3, normalize, sox, transcode, kinit +, ffmpeg_3, libmusicbrainz3, normalize, sox, transcode, kinit }: mkDerivation { @@ -28,7 +28,7 @@ mkDerivation { # cd/dvd cdparanoia libdvdcss libdvdread # others - ffmpeg libmusicbrainz3 shared-mime-info + ffmpeg_3 libmusicbrainz3 shared-mime-info ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; postFixup = diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix index 043f1c86bd12..4e1f2e8c084c 100644 --- a/pkgs/applications/misc/airtame/default.nix +++ b/pkgs/applications/misc/airtame/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper -, alsaLib, atk, cairo, cups, curl, dbus, expat, ffmpeg, fontconfig, freetype +, alsaLib, atk, cairo, cups, curl, dbus, expat, ffmpeg_3, fontconfig, freetype , gdk-pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite , libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender , libXtst, libopus, libpulseaudio, libxcb, nspr, nss, pango, udev, x264 }: let libPath = lib.makeLibraryPath [ - alsaLib atk cairo cups curl dbus expat ffmpeg fontconfig freetype gdk-pixbuf + alsaLib atk cairo cups curl dbus expat ffmpeg_3 fontconfig freetype gdk-pixbuf glib glibc gnome2.GConf gtk2 libopus nspr nss pango stdenv.cc.cc udev x264 libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst libpulseaudio libxcb diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 60514c92b338..9a868d1699a1 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew +{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg_3, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath; buildInputs = - [ boost ffmpeg gettext glew ilmbase + [ boost ffmpeg_3 gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc alembic diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 9c05e9847202..5c31ce55addd 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, perlPackages, rtmpdump}: +{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg_3, makeWrapper, perl, perlPackages, rtmpdump}: with stdenv.lib; @@ -26,7 +26,7 @@ perlPackages.buildPerlPackage rec { installPhase = '' mkdir -p $out/bin $out/share/man/man1 cp get_iplayer $out/bin - wrapProgram $out/bin/get_iplayer --suffix PATH : ${makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/get_iplayer --suffix PATH : ${makeBinPath [ atomicparsley ffmpeg_3 flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB cp get_iplayer.1 $out/share/man/man1 ''; diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 535985f1601d..57a40f8d1877 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -4,7 +4,7 @@ , withCC ? true, opencc , withEpwing ? true, libeb , withExtraTiff ? true, libtiff -, withFFmpeg ? true, libao, ffmpeg +, withFFmpeg ? true, libao, ffmpeg_3 , withMultimedia ? true , withZim ? true, zstd }: @@ -39,7 +39,7 @@ mkDerivation rec { ++ stdenv.lib.optional withCC opencc ++ stdenv.lib.optional withEpwing libeb ++ stdenv.lib.optional withExtraTiff libtiff - ++ stdenv.lib.optionals withFFmpeg [ libao ffmpeg ] + ++ stdenv.lib.optionals withFFmpeg [ libao ffmpeg_3 ] ++ stdenv.lib.optional withZim zstd; qmakeFlags = with stdenv.lib; [ diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index 4fcbaa19a209..798c32aa722c 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -28,7 +28,7 @@ in buildFHSUserEnv { # DGen // TODO: libarchive is broken # Dolphin - bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm + bluez ffmpeg_3 gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm wavpack orc nettle gmp pcre vulkan-loader # DOSBox diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 07d194dbff42..899b069f0542 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -5,7 +5,7 @@ , cryptopp , curl , fetchFromGitHub -, ffmpeg +, ffmpeg_3 , freeimage , gcc-unwrapped , libmediainfo @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { c-ares cryptopp curl - ffmpeg + ffmpeg_3 freeimage gcc-unwrapped libmediainfo diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 3a26def26c91..e04833cd4b2c 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -1,5 +1,5 @@ { stdenv, autoconf, automake, c-ares, cryptopp, curl, doxygen, fetchFromGitHub -, fetchpatch, ffmpeg, libmediainfo, libraw, libsodium, libtool, libuv, libzen +, fetchpatch, ffmpeg_3, libmediainfo, libraw, libsodium, libtool, libuv, libzen , lsb-release, mkDerivation, pkgconfig, qtbase, qttools, sqlite, swig, unzip , wget }: @@ -21,7 +21,7 @@ mkDerivation rec { c-ares cryptopp curl - ffmpeg + ffmpeg_3 libmediainfo libraw libsodium diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 328e106694b2..2ae3f1894d53 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, perl , alsaLib, libevdev, libopus, udev, SDL2 -, ffmpeg, pkgconfig, xorg, libvdpau, libpulseaudio, libcec +, ffmpeg_3, pkgconfig, xorg, libvdpau, libpulseaudio, libcec , curl, expat, avahi, enet, libuuid, libva }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ alsaLib libevdev libopus udev SDL2 - ffmpeg pkgconfig xorg.libxcb libvdpau libpulseaudio libcec + ffmpeg_3 pkgconfig xorg.libxcb libvdpau libpulseaudio libcec xorg.libpthreadstubs curl expat avahi enet libuuid libva ]; diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index c0e255a36e37..1802eef54092 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, ffmpeg }: +{ lib, python3Packages, ffmpeg_3 }: python3Packages.buildPythonApplication rec { version = "2.0"; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { blinker ]; - makeWrapperArgs = [ "--prefix PATH : ${ffmpeg}/bin" ]; + makeWrapperArgs = [ "--prefix PATH : ${ffmpeg_3}/bin" ]; # No tests included doCheck = false; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ffd0f018f87c..5dbafcee837e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -16,7 +16,7 @@ , xorg , libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups -, ffmpeg, libxslt, libxml2, at-spi2-core +, ffmpeg_3, libxslt, libxml2, at-spi2-core , jre , pipewire_0_2 @@ -93,7 +93,7 @@ let libpng libcap xdg_utils minizip libwebp libusb1 re2 zlib - ffmpeg libxslt libxml2 + ffmpeg_3 libxslt libxml2 # harfbuzz # in versions over 63 harfbuzz and freetype are being built together # so we can't build with one from system and other from source ] ++ (if (versionRange "0" "84") then [ yasm ] else [ nasm ]); diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 71940c1b33ae..27eba126de9e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -48,7 +48,7 @@ , gnused , gnugrep , gnupg -, ffmpeg +, ffmpeg_3 , runtimeShell , systemLocale ? config.i18n.defaultLocale or "en-US" }: @@ -134,7 +134,7 @@ stdenv.mkDerivation { libpulseaudio (lib.getDev libpulseaudio) systemd - ffmpeg + ffmpeg_3 ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 4a64d0af0189..8d51f5c888ad 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchgit, makeDesktopItem , pkgconfig, autoconf213, alsaLib, bzip2, cairo -, dbus, dbus-glib, ffmpeg, file, fontconfig, freetype +, dbus, dbus-glib, ffmpeg_3, file, fontconfig, freetype , gnome2, gnum4, gtk2, hunspell, libevent, libjpeg , libnotify, libstartup_notification, makeWrapper , libGLU, libGL, perl, python2, libpulseaudio @@ -11,7 +11,7 @@ let - libPath = lib.makeLibraryPath [ ffmpeg ]; + libPath = lib.makeLibraryPath [ ffmpeg_3 ]; gtkVersion = if withGTK3 then "3" else "2"; in stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype + alsaLib bzip2 cairo dbus dbus-glib ffmpeg_3 fontconfig freetype gnome2.GConf gtk2 hunspell libevent libjpeg libnotify libstartup_notification libGLU libGL libpulseaudio unzip yasm zip zlib diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 39749dbb1a7e..1b4fa5ef595a 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -29,7 +29,7 @@ # Media support (implies audio support) , mediaSupport ? true -, ffmpeg +, ffmpeg_3 , gmp @@ -83,7 +83,7 @@ let ] ++ optionals pulseaudioSupport [ libpulseaudio ] ++ optionals mediaSupport [ - ffmpeg + ffmpeg_3 ]; # Library search path for the fte transport diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index 25ee5462b298..a5bea6cf34a9 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -15,7 +15,7 @@ , glibc , libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups -, ffmpeg, libxslt, libxml2, at-spi2-core +, ffmpeg_3, libxslt, libxml2, at-spi2-core , jre # optional dependencies @@ -93,7 +93,7 @@ let libpng libcap xdg_utils yasm minizip libwebp libusb1 re2 zlib - ffmpeg libxslt libxml2 + ffmpeg_3 libxslt libxml2 # harfbuzz # in versions over 63 harfbuzz and freetype are being built together # so we can't build with one from system and other from source ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index f793491afe15..248980e5b2b1 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr -, alsaLib, dbus, cups, libexif, ffmpeg, systemd +, alsaLib, dbus, cups, libexif, ffmpeg_3, systemd , freetype, fontconfig, libXft, libXrender, libxcb, expat , libuuid , gstreamer, gst-plugins-base, libxml2 @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd + atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg_3 systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf libdrm mesa diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index ace546227b93..37d8adceae1c 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1 -, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg +, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg_3 , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [zlib openssl libre librem cairo mpg123 - alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid + alsaLib SDL libv4l celt libsndfile srtp ffmpeg_3 gsm speex portaudio spandsp libuuid ccache libvpx ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]); makeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 0d97fcbbf511..e27835851445 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -10,7 +10,7 @@ , cyrus_sasl , fetchFromGitLab , fetchurl -, ffmpeg +, ffmpeg_3 , gdk-pixbuf , glib , gnused @@ -137,7 +137,7 @@ mkDerivation rec { bzrtp cairo cyrus_sasl - ffmpeg + ffmpeg_3 gdk-pixbuf glib gtk2 diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 58d6230f26ae..0df7a5d8e560 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -2,7 +2,7 @@ , libtoxcore , libpthreadstubs, libXdmcp, libXScrnSaver , qtbase, qtsvg, qttools, qttranslations -, ffmpeg, filter-audio, libexif, libsodium, libopus +, ffmpeg_3, filter-audio, libexif, libsodium, libopus , libvpx, openal, pcre, qrencode, sqlcipher , AVFoundation ? null }: @@ -25,7 +25,7 @@ in mkDerivation { libtoxcore libpthreadstubs libXdmcp libXScrnSaver qtbase qtsvg qttranslations - ffmpeg filter-audio libexif libopus libsodium + ffmpeg_3 filter-audio libexif libopus libsodium libvpx openal pcre qrencode sqlcipher ] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ; diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 55624643a018..4a95debdfd10 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -13,7 +13,7 @@ , libsndfile , dbus , dbus_cplusplus -, ffmpeg +, ffmpeg_3 , udev , pcre , gsm @@ -101,7 +101,7 @@ stdenv.mkDerivation { libsndfile dbus dbus_cplusplus - ffmpeg + ffmpeg_3 udev pcre gsm diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/pkgs/applications/networking/instant-messengers/sky/default.nix index fe8b251c4048..33bd4586bfdb 100644 --- a/pkgs/applications/networking/instant-messengers/sky/default.nix +++ b/pkgs/applications/networking/instant-messengers/sky/default.nix @@ -4,7 +4,7 @@ , curl, sqlite, openssl , libuuid, openh264, libv4l, libxkbfile, libXv, zlib, libXmu , libXtst, libXdamage, pam, libXfixes, libXrender, libjpeg_original -, ffmpeg +, ffmpeg_3 }: let # Sky is linked to the libjpeg 8 version and checks for the version number in the code. @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { file qt5.qtbase SDL - ffmpeg + ffmpeg_3 sqlite openssl openh264 diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 87c70464e9b4..cfb41fa9fc52 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja -, qtbase, qtimageformats, libsForQt5, hunspell, xdg_utils, ffmpeg, openalSoft +, qtbase, qtimageformats, libsForQt5, hunspell, xdg_utils, ffmpeg_3, openalSoft , lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected , range-v3 }: @@ -21,7 +21,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config python3 cmake ninja ]; buildInputs = [ - qtbase qtimageformats ffmpeg openalSoft lzma lz4 xxHash libsForQt5.libdbusmenu + qtbase qtimageformats ffmpeg_3 openalSoft lzma lz4 xxHash libsForQt5.libdbusmenu zlib minizip openssl hunspell libtgvoip microsoft_gsl tl-expected range-v3 ]; diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index ce6d3958c9b0..a6a0ab272873 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkgconfig, protobuf, bzip2 -, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg +, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg_3 , qtmultimedia, qtx11extras, qttools }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools - protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg + protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg_3 ]; preConfigure = '' diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 9d13f3b3e3fa..414e9d1b9085 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg, glib, openssl +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, alsaLib, ffmpeg_3, glib, openssl , pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama , libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland , gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { [ alsaLib cups - ffmpeg + ffmpeg_3 glib gst-plugins-base gst-plugins-good diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 123308babeae..64c7dc20f355 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -12,7 +12,7 @@ , libass , fftw , ffms -, ffmpeg +, ffmpeg_3 , pkg-config , zlib , icu @@ -85,7 +85,7 @@ stdenv.mkDerivation libass fftw ffms - ffmpeg + ffmpeg_3 zlib icu boost diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index 2cccbae43d2c..e818ef585c17 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, cairo, ffmpeg, ffms, libjpeg, log4cpp, pango +, cairo, ffmpeg_3, ffms, libjpeg, log4cpp, pango , avxeditSupport ? false, qt4 ? null }: @@ -29,7 +29,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ cairo ffmpeg ffms libjpeg log4cpp pango ] + buildInputs = [ cairo ffmpeg_3 ffms libjpeg log4cpp pango ] ++ optional avxeditSupport qt4; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index f9a82af2f798..2ae3722fff2e 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gtkmm2, scons, -mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg, +mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg_3, enca, pkgconfig, fetchpatch }: let fetchPatchFromAur = {name, sha256}: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 gtkmm2 mjpegtools libdvdread dvdauthor boost dvdplusrwtools - libxmlxx ffmpeg enca + libxmlxx ffmpeg_3 enca ]; prefixKey = "PREFIX="; diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 34e0d33bcbc0..fc752f1bd1fd 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, ffmpeg +{ stdenv, fetchurl, makeDesktopItem, ffmpeg_3 , qmake, qttools, mkDerivation , qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine }: @@ -13,13 +13,13 @@ mkDerivation rec { url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; - buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; + buildInputs = [ ffmpeg_3 qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; nativeBuildInputs = [ qmake qttools ]; - postPatch = stdenv.lib.optionalString (ffmpeg != null) '' + postPatch = stdenv.lib.optionalString (ffmpeg_3 != null) '' substituteInPlace converter_ffmpeg.cpp \ - --replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \ - --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg ' + --replace '"ffmpeg"' '"${ffmpeg_3.bin}/bin/ffmpeg"' \ + --replace '"ffmpeg ' '"${ffmpeg_3.bin}/bin/ffmpeg ' ''; qmakeFlags = [ "clipgrab.pro" ]; diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 2ec2f68d1285..9bb5518e80f7 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor +{ stdenv, fetchFromGitHub, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor , gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }: let @@ -30,11 +30,11 @@ in buildPythonApplication { ]; buildInputs = [ - ffmpeg + ffmpeg_3 ]; propagatedBuildInputs = [ - gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3 setuptools + gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg_3 mplayer dvdauthor vcdimager cdrkit urllib3 setuptools ]; postPatch = '' diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index f6e336240d3d..e35d95d54d6f 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }: +{ stdenv, lib, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg_3, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools, runtimeShell }: let - binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ]; + binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg_3 imagemagick lame mjpegtools sox transcode vorbis-tools ]; wrapper = writeScript "dvd-slideshow.sh" '' #!${runtimeShell} diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index c2259ce83794..411ab9e6bc28 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonApplication , fetchPypi -, ffmpeg +, ffmpeg_3 , tqdm }: @@ -14,7 +14,7 @@ buildPythonApplication rec { sha256 = "18dpck9grnr3wgbjvdh4mjlx0zfwcxpy4rnpmc39in0yk3w7li2x"; }; - propagatedBuildInputs = [ ffmpeg tqdm ]; + propagatedBuildInputs = [ ffmpeg_3 tqdm ]; checkPhase = '' $out/bin/ffmpeg-normalize --help > /dev/null diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix index 3b7e8913c5d1..3a3ca044bb88 100644 --- a/pkgs/applications/video/gnomecast/default.nix +++ b/pkgs/applications/video/gnomecast/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, gtk3, gobject-introspection, ffmpeg, wrapGAppsHook }: +{ lib, python3Packages, gtk3, gobject-introspection, ffmpeg_3, wrapGAppsHook }: with python3Packages; buildPythonApplication rec { @@ -17,7 +17,7 @@ buildPythonApplication rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}) + gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg_3 ]}) ''; meta = with lib; { diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 2364f9ec02cd..56247b278260 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchurl, autoPatchelfHook -, ffmpeg, openssl, qtbase, zlib, pkgconfig +, ffmpeg_3, openssl, qtbase, zlib, pkgconfig }: let @@ -29,7 +29,7 @@ in mkDerivation { nativeBuildInputs = [ autoPatchelfHook pkgconfig ]; - buildInputs = [ ffmpeg openssl qtbase zlib ]; + buildInputs = [ ffmpeg_3 openssl qtbase zlib ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index 470908377b50..667b2bb2b885 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch -, cairo, ffmpeg, sox, xdg_utils, texlive +, cairo, ffmpeg_3, sox, xdg_utils, texlive , colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub , pbr, fetchPypi }: @@ -28,14 +28,14 @@ buildPythonApplication rec { pycairo pydub - cairo sox ffmpeg xdg_utils + cairo sox ffmpeg_3 xdg_utils ]; # Test with texlive to see whether it works but don't propagate # because it's huge and optional # TODO: Use smaller TexLive distribution # Doesn't need everything but it's hard to figure out what it needs - checkInputs = [ cairo sox ffmpeg xdg_utils texlive.combined.scheme-full ]; + checkInputs = [ cairo sox ffmpeg_3 xdg_utils texlive.combined.scheme-full ]; # Simple test and complex test with LaTeX checkPhase = '' diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index dd0510f70c36..175958afb7e0 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, ffmpeg, libjpeg, libmicrohttpd }: +, ffmpeg_3, libjpeg, libmicrohttpd }: stdenv.mkDerivation rec { pname = "motion"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ ffmpeg libjpeg libmicrohttpd ]; + buildInputs = [ ffmpeg_3 libjpeg libmicrohttpd ]; meta = with stdenv.lib; { description = "Monitors the video signal from cameras"; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 1dd6b593f0fc..02c88b92919f 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg +{ config, stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg_3 , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig yasm ]; buildInputs = with stdenv.lib; - [ freetype ffmpeg ] + [ freetype ffmpeg_3 ] ++ optional aalibSupport aalib ++ optional fontconfigSupport fontconfig ++ optional fribidiSupport fribidi diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 4e6c9f7ea5a2..dede7d6b29e0 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages, cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip, - poppler, imagemagick, openexr, ffmpeg, opencolorio, openimageio, + poppler, imagemagick, openexr, ffmpeg_3, opencolorio, openimageio, qmake4Hook, libpng, libGL, lndir }: let @@ -68,7 +68,7 @@ let sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libpng ffmpeg openexr opencolorio openimageio boost libGL + libpng ffmpeg_3 openexr opencolorio openimageio boost libGL seexpr ]; }) diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 861ac4560291..e24b6ee41f85 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , pkgconfig, cmake, doxygen -, libopenshot-audio, imagemagick, ffmpeg +, libopenshot-audio, imagemagick, ffmpeg_3 , swig, python3 , unittest-cpp, cppzmq, zeromq , qtbase, qtmultimedia }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake doxygen ]; buildInputs = - [ imagemagick ffmpeg swig python3 unittest-cpp + [ imagemagick ffmpeg_3 swig python3 unittest-cpp cppzmq zeromq qtbase qtmultimedia ]; LIBOPENSHOT_AUDIO_DIR = libopenshot-audio; diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index ce0ea532c4cd..24c44c248f58 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -15,7 +15,7 @@ , glib , cairo , keybinder3 -, ffmpeg +, ffmpeg_3 , python3 , libxml2 , gst_all_1 @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ which ffmpeg gifski ]}) + gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ which ffmpeg_3 gifski ]}) ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 98af60c49379..dbb2128b50bf 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -6,7 +6,7 @@ , qtquickcontrols , qtimageformats , qtxmlpatterns -, ffmpeg +, ffmpeg_3 , guvcview , cmake , ninja @@ -40,7 +40,7 @@ mkDerivation rec { v4l-utils libv4l pcre - ffmpeg + ffmpeg_3 guvcview qwt ]; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index f97d1ee00373..7176f5e2f09c 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras +{ stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg_3, libjack2, libX11, libXext, qtx11extras , libXfixes, libGLU, libGL, pkgconfig, libpulseaudio, qtbase, cmake, ninja }: @@ -25,7 +25,7 @@ mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ninja ]; buildInputs = [ - alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU libGL + alsaLib ffmpeg_3 libjack2 libX11 libXext libXfixes libGLU libGL libpulseaudio qtbase qtx11extras ]; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 782b81cc2380..c1066bf283a4 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: +{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg_3 }: pythonPackages.buildPythonApplication rec { version = "1.4.1"; @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; - propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client isodate ]) ++ [ rtmpdump ffmpeg ]; + propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client isodate ]) ++ [ rtmpdump ffmpeg_3 ]; meta = with stdenv.lib; { homepage = "https://github.com/streamlink/streamlink"; diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 6c1e79c42deb..2ae4cbac4d73 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, vdr, alsaLib, fetchFromGitHub -, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg +, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg_3 , libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg, ncurses , callPackage }: let @@ -52,7 +52,7 @@ in { name = "vdr-vaapidevice-0.7.0"; buildInputs = [ - vdr libxcb xcbutilwm ffmpeg + vdr libxcb xcbutilwm ffmpeg_3 alsaLib libvdpau # vdpau libva # va-api diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 31ec6d9ef198..3ee662f73c53 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoreconfHook , libarchive, perl, xorg, libdvdnav, libbluray -, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib +, zlib, a52dec, libmad, faad2, ffmpeg_3, alsaLib , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # which are not included here for no other reason that nobody has mentioned # needing them buildInputs = [ - zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread + zlib a52dec libmad faad2 ffmpeg_3 alsaLib libdvdnav libdvdnav.libdvdread libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index 94d0de20ccf7..0cd3c814b173 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, mkDerivation , pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr -, ffmpeg +, ffmpeg_3 }: mkDerivation rec { @@ -35,7 +35,7 @@ mkDerivation rec { ''; postConfigure = '' - substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg} + substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg_3} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix index dec8bdd67fce..f9e6a3d6521f 100644 --- a/pkgs/applications/video/xscast/default.nix +++ b/pkgs/applications/video/xscast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }: +{ stdenv, fetchFromGitHub, makeWrapper, ffmpeg_3, imagemagick, dzen2, xorg }: stdenv.mkDerivation { pname = "xscast-unstable"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { patchShebangs $out/bin wrapProgram "$out/bin/xscast" \ - --prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]} + --prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg_3 dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]} runHook postInstall ''; diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index 6763292b626c..68daffb0d157 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -8,7 +8,7 @@ , qtx11extras , dtkcore , dtkwidget -, ffmpeg +, ffmpeg_3 , ffmpegthumbnailer , mpv , pulseaudio @@ -41,7 +41,7 @@ mkDerivation rec { buildInputs = [ dtkcore dtkwidget - ffmpeg + ffmpeg_3 ffmpegthumbnailer libdvdnav libdvdread diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix index 5a6c96507649..89896c556efa 100644 --- a/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: +{ stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg_3, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: let common = javaVersion: @@ -117,7 +117,7 @@ let }.${javaVersion} }:${ stdenv.lib.strings.makeLibraryPath [ glibc xorg.libXxf86vm xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender - glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg libGL ]}" + glib zlib bzip2 alsaLib fontconfig freetype pango gtk3 gtk2 cairo gdk-pixbuf atk ffmpeg_3 libGL ]}" for f in $(find $out -type f -perm -0100); do patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 7ba04ed50cc0..adb564f7cfee 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, writeText, gradleGen, pkgconfig, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg_3, python, ruby , openjdk11-bootstrap }: let @@ -19,7 +19,7 @@ let sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/openjdk/openjfx/14.nix b/pkgs/development/compilers/openjdk/openjfx/14.nix index 12d9448595e3..04bb1fa56274 100644 --- a/pkgs/development/compilers/openjdk/openjfx/14.nix +++ b/pkgs/development/compilers/openjdk/openjfx/14.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen , pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib -, ffmpeg, python, ruby }: +, ffmpeg_3, python, ruby }: let major = "14"; @@ -21,7 +21,7 @@ let sha256 = "16aj15xksc266gv3y42m0g277pfvp71901lrngndcnpr7i2zshnr"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 092af49a9f8b..78fff4a59fba 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -19,7 +19,7 @@ , glib , libxml2 , libav_0_8 -, ffmpeg +, ffmpeg_3 , libxslt , libGL , freetype @@ -171,7 +171,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ + [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); rpath = stdenv.lib.strings.makeLibraryPath libraries; diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index ed3d67ff8621..e48fee0a6a59 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath -, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib +, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib , fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg , swingSupport ? true }: @@ -15,7 +15,7 @@ let extension = if stdenv.isDarwin then "zip" else "tar.gz"; libraries = [ - stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL + stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk-pixbuf atk ] ++ (lib.optionals swingSupport (with xorg; [ diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index d13e574a81a1..bfaa4c777b32 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath -, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib +, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib , fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg, zlib , swingSupport ? true }: @@ -15,7 +15,7 @@ let extension = if stdenv.isDarwin then "zip" else "tar.gz"; libraries = [ - stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL + stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk-pixbuf atk zlib ] ++ (lib.optionals swingSupport (with xorg; [ diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 472b1fc75691..ec14c565b74e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -724,7 +724,7 @@ self: super: builtins.intersectAttrs super { dhall_1_32_0 = dontCheck super.dhall_1_32_0; cut-the-crap = - let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg ]; + let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 ]; in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { postInstall = '' wrapProgram $out/bin/cut-the-crap \ diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index d09d150bd79c..41cf4c221c6a 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2Packages, pkgconfig, SDL2 -, libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib +, libpng, ffmpeg_3, freetype, glew, libGL, libGLU, fribidi, zlib , glib }: @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python cython wrapPython tkinter - SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib + SDL2 libpng ffmpeg_3 freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib ]; pythonPath = [ pygame_sdl2 tkinter ]; RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: path) [ - SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU libGL fribidi zlib + SDL2 SDL2.dev libpng ffmpeg_3 ffmpeg_3.out freetype glew.dev glew.out libGLU libGL fribidi zlib ]); buildPhase = '' diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 4702d67a01f2..9da5a80f6205 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost, ffmpeg }: +{ stdenv, fetchurl, cmake, boost, ffmpeg_3 }: stdenv.mkDerivation rec { pname = "chromaprint"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ffmpeg ]; + buildInputs = [ boost ffmpeg_3 ]; cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 82a30337348a..4e3c10e8829d 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig, libjpeg +{ fetchFromGitHub, stdenv, ffmpeg_3, cmake, libpng, pkgconfig, libjpeg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ ffmpeg libpng libjpeg ]; + buildInputs = [ ffmpeg_3 libpng libjpeg ]; meta = with stdenv.lib; { homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 5a87402e0d92..ebbced19eb8e 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, ffmpeg, pkgconfig }: +{ stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkgconfig }: stdenv.mkDerivation rec { pname = "ffms"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fPIC"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib ffmpeg ]; + buildInputs = [ zlib ffmpeg_3 ]; # ffms includes a built-in vapoursynth plugin, see: # https://github.com/FFMS/ffms2#avisynth-and-vapoursynth-plugin diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index c72cb5b71a43..90a7116f42ad 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, copyPathsToStore, extra-cmake-modules, - attr, ebook_tools, exiv2, ffmpeg, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib + attr, ebook_tools, exiv2, ffmpeg_3, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib }: mkDerivation { @@ -9,7 +9,7 @@ mkDerivation { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - attr ebook_tools exiv2 ffmpeg karchive kcoreaddons ki18n poppler qtbase qtmultimedia + attr ebook_tools exiv2 ffmpeg_3 karchive kcoreaddons ki18n poppler qtbase qtmultimedia taglib ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 3db0b056c0f0..f7e9606bbe77 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -13,11 +13,11 @@ # ''; # See also . , gtkSupport ? true, glib ? null, gtk3 ? null -, videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}: +, videoSupport ? true, ffmpeg_3 ? null, libmpeg2 ? null}: assert gstreamerSupport -> gst_all_1 != null && builtins.isList (gstPlugins gst_all_1); assert gtkSupport -> glib != null && gtk3 != null; -assert videoSupport -> ffmpeg != null && libmpeg2 != null; +assert videoSupport -> ffmpeg_3 != null && libmpeg2 != null; stdenv.mkDerivation rec { name = "libextractor-1.9"; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals gstreamerSupport ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ] - ++ stdenv.lib.optionals videoSupport [ ffmpeg libmpeg2 ]; + ++ stdenv.lib.optionals videoSupport [ ffmpeg_3 libmpeg2 ]; configureFlags = [ "--disable-ltdl-install" diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index a0ee8fe00539..1c414b9dd866 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -11,7 +11,7 @@ , doxygen , fetchFromGitLab , fetchurl -, ffmpeg +, ffmpeg_3 , gdk-pixbuf , git , glib @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { bzrtp cairo cyrus_sasl - ffmpeg + ffmpeg_3 gdk-pixbuf git glib diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 8d9cf381ff80..00a87402fa3f 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, extra-cmake-modules , qtbase, qtmultimedia, qtquick1, qttools , libGL, libX11 -, libass, openal, ffmpeg, libuchardet +, libass, openal, ffmpeg_3, libuchardet , alsaLib, libpulseaudio, libva }: @@ -15,7 +15,7 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia qtquick1 libGL libX11 - libass openal ffmpeg libuchardet + libass openal ffmpeg_3 libuchardet alsaLib libpulseaudio libva ]; diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index cfc74a8a759c..98176cd41f14 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libXau, libXdmcp -, libXext, libvdpau, glib, libva, ffmpeg, libGLU }: +, libXext, libvdpau, glib, libva, ffmpeg_3, libGLU }: stdenv.mkDerivation rec { pname = "libvdpau-va-gl"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg libGLU ]; + buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg_3 libGLU ]; doCheck = false; # fails. needs DRI access diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 5f7daa83b2f5..81c7c8fcacf3 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -5,7 +5,7 @@ , doxygen , fetchFromGitLab , fetchpatch -, ffmpeg +, ffmpeg_3 , glew , gsm , intltool @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { alsaLib bctoolbox bzrtp - ffmpeg + ffmpeg_3 glew gsm libGL diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 6f327ca396a9..1597eb7913a5 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -23,7 +23,7 @@ , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 , enableVtk ? false, vtk -, enableFfmpeg ? false, ffmpeg +, enableFfmpeg ? false, ffmpeg_3 , enableGStreamer ? false, gst_all_1 , enableTesseract ? false, tesseract, leptonica , enableTbb ? false, tbb @@ -188,7 +188,7 @@ stdenv.mkDerivation { ++ lib.optional enableWebP libwebp ++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optional enableJPEG2K jasper - ++ lib.optional enableFfmpeg ffmpeg + ++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 9dcb9956838b..dd71b10728d8 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -23,7 +23,7 @@ , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 , enableVtk ? false, vtk -, enableFfmpeg ? false, ffmpeg +, enableFfmpeg ? false, ffmpeg_3 , enableGStreamer ? false, gst_all_1 , enableTesseract ? false, tesseract, leptonica , enableTbb ? false, tbb @@ -204,7 +204,7 @@ stdenv.mkDerivation { ++ lib.optional enableWebP libwebp ++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optional enableJPEG2K jasper - ++ lib.optional enableFfmpeg ffmpeg + ++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index f637e730179b..06a3d5f194fb 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -7,7 +7,7 @@ , enableTIFF ? true, libtiff , enableEXR ? (!stdenv.isDarwin), openexr, ilmbase , enableJPEG2K ? false, jasper # disable jasper by default (many CVE) -, enableFfmpeg ? false, ffmpeg +, enableFfmpeg ? false, ffmpeg_3 , enableGStreamer ? false, gst_all_1 , enableEigen ? true, eigen , Cocoa, QTKit @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableTIFF libtiff ++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optional enableJPEG2K jasper - ++ lib.optional enableFfmpeg ffmpeg + ++ lib.optional enableFfmpeg ffmpeg_3 ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen ++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ] diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index a209c950d482..a86171852164 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -11,7 +11,7 @@ curlSupport ? true, curl, colladaSupport ? false, opencollada, opencascadeSupport ? false, opencascade, - ffmpegSupport ? false, ffmpeg, + ffmpegSupport ? false, ffmpeg_3, nvttSupport ? false, nvidia-texture-tools, freetypeSupport ? true, freetype, svgSupport ? false, librsvg, @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ++ lib.optional curlSupport curl ++ lib.optional colladaSupport opencollada ++ lib.optional opencascadeSupport opencascade - ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional ffmpegSupport ffmpeg_3 ++ lib.optional nvttSupport nvidia-texture-tools ++ lib.optional freetypeSupport freetype ++ lib.optional svgSupport librsvg diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index e9f55dd6145f..3af1833fe49f 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, libGL, glew -, xorg , ffmpeg, python3 , libjpeg, libpng, libtiff, eigen +, xorg , ffmpeg_3, python3 , libjpeg, libpng, libtiff, eigen , Carbon ? null, Cocoa ? null }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { libGL glew xorg.libX11 - ffmpeg + ffmpeg_3 python3 libjpeg libpng diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix index e9656ee23ec5..1dbfe0647f47 100644 --- a/pkgs/development/libraries/pipewire/0.2.nix +++ b/pkgs/development/libraries/pipewire/0.2.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind -, glib, dbus, gst_all_1, alsaLib, ffmpeg, libjack2, udev, libva, xorg +, glib, dbus, gst_all_1, alsaLib, ffmpeg_3, libjack2, udev, libva, xorg , sbc, SDL2, makeFontsConf }: @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer - alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2 + alsaLib ffmpeg_3 libjack2 udev libva xorg.libX11 sbc SDL2 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 8fd83c59e56d..21dcf5af3159 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -11,7 +11,7 @@ , dbus , gst_all_1 , alsaLib -, ffmpeg +, ffmpeg_3 , libjack2 , udev , libva @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { alsaLib bluez dbus - ffmpeg + ffmpeg_3 glib gst_all_1.gst-plugins-base gst_all_1.gstreamer diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index df444eee2eb5..512060701e2d 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -14,7 +14,7 @@ , enableProprietaryCodecs ? true , gn , cups, darwin, openbsm, runCommand, xcbuild -, ffmpeg ? null +, ffmpeg_3 ? null , lib, stdenv }: @@ -152,7 +152,7 @@ EOF libevent ] ++ optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ - ffmpeg + ffmpeg_3 ] ++ optionals (!stdenv.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 602f3e670dde..9fa64be4d53e 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , pkgconfig, wxGTK -, ffmpeg, libexif +, ffmpeg_3, libexif , cairo, pango }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ wxGTK ffmpeg libexif ]; + propagatedBuildInputs = [ wxGTK ffmpeg_3 libexif ]; buildInputs = [ cairo pango ]; diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index aa9600085c01..4322278e2fd6 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, xorg, alsaLib, libGLU, libGL, aalib -, libvorbis, libtheora, speex, zlib, perl, ffmpeg +, libvorbis, libtheora, speex, zlib, perl, ffmpeg_3 , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager , libmpcdec }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext - alsaLib libGLU libGL aalib libvorbis libtheora speex perl ffmpeg flac + alsaLib libGLU libGL aalib libvorbis libtheora speex perl ffmpeg_3 flac libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec ]; diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix index ae7dc43020b5..51b0060cb2d6 100644 --- a/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , substituteAll -, ffmpeg +, ffmpeg_3 , future , pytest , pytestrunner @@ -24,7 +24,7 @@ buildPythonPackage rec { ( substituteAll { src = ./ffmpeg-location.patch; - inherit ffmpeg; + ffmpeg = ffmpeg_3; } ) ]; diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index d6438c6a5b8b..cf119c1dec56 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k -, ffmpeg, async-timeout }: +, ffmpeg_3, async-timeout }: buildPythonPackage rec { pname = "ha-ffmpeg"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "230f2fa990c9caaff1c67c2227b64756062248083849651a9bec7d599e519a42"; }; - buildInputs = [ ffmpeg ]; + buildInputs = [ ffmpeg_3 ]; propagatedBuildInputs = [ async-timeout ]; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 5433e1ea9e41..ebb7f86f5afb 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -8,7 +8,7 @@ , pytest , numpy , isPy3k -, ffmpeg +, ffmpeg_3 , futures , enum34 }: @@ -23,7 +23,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [ - imageio-ffmpeg ffmpeg + imageio-ffmpeg ffmpeg_3 ]; propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [ futures diff --git a/pkgs/development/python-modules/infoqscraper/default.nix b/pkgs/development/python-modules/infoqscraper/default.nix index ce265d013785..4a1543083432 100644 --- a/pkgs/development/python-modules/infoqscraper/default.nix +++ b/pkgs/development/python-modules/infoqscraper/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ html5lib ]; - propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg pkgs.swftools pkgs.rtmpdump ]; + propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg_3 pkgs.swftools pkgs.rtmpdump ]; meta = with stdenv.lib; { description = "Discover presentations and/or create a movie consisting of slides and audio track from an infoq url"; diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index 76820b6ebc6a..d7791fcf96cb 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with pkgs; [ alsaLib ffmpeg libv4l sqlite libvpx ]; + buildInputs = with pkgs; [ alsaLib ffmpeg_3 libv4l sqlite libvpx ]; propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; meta = with lib; { diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index 970fe5a19878..8a1154d66c88 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -8,7 +8,7 @@ , pandas , tables , git -, ffmpeg +, ffmpeg_3 , scikitimage , matplotlib , qdarkstyle @@ -55,7 +55,7 @@ buildPythonPackage rec { pandas tables git - ffmpeg + ffmpeg_3 scikitimage matplotlib qdarkstyle diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix index ee805ce6300f..86a2dd200110 100644 --- a/pkgs/development/python-modules/thumbor/default.nix +++ b/pkgs/development/python-modules/thumbor/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { gifsicle = "${pkgs.gifsicle}/bin/gifsicle"; exiftool = "${pkgs.exiftool}/bin/exiftool"; jpegtran = "${pkgs.libjpeg}/bin/jpegtran"; - ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg"; + ffmpeg = "${pkgs.ffmpeg_3}/bin/ffmpeg"; }) ]; diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 463642988a8f..ab16d9511514 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -3,7 +3,7 @@ , xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify -, ffmpeg, libxcb, cups +, ffmpeg_3, libxcb, cups , sqlite, udev , libuuid , sdk ? false @@ -22,7 +22,7 @@ let xorg.libXScrnSaver cups libcap libnotify # libnw-specific (not chromium dependencies) - ffmpeg libxcb + ffmpeg_3 libxcb # chromium runtime deps (dlopen’d) sqlite udev libuuid diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix index 0d0bab2c4ebe..ac228118444a 100644 --- a/pkgs/games/chiaki/default.nix +++ b/pkgs/games/chiaki/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub -, cmake, ffmpeg, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf +, cmake, ffmpeg_3, libopus, qtbase, qtmultimedia, qtsvg, pkgconfig, protobuf , python3Packages, SDL2 }: mkDerivation rec { @@ -17,7 +17,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig protobuf python3Packages.python python3Packages.protobuf ]; - buildInputs = [ ffmpeg libopus qtbase qtmultimedia qtsvg protobuf SDL2 ]; + buildInputs = [ ffmpeg_3 libopus qtbase qtmultimedia qtsvg protobuf SDL2 ]; doCheck = true; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 771554192d80..00df6f338210 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut +{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_3, freeglut , lib, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs , qtbase, qttools @@ -27,7 +27,7 @@ mkDerivation rec { buildInputs = [ SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image fpc lua5_1 - ffmpeg freeglut physfs + ffmpeg_3 freeglut physfs qtbase ] ++ lib.optional withServer ghc; diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index a9047de70416..cae97dc42158 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivationWith, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg +{ stdenv, mkDerivationWith, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg_3 , boost, cmake, SDL2, unshield, openal, libXt, pkgconfig }: let @@ -24,7 +24,7 @@ in mkDerivationWith stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake boost ffmpeg bullet mygui openscenegraph_ SDL2 unshield openal libXt qtbase ]; + buildInputs = [ cmake boost ffmpeg_3 bullet mygui openscenegraph_ SDL2 unshield openal libXt qtbase ]; cmakeFlags = [ "-DDESIRED_QT_VERSION:INT=5" diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index c2bb5cfa20ce..b53850a87438 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, sfml, libGLU, libGL, bullet, glm, libmad, xlibsWrapper, openal -, SDL2, boost, ffmpeg, Cocoa, OpenAL }: +, SDL2, boost, ffmpeg_3, Cocoa, OpenAL }: stdenv.mkDerivation { version = "2019-10-26"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ - sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg + sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg_3 ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenAL Cocoa ]; meta = with stdenv.lib; { diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index 9fd90945ebad..16d0036b6583 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, boost, cmake, ffmpeg, freeglut, glib, +{ stdenv, fetchsvn, boost, cmake, ffmpeg_3, freeglut, glib, gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, libXmu, libGLU, libGL, openal, pixman, pkgconfig, python27, SDL }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = - [ boost cmake ffmpeg freeglut glib gtk2 libjpeg libpng + [ boost cmake ffmpeg_3 freeglut glib gtk2 libjpeg libpng libpthreadstubs libvorbis libXau libXdmcp libXmu libGLU libGL openal pixman pkgconfig python27 SDL ]; diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix index 18c78c84d6cf..ac87190b0507 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -1,4 +1,4 @@ -{ expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg +{ expat, fetchFromGitHub, ffmpeg_3, fontconfig, freetype, libarchive, libjpeg , libGLU, libGL, openal, pkgconfig, sfml, stdenv, zlib }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - expat ffmpeg fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib + expat ffmpeg_3 fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib ]; meta = with stdenv.lib; { diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index b460aa7a485b..0053079d992c 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -4,7 +4,7 @@ , pkgconfig , cmake , bluez -, ffmpeg +, ffmpeg_3 , libao , gtk2 , glib @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez - ffmpeg + ffmpeg_3 libao libGLU libGL diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index aa77356600be..3865a4a70602 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake -, wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext +, wrapQtAppsHook, qtbase, bluez, ffmpeg_3, libao, libGLU, libGL, pcre, gettext , libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib , miniupnpc, enet, mbedtls, soundtouch, sfml @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { ++ lib.optional stdenv.isLinux wrapQtAppsHook; buildInputs = [ - curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio + curl ffmpeg_3 libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml qtbase diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 5611b344cb1c..872fdc713836 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkgconfig -, cmake, epoxy, libzip, libelf, libedit, ffmpeg, SDL2, imagemagick +, cmake, epoxy, libzip, libelf, libedit, ffmpeg_3, SDL2, imagemagick , qtbase, qtmultimedia, qttools, minizip }: let @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ wrapQtAppsHook pkgconfig cmake ]; buildInputs = [ - epoxy libzip libelf libedit ffmpeg SDL2 imagemagick + epoxy libzip libelf libedit ffmpeg_3 SDL2 imagemagick qtbase qtmultimedia qttools minizip ]; diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index b2aa81124dae..a15347715501 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -1,7 +1,7 @@ { SDL2 , cmake , fetchFromGitHub -, ffmpeg +, ffmpeg_3 , glew , lib , libzip @@ -37,7 +37,7 @@ mkDerivation rec { buildInputs = [ SDL2 - ffmpeg + ffmpeg_3 glew libzip qtbase diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 735814296132..17b1679ed5ba 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, python37, retroarch , alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL -, ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump +, ffmpeg_3, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump , miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl , buildPackages }: @@ -834,7 +834,7 @@ in with stdenv.lib.licenses; description = "ppsspp libretro port"; license = gpl2; extraNativeBuildInputs = [ cmake pkgconfig ]; - extraBuildInputs = [ libGLU libGL libzip ffmpeg python37 snappy xorg.libX11 ]; + extraBuildInputs = [ libGLU libGL libzip ffmpeg_3 python37 snappy xorg.libX11 ]; makefile = "Makefile"; cmakeFlags = [ "-DLIBRETRO=ON -DUSE_SYSTEM_FFMPEG=ON -DUSE_SYSTEM_SNAPPY=ON -DUSE_SYSTEM_LIBZIP=ON -DOpenGL_GL_PREFERENCE=GLVND" ]; postBuild = "mv lib/ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary} ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary}"; diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 28a641ec9701..a9950a14b4d9 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper -, ffmpeg, libGLU, libGL, freetype, libxml2, python3 +, ffmpeg_3, libGLU, libGL, freetype, libxml2, python3 , libobjc, AppKit, Foundation , alsaLib ? null , libdrm ? null @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wayland ] ++ optional withVulkan makeWrapper; - buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] + buildInputs = [ ffmpeg_3 freetype libxml2 libGLU libGL python3 SDL2 which ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ optional withVulkan vulkan-loader ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 4e022b2868fa..5e26624d6c7a 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchgit, cmake, pkgconfig, git -, qtbase, qtquickcontrols, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python3 +, qtbase, qtquickcontrols, openal, glew, vulkan-loader, libpng, ffmpeg_3, libevdev, python3 , pulseaudioSupport ? true, libpulseaudio , waylandSupport ? true, wayland , alsaSupport ? true, alsaLib @@ -36,7 +36,7 @@ mkDerivation { nativeBuildInputs = [ cmake pkgconfig git ]; buildInputs = [ - qtbase qtquickcontrols openal glew vulkan-loader libpng ffmpeg libevdev python3 + qtbase qtquickcontrols openal glew vulkan-loader libpng ffmpeg_3 libevdev python3 ] ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional alsaSupport alsaLib ++ lib.optional waylandSupport wayland; diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix index a821d430f6c6..833d8a82990e 100644 --- a/pkgs/misc/lightspark/default.nix +++ b/pkgs/misc/lightspark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg, glew, pcre +{ stdenv, fetchFromGitHub, pkgconfig, cmake, curl, zlib, ffmpeg_3, glew, pcre , rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, gnome2, lzma, nasm , llvm, glibmm }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ - curl zlib ffmpeg glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg + curl zlib ffmpeg_3 glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg gnome2.pango lzma nasm llvm glibmm ]; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index b73c6d351a20..2f0d184402fc 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -5,7 +5,7 @@ , fetchpatch , platform-tools -, ffmpeg +, ffmpeg_3 , SDL2 }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper meson ninja pkg-config ]; - buildInputs = [ ffmpeg SDL2 ]; + buildInputs = [ ffmpeg_3 SDL2 ]; # Manually install the server jar to prevent Meson from "fixing" it preConfigure = '' diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index d780cade7865..41c21502e0b3 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -5,7 +5,7 @@ , pkgconfig , portaudio , SDL2 -, ffmpeg +, ffmpeg_3 , udev , libusb1 , libv4l @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 alsaLib - ffmpeg + ffmpeg_3 libusb1 libv4l portaudio diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 4ea74019692b..9fcb3305f0ac 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -413,7 +413,7 @@ in rev = "0.9.0"; sha256 = "1b0v471mzbcys73pzr7gpvzzhff0cva0l5ff32cv7z1v9c0ypji7"; }; - inputs = [ pkgs.ffmpeg ]; + inputs = [ pkgs.ffmpeg_3 ]; }; vts = { diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index d401d3ada5e1..38eb336ba219 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, buildGoPackage -, pkgconfig, ffmpeg +, pkgconfig, ffmpeg_3 }: buildGoPackage rec { @@ -18,7 +18,7 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ffmpeg ]; + buildInputs = [ ffmpeg_3 ]; enableParallelBuilding = true; diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index 17bfdef2a30d..d996a6ad0ef2 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit -, sqlite, expat, mp4v2, flac, spidermonkey, taglib, libexif, curl, ffmpeg, file +, sqlite, expat, mp4v2, flac, spidermonkey, taglib, libexif, curl, ffmpeg_3, file , pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd"; }; - buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file mp4v2 flac + buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg_3 file mp4v2 flac pkgconfig autoreconfHook ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 44118277a28b..b801020a6652 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -4,7 +4,7 @@ # Archive support , bzip2, zziplib # Codecs -, audiofile, faad2, ffmpeg, flac, fluidsynth, game-music-emu +, audiofile, faad2, ffmpeg_3, flac, fluidsynth, game-music-emu , libmad, libmikmod, mpg123, libopus, libvorbis, lame # Filters , libsamplerate @@ -46,7 +46,7 @@ let # Decoder plugins audiofile = [ audiofile ]; faad = [ faad2 ]; - ffmpeg = [ ffmpeg ]; + ffmpeg = [ ffmpeg_3 ]; flac = [ flac ]; fluidsynth = [ fluidsynth ]; gme = [ game-music-emu ]; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 49eaa26c2947..a5924e37331d 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -1,4 +1,4 @@ -{ alsaLib, alsaUtils, cifs-utils, fetchurl, ffmpeg, libav, mono, stdenv }: +{ alsaLib, alsaUtils, cifs-utils, fetchurl, ffmpeg_3, libav, mono, stdenv }: with stdenv.lib; stdenv.mkDerivation rec { @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { runHook preInstall # Check script - sed -i '3i PATH=$PATH:${makeBinPath [ cifs-utils ffmpeg libav ]}' check.sh + sed -i '3i PATH=$PATH:${makeBinPath [ cifs-utils ffmpeg_3 libav ]}' check.sh sed -i '/check_ulimit$/d' check.sh # Start script - sed -i '3i PATH=$PATH:${makeBinPath [ alsaUtils cifs-utils ffmpeg libav ]}' start.sh + sed -i '3i PATH=$PATH:${makeBinPath [ alsaUtils cifs-utils ffmpeg_3 libav ]}' start.sh # Debug logging sed -i '/--debug--gc=sgen --server/exec "$HARDLINK" --debug --gc=sgen --server "$SCRIPT.exe" "$@" -storagetrace -watchertrace' Appliance/RoonAppliance diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 009dd9bfc43f..f97935a4ce39 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig -, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg, libiconv, openssl, python +, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_3, libiconv, openssl, python , which, zlib }: let @@ -17,7 +17,7 @@ in stdenv.mkDerivation { }; buildInputs = [ - avahi dbus gettext git gnutar gzip bzip2 ffmpeg libiconv openssl python + avahi dbus gettext git gnutar gzip bzip2 ffmpeg_3 libiconv openssl python which zlib ]; diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 8dcbe36850af..146705fb3d92 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchurl, substituteAll, cmake, makeWrapper, pkgconfig -, curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages +, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages , polkit, utillinuxMinimal, x264, zlib , coreutils, procps, psmisc, nixosTests }: @@ -138,7 +138,7 @@ in stdenv.mkDerivation rec { for f in includes/Event.php views/image.php ; do substituteInPlace web/$f \ - --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg " + --replace "'ffmpeg " "'${ffmpeg_3}/bin/ffmpeg " done substituteInPlace web/includes/functions.php \ @@ -147,7 +147,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ - curl ffmpeg glib libjpeg libselinux libsepol mp4v2 libmysqlclient mysql.client pcre perl polkit x264 zlib + curl ffmpeg_3 glib libjpeg libselinux libsepol mp4v2 libmysqlclient mysql.client pcre perl polkit x264 zlib utillinuxMinimal # for libmount ] ++ (with perlPackages; [ # build-time dependencies diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 71ebe7ceb81d..662dba65be42 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -10,7 +10,7 @@ , enableAcousticbrainz ? true , enableAcoustid ? true , enableBadfiles ? true, flac ? null, mp3val ? null -, enableConvert ? true, ffmpeg ? null +, enableConvert ? true, ffmpeg_3 ? null , enableDiscogs ? true , enableEmbyupdate ? true , enableFetchart ? true @@ -39,7 +39,7 @@ assert enableAbsubmit -> essentia-extractor != null; assert enableAcoustid -> pythonPackages.pyacoustid != null; assert enableBadfiles -> flac != null && mp3val != null; assert enableCheck -> flac != null && mp3val != null && liboggz != null; -assert enableConvert -> ffmpeg != null; +assert enableConvert -> ffmpeg_3 != null; assert enableDiscogs -> pythonPackages.discogs_client != null; assert enableFetchart -> pythonPackages.responses != null; assert enableGmusic -> pythonPackages.gmusicapi != null; @@ -146,7 +146,7 @@ in pythonPackages.buildPythonApplication rec { || enableAcousticbrainz) pythonPackages.requests ++ optional enableCheck plugins.check - ++ optional enableConvert ffmpeg + ++ optional enableConvert ffmpeg_3 ++ optional enableDiscogs pythonPackages.discogs_client ++ optional enableGmusic pythonPackages.gmusicapi ++ optional enableKeyfinder keyfinder-cli @@ -200,7 +200,7 @@ in pythonPackages.buildPythonApplication rec { s,"mp3val","${mp3val}/bin/mp3val", }' beetsplug/badfiles.py '' + optionalString enableConvert '' - sed -i -e 's,\(util\.command_output(\)\([^)]\+\)),\1[b"${ffmpeg.bin}/bin/ffmpeg" if args[0] == b"ffmpeg" else args[0]] + \2[1:]),' beetsplug/convert.py + sed -i -e 's,\(util\.command_output(\)\([^)]\+\)),\1[b"${ffmpeg_3.bin}/bin/ffmpeg" if args[0] == b"ffmpeg" else args[0]] + \2[1:]),' beetsplug/convert.py '' + optionalString enableReplaygain '' sed -i -re ' s!^( *cmd *= *b?['\'''"])(bs1770gain['\'''"])!\1${bs1770gain}/bin/\2! diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 8122e5a5ec2d..2cbf43407ffe 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpng, bison, flex, ffmpeg, icu }: +{ stdenv, fetchFromGitHub, libpng, bison, flex, ffmpeg_3, icu }: stdenv.mkDerivation rec { pname = "cfdg"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "13m8npccacmgxbs4il45zw53dskjh53ngv2nxahwqw8shjrws4mh"; }; - buildInputs = [ libpng bison flex ffmpeg icu ]; + buildInputs = [ libpng bison flex ffmpeg_3 icu ]; postPatch = '' sed -e "/YY_NO_UNISTD/a#include " -i src-common/cfdg.l diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/tools/graphics/yaxg/default.nix index 094ec2d5bc49..467210b27b35 100644 --- a/pkgs/tools/graphics/yaxg/default.nix +++ b/pkgs/tools/graphics/yaxg/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, - maim, slop, ffmpeg, byzanz, libnotify, xdpyinfo }: + maim, slop, ffmpeg_3, byzanz, libnotify, xdpyinfo }: stdenv.mkDerivation rec { pname = "yaxg"; @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ maim slop ffmpeg byzanz libnotify xdpyinfo ]; + buildInputs = [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ]; installPhase = '' mkdir -p $out/bin/ mv yaxg $out/bin/ chmod +x $out/bin/yaxg - wrapProgram $out/bin/yaxg --prefix PATH : ${ stdenv.lib.makeBinPath [ maim slop ffmpeg byzanz libnotify xdpyinfo ]} + wrapProgram $out/bin/yaxg --prefix PATH : ${ stdenv.lib.makeBinPath [ maim slop ffmpeg_3 byzanz libnotify xdpyinfo ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/capture/default.nix b/pkgs/tools/misc/capture/default.nix index e7134961c252..e92898ccc4d6 100644 --- a/pkgs/tools/misc/capture/default.nix +++ b/pkgs/tools/misc/capture/default.nix @@ -1,4 +1,4 @@ -{ stdenv, slop, ffmpeg, fetchFromGitHub, makeWrapper}: +{ stdenv, slop, ffmpeg_3, fetchFromGitHub, makeWrapper}: stdenv.mkDerivation { pname = "capture-unstable"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { patchShebangs $out/bin/capture wrapProgram $out/bin/capture \ - --prefix PATH : '${stdenv.lib.makeBinPath [ slop ffmpeg ]}' + --prefix PATH : '${stdenv.lib.makeBinPath [ slop ffmpeg_3 ]}' ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/tools/misc/gif-for-cli/default.nix index 993c20222d8e..fed22e518937 100644 --- a/pkgs/tools/misc/gif-for-cli/default.nix +++ b/pkgs/tools/misc/gif-for-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, ffmpeg, zlib, libjpeg }: +{ stdenv, fetchFromGitHub, python3Packages, ffmpeg_3, zlib, libjpeg }: python3Packages.buildPythonApplication { pname = "gif-for-cli"; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication { }; checkInputs = [ python3Packages.coverage ]; - buildInputs = [ ffmpeg zlib libjpeg ]; + buildInputs = [ ffmpeg_3 zlib libjpeg ]; propagatedBuildInputs = with python3Packages; [ pillow requests x256 ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index d33743025464..00624a482c8e 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages, ffmpeg }: +{ stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages, ffmpeg_3 }: pythonPackages.buildPythonApplication rec { pname = "yle-dl"; @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec { }; propagatedBuildInputs = with pythonPackages; [ - lxml pyamf pycrypto requests future ffmpeg setuptools + lxml pyamf pycrypto requests future ffmpeg_3 setuptools ]; pythonPath = [ rtmpdump php ]; diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index 0fbd76855a7d..6a14b5f1c82d 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }: +{ stdenv, fetchurl, ffmpeg_3, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }: let version = "1.2.1"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { export makeFlags="INSTALLPREFIX=$out" ''; - buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ]; + buildInputs = [ ffmpeg_3 flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ]; postInstall = '' mkdir -p $out/share/man/man{5,8} diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index 44eacacd0e84..97d3f8960d93 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, makeWrapper, ffmpeg +{ stdenv, lib, fetchFromGitHub, rustPlatform, makeWrapper, ffmpeg_3 , pandoc, poppler_utils, ripgrep, Security, imagemagick, tesseract }: @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/rga \ - --prefix PATH ":" "${lib.makeBinPath [ ffmpeg pandoc poppler_utils ripgrep imagemagick tesseract ]}" + --prefix PATH ":" "${lib.makeBinPath [ ffmpeg_3 pandoc poppler_utils ripgrep imagemagick tesseract ]}" ''; # Use upstream's example data to run a couple of queries to ensure the dependencies diff --git a/pkgs/tools/video/gopro/default.nix b/pkgs/tools/video/gopro/default.nix index f783b086345a..9979b224868a 100644 --- a/pkgs/tools/video/gopro/default.nix +++ b/pkgs/tools/video/gopro/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, ffmpeg +, ffmpeg_3 , imagemagick , makeWrapper , mplayer @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { install -Dm755 gopro -t $out/bin wrapProgram $out/bin/gopro \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ ffmpeg imagemagick mplayer ]}" + --prefix PATH ":" "${stdenv.lib.makeBinPath [ ffmpeg_3 imagemagick mplayer ]}" runHook postInstall ''; From 261912e07124bf8e72cca2049c2a66acc0288db7 Mon Sep 17 00:00:00 2001 From: Jeremy Schlatter Date: Fri, 12 Jun 2020 10:04:24 -0700 Subject: [PATCH 1509/3452] maintainers: add jeremyschlatter --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e16a7ed02f80..b75cb49467a0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3514,6 +3514,12 @@ githubId = 1608697; name = "Jens Binkert"; }; + jeremyschlatter = { + email = "github@jeremyschlatter.com"; + github = "jeremyschlatter"; + githubId = 5741620; + name = "Jeremy Schlatter"; + }; jerith666 = { email = "github@matt.mchenryfamily.org"; github = "jerith666"; From a3b63dbc72add9fb4c72b7efe58c50a0214ad5d6 Mon Sep 17 00:00:00 2001 From: Jeremy Schlatter Date: Fri, 12 Jun 2020 10:07:25 -0700 Subject: [PATCH 1510/3452] python3Packages.iterm2: init at 1.14 --- .../python-modules/iterm2/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/iterm2/default.nix diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix new file mode 100644 index 000000000000..33504323802a --- /dev/null +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, protobuf +, websockets +}: + +buildPythonPackage rec { + pname = "iterm2"; + version = "1.14"; + + src = fetchPypi { + inherit pname version; + sha256 = "089pln3c41n6dyh91hw9gy6mpm9s663lpmdc4gamig3g6pfmbsk4"; + }; + + propagatedBuildInputs = [ protobuf websockets ]; + + # The tests require pyobjc. We can't use pyobjc because at + # time of writing the pyobjc derivation is disabled on python 3. + # iterm2 won't build on python 2 because it depends on websockets + # which is disabled below python 3.3. + doCheck = false; + + pythonImportsCheck = [ "iterm2" ]; + + meta = with lib; { + description = "Python interface to iTerm2's scripting API"; + homepage = "http://github.com/gnachman/iTerm2"; + license = licenses.gpl2; + maintainers = with maintainers; [ jeremyschlatter ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0aa27ff933ea..27195adef521 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -853,6 +853,8 @@ in { itanium_demangler = callPackage ../development/python-modules/itanium_demangler { }; + iterm2 = callPackage ../development/python-modules/iterm2 { }; + janus = callPackage ../development/python-modules/janus { }; jc = callPackage ../development/python-modules/jc { }; From 1bc740008b7b0bc92502199973d0561d4c186957 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Jun 2020 19:22:53 +0200 Subject: [PATCH 1511/3452] firefox-bin: 76.0 -> 77.0.1 (security) PR #89438. --- .../browsers/firefox-bin/release_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 28a3c085a2f0..464eef9f4b7c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "76.0"; + version = "77.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ach/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ach/firefox-77.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "d1bd187497c76c624e010ec50a43e68bd91cdfded37f85e02047acdb53027c79c8071632f1a31f35f0a2b52eacf94c905984f2edb7b83e0a74fb0a0565eb18a5"; + sha512 = "12adc58633a67921e1d1944501191510baf3b0308213f417a202abcc09d5abad3155a478c2541508273d6e8b07bd3c13f7f8ab6e40855927429a94cc8d989888"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/af/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/af/firefox-77.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "bd9e45046cb566cd3fc94eec9d5587b0270417d68091da1b29eca40645b2aff4f081c2a5b0292a0e06da410a64fd1f617543bf0702852a6fe424680fdf3ec39a"; + sha512 = "ee58827ac139f48b870d3c30d8c317857ad5973593fa99addd7d09faa1fc53ae5ae31e36cd1f5c9dec6ff56ab31b987baccad98d4c8f8e009830e2e5065b8a4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/an/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/an/firefox-77.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "d5df04a513a349291d629941e519617cdcdee1c004ec8bcc3c02bf02ad310dad2dc33878268d8a4a6b115b3b02bd558159a8eaddda48e83aca29f2a377225396"; + sha512 = "ba8a36a8e7a8638c88355ce68ca4f320d13b60522f7699dbefd056ad01c4476799c38c3cb5817d5c506f29ec32532b533bb6aa5a592cef971f1a617d353b12aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ar/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ar/firefox-77.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "753550131ee986f7a770f95959a26b24b17e0a6a5f2e12ec1b7d42b31886e32b9c93a559b7824cd5348f34f1fe26901f5198fca57ab2c9f412ce032882cf7b5b"; + sha512 = "507a3c9487f0d2fd89b91473afbb9607d2c8fe2f642e331a4c781078d0f474b5345827a83167981c0d9b06556370b6d7baddd9eb3355dfd8c64014d139483e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ast/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ast/firefox-77.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "8561ba0236a9524672c7ebacde935d4c3761fe2c5fc0125951d28f53c3d27388d48c108a6fa71064cbfa54cca57a72f6fb49b3b8314d28b875e250b218be4d55"; + sha512 = "70df4d795059609d2935243ca1af753e9e57d303f43df42f72a423135d095b8a295cf06fc3aa0284f68415c77de46b6925b34fc19987309a9b3f749e8234d9c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/az/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/az/firefox-77.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "53b7a939d02ccc0a809079070afd4db528a4cb617a4fbfaa58cca573450be764e3894caf3a40477903151f8116460dc574749f0edf9bfae6981616772b649703"; + sha512 = "34a95a03400f67bc17a405767d174de67103a57cfc2154621e4452b914e070344b361547876b2a17813638405440642f28684f84782285960d3ed5bd0d8c0eec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/be/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/be/firefox-77.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "36658c05c6b7b1f64ffe14ded709dbc08f0236f99f9457964c15a36a4ebf8d73bf482ac2f8518927b2d66fc9a1ba19289db1855a6dbc7b9502c2a3c0137bd7ab"; + sha512 = "66acd13f56a2a3c79cc49f3cd5cd203c7b7e1f7f978a1ce1eb90f702f35f501bf7b16b1fbc9be8ba9b176b103bc37d0868aaf765ca485c854192c2c4d27b1030"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bg/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/bg/firefox-77.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "890066ff182d6ce79cf0adf307a92a26ced29f633cbaaacd02eb5c1c3f0e2bc2de336a7b22fbb530ec85561d26dc44f93f2ce1f58843e1d87322badbdc92e8fc"; + sha512 = "44f3dc39fb73c03461d16a34f1fcfeb385722a0b4deb7b75199a8f8fb40fe85cec8116e11eb2f7852580a4ce9925d8f022c6133647232f6547db689b6d87912a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bn/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/bn/firefox-77.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "c6f9bda8a95351d79ecfe1e138ace440aecee6c1dc5ad2d7c6d249e5277b75b27797cdcbfa1b8d3ec2a899974f555b8b20f7c38f03a7979ca917ab050feb6cfa"; + sha512 = "2ecc1a1433eb8301cc7e9d66dadf1926aa20b609b7683e69004dd56a12b3a8a2a1db19ec85113bdb0bb0759c29b0e70a157ef6f2f7ba29a121f22d39cb256c5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/br/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/br/firefox-77.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "b15b1cd34dc4799836d67ce4ed8b166b54e21076313a2f726c7b872aeabbcc40a35c7f859cf78e0f17825fcad38b6d4dfaadf5d27ef89ebea8da0ce427492311"; + sha512 = "f9561f0d2f00da6736af19dfc2ec21a25a46b0a2c0ae195e0725a59f8df0367be3c0dbbfacc4b79ba82bce7643b00127b9a9431379e533c0393d49c6d3017ccf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bs/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/bs/firefox-77.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fee05346fed30422b79af7c0626a7763f404f8a3a2617bddd17b95434060bd1c47b47409a0147c130b51d08d98de2232abe8fc7ade9bc58cc1eeccaf0987aee7"; + sha512 = "e76982df74ee812f37f802d3e82a7ba842d6a211be3beff4fe6347a991ed49601678f11c01847a9708ce36ec2ca956f452b2d7b1fe168a7608ae7999113fbf22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ca-valencia/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ca-valencia/firefox-77.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "beb5d44cabc7a80a0ceb4573e4e6fc2b554c6cc0ae38c9a5699d0d87d5f36aee892c4bee8ca1d103001b3305ef814f9a96a8fd63dc5b495363443f9abb4edc91"; + sha512 = "a2633b6e009edcb98c4af62df6cac991254a0f370384c2d0a3b81f8c4e49648ab6cdc580888a628668acd0a4daef1bf6b65633c58441aa0e9aaf84dfccfd10fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ca/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ca/firefox-77.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "1b8cc942602134a48e0d16a3244e97edafa133c74651ed4545f5e3eb515ad1881276cd2adc204e5c9cfd677dacec79030311483469174415199b9eb679729442"; + sha512 = "c8ba559b912670a86f94188e1b3c0962093955a527b2751e4264699bdf343050999d76b93857f6819c797dbafbbd0980032cf5c497b0d34a50c5c8395cd07cd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cak/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/cak/firefox-77.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "2738e924257a81bb1ff956a6717e6ef4769e96f5940bb0fad58030e3d2ce65e84ecb2807e6e04ca820eeba61bd386c85716112535cc28d2bd3c9e7a364c734b2"; + sha512 = "52f446f2a2c4bd6d79f680ebdb38e2f62e0830d14fc98dc6ad01c5b404794da1e59f4b8da2d7f4a0483187f4725a212e41edcc2006190818e6229a5a9af8a597"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cs/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/cs/firefox-77.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "3d58acd8bafbd11307ca58894992fcf8325a5679585d5c5e09e397b941019a8a8f7bc9b63997bcad2722e8cbba88715b789683b0428632e4ec4b728a36b54099"; + sha512 = "91d8dbd3d8dd6e242943d9b416534492125746694a721fff6c9d51f811e2f93b5d521f63357addd0e11bbeac80d3a07d2fda0133d746eb3d4d5d086e59a713b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cy/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/cy/firefox-77.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "aa7aa1b06c1a28e30b532d41b4cf3bbae26c42a24a63afb1999f421577afac4e4591b465b3e659ed5c9278b2c5d2c4c449a84fcfa69b451804d2a0470524ab04"; + sha512 = "14a04b2d97ea473b45602ab44d8ad08f35f21e98621e93b901ae25731fd86d207b4949bca3283e39cf22aea7667e110c94b948b51a370551c4416a3009f10854"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/da/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/da/firefox-77.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "48160d3a437dee94c1070e2742c6bde4a36811e8d2eae87d7c8450476b30b912bc9cbef8a5f7d917ad4be771eeede9d7fa9315e27b154f50049ce80f4911024d"; + sha512 = "5ff9be1796f70f608e12732c71f46c6c4f636e52ed03cb445ee1fc35d4db2897ee1b8f231ba0a5724696d3f7db04845dddf268a3ba59b26a869f65729abd57e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/de/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/de/firefox-77.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "fc4d0ddd9649dd555b4abd4d90f9d6cff8fe7e702bcf5d2931565c469842f51ee215286f68802304868848f043e54c8224358c8f4060435a4674401d19bd6989"; + sha512 = "b15a90114ea7f2c69fa94bb6e9c2559be0f7a7a0b7c4c1042823153000bc6a04a27f62c9373cb4c73535e676c41b23dfd260396fa691f2ac0319badb7a087f05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/dsb/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/dsb/firefox-77.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "3cab1a498db5900b055a8bc6398e4dc9770657c41ba9bb6bf0f196566e9c535db99f02e5c51750e7c7185f2f0b1a26e84da51403775c33ef34915b43e3a8b27c"; + sha512 = "bd10d40bb2f52c1b5cae9c7d91d53b3cc33bac0415a6f0b37fa5e1e2f5249ce5313a45e0e8b8b218ad961b2e3b3597c7132486a71eae76acdc61805181cd7220"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/el/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/el/firefox-77.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "d099758283e38566a4d9db744590f42b5fd28de8e985c2f240096e158995da00711e97d6feb3979bac40a2ad57cf7876da37c4ba69f3467930415d87a2d10c50"; + sha512 = "4c28c9104085d2ddd024a1418f0f54cd4c57d0ad5fc59bbd26d28bf173a78999eadb025618f0221273c5cb697708f944764a88fe9c08695b10694c68ec54473c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-CA/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/en-CA/firefox-77.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "442e60f0d132d96c58364e0d5f70e43ade8e6508f5d0a76b3d7e5c61bed0bffa5f9bc2096c89879dcb1681bc394699e39d3c31f2d02fa790dd8e38f1b406154c"; + sha512 = "0722520753a1bdb093e696cebe1e9074661b7602b5d8285b41f62acd462e740cb0833b751d870d602e7473bd11f3bcb3e5dd8e84ca00ca3babeea3a19d45974d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-GB/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/en-GB/firefox-77.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "8c0d31a9123d8d8baf94f73505233786f7fd2ce721f8792f4cc1db337a1659badf08393a22159dcb9d8256e43f24661c3975e6a1f801e30d21bc54083f4da041"; + sha512 = "8f6aa14f4dddadf19661e3bf11573d930c5e931f383498fd22826cb1e61f97bb5cc5db7507e5363648fba3368c7d49d7395bd4d68c6f9787db65401e990a62c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-US/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/en-US/firefox-77.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "993e5410a946f802a47d8167c83e767fa9973754cfc1365e4cc2698a25524dc27c83f3b202990744dd654d68226c601ad9608ecc49d2c3952e50967e20ece34a"; + sha512 = "28b0f843220a88759893813c48f9b02a255c26fe954632e530f956f43c4cda6441546f3e9d827fd61bca0d61fc6a5580d3134b8d5315cdab90fb57aaf96fa5f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/eo/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/eo/firefox-77.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "c2021ecd345cc45fd26ccd8a75ee66cd1eeb506a8e0f6b9811b4149b6bb15121edcdc9a0825703db52beea61f7249f45d23fa3822a9f47701adbc2e86c7ccaa3"; + sha512 = "da2d5d3d337c39236ecf39291dc44ce5c023dc0dc0b093c73b17425befa5f8b54239f166831b2d2b88d3556b9ea1e3dddcda8bdf2907fa7c5a63d78ef222b214"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-AR/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/es-AR/firefox-77.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "c397cdeebd4527189b898db2640c1a5b8b5bd4fc1664ef384662136232b5dc21f7033686d2624ec421542d1140f46cc95c8364d47e1c89a8653d541fab52e28c"; + sha512 = "ffece84feea0c13e2f1b40c41ddf0c6bcb9db03d5d377c509421abc2bbab7d04134e14f9eda5bb87bf7a63da57ac214cf88a054fd58cf7785e620e37076b5820"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-CL/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/es-CL/firefox-77.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "86940cd36df65d0515634c7abe6c7c81157a8bd3576acd9844784041c2239d25aa455da2fc33ba9b8cac0e5a840546dda0cc04765589dab0608ebe9b3cd53967"; + sha512 = "649bcc8ffa5ae82a26c277ed648e7e02bdae3df782c2716ae15834f46230105ec4c33bf838a7c5dc7cd1ab1ef92f9babe9bd39e8dd5d34376ae76121119e7a2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-ES/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/es-ES/firefox-77.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "9a1404626e2b9716567e0c1b0a7d681acfc47bd488fcc585172fb40c4d18dc1bdd4356244c74d042ad085e0300aff73ff7619d651658655bdf7d668f64e72a3a"; + sha512 = "c292b0f01d5289ca978b0af87d15a0472748db192ef4f09b36f5fcb1a671edc9a3286d3981e482bbe0b33158f930ee1514cf0e8b18cdf31a47a2c72b0e0dbf19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-MX/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/es-MX/firefox-77.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "870b2b135ffe3ece3ef4d16abc74d469421742bb32fe8b0add3a39dbd580aa07e251df4137f3a2950d6992cefcf0eaff162959ad5eeeb7e493c016769ad2751d"; + sha512 = "969f18a23691d80f7cd7df0ac43c6a725eaffbee73d8044daf90ff4ea0baf504cba9e73049f74b9cf8619b78326797d831f247f86e5181a791fb4ae211b20e46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/et/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/et/firefox-77.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d20a3c1cb0649406d9cfcc22bffb4dacdee124b68c210ff25b1316be76a1ec26b7b9f21ee8d208cb7a6f1f733ae71b70af3fe084b92640cce03989f4d45cc375"; + sha512 = "cacc56bec434d5c44422f2178bce9db151249b4298df079a00c378995cd353d6369b6a1edc841928eef26a5dfa23d44f25cc33f0dabe96b44c13004bf134ecf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/eu/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/eu/firefox-77.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "fcc4a18ab042f31153e1f5a4d090c920e687687ae8be4259394a771c839e8af167efdf9b0a3cd8ae80f15e70300d24ca894ec1381bd91738b7a5c1160dcf8eac"; + sha512 = "a5fcf26a1b614006463f0b2503c39c00009ccadeeeef54c7ade12717837858594037cdcf96983cec88c5816e436e97eebacd07b40182504c016d238207bd3e62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fa/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/fa/firefox-77.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "7ce0bce00836d4497a440f3c66421cbab38f5b856a8b0e3dea13b88c167b689a061be7261d9daed1ddebd23f21eb806fbe72c7cf08a2f49c31ea1486287404b7"; + sha512 = "68a2938aa4f190941595e66efad29adb7770657dc755725e926a19e189f15f83a5e234d896f589c693fc3665e50b5da95fb3538238a2c2c2f955caf08d7a9cd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ff/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ff/firefox-77.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "41c0639955bb82c8042e0cd9e76c6c6b30c5baf8f94206f1932e8a56cbc21a2de53fc9b31b6dec656822e215d11259a7b2dc158e58d1edce48dbe41f2cda4098"; + sha512 = "28298f6619a3c485f08d25fd9cfcd9ff8c60014c702ff7e4b6e462a0877b7225829d4a5014a653a3073d4d51dca731859bb6600ba9a66fdc488734af7487f9a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fi/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/fi/firefox-77.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "540f26080c0b85b71e40bb0eb5acd92d8b71cd9ad8dbe72121225afc2b9821519ed6a2d2bc58cc77b445c3fa42ac6e39647c1da8c8a8935617995dcb0376b9d8"; + sha512 = "fb4ee19b0b71d6d51f82cdfa384a4229e4cb735e0901ef9d246dd192ea5fab010de5549a0236917ee0002de0cb28b0328692079087184f46511c429b4c0201f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/fr/firefox-77.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "ccf845aec06d7274acc7a850702e2dbfe69db8198a44537f7f0eef6b65bdf0cb71682b2a443f0e6a5e8ff310922bd29c39229813cd12ba54f70c0fa3418ff23a"; + sha512 = "73a06198b1b62ce230c76d045b8950008b0ea608a967cd7a143b79b745ca269b6d5960232dc2f20a26af6b9df785785db535182b2fcea2bc1fb6d46abffa1659"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fy-NL/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/fy-NL/firefox-77.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "5eca2e853a3458f5adf0a960cc7ec4f21db344e67e7e419ca19d34b807809bd0c954ae4011b5ee73b02d9ef88686ac57f2a0d1d3af43e6a4def2031b698cd656"; + sha512 = "a7a2ae5b4e1c5b6e0bee93e4dba501638d4f6aefb094833eca2e1a4c342beb29102d92840ef8c898106c8689d585548a2dd192dfdcdfae3a0c7a9fdffa604008"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ga-IE/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ga-IE/firefox-77.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "4ceee43db5cbd6ef5b18442cba0c7c74998129280e14b20ad41de041b3053b518fe77767a7aed9c62fa2467b2d6ac36a680e276d79edbc959313b260950f7c8a"; + sha512 = "1341a646c758c1b879464722a536743cbe406b964ba289d9bd36ac973db8cfe008331f1736a838c1b0fa5c2c3a01e12fd8a4b3bbc073e0772ec3d50da7ea7159"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gd/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/gd/firefox-77.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "9a5115acf49a15e10a530041029081eff7bd7a6877dac1331391d5321533083162be0dbc5dcede2bb708d8a54d47af3773c89e498d8c7d99c28f7229747c0721"; + sha512 = "d7996916bf60c44df2a354c2f09bd1116c2bf1f20bc4445686e16f1eadfa6606e772fb0f9f3086231b8666a5a22a4dd549a4efcf7aad4529ac57a49adf9a7777"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/gl/firefox-77.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "435de08a8d536491b645d630e81bd9190b61e0073c3b170977a995f9599b0ebd0fe4a18279f0ef40ca242e854fd43ea36dab41a86a73c515a691b621f8b74ae2"; + sha512 = "38068429fb33f17451babe535ed9692f8d97aa9bd10a419016f6b61c8a02232c801a2e018bb6164ddcd1c4b3216fae71c1cc7f00cbfab3e20b85d3aabda02727"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gn/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/gn/firefox-77.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "e4e4d05239306cbc0f91cf6d1eb890af45c40fff8ac53fa47c6dde6dbaa583d31b6e5e51bfac91d2fddba9f89e51125235b11f766ebc39ec5e55da65e1ba732d"; + sha512 = "ceedc3f1e05ca7b33e03bea9e0da10eec1930ebe30cc5b539e6b928da8a19eaa619289f25188888799c3a0d91c12a6873e38411e136fa684f5ad27d6ded6d6e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gu-IN/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/gu-IN/firefox-77.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "727b7db843fc1722cb5d837e02388170d06f8c6ef42aba22dde9e237808e5404820c8b14dd43ec5cf2ddfcdf4883bd678d5c9aeb2845e428c096382d8a805afa"; + sha512 = "f2497076febb3f19964b3ffa29de9061cd64706224c29ea8680a4e7277131de559b67c0012d6d7a8905143e6b19ebf27b5ddccb3263d5fb3bfcc8aed1f93b294"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/he/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/he/firefox-77.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "c151a281f8aaaf82a0021c20af2d12332674b27f2e5ac9c0ffea070c5c350f96de978a1662b5886f1d3b1d514061747f247ae3ebbd965e3ce940a2494c164243"; + sha512 = "d91a982c027d2b68c449fcaeb719d8943d089c778d017534d72b571b26af8c7e01ed9ee37309394b6984daec3579b91c901a3a1d9ecf5485a2a0a1a8f93d522e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hi-IN/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hi-IN/firefox-77.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "5048f072162e3b2cbfbcc24885aec83599a7c47bad212fbae741fa15b903014a9e29b362f1492b42341498398b009e5d929de0801a22b4333093f9057c47b42c"; + sha512 = "7aa929a279e568ca517f3727b4c51417cb4acb6e2606da30658c9a213fb789dba9191b51d62037928a47daa394ddb5baa0e2746f68a4c5569bda3632be17a719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hr/firefox-77.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "ebd9c280598ebec64a230f6711d4d7839feb005d790c0660fe789e129a1acba78e170686eff21e0bad558dc7e9b0dc98a9139b7fff2426d9050ec0b3ed3e815b"; + sha512 = "07fde2ae76e5b9ffe81ed5d68114f66aacd7209e5edb353d1962a9509c7cf75bd42ae21ee8cf30216f502e31af5caa7984676192a714712bd279440659dc1661"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hsb/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hsb/firefox-77.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "197ea2000df14ad17191e2e7eaf54bf7bd1df21fbd25c0e18b200d2c43686c4e256be329f57254422a8e156917ea3bf312a38e332b72596b5b93b97f61319be2"; + sha512 = "b591a29c05f751374fbcf9c8557d208842ee26eb27ec0be766fa1f5c608c4eac7311e667f27f95bddb4d55b984d1975533e4c6d3267c69130ec21ddf189e84ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hu/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hu/firefox-77.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "ce3b86d39f27f1a5f2287cb88bb45be0b70ca8adf7e814e3fd5191fd41ab7e33c427d8ee0d4f5c7c5b279e2079e318239aa3485771bd2f211c9f1ae2e654fc5f"; + sha512 = "cd5f400c8e66e201f34155450eadf6d920327a19e87f0d0d1f7728c481c03588268b7711c865a011a207287ba16ada555b6d370badb28ee3ea2b469a76f0a03a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hy-AM/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hy-AM/firefox-77.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "022053cf588d2f7aebb564342068d4bf3763dde50f3bbcf433dd2d7e5d90ecb134f9302b44f5bdcc84f56e74c7c965555e931ac7b6d85ce58dafe838026a91b6"; + sha512 = "f08d7c0d8db0cfefad662eece31ef9d23de333f88aac225960bffd20a9de4bdeb4f2c9835be7351e20615f24024861231a79ab7ee598caa83dde88e810d973f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ia/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ia/firefox-77.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "bd57679165653b1557569d20eaa3ca83011e5704b76e3f29730e91d2c7a5fb553ab3563a1f26d38100ff8330d7efbbd133e959c4ae5c534da2e0888dac12ca5d"; + sha512 = "b5bc06630095041dffff149743d7dd43fe0d4c698f514f2f91ec0d8dea62273501df4a304903dd96532e9fc1756a8330f052a5833e331bb39478397dca5fe7b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/id/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/id/firefox-77.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "72a391de2d665db794e5624f341245a85a85c45d8d2f3c71bcf526b273bbf1a06cdfca5e9d45ec05627570ee496e0899fd7756066f6f40a86df088c4e5025ac2"; + sha512 = "2960c0551aadd142c5fac2e99b327be4393bc2e5515d3c67cca617cdbbf6dac8e20898d124960420a8804bc7e1c61a8bc3de715fe43ff7c5a9dba62d515a4e10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/is/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/is/firefox-77.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "8707e9ea8665b0f2f773c98b7c457c00c99528676afaebd56570fea1460b11ac016ca257f10397e447581a3a8966db671bf33634255c015104c8435c067fbce3"; + sha512 = "ca9be0a8d2ed5cbaa3228de5d5cbc4ed6a0b14c5bf5f1e978e28fa1840c00d3cb32334f24cd9846e9aacbd61e04f79949f5271d061d62b5654a44e95f813b397"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/it/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/it/firefox-77.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "10d74b74ca47e406919ac9589937ecadc55b637678f895d6bb3700aa072c261416591378845fcc2f032755da08a4e996c726fa1694b18883feb9fb90a36ab71e"; + sha512 = "20259f0b35d85a75a90182851cb57f33b9e043e358a2b80e9d3e4fc5e6b0f3ce8bfffd9dca4f574304d66070f307c3832647d4829169202b119a998cf969ef39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ja/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ja/firefox-77.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "9d7d45b0e1ef893145bce37a137e648b6292febbb08e66a0f0e8b6e9765e19ed3e864483c3892d327f3c75a4f73592a5cb2957ff6c17b20d19bf18179df5b083"; + sha512 = "41234ac1f73c3f93f61bb6f1dda395d7e6b969627b86fe36f93f33353c1b28b4f9302014ad7cde6b3e8df2f84b3eaf0bb75c6df884de0a9a77ed2d133beef863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ka/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ka/firefox-77.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "22730ebd0eec5fe1c9f993c8964c81b31d2bce1b1b7ba901c3a7911d9544659e459fdd19024bb551169d17c9430e15a92c039969379da28a49db2f0b04d799c4"; + sha512 = "be9130cd5835cb103c3149dc53dc325c54c1cc5f5006cbf3598314be2022c1f51928529cf3218052abc5f7f6f649e862f69ccb5b39ab5053141e231e56113ba1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kab/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/kab/firefox-77.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "e7455deffe566f95239e6b1b6eb5a4b20d849ff9f0fa26518d993581b5e76975e41a5bdb54f69be7ff182437ceca868779b67c6a6c118155569dd8792793979e"; + sha512 = "75d15e95416f3f61e49164b7be43f9335049f62f8350cb4abcbe3c7df6848a124ff5b5e43f81a4eb2f492ad3a61ab1c0979083d14998b684b2ba8988c94d6b57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kk/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/kk/firefox-77.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "56e36532e5babf3682edf5f278b971897cbd4854b0864dde5aedffa6a7828048557dee5992f9eabdfdb67c2054abc0dc2e5d0df8ec5882b07d8b266183177e06"; + sha512 = "df7ecfd04df63351d35425f74bcd5b0b342302b6c7b24deb35394aff9ed3f025ea9ad1c1147d46a789a2a11d8dda924c15584ee826819fb4b1fb0509aa71cc9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/km/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/km/firefox-77.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "6d1ef5fb7b555d667bc1ced25b7ef49f8832b9c077b113db79ff8509d845d693af33bcccf4039805fc0c69293139a22f24ea3294706097ebde859cd0f9aae8bb"; + sha512 = "811876b5a4d070aba73426b2da43ffa5e9f9beb1a4ca37ecfb5e058100c60d3455e6284e9a71d5ae58af8cb9fe9e3e0703847ffb16fd963b4eb1410a3921f260"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kn/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/kn/firefox-77.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "04626f922214d666f1da224b2ba52960f1697ff76a0b40f92718c536eb07de6b319700566a9c3d702e50b137d54b7a75af474bdf56d39bf80165b8430b636944"; + sha512 = "8c195accc9adbe3662abf62435d3b42ae4e2affcc41cefbb8f5a702ef75ad8566cab07eead40869118ef9164fb6529e1b4203970b908ed7d3f0cf43190049b2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ko/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ko/firefox-77.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "e83f42c7c24b5a0536510ee736114d8e8ab6c6393ce63ca9e2f9d0e0216831b192781d0617e9793c6a8b687429275eafa6f84a8839900858412abff751256a4f"; + sha512 = "2c571a931e88a49e4c977728bfe51a2008d4c384aae55b759dea665bf2810e5929a693f633c82c5ee26e1236cdcbc003a9a39e0e01ac46db71c9bcc20eb8d17c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lij/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/lij/firefox-77.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "524261eaf2fd311f92d85df46459bba17b06ca4e1a61a14453c9edbf37c31b1de2d781d466812c250353546bbde2044c79626840297c76a3986fc6ef869db863"; + sha512 = "d624ab2b73c03157d0559a3a41a7a50f985364b8b2c03466f949d2cd212d206bb39957eed9ea769796f4091d7644cf7191fdd0881eb8101e2cb8944923c677ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lt/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/lt/firefox-77.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "f9c0665c4f4fa6f4a8f0fcc02b92c88d0c9eefcc7b018dd54c605c6b0f024282e25645ddf14cb2bc82827f7c4c8191a83c38d4d749af45db07bb81df99ec6d44"; + sha512 = "72607d7201c562103dd241f18cdc2b681fcd5d28302f5afcf9e03f8aded2339a88e2b8c2b81fffdad5e10bfef94fe39810116d61a415f9625d0a48c794078bd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lv/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/lv/firefox-77.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "b89f91a5223a2431ea272115b18fba29491d60ab5e0a69af4a1152644596b477876a7c8109ba08c5210b782ad11ddd2b65c775a4fe8cba1126b21cf31e31d1e9"; + sha512 = "f928e22f29e46bd9405f5d2bc902c82093ad8073d8f6ea52af20c93805b0c7b5523f489f9140baae1b04b015b7c185ba27398ca857b00c171dce32f38ea0d706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/mk/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/mk/firefox-77.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f10771c9b2f8634259b7252488e4fd3f9b249b33ab59ce9a02c77d0c4cdc5c567222a91271d4cf3949decd86602613e9fcf9e5e8a403f91255ad8a69bf2351dc"; + sha512 = "f6c7bcda5da5d3315a0a5a47d7a0b9ec0d4a6d4b0daf8fc11d41a8a8376fa05607889d108d38f3a6085c0f9cfdde86a6486993f72f44822a75a97b1b9dbfe185"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/mr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/mr/firefox-77.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "49bf1846a330c4d43d554f048bc1c5061c1059d62c57ffa224d19b3b4b2fdc806be73e6bea8409763be182b37ab6a1243652c62f5f3e48a36c3443f509a06c56"; + sha512 = "8a41b844c5faf640f78615593343dee0bde8dfc2c20977b80a6e9de37fbe10e997345c801b025e4eb79627aac27a92169e0c332e7595715227b2d3015b2c9b3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ms/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ms/firefox-77.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "018622ef6cec81de014191bf94f88aa1a7ce732324f70a1524e3866e5500ee93dc6ac48dff4603b2f86b909301ebd2440ab87bf976cf041f6f8ecc4bc7da25fc"; + sha512 = "866daf16e535cf9e404a788c8b792c8cbb391c43912738d7eafa723c5e6eaee7290d94c39324708533b4c8514391a0eabd62626029ee7591934e5ff6abd72969"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/my/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/my/firefox-77.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "24685648158e9da5e74bba611884c3d260e7bad4eb3b6b2e70cf57f15d505b87a7886868e88bfaf440f03f37f7da04fb6fcaa5947ac6ecb62a987b24e0be5759"; + sha512 = "94ba7fa3a0cb791daaeaaf9998b0c574759f7afcafcd388b0b5aeb9bb1ce97e36671378f0c56c3d5120872ab2ca48933b2a304f3ef3e194a77741c492e8e75bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nb-NO/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/nb-NO/firefox-77.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "4fd040d08c704cbcade0a290020d591fc265bcbf63467f93c58603a3f96af06cb3b38d03aae5a32b4b78fe2c4f89ef81112a69bf539fa052b721f549423b42d9"; + sha512 = "c46ada870f940387fa6bff044176aa59f3fb376a8d8b1df1715f6abbe3bf87f932a49e53f2c4bde967bdc04c930fa2e426f7c4f66c22c64353be68220d9ed94a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ne-NP/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ne-NP/firefox-77.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "0708208411de209aad6a692dc1b867011d589f2fe1e60dbb5c8448f96735d811aca6a444f7a3ae2d93a2953965b57a728e3af1b2a31ff8c86d1941a21ac2147a"; + sha512 = "005aac3f43e0104b284f1805062eea457e81e8b29940b8c034f99de7e07d38dcbf9077d62a1c44a1f2dccd65258b1346889e08b7736d9fc983f03df788fd5e2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/nl/firefox-77.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "2c6df617fe9e4c3ba1940aa86e313fa4a5e64db98f4df9abdcef2a5e7832e8586e939646e435c9725e5b97ec80da0f987b620a78faaf445c374a46cdda862f23"; + sha512 = "9d00c7ebf4589615afffddf6a33f0e75172059fa3e9ccd56d3fe720b01c521fa30a88217b77cb2ebc37b088ce69ad280488da6ab53525170cb1fafba64816235"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nn-NO/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/nn-NO/firefox-77.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5f02a673edacd9e9e9171c7324b3b45974bc5374fc5a05835a450b6aad1219dc76ee50dd4084243523fc3e10e7b65a51f33e33009f4393f790a9a8430442d87f"; + sha512 = "5a9ff27a1355497d57056826ea0ba465d9f10fe0112628634267b262b4bdaa07b0133fbacb8a5644063cacbd0d59526a09a6b98caef78d25c39173934445432d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/oc/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/oc/firefox-77.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "cf24d386d8ad5a927e86929d053eebaf03be667bee4a4d0a85a76b6030e85f254b8e9b14091cb17ce3082890affa2c75ae2c1c0da8e007fed5189c9c2fb3b95a"; + sha512 = "02e1519ec4097a990325cdcc2e13e70c16b25febb466d9d06db64b8b0c689c7246546d0666a71003a533d73d0b73b472aa8312d9bc59463dffde979618570ef8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pa-IN/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/pa-IN/firefox-77.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "1a8f07e70425bc65552fa82a16eb4009e036de60a6b84aacf7a4d47c2763b00b116f61fb87aa2a5dc28d2e09a82dc3621470b5589b3fba449e2eadf2996686aa"; + sha512 = "9f7218eeb5abe8f2196b2a43cc24a0cf6cd13dcf8801f7b57100336a90550bce23579dac36353fdefe542714e67bdb86102de734ef74e4ccd29a55c8f79a2689"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/pl/firefox-77.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "ba8dcd5ad68f8506d4c637be831365fe230209ef58640da8bfec20cde9447daab678229e0a82931c022aa0c6fecdd0e405e92a4bfd51d7627235b689aa78c555"; + sha512 = "d986bfcc489a89a9f49defd9383904043d36d4b29b02715186977cd60add217845dd1785fb457228c71ae02243d10a110b563f18fe5352e68e315ffa8290848a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pt-BR/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/pt-BR/firefox-77.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "fa1f67341221a907f24ce2953fd75a0003c04540a7673173fdc333081c82c24e68c0fcaa85e10264435a9540e356e94f0b4d5b38d892821bd307530ee10f9b7a"; + sha512 = "cfb4d9510ec5e35d25d53302e553c9a85f8eea4120a236dffc5f2350b70868016b852bb1d43eddcc03b7dc9593f8f76e133fc8329c000f315f68f2e4ae5e3201"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pt-PT/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/pt-PT/firefox-77.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "c282b71b30ee4f2f67d98551eaeb1700d2867e8ae1f19dad417f8774b8a91db63ecc14c37712910b7476e837c4c23f4871a20d2afe37f61ba4ba0ca4b1684569"; + sha512 = "335fa2e31e66f0ee0323a50154dcbfdb1516b8376a587f0097e40c51c93e3c019de3e1c4af19cbeb4f57c1b736703b82dd63af91e53c2af5532eac42d80fd800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/rm/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/rm/firefox-77.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "70cd918ccbeade126f36dee76600f7c6e78ec3291a12e6d60f684dbf5fba322bb7ab847cda9f101af5b48d9b0374573e8f6295dd8683ff3acf9a89512117d054"; + sha512 = "f7f06e4ad2f0f01f398afb5e95c4d88e6c045d57c86d7e004aac3bc79c29043853aeeb4a6162fe004ebcdd7278055a19f6c25d60887ed451905ec4e376eed175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ro/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ro/firefox-77.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "acf9a4914255bdde374ecdd77b39190c945621c51ab13b2d9e1e8b1655df593c6c7e174113d89e8b1afd223e6a0f63560ef4d991706d5f23db35a939ddf793da"; + sha512 = "4017ef08f0f1d7fb82bd9b7afa72a617a3f781ef6296b97b9c351528d8107523df5c2dac5aa1ca112cf6e6b5aaea818195f3458cbd20b9f0cf88b3acf09699f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ru/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ru/firefox-77.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "9457048e428958b55ae221471cfb2874ca16ea9c1e34a33d538b9964e6ed77711283207106814f6d18ab73f8c690e6c20b2c84d361242b228cc92c7ddb675a27"; + sha512 = "7aa2ade09571ea44e08b12f2c758e56fa66eac8cbd49d90c28abad04b99f9fe005eaa04f5b6b238cdf56cd7a59ca388ff769c862310dff0a41d952d35f1cc7a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/si/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/si/firefox-77.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "897b488d3ba0592b902f2cdc4eeb2f454b9b6f67fb5e4c583f5f49fb062483ce1d30e64f6273894c698406f8be7dd8a2af02a67e8d9bf47f8d30a572fb18e7c9"; + sha512 = "668df6d1741a9d300e975d1d25b42931a7eb3c2883c33c4ce1a585ed7a065a589ff569732e1ee04ef8f25c84d69ec3458f92263aaa5b2a36fa6da8a1ccacaffd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sk/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sk/firefox-77.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "2847545533829f45c22b85368c5fe262e2a43cef0e5d480a540ca47f0dacc8003b8e155b11098944c7012b03feb8ddca216649f645c46da0975183f42580e285"; + sha512 = "e295e69e84a768ba070f087aecf3cf041e67bc297f144af5eed9a75758e0d322f730b797601fa0733b1b9260f5d3225c899ccd80a3861fdc77ab1ce9179dc589"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sl/firefox-77.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "9b0223b409774a62216c97e522696700dd95b65e1755d889d58137602fe4302d8f5280464636d94c97cfdde8c56e49492005e487730b591d19bc947271754e1e"; + sha512 = "63dd33ca7ce582b4f3284e936f54469a4c31ae1006dcd95ec5952dc4d97b2d524a91adfebc041e8a7b9358f5af847a6fb6af35b41af744c2701d408f64d181d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/son/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/son/firefox-77.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "097ff1df64b7ef62eee3a29672447c42c46dc23741ebe87365c4d41159052ba3560f7a10956dbae6b67daaf80607600d2241dd997573b8ef8c54fa94f064e629"; + sha512 = "801bbdd3da93480dedcc13589c77dd2bebed151df9ff468e8d9d2358f69fb57c22f8916a9581e460ce4fefed6bff651126f92ca588392169556444c21a4aaf42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sq/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sq/firefox-77.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "8a76a933f261708504fb637a93bf4d600514558f08832ceae8db23a404e5d911ef23803436e5513a4b7e4cb85f536e64c5ed801457ad2e1f9c559dfd1f8be807"; + sha512 = "4eff5f67eaededa77e962609ef7da1af2b10f5510f3d354d5d8065957aec115d827da0c0ea056d02b5d7c11f05db7e4b91cfdd6bb0f879ab92f6fe84a1e137a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sr/firefox-77.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "bf7d631608e91989a8cb63cc07b8e253cc2c764e9f712eb113c7b735bbe2da04ddcc91d43fc418eb208a75f4027256cfb10d15c21e82b7e3eea096ce6fce9a5a"; + sha512 = "d688aa2911bd7925f6be1307bfad521ac29364f047b8c7d683328b95b871a7ca0f382c103babffd518f607eea0298177d6ce145511271f3c92b8e2de81da06e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sv-SE/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sv-SE/firefox-77.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "cfec4b5942c193b37e881569de1d40907d44b7ffdd6a08fdc3dc44ad27151427de0e368a08e4888d9248e07fda8de54f1b7d1eb3e106f0cb41c7fa1a8e4acb10"; + sha512 = "27fad5bd1e0a2b2a06ff48c90049ed2d03fe8c463ce5a5a5b5a83a24add6d1fb72ec83d02f4c9e2e741c3d43b86e9fd3a821cb6d158d3fc940fadcac9d040061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ta/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ta/firefox-77.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "8f487289fff43075239d79d1d4b8b0e9e7a645a8dca26eff58ec32e534a870b5b67232ea6d43dc58b1b4bae9be8af65793f185e4b5747d9c374fe7802b92c9b4"; + sha512 = "1dc96ca10fdedd37369037126c48940c060ec1b0238cb4c592db79b3154c8e1ed167152ebbd33bd7375b241776109222c1c3e886dacf4f885319eeeb7e33ee8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/te/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/te/firefox-77.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "a3ed83d4c34fe6d24c2d33c490d6d2de6fe56382bb87807f530bef967c25bfb9a00a1958ca13f2936357e3f1d75b029dd2bb89a13171574bc022f7da8b4f49f6"; + sha512 = "4c203815b896aec1a94416ae2baf96dda2c0c035da00e592ed16eadb9b729710d5cca26cd0d03fc654576b9458b4c2fc50be159164e6ef1f1fddf90609221eb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/th/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/th/firefox-77.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "54c9f36ff4f00f1bfa3f947930988ce6985bf4e2682613a8368ab60d07abd02d3171cd2457987b2bcdd7d0929003580af9e4683b7e0f529b1ff3661004aafff7"; + sha512 = "22ae877469cd895afd487175ebf04c6a10b42cd7b408e5dcb352143e457690bc13561395abe15db0bb6594074f2298609fc381d2137c5e1aef2af273f17e2489"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/tl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/tl/firefox-77.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "6dd5f5908e9ca66b7ab9e132dd6db3c5c2ea2e28eb9de211ceb6d2736746fcd50408cd327f098ffe1beb57199af6b60827bc11614c4c781d109ff315ccf9d7c8"; + sha512 = "10d60e3389f43f1206a3eb1252897d0a047cb14272f8408c61f34eaeb227966e8e43f9fbb92d246bbffde77fd139e5354fd2abdf0abc91b8631dbbb64635b549"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/tr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/tr/firefox-77.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "0222ab139a87a195fcc4489a2d2b1024e95b4b76d4ffd8c63408ab3f4c9ea0e4be019a57e31ef3eee3216fb0217c01cd92cbab9ea33b2d7f0a4660326dd0b8ce"; + sha512 = "c17c8ae0e97b130ee437752410eec9d2bbacc84aa2e5f13e0c52147d7540fe6f76e91a01b0c94aa81b1a67f2a7d8ac29fe9e21197b659a6840c3c9933603c119"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/trs/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/trs/firefox-77.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "a50634af2bb7d9cdd8ae8fd268b2bd5f24bbe68e7bfcb810e51921a56db7f831e84e73f93001a12f83a269a27df956df03e70aaf6231925b08399bc54aa71de7"; + sha512 = "df664c21640b9d36c487030a5db3f83a2947f375a7bbea3fef9a86add22ebe23f482091cff6205ef22e8544dacad43345302a7b34f0a4729a8da6670ee9ec9cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/uk/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/uk/firefox-77.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "9e32876027449c3b145cf7088b5b9bf7d941d3086f6d1da1dd13f3f06138b1c7c375dd7561d9342dd7a1aad1adae6da3a2f354927be1318eb79703753dbb0d00"; + sha512 = "68f6c6a804b40441cd5bccab2e925864ae8642dd2be6433e215e1a786043b50eebb8e00299d47c19d5b3c52a86c8a0877a511f3142299b906ea2bf4bcd92099f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ur/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ur/firefox-77.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "f4331e2c47373a612083697f4a693d7c05edda3f08518642617aa274e735f7a64ac49f28a0c1681addfe488107367377757b12dedae49a14a4752ca726d0fe02"; + sha512 = "05751d956fe5c5d3662c722bf97af4056e32daaff5b704e0f514a16529d8110ffb6caa4207747745b9c46bdaabe51be658b15b54168fea4f0b27287ba7ae9173"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/uz/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/uz/firefox-77.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "ba7a39e9f8537bb5fff9253d01b3fb2a0c815c3d93fda024d1da6dffcaf313e7c75068c302887355b0e1b498157917be5f290fe81a2c30f8303c33ae2f23d9fe"; + sha512 = "bbc479208f90b22da1a8cc154870b1b2eaaed25395525820c5add437186c7e3a391545f5efef0d1b11e6ff82d5cb7ba85d1a0872e919cd681eca7abf92aefb92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/vi/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/vi/firefox-77.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "4382a78302dac11f2ec626627c65c528d756364b8332c0124cbfd45ce9ae226d4b42eddf723e306a1b1e0b7bb3fe70c9efd3019f91993ac2e140492900fc0ab0"; + sha512 = "9414e3c51efde79c1d959036d6365416cb421d0cf37bc5e2fbfadf7673d5bd87d506e0ee1914949292c4cdb9061dc93ec50c405eff5cbba8bfe5f1870afb4948"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/xh/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/xh/firefox-77.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "b23a1f3b7fa906fd6dc25638d8cafdf3adfe63346fdcdcf878b9f0f98c8803631fa608fd75086aa7808fa0d4730ea7a89998e2d695b2d1f140a178f14294d318"; + sha512 = "61c8b31b28f406eb63688258757ba072065eccc91cf0195f03721cb774ac3e5d5aca0fdba27e09933be8e4106e30ba39ba4cdcfa85d3bda1a8e976695a3e47e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/zh-CN/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/zh-CN/firefox-77.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "b73405a8872f079f5f69cbd9fd69aa60e614a0e22f1f933be9a8a9e7312fca362549f57af17629548694e92679c763786978fb572faf4f9f6cb72d64b2661d60"; + sha512 = "4fc2046f4f2cce47c27876cb63a7b07024b639e43cd01c771bf01ffbbaa70943dab0a17e08ecf63d47b66416a7fbf89cd37cb06dd0eb5d589f0e58168632d6ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/zh-TW/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/zh-TW/firefox-77.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "0069f82c583d88e9630fcb70c481969ada68a7ce919c4f5ab12ee442ca77f69d15179a46e5f2e7850a6686bcd6cd896f2e03163ddaa7e88affe6d62856d1fde6"; + sha512 = "5eaca5f3d81588547f0df7929f8591527c2a331d52136b23aca547e7d97b711ef45d1b5309d63b08eef44897fb9ba47d91b0b94f077856dbc5e6db3bb62ae441"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ach/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ach/firefox-77.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "1e81c77813d8f489ca2d2d75dcf74ef1085ddb367df885c2d25cc7051d759f26685da89860f67920a49ae4331762be74fbd2293bc2a6e0549187ed8fde643d4c"; + sha512 = "10723c4bfb26d00637f4e190330bcce602b80b4693c4321b7fd7cfa58cf7ee33d8829c0afd23c17c836ef82f03d5c7da98695248bf932264697015a2949a3576"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/af/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/af/firefox-77.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a753254f0e302af7aea86499c1b03cec34a83691eff48231840a20c0afff1c595fab893d804b83aa0964eb5e570185102a701d31c668764d58c4715b3d0feeea"; + sha512 = "276a26621d0fb37f9c57bb5de992a3213cfc97ddf891b6fbec331722455221d71b1dbe6f5ec63cbb552a1dd0addc2ca8549451facd83d9b3b3b5d88fc0e5537c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/an/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/an/firefox-77.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "e1fa38d89cdc7d7c9a01f8de5ee19316b1ddbdce1f4f868e8ce1bbbf22e68b8f741246a5ba4f2a4e67c959b9575c73acd7b88e918e3be5fa285dc5ed42e9af61"; + sha512 = "2cd26f8507a49676c32fb7c9c8ce43a9df082a965d59340ec794f11e85077f126a2052c86ab78edc6087a1fbbed3e58e773930f20a5e3e69fece29df0931aa1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ar/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ar/firefox-77.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "10270f9783b09b09fd7f43b8f3c4196d332644820796b097ca219819e81bd5fe23ffcd4df988d3f2f3d59fd005e38feece57b7dedb84a78aac6af7965e73421c"; + sha512 = "80a4fa4279f0121fddc956ebec61b9ad2fc4417f8e41461517e50fbbd6d44278640590e4d4ae383a3e1d732382f037ed7bcbfe599fb08ab21a0d98b52f32d0f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ast/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ast/firefox-77.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "1df6b8b479fe391bd128cd9b175ddc233b19b61b3f538ee75ba7728a4b59e4cf1ec09bd9576f82df66e89048b62ebd9cd2206038a0387492cf7b1994c36d84b2"; + sha512 = "68392bec35e5ae6913311c7f6187d916dee6e3702663e0812a557e331a5cc4f30cf8cd6555abdf132ae7d638100ddbcd485bdbbe1519693ba34d607e32c361e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/az/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/az/firefox-77.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "81305694cb1601b45d09aedb7bf6c0ecdda500c95209abaa00feb2cd2aaa1f5d86f5bb18933f00cbb5a6b676710db4e96495b17141cc62dea06c26483d90976f"; + sha512 = "e15dda365436f32ce3b553f63e459e5d32c5a00aa3b4413899c9028e0b18d1a575c33747cd621d1b8e08a84a77ee2ead5c5fdd8b4077055dbe96cbf2d223cb05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/be/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/be/firefox-77.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "13e5c72791ccc0ee12844d8a9ffdb5ac60a2a9d79bb3f25818f4f1b3b606137b5eb3c8911f81d654028cef48a00d9cf10841465c7fe0304000357c62d964ec44"; + sha512 = "46dc546bf28e57f7d2fd462733eb7486f88d4198159e77873a5b566590fa1b81db8ef4149dffcf60cbc6aad1529be11b8eaf5aa4fc410600a4a1eff3b576f0e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bg/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/bg/firefox-77.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "06a1ba2fc944a15375029ff12ed9f566ccf6a795ea8e63743be8084c7e11004d72693c65b8a330cf945a530fde5298c69c83a0f549edca8fa50d85a904ee744f"; + sha512 = "f44fbeb1b25249a28a9fd77dda908c3247f85f788ba22dc131155e6c21d80450975687e546a63291832974555745e29bc8b8b177c338bf911c212125a10f95c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bn/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/bn/firefox-77.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "4b4c8871d5da372ddd15ac410ecfae08385a74b68e142b64e4e463d58b1e60583025f3855375b5adffb8a218839f86cf538a96dd285dabde96f8695af2ed1a4d"; + sha512 = "b2fdfb72aede045bbdf03feeb38d0f8530edbf6f2e9ecd9723b481365eaf0827e879a38136e6d72efb666138403205c13cdb10a1018e5d255a847d8fda4a2507"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/br/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/br/firefox-77.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "e33d927f88d4e0a67b28f27ed32696cadba6241fd3bb48800e68248173bcd7085adfd3dd3700c8d4ddf5be3df93403e20e9c0d57db9ff5d6a141ed58b74c26b8"; + sha512 = "68cd1a7eaabab81400c78e1fa36850dd84fae8f2b05d5c57a4769beb7948d050b6cdb5b4b6928afa3a70ab9cd97e37214d67ccc5cebf62d09b7c1194ff410b24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bs/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/bs/firefox-77.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "680587ff748248a665751f004b02d0b0d4e28f90f672141961d47cff6239823431b863e8ba702cad8f43fa70b295ad69b47954d2abe2fcec423e68f704fddc6c"; + sha512 = "4fa4d41a85e4746e383bb514aab8222a9c0aa4ebb1779009a50e891c672e6a1002ba454ed24d7d4fc4f0f79ca53a985ff56981acb2845762085570bed93da3f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ca-valencia/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ca-valencia/firefox-77.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "3f740ce2af373a3154372796edc4e85f8bf87b83cf4895328dcdb357aa4214e7711cdacbed596c4d7a1ce1ccc16bfba32fdf2d38749f3144faf747d05e76e208"; + sha512 = "23b3a60a34fdc9dc31e54141e5f62d21fc118b9932ed5b0eef6614535174c107b113bbcb3c42a940fcf6a86d1e734d5478dcf840f882cad6a772c6006c8944c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ca/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ca/firefox-77.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ea9b71eee4f6e967753acf4e9f0a4014eeadadc6d1bcc5fad11a5975b778f92cade729338636d86a783ca08b0363942d7d9b7e4ad65fc3186760189ead9bf0ae"; + sha512 = "227cbe52a302f4030fe610ba816c70c5051c58732964fbe64462b62e879df0e35069b0a5d5a862bed87c21f36387fa43bdb82db827fe58b1e1d80c966f0ccf5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cak/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/cak/firefox-77.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "bab4ceb14749b67877a99b96f47aa7a9d6d65281e78fc416d3bc3e5296ba2133d7548ccfd4ab32637c976d178fc911f55b6acc60dc6658b4193e1c6146bb641d"; + sha512 = "5a615b7de8caefaab8f4f75401b13f40f3cc4ea23404f9a998979402789e8b2493c1cdb88b56a450b3a0bdc075a42722d963c3f65241ed3b690398d0d71dc196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cs/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/cs/firefox-77.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e33adfe91886dc66f09cce26dc33ea26cdf432915674541a8fbde09cb41d2b14c0ebb3c41683cb1c29908dd652c83c92bacea3b8cab9bb3e8d9d6010a19f9646"; + sha512 = "75f06c1697372e0432e8c6e9691497e0cd328ed7e050a0bdf76acd3513328994d734c4ebddd923e2d19b5a83142c4570e16f3079fa6e0406ac83de25e3fe6e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cy/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/cy/firefox-77.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "1c5b5d518914fb69b6a978fbb8530589c0aa117da1f2f7398696fe29c6177f0ee932f88bfabeab049bdc80d6e457835a492853ee9095b10f12b68172004a2b73"; + sha512 = "7636a99636e77e4a6b6ea20c6d73eefc11c91691d0418d75a3fa7033d844c8ab652cc5dd1caa1c574dbf4c1a143ed738c08346af4ff4323493aca461fa256b44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/da/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/da/firefox-77.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "90d385bf3faaea5ec6884c4042a72e6a23c68f1454309bc933670d0fed7a5aac2210ab4c6b23755d883fed385ae0f11639a932c2540687b219aa009067a3ab89"; + sha512 = "0a591e75f79f196dc45630b32e237e8b28cc2ae8463ababfb36b1fa9ae4f271eb53d7cf31834de8ebc0e453b89310e5789996add2f57d0035d1d9a80369e6ae6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/de/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/de/firefox-77.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "7fbc20a9cef66a6760fa314f2d074d2c597b420fee45fbc8c61a85f963130564e18d47a97833299283faf5c959d12f70e4f99089dabcbc3d83f3bfbefaec0f63"; + sha512 = "fcbfe21676ccda69d67f945260ec5a62a7513b5d4c4a51dadd252d083860f2b0d2ca0882714af55485a0e11b36a0059c87db682032901506973ca54a8e341c38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/dsb/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/dsb/firefox-77.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "2dc3dde5159c64b61a4599a0ee2aaf3e4d9e71d7a3913e086c0c187cca48e8bbaebf7d4253dab7a3cb4fbce55a1119e3f4c30026671b92b70059b8b3256e72db"; + sha512 = "76e8200017f7a89b0418ff555ef8028e38012fa520ca2fa83239290eebfbf4c1e063d42bbe288e6d32daf9dd27d463cc6fde2d8c60e7a3b8ab2cd442742da450"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/el/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/el/firefox-77.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "73bfdcc5482d5793c0c5673738ae08cb6a2187e61d8ee057ef89f4ceb801bfeec48b8c0a9f48bdd996bca8ae4a232afc61c6539a1c22c7bf96d06180364cecc6"; + sha512 = "73f5a0f278556b0c99eb479407401f19ce228cfef164ab1cfc61c766052beac10ad9ca3d8bb2e9684d31db75b764572203ad22682f48af3db9d74b3b2c7e327d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-CA/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/en-CA/firefox-77.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "baf1441e6f6ce7a31ce5ff12b600b61068bdbb9beebfe74f6c9b97ed2533ec734bc34b702caa9e9c59bb4563bfdd64c2612151793067cef3ffa1fb0ada312e28"; + sha512 = "51d76ddee014df74e45fcf960fbcf61aff4500fbd86d4ce99b9f52223955af2b7f81bf6c66501085460ec759471a8ea45d45b09295d3be8f9d03a3b55d788570"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-GB/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/en-GB/firefox-77.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "60b276043c2ec3456b6b06acd2edf6f3df5149824d20c33974f3ac77fa0ef81a03f99f337add0209bb88b390fbf4dec08a30da207ad72ef91c9a89cd36e4452d"; + sha512 = "93aa0d761f68c2b5b6c387284418795a77491d5f880d3cc0fa9ccdea2971563326545fc9dbb1f5ca0bae19e7199553c757320706e95afb2b77c00c2e06fba911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-US/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/en-US/firefox-77.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "26eae1d8a6f9e988695d59d418749fde988e48514d7c183039ee998b400f480dae16e9d5a590ff4364954e57a4008e7104cece212fa81fe73666d2bf3f0c0020"; + sha512 = "b3da650b9da5df10c611aeb5e08a6f96be431a85edc0c3768221faabfc3b302bb23677b33527d23d9df37aac7b83daf869f4a373d461893a9be83d1b74937e87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/eo/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/eo/firefox-77.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "55aee2c68a1cb6b7e374f2622c8aa30a8f26e14ea0f0119d97bbe6e807c15c7df94ec74c0f31ef071ea7b112c3bd8ee501c7d7b33ab5eae9a8126b2fc9673047"; + sha512 = "c089b6425c683a1a75956fe50be90e9027693eb4bf3dd7b19efcfedcae36cf8c989898b5d6e69f15810be0a2485a353fd0d6a1ef9041e50ac62888769e9187cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-AR/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/es-AR/firefox-77.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "dbd5aa229d0123a26290330df078967bff4d0484bcdcc3eb499a7cdc82176b49a2362a0ab08e2b55286141b25c8cd4970308cf48a1143a5af788eced5b84b83b"; + sha512 = "369fe08d54a48e9d6c5260b03c4af124ab43676ba46d96eac08f71b4bcd3a9776563e6bebf37ed523828463735792f6a160e222cba912cea9020a84b92136d31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-CL/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/es-CL/firefox-77.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "5082bef600a311f560daa09b31945961766a0ec63ebf9f38a0f0e76560fca2a99594c1f26fd0b57a2dca0c94d1991a91501ee3e931740e59010c93d46d3e8a67"; + sha512 = "dc9f850c487209b414b77d9bbebfbf3c32a8ee5644dbb2a9a119fb0f9da6d3d711a3783a4151dbf3036b9f94c28273802893add63238ffffdbf77cf213686c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-ES/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/es-ES/firefox-77.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "87ef420353069862cd539aa8e53f93f50330e0c68bfa4a56913e9245bd4a972bcd271a7c159218f9ffb78c9d9be3046206f20fad4faae3d76e4e9687530ea6b8"; + sha512 = "331a100f8b71ad1e33e436e0d03c37438e0c7dfaad9f280d627dd02c2c28e28756d7856d36e407b84c254ca45b88a761e9a940955a8aa52c0c558fb98b4e6bc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-MX/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/es-MX/firefox-77.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d02362e93a290f34063fdfa7af8fea71a6cb92b964b872bfac8f5b5665dc6ce9cde7a38a445de1074fa8673cc2c0243af69e2663542c5c2fb8e53f2c41518cbd"; + sha512 = "c4ce60e070214ca4901e153c3033e66cfcfe8d0ebf9c1d1e448105467b8a129e7904a3293fb3d895a6380a0e54bfd007e5d581bba4f1d2ee7ba3cd44b5117705"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/et/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/et/firefox-77.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "0064c56cf6cfc38a5eff201f16df5c9037da8089655df5c88a348ffbeaf933941d5ce99b3618293d2154774b483298b4c28616c6e175fe0f6c9124ce00bb16f9"; + sha512 = "bae0eec7d0578f8ba911f71505d803efcb8b7005e6e6ba0bc7dc36093f462c7f704c1244dddad5d38249204b553cdf8b0efeb12c235db171d98f5e2827d085eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/eu/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/eu/firefox-77.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "bf5cd434f45bd057de94bdc219f25e4da878a0be58c4a864a22961ac5677d0a679204a069220cdfb353d319d493e10d3423888999de6701e33227b1dde16e43b"; + sha512 = "821d3b331ac1bda31543c08ca678d141f640e862986da1c5b0e8c48981fe88252cacbc728b63e4552fbd83dcd086268420f63a0afad5a37ab0348e7d29828d03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fa/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/fa/firefox-77.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "402f980bbffd145e9f6f832ad4bff8c6dbb0db9a77a303ffe16c44b449668e621c2edf75e41686cc69684069efa10b7853d57ed5ee928298bad5ed27c253eed0"; + sha512 = "1ded2445623c10c5b348041935c03050eebfe1af1fcbc9ca9c2bb630a38a095408f3d09e9f4ecb9db4e06ea51d9aa139ddde8531db0072f6a57c7932fe302e80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ff/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ff/firefox-77.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "baae62b09a0a7fef88f64b43b854dc8c4ff583765338c4dd1e00db9c7717adfb3d8817c776cfc88f88ae6865d490a08bf4d0c97824ae3280835769ca04fd8c71"; + sha512 = "1f3a2d9c0c981c20f1dcabcdc5c8b6a8170a238f4381004183f8381bc1059d65d650374f03d124d22e821cb8d9bef59d59aba6ef132dec991b72af4c77f61d8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fi/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/fi/firefox-77.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "161da9aa8cd66a9f691b218f5d11cdae19fbfb04f44a77e266731afdb7202af98f165e33107af15ee6ced477b0ae07d78f91f57d14fec0e9a6de24847cc73976"; + sha512 = "8f4737e9bbdfae980faae68758906099aede135167cc99b3ee98eab85e6d9d22616e8043af7f02981ab96b885312a89869980a06fc0ddc117806b1d5f9b2d3ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/fr/firefox-77.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "150677eb9c0aafb0486dce2c846e0997f6eb1ccfb022a9ec2914628fa2affc32801fc34f0397fdade3cbe3afd1897ead515bc240043dd1cc7b879d92566a47c5"; + sha512 = "8680f38e6b9d56f3339f243e99cb5d541d6b2eb10a7210d8cd81bdc91f35dedd0de3b551e1b857b216806bda223c3a638cdd7e786d97674c5b7ea6710f669304"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fy-NL/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/fy-NL/firefox-77.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "b03e12ebeed5af0150715176e32a7da3ce20a57d227f3ef6da369f6fa27059cb23a8af0b4e165027598894c572d02e4d58e8fdb9a48b86d3bdc35385a249287f"; + sha512 = "aa34dde7faed1b86707f71fe190abde730f0ecf33351c487d1a2fdd369dd67375d122a266fb5dc2b28aba87c93663a5606c43fe3092597b04cf9adc752c3bcb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ga-IE/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ga-IE/firefox-77.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7122e4f914f5e8d42393a86e61baeecbcdf6fff646ddb38cbb2d7324a0be90d60bf609824f2dcc696c107f856a867e0ac9717fc098b1db3571bf60fb6d3b8a28"; + sha512 = "bb1988e6b4b718cc698a5de87b9f339dd28a2d552906c24fbe9d67385c70e3669eb284220f506f3afe03949be5df0178af1d13c727716e1bcc07d9020c180661"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gd/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/gd/firefox-77.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "f35b295657bbceb293cf1bb88a140d629f0b1fc654cf3f1ebcb5d9de84f40b17a9a7bc8973dc6699c4c6609e5cfbb858df52c0153ed4dcde6eff2e25c38f7ad0"; + sha512 = "57b665e7bf404a0ae8c7602b88d987ff550d66a2a72c47ad8d163d9a697cef18753dde981d46471c5276002ebc5464bae54316e595d1d2aa8a00ca07bae25d69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/gl/firefox-77.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "4a4a37fdce02108118cca5fddc2f2ebfeddb8a4fad97ef0584fb85748e09d43abe79b0d3f7b5250deeaec8ec0b2e698771100dca486831fdde09f41d8d77b093"; + sha512 = "409cec1407ab01070aa75a0234ecc82e974f00ef7391119828b1a2ab019c62b5986a15226f620bb1fb403288d9aabded3bad1226ae8ce516476929a181b0ffad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gn/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/gn/firefox-77.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "6c4969572ce922eca81344f1b05747d3935f88486082bdc64c814825af2cfdf27eac7f8f0c25edfd4d249b9f469ada0b062abd0aff02b9849c7055e40bec5b67"; + sha512 = "e2db32222279de40ae37392af9df330ab6d3bc1d1a583c93530262ad541b4d3139392a5d0043d6e9d0841fd0eaeb40c53b5e6f3f8fea762ad160888012dc7428"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gu-IN/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/gu-IN/firefox-77.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "a5d1daf151be8d23dde730945343bfd507ba29314ab8acb71e4d5e71b534eadc573eb4eec1bcae0ab0bd72735cd891b72d8d931b634680881bf65f63a4a7abab"; + sha512 = "99bb0e4244ad5c406259d627161c8abbf5dbedd664c83ecff6767656af8e4101c8d62081ded7a8cd1842d739689cb6aaee02bba593ab162dad3139d5b03ad3cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/he/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/he/firefox-77.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "87b6c4a1dfdb49bc9430d9740612d24ec9f61d74bd379caebef6d19fb3492cfd1a4c8112126ab509af1f35e3f6e10062a786a0e5397b424e057e9d13c924fd7d"; + sha512 = "ec00d7c46d50f38d0d43efe2e98d6e404398676eaee9640a4148e3cc196cb73ac62711a188d32c167c48bf048a5e0155db714172ba0bb7024dce6c2122c656ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hi-IN/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hi-IN/firefox-77.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "e2b96ab462227f70f4208b52b144d852e657edd3fc9885ba6b4217461a414a6aac6dedc206b4fc82d269c768662ce94ccc6cb3e0f096250d074b3d91ffa98c9e"; + sha512 = "e107c3042a1e9ab1896a7b98dcff5918b8b3adf35d3e50fea5847337c505d2cb4073a9a15fd2d3b4f6949615cd8b0376541e715d686388e418d5ce64c1001e0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hr/firefox-77.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "1fcaff37d60936b68a6f2e368c414c69718e114bcdcf8f71114f5e3dfea1eb2fbfc8b5e237406576daae74f8c4371d8a824d2542dcdd36221c931a86c9ea7175"; + sha512 = "cee9eb9a7b13944d2dd4c52456cc44404b2377062972eb3c9992499f3835d352567fb05560829ebd9db083f62bf9722d9c0e9610d439fb5d79c2dc120542970f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hsb/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hsb/firefox-77.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "5146346331ed881f0f85f42bb43f4b4884cdeb659b392db28f7a534c685a579405fa482ad14c6c4e20422e8e22b07f2fc35ead1f3756539dcee797fb0df8c1dd"; + sha512 = "7936c949ac42d69b573f8b6be4055cf3b4cc62a8ad7c5c060ee4be8aaf0ad1e9e3c651289dab7c159e8ab18584374023dc605629233f58d944f13ca87db574c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hu/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hu/firefox-77.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "eb043d50e735f1b99eab7cedef601aa302dce2b0270f08a9e93c1b1fa9b85da87305aa94e8db638e81dd8f6d9bed96b6c22f87928026cb042964bbb51420fff2"; + sha512 = "a68299f239c80c1346a5aa559fc5dd6f6e6dfc13f883c2e7be88c267725c837b6ca3c4dda06e5bf6c81ecd16739a1921c21bc71c3caf72944797915f452ba450"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hy-AM/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hy-AM/firefox-77.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "eb0553646d6b53a41bff160379845b0a21c28815ea523ab0de21230ce6c519b7ee07c9d97ce26f2078f3c66448dcd1c09e978bb1f748e548d1b5c2e0fe4e7f7a"; + sha512 = "a8ef4b5467d58ef6935bb4525363d38a9167a00a8ad84665b2971cae231c60706ac46618d62d183c19ca2eaaee04d0f386c845cefe6eed3a3e12dae188524f2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ia/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ia/firefox-77.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "b43efaa2e45de94e9be8b8b9bea50966b0fa089dff9e25671577c724f45d0dba502044c2da7de32cf1431a38aaa92c2e5856659fb7f1ee557e38616beb4a9c96"; + sha512 = "5c3b30a18467b416b109e2ff48e3a50c1cf10e550b22436115a44d13aaa03696443a5fee6c978e3560ada583fdd2806f3f1ec13c221dea097768b2d282d12160"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/id/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/id/firefox-77.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "5fd68752ab6309af0bbc6d523e2e251c8378ac0a6c2ba0627b37ddf7dbb1efc444901a254944f4384a6fc10ccd1909f6312c0fd7c9e700ba5f223ccdf76d30d5"; + sha512 = "bfbd86bd3eef27c2eed900c23c29a0236884b1fd4d858ee8bcdda2a071abe1d042624b31ef258f9ea415b04ff1d17e70333c6507ef2a534033f1869e742e8b82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/is/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/is/firefox-77.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "1c128e7fffc103347329cbd65037e798292d5b0e843f878ffc44d9d53c32f1d9a917acd694cb3662ba0089e79063421705f30d39e9736c88b9c439660147b949"; + sha512 = "459e4c9686952467d7e179c1b4f9f422e6445509813b0e0fba200e46468dabbefe59210a2cb218b226a6c41a333a64bc17005380be7e319015d722fa70a600fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/it/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/it/firefox-77.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "890812041bb3ab8cb0ddc6a54222fec9f4e342f9734f3c92f9d0452122cceff739eb46d92ebef5d2571509e4c7821704a64da1ec3dfe8150193a6dc5b4aa8477"; + sha512 = "6cd7c36d28e6abbcb92582b14022e56b048481cda7832b93c5dec6b0b4e38bd99de121c433eb0e90c9ebaad2bd00f681f22fadd09acfb1b669c0886544ebd8d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ja/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ja/firefox-77.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "13703e62dd8d6728553524723828cf7bd8db672febeff63324c93e300a9ed6c2f3b1919d6f4bf8f1f74164df278a0c95ac98c348531581b717ab09e921490a91"; + sha512 = "cecda310147fc3298bbdb250d4d7a5a66225dd96f1bb0317b1846049a15c47bd2b7579982dac583dd4eaa1cd8bf706e7213b0c7bbe48ca980070f413380a133e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ka/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ka/firefox-77.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "929b2e3ca70c8d9ee11405b1366faf957cde5075dec5631a49ebc724d4912291b1f3826ee01e5c90e2d68c09b2664599ed73e4f597298ffb066ff8419a8056d8"; + sha512 = "ad29814eb9cbe19061b361c23c896f8bf8cb21c67d36942a1614af74a5adcb225df20dccf3af8d34dba27036d38feb758a945cb69a66c6ad1ec0271fe1c316b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kab/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/kab/firefox-77.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "83900bd13db0731508e516bfafb5bb540a43f6b8ba9c9e2e9c0878d67e9cd8f9b6b496e5b77ccf314346ea3089f6d95c1902b9280741ac3325638e972794872a"; + sha512 = "cadd0cb80e9d00d2a4f6f5a5274d85b23eaf802874c813a87fd7464d4cf7ac528c4b2ff30446c7cb438fd1faa514c80a2576d1d6b36779ab983fac5fd6654317"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kk/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/kk/firefox-77.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "a62767e00ba2c0d522f503331c2b6eb4cc82d3abb4879711c2d9f611c8454f2cbfa5e76707e6ec6ce54df8d40f64da6ad8af2e15079ea75b3b8ec55e6273ef2f"; + sha512 = "033bdb4274c05b06b2c1fc3822a220aceb7b39bff310de6fbe2e59a097eac77a6aafcd275be690e84334ea7bf70c6bdb1a43f4bec0b82286e42db7797348ee57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/km/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/km/firefox-77.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "03a47578e51da36b51bbaa98e36927a1a5b3f216ff6ed60c337d905f414902c7638cdd361b5d8f4c29960dc93b19343b18567c7b40106f0e7e95fa941c0dae88"; + sha512 = "d028d387c7546ccba6b3001d006d0243300d770b1e255cbe02841bba759a8b4d75a55a68dc5f8a7dcc869badde9d7bd38f572e26d544444190ae05c23ff4b9c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kn/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/kn/firefox-77.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "c4cb00f4383f73c65930ff3626342cb53695ca4aaa29ec5f80400ed4d18e4dc87dc44445069c62265112980ac7a061d0839f542a792aa5d294561b201445b677"; + sha512 = "e7c17380869b5f47359bcbb82fbe6b2b16d814536218bfa1447432f0affae78d6c53e68a7ff7153e0e2ed72979c026edf6e8a9689b0cc90ff3d10919b3e06061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ko/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ko/firefox-77.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "72fc61f2429fbef846eec40e53f50bd95d3b6b728d78e2199408b052b0d85ea66fbd6d2a114cd046311f88b419eeb7447b062cc9c5824cbae572debe872656db"; + sha512 = "bda7e81ddb11dd7a197a9e6e286b3a8cc10e3c3d2a627f5c970643427a158c7615901aa05fc4da737586d5bd86eb4411a23e5830c1f6af582963f18c169eaa05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lij/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/lij/firefox-77.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9192d46b8b16129243ee2f5af47cd0f8fdf9af3ac953ae6481452cdd1f4da9ad9b75aa9c1b96416cba47dc16ca867db3135da810f32df5a33bed233a3b68f447"; + sha512 = "4a2a07e90d9ec3aa26557523c0c20d1aef34895ee06ee02dfedbb6f3d612623c23c84f10eaaeaabb35133e3f69b9545dd8720929ea04b73af8c9c3acac53901e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lt/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/lt/firefox-77.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "89a5c07f1c1b7b389bf7074feb6b7c29470bfb143b720503783c35cabb36fbd0e5c3fe31349e1004728f128db36148ad6dd07f389099fab17c8a6d078c37675d"; + sha512 = "ddccb22c9d0dac8abe9c81782293834213a53b182ae0650b7904c6cc8f5777255ef642cb442345c64a1cad96d0ec8f45ce6d6cafb0e6405474c2a8e972250254"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lv/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/lv/firefox-77.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "1bc60805513cfd6ab6d563108fecb176766e77bf10203c942ada3878d062e6a75c54129505fa63f16aeb72f4a1c6b360f7e65e8f23433d20fe134692e53f4210"; + sha512 = "86af4440803d27a5f6312b8a7dbd0d5f66fd1cf90b0e9b1cee8c4ee3b555927830a8cc3a06b6c72a66cee4e75d7e11168060d8681fa1f7c39ea2522819dc893d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/mk/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/mk/firefox-77.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "811449cc14b5bc3185c56a8ea2b640a3fdfcb60b309ae9ccb5498196677e1431719897e3e239dec4ee964575187430c1a0a1b4fa48fbd29dc874a1edceb7fd00"; + sha512 = "e3876258021cd0d3197af334eff967ef2d1429eee880b63ee0d88569b94f0ab938b5843153cf4b9e6608c4c63c50682671ef4f6c15d8298b43748885f8d57c17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/mr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/mr/firefox-77.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "940563e7a93a08372790ea3f0403c4facc900a6ec680c0e7d71fa10978fbe484c448f1e7bdc8096e26528a969178273223592daba724296f423b1293b79aa5fe"; + sha512 = "9b7379aef1061ffc24f9f70e28dde4c5828315bbff4848cec7764a7d373f3590539a052e6578e1e87d214263f009c831dd2890f3d7a7eb071b0011f75402ecc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ms/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ms/firefox-77.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "ab8d456745a815934736ae25cf597dd6eec2dc25320dfe99c6af804823ad71b482b19eae071be08763c82678e7c966bd86ab1bc285925945b6800ab725dbebe5"; + sha512 = "36d44b200a554476da7c63918b709d57c31741901bd33081f493d9ef8bfb27969d491381ccbb8f4a21e48693cd35bc1630144121c8871dbc0d1a87a730d467b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/my/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/my/firefox-77.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "a8b4532eda52b3543767a28fb9550b21324c72976b71fd2101665e0ca89c63c4b1d8272a9f425feacb3bef188b43edacf603ac87fa1a3dd19c374d22877ac02f"; + sha512 = "4e290ea118b8b2ce63879a926d7992a3a231343ae98f9d6f61de720c5c39e2b4dd5b2e63ce8937945b02cc6b2acad1e7ee6aa3c2c15441e11270d817ea2615df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nb-NO/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/nb-NO/firefox-77.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "a68193718025329d73e07b7199fc6a11e4834cf3f0ca327efbc182d0b33bff342e8a3012ae180fec2167f842781ae9c6d63d29e312e2385ee06e4ef25c851fbe"; + sha512 = "82820f7da33b522f6e4547f650ff85e8d05e8b2142d2e113b9e0d94af560792ca3314a1afe98d3f18d3fc0fcf887de601bc22e93101908cc31a2238af359d150"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ne-NP/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ne-NP/firefox-77.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "5ba2c7da5741d45b376de87c9d3abd65de5a74885cac25ba0c7c8a81d681c0dd0fb870764208b62aecbc93122daea5cd7dba1fec41a1d97eda0dc674f16dd6cd"; + sha512 = "591699f34737fcbfdf9c72b12be83ba5bc83bc027ef439c40f5b0eb22014fac54b5661da9fa0f118ed82bb5290147445f4d703e40a152ad4f7d2cb7153b9586b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/nl/firefox-77.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "941cbc8f65b1b307f998c853010bd373541aa8043f1fc97e261453f7d49ed7ad9880e0cd85fd1bdb5b4b038272e210d9eeb7a5a24f27f1212ffbfde494c87b04"; + sha512 = "fbeae8de6a8297a9e0fab0a10e2c95aaa2d82af7304bbf49fad7cae69f26c5a9dae9de4d84614a1061cf9a82f71abb7eba2e8cb4988ad93d1b5667912ee537fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nn-NO/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/nn-NO/firefox-77.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0c0dd5ce17626e96c3e88a9771272f60e93c7ad4f1f40710d8b70d4f40a58010933de89a2b381dac94831db786621a35ef6894f46f1b19026c0eb7ce0b172459"; + sha512 = "4cbef717a02fec48d29a9f0ed80c8db34fcee2ccd1f2cd6e0fbf0d2b0d36cb5101bbe794c59c8bdafe28c6286eb4c0fa28942c77b3d4a4c047a97bd66c41b7c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/oc/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/oc/firefox-77.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "169b6a1a48b2711ecdccdd6a685ee10b5f602d0300cac13b56feb331901be88edf6e8386ce6e4bfc108f419de305a5603445f5b7561b37358a75adb8e8d418e0"; + sha512 = "5a1cf2f3b9200c0fc039ff7c961eb7fff97464f0259c4b6a5fbfecf54d7d333abdc8b052d3138278c87726769bf7b10f2bd4557493e6e666f96187386289c8b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pa-IN/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/pa-IN/firefox-77.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "96dda02dda90aaa1de2bd31e04d87b37a179773d1f3f8094d33fcdfa6ffc78616f9d7539b4405911a6dfd31382cba91ce34ca6680c36e7aec22493d3bf6f15fa"; + sha512 = "355656300dfd9bef921e2123ffcc633d0562798b5ac692506c87204f2951f3800c03fc3e9e85c6dc9110644b17e40fe5058149b805255f43b1217b1cd71aacf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/pl/firefox-77.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "326b8b65388b6e7d8215a665fd6acd9ad9fd5a03edfd6ee428dc53b217df7b108a351094530621c5b78f3cfaed90092c17e1d1c9656a37a10c108aa441ae0e47"; + sha512 = "b677c207bad42145fac04efb40d9c48800ca0796536ece583d6588f612a3e7c1e5dfa8476e38795eac7362ee0cf4ff60e803bf4263bb6ef875337688d2f9897b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pt-BR/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/pt-BR/firefox-77.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "70a56009e39e06b701de62c7df02d3d648e04ffe94d2718f2f2cc4ee24f19e832decf0371425ab9791ed5db6a5b56d5f221163d3bd67bcbf6cd48617114353c4"; + sha512 = "96e99c72d3131b7e920652a9adfa0794ed67932adfa9193796a8375e907a6c7817a21a2aa41f852e5c58897f41de8394c8e7e81462d74900fa45e2b3b5837d51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pt-PT/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/pt-PT/firefox-77.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "33a770a0ea0c177c1d839056f4045e41e8e2102e840c99c48abd2cb49733d44af2753f040696e859eb724dfbb6dddc3357bf505620f74c0c29b92211d8ab9572"; + sha512 = "2c119a0774f6ae8802a15ae24f2a1fae50da1d4a2f676e3fee7349745ffac497859aafdfca3d092dd3b2dae7f51307953337281ca3274a2746503161b93ff2d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/rm/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/rm/firefox-77.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "233af09f6a4ebb88aa678362c85244f1465d5da57e193b26d676543d0d1df9e673b25096da705178d1784cf3682fb6a1d12564525b77723eca0924bad7ecb0e4"; + sha512 = "09c9669f36b03be27b4defde30cb3c20ea2790e18a05a2059bc79ecde006f019053cdf6c8f0eb2523de0c8d0fca3b2f0bd9cf02b8e2b6d9890ca3ecd51abe965"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ro/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ro/firefox-77.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "6be29acfa925e3524c83ccd6915523cb8a37143855361b46fbd71465002f8791426ea9985d34486db17edffcf53d6197b7115cc0dd38a2be16502d07d3b26cf9"; + sha512 = "24b1b5587dafc81a45e6ed89db33cf0bdf054f14a4d7e883a4f779573d17fc04cde1065b22243d0e0827c73accdc0dd08619a56e8caa04986e7500a57916f95e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ru/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ru/firefox-77.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "46b2a7b8370fc173101dd1e78ce12e363f80a852d55b2e6be9f5b31232888750e07937afa60bee2571e0b3b18ca2987ffbbad8c6065d4bb71064c34acc46c3a1"; + sha512 = "dbb9654c696ac29966551843b6c27d0867750565c21e84c9e71b6443bb5557847e109826ff550107bd56008e913c625e89ac60268f4cd140d2278a4eb82b1a67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/si/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/si/firefox-77.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "934144d99326a139d994518e5aa763cf32035a7d310fa94eba7b4a2b7cf40eaff732dc20100f7bba35dbf415b7a5fc22c5122ef40a65732566063d4517321ffb"; + sha512 = "a47e67c9b3e6a33dcd0dc489e32d95f44345593fac2e678610045fe5408928e12445551011ae87d4e6e242f35c11ee0edad2b6955485394d1f55d3d4e8f68dd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sk/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sk/firefox-77.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "a892ced0d9c5dac7cda65cd67abc1232d5be3ba8ebc2c98181f504b68d43018fc392e0e5b4b12ed22f1ca1b6469be83f68b12e60fad28fd42eba18d9b8d4d7b0"; + sha512 = "c73e183daea5adc333c04b0c473af3189c2d24f84ee352733b211925e62c02cdcd2125c4ccb12fa15b08a48bd0a690a06e39c364108ce47b834b321268cf5488"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sl/firefox-77.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "229175292f435f3cb1db7ba671933508ba7b4daba1aa5db0ed9f03fe8bb83778a0b951b0248a27b4e4a7beaa374f9bc4eef3b2762596b22bd45045efc3038be3"; + sha512 = "7f64f829c83b5483fd3a839aca41dbc0e3506576d633f8c6dfb9265a5bf783aeed537ca801fd07f8356b71aa47719e742b1bcf680f4a6d6c21469327bfa0b9b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/son/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/son/firefox-77.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "44d585391132de3c4df67bdec4a5062bf71af4ae32084e0602de93d75c279e8ee76a022aa19926eee03a31022b4d7eb9feab8e349c2a6547b85f8a42f5b122d1"; + sha512 = "fc8120011f886f996840420c07bd7502622f63a1b53b7d918c16ba1b60ed76a737bc6bd27532f03262671cbfc0f094e41422f5485b4c6854d78d4f95422141da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sq/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sq/firefox-77.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "f0b04a81888f8cac58e311f9f4fe16111a414f541bd1a5b3dc2fda028cf85b3a701ae5b91d223a3d6542580c1bec5459dd4dfe90cac517d3f974c1084ed6be1f"; + sha512 = "9116b54651b0ed2caa04f7c9327cb1fb977242364ee17ea19e114d8fcfad03c08cc3706ab6e355f91ecc3d1f6232955db0668e5f7f290d191a051b214f06b779"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sr/firefox-77.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c3fae910a582dbcb5b8609dbfce0d759d776667e34c737755968f1a531e83b58b098b8a88bd948ee820ab76328210631b7d85ff65a88be630f795522831a7014"; + sha512 = "ec0ac112222d35bf2345a91f448677ccc24f213710a1d5cda976c6ac15b8d3ca28bc32790f301103cfd3f2ae52ebfdf41464b6fb95df4b0f8535238b714649de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sv-SE/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sv-SE/firefox-77.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "fd5feca0a4a107b018329ab2fc1d7eab9c0e51d2660d8356cba4792cf73f1176fd19411580f98a469f47eb6bacb2c311134194ee612caa7ad8a5a0021b062420"; + sha512 = "7e3a6c8da1143c3cf19e3f98542ed6b3e9dc1bab0667a2e64ab82c5f68f9623ed2196ed4378174998070e72a77bf00d5d9bc9d727b319d1c7699992a7bb67aef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ta/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ta/firefox-77.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "c54d20862ec7c09e4ceaca3afb120938beb7ec0bf1c38e651355fad1247c61e75acbd0fe6b96a17fc19136720ba55755a8bb04726c714c812a333c9e300b9463"; + sha512 = "5e3d653003fe036687bc55f4f5f0a2f1008ae58a196047654a1a067d88c7cf06b132207a3647ad5d3a707d85322d0d9eee21222c832daf67b9dc2895e6cf75ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/te/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/te/firefox-77.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "a594904a68ccd42f5e6c0a829100fb99e37732a29775273ac202fbb65785549bbdf638e8ddbcf6b7269161cafd229354b5b350be8e2f2360892bcf17ef777e07"; + sha512 = "2f42f73eb590ed605e1871d11217027abed2dfe0d2bdba2e9c29c6cbcc5c639b48e4bc26b8a6807c316dde23005e5e1010ebef4c4dfb385bf2e41a4710acf12e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/th/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/th/firefox-77.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "45b5fca122f7900da176ff3d55dd70a1a2d594fd9119b75760dc094b7a254e21aa6455c8370650f1b17d69ec1e81749881635d176dc72a45eec8f632d3a2e0f2"; + sha512 = "49f4f6d2f5dacf108debe915116905f5da4c65bed1c13d7f2a65b8b21b0734a34add68c6b56c340e90f6f82ba1f8cbcf9b7fb2546ce64e33c73e2a73e9b3bb17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/tl/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/tl/firefox-77.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "06b3fd1f4cf030377854ea39bfe0818322123d53299a3f5d7308db32683f3992240099491422858c3104079b566958dfa60b58248c0c6adcd0153d584429fca2"; + sha512 = "6e4368b4a0ebe0b296eae341563f8712567f08c7889b0600cd5c0ab881b1de1f5bf8e657b5ac497746fdfe087c8bed902014bb6daa0ce4c2d3712dda614b698e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/tr/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/tr/firefox-77.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "2cb1d03ced3d88344e24bda60687e9a0c34aade38fd635a63ffea3f072188bf6f5ab76cc7c54188280932c225f1e5c9b7c6cea4d2ee0b1798335e84b7826c886"; + sha512 = "fedfa95f6516d3685d73ec3997148eb0954a8ef6713e8cffc304080937a1962a26cf384a85e937a9394150d52fc9db14c3a85b8b483d18615759dd06bb04a558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/trs/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/trs/firefox-77.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "6fa6eb60bef978b82e6805c3a083ee40418125416f139bfae2695c2a4b28e34081a984e8c8e092e449e28fae28d812ac2c76b808da83f79c2be4e7f5361f4536"; + sha512 = "3b165460a7a34e5b2a059101a508a6353ca7f89c03c9eeb7b062e734c2cb1786b1cd2f9415cef7fd3ca2aceb72b4311b2b5da778f96b51f33aeb39cd7e69f1e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/uk/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/uk/firefox-77.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "e412938a9ff5bca8b770a83a2f7b9a03f92fc155df9088f60d758aa41c47bb348e331e34c8b04b1b2b5c796ec34261aebedc697c058bc5457265ee7b87d2d773"; + sha512 = "02c39e86a144dcb6ccffaf4a6c6620088409b8a098e3d2d92268d5b2dd7098c01b9a55878a9ebf1a91552b3f1be8dc86a6a8ff514e3988ffa51e581dfcf43b8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ur/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ur/firefox-77.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "8a4d50ceae88d1ccb354135fa10df40a2427bc0e704dca5b7ceafafbfcb3970eb57d4d6eb427330a2198894e67e2da2532adcdf5f900f5e8ed15727e1dc4fa84"; + sha512 = "d244301b2ee17b78a1ab20cb7a8fe362b6ac86e0cdb9d811afc11c0637ad3fe1e1dffb721411f36960ecec011b7b691a12df1bef1d257c22ae45d345096b7166"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/uz/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/uz/firefox-77.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "cb1be90d64caa7ac445cc7a6b3549350eaf8859e7a4e662e602eee4218de98944360bcd828b62bdcf18a5a602b153a1e4cfb0bdac92a802a8b071f349c88262a"; + sha512 = "8fc3cf2b1eca9b229ada7ca632fd362e42bc1063ad1bc22df1f6781cf996d179dd8e8fa231e02ffb12dcdfccd6f6641735e0b4b28c6e2a1a9372d80c0dc8fd78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/vi/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/vi/firefox-77.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "69fc97339bd8fddedf12ac5f545c2f768cb071c4786f08c43fe61775e43b2dcf065d84d23ef9b9fb3f09c6df6364413f61fec0fa1cdeea2b4b769e3ef0bf124f"; + sha512 = "3676a6246a7fbd49a5779fb2b9ad3e14be809228e15bb19f81ca3b880ee5d584c4aba07d1a94ed2cdb6ec7549409d7738750422d06fa2415722d3424e948ab98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/xh/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xh/firefox-77.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b8013f7c0e1cfad11ef950015444105b1e8512d778fe4b2a7567e0613a1191a7a929c5fdca9c15ab846da05f189fea1b0c137784ca1061b43f7ebada27376a06"; + sha512 = "d4a8d251a4ad5603f301ad45f7eb3518066f06668a765d1583d067e0b89caa87f6699e1e06f67853527dd352b903c4b3a063d5ad7d19d297a040671a98aac2dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/zh-CN/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/zh-CN/firefox-77.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "154bfde5424cca1af2e624596755fe95a1504be0ce977162117e937b6ab6ec6b03b1cdb470ef62c710129d19a16c42fac334477f8638de6472b742ab2395b262"; + sha512 = "2137ced68047439bfff22eaa7bccdeac3b0c30c7e71e3523c54f47a3127a8f0ecf6ff3a3ff789e05c5df525f3c3d32d616eb731f022fe063170d3c67e459b093"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/zh-TW/firefox-76.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/zh-TW/firefox-77.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "6c3d36ba9e4682600c2a99d6837dfe76032d6d1618c0ddb8dab5633c2961d413959e9fe0a9c0fc7ef4bbbc41af469a92fab566d24458c43c1671cd3288dcaae8"; + sha512 = "23efdb7382ea3483784589fe0cfb9919630f34e5418734de9bd52ad9e91438a4d86f8760b1c4a4c127e1fe05de19ed24aedd0e21c2bdb32c5ab62183bc32fb18"; } ]; } From 51d0d03b8c4a925b2615ac50cb2c5bdd697110e1 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Jun 2020 19:18:00 +0200 Subject: [PATCH 1512/3452] firefox-esr-68: 68.8.0esr -> 68.9.0esr (security) PR #89438. --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 092f4342e158..753791be07c5 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -35,10 +35,10 @@ rec { firefox-esr-68 = common rec { pname = "firefox-esr"; - ffversion = "68.8.0esr"; + ffversion = "68.9.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2rl5irkamxi8caa8krj0wng93lb82kk9mf09mgci87mj9hy6fxzcrlmiiffp14s03rv0raagrn4w54pbx1336mylq6saxmfhpf676hk"; + sha512 = "mEMYANgPfGgK757t4p34IXgQkSoxmn9/jC5jfEPs1PTikiOkF6+ypjFegl+XlFP/bmtaV1ZJq6XMY85ZVjdbuA=="; }; patches = [ From 5460d53af19d652578c8b32a480abeb766497534 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 3 Jun 2020 19:23:45 +0200 Subject: [PATCH 1513/3452] firefox-beta-bin: 77.0b7 -> 78.0b2 (security) PR #89438. --- .../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 56910dd1e79f..601e4a77db5b 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 = "77.0b7"; + version = "78.0b2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ach/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ach/firefox-78.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "faa837577f00714097bdec079b1df8cef64047fc9225df81e3531c6e0adfab4abdd82cd7184155d13eab152cd117804ccdb7c43f2893b6f3ff3bc1077e125e77"; + sha512 = "f70d001f2415f46f0a2fddb7a3de19d0b4be6fb185b1e4e875bb3f374b9e73f65369117b197ddeea7cea72bf8993984ff166d0a58dd9fcea1a555db19df242af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/af/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/af/firefox-78.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "32a963ca337c71702c5a6da5b3131af4b83fff24a27236a2cdc04bf191f1fc877869ae3ad3762e78a5d0f384bd104f89a019d405f875df1984667449fe31155c"; + sha512 = "9376bfa53068581a4bcbbf2fa7fe946d3ae006770edef1060f82b0c1722c90712c65cd86e89292c03167bebbe3e67c5b3215b88e11681c723f430470f84e685c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/an/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/an/firefox-78.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "6729c589b1ec63e0dda604a138016d37507479205ac477d12e63859c3937e1c82d10c72b0bf419ab516d9ccb60a86e0b60cc7d3f595ee90c10f7200201c5bc39"; + sha512 = "51b4294f4ecd8716b875060b219af558df8298113c487f24a23c0e598ef7c5516fdab9a888022c4ad6679efdf0cd86cdb601179c146e6b97ccd332d22f0d08a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ar/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ar/firefox-78.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "c03744d53d95663133696f277aca2e6d22f07eef1c61c94c478893cb09605169bbc34d0558842444a454e31921e6d29349dd6cc410a9276051df5a03c1c7d6ae"; + sha512 = "4fc9a968ffaa96019819603ab9788ef0580f43da222c899c1af68db2e8f4e9d056356ea99d27481bb9b7eb451504bbe31fb857bd511d1862cb366ad4177616e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ast/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ast/firefox-78.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "a361ecf02bc85ca44ba6a8e86f91ef11013b86fa9f093d330ae43e2347e560d5112b8012a5af8940afb0e34fdcd6003030149daf33dab1ba8f8717855e50d6bd"; + sha512 = "c70026f3a7ec4572750c01df1d7ab5859afd91dd12b242534c5afbfeaf99dfe2585655d5d87d861f5211cef6cf67a0ab177190adcfca0697a89c7a6f7de022c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/az/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/az/firefox-78.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "7a6baa17135213be0a21257ec9f0bd1522f0e402a3746f58bb605cf2cc4b947163696313fa60cb6148c073456e3b4bfeaf5d7c948905657c1517ba6cb4976b4d"; + sha512 = "005b79149215e2f85851900e08ffb1214f8b100a0a1bcf73365115769f8744e687f9b0ff8500a40cc48dc53cb203d33b757153266157cda3406532e5a1cb0c5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/be/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/be/firefox-78.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "45f3af3d2378f48da55d2793f5b9c57835fdd2f94ac2f15614db1cb0b7b717c9ff744ea101646add604867e6ede53f62d191a12f48df071b46b57ef114dfd3d8"; + sha512 = "11e1ec1146b0688ccadf1c9ce4c219a722533ecd00a3df828e0519c2b49bdb66280aee053254fecd00fc90e0d577de167ea3c1e146e2f9c351b9bfe4756c21eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/bg/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/bg/firefox-78.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "f01e95c639dd864de6dc7742260b29a4f7b9aea0f1c404d1f00068ca5ef67fb85fccefbe443ef7fc13ee58031ad3d1d38d1c71592e8b1aca7fc215f4314f50a1"; + sha512 = "4a8cc34e0a59d9000b62181461633863583c2f35e50dd7e2de8307b0d537e0f3b439112b2879a95c9a4341a01b361971f0160abd9409be1f4169cad44c3c3825"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/bn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/bn/firefox-78.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "507c26d022d1935e007131252ee0798759ef93df65b789f8aee0ad1724929524f23f0a911d7ce5a8a82f6bf7ed2dc845da06b465ba23ab51103584655db12e2b"; + sha512 = "8330315eb21da9da68840bfa64e8f4a150fd4df5e12d10ebd504f38dacab17cf43a246c10cd77ccb6fafbd8f4094d1f6ede53b623308fae90e161d4cf86e6fe6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/br/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/br/firefox-78.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "070b062286944c8be2b11d81206f18e5ff9e35373dd70e222d7ed252c5e42bdced507bb31cdaca8f9130ab5f012282555d4c7c54a6d216e0ac2c9f222f338358"; + sha512 = "cfd67e67af7d97f0bbae051b3c366fba48a09ec4615fa4ff178bc12610962952dd2584916df5a76e52a5f575fd4060e473ff4a2ccb63322f8cb8ed1a351b5a94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/bs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/bs/firefox-78.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fea2e69feb05419faab82623296845673434f269d391d52b0bc4e0b1d4c3d55ce9b6b8b7ced70414a5a1266ef5cd55faf9c31c3dfbbfe7c08c609f821293b199"; + sha512 = "e4781c53f1eeae10b6af48c4841a2ecff7f82006ecdea50b3afd40d000af3d4d89806a5372feb13c5d44b04c0c7dca32a0ca6f2d9a138b393569a9f1d96d572c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ca-valencia/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ca-valencia/firefox-78.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "d2dd835fd2a9b179ec44963df2aa38b0e8bcb46ee55bca312b6c59cb3f82857039239e51cbd224f8c66f2760214ed52da9021b9895682897231c8e7d3733e89e"; + sha512 = "9dc0395dd7f7e2c704a77deb4823882e1ea7c9ccc38bc49da4c906e70a009d912afb0cf05359d1f757b4591243091adc6890caaa85ee15cf1b2a26d2245cae58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ca/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ca/firefox-78.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "14f626b4aa9096334d563fc853afad428d2de8d2cd7f80d512464c219f1326568530be08cb318e0edce0489c9686364471e92455db9ceabb97e497f327acecb1"; + sha512 = "118980cb81ac4d84d456675db91d61ea54a35ad4796acc59434cfe294fd1e0355c1ee92a73de867b18ae04972a28d849d8ed4c8feb5dd6bacd1066175ae3968a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/cak/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/cak/firefox-78.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "ab25fd7b09a8c46a452a57e3e5586188a9a614bc884cf7d133460c730c5cc20945e4d29d54229be17ac5101f1c2aadb937a0a116d2f0fa8fe83e18b3bda003d7"; + sha512 = "47f85a0a6dd1c8540abdb017de664577d9ca79da8057c26b84045fb2ae1fa3b03dafb6c067c9bfe485e0d208d114449ac3cc02274ffef6e80affde8c2ec0c530"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/cs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/cs/firefox-78.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "bf62968ad7aab66d7b931b33953aaabae004de2b3224d099ca8a600ada0cb7c1e7703ab7e4fc3699942cc2a0b1b37a1af0b93aa3134fec7c6aa8e79e9eb19c74"; + sha512 = "0a51c2fbd9ea337487073b7c6e4fe616762019682b91cb9513f1a8a8436ec73f2c1175ee3fd66ce81084d0122f3f550fb49c5d91ac461bb6f2ac47d29dd69152"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/cy/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/cy/firefox-78.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "0bac8d012df7364429f656e8b20e94b18ec1629111e4c3675c2f4d8b9104de929ab1833bb28ac5ebdbd20f3e8f0b0b393ad1857308c57a76b8d465e0d2c731f6"; + sha512 = "aa795f346fe87ac8afbca19add1bcf6aaacdf051323e4dbe8f04fa83c27444d9814cd4b7ae169390fbe3c3987deed14e453f45800393c64d896b8607af05b65b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/da/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/da/firefox-78.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "990899501c4fb0228817288f06c9af9f295101af053412a3171f2c3a368cd7047388b43c07e4fa205c3c9d4e2a19dd7232742e46bbcfa128494c274a98e01f41"; + sha512 = "80796ffe89d9dd15b354015585dd722da3047db5b8b15fb380f7566fd99792959133a100bebe7d4b77ce5dfa710117fab61f5f5d0569eae88284138718e5fa63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/de/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/de/firefox-78.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "c093c2304f95151eccdd694f714541d92c99327534645ae3b9219b779776aea0478d5a7539cecfac4c22e6e49b02ca2e92442343a9b818a79fee6a3c100887da"; + sha512 = "a75dea0908d83630e2df0991250102fc8d3148644005e70e31a15cc626d189735565e49021de9ed766419873adcded2086186a520b6edd8c8f753710381e55e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/dsb/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/dsb/firefox-78.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "ea83c7500ed8c59b6edc128bdd77fb4ab608f25f020d91bbe1b76970f7a054fd4c5492ec8d3bf4ddb3105957cb89deca16eed82895435998233731c658c1bc1c"; + sha512 = "729e10b88c59a24b4d838b3888ed6ba910e28199211df046c1f09d68b19b5547e5e9953c131118fda4c302b23b09a5a8d6a78a6e220207701590d815af74097e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/el/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/el/firefox-78.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "c6c32e780edb3feb57874efb61a0e155ea3dd011008db47ec9fae19fa035d01657a3b4fae05407dab5ebfb72ae00dee9680023c9d2d2f572a4f59e3f7e42cbe3"; + sha512 = "862377ff91054392814f851da646f18a2e485753fce3338411fa590eb461100d94f5b9926fc97848e38d4d1715a8cbd82b87033575daf2e3cff00bddb5c7f165"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/en-CA/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/en-CA/firefox-78.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "6a9a96205a2edd93c08d10ff0b9456a7964a167ac20e881b37e21cfce169455ecf3f6aab39719574f102d7f1b3322b829a20399601b156d0f9cd465a5f0a9a60"; + sha512 = "5a02d99dad00e69f47117f41a0b5f48b3a52d64b1595f9c8cc13086ed0db67c7f9debee30c071140d633821fd42f588430bd8ef93a16bb80f0def1f965da7135"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/en-GB/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/en-GB/firefox-78.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "94bedfeaf71fc9f8a4d0e0d79e47790e0fa70838fc2f3759255e4f5466cb26924e72aa044de2d8ba238569eb1a77092f5dc03ca4e7267f745b26689355056fcb"; + sha512 = "a8fefe63ff03015f945d45294d20954808488bbbb8f28629ac0bd2309500f64b6c766a1c75cc2b340f65bb511d1a50516097ac82d7bc2f3e7f82ae88789aeb91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/en-US/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/en-US/firefox-78.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "fa03a78389ecb11ff3c76e182bc1b84cdc9043eeb9d9648e38a7b3362e22f7ce2cf1fc0af9fabce3a2d103f169f74e946cae4cb655a868ae26cc765e25155dbf"; + sha512 = "73df2d07120716b9e25028f8fc46c0e0e671b6ae1b131f9045049c709a1d678f9227d882ebe2f496cf0dfb71ae7bdab4185015728d1bd8e2b3661acf74ee1573"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/eo/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/eo/firefox-78.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "afd6821d1a76097f7cb8285355c554d05d694e7c5bfed2cbde0b9d5c25512d2ff5d4c338a342fe546c3094152fe0f196f4826a859ea4eeea9a69a91198660c32"; + sha512 = "835944b50e3005cfa69c8c0aa0644d76ad2f953d1b01be6d019423a276f8ba5abc39cad0393356029f5bfd4d2edf6b94c653a1590017eaa4cd206161e3513350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/es-AR/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/es-AR/firefox-78.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "90a821a4db378e64c74f2a30b951febf1d56fc91dd1746ccfe789614f9b5ca61d78b4374cc01eed4b776445a00956eba14bfe402dbd360241a6542cf37a64e5c"; + sha512 = "7395feba72406eb9888a59587674e1ad0041fb8339fef29f2bf136a7a7a54aeeb082e9be897b2137ee2f48bb09c844ed153213393d0492b05b93ec13fb9852cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/es-CL/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/es-CL/firefox-78.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "ce7c9a90de740aaf21c23404f335c16edd0647dc44167e5cbd55491f7edd4135ba8c8c220cd65a76fc7ec91972b1b53d0c9f61b571aefc920049f590074b776f"; + sha512 = "ec654f43750239ba622b8e0dffe99acc7bd04144f8a116ffe2f40b3995ca37abfd94b6827cf3af916d0657e38041b8ae3e86c6f5c0d215b24fcabbc97accf51d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/es-ES/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/es-ES/firefox-78.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "7c3fc75ac74feff0ef0862cff2b476d2ed847dbba717889d848bd9d9265cfdbd0c8238337f116bd9976955d51d0e1165cfdb643e6d67e85137d8481abc323d29"; + sha512 = "65ad0d7c4d9d0ca6501b7c957175661bf692ee388679c435471af6199d4ed0e070168490c4dcb65d53b66d8b517c5271019f869af7a5048be81259c3d73d01ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/es-MX/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/es-MX/firefox-78.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "c5f8b98ae9166fac5c9da9d39008bbd43aa3548ab451f0d47e096a2e22e5b5ad4acba5aedc1ae0e1d67dca8c1789a2e1e9e65124a3fa816b0eb31eeaa22d050b"; + sha512 = "de8fd8cd130f6de8bd26ca054c8eb655de4c958d183cc05bcb41e64102697a4805abe706e760eaa32121e777f20170eaa48eb46db468a51c3c77fc74b4ca2626"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/et/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/et/firefox-78.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "3ba3213746a3d22c3d332946c4a98702689b2a7427fe5742e47cb696fc04817bf9fb3511188983050e14ab33135661e7104c75e7ae1439048f3762c08b34a0b0"; + sha512 = "d39f4f6a65ae24aac5d4c541246ca5911d6af14cb851eef3869e9481f52c9dc593f5518d1c475dfd3a7f2f55d661463e0d6510e0267f46795b3282a6a26684ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/eu/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/eu/firefox-78.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "433eec6c2b3d03e6c4d549dd09017d04685c2079c6bd3d34773ac424c871013bcfe57f872083ee5c3e5578208cae79c151b3bc1d5943568827f6edd8de196460"; + sha512 = "4661cf17da33ed88b8bb0ef8967809f0748c3cd1c8afaf22ba679aec95a9d0ee95cd5c1d08f7a449fafb55f49a32e2a4ef366d09056460985ee5b6999ae80181"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/fa/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/fa/firefox-78.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "5cbcf27f43ac79f802fd05c90d7fd0364be88acbce0e994bb7a867f378b5aad146a1c667426d736dafe0ade86a5d91abb2de4ac1a0a897dec6d3c38a94cb62c6"; + sha512 = "83181415420d2c8c5d56f81d40ad587c1ff1ccf21b1469a235efabad0960db78e912f459e7264f10cc9c2707fa3d6756b8c0b0f8321754e44ca5b319a952f9e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ff/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ff/firefox-78.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "4a0416ed025073d5a41ebfd9432ee1451917c3b1ff94403011c381170c558be4f1ed7fc052473f806be4d035c7e16c266a2d2db5b2d7a2bb2b9de1d236280077"; + sha512 = "7821df8329fa367002e526bc792432631e098b1ee15e116af2b0ca06d629594d650e8310e701d5e02711bc438c7be9aac997686ee314d226b834ae9ad661fbbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/fi/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/fi/firefox-78.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "3560e1528fd40497e5e16ee7c0f4ab76fe71e77e8e8f938a09e2b89fd8c6d1fb3389d4b95807267101a7dcc361f47d227e5831e5bb7416e45d0b1435bd728f5b"; + sha512 = "9cb5b49cd326ba3f3effa2c844a9b2cec1f5e55a56f4e86514e6b8607dd8d3fdf88335614c974a8d2362f6967bca800032411e2d18a6ae5f1d44ea815baba134"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/fr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/fr/firefox-78.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "d0e7ab281050f7d2cc8804660e5bc5e507c3dfe4fc493c3082bde5f6d6b41d596b92903f821e5d37ab94c819cc97d55f2a266627b6be42e492dcb8d2d99f826c"; + sha512 = "fcc80e9643c05ab9c581c9652bb24aa682b76c07702c3cc6bf4fb6abc3b5e198bba5691e0403cafacd1a52e45eeab707897603a24311a78a4b54da706208123b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/fy-NL/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/fy-NL/firefox-78.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "5995b510a737396700316f32ac7484545c93f8957ca8faa0c40678d0271ca650ed28014e301c00b721144f386ac37c0410f28f550381f6561b1f6754a1f8df79"; + sha512 = "6df59da001300587d579b6202b85c089867b2b762ddb4705cd44927f16766e8c85d9c72fa00a5c47904b07e475f7ebf4f26428b9f4af73684a1b8140a8a6e7ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ga-IE/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ga-IE/firefox-78.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "11416a57a298db37407f1c0998833f16bb580a00a51902fe6efb7c38e6ed01806ef9007f871331882253880ed277ebf87266c0723228d5a747537be910f64858"; + sha512 = "b94d32ed84c6c06a060040fa349f470886ce06a33139b987a04540fd567f74be779a63d7a8e860b22abb8711114cbd2c22b882bfaea4baba1eaa73d9a31670ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/gd/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/gd/firefox-78.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "3128f71da4e849307fad30e0531a891f6de58a61641e7b641e5b0b8dc3c4e0d0883ac1581f5d1cd09c28130fb1d087c4f1a25582672b6af3efc70a2390af2884"; + sha512 = "4dfd64b333aac4848dcf3ff44b56d2070dcaa5b81150d643e50c68a1c1c32e533f6b00befef3daa1fa6f6bfa8041593acfbef4fbf91694c9cbea931b0082f890"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/gl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/gl/firefox-78.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e0297f754c9599491d5e0f18c45f3570a0589f6b8750c2500b973b176ad963f56f5e44eeecebf23faae2d1cf549e9b7ff6a02a2b403e7cc3a05694315ed7d4c8"; + sha512 = "b4f10e6c26cf215b810512786988af3e961383d5c00e4d0c6ff2e0cf45d4616a3f999837df0b15c642109f0a930a543192d69b38fd5ac6d2adc4b8e147c85297"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/gn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/gn/firefox-78.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "c84d8f600b84e5c665e7acaa36e640ce7e2a6758a210a55e0a3b4d0b43890ec0d39269029d480ad9b2c4cebb2491784c99313632a3e7858d73fffbb16a77e425"; + sha512 = "f51911301d88ca070defb75ff49bdc6d1ca5dc60534518febfad20f2aa256dc226f15945993300e96ff4fe1aadb427aa51340dc1f3ec7420c15432f57fa31d8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/gu-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/gu-IN/firefox-78.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "2ee2ef40e4ec35eb36c639e0b5caaa9bad57e3ecf5056c99c6d3e5d4bc12dc116a0dda02621f06924131097d921987364d7db5beae5f1707525af251ca922ad8"; + sha512 = "c122187243467d12422da400affa93fc62070801d30976fda1fde6664c5dbff3cab37c3b1e0a20a1b62605eb1127f13bdf806c07063cd84ee5f8fb9d19397573"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/he/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/he/firefox-78.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "1cd2ba19b79b94044c7da3072936e5d2c663e965bab9e7a2fe04ead68c0de1e94e4093f4321d1b07342fa10ceb6d079e0ea2dd1d818b289c6b4a8a935d3d3006"; + sha512 = "5f0208c47710d0bdde59742392c4086add04cce787cf257d9295243426cd3085b5693a382985a6a0b5cc46815049012807c6fdf5c4835fce8c0f60c105743020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hi-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hi-IN/firefox-78.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "09249512d40303a35acf62d7ac5dfb5f25d5aade17f163b7abed95f08eac9e7bc5f67c4939a539ba7c2fa521aa67d05690b08d1c7541abc329467861292d556a"; + sha512 = "28c296e2e3e6c17ddeb5bdff5b3c75e81eebe631c10bfe63a8b7755cbce78627634cdd300d8ca7e65bebab1ad3a058eed0be6704a1f3eb0c46761b2516e25a34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hr/firefox-78.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b2fc193b0017b81155db010ccfebb37b0f631526b18a8061ed626654d0d3f49cb973aeb0112da9e099b7dcf232a9967e2a7ae81ca2d76a6329c62d1f72d0e5c5"; + sha512 = "638cc3b5f2a1f5fb3e45e81beb209234a1a89356bdc99b933a7c7d84811691a33dca27163e93e9b77b2cd1168decac98d2c21a6837dee4335214f87e5f1cd78c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hsb/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hsb/firefox-78.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "7a7ace8330802da958189d06e51b61eaecc536c8808421ceadfc9599547c7314927b08e1c595ec1e73651d5e74863a1d5ecbbc09cc11879fc9ff4dd16c6baae5"; + sha512 = "40e842a776c591dbe92ad2d191e6fd1c1c26c00aec6110b74e734ace0b5868afe430017ee2e953692fcbdb542115904229adb9294c64ffa63a15ae4da6abd949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hu/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hu/firefox-78.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "4a79b19ff66417f61abb12ae77068563a493c4983d41bcea198f3ea9b646550cc43061e49a5c641d56fd030de99154c37767098dfb36209ed2287afbe8014812"; + sha512 = "b544898a2433c66c6b69fa84e36558f95d722e986d09afeb76f412c128a351977389bf554d524e28c02d8e5554519ebcdc136d57f17b0baaf40f78f0738c9aa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/hy-AM/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hy-AM/firefox-78.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "4d0ce5ab930e49bae189e3bebb84f3a05611b13b674cc0cbe71eb3760827115c24a27457a2dc4ca4277007733a785093742e331dd961edc2feebe98f6f74dc4a"; + sha512 = "1a3a40148fb35f3d741f732e3a39e6f1662e6196b1d0ab149b0f42f2f7dfc103fa51df0dfe1874a5d483a5a998555d858be06f8afce9815f7242b7b86d8b3af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ia/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ia/firefox-78.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "2824698f01cfe336f2e292387c0044f7ae15949ae561e0944f6ab6a44603e73b62b95eb7fb0dfe8ceaad958b111ebb0a709b5efd07ecd13644d4c6334e3bc1de"; + sha512 = "7e8472462754b358a4ed7f7d9a1d853d0f590a680a64e985ff1db631e84e6200908348d85ae3757b9236c76e9b3e302f18bba3a84b620834345142e3e39f95ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/id/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/id/firefox-78.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "8c126ffd553fe98919a307e654321385598aa21343ee7bb4e7241b3bc59a825faa9b7e13ee1a98f3d322205d124fc19cfe53e0503f53794e01b1b28a5ed2e1b2"; + sha512 = "028df055359a2fc5088b65ee1f377b94dd69f7c6c718cc954084ef5a53e3f53ddb95a8e52c46b2e463e5de6ecd7272a4d687e49718ad96ac17579ad121403bc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/is/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/is/firefox-78.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "d6885c9858853d882664577748fe5d3cc0ccde79867ec21e080b1fe799a895f0b93de2456e1332e5600ecf5286975b7d170dfd4ebaf66cdd276b7fb7d5a3f415"; + sha512 = "232ed8f86d6c825444a0e2448b5d5f06a8d17be5c4ce35fc0d6cff24cf3e49253ab92c16d82ff52726540104106c242e3bfd0b3b969f8a437f46b60114654f42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/it/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/it/firefox-78.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "249a07a88d7e6c9fa779956547a4709fe8cb75113a40aef9f8261709aeb8412ff0a2ac776096ad043c7d00d7cc03599cdab11df021d2b7a926f8fb8261fae8bb"; + sha512 = "43f29ac4beb67d8859cc8cd7abdb3ffe2e3c3aec7c962e4e9481d89005a72598571a0dd53a65b06241ed04e6022b7992b2a2c4cb95bbaac95c4132e1bde4869e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ja/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ja/firefox-78.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "a71922abcb69e483a84aab49893caf580b6cfcc2cf25138342e45fae6a925c4ce8b71ca3be7c606f6d4bb56c5a0e32d2b8305171a45ad90285b04e4f59be7e91"; + sha512 = "c469704306f8e28f8508b66bc418a867b3f39eb33405430c0b3fce3f5ff5cf0390d03889ab1c20aa52d5f0b7f4631cb98e0315ab63c3e9412f30f484ac88df5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ka/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ka/firefox-78.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "2af6292101878bd056844ad8bd98c1c200004faf83bb40206b979439718c2c652ac15cc5be7713648b0821aed6876bf16e68964273c307c17c38d7c7cdf4c997"; + sha512 = "5c4eb2a1f8167ab3f6e818291595a67b3b9f125f800ca84b930e0ffe64357e37b9a9999efc17593e502abd1912498250423fd672c7c479d227dd7d6df3092c49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/kab/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/kab/firefox-78.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "bff8278ae5c4fe87daa0a04613b979386aee97ebe0aec8d80a6ac79ea13de791fc9f8ebf46d6b200d282c0fa9a6bdb3923051824ebede1a1d7ff4623b6511731"; + sha512 = "d7b7eb5065a6d949b018d0b1bd7c3613a97311168783a64597731da0b7bd248f11b13069833f3fc794563b1de1f4e0c40be23231b33471dc49bbe112f8e536e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/kk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/kk/firefox-78.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "9e94630f949d32e0f53cd8a9658d777ded9fbad464de542ec4f606c4befb1ade55efc56afe692c6c15ceb969b1c8b5196e342e795eae5de6eeb27744989c8d33"; + sha512 = "7c2a20a0e20bf581aa8ebcea29ce7096fe14c8181780364ca6c828e0df71862b4da85e46ad5e9b73c6fb1dd575732ad1bf36e7dd9f6087f187cd56e29861aa4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/km/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/km/firefox-78.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "8a38c0ba6ec5a37a02f7d24419cc43cef75f9549d3db8c5eaed8e5a00e534877c63c71fbdc5853a4886ea787d5a513406a73c48d9d9d8e31fbde39016551992c"; + sha512 = "47ce70d662ad99540a0186f62c51918e1728976467f612cba3fc36b9d336b1435db1c06a834bec54e1546b9842028c03fc965efc472a08db81a6c13766db48bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/kn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/kn/firefox-78.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "9a4b93057dc9ccaa3bf14074629e9f31e18ad188fdbf1195e6daa4c6ec31509f7e417723ddda909ea0eac121627cce716c9b6ad74bb59ab9274370141af2256d"; + sha512 = "3a62cacb7f5e3b4d2652731268fb0517678ed38508f5fa0fc2fc5288031c706ef95a2ebc09116b35a1587e4b42fb8e9b07667ec90f3727be0541d398acc1e8eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ko/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ko/firefox-78.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "0de01ecf0815f1046c7d24fb5561dc7602dfe24d0f3d9a23cf934e6087a7b190635738f7d08c84d3dd368c62776f003db6b2cd90a9249090d479784758ecb61b"; + sha512 = "9fe53ec1bb0e5b2ab583c2f7709101ef6ad8f7a246ed0ce9988dbd086640cf34321b49b753960eda5b47a09fc162b0a2a2eb103287e208f75a85c97ad7752545"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/lij/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/lij/firefox-78.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d659155611ba762a2c8a670c2d77b7ba693816d062bed08834251c56b8c4727c580cf6b38c1e7807deb4e65b2da7db940df4c9cddabfcc1b99d1d8e00f056170"; + sha512 = "221ca319327c9bc4f68f12f93309612ab7b286f3df0971dba3f42d6e0ffaf12bb554cd0dca83a4bb9de4c9a239af724eaf5f70d0f0b594593b64f8338b4c7954"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/lt/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/lt/firefox-78.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "487c1d0be32fbed5c4ee7c5a3c8964acca6402fb03dac2e8a32534d8a2737129d06aaa69b1747e40aae18874b5b5b74aed682d59618765d7b248d388a4b4fe36"; + sha512 = "2aff555428cc9b04ed2134178e8c2da1ac702f1a77b3f5b648cad9bb4c59875277830ba657aaa7dff7652a4fc35fb39b6dbfce3013213a503cc39700156193bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/lv/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/lv/firefox-78.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "c87501dec3fda705c7bc50d14b733cd8516d9a3f83228bb7a5805ef6195ec52e57da626c698460ba09bdeafc2e373f5b890a0d77f6b36aaa3b4603f97d87cf48"; + sha512 = "540057409baa8b823ba2eb2ee1a823e24ff08510637caed97635d719c1e3be6fa12379f86f08a68e53c9084ea1d79bb89d188bb3520c723c52db2fef3ee8025b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/mk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/mk/firefox-78.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "21167a3e6ad9d740f567270bda50ea8cb0315f1fced2b70aadb9eeb5c6de9609504cb5b81f3c51e1b69542e393d522278f649fa515b77d2e5fbc02a82d03e7f7"; + sha512 = "adde84f336cc36f23daf58b006a0cfef18acaade8892c2368b0a3b3322ddf2b26a0783f04a533e173d71a4e2f579fde2f6fa6a6c23d80506a1dfe1945a2fb073"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/mr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/mr/firefox-78.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "58ff22621d4158b93a773016cf766f0f90f71181d77b4c7d28ab2546e61f630447e5c01c559ee887224f6579801a6ded557a748bb89e8b5d4cd086e1e04f8bd0"; + sha512 = "93b021845b9dcf173b4fef281dd4f51ae5a84de3bdf80c3861fd0e5e4d9431366b4592f0bd553d45fd2f9f3cf690ff82cfef6b32f9bab06fa916b417658402cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ms/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ms/firefox-78.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ad3e4725cff1f9b6bca01425764110df71694ede2b7afcd56da88da1982cdce93f08607c17806659917ba4fa1f0c88c4758079bb695b5145f3e717b5dcd45848"; + sha512 = "071217dc5109570a1f5a98a06ebc0120aa809a189b3a78a3cc19dbdce0ad1cae409f665eaf97cdc7b4df529c8406fa2fa2c57e5b34dc32e3a0f4a62d981aa2f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/my/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/my/firefox-78.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "c70153af55f07aa84d9fac8e9ebf9c9137f62f6028662afc1189ba8329efbe17d77d1f3d2f368d800cddd715701714ce73b24960c243f933aa239b880d658543"; + sha512 = "39fa770a4b6632d1dc0e3bee24ff7ed95caa26db7298c93a7e0f4732ef18d72a1f21612275908dd12ee94da0a89b08e2b575cb745340ef0d595263f554fc61b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/nb-NO/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/nb-NO/firefox-78.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "a3ef8dee50ae5b0aeb08b3e7007fd766916fa7703189efdd9a2f7e9938f68699232aa1a4550f42fadf1fcdfa236fc355a072173ef2de1b00f6ec867f47cdc080"; + sha512 = "f408f1ffa88b3c918e52c001ee95027730e4961e13a0b47a0c8c6d3c39aa8d7cab172329738ec546207051bc1d682b8d62d59ee9efae4d7533036cc9a6869f71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ne-NP/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ne-NP/firefox-78.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "2fe23bbbaa450de730e8269bb530dc03f1ff6b6d08e128bb685cfc601ff3930bdf50646f0f23252d692be0e843505a57c182dd747dd60e1404883b89379d697d"; + sha512 = "6b8bda91d969a832ffbadd4d2241b9bb572637d0d34c910f7e5f14921d7c9f76b4a88e0e3bdbfa259a0090cc8b7cbe638f60596f05d8b8c5f48faa181393a37e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/nl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/nl/firefox-78.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "efed082f592adf33fcb1fa1619743d0f502295dfb0626eeb66c17aac2d6cbb68598013b37631050c0438cc9dccb5756becad117a82493c9ef9b4c4c46aad6eef"; + sha512 = "ea86fff04dfa7cdb8344af38b5b983dc9043b5b754999ac4b2ee1fef19df31fb4c43be6952e0e97ecd4af62c97b1a8c12914f0473dcb19d1a9fdcce4c0710869"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/nn-NO/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/nn-NO/firefox-78.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "6f34fee6e0beb244b567e748c8c4ffb72021061aec9f5112f782dda3cd90a76b1ba3f044e5eee7b6c0b0b39c2c9b32626cc379d3e4d1bbd37ef6b7bed8d3ae33"; + sha512 = "9bb74a166716654e32f1b2931241dc556d399148bac3b1fc44a96a101f48e74413d40f380f6e469639c186a2483bd9131ee27b8acd8e442e4a3c2eec7361bf1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/oc/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/oc/firefox-78.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "cfa9c3712952e93e854300bef57cc8b4c5ac908abcab9fc06c6818936b52377ec7d2dbee8d1d28313175b7d39977b7c1294babce387e5a8bc3bce50d6de74ac8"; + sha512 = "3d7445cf18226db6a4a875f2f006150d709b53a8837f4dbb2bfc7782149c01949473a1fa7ac0d5ab3ce269b2a41077cc93f7635b3b55a08c2a105973c926e62b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/pa-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/pa-IN/firefox-78.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "166c240c73de0b4c3107270b3a1a4539a9c4a0712e96f3ccbef95330842d8b1c02ff6a15187c262231bfbd3e0ed237ecd3184b1abbb666ff55e5d4f242cc6f95"; + sha512 = "0208389b74ca0070c727f6fde7102e12e28b460eaa062839c23a81f5f25f68ebf4596e5dfa661a2de7c21c233e09d621dca716233c6b73368c7eb7fb0aed6d93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/pl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/pl/firefox-78.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "5588ffb0238189fd9f18b6a50e8b421b807e50e9bb2da7fbed2c8c5d503a738a4c1b79457780ac6731e71b938879e2c8d61701cf5e21814172eb268c9d71c460"; + sha512 = "9765be62795d6a0efdac06a91d2993a1da2b015ea20679aca8ea6d70768b2a0f9603533d2ab81bd2cf33dafe842e9c78d0a0bdf2b705c74f22b7d9fc22cf2c32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/pt-BR/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/pt-BR/firefox-78.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "a9341b379e27f059cd26d03cc4f68124f52b8501c983e8c29653694e5d821311c92af123e2569933e6140889a701f4a7e5eeaa7f80e24502f75414be3631b57a"; + sha512 = "c59eb5f10a8f94e44f785bdb8425e8b889e0120434c1796def1fb521a77d5da356176d1c864a2fdef08cb650a1b6c71cd334a3cd0d1b2f647519d46d2d65ef8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/pt-PT/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/pt-PT/firefox-78.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "8ce686c98f56d8e8847a567a71a52577569403daf02793f090a360e266d8fe3044088d615db0c0b8d3eea8f1da331f6f37bc21265fc4078c2a1e7d12d3be70e9"; + sha512 = "8fa1dd31772b0de062c1621ef9346ee1b0fa77629977c39a8111f0f22b00a1656e6bf143c3ac74af7abeb8f2c2cd26495327ec72b067c4ab7743957248b62e32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/rm/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/rm/firefox-78.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d66607192e6155ad67648c9c8ec5327b58433f14ab646d8b7fc8ffe301c02258057fcfbaa37d792978de4e171e89520521d741608a2186013931c6adfbd1c04f"; + sha512 = "737c5614d84fd72313c3ee4eb72779bbb339a40f249967417d591137e19d76b32e9ce528adb167415134ec75b796f7ee4dfa624cdefa4bd42e11148297b08867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ro/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ro/firefox-78.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "3c74b828b663de1e091e11534656579759a6953a7fe21b0531aaf501ad368dec9652af9a70eb183fc4a5242bdc9cead4d2ec8fbf3274d8e78963df2c78779584"; + sha512 = "0744ff66859699c611597113c77de6bdfb5ddb543768671a48f9cb83da888ea88ed6fbde5fb86f610a35fb6e7daaf0a4c6fec1d9658c700c16f37e04f7b41366"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ru/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ru/firefox-78.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "5f3a78c25b202c732ca14a98bb4b3ac5baabcf47248ae0157c83afc6cd6d628e2ef44de0ec0292e4839994e2806ebd8698dbf0dcc13716f5f6e34110ee8111a0"; + sha512 = "77e085bcbbb2ee78c486f85d86a5be43498ea094214fa1e769c3edf7af42821c833d6dd207766ad1fea9eb9ad2354229617b6ee49b38d869024092d317790781"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/si/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/si/firefox-78.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "398efe34b30ad6978e98363c978e6bbb810f359dea7066c06f904dff4bb934a49a20561e39cbd639eab9474210e9d34e3cbd97e1b78aca2755431ba7cbd83afa"; + sha512 = "1742142be1d9fdcb13f6d68c5fe413b9ad019556491263855c172d350fe0bd00d467bd91683caae51eee3e512023e309ad97319e3327098ee47ab6be35d1a851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sk/firefox-78.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "8521f91202f18acfabb2ed2e914ab4f8a28079d1b474d86e110d1b0ceb0aae8f8b70a1a0cb3fa5a23b38a905f3abbfc2c1eb5277a400a215856c408efb0efb23"; + sha512 = "2c292ca74a5424315e22d595a688d14167389cd7afbf73e07342b7e77ca32e9b56300594790f26d048b32d0ec014d23f144b9226b01cdeea3233050998394f99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sl/firefox-78.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "e137e54527667f98a5fb1f65707d2e60a151a7296068fb1190a62f07f091c5fefd97c098217e352ef2e62b5256bb45f5e410e4eb0636ef2f1033eb9a391e397b"; + sha512 = "d6dad078272c4afd6d0641bd53db9d9af4b9ff9ec34c45917ad313cd6088ccfdce614669765281d57c57dd83a5b7e428514e21c6fa13cea70c93e91690ece671"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/son/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/son/firefox-78.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "924401c776f507c70e6a60c873c84f1f7540454946a4cfbb85426aa20a589973147a42f03fc106407a91cf484a3763cbb6268f8c119d72bcb3b4c46610986b57"; + sha512 = "7a382d02653006c00e4761a7f61746f6ee80ae2f922cb2eb027da3ec7f6cebfccacbd51c528a29186557dd9e905a744e6db7e07c273751a1f80a277a08a86410"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sq/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sq/firefox-78.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "8615b1930cb673c7eca59e5beef70cf05f9be628b90e6a895f28f5dbdfe46cf051a14134a30940d3f55512d6d1e12714ab2568b53202bb33af2ee4f0b26e586e"; + sha512 = "0ee0ed873edeae765b624e1f76612b06bd6bc7b8df396656c76b59b1e1ef8d5b7f056a18a71eb2cf9f950382ca272bb9517ce24c6145e966f6e895b4ad843e6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sr/firefox-78.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "aee6e902c58389e5794ab802c3e7f0e6750c3dd9076e8dd33894388186daad17e3bd34f48cf16b082eb1fa4e3e8a4f794fd6bd87940792d089c50214b390d35f"; + sha512 = "d8589397053bd3b5068885925ad69ccbece3b439ee61b787babce92f24a8cec9e32164616d73fbd35f34047d1f5ebee48e91bd9f1ddedda2dc4f19d5ba869afd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/sv-SE/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sv-SE/firefox-78.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c61acff7429cbdfc14dc6aca65bb538d99417567b477e24324d7ca1f7fcd12a0e2f338ee5a8246b8ceeed0c1761b3bf8d4e6d2be9311d6fdd91bc5677ecf3cd9"; + sha512 = "d72111d03ddd880a24590a5b1e17e950401fe9d61fafc7b4b256f877d8c950689ca393ef6fdae048566beb1aa46ccebc7f1de8273c22b8a02a651730a75e29b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ta/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ta/firefox-78.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "8c9255e218e0cbbd77cd6089d02535af65301a988c74cda0070ecd71a432ce34c5bc8c71aadf1edc5d558ebbaa5d8a5b78e3c76c0c714a6afd8d4b11e1b9e3a8"; + sha512 = "8b3c549bd419861fbf8d3dd30e10482922af955454bc1974f0c9bbe065a6aa88aa55b8808b2c4865ea3bb5ec240490b882a3d1251291513b234cee3c075f28c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/te/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/te/firefox-78.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "92afd454d7542100ea73bb71df673bc006084fcc1a31f240b6431f4bc6cff946ab57a94d8a8634a8d01ee996e52cbadd5c9dc58e3d47533d3d3a72a8d3581142"; + sha512 = "8d8c74aa0811c24d97ce03628d9fa3be139ae53356296d8599c5c4a9269f479a2dd720dace92e86560a3986fe68daf042b18e2bf1c4d4339033b5c42cbca0f26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/th/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/th/firefox-78.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "077e610d74fbf8d861f9ad0e3bd1b5dcf79e9d89913f7cb53bef139db94cecaa08d00dbe830a66f0775daf216a4e44416827bfd386d383272d7cee75b5493bb2"; + sha512 = "7c6645a2287b0da7c346f1075e44658c72d9c95e4e47413d0e18024691471e0165f2ca58142658e4ecc605fa5398d047e9acd248e1090231809887189ab19926"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/tl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/tl/firefox-78.0b2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "00fde9ca4590744e2877a6460e5fcccde3da81864f6ca0e7b092cb250137d449038b618bfb9a3b58f2b349dfeebe964c88e194162f83c6dc573a239e8d4d3598"; + sha512 = "d27d4f5815ebf6d92c9394fb9b187985eee43b89034f6378a862c5e0099156423d925e4f239da7f4dadde31a68053eef909d53814a2342157f42a1ffaef48df1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/tr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/tr/firefox-78.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "c84b99040d24d1e13ee568c6d5a0ec336823deb2ab229ca29d0738490dd848cbb79089687009016313b5b7d80601e9d54f68d7be08138b71dcb2cd016e555867"; + sha512 = "e9001e4ac3d56a76955c04f2cc43915696e3ecf0ed0d7446a282bae6bd3ff7461ee6abfe7db40ad61cfe37361636089f2d4b353eb5f7f09a9af16f933c9e1ea5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/trs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/trs/firefox-78.0b2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "7b50b2662861c4dc8a800f251297a21be22d3dbf863dabd0d2edc48406a0d190a1dba5dcfc623f3717c741b771dc338563e31f4d75484dc0fd7fb3bccb9c7a30"; + sha512 = "9aa5a64c8ab17beccaa53cda383383b28b7ba311c08c21dc9bc097d2e43f351901399f315f2b12fddfcf101023212e61c5e416442a726a324c66c7872dea75af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/uk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/uk/firefox-78.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "e2893db5b1d1199c9f823294b487e79b0c7f4e4c4c33398a3fd74db93fb11b1272292e0ccf8c6e51e706eea5ae63810dafee04ff8f53d76fc98f73cd5560ef04"; + sha512 = "8d33e4ff58711e2bd71144b00a96fde332675c6a81b09c1896eea25b6599fa37358c762d951e4515ed398f746b368216fe26beafdcea51cd3e927e132d26856f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/ur/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ur/firefox-78.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2cc0f3af1e52573b570ae07e39af53f63d0e51f6cd15121d3894a9afa96a0796d2dde9d49f0888ef7ab1a644682963c68282a4f9032a64b2093d7ff8083f35f9"; + sha512 = "2f8e5d91c9f4119340762efe519b11eb69c4dca355a4add963cf71a5aa58b53c315c0315caab323b27cca293f383bc07325dcbc483326dadf95f305fb2ecd067"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/uz/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/uz/firefox-78.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "10faea0201c3b350cdf52935a5df3fb0277f6ac52259b446a87a9cda1fa4f412a2d8e77c005abbaf2c2d9d3fab998a97ab8ef9833ea63e2acaa6981d194d064d"; + sha512 = "b23309f728ccd814f7444c1e3e129034c66a1ad1fd216e6960c79470fe37d765314fbe9d221d8bf2f423ec07406657135029b280e2d5884c5f3a55050e0194f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/vi/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/vi/firefox-78.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "2360929b0099a6712fff7658216bee5c9a90d38fed6fb181ec9d16423a2796763b3d955fbbf9ec124320595bcafcf7e50b1877989185a35bd5f25d1321dc5325"; + sha512 = "698f917a168d753d7dea3f0e91566beb6cd96cb708abebfeda808115775ee5ee2dd906ed68f99cc571c752560d765dbb49ddf701de4f74df2ddc8a6642f9bb19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/xh/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/xh/firefox-78.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "2abd797d2f9b81f22c140bd3c57ad68baf54c10947a0d0615b639fa289a54ce3b3e72ea6c596ec6389977a9b31a1853b6c96e1bf23902f4c0eb7f4aa8a907e9a"; + sha512 = "1b1dc73a235218bdb832bde08f4de5f157fd9acc2257fbee5f1684e2d4bc2f14a22ab70e062d53612b36588dc3f252a6a1e6707cbff392d9d1b1365adfecb13e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/zh-CN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/zh-CN/firefox-78.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "ec379eeb6d70eb210291651125a3fca08b1aca0f06cd22a6ccfa532ffef8d1480fa32ce79f93786f7ce3359328d5a96442ab88b4e7c78fa88a892ec08b8822ca"; + sha512 = "07d21c46ff1cad5cc9e75d6719224721e230895bde0adc34b69eb5a34f14d400206e0d2e4de80ba4e029de0b185b2c6ae0a44624b5838eee210726831ad082f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-x86_64/zh-TW/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/zh-TW/firefox-78.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "fa18cc45678129584438122766b7b56705aa9332025c6f729f29fd50c3051a2f60988fac4f1f267a94d443a35f3f9d58162d3d355f978c018062a8546976a341"; + sha512 = "13be3323975a7ed42f6a9ccb8bea4b71d875cd5dd8e1e5bbef8ed36d1020819f3189b6e933200ce58793bf89cd7d989e6e22dda60321c9ea3c5d3b776cdf8e5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ach/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ach/firefox-78.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "4f32295fa57221d2658f2bdcc4d3396ed3337944dbd9e46a1694ff478f4ac2d68ba57d8d65a6e5387c657d1e51b2a392dcece3735fc0c075da6c9e9f3a053cb9"; + sha512 = "383146225929a318a6dbe25e74880f7c8b630bedf4ee91adfda3b8c9626b2967d6e6e76573e05fec2a4efeefd0573c6ba63ab252acc453b691cca3f09dac7f1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/af/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/af/firefox-78.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "8c88972e9f0b716d5e10f730d040188f4bd4566eef196da473f1be7206c67cbce90edb4bd08f7261e6860c276fa0c8fd15f39641e5f243715608b617ed8c27ed"; + sha512 = "4b0fdbdddd7c5eb18a25dfa03a95580826c940941f66c984a9d6e46f1ec88ab932b0db8d94644310dc5fa1519d44a3cbc24d8373a449b6987e2401b9bc2800c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/an/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/an/firefox-78.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "ee72bbd1608ef81184fe128d3274ac0eee56003230d61e7047d0d40f5d0176383e843a5b7d090391203a1e3d6a8c1014096dae3796fb47feb55fdf08e5d5f37d"; + sha512 = "72495918ee96313318db942c8c403286ff6ccbeb59811ab2c595723cd18c2a57d6a42adea7d8779b22b9dfdd1e5c5c0e19b5fb438d198f9e770f3034a932e610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ar/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ar/firefox-78.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "280ee75fcff94e9bf6052c139871fc1d3e54f9427be30d2b286f654468436a906905fc3b8d48a943d1e2c4eb741d941020ccc2b82a99c73280bb8a5638689bc9"; + sha512 = "61117afc0748e44daf713234b91911336875b8d9eaaeecf8e183d54d2c6bbabebd1cbf34c74a019ab660b06bfaa28c417d7ea3ae8cc476c26c9c40bb9fff5392"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ast/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ast/firefox-78.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "11a78f70db70c0ae9284c623100ac92b8af742ae389905007bcff5b9c731e18b97ad1226503b8fb7a78e981ff97595594e8ca84cd76ef48052c8440f1ff757bb"; + sha512 = "63f66ac824c1ace695000cebd357684d0b09c3e69f46021f44ffb2201327468c2d4d21597a660cb14f6fd08c21d58e0e47520f72595da8f59c808459ae8ef0e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/az/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/az/firefox-78.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "5f6064fdf15fff16312005114e91b8957daaaa45c2bbe12277b5d2bea72d6e20b2c04f5f5731300337d7204f3114ce9964c006cdab349b9d78255b109213fdbc"; + sha512 = "481f350c51b234aa44091e7e6ba308364c84ef988bc11c0f66aac72511e0aaed0c0a4bd865e781516cad6a867bcb2e09fd4d1726871290f828837398712ca401"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/be/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/be/firefox-78.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "08e136fd182c7c126a7c6bd410d5d1fd776797a7409e42ebdaad5dd9e0b7dc847a6fe8c5dfd9cec929c48461ba0c5da996a8eb8f34eb4be215f018fa71d290a6"; + sha512 = "1c4b35ac02bec3daf9f5a7fd984071beb274281ccc3f3a8979d8255709fa22396a1d2ab2606521f279943c872294e19b99e974b116f1293d63d10dae0f92e586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/bg/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/bg/firefox-78.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "fbd6a0fa6ae9e4f4232662edfcaf23b3c5b13cd8f9e33c714459ec398bf0cc06a358b448cc56fc5208b7f93315ff47d34f5b2975c90765f49d73f88d47596f9e"; + sha512 = "9bf06f95a1769a9f0a4e63ddc15f612d8f5f8678ac217671c58f3fe8669d3936186a2695b6b49ab6d37a052a2844ac53e6d65795f4539033467f2405930e191f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/bn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/bn/firefox-78.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "5ac3c52f9e8f40bafb3edb7b3cf6483fa74f6537ce1baedaa96e41a851197d6bf74c7181a132a51bf225d450081fc57450217c9db3df8cc085f799af5aeb0b04"; + sha512 = "7388dbc16b05f32a0c2cb69489e8dc5054c6ae785881b91571d2ef7bd010300efffcf322598c51157f681ba599f7f39791bd2dae217147eeb478be92efc82f7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/br/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/br/firefox-78.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "1311c592461fd0d23ab1e7616e120fe51b15c70790c2290340ff6f6110984a1ae9a96da40a73cccacbdcb4b2aa03717401b34b415c6509850adabbe028e9aa7c"; + sha512 = "ca7fd9c0c46c92b26e1038a4b611f26690b4385cadae2651611f079323a6775f47d305d9547d98711eeebcc00374df5172fddafaacf44279cbe0c765c7fe011f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/bs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/bs/firefox-78.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "ea11227e9e53c781542c61212397dfbfdeefb2f70ec0e8a26bafd6e7de4dde3f35e6d87e3e3fdd5e31fd1e061d7906adad355398a4dba0ec1e6ebccf517bf2c1"; + sha512 = "fcd846854ff686542a0159e722722a97b6be0a797341bbfb2fac62cd8b6bdcaa3aa2f51bbd6a7b2d90b46188af1ebc5c1b6ae6e6dc24f3f4f1a1bb26cf2205e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ca-valencia/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ca-valencia/firefox-78.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "c858400aad550180e04bedfe10ff1094bd0bcfe5c7bcffd5edd9512eefd671d6401bf1b50679af4636c3211fada6c44c126ebc3916fbec3fa08f587f70520e1d"; + sha512 = "4e997173753a7eda937c5c04c1bfed27a2368e58db459d1e0918642d2c5878a5abf5437f96de9e47e0322f4f0d0e8782cda27bd24f6c5efecf685fdab3b9d149"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ca/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ca/firefox-78.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "2a6464c84120f2c85002554af4759f282440435a84501817c0e933de0f2fa6535a5acd59bef92ad6befecd8bd7e40a8f650fcfa75aa4dc2b20b546eafd4df056"; + sha512 = "c2ba20e8217134b641d9c97e3332167236549e027946d7cd4200ace74498639e6841eae76f753195ba8ffd2872dc3dc81576970a128cc618c51526497d14c1ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/cak/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/cak/firefox-78.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "c2d492cbc4ac4cd5ba030f1253dc987fff0cc2ebc0d3b126c52b1a6de9badf57b8601a350526934e059bd7f3b539f45fc120cb1c2f327e96abefe62b1177c439"; + sha512 = "e89879635fcda716916f5e0afe2372172a7e3e13db6a57310cc2d4e8bed95ebc76fd2a39d730ba548a8f2871e68ec6c80364a67a8a9f2f72e8770a6088cd489b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/cs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/cs/firefox-78.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "9a2eb3ec93e43d789c3a15acf826cf72ea67afd5656114a0ba1125dc2bf57741799b52f565e47f4403859bc7110f3cea100c126c8280936235289331c7292fca"; + sha512 = "ce657c44e1ae63db3f206601b5be7107e0334de7be574c8ff9211fabb6d41936eca3aca33f58e05220adf1213aa96ccd20f183a72c4bfd7cd71c145e8e8c051d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/cy/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/cy/firefox-78.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "9fca98e4eb686968d5608a8e253e0738f3369b943e63b960296c7ec718ab29638f522844705eed29fbccacb6b525189a7a828a7b29ce23e1bae61cacc925a73f"; + sha512 = "fa217e8a7dcf509132c35775c85c74eba600dbbbf2952a00a61bdf258396f134759667f6c3b8195bcc0fce8a6d896e70fcbfe514bb50346969fec258a8ce9342"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/da/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/da/firefox-78.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "9393a9198d200b757e51af3961c2cf20f42cd6a8d85a7c2194731643648dc971eec924784958e306d3ea177a4ba8c15e79195dc59063eb81e332d4010e35884d"; + sha512 = "ace0ea8fdcc68845f948656c31e142d5158eb2ebd0ead6c8d1752d6ffd4ad6d915b632034ac328751e69fe133d288309b2db0e97caa8cfcbf697150abc757839"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/de/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/de/firefox-78.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "22f901cc49ad275ef107a6c49607c3d8ae51315f83472088cc7d062bd980e6f74b911067f92740ee5906fca3e3fb1cfac8be63c8fc0d6cd45474f32be5f23007"; + sha512 = "6e87302f9a5c9a08c7e9c56257a31787c013ce8b5b800d4a7be1cb7ebc66c32d9cee536312ba0042638c33b614fcee051f99b83b71007cb21716e0d12d380696"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/dsb/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/dsb/firefox-78.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "190db9d98bc335e9cc34e37921af328ac0beee967aab4804c4a513199ca9f9c4c5153351c359d91d34f25cea4e109b90735009ed1f480b2da6a80422f0ea7839"; + sha512 = "5f09de6e10b863e06699b9131c5bb819aae6afb40030550a1e2785555588fee83e18abf60825b27f8e458dc9459ed101db213c230a06507e95e9b43a0fb1fd58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/el/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/el/firefox-78.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "36b0942422aabdc0dbe1959f330fd6347c0e3e0de9fdb18f33db3bbc8f7b1982a4cfe99aa126c8c4b3ccf93b0c26d01b01e74838460793cbd5d0a6a8193da4c9"; + sha512 = "03dc3e0ee03c27653c42f314a3e65d9e45b717803a869827cedc5ed5351ef32dcc768f7c13a9cd3eb14b0ac8a0d386a8392e677f7481bf81699d4cd22f91cc3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/en-CA/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/en-CA/firefox-78.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "af22e98b054cf4052120bc17735e196b56e3d8875936f7c35fe66016858c650bee94932ce892afa5ab7cef3012f880b2533d58571a752f1ecab9a6284f69f991"; + sha512 = "9eefc744bbfd503e6cb0cc0c25a1955a3246775ad2f204b7004aef96f24e6268576b89a83853de93998c228208174cab91cc0615ca16d42c6f2dc043939aa213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/en-GB/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/en-GB/firefox-78.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "34b5a9a7270d6bde97caa77e5b43c3c47bc71d9bb50e51bb6449969ac99b2e7df870349f73a4b7cafd4fef1e409720156a2f8c4082b50ed1abc042f3c53f03e8"; + sha512 = "66e3abfa4acd7b701285a8bf9a48f6be2401e8bafe19c694f1307b7b3437efdf500e12ceaeb5b41f3deaab29a3ac90b78ff79fd5521e94bae055b119d4918690"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/en-US/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/en-US/firefox-78.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "ec6dc83bd8e5cd20a47566be95e152ee63d770557b9f1c864da411fee6ca554e58aff21372e97f1ea557156381ed24a619262669190742ad705d2e48a9e9dbfe"; + sha512 = "38500788aeaa19cc295c038e85ab11ed7a091fd5b4105cc2b7202b22e271dd8f3ca8139586e87273f98b1e17b6a7f526131ded5e4bddd0c4e52896cb7f47c5c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/eo/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/eo/firefox-78.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "9b97b46029ccd4e47fdfe157c9c34619311755da4d02e55469e434a82e187324f1a25a4015a8fc6345ca9701c6bbf721d076132b7d953a8d55cbb8e6cca8e918"; + sha512 = "d3e5aad8cbf2b2a61cf52d3f17d99d050ee46567a7aefb04d0855922f86e7820d11c15d60efe6beea76232a7d1f43f2b5a4aca088844906affdb2d272364a492"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/es-AR/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/es-AR/firefox-78.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "3dc73cbf68defecb48519996dde87f89f30788c4eda9782b89d5449e35b31bd3c842727564f9aa17dcca7acb19f4c8d27d975aebbd0045a0499217533a546362"; + sha512 = "81aeaf4e97d53db8dc93d0e6b163b4df6218621781dcabd85755baad71a4454f406d5119d16044ccb867f8f6826006943b72d97dd6b5d658daf196d16bac040e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/es-CL/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/es-CL/firefox-78.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "dcaffcb471bfd9da4c4eb2e55061828a5fe569de2ef64492047122acf74a7885a91eac49c2057fb2d29045ad41ea4d9817ec0579aca286f186c12f3fd17020e3"; + sha512 = "e22ece882fe8141864f1efd7d72774aa659cea88ac45380c709f8da92906b8f0d72ff959add05b6be57955b4687ae52a138b51bc4da81223c16ca40b76c056ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/es-ES/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/es-ES/firefox-78.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "ac4cb3bcff2be801b3ef23c7b0daba5f36b6d2e5fb8e1b2baa45313963c1c32467c1a93fb1072a6fd38713b3fbde86e8de24ddc9f66b002ffd6a3d4bea9eb0a3"; + sha512 = "26b6d729d72b302d38d7a372e716dc9cf741658e3c42c7080a8593f3eb5e5e96fb40b5188082a2ff9eae528f387801f034744fd2ca47cc279461669550e29502"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/es-MX/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/es-MX/firefox-78.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "79377037cdfa8a66df3d55e95b5a9a6846f8976371d7c88f2bf4f6df0bf33faee44fa0ccc9570f55367e5772750b53dc0fea6d1e847aab222599d055d64f387d"; + sha512 = "2069eacc1ef1ec020088b3406755dbe2cb178f53555371f7132636033b4ec4883973a00f5f89907f8d6588a1cbe7fbb2d0b6dbb9d42c74165698bb222669bf42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/et/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/et/firefox-78.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "17d04657ed054a8a7f2bde5d71906064ab924e24a1055a9bc9383fa86a1c5481e2a32f63735737e5c129e32046b06458879313bac37ff72774053a437714d8cf"; + sha512 = "1c2c865b8a7106a91ecc223a167216da94be3373a4d43012165989e6482a3d0a90f685b163f5bba50d14d1f2abe1f0866d6f1f75871cafd5823b060d9f6272e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/eu/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/eu/firefox-78.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "a87495e8f4b8035886c007421ac84fb47d8cce387f8cd16e5cdc5f5fb71a80148ef42fee553d4ecb2d794aae367d609377cde61f9388f5aa7635fe704cd268be"; + sha512 = "3f2e68d6fe86a59cee48023cb646d5002495e2ae416ee18c7ae51c3e48690969c704da16e574068ea7f91fd17cc581be7cdae8303f0666fda3025cd87f173c4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/fa/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/fa/firefox-78.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "99b989bc71e58b09106038db336ff9de46c8381be2294010b7a6cb32b1f222de413b051062f5fb2981ee173b0879d089d74c8cc9b6022f2f544c6021a998ddae"; + sha512 = "6e6c7a29a1a20cab73b82f2c6d6167c8de66a249c0b02170c9a1ea052bc1eb8af5195dee3e83b597004127639fe96b4d89ffd020625a0aa0369dc47cc9560d05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ff/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ff/firefox-78.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "125bfb8aab76599a1b35b9bfad886735ec8a89ccdcf8d29c45a238b4e06ab56ff2b848c94febe00042b75c378c5719610613b5b35fb80257daad35cc456bd90d"; + sha512 = "3975634e0395df6377e7a240d4ae6328691709f50f115a0c364de9a9da849a6655c8397defd80df6e8edefb6f6b413bb877fccd847bc56b1bf71431e2151b114"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/fi/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/fi/firefox-78.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "e2f115848250093981efd9b4ad344464636bca52eba388e26f3d10795351f25d411ee71ed77ab3097c1e285676ea30d5151117a24527e8739f73431f60b346ad"; + sha512 = "1a96293cb6aad59b5706ff26f7324cb6dafeb9f17de4043c03aa789b9a81f7555218213923fac0abc16700cff4bc68848345f99376696025238122626a341177"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/fr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/fr/firefox-78.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "9960af7e15dd722c93a7620b4f30fba8651d2245933e29d4f3f6fc3e89bb79a5658aba2c8969e569de7204e2d34bee72fb2ce292e970cbbe50cdad320e030117"; + sha512 = "1d3d243663ed47c7ee3ab68a578d87769b617a4e961572d3db2b34dd62b8b1c997d223104ded10b42a00a0f0382b0ba10c089060f613e30001253ed008b09ddd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/fy-NL/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/fy-NL/firefox-78.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "aaa2ae8968ce6906a47305e78e2efe348117cce9040d7079415f082033c510ce67f833b9195d6496b831f7d8baf95f501ce1d54185009bc3f1d12b16a8275e4d"; + sha512 = "8f1a40d1a46e5b4bd9cc679f07893f407b1ba7de11cbaf0ac6889ed9d344ac6a9f10842359e85f92187256548365b038d619c58d62eeb80538ee592691aca6f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ga-IE/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ga-IE/firefox-78.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "1b7f808948bd3dcfdf748b3e0b8f03cc6c5cc2c43edf84ab62a385ccbd51c915c971e5deae03048b4e48f7f73d671031bd55be06bbf74c050746d87b3d9213ec"; + sha512 = "e15f1d055f6bf4c81736370577a102dd4ffd548d66bcd6c74c807d4996d400979bc5761ae5e5053dd0600b9c7e69ca0fd9e4b03f8428032e4a1acd3485a47f37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/gd/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/gd/firefox-78.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "2494ac50da66ec1a711a245ace28543c4d9095fd186855d968eafb48b385ff15e258b5476168464a3ed5059455bb023d3a964288bec8cc759f2421b8e3705b21"; + sha512 = "564f101816eb3812fc1498725562205f10590b8b2a97dd80fb2f5965a6f69d6dc10d42ba21171b4064107e8403ff81bd6a65da13d302d93a142ffd19dd13778f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/gl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/gl/firefox-78.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "5c5345d2cf6d26b33c6526c1591fc4c4667d2f9c553fd6b5a48a77316ceb1091b7c68c1860e4e01dfe9ba02ff397a48b10cae4047474e25a53bcf09942cbfebd"; + sha512 = "bf67fab5222c481088dabcc92f1298cfb4420f5d4e93c5e320d6bc1c306a51a4fea98c7bff52821b61b70d02c7cbb2e0a8a01bd76a21bb5d8dd7ccbf1a2cca72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/gn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/gn/firefox-78.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "8e5a5b0791a937c3c4c5fd5b7862f92947e16b596842725af7c3c72597ce91946e2a8291a864ca2adb06f96b7bec9cdf0e01d9c915f68f186f80f95e245c61d9"; + sha512 = "306887a8436502fbd8f6654b6bcff057cb279e81e01e05eba6394a109fd21ca5d5b45a61570b9b880a5d104b1a52b002a3efcdb4018b44a9437443e3ea4678ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/gu-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/gu-IN/firefox-78.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "b12cafbb422a817073fc967b632fa80e3c08c38be5e5cd33a4648185e68be7ad2d5827ad0923c4d86e6ffddb50612175bf6a58c19992fc6ebccc3ca170b9ef73"; + sha512 = "84a27c6b14035bd8a6679e954a7f62728a24b7720cf32f1dd93533c97dec7965a963bca8bad7ae1b1895f5d8b30a9356f8fb87a45ae2bed99661852107dc4613"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/he/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/he/firefox-78.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "b97e5a8f4958499391007d4a299bd70f5978185381be0e984bd87bb79563dd691fbee5a6106210629cfbb85346ee867b8eed6136454f9c910e9a728daa3c2524"; + sha512 = "f9ab81b3f184c3351492deba6e4cdcf87306c378eca65813269d779467c68951e9000636d2ed6bc7d548453a5be59b50db2658e69d385bcb800eb452e360a245"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hi-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hi-IN/firefox-78.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "44a512fd82b840141360ba2f2c283a014649cf532a151b8ce75f5b64dc8e04ab1ec7addf8c2ce4c288b125b1bde433c05ab87891bba0d6515c1d9501239887fc"; + sha512 = "d4ee0b984ca5679fa4d5922c321ba2e96f7fb2f6e0c3221eb4e22b25cf8385869c195e668932cf95b28efb17b7f9946dfd3453e679047d74eaa49032f7f494ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hr/firefox-78.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "167b1128c547c6d041d5ead144a7539ca77cee428ebdc9ca712a5a13b89c38d332f00a71f48719af7162db0c59a067001181b8dbabc0e30cbaf2dd9dcfb4fb3a"; + sha512 = "f8217dd5f3772500584eea717cf142cf7a16655ed02c2628edbb6ef43c8a53cc8c73e3b829bd71f98e1c3d8e54619155ba5db8f988a5435e86587367ee754ea5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hsb/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hsb/firefox-78.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "116ceb3aab81c56d526c8564dbb45d4a58712ab62d0ce26edf99bd903e7782be8d4fc1a3d117feadb2a36740803bbd7778b18397abae4aeb71e69b48841e6097"; + sha512 = "1883d76849ff588abb135f594ec7f8faa7c6eed2dd899ce4d7fb5e3f20e0884cb91bd6c606248910dd1d680c516336faea352b043ef7f0cbf95c86b82fb8781f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hu/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hu/firefox-78.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "8ea1cbdf1985b065bf71209ce5a4e9cc91b0a258b873b0b65fc9e7030a67c5eed3feadd714542962aca079a191a4fe92b452cfba6c45ff7f8dff7f874b627535"; + sha512 = "36434f4fd5be4c50bdaa2b2a3ebea4ba1e89f18d51b337d17455a35169c3ec65d5b0aa17c6771f211b81f607175b6df754a28efc927a951e4d34072da343e0e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/hy-AM/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hy-AM/firefox-78.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6aeab5e8fd9984410d8cf95ea675336a1fa98807abe19182c2f94155ec1bef36e7bd9a10b9ffb38d2a9ef7441a56dd329d07df4f7c9c301342f46afdb5f2f348"; + sha512 = "0b09ba2521e364fd839769725292bacee154806d94239e21dab70e4fd167b2295cac01e070cc5a50b1fc767ed57f50bdfa428fd5aa57a2ce6d2c0639c1b82807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ia/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ia/firefox-78.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "f853d14a988c3a9c1f8d1d3182d8bdd849784f081bfc609871e592a78de14159203b64755a0e9c63d1649b812094d389172b60bf12feec8cd23c55bb5ce664cd"; + sha512 = "2753b8d3413bad99cdb40e4dc2576ffd559e4ea92a507e0617e04b8fa41abef34ee642d6e8bb58c973a837e1483d117638cc49f1df3f485987be96c2b6d0dc77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/id/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/id/firefox-78.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "897a928303027345459e2343a025fc0e926be7ab8ae7bca951afe36de5748aa6606dcc630bd33df8efa383897f5d1e24b078d94d15400496c61c6494fd9a9f2a"; + sha512 = "a0f863f34f4ba67c049749453220d06f9737d855f6385c16e933a24c9a73f9a28928049fb99a89fe976db9224f40fd90495016388c5442eb0b977100bd5a8ff3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/is/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/is/firefox-78.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b86c9ce4a0f95ebbe9865443420576fa37946bdd5ea5e060cf4b6bf2d97ae98af599a00836ed722e1d19ae002c79d4ba1a8d41e0779745061410bd4d020771cc"; + sha512 = "4425c986b537b04ad0d9740bcd835388b1bfd3a719867c7ea264eb1665a96deca9f4fa58d84e6e9dc7e038ab9bc55fe86fc69381c055f88899fc68b39505f393"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/it/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/it/firefox-78.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c7320bf6f9f5ae18d7eb7edc6b070dd77b79f594795395f2158ef3c9109e6b582b992aaf9712646f7e832eec9f4a622f00b8f218ec6a742f2010d4ab9f0fe1e2"; + sha512 = "4869bca5c889deced2e2d1029262726db3aee7a1aa5c79e928038295c1367ff6003b030ab2fa8940fa1920129c89636e059d9b20e20fa43f2dd938a44995b4fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ja/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ja/firefox-78.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "32d619b4818fcb05061c5a07f4e83115532a37bc67ed7fb655dd813ff1390fcab1f7477f34a2a78832252cdff7f31d2046583afa4c0f48ec810a97bc2a2fddc0"; + sha512 = "e4f288ec38c5a9723f3c653e3d995f9cc2c2dd86f285277a1b44f315df2bfe51e6ed58db00e7df1914b34bcad3b8258ae43075d02d4440cec2c1fd307baaaa9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ka/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ka/firefox-78.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "9f4eb01db315b8f3b13900ce05ca3d6d036eeb45f67fd2e925d1d4e50a87418a0be5a0843e789174449c105e50beab82baf00f524e4b327d2a3e4b8596866a0c"; + sha512 = "f03488b30e3551cf670ee3a193452dde79c72fb5ed63288c41922e627ea0033cb31b1117a4b270260235492ef9d37ce7b6317d637c2495d1732c606aa2d5f6aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/kab/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/kab/firefox-78.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "2a57cb02f645ad0505292bfb064d908a5218928b9964761f89a1a775054fbe0f094c0e22895de68c7603e4328d33e7371ac09edc2b6d2c1737d5b662141fd0de"; + sha512 = "ed496b1cec1152db8f63a04f056479019b90338220b163f1da1022de11b1064dff1dc32299f92a0464073d4938551da813f88d5dcc8536c61abc84347098cd20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/kk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/kk/firefox-78.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "708a29a81a0f1ded29abae0d0d781883aaf809f7910db2985d9e95b8de78cea750dd40f9721b24b642719f37c917d36e4e876d6aa8aa27401e695b61a392a2d5"; + sha512 = "01eef4b39491227ba2a0428066fe99b59222dc1d9c98d435254558d14d91b4cfc062a2649d87c86da3b83e327ef8a7889a78068ba1e118140dde8d696aaa4654"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/km/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/km/firefox-78.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "65de59b8b41f44e9e759e9bda4eeee88558e4660db30b3d9ca3f66dde0a82145a82ba463eeec55fd839f70f455c9d855d77e0507910ad234c6c883572942899e"; + sha512 = "f284b80465c175a141210dc57b4bb472418981197ef5c7cc4b32c5d2d65898dc9def0f29a096d14eeb8d66328713afdbedd26e9b88a969a43ec62117c2d38d0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/kn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/kn/firefox-78.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "094c26405e965834c5483d62c0403b0a64426ac1e559c1a760bd4492b7ec1662cc998a896e06778f910ad375073d996a25ce9549bf16f4b17aa4be52dbf26ffd"; + sha512 = "1b3f97c710a45441fb66c83ba6b2e648f726d8fcd0d245f9f8121a86d878c6bf3b0b114878d70f64f6f18f057218f84c5e30ea0f4f4ad8b1921d22ac9aba5e7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ko/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ko/firefox-78.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "642acfd183571001c25592ce0f35155dd80aebb8a79bdfdb2fc89a1130f93329b43a02d8ae550d495d277de0ad1ba5c746352c80419e97b51ea5c05169c4690f"; + sha512 = "4deaf19c5b1fd396566dabd7f9cefe416e29ec885781f7aedca1bfad37645c2878a884b516d1300eaf2292220616ba494be4b8d763998cacd1d5e9e5b7a902e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/lij/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/lij/firefox-78.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9aa044f118cb4aab69570ee08f67591662e6664b54e5989076875e59ba38b5b546047a3c2cb91a6d4ae658a89158b4ee78aca048598e5c26c79e4c79e972117f"; + sha512 = "17bf34017b58765bc0f90d08ac8cd73065edb223e1d8222425122460c8a502ba2430caca3447e535ed9f444dc5d05b5958984e8a87e29dd1b713095cb68c130f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/lt/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/lt/firefox-78.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "92db275ad457450f7f7866a599082e643c106155347a18e4ad443f4123589014aa628bc485722d31ec625ad7d123d772c65579771dc0a253785ce61bd00f674b"; + sha512 = "43240bde81bb7a27a9a9b9ecd95bfcfdcc701441a5820ef2abfc0d13fcb8eb41abe240e16bef0a5c1126d498216c9d2c5302c787c93093665cbadeafbd81bcd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/lv/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/lv/firefox-78.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c1f5e72a8948e3fc8b240f93d9c6ebc403ca9f6c839064c830414935c4921825da39a3a9ded4c0362729c9da866c22fd24a1b5fb5a53b776b8a8e924dc862ce7"; + sha512 = "6c91a4d5e746ce88522ee9ab1fb5ade7293365eb3bd67f5f5648fc8b298fdb41227408bfde8c567d238bf65ba5276021edb630c4b8f3314493a6f2d5face7845"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/mk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/mk/firefox-78.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "b7fb36e20d83197e64b43b01e8f2d38f8c9ab721889a72c922df6f2d97ea8eae53cd638fa5cd18540b7c28bff6ce64a596246f535745d0890f69bd3fbc011a41"; + sha512 = "c9a29a67dba15e60aa3a08499c19c151ed88e4f9b108204fffc42a56cc2b73f2ac65460f1f6ead90595deb1b874a0aaec466d5decf3c975c9507f32c6708e4e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/mr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/mr/firefox-78.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "5f65d79c539eaf73ce41ac3effe9a3ba033ce3bc32a4afda3353c815645dd69daa989f85def03ad6017a759f8b5d05cfc39223bd265f4962fa01d9ba83ecacae"; + sha512 = "e83006eb8bb225c5c8961e73c02dab509cc99be714a563f7de6203d7b1f9aeea61228de5c2c0353203bf206d113af6d95b47ab83793aedd0d8fc57c66774ed08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ms/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ms/firefox-78.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "67ebaff0a9dd48dd257b93dc31857ec6e3ca190a9ccd945f93b153293f9ceae9f461370a35f52f8d4f667905198076c79e2594e49a62c436248e2e198b75946f"; + sha512 = "30c08210314a0bb9854ec3ec7db222bc03a3118578940f28fd503a90b266b3d803b59e4d691be4d5d50281b6036d3162676a775de1b0d22d57473ca4f277331d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/my/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/my/firefox-78.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "aa14d4a9aca7bd601cee793f9f269b6a8009f5b8c41858d7eb3440d0037f5d31f0fd9aec05c6dff1ff294e724d487bdeaf55450d378013b79ec198761e88dfee"; + sha512 = "744153ef1626a18fc6295934e4ba53a12854f7f8eee73a451e996ff9497caa7c33a85a8fcda2ce8c510ad516568909dcf793acd69f2b183775dc2e2921280c6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/nb-NO/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/nb-NO/firefox-78.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "535df626eb1cda145fa474a0b8281480703f738dd40649e8a090ff880dc69c7c9b002a7f4fbbf149ba50eff43b05b978f7bffb73c2d994b709bb1221addeda6f"; + sha512 = "f1519f65a3437394906750a19b9581a2bbdd295f8491caac191a6d702cfd81eee31dc58f18297a2c77b7a3099c1cde191017590881613cec21ece0abb3b33b0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ne-NP/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ne-NP/firefox-78.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "f6d3eb4b0bf3fd9891123fbea78d8b63e205886f0f2b7d9fb4fd7217981903ee9ea2933744a682f5684c1db1d398d5aac5e62e4c331d74b5f1ba0132d44c70fa"; + sha512 = "c433b58a5c95c8bb15eba38fbbb443ddcd6e996809e382925284d46c5357901f3996d677cd1a7a4e3afb5d36fe9ff7aeeac9202f333a0acaf4cede1932fb9c1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/nl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/nl/firefox-78.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "02ba2f98ea4c1ecb9751feeeb603c058947df68841c803b218a3c92bdfc66f61f98c56bbb0614ebaf4cf67831e6702ec857cb7f6a8c540bc5fec3d81c5ba5ee6"; + sha512 = "4a08f0571fb66742cf99abc582f761cc8dcd7297bc66db56f11f12bcbc5c46ad0030b6943d31d4f42faa9b2caed5b25576df34d4078ffad5712bc1cd7f9fb3bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/nn-NO/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/nn-NO/firefox-78.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "591ecaf523f48a27101417a963a5792329b78605928ca400a8c61b5afd653a840755fae5ed3f752b88fb1d746cb51c3acf655ced3051ffe379e165264958c0b4"; + sha512 = "97768cf2279b49a5d2ee5dafbd1315a9645ae017d6658106c4dfed682079d8b1aaaed201d8b571e8c00a5a305e5390a7f799307f167c24930b6e08b601586071"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/oc/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/oc/firefox-78.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "a11bce29cede60bc9bff8adadbe22ed70b44576686b88a0e7ebb59d3fab38c69553af4827fb7ee3db29c3f587c3099da6f19d4583f4c688eb46be4bbd04d2568"; + sha512 = "2bfb1e7d79c8c7256c7a4af08e33bd3cfd7bb3b5e214b06d50714d602b0ed44db5556d555d506b29d5779b86c8f15cabd6e9d4151e76e0c4e03003a49f1e2460"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/pa-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/pa-IN/firefox-78.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "6c060521f85228487cedae7ff6c333e72fb3ac50269136585a0582e2ccc3ea0874ec21ac2db332cb90059dddb60014a68f434b9396a535694e65ea7207ff41bf"; + sha512 = "e53b42fcc15613bef2201e2c8269269901130884fc7b3d4fbb5cc3eea1c9ff1a219503c2e2960643ae23ed0ee99287ba977f55f77df00c0cdbacd380623967ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/pl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/pl/firefox-78.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "a03d759520fdea2f911066b17082e4c322daad8bf6120643da9a1f19d2c1bb3cf3db359da614f0f876637f0edcfeaab45e18b90769568cdf2d2ea46cd6fa4902"; + sha512 = "bce7db6d18de63080a806dbf8639bd2f6dd00876605b17b9fcc741678618f1f17a5d991c461daa765cd2f3f217d2f39971e572e2e607b91bcdfc8ca15529526c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/pt-BR/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/pt-BR/firefox-78.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "6fdabc52c892fe28f43d7acccc5c4edbf8bbf4e2cb9939447bac1299b78315df0f47c17c6abd1dae8508b20e2053f13ab169663b3572f13d6c5b55c91f9ef216"; + sha512 = "7260d2a9ff4fc0b29f5c72942eee47c36b4041982924ece2a32f70a5a821bbbff07ebd57a3b97c64700a6e7815e3f00f8fc521ca7f99192b25f3199089b33738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/pt-PT/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/pt-PT/firefox-78.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "4be9f310a230ff5426c73786e421bbd8ee96eb3ed15d394e7ecd8514b08d6b4edbbae259587da522c25a4f3c6eb57324672f8adc3622334c7f5c48af495254f0"; + sha512 = "47f02eb60a50799c542ec8f82dd5e43a684ca03dd8daf487d651a33c7ed78ab12be1ab910c2a658e67645b2537f6f112d9000b59377be448c066f218bc9287a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/rm/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/rm/firefox-78.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "05fe442d3ea0af4bbe1901b17521d0a1eb527eefef803d9a66fade056b988bf52a6bb2f7f32fef22a6d9bef76d66b31b690e03b14e1277627e228e0ba85260e3"; + sha512 = "dcea73109f2c6bd570729175e136856d1a8141cd3e6caa04ad5a0b94096171587980d9567181c41fcc950da92c15155ef23402ff7e97939fd7cc4d3c6d349e6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ro/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ro/firefox-78.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "b3fcabb7dcf35ca9e444a618b476862050ceff0845dfea4070793b59d347018dfdb6362fc5cb2f6a5ecb6fabcc2e55511535c018e2229a6aba4b6c0266eaf6f8"; + sha512 = "5189292876c243ef963f552123876d9a392a258efdd3704d4ac2b4da26d98e3ff5d281dd54be89ae414c8a78abf080234259045326487eabca45a645a1ba29c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ru/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ru/firefox-78.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "1e67aad86d44fdd6d7b72528b558b772868d72b9aab634224019646aadb64d23d19b7827a7b15e3e5b0e6a0247f64afecffa3ac88b171133c054b7587c2aa050"; + sha512 = "c4ced260fbae120147c18cc03be8ed6c604c5b98c4c63d3f7ba579154cbfc04003b5ff03c65617cb6a2c65a49c36c81fc1c1b2d6315e51ea368165d0c6fe971c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/si/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/si/firefox-78.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "df01e74d2c2ac38ad574e2cbbabb057c60ffcd18a9e43f8de12483e9ed256a2368005b3c02f11cf6a742ce19d46eed7083f8834c3fdae5eaf1ab5f42b2281360"; + sha512 = "84f62ba8c25c46cfde46e2dfd2ca6e9051d75ff4b930f1898da661714976103530571a39ba19f374beb4ecbcbcb30a390483d91433558e2f263d9106efaefabb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sk/firefox-78.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "d2db364b089b2786407c6606657b182980b4de9d09333fbe63f6d51bab8e99a493bcab417f06d528d4b178bf7cf5101e2903cd4c2998b264b9233db3be9e8330"; + sha512 = "9f9792fb821396d46c5ef30acd2d71ed224db8a8a533a6dc3f0afe3b8aa7c9915f425d921fc2f8adc11fa3f5d9ef2580eece36f488417cee4b4dd3988d9f7553"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sl/firefox-78.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "5d6b3e9b918ffd18533335e32f8088dddfb66ca82e98a9af8a76fd2ff23247f4c8b05cea9895d076b555f2edd2af34776ed25a0e902be9abd589fe577e7bd659"; + sha512 = "55d0c5d17f80d9a35ea5dffcc93ad6cf9af2414e8b74bb7f0681dc97b9c7292a95a9175400b1710ce5eb78e2aab6ca9a57deba96df68bc8b0949029a4fca55e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/son/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/son/firefox-78.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "ebfecd76869650105ee62325de604413a409b97fa0560d9f0e908a002a318234cff23dd857168ea0d782095fdc5db371af1382cebc49640a2554e6a602117f90"; + sha512 = "a341592537300f4aaaee8010c58143204487642bfd72fc25086aaf94bf916aeef57ac1a8cf5aa6d3456759a4a9416da6c72a6e222a1011bf3dcef3a1bacc53fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sq/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sq/firefox-78.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "c94332eaecd79c0d1bec6cb9aeb9abe78a1528d855f71028a5d0eee95c9bc30c50263bebc198b86fa583d0a86ffb72fade74afa6d2a93ebd85e04154bd94b2f2"; + sha512 = "ce6f8b75467d9a97732a9541ceae1611b37ad81c2cac1a150502e4d96b3d2f0a35e3031f534cc974a13810716e2c2f4bd30d71f84076a98c0bff85b37bcdd51a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sr/firefox-78.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "386fcd94487ee4c360e6d5bd4cd97668c68c035100140f3ce894fb33eb179617281e3af42893abb9fe830e057d8b8a987f387861fb415bfe7af5cc49a2160763"; + sha512 = "644cfbad8921ad9101eaa2eb20cc4764baecf8c2ac29e30ded8470df6b103cd39f2ac913b30a89cc92b8cd6e2a0a16a2c5dec61102a599e43675d9edf59ce2b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/sv-SE/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sv-SE/firefox-78.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "d3413015adf93a6f9923b69805729e58f3826cd1db17585be10263fad78118d666e6036fb3c7e8f64057259e8f1fa93dd4fb2677e3b913bfca42b609077590d5"; + sha512 = "6b4805545d53241e6f4bd6de168fe642d502cdcb33d805f696e7622894b7e1e347870294b168f2be191b96c8d109bf567a0c102c727b0d6d399e4bf1f0e0464b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ta/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ta/firefox-78.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "fa6365f5ed4f53f12b8f7692aebae81150b4b8df6830f0f215c854b9603bfa57157f9e984201c5edf46bef8bd2d12772b5453b9b518f8cb90b3fd927d991d69b"; + sha512 = "0681cef623d3266b40cf3081c19f5fd54b0aac447684553fa9205735099bacd615d024f2205329c2c14a4f48c81cb7356039cb8bdc76c0e68b0c4c85c821f0a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/te/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/te/firefox-78.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "6eafe03b0856218a04f9fd78153552fd9b1026c2fb1b252e90decacd580b235d40cea0b54b6ba4209f9aea92c82785469cbd633e23c6ef8dfc61071f7412c491"; + sha512 = "d1b4eab69607d6ce2b94841c2320aebdfbbf2ed71d09d2d34eaeedf18828b3db6c85062f52dfd7555230d29b5431db742ed261d76c7ff61bc8e652dd9af5eae1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/th/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/th/firefox-78.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "6c18435b711a8300232eb64014305366f9eb96196e8c04cb2b30a84c8d21a738405e0c5abcbc2e2acf598d7ff6479cd170fe4b1fe9e02a1a59c0407d3d301c2a"; + sha512 = "2020ca64cc8aac6fc5cf45fb9201dfff33f29c453bd2e876456017876f7965bde5308464bf08eaafd457da2d51dbee385cdf35921ca8f92f651ed9cf3b900697"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/tl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/tl/firefox-78.0b2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "d97c291dd618fd9ee9863d021c15113355d6668904685197d355156e365aa15e8ebcc2d62959caa3e596ab6609c84a571ff1b9c2e206e763f1dc691d2c4b90ca"; + sha512 = "9cef23915220fd61dd699fae18ce7ceac585d5b704ebf8268365a36108d0e52a488a88deb49e0b942fc2cfc164d5306d1bcba9c2ebefaabcead775bde181f368"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/tr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/tr/firefox-78.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "4c253b3f65ad7a04759fcde055315fe30f0b8433e0b670ffecbd906b8ec2ce96825bfd133bf7f014f696c1805e38152b0e4159b29840b22c77dbdc92dde5ebc9"; + sha512 = "7f02a59ba18c59648c98f5965bd0e960149b2edf121ebc2590353d4aa8fc26a270ef2fb16f9a80fa69e604244d56cdaf3029c12149049aabe9796e347fcc4d77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/trs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/trs/firefox-78.0b2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "b8d6e7ecbdfbff07a08a739cafb50a26c760b0ffb77386d57ae29255c57f67fcbc25ff95d4c3d9f1592b0aa84241493edf86a834a11af3f565ba35a1a6bac21d"; + sha512 = "e1dc9905817bdff2db64f60440044204c9335c443b9db605915a4b412426ae877f5e7b2a83cb8b73ca534627d2b1b8b4b9a11306779baa8516ba06d85b3b9a18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/uk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/uk/firefox-78.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "d4d33614c0ee3382609d069327a7eb64dc00572c9150650f469389f13d6e8031e9ff92900fe1f8ff0bd6c8b0e77733d7dba1ded72bd598257c028fef218925ea"; + sha512 = "3bb99eda1b5c33418ae7267dfe65bb905c617818f405b80e775d70d6bb8a78f143843aa2256e442aa36304ae6f4284524ce4836a1c864ba06fe558c202f04258"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/ur/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ur/firefox-78.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "b9efc510b1694a3aed04727484bd436d74f426d6c10ff491e770d4db38a0617a462015c5715e1d586490869f3d986b546a2f0da32e9c9bd7b9fb599804ec8b15"; + sha512 = "e1f71eb9b6b5f0dcdeedd3cca964a6110e6d9cf4e5fae815922135b3dee8bd6ce42c97b893eb922e436c5088130035793d99293ec1c5ce8c70d4ae5e0a097f7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/uz/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/uz/firefox-78.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "65b0b0daf9869d82c16956f36d470dd52f82c7521c11877420ade0726e5f859f0b5fd8a68f587ea51f668067b45b777313b96f584e8cbfb4628704bd21b8f150"; + sha512 = "39cc68ab411bbfb784ea3a70306ad2fd27cf377e796f3cf39a1f68d70363923dd1fb0cfcd39f62efa2940439969ae0467191c0c62ac68dfb5205b29760f9a923"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/vi/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/vi/firefox-78.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "4bb9160bd25f77959e9113b6fde02898193679afb2f11432271129472c8495427597c753c4ca3d7c138814278aa801957cbc73d55ab229cc05ed02a9b446b873"; + sha512 = "4ab8ee124d40ed7a26ff0cf7257c60dc8a9879c82b6b881ee0fbae1662fa8e26f672ad59993419dbe93458723c4d4b1a1dbec261ec3811c348449a1a352dd688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/xh/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/xh/firefox-78.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "0a5b9924328080838c1a2ae2a0823d0d28954a356d431fcc57c2ca387651e4bdb20673533ae098af68a93430214ff159c2d13a0180cb7862dbfa78abb2e1dd37"; + sha512 = "fea8a74c935e7213e551b1f9c2c00286eca13a2d1a987bf523ebabcd57bcc5dfdcdceb23b4d589e354f116900b8ace28e41a069fa0d8692656e70960025e39f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/zh-CN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/zh-CN/firefox-78.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "811934399498bae9a330b5a773510507fc6cd4d3d084ea9a2d866d2789576276155a8173a2e6cb4ac6c021acfb79220f64f4b484e5806a8aede252fdc726712f"; + sha512 = "a5b1dcc1fad60e62f3d7b258193f7c76a807ec3efbc766c50096649eb1e4bb523a981f4b30c9d93a1bd814dea1d99230ad3091a1f8502ac44e177073c0afcb3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b7/linux-i686/zh-TW/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/zh-TW/firefox-78.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "ddcee97acae9b4abfcb10e6ff095d9f69134f56e95ad46abd9dbba7f26f9fd0318aca470346add479ffa6899aa6a403c7a29563827935388dd92a49a9817faee"; + sha512 = "3f82220802d5fee6502464faf62bc0dd7edcddd0bb93d9e9636da70b7a5e4760d1b1928976793d984c56c6aa73cc9bb13b687590b0a85b395137fa4d7ec72d90"; } ]; } From 35a6dc658dd7d852073ca8cde5982fc7aee4e3ae Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Fri, 5 Jun 2020 00:24:15 +0200 Subject: [PATCH 1514/3452] python3Packages.pytest-rerunfailures: 8.0 -> 9.0 fixes NixOS/nixpkgs#89508 (cherry picked from commit 53481e4bf033e50f41e4a9bb9bfe6a4ff2bb6a5d) --- .../python-modules/pytest-rerunfailures/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 79631824b927..86083265dbda 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -1,12 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, mock }: +{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, pytest, mock }: buildPythonPackage rec { pname = "pytest-rerunfailures"; version = "9.0"; + disabled = pythonOlder "3.5"; + src = fetchPypi { inherit pname version; - sha256 = "895ac2a6486c0da0468ae31768b818d9f3f7fceddef110970c7dbb09e7b4b8e4"; + sha256 = "1r5qnkkhkfvx1jbi1wfyxpyggwyr32w6h5z3i93a03bc92kc4nl9"; }; checkInputs = [ mock pytest ]; From 2a8b8f6593016e0dfdb12089950cdad7efe06eb6 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 12 Jun 2020 15:23:21 -0400 Subject: [PATCH 1515/3452] release-lib: Avoid filtering twice We were using `supportedMatches` both when getting the list of platforms, and before `genAttrs` the derivation for each. Now we just filter the second time, --- pkgs/top-level/release-lib.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 9dff0503d23a..1e33c7b0585b 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -145,7 +145,7 @@ rec { let res = builtins.tryEval ( if isDerivation value then value.meta.hydraPlatforms - or (supportedMatches (value.meta.platforms or [ "x86_64-linux" ])) + or (value.meta.platforms or [ "x86_64-linux" ]) else if value.recurseForDerivations or false || value.recurseForRelease or false then packagePlatforms value else From f0cf89278e8494c96e72c7756573bec9dc36549b Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Fri, 5 Jun 2020 00:25:54 +0200 Subject: [PATCH 1516/3452] pytest-rerunfailures: add das-g as maintainer (cherry picked from commit 46821ede459fef99161805aa4000bc7ded25675c) --- .../development/python-modules/pytest-rerunfailures/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 86083265dbda..c15320867cbe 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "pytest plugin to re-run tests to eliminate flaky failures"; homepage = "https://github.com/pytest-dev/pytest-rerunfailures"; license = licenses.mpl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ das-g ]; }; } From 803ef3f3679044454837295b87154e21b518df4b Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Mon, 8 Jun 2020 16:05:03 +0200 Subject: [PATCH 1517/3452] piccata 1.0.1 -> 2.0.0 Signed-off-by: Sirio Balmelli --- .../python-modules/piccata/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix index f1cfb362a80c..bbb4fcf19934 100644 --- a/pkgs/development/python-modules/piccata/default.nix +++ b/pkgs/development/python-modules/piccata/default.nix @@ -1,16 +1,22 @@ -{ buildPythonPackage, fetchPypi, lib, ipaddress, isPy3k }: +{ buildPythonPackage, isPy27, fetchFromGitHub, lib, ipaddress }: buildPythonPackage rec { pname = "piccata"; - version = "1.0.1"; - disabled = isPy3k; + version = "2.0.0"; + disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "45f6c98c2ea809d445040888117f99bc3ee843490d86fecc5805ff5ea41508f7"; + src = fetchFromGitHub { + owner = "NordicSemiconductor"; + repo = pname; + rev = version; + sha256 = "0pn842jcf2czjks5dphivgp1s7wiifqiv93s0a89h0wxafd6pbsr"; }; - propagatedBuildInputs = [ ipaddress ]; + propagatedBuildInputs = [ + ipaddress + ]; + + pythonImportsCheck = [ "piccata" ]; meta = { description = "Simple CoAP (RFC7252) toolkit"; From a113aa5b6becea8989f6d9df986a9423f4a806db Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 9 Jun 2020 15:56:05 -0400 Subject: [PATCH 1518/3452] python3Packages.rnc2rng: init at 2.6.4 --- .../python-modules/rnc2rng/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/rnc2rng/default.nix diff --git a/pkgs/development/python-modules/rnc2rng/default.nix b/pkgs/development/python-modules/rnc2rng/default.nix new file mode 100644 index 000000000000..8e42baf8ff74 --- /dev/null +++ b/pkgs/development/python-modules/rnc2rng/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, rply +}: + +buildPythonPackage rec { + pname = "rnc2rng"; + version = "2.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kmp3iwxxyzjsd47j2sprd47ihhkwhb3yydih3af5bbfq0ibh1w8"; + }; + + propagatedBuildInputs = [ rply ]; + + checkPhase = "${python.interpreter} test.py"; + + meta = with lib; { + homepage = "https://github.com/djc/rnc2rng"; + description = "Compact to regular syntax conversion library for RELAX NG schemata"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 27195adef521..9bf1df8239f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5689,6 +5689,8 @@ in { Pyro5 = callPackage ../development/python-modules/pyro5 { }; + rnc2rng = callPackage ../development/python-modules/rnc2rng { }; + rope = callPackage ../development/python-modules/rope { }; ropper = callPackage ../development/python-modules/ropper { }; From 4c2504a6bf9f1b566e7c08593e9915834485c58f Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 9 Jun 2020 16:08:55 -0400 Subject: [PATCH 1519/3452] python3Packages.citeproc-py: init at 0.5.1 --- .../python-modules/citeproc-py/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/citeproc-py/default.nix diff --git a/pkgs/development/python-modules/citeproc-py/default.nix b/pkgs/development/python-modules/citeproc-py/default.nix new file mode 100644 index 000000000000..bd1ae0c563a4 --- /dev/null +++ b/pkgs/development/python-modules/citeproc-py/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, git +, lxml +, rnc2rng +}: + +buildPythonPackage rec { + pname = "citeproc-py"; + version = "0.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "00aaff50jy4j0nakdzq9258z1gzrac9baarli2ymgspj88jg5968"; + }; + + buildInputs = [ rnc2rng ]; + + propagatedBuildInputs = [ lxml ]; + + checkInputs = [ nose git ]; + checkPhase = "nosetests tests"; + doCheck = false; # seems to want a Git repository, but fetchgit with leaveDotGit also fails + pythonImportsCheck = [ "citeproc" ]; + + meta = with lib; { + homepage = "https://github.com/brechtm/citeproc-py"; + description = "Citation Style Language (CSL) parser for Python"; + license = licenses.bsd2; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9bf1df8239f5..28700bb631c1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1999,6 +1999,8 @@ in { pythonProtobuf = self.protobuf; }; + citeproc-py = callPackage ../development/python-modules/citeproc-py { }; + colorcet = callPackage ../development/python-modules/colorcet { }; coloredlogs = callPackage ../development/python-modules/coloredlogs { }; From a6d8a12e4eb20ecd7c97ae695a87fa5fbab28cae Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 9 Jun 2020 16:09:21 -0400 Subject: [PATCH 1520/3452] python3Packages.duecredit: init at 0.8.0 --- .../python-modules/duecredit/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/duecredit/default.nix diff --git a/pkgs/development/python-modules/duecredit/default.nix b/pkgs/development/python-modules/duecredit/default.nix new file mode 100644 index 000000000000..28aaf8ee47c9 --- /dev/null +++ b/pkgs/development/python-modules/duecredit/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, contextlib2 +, pytest +, pytestCheckHook +, vcrpy +, citeproc-py +, requests +, setuptools +, six +}: + +buildPythonPackage rec { + pname = "duecredit"; + version = "0.8.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1yxd8579pakrfhq0hls0iy37nxllsm8y33na220g08znibrp7ix0"; + }; + + # bin/duecredit requires setuptools at runtime + propagatedBuildInputs = [ citeproc-py requests setuptools six ]; + + checkInputs = [ contextlib2 pytest pytestCheckHook vcrpy ]; + disabledTests = [ "test_io" ]; + + meta = with lib; { + homepage = "https://github.com/duecredit/duecredit"; + description = "Simple framework to embed references in code"; + license = licenses.bsd2; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 28700bb631c1..1ea7ee183549 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2071,6 +2071,8 @@ in { dodgy = callPackage ../development/python-modules/dodgy { }; + duecredit = callPackage ../development/python-modules/duecredit { }; + dugong = callPackage ../development/python-modules/dugong {}; easysnmp = callPackage ../development/python-modules/easysnmp { From 503f9f74a0c3af7ac4c4aa47be382dfa56e0e301 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Jun 2020 12:36:34 -0700 Subject: [PATCH 1521/3452] python3Packages.pyx: fix src pname --- pkgs/development/python-modules/pyx/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix index 8b5e3633e25c..339fa9029b70 100644 --- a/pkgs/development/python-modules/pyx/default.nix +++ b/pkgs/development/python-modules/pyx/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyx"; version = "0.15"; + disabled = !isPy3k; src = fetchPypi { - inherit pname version; - sha256 = "0fc3b00c5e7fb6f4aefbf63b95f624297dde47700a82b8b5ad6ebb346b5e4977"; + pname = "PyX"; + inherit version; + sha256 = "0xs9brmk9fvfmnsvi0haf13xwz994kv9afznzfpg9dkzbq6b1hqg"; }; - disabled = !isPy3k; - # No tests in archive doCheck = false; @@ -23,5 +23,4 @@ buildPythonPackage rec { homepage = "http://pyx.sourceforge.net/"; license = with licenses; [ gpl2 ]; }; - } From 98f95ef9c4559c96cf852e5c0dae1d5124145a78 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 12 Jun 2020 22:00:09 +0200 Subject: [PATCH 1522/3452] blender: fix build with python 3.8 Since Python 3.8 an `m` is no longer added when pymalloc is used. https://bugs.python.org/issue36707 --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 60514c92b338..4249cec45c0b 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -86,9 +86,9 @@ stdenv.mkDerivation rec { "-DWITH_SDL=OFF" "-DWITH_OPENCOLORIO=ON" "-DWITH_OPENSUBDIV=ON" - "-DPYTHON_LIBRARY=${python.libPrefix}m" + "-DPYTHON_LIBRARY=${python.libPrefix}" "-DPYTHON_LIBPATH=${python}/lib" - "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}m" + "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" "-DPYTHON_VERSION=${python.pythonVersion}" "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" From 8c3e9313c924ac16595077fb75e5c6aad453dcb9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Jun 2020 13:20:18 -0700 Subject: [PATCH 1523/3452] gns3-server: fix build --- pkgs/applications/networking/gns3/server.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 32dc42e9f51a..26553b9aed2a 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -4,8 +4,10 @@ let defaultOverrides = commonOverrides ++ [ - (mkOverride "jsonschema" "2.6.0" - "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg") + (mkOverride "jsonschema" "3.2.0" + "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") + (mkOverride "aiofiles" "0.4.0" + "1vmvq9qja3wahv8m1adkyk00zm7j0x64pk3f2ry051ja66xa07h2") ]; python = python3.override { From 38397dc9ea14888e8efc51dfa5f93df5258abd6c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Jun 2020 13:26:32 -0700 Subject: [PATCH 1524/3452] python3Packages.pylint-plugin-utils: fix build --- .../development/python-modules/pylint-plugin-utils/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pylint-plugin-utils/default.nix b/pkgs/development/python-modules/pylint-plugin-utils/default.nix index 2d48ef7fea76..f2bbef2cc8c1 100644 --- a/pkgs/development/python-modules/pylint-plugin-utils/default.nix +++ b/pkgs/development/python-modules/pylint-plugin-utils/default.nix @@ -5,6 +5,7 @@ # pythonPackages , pylint +, toml }: buildPythonPackage rec { @@ -20,7 +21,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - pylint + pylint toml ]; checkPhase = '' From be5804ac9ed4af838f02b3d7f69ece199909c2e3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Jun 2020 13:31:50 -0700 Subject: [PATCH 1525/3452] python2Packages.validators: disable url tests --- pkgs/development/python-modules/validators/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index cc62eb37df78..dbed55725bc7 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , six , decorator -, pytest +, pytestCheckHook , isort , flake8 }: @@ -23,14 +24,12 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook flake8 isort ]; - checkPhase = '' - pytest - ''; + disabledTests = lib.optionals isPy27 [ "url" ]; meta = with lib; { description = "Python Data Validation for Humans™"; From 619f7d8c74095b6c8e4afab296598044850f00a2 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 12 Jun 2020 11:25:08 -0400 Subject: [PATCH 1526/3452] broot: 0.13.6 -> 0.15.1 --- pkgs/tools/misc/broot/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index bf5d569bab48..554d7f9e1dd3 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,23 +2,23 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.13.6"; + version = "0.15.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "08d0zddqqymxj1qcp8c78r7mpii1piy6awaf135jxhzwi775sqqv"; + sha256 = "1ggzx4w69fmvaxm5gfqhh8ncr2mdx528zm6vwrrwz165lga2fvw6"; }; - cargoSha256 = "1cxvx51zkmhszmgwsi0aj469xz98v5nk79zvqfyma27gsnh8jczr"; + cargoSha256 = "0gcq0fww9hl3avh3qcnpnwmpwda4cymr7x3kd3frdizrs8i643mr"; nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; postPatch = '' - substituteInPlace src/verb_store.rs --replace '"/bin/' '"${coreutils}/bin/' + substituteInPlace src/verb/builtin.rs --replace '"/bin/' '"${coreutils}/bin/' ''; postInstall = '' From 529c2f192e2c06b6399cae0a7c3c22883e046cc4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Jun 2020 13:49:40 -0700 Subject: [PATCH 1527/3452] python3Packages.sseclient: fix tests --- pkgs/development/python-modules/sseclient/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index 559b3fff178a..8ba678ed5757 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi , requests, six -, backports_unittest-mock, pytest, pytestrunner }: +, backports_unittest-mock, pytestCheckHook, pytestrunner }: buildPythonPackage rec { pname = "sseclient"; @@ -13,7 +13,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests six ]; - checkInputs = [ backports_unittest-mock pytest pytestrunner ]; + checkInputs = [ backports_unittest-mock pytestCheckHook pytestrunner ]; + + # tries to open connection to wikipedia + disabledTests = [ "event_stream" ]; meta = with stdenv.lib; { description = "Client library for reading Server Sent Event streams"; From dd35d3b655ad42d44161a7100133f539d46b9c33 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Jun 2020 13:53:22 -0700 Subject: [PATCH 1528/3452] python3Packages.vmprof: fix build, mark not broken --- pkgs/development/python-modules/vmprof/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index 70e7dbeba697..149efb753e20 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -1,6 +1,9 @@ { stdenv , buildPythonPackage , fetchPypi +, colorama +, libunwind +, pytz , requests , six }: @@ -14,16 +17,16 @@ buildPythonPackage rec { sha256 = "a2d872a40196404386d1e0d960e97b37c86c3f72a4f9d5a2b5f9ca1adaff5b62"; }; - propagatedBuildInputs = [ requests six]; + buildInputs = [ libunwind ]; + propagatedBuildInputs = [ colorama requests six pytz ]; # No tests included doCheck = false; + pythonImportsCheck = [ "vmprof" ]; meta = with stdenv.lib; { description = "A vmprof client"; license = licenses.mit; homepage = "https://vmprof.readthedocs.org/"; - broken = true; }; - } From 3ba9e643fd0e438d196e439764fc72a72869ffd0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 12 Jun 2020 13:57:27 -0700 Subject: [PATCH 1529/3452] python3Packages.seekpath: fix build, use github for tests --- .../development/python-modules/seekpath/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix index af74649899bf..e387f27c6738 100644 --- a/pkgs/development/python-modules/seekpath/default.nix +++ b/pkgs/development/python-modules/seekpath/default.nix @@ -1,17 +1,20 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, future, spglib, glibcLocales, pytest }: +{ stdenv, buildPythonPackage, fetchFromGitHub, numpy, future, spglib, glibcLocales, pytest, scipy }: buildPythonPackage rec { pname = "seekpath"; version = "2.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "188513ee187fbbace49066a29ecea9bbd351f23da3bea33d507d0f590856b082"; + src = fetchFromGitHub { + owner = "giovannipizzi"; + repo = pname; + rev = "v${version}"; + sha256 = "0x592650ynacmx5n5bilj5lja4iw0gf1nfypy82cmy5z363qhqxn"; }; LC_ALL = "en_US.utf-8"; - propagatedBuildInputs = [ numpy spglib future ]; + # scipy isn't listed in install_requires, but used in package + propagatedBuildInputs = [ numpy spglib future scipy ]; nativeBuildInputs = [ glibcLocales ]; From b36ef706fb8d10d3602179c1975eb62b1c3a9ac3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 11 Jun 2020 15:45:39 -0500 Subject: [PATCH 1530/3452] nixos/ipfs: add startWhenNeeded option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes it possible to only start IPFS when needed. So a user’s IPFS daemon only starts when they actually use it. A few important warnings though: - This probably shouldn’t be mixed with services.ipfs.autoMount since you want /ipfs and /ipns aren’t activated like this - ipfs.socket assumes that you are using ports 5001 and 8080 for the API and gateway respectively. We could do some parsing to figure out what is in apiAddress and gatewayAddress, but that’s kind of difficult given the nonstandard address format. - Apparently? this doesn’t work with the --api commands used in the tests. Of course you can always start automatically with startWhenNeeded = false, or just running ‘systemctl start ipfs.service’. Tested with the following test (modified from tests/ipfs.nix): import ./make-test-python.nix ({ pkgs, ...} : { name = "ipfs"; nodes.machine = { ... }: { services.ipfs = { enable = true; startWhenNeeded = true; }; }; testScript = '' start_all() machine.wait_until_succeeds("ipfs id") ipfs_hash = machine.succeed("echo fnord | ipfs add | awk '{ print $2 }'") machine.succeed(f"ipfs cat /ipfs/{ipfs_hash.strip()} | grep fnord") ''; }) Fixes #90145 Update nixos/modules/services/network-filesystems/ipfs.nix Co-authored-by: Florian Klink --- .../services/network-filesystems/ipfs.nix | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 9b8fe6d5f10b..f7a611399923 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -136,6 +136,12 @@ in { example = 64*1024; }; + startWhenNeeded = mkOption { + type = types.bool; + default = false; + description = "Whether to use socket activation to start IPFS when needed."; + }; + }; }; @@ -192,6 +198,8 @@ in { fi ''; + wantedBy = [ "default.target" ]; + serviceConfig = { Type = "oneshot"; RemainAfterExit = true; @@ -207,8 +215,6 @@ in { wants = [ "ipfs-init.service" ]; after = [ "ipfs-init.service" ]; - wantedBy = [ "default.target" ]; - preStart = optionalString cfg.autoMount '' ipfs --local config Mounts.FuseAllowOther --json true ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir} @@ -235,6 +241,18 @@ in { User = cfg.user; Group = cfg.group; } // optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; }; + } // optionalAttrs (!cfg.startWhenNeeded) { + wantedBy = [ "default.target" ]; + }; + + # Note the upstream service assumes default host / port + # we should override it when a custom is provided above. + systemd.sockets.ipfs-gateway = mkIf cfg.startWhenNeeded { + wantedBy = [ "sockets.target" ]; + }; + + systemd.sockets.ipfs-api = mkIf cfg.startWhenNeeded { + wantedBy = [ "sockets.target" ]; }; }; From fa06d8f96121daa8863b57dfd9f99e8237c07afe Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 11 Jun 2020 16:59:11 -0500 Subject: [PATCH 1531/3452] nixos/ipfs: actually use upstream systemd units --- nixos/modules/services/network-filesystems/ipfs.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index f7a611399923..7c376207db4e 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -179,6 +179,8 @@ in { "d '${cfg.ipnsMountDir}' - ${cfg.user} ${cfg.group} - -" ]; + systemd.packages = [ pkgs.ipfs ]; + systemd.services.ipfs-init = { description = "IPFS Initializer"; @@ -237,7 +239,7 @@ in { cfg.extraConfig)) ); serviceConfig = { - ExecStart = "${pkgs.ipfs}/bin/ipfs daemon ${ipfsFlags}"; + ExecStart = ["" "${pkgs.ipfs}/bin/ipfs daemon ${ipfsFlags}"]; User = cfg.user; Group = cfg.group; } // optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; }; From 982a17a48e454df80c5ab84de0e17948462f8970 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 11 Jun 2020 16:59:38 -0500 Subject: [PATCH 1532/3452] nixos/ipfs: always expose sockets --- nixos/modules/services/network-filesystems/ipfs.nix | 5 +++-- nixos/tests/ipfs.nix | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 7c376207db4e..a5f514974f26 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -249,12 +249,13 @@ in { # Note the upstream service assumes default host / port # we should override it when a custom is provided above. - systemd.sockets.ipfs-gateway = mkIf cfg.startWhenNeeded { + systemd.sockets.ipfs-gateway = { wantedBy = [ "sockets.target" ]; }; - systemd.sockets.ipfs-api = mkIf cfg.startWhenNeeded { + systemd.sockets.ipfs-api = { wantedBy = [ "sockets.target" ]; + socketConfig.ListenStream = [ "%t/ipfs.sock" ]; }; }; diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix index 4d721aec0c73..82234f969226 100644 --- a/nixos/tests/ipfs.nix +++ b/nixos/tests/ipfs.nix @@ -21,5 +21,12 @@ import ./make-test-python.nix ({ pkgs, ...} : { ) machine.succeed(f"ipfs cat /ipfs/{ipfs_hash.strip()} | grep fnord") + + ipfs_hash = machine.succeed( + "echo fnord2 | ipfs --api /unix/run/ipfs.sock add | awk '{ print $2 }'" + ) + machine.succeed( + f"ipfs --api /unix/run/ipfs.sock cat /ipfs/{ipfs_hash.strip()} | grep fnord2" + ) ''; }) From 2c2f6c0b381ab89c44098d22c1f643c5f90d3415 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 11 Jun 2020 17:53:59 -0500 Subject: [PATCH 1533/3452] nixos/ipfs: only set listenstream when gateway/api is default --- nixos/modules/services/network-filesystems/ipfs.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index a5f514974f26..a3bd40135d19 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -1,7 +1,8 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, options, ... }: with lib; let cfg = config.services.ipfs; + opt = options.services.ipfs; ipfsFlags = toString ([ (optionalString cfg.autoMount "--mount") @@ -247,15 +248,16 @@ in { wantedBy = [ "default.target" ]; }; - # Note the upstream service assumes default host / port - # we should override it when a custom is provided above. systemd.sockets.ipfs-gateway = { wantedBy = [ "sockets.target" ]; + socketConfig.ListenStream = [ "" ] + ++ lib.optional (cfg.gatewayAddress == opt.gatewayAddress.default) [ "127.0.0.1:8080" "[::1]:8080" ]; }; systemd.sockets.ipfs-api = { wantedBy = [ "sockets.target" ]; - socketConfig.ListenStream = [ "%t/ipfs.sock" ]; + socketConfig.ListenStream = [ "" "%t/ipfs.sock" ] + ++ lib.optional (cfg.apiAddress == opt.apiAddress.default) [ "127.0.0.1:5001" "[::1]:5001" ]; }; }; From d55e70b7cd0d879147932e2d43884cc6eabbbea7 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 12 Jun 2020 15:55:44 -0700 Subject: [PATCH 1534/3452] rust-analyzer: 2020-06-01 -> 2020-06-08 --- .../node-packages/node-packages.nix | 730 ++++++++++++------ .../tools/rust/rust-analyzer/default.nix | 6 +- 2 files changed, 484 insertions(+), 252 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 69045fa7d615..964328388ca7 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -22,31 +22,31 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.901.7" = { + "@angular-devkit/architect-0.901.8" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.901.7"; + version = "0.901.8"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.7.tgz"; - sha512 = "yW/PUEqle55QihOFbmeNXaVTodhfeXkteoFDUpz+YpX3xiQDXDtNbIJSzKOQTojtBKdSMKMvZkQLr+RAa7/1EA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.8.tgz"; + sha512 = "tK9ZQlubH6n+q+c2J9Wvfcxg3RFuRiTfJriNoodo6GHvtF2KLdPY67w3Gen0Sp172A5Q8Y927NseddNI8RZ/0A=="; }; }; - "@angular-devkit/core-9.1.7" = { + "@angular-devkit/core-9.1.8" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "9.1.7"; + version = "9.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.7.tgz"; - sha512 = "guvolu9Cl+qYMTtedLZD9wCqustJjdqzJ2psD2C1Sr1LrX9T0mprmDldR/YnhsitThveJEb6sM/0EvqWxoSvKw=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.8.tgz"; + sha512 = "4k1pZwje2oh5c/ULg7pnCBzTstx3l3uF7O5tQq/KXomDDsam97IhLm6cKUqQpaoyC1NUsBV6xJARJ0PyUP5TPQ=="; }; }; - "@angular-devkit/schematics-9.1.7" = { + "@angular-devkit/schematics-9.1.8" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "9.1.7"; + version = "9.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.7.tgz"; - sha512 = "oeHPJePBcPp/bd94jHQeFUnft93PGF5iJiKV9szxqS8WWC5OMZ5eK7icRY0PwvLyfenspAZxdZcNaqJqPMul5A=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.8.tgz"; + sha512 = "/8L5J4X6SkcFMRmrSQHvJWOPilrMWTNlv1lD+1z06D3xGJEktVxXM3gCUXhDrbMvpoi+lYtR2Fuia0E6zvyjCQ=="; }; }; "@antora/asciidoc-loader-2.3.3" = { @@ -220,13 +220,13 @@ let sha512 = "fDj5rWlTi/czvUS5t7V7I45Ai6bOO3Z7JARYj21Y2xxfbRGtJi6h8FvLX0N/EbzQgo/fiZc/HAhtfwn+OCjD7A=="; }; }; - "@apollographql/graphql-playground-html-1.6.24" = { + "@apollographql/graphql-playground-html-1.6.26" = { name = "_at_apollographql_slash_graphql-playground-html"; packageName = "@apollographql/graphql-playground-html"; - version = "1.6.24"; + version = "1.6.26"; src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.24.tgz"; - sha512 = "8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ=="; + url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.26.tgz"; + sha512 = "XAwXOIab51QyhBxnxySdK3nuMEUohhDsHQ5Rbco/V1vjlP75zZ0ZLHD9dTpXTN8uxKxopb2lUvJTq+M4g2Q0HQ=="; }; }; "@azu/format-text-1.0.1" = { @@ -2524,22 +2524,22 @@ let sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw=="; }; }; - "@octokit/auth-token-2.4.1" = { + "@octokit/auth-token-2.4.2" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.1.tgz"; - sha512 = "NB81O5h39KfHYGtgfWr2booRxp2bWOJoqbWwbyUg2hw6h35ArWYlAST5B3XwAkbdcx13yt84hFXyFP5X0QToWA=="; + url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.2.tgz"; + sha512 = "jE/lE/IKIz2v1+/P0u4fJqv0kYwXOTujKemJMFr6FeopsxlIK3+wKDCJGnysg81XID5TgZQbIfuJ5J0lnTiuyQ=="; }; }; - "@octokit/endpoint-6.0.2" = { + "@octokit/endpoint-6.0.3" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.2.tgz"; - sha512 = "xs1mmCEZ2y4shXCpFjNq3UbmNR+bLzxtZim2L0zfEtj9R6O6kc4qLDvYw66hvO6lUsYzPTM5hMkltbuNAbRAcQ=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.3.tgz"; + sha512 = "Y900+r0gIz+cWp6ytnkibbD95ucEzDSKzlEnaWS52hbCDNcCJYO5mRmWW7HRAnDc7am+N/5Lnd8MppSaTYx1Yg=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -2578,13 +2578,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.4.4" = { + "@octokit/request-5.4.5" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.4"; + version = "5.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.4.tgz"; - sha512 = "vqv1lz41c6VTxUvF9nM+a6U+vvP3vGk7drDpr0DVQg4zyqlOiKVrY17DLD6de5okj+YLHKcoqaUZTBtlNZ1BtQ=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.5.tgz"; + sha512 = "atAs5GAGbZedvJXXdjtKljin+e2SltEs48B3naJjqWupYl2IUBbB/CJisyjbNHcKpHzb3E+OYEZ46G8eakXgQg=="; }; }; "@octokit/request-error-1.2.1" = { @@ -2632,6 +2632,15 @@ let sha512 = "/wbFy1cUIE5eICcg0wTKGXMlKSbaAxEr00qaBXzscLXpqhcwgXeS6P8O0pkysBhRfyjkKjJaYrvR1ExMO5eOXQ=="; }; }; + "@octokit/types-5.0.0" = { + name = "_at_octokit_slash_types"; + packageName = "@octokit/types"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/types/-/types-5.0.0.tgz"; + sha512 = "3LVS+MbeqwSd5G4KS8123cZz+hWomsiGeMnQ/QJIBFDwL/YHX8kkr0FZXrgWEMO7Fgi2/VOrhbiFnk9sZ+s4qA=="; + }; + }; "@parcel/fs-1.11.0" = { name = "_at_parcel_slash_fs"; packageName = "@parcel/fs"; @@ -2821,22 +2830,22 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-9.1.7" = { + "@schematics/angular-9.1.8" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "9.1.7"; + version = "9.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.7.tgz"; - sha512 = "ld3WcoMWvup04V3OWioQ+AFGQBzz7IDM4Fxc5+Qc3wILWkDJnNkrc4EmJAow96Ab4/T1+Wl1vof3tV4At0BTzA=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.8.tgz"; + sha512 = "fjyAP9m4aF51OVdksRXCOF8BTyt96PqFmKK9G0kuwOzgfx2gPZNOO3wOZH6xFAMZ09y86VGzasZxZNeDdyN4sQ=="; }; }; - "@schematics/update-0.901.7" = { + "@schematics/update-0.901.8" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.901.7"; + version = "0.901.8"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.7.tgz"; - sha512 = "6IpQVFvbu47CrXfqqHAzv2vi7AOdfi1S+SiayXU6FWTeA2wV47H8R60VjxurL8JkDGoVhFgC4+lK6KG++g3dQw=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.8.tgz"; + sha512 = "v1tEYX6yM5vuwXW7AG7OZ4OtjqRwTo3kd69LVJyOdF/d9HlqaAFU301RuEsAPwOrPqZEQdTwklH1fNJnqgpB/w=="; }; }; "@serverless/cli-1.4.0" = { @@ -2938,13 +2947,13 @@ let sha512 = "hcMiX523rkp6kHeKnM1x6/dXEY+d1UFSr901yVKeeCgpFy4u33UI9vlKaPweAZCF6Ahzqywf01IsFTuBVadCrQ=="; }; }; - "@serverless/utils-china-0.1.13" = { + "@serverless/utils-china-0.1.14" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.13"; + version = "0.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.13.tgz"; - sha512 = "NeWXaNDUs/8mUyq2OVtSyzTHEg4PabaEmz31tIkG5+AUuNdfg/mlE5RTzOmH0pW/WeKwFtmm3Wehs75WEpzYcQ=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.14.tgz"; + sha512 = "M1/bvs/ZhqPfj1yqdsyxu4yIWtCXHd+a5Av/ZXef1deTn1zJHO+ZJdOtvFzWHb0Sr7sX4p2ZHD/vGj0Rve/Pzg=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -4099,40 +4108,40 @@ let sha512 = "uh+Y2QO7dxNrdLw7mVnjUqkwO/InxEqwN0wF+Za6eo3coxls9aH9kQ/5rSvW2GcNanebRTmsT5w1/92lAOb1bA=="; }; }; - "@vue/cli-shared-utils-4.4.1" = { + "@vue/cli-shared-utils-4.4.4" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.4.1"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.1.tgz"; - sha512 = "teevHgI7XUsKVMOncx3M+6iLjO28woGfRwgUG4hR83moVBHQe5x2OCr2i5t/58bwpv269RD5RYXBQCGtIXuxZw=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.4.tgz"; + sha512 = "ccMZtTMSutR35V5nrU/eyj+zRMomTRGBTLwJPmaJ2sRiW/93MTggQGXDWC8JRAA8yiU1N8xza8mjBxS0O2wIAA=="; }; }; - "@vue/cli-ui-4.4.1" = { + "@vue/cli-ui-4.4.4" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.4.1"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.4.1.tgz"; - sha512 = "UPDvDdYvuacUuq39OQ/WfLsuIrzIJMdL2bkMecpcegDRPi6MEgkInXqSOMEl5v72FX8qStwXYCUSxifoYIIZ/g=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.4.4.tgz"; + sha512 = "BKzDvUgy6fsZolrMLBvMLlue7s3dFeIJdxWWJtc8/CjD5VvLG+XawAePx8W+24QZwCZpvoZIz4zU38D341IT9A=="; }; }; - "@vue/cli-ui-addon-webpack-4.4.1" = { + "@vue/cli-ui-addon-webpack-4.4.4" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.4.1"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.4.1.tgz"; - sha512 = "UJrv7bCSEJIq+nG3xKSOMjkUnQBbUr+vwk6PjBPsMcjOdbra7p8sQfDIXeRSviCgoDVcnODJDMyD0tqg6OI/sA=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.4.4.tgz"; + sha512 = "qx3MnLxk4JeKpkGK2h5ZihuA8Asgu7sbLDagOOaEbF6GpnHSfkrYioE7es8AHm4QHBgn/MWqnkBts5XDN5r4LA=="; }; }; - "@vue/cli-ui-addon-widgets-4.4.1" = { + "@vue/cli-ui-addon-widgets-4.4.4" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.4.1"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.4.1.tgz"; - sha512 = "VaAnCI1X2SEllLNf1TXNz0BARfdb+COMUMzc17PMb5xmdqDswPvVKG5pnFurKODWFgI7zcbk4kBnrYojdLnhNg=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.4.4.tgz"; + sha512 = "nOe6LOwZsKCiaH+jrAO2/G90qAkzB1RYivcWGnXirQAH7nec1ZysDNQv1HMDIfWbhCkJMWhGICuWcrn+rtb/8Q=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -4774,13 +4783,13 @@ let sha512 = "ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="; }; }; - "acorn-7.2.0" = { + "acorn-7.3.1" = { name = "acorn"; packageName = "acorn"; - version = "7.2.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz"; - sha512 = "apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ=="; + url = "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz"; + sha512 = "tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="; }; }; "acorn-globals-1.0.9" = { @@ -5593,13 +5602,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.28.2" = { + "apollo-2.28.3" = { name = "apollo"; packageName = "apollo"; - version = "2.28.2"; + version = "2.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.28.2.tgz"; - sha512 = "UcQIj6+MKcCSEH6la0G1SinIV8+Q3AM9x8Oryq9YXRcwjJqnOYdq1qPpmmTG+SlR9Lfxpo8Sv+e16QuSBFVQNg=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.28.3.tgz"; + sha512 = "+X1RqODYOz1VPO0a/6tZpZiFQr7K6z0ZSm7H9oT9PmuZ9TMC27mwOh2N0i1p+OP+6JORKh8lHmjMvle+doZ82A=="; }; }; "apollo-cache-1.3.5" = { @@ -5638,49 +5647,49 @@ let sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA=="; }; }; - "apollo-codegen-core-0.37.2" = { + "apollo-codegen-core-0.37.3" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.37.2"; + version = "0.37.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.37.2.tgz"; - sha512 = "Cf4+mWf92nd0PlruwoLrHpS1/eRF2M2qaq/NBGyJlLFhwALrMlM63cqMuJ/Q2dWwAB7ecQLKgZdUkv4jisyimQ=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.37.3.tgz"; + sha512 = "/DwAhOOFzl57GdBfRGNnqIAcfZAXpsgFIeWYqlu3I/eIucGBCFWo9CEW1TcNwkZzYGAmSE8tURwPgt7dtnhFpg=="; }; }; - "apollo-codegen-flow-0.35.2" = { + "apollo-codegen-flow-0.35.3" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.35.2"; + version = "0.35.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.35.2.tgz"; - sha512 = "B8Vo0bViAENNNQ+2uAwxnLYsdU0URyQwEpTQDXfV07JLQrm3ebNQqoLeDz2Xacknuh11QtQNexOmM02Q/dfjvw=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.35.3.tgz"; + sha512 = "npDt9PEJiw/ygKUsKxaDGHCnjQUANPlg/F9piIbQ71jwBjNNoNSXrRaRiD5632MfcTvEuBvanElEX3AO2sA1gw=="; }; }; - "apollo-codegen-scala-0.36.2" = { + "apollo-codegen-scala-0.36.3" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.36.2"; + version = "0.36.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.36.2.tgz"; - sha512 = "423HUZo3i1SHBIvH+lusi8fXCRvQWjo+UoRRzzIxiALKDhLAWxgdNADXn0B1jcWJNnyNhfaw58Bh3PtGtFbDnA=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.36.3.tgz"; + sha512 = "KOmcP/0RiqSGY03fXdF87IzQ1RSsApbno3/M8KRVF2yhf+4X3GQXQRpXejHMt4DxnnfPBOn7MqwtP/cDMJIiyw=="; }; }; - "apollo-codegen-swift-0.37.2" = { + "apollo-codegen-swift-0.37.3" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.37.2"; + version = "0.37.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.37.2.tgz"; - sha512 = "sa4huF3fnjMwf93CsOc2vaIwQbolZzELq2o9F3uX6ZNJhiE1oywF64fI5jLuw4adQSe9vX5RI5CbQiKeFoh0xA=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.37.3.tgz"; + sha512 = "0BpwtSE+IP12C7OdoScsOWUgxbcuThgwVRsxybBNugUcmddF5sCdGiRbdm+oKvX1vErsG+XimwmIuZnBPWv6ew=="; }; }; - "apollo-codegen-typescript-0.37.2" = { + "apollo-codegen-typescript-0.37.3" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.37.2"; + version = "0.37.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.37.2.tgz"; - sha512 = "Y837GfKEKVusLj+1DKjHaLcKKyLAGsddNqZRFhXDFAQ4G5Mmrrrn2BzNTYKLoeyDEiBW3dle32Pzyc8UpHbURQ=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.37.3.tgz"; + sha512 = "tuf/AQTFcNrngQrT4q4WKRdiuPbglyR1m3L58g/nNevoO0cRmF6koIix4NB5sO05LgF8XJmd2zHvInUI5v33Ig=="; }; }; "apollo-datasource-0.7.1" = { @@ -5692,13 +5701,13 @@ let sha512 = "h++/jQAY7GA+4TBM+7ezvctFmmGNLrAPf51KsagZj+NkT9qvxp585rdsuatynVbSl59toPK2EuVmc6ilmQHf+g=="; }; }; - "apollo-engine-reporting-2.0.0" = { + "apollo-engine-reporting-2.0.1" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-2.0.0.tgz"; - sha512 = "FvNwORsh3nxEfvQqd2xbd468a0q/R3kYar/Bk6YQdBX5qwqUhqmOcOSxLFk8Zb77HpwHij5CPpPWJb53TU1zcA=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-2.0.1.tgz"; + sha512 = "3OYYk7DqNuJ5xKYnyLy5O2n506jYSryim8WqzBTn9MRphRamwPFjHYQm+akPA60AubXrWnYa6A8euMAiQU0ttA=="; }; }; "apollo-engine-reporting-protobuf-0.5.1" = { @@ -5728,13 +5737,13 @@ let sha512 = "0qa7UOoq7E71kBYE7idi6mNQhHLVdMEDInWk6TNw3KsSWZE2/I68gARP84Mj+paFTO5NYuw1Dht66PVX76Cc2w=="; }; }; - "apollo-language-server-1.22.2" = { + "apollo-language-server-1.22.3" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.22.2"; + version = "1.22.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.22.2.tgz"; - sha512 = "b+KgnjkJnXFRzaNHUb83+IVTw6H5V515DrALBCTlhxa1LmAnET1pm0vuWaFNl5O2fHYqgbtLNz/omipIkvd/5g=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.22.3.tgz"; + sha512 = "RurKlBUNE1RrvY4m93b5WS/DXInUEI47MlzuvholRqZSQovt2rQi81R0RvmS/l3d6y5TBfxbPFpT5RyHbdAntw=="; }; }; "apollo-link-1.2.14" = { @@ -5818,13 +5827,13 @@ let sha512 = "L7LHZ3k9Ao5OSf2WStvQhxdsNVplRQi7kCAPfqf9Z3GBEnQ2uaL0EgO0hSmtVHfXTbk5CTRziMT1Pe87bXrFIw=="; }; }; - "apollo-server-core-2.14.3" = { + "apollo-server-core-2.14.4" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.14.3"; + version = "2.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.14.3.tgz"; - sha512 = "A9RkWuHFZ04uEnXof5V02T7wfhUel7Hx9LpEN4N59mXTpb7ewW+cb0u+J+SP+Y4vDhVqaHCGoveRVKy6X2kLhw=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.14.4.tgz"; + sha512 = "aAfsvbJ2YrqAXDBgcBQocOmQJ5DkeOnEYQ6ADdkkDNU68V5yBRkAHLTOzPfbUlGHVrnOH8PT1FIVWwu5mBgkVA=="; }; }; "apollo-server-env-2.4.4" = { @@ -5845,13 +5854,13 @@ let sha512 = "7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg=="; }; }; - "apollo-server-express-2.14.3" = { + "apollo-server-express-2.14.4" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.14.3"; + version = "2.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.14.3.tgz"; - sha512 = "35PZXG6sQYB0YT+TBZ5KRxyWqknVnevuHyPG5XSAhMtWsVF2ySMzRPs6JdQTi0p2jlFTo5pt4P6FT3hRu0EFUw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.14.4.tgz"; + sha512 = "g0ml0NGmghvJhTiXMR0HqDD8eTz77zdgzDG2XoqNoRehtVIsZq8fmKTagVt9cUKCKKiBPUF+4tqAGD9lnprUdw=="; }; }; "apollo-server-plugin-base-0.9.0" = { @@ -6520,6 +6529,15 @@ let sha512 = "mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA=="; }; }; + "array.prototype.map-1.0.2" = { + name = "array.prototype.map"; + packageName = "array.prototype.map"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array.prototype.map/-/array.prototype.map-1.0.2.tgz"; + sha512 = "Az3OYxgsa1g7xDYp86l0nnN4bcmuEITGe1rbdEBVkrqkzMgDcbdQ2R7r41pNzti+4NMces3H8gMmuioZUilLgw=="; + }; + }; "arraybuffer.slice-0.0.6" = { name = "arraybuffer.slice"; packageName = "arraybuffer.slice"; @@ -6907,6 +6925,15 @@ let sha1 = "125dd09de95d3ea30a378adbed021092179b03c9"; }; }; + "async-write-2.1.0" = { + name = "async-write"; + packageName = "async-write"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async-write/-/async-write-2.1.0.tgz"; + sha1 = "1e762817d849ce44bfac07925a42036787061b15"; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -7069,13 +7096,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.693.0" = { + "aws-sdk-2.696.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.693.0"; + version = "2.696.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.693.0.tgz"; - sha512 = "/0zy5IlE8wHrTXCxPYMSJGaqTKN1ulBBOSuWYeGxHU8pnTT6ZHpDdHlS83DHrVbsXnO/zq9prEf1nXRWlwgARw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.696.0.tgz"; + sha512 = "LpEZf0ozwVOARKiqXzJ5njXt9eQswRDCwLNK+iTeADGv1up5g7pwU23itOrSLeer3FHV6iueEr+CxEpjQhrEQw=="; }; }; "aws-sign2-0.6.0" = { @@ -9958,6 +9985,15 @@ let sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; }; }; + "chokidar-3.3.1" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz"; + sha512 = "4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg=="; + }; + }; "chokidar-3.4.0" = { name = "chokidar"; packageName = "chokidar"; @@ -12668,6 +12704,15 @@ let sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; }; }; + "cssfilter-0.0.10" = { + name = "cssfilter"; + packageName = "cssfilter"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz"; + sha1 = "c6d2672632a2e5c83e013e6864a42ce8defd20ae"; + }; + }; "cssnano-4.1.10" = { name = "cssnano"; packageName = "cssnano"; @@ -15251,13 +15296,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.466" = { + "electron-to-chromium-1.3.469" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.466"; + version = "1.3.469"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.466.tgz"; - sha512 = "eieqkoM2hCkZZRhETKyCouMziDV3l4XEKHRLuzcHG+HV+P7PeODU/z9HAmBgMQkzvHg2DoyQhfIDmmeguLZT/Q=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.469.tgz"; + sha512 = "O9JM6ZsFhS0uy0S2Y3G8EoNfqio3srdxCuwuJh8tKgQKa6rf7je/xQ3TIoiEaEtpf2/qFFLAGt/xB4MjuUZqRw=="; }; }; "elegant-spinner-1.0.1" = { @@ -15783,6 +15828,15 @@ let sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="; }; }; + "es-array-method-boxes-properly-1.0.0" = { + name = "es-array-method-boxes-properly"; + packageName = "es-array-method-boxes-properly"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz"; + sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; + }; + }; "es-get-iterator-1.1.0" = { name = "es-get-iterator"; packageName = "es-get-iterator"; @@ -18087,13 +18141,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.126.1" = { + "flow-parser-0.127.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.126.1"; + version = "0.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.126.1.tgz"; - sha512 = "HDQAPl2F8vuGgyVm/Zx4vmT9Ja/ACAVIWVA3FRIcNoklkWsWDv+2vv2oVLk/2n+jAzESmvA5nFc2ElayVFZN1A=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.127.0.tgz"; + sha512 = "T4T92hVeVtrkYYvU01L2KFANsA0TJQrgy46efIU/JBxDhVjxIdS7KzaBEsPJu7RPOM44FCR7wcFQg6rWtGGrLQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -18132,6 +18186,15 @@ let sha1 = "ae049a714386bb83e342657a82924b70364a90d6"; }; }; + "flumedb-2.1.4" = { + name = "flumedb"; + packageName = "flumedb"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/flumedb/-/flumedb-2.1.4.tgz"; + sha512 = "jqbUXWsIPxHFmDOTN5/I5khgHzGtEl8cSL3kC13CC/FudT57tfzg+jvCWeXtSty15X1w6QD86lw8RW7cERuqsg=="; + }; + }; "flumelog-offset-3.4.4" = { name = "flumelog-offset"; packageName = "flumelog-offset"; @@ -18159,6 +18222,15 @@ let sha512 = "Nl0gJOgrDGpJGZDkP6gvo6s1Q9WmRynbHUvI/JY3eQ81YgzUUa2FKLlfu6OHV5ho5NeXP+00F+0K1yBVaEgJOQ=="; }; }; + "flumeview-level-4.0.3" = { + name = "flumeview-level"; + packageName = "flumeview-level"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-4.0.3.tgz"; + sha512 = "lmSiImD7vNJ9pC9hB2j9hgx5WhleUZM5n69e2qUTGU4LCyvCbVuzn85pKfqdrKEAMuVjbb+jEPEErPJFNRj0SQ=="; + }; + }; "flumeview-links-1.0.1" = { name = "flumeview-links"; packageName = "flumeview-links"; @@ -18177,13 +18249,13 @@ let sha512 = "zDwy3WIbF5pKhwyK0wVtGdedU+1Xh2Dnrg06fJ0dIkAcQs8+u+CaoSBcnyp80i6XmzfzGCRkN0Fdve2b6f5XAA=="; }; }; - "flumeview-reduce-1.3.16" = { + "flumeview-reduce-1.3.17" = { name = "flumeview-reduce"; packageName = "flumeview-reduce"; - version = "1.3.16"; + version = "1.3.17"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.16.tgz"; - sha512 = "4ATidV3QARML74eNdi+HPzGa4JtSZfnQpW6QQArlKZ6NRkjax3EFLt42hK2VJyADxnVnsVInt/ItqJL/4G1/5g=="; + url = "https://registry.npmjs.org/flumeview-reduce/-/flumeview-reduce-1.3.17.tgz"; + sha512 = "Li09TntlRpN51GtFKllIh5nDdBcyDazvi5a/yvbdUCS9xAFb8OA6H6uu32W9gG+4GyvfUi9AsOyN8RQ8OcREQA=="; }; }; "flush-write-stream-1.1.1" = { @@ -20113,13 +20185,13 @@ let sha512 = "efoimZ4F2wF2OwZJzPq2KdPjQs1K+UgJSfsHoHBBA0TwveGyQ/0kS3lUphhJg/JXIrZociuRkfjrk8JC4iPPJQ=="; }; }; - "graphql-extensions-0.12.2" = { + "graphql-extensions-0.12.3" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.12.2"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.2.tgz"; - sha512 = "vFaZua5aLiCOOzxfY5qzHZ6S52BCqW7VVOwzvV52Wb5edRm3dn6u+1MR9yYyEqUHSf8LvdhEojYlOkKiaQ4ghA=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.3.tgz"; + sha512 = "W7iT0kzlwTiZU7fXfw9IgWnsqVj7EFLd0/wVcZZRAbR8L3f4+YsGls0oxKdsrvYBnbG347BXKQmIyo6GTEk4XA=="; }; }; "graphql-subscriptions-1.1.0" = { @@ -21365,6 +21437,15 @@ let sha512 = "CbG3io8gUSIxNNSgq+XMjgpTMzAeVRipxVXjuGrDhH5M1a2kZ03w20s8FCLR1NjnnJj10KbvabvckmtQcYNb9g=="; }; }; + "http-status-1.4.2" = { + name = "http-status"; + packageName = "http-status"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-status/-/http-status-1.4.2.tgz"; + sha512 = "mBnIohUwRw9NyXMEMMv8/GANnzEYUj0Y8d3uL01zDWFkxUjYyZ6rgCaAI2zZ1Wb34Oqtbx/nFZolPRDc8Xlm5A=="; + }; + }; "http2-client-1.3.3" = { name = "http2-client"; packageName = "http2-client"; @@ -23966,6 +24047,24 @@ let sha512 = "RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q=="; }; }; + "iterate-iterator-1.0.1" = { + name = "iterate-iterator"; + packageName = "iterate-iterator"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/iterate-iterator/-/iterate-iterator-1.0.1.tgz"; + sha512 = "3Q6tudGN05kbkDQDI4CqjaBf4qf85w6W6GnuZDtUVYwKgtC1q8yxYX7CZed7N+tLzQqS6roujWvszf13T+n9aw=="; + }; + }; + "iterate-value-1.0.2" = { + name = "iterate-value"; + packageName = "iterate-value"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/iterate-value/-/iterate-value-1.0.2.tgz"; + sha512 = "A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ=="; + }; + }; "iterators-0.1.0" = { name = "iterators"; packageName = "iterators"; @@ -24173,13 +24272,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.17.1" = { + "jquery.terminal-2.17.2" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.17.1"; + version = "2.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.17.1.tgz"; - sha512 = "f+fqKLf0y6ZEhOLGlGCjlDdALPcf0APPd7pDAtDdUZ12Y6fWh0st1Y7RnygJRHpYkEYC3mRC+oogA03XqMH7YQ=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.17.2.tgz"; + sha512 = "FHs9cS0phsXFXI1waqK/kY9TnyiWmQp65NFu/vMZky1Tef4zIYD3D5qZcBhBkXhAbIFA+fPfmMUUgGKBQWtKlQ=="; }; }; "js-base64-2.5.2" = { @@ -25506,6 +25605,15 @@ let sha512 = "wcak5OQeA4rURGacqS62R/xNHjCYnJSQDBOlm4KNUGJVE9bWv2B04TclqReYejN+oD65PzD4FsqeWoI5wNC5Lg=="; }; }; + "level-6.0.1" = { + name = "level"; + packageName = "level"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/level/-/level-6.0.1.tgz"; + sha512 = "psRSqJZCsC/irNhfHzrVZbmPYXDcEYhA5TVNwr+V92jF44rbf86hqGp8fiT702FyiArScYIlPSBTDUASCVNSpw=="; + }; + }; "level-codec-6.2.0" = { name = "level-codec"; packageName = "level-codec"; @@ -25560,6 +25668,15 @@ let sha512 = "PeGjZsyMG4O89KHiez1zoMJxStnkM+oBIqgACjoo5PJqFiSUUm3GNod/KcbqN5ktyZa8jkG7I1T0P2u6HN9lIg=="; }; }; + "level-js-5.0.2" = { + name = "level-js"; + packageName = "level-js"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/level-js/-/level-js-5.0.2.tgz"; + sha512 = "SnBIDo2pdO5VXh02ZmtAyPP6/+6YTJg2ibLtl9C34pWvmtMEmRTWpra+qO/hifkUtBTOtfx6S9vLDjBsBK4gRg=="; + }; + }; "level-packager-5.1.1" = { name = "level-packager"; packageName = "level-packager"; @@ -29367,6 +29484,15 @@ let sha512 = "+GgHNg8xRhMXfEbv81iDtrVeTcWt0kWmTEY1XQK14dICTXnWJnT0dxdlPspwqF3keKMVPXwayEsk1DI0AA/jdA=="; }; }; + "monotonic-timestamp-0.0.9" = { + name = "monotonic-timestamp"; + packageName = "monotonic-timestamp"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/monotonic-timestamp/-/monotonic-timestamp-0.0.9.tgz"; + sha1 = "5ba5adc7aac85e1d7ce77be847161ed246b39603"; + }; + }; "moo-0.5.1" = { name = "moo"; packageName = "moo"; @@ -35225,6 +35351,15 @@ let sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; }; }; + "promise.allsettled-1.0.2" = { + name = "promise.allsettled"; + packageName = "promise.allsettled"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.2.tgz"; + sha512 = "UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg=="; + }; + }; "promised-temp-0.1.0" = { name = "promised-temp"; packageName = "promised-temp"; @@ -37088,6 +37223,15 @@ let sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; }; }; + "readdirp-3.3.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz"; + sha512 = "zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ=="; + }; + }; "readdirp-3.4.0" = { name = "readdirp"; packageName = "readdirp"; @@ -38438,13 +38582,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.15.0" = { + "rollup-2.16.0" = { name = "rollup"; packageName = "rollup"; - version = "2.15.0"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.15.0.tgz"; - sha512 = "HAk4kyXiV5sdNDnbKWk5zBPnkX/DAgx09Kbp8rRIRDVsTUVN3vnSowR7ZHkV6/lAiE6c2TQ8HtYb72aCPGW4Jw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.16.0.tgz"; + sha512 = "95NglykUQAhl+mTFZqVvGUWDoGHV4/XanOZBbR7LOwTKODde5yFNHfVDZEnERBMuQViDuYaxOlFW87i1GQMihA=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -39365,6 +39509,15 @@ let sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw=="; }; }; + "serialize-javascript-3.0.0" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.0.0.tgz"; + sha512 = "skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw=="; + }; + }; "serialize-javascript-3.1.0" = { name = "serialize-javascript"; packageName = "serialize-javascript"; @@ -40229,13 +40382,13 @@ let sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg=="; }; }; - "snyk-docker-plugin-3.10.0" = { + "snyk-docker-plugin-3.12.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "3.10.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.10.0.tgz"; - sha512 = "0OIIqBOq76wBZ/09oB+L+5CdyNXEeDAgLH92TRydEj5iuJwjddAfzWtoqeCIeh3d09DidsHBRP8mMhXKAht7Sg=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.12.0.tgz"; + sha512 = "Nv8ez1bykJFtM1OEkNPh6dRg11xHQg4ybTW8A6OC9IaLrWxkH/wrUfmRqhDnrJyzcDhF10CnyQX7KdUnsA7PwA=="; }; }; "snyk-go-parser-1.4.1" = { @@ -41237,6 +41390,15 @@ let sha512 = "J3fsWb5nS6PqObZLW2tclEz/bkRQ5pcF9goXanYGVsoH71F6W4f5sOnck9szeubI8srNaiL9pa0kPRv/lojHiw=="; }; }; + "ssb-db-20.1.0" = { + name = "ssb-db"; + packageName = "ssb-db"; + version = "20.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-db/-/ssb-db-20.1.0.tgz"; + sha512 = "oN5bBdnuOv6ZA6DRBeB5iH08VvGEHq5yfHNdtvaOv3IDj6RYSJMd0Z6qOwR9qlNgxtaD/fDo21nxaNcs5Hn/WQ=="; + }; + }; "ssb-ebt-5.6.7" = { name = "ssb-ebt"; packageName = "ssb-ebt"; @@ -41408,13 +41570,13 @@ let sha512 = "iRXjeI0sbRbgMwaKg+poqhHSH7GvUVgJ+8ysi8q7Hjj4wHkczLGAOyVjnyhjF+ErPDFn9kXN+46joneKqSgEDg=="; }; }; - "ssb-ooo-1.3.2" = { + "ssb-ooo-1.3.3" = { name = "ssb-ooo"; packageName = "ssb-ooo"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ooo/-/ssb-ooo-1.3.2.tgz"; - sha512 = "JBH0cDaqQ/WRZMfoyn/fNLDrbrs5w2xnSno/VUDWGhc+SX+3/h6zFK7VvCjdzEATlZ/D7VRkXMYrOedSIVIKwA=="; + url = "https://registry.npmjs.org/ssb-ooo/-/ssb-ooo-1.3.3.tgz"; + sha512 = "6yI5XBpBHkwFdAELpKwlf1C1V32Z0/AKEJYsoU7lk+Eh88blv8LKydo4a1DnjMiPy4ywn4lRU5oayQaPE5MRtQ=="; }; }; "ssb-plugins-1.0.4" = { @@ -41444,13 +41606,13 @@ let sha1 = "dfd30cd50eecd8546bd4aa7f06e7c8f501c08118"; }; }; - "ssb-query-2.4.3" = { + "ssb-query-2.4.4" = { name = "ssb-query"; packageName = "ssb-query"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.4.3.tgz"; - sha512 = "Ktuk6Bl3s70gueDH7FBXzI8KHsf+h+n82J6Id33NTwP80u5iSDV5vXK2f7/He/cmP3uUVUI5ogJda7ShmrDIug=="; + url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.4.4.tgz"; + sha512 = "t81fskbvFzeXausdJ/TDGjqh8iyClhJy8B9JLgOAmt6D67IFDlkUPgVYF2ITqP4NIkqsLAj/jgX1KV32ntxaNg=="; }; }; "ssb-ref-2.13.9" = { @@ -41480,6 +41642,15 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; + "ssb-validate-4.1.0" = { + name = "ssb-validate"; + packageName = "ssb-validate"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.1.0.tgz"; + sha512 = "GszJGLXZdnWSAP5f1evXwRct7qY0T/LFXR41eHIh/N63Z7kKBfBcIMd6mbQ5DgpU+sVHwdhXXloYXoMPZHiJDA=="; + }; + }; "ssb-ws-6.2.3" = { name = "ssb-ws"; packageName = "ssb-ws"; @@ -48276,6 +48447,15 @@ let sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; }; + "workerpool-6.0.0" = { + name = "workerpool"; + packageName = "workerpool"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.0.tgz"; + sha512 = "fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA=="; + }; + }; "wrap-ansi-2.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -48862,6 +49042,15 @@ let sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; }; }; + "xss-1.0.7" = { + name = "xss"; + packageName = "xss"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/xss/-/xss-1.0.7.tgz"; + sha512 = "A9v7tblGvxu8TWXQC9rlpW96a+LN1lyw6wyhpTmmGW+FwRMactchBR3ROKSi33UPCUcUHSu8s9YP6F+K3Mw//w=="; + }; + }; "xstream-11.12.0" = { name = "xstream"; packageName = "xstream"; @@ -49462,17 +49651,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "9.1.7"; + version = "9.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.7.tgz"; - sha512 = "NhsIa725S/U/n7nDxp6ForusdYHEXF4aSIvsFRdoK6vbQ889c5e1Rdj+T5EWXLmpQZxeprSKhLI2alNX0nVhhQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.8.tgz"; + sha512 = "yfF7glPo3Xm7fTJVln1bFZVXqHu8wkIGZRZGb6lsJa+QH4ePxHgn+dNYXho0MYpGUnhY7xOBW4MJzjS7E+1y5Q=="; }; dependencies = [ - sources."@angular-devkit/architect-0.901.7" - sources."@angular-devkit/core-9.1.7" - sources."@angular-devkit/schematics-9.1.7" - sources."@schematics/angular-9.1.7" - sources."@schematics/update-0.901.7" + sources."@angular-devkit/architect-0.901.8" + sources."@angular-devkit/core-9.1.8" + sources."@angular-devkit/schematics-9.1.8" + sources."@schematics/angular-9.1.8" + sources."@schematics/update-0.901.8" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" @@ -50314,10 +50503,10 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.4.1"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.4.1.tgz"; - sha512 = "X9K0EZFipqnckuzaUa2MzCtxPzazy4CwCJN0OTeXwc6I3q8f0M3H/5BuJM7cGPBn9CHDQTsiR1x7b2t3IKw7Vg=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.4.4.tgz"; + sha512 = "52pXlikVdBiPlZqEBx+vFQCrTmPrP3aLLxE0Wue00yJacPXt8ph6cb1PhCwYQAY1N9ROQstVJlsrm3GOXpCfyw=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" @@ -50332,7 +50521,7 @@ in sources."@apollographql/graphql-language-service-parser-2.0.2" sources."@apollographql/graphql-language-service-types-2.0.2" sources."@apollographql/graphql-language-service-utils-2.0.2" - sources."@apollographql/graphql-playground-html-1.6.24" + sources."@apollographql/graphql-playground-html-1.6.26" sources."@babel/code-frame-7.10.1" (sources."@babel/core-7.10.2" // { dependencies = [ @@ -50488,14 +50677,14 @@ in sources."@types/serve-static-1.13.4" sources."@types/ws-7.2.5" sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-4.4.1" - (sources."@vue/cli-ui-4.4.1" // { + sources."@vue/cli-shared-utils-4.4.4" + (sources."@vue/cli-ui-4.4.4" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.4.1" - sources."@vue/cli-ui-addon-widgets-4.4.1" + sources."@vue/cli-ui-addon-webpack-4.4.4" + sources."@vue/cli-ui-addon-widgets-4.4.4" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" @@ -50519,7 +50708,7 @@ in sources."normalize-path-2.1.1" ]; }) - (sources."apollo-2.28.2" // { + (sources."apollo-2.28.3" // { dependencies = [ sources."strip-ansi-5.2.0" ]; @@ -50528,18 +50717,18 @@ in sources."apollo-cache-control-0.11.0" sources."apollo-cache-inmemory-1.6.6" sources."apollo-client-2.6.10" - (sources."apollo-codegen-core-0.37.2" // { + (sources."apollo-codegen-core-0.37.3" // { dependencies = [ sources."recast-0.19.1" sources."source-map-0.6.1" ]; }) - sources."apollo-codegen-flow-0.35.2" - sources."apollo-codegen-scala-0.36.2" - sources."apollo-codegen-swift-0.37.2" - sources."apollo-codegen-typescript-0.37.2" + sources."apollo-codegen-flow-0.35.3" + sources."apollo-codegen-scala-0.36.3" + sources."apollo-codegen-swift-0.37.3" + sources."apollo-codegen-typescript-0.37.3" sources."apollo-datasource-0.7.1" - (sources."apollo-engine-reporting-2.0.0" // { + (sources."apollo-engine-reporting-2.0.1" // { dependencies = [ sources."uuid-8.1.0" ]; @@ -50547,7 +50736,7 @@ in sources."apollo-engine-reporting-protobuf-0.5.1" sources."apollo-env-0.6.5" sources."apollo-graphql-0.4.5" - sources."apollo-language-server-1.22.2" + sources."apollo-language-server-1.22.3" sources."apollo-link-1.2.14" sources."apollo-link-context-1.0.20" sources."apollo-link-error-1.1.13" @@ -50557,10 +50746,10 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.20" sources."apollo-server-caching-0.5.1" - sources."apollo-server-core-2.14.3" + sources."apollo-server-core-2.14.4" sources."apollo-server-env-2.4.4" sources."apollo-server-errors-2.4.1" - sources."apollo-server-express-2.14.3" + sources."apollo-server-express-2.14.4" sources."apollo-server-plugin-base-0.9.0" sources."apollo-server-types-0.5.0" sources."apollo-tracing-0.11.0" @@ -50782,6 +50971,7 @@ in sources."crypto-random-string-1.0.0" sources."css-select-1.2.0" sources."css-what-2.1.3" + sources."cssfilter-0.0.10" sources."csv-parser-1.12.1" sources."dashdash-1.14.1" sources."date-fns-1.30.1" @@ -50940,7 +51130,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.126.1" + sources."flow-parser-0.127.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -51004,7 +51194,7 @@ in sources."ts-invariant-0.3.3" ]; }) - sources."graphql-extensions-0.12.2" + sources."graphql-extensions-0.12.3" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.3" sources."graphql-tools-4.0.8" @@ -51775,6 +51965,7 @@ in sources."xdg-basedir-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" + sources."xss-1.0.7" sources."xtend-4.0.2" sources."yallist-2.1.2" (sources."yaml-front-matter-3.4.1" // { @@ -52457,7 +52648,7 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.1.1" (sources."asn1.js-4.10.1" // { @@ -53165,10 +53356,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "1.7.14"; + version = "1.7.15"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.14.tgz"; - sha512 = "LOq7zTp2mb2omi1Pc0r1PEK2N+bwuPYpSfszm78Rsvvht9cU+o/YuC0HagG4VZ7iwuiy9VRvpNz218sMZJqm7Q=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.15.tgz"; + sha512 = "R2h5x0j9FLlGZLEMlEnvoIors0b10yC2eBYkyYlwEFavWZn9DXwpnL3r2p6VUKNY02pwEyTGY0L5ffnPFZsUWA=="; }; buildInputs = globalBuildInputs; meta = { @@ -53183,14 +53374,15 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-0.7.0.tgz"; - sha512 = "ntDgRtLshBtxUuUXkkxH2S+xUWZW86ptrLO0pe74MzeS6m/Z744QvwSor+abHUTHO370nrUEUtGaQDUEh9p2BA=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-0.8.0.tgz"; + sha512 = "PMMybjPvAT+gGZDRaTmq1rIe59JsG9WRWWzVlT3gRo/Zp5Xwg2ho424m65ubGgre/UU23D9LVH9FLZDU4NH2Gg=="; }; dependencies = [ sources."isexe-2.0.0" - sources."tslib-1.13.0" + sources."node-fetch-2.6.0" + sources."tslib-2.0.0" sources."which-2.0.2" ]; buildInputs = globalBuildInputs; @@ -53482,7 +53674,7 @@ in sources."@typescript-eslint/experimental-utils-3.2.0" sources."@typescript-eslint/parser-3.2.0" sources."@typescript-eslint/typescript-estree-3.2.0" - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" sources."ajv-6.12.2" sources."ajv-keywords-3.4.1" @@ -53640,7 +53832,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.466" + sources."electron-to-chromium-1.3.469" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -54679,7 +54871,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.466" + sources."electron-to-chromium-1.3.469" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -55299,7 +55491,7 @@ in ]; }) sources."abbrev-1.1.1" - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" (sources."aggregate-error-3.0.1" // { dependencies = [ @@ -58674,10 +58866,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.28.4"; + version = "6.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.28.4.tgz"; - sha512 = "KgKHW1PDfOOMzbldVhySG4sLFrllEFLvqNO/Is0F15sSho11lOjAb2MoKOB/bypJQ7DgrxR/O9zMVFxvEI6Vdg=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.29.1.tgz"; + sha512 = "p/4ZAjzx0C6wVPnqHBqFZXwa2HI40mg3pchl3kW8utLg3G0ILA5H1ypXB62S1uyPuuNXgq3GdiEj8C12aa15nQ=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -58686,7 +58878,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.693.0" + sources."aws-sdk-2.696.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" sources."base64-js-1.3.1" @@ -58715,6 +58907,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-signature-1.2.0" + sources."http-status-1.4.2" sources."ieee754-1.1.13" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -59200,7 +59393,7 @@ in ]; }) sources."@types/color-name-1.1.1" - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" sources."ajv-6.12.2" (sources."ansi-escapes-4.3.1" // { @@ -59376,7 +59569,7 @@ in ]; }) sources."@types/color-name-1.1.1" - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" sources."ajv-6.12.2" (sources."ansi-escapes-4.3.1" // { @@ -62904,7 +63097,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."jquery-3.5.1" - sources."jquery.terminal-2.17.1" + sources."jquery.terminal-2.17.2" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -63795,7 +63988,7 @@ in sources."@yarnpkg/lockfile-1.1.0" sources."abab-2.0.3" sources."abbrev-1.1.1" - sources."acorn-7.2.0" + sources."acorn-7.3.1" (sources."acorn-globals-4.3.4" // { dependencies = [ sources."acorn-6.4.1" @@ -65159,10 +65352,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "5.0.9"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-5.0.9.tgz"; - sha512 = "dUA5z7Lo7G4FRSe1ZAXqOINEEWxmCjDBbfRBmU/wYlSMwxUQJP/tEEP90yJt3Uqo03s9rCgVnxtlfq+uDhxSPg=="; + url = "https://registry.npmjs.org/karma/-/karma-5.1.0.tgz"; + sha512 = "I3aPbkuIbwuBo6wSog97P5WnnhCgUTsWTu/bEw1vZVQFbXmKO3PK+cfFhZioOgVtJAuQxoyauGNjnwXNHMCxbw=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -65824,8 +66017,8 @@ in sources."@lerna/write-log-file-3.13.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - sources."@octokit/auth-token-2.4.1" - (sources."@octokit/endpoint-6.0.2" // { + sources."@octokit/auth-token-2.4.2" + (sources."@octokit/endpoint-6.0.3" // { dependencies = [ sources."is-plain-object-3.0.0" sources."isobject-4.0.0" @@ -65844,9 +66037,13 @@ in sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.4" // { + (sources."@octokit/request-5.4.5" // { dependencies = [ - sources."@octokit/request-error-2.0.1" + (sources."@octokit/request-error-2.0.1" // { + dependencies = [ + sources."@octokit/types-4.1.10" + ]; + }) sources."is-plain-object-3.0.0" sources."isobject-4.0.0" sources."universal-user-agent-5.0.0" @@ -65858,7 +66055,7 @@ in ]; }) sources."@octokit/rest-16.43.1" - sources."@octokit/types-4.1.10" + sources."@octokit/types-5.0.0" sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" @@ -67852,7 +68049,7 @@ in sources."@xtuc/long-4.2.2" sources."JSONStream-1.3.5" sources."ace.improved-0.2.1" - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.1.1" sources."ajv-6.12.2" @@ -68128,7 +68325,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.466" + sources."electron-to-chromium-1.3.469" (sources."elliptic-6.5.2" // { dependencies = [ sources."bn.js-4.11.9" @@ -69753,17 +69950,18 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "7.2.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz"; - sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.0.1.tgz"; + sha512 = "vefaXfdYI8+Yo8nPZQQi0QO2o+5q9UIMX1jZ1XMmK3+4+CQjc7+B0hPdUeglXiTlr8IHMVRo63IhO9Mzt6fxOg=="; }; dependencies = [ - sources."ansi-colors-3.2.3" + sources."ansi-colors-4.1.1" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" sources."argparse-1.0.10" + sources."array.prototype.map-1.0.2" sources."balanced-match-1.0.0" sources."binary-extensions-2.0.0" sources."brace-expansion-1.1.11" @@ -69775,7 +69973,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."chokidar-3.3.0" + sources."chokidar-3.3.1" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -69789,20 +69987,22 @@ in sources."debug-3.2.6" sources."decamelize-1.2.0" sources."define-properties-1.1.3" - sources."diff-3.5.0" + sources."diff-4.0.2" sources."emoji-regex-7.0.3" sources."es-abstract-1.17.5" + sources."es-array-method-boxes-properly-1.0.0" + sources."es-get-iterator-1.1.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."fill-range-7.0.1" - sources."find-up-3.0.0" + sources."find-up-4.1.0" sources."flat-4.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."glob-7.1.3" + sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."growl-1.10.5" sources."has-1.0.3" @@ -69811,6 +70011,7 @@ in sources."he-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."is-arguments-1.0.4" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" sources."is-callable-1.2.0" @@ -69818,35 +70019,38 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" + sources."is-map-2.0.1" sources."is-number-7.0.0" sources."is-regex-1.1.0" + sources."is-set-2.0.1" + sources."is-string-1.0.5" sources."is-symbol-1.0.3" + sources."isarray-2.0.5" sources."isexe-2.0.0" + sources."iterate-iterator-1.0.1" + sources."iterate-value-1.0.2" sources."js-yaml-3.13.1" - sources."locate-path-3.0.0" + sources."locate-path-5.0.0" sources."lodash-4.17.15" sources."log-symbols-3.0.0" sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" - sources."ms-2.1.1" - sources."node-environment-flags-1.0.6" + sources."ms-2.1.2" sources."normalize-path-3.0.0" sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" sources."p-limit-2.3.0" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."picomatch-2.2.2" - sources."readdirp-3.2.0" + sources."promise.allsettled-1.0.2" + sources."readdirp-3.3.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."semver-5.7.1" + sources."serialize-javascript-3.0.0" sources."set-blocking-2.0.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" @@ -69855,12 +70059,17 @@ in sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" sources."strip-ansi-4.0.0" - sources."strip-json-comments-2.0.1" - sources."supports-color-6.0.0" + sources."strip-json-comments-3.0.1" + (sources."supports-color-7.1.0" // { + dependencies = [ + sources."has-flag-4.0.0" + ]; + }) sources."to-regex-range-5.0.1" - sources."which-1.3.1" + sources."which-2.0.2" sources."which-module-2.0.0" sources."wide-align-1.1.3" + sources."workerpool-6.0.0" (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -69873,6 +70082,10 @@ in (sources."yargs-13.3.2" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -72113,7 +72326,7 @@ in sources."@parcel/workers-1.11.0" sources."@types/q-1.5.4" sources."abab-2.0.3" - sources."acorn-7.2.0" + sources."acorn-7.3.1" (sources."acorn-globals-4.3.4" // { dependencies = [ sources."acorn-6.4.1" @@ -72362,7 +72575,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.466" + sources."electron-to-chromium-1.3.469" (sources."elliptic-6.5.2" // { dependencies = [ sources."bn.js-4.11.9" @@ -73969,10 +74182,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.1.6"; + version = "5.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.1.6.tgz"; - sha512 = "BMY+RH2ggxY27pSlO5RtGAtTUcUfFVetQZHJdZURWu9tankNO0iDuqSx4w9iBGdIm9+Gd5eQqNYylqTksu2ueA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.1.8.tgz"; + sha512 = "DsyoyFo60MByj8rZEFH6a/ZKz0NQbg5tdKCIgjMlvA2kyNKt0d+XW2eaYjqw6ILGuy2k857yRPZfgJgV0Xgpjg=="; }; buildInputs = globalBuildInputs; meta = { @@ -74150,10 +74363,10 @@ in pscid = nodeEnv.buildNodePackage { name = "pscid"; packageName = "pscid"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/pscid/-/pscid-2.9.1.tgz"; - sha512 = "K/v6B+pLyKi3PxthFbNwpWxVvIMIAFWgwo3SewjPnylBaSx9xGLxTrMneKHMf3whOMJlXMD/lrXdGJ0paYfRGQ=="; + url = "https://registry.npmjs.org/pscid/-/pscid-2.9.2.tgz"; + sha512 = "xK6xfd8AhzJIddcpwveQjFEH+7ODr4gVM84rsvXwP6/167quMbt4VB2pcMf051gew1iwFgK90L301CcW+UD7Cg=="; }; dependencies = [ sources."balanced-match-1.0.0" @@ -74194,7 +74407,7 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.1.1" (sources."asn1.js-4.10.1" // { @@ -74648,10 +74861,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.15.0"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.15.0.tgz"; - sha512 = "HAk4kyXiV5sdNDnbKWk5zBPnkX/DAgx09Kbp8rRIRDVsTUVN3vnSowR7ZHkV6/lAiE6c2TQ8HtYb72aCPGW4Jw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.16.0.tgz"; + sha512 = "95NglykUQAhl+mTFZqVvGUWDoGHV4/XanOZBbR7LOwTKODde5yFNHfVDZEnERBMuQViDuYaxOlFW87i1GQMihA=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -74705,7 +74918,7 @@ in sources."semver-7.3.2" ]; }) - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" sources."agent-base-4.3.0" sources."ajv-6.12.2" @@ -74973,7 +75186,7 @@ in sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."rollup-2.15.0" + sources."rollup-2.16.0" sources."run-async-2.4.1" (sources."rxjs-6.5.5" // { dependencies = [ @@ -75404,7 +75617,7 @@ in ]; }) sources."@serverless/template-1.1.3" - sources."@serverless/utils-china-0.1.13" + sources."@serverless/utils-china-0.1.14" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" (sources."@tencent-sdk/capi-0.2.15-alpha.0" // { @@ -75480,7 +75693,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.693.0" // { + (sources."aws-sdk-2.696.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -77101,10 +77314,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.338.0"; + version = "1.339.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.338.0.tgz"; - sha512 = "kygisp/bsNVLnATEdHeb3ASQS58b8DKOju9BcVNC3OpUi0Ajjiqy5o7RdfNPfCzp9lYglLT9grIM59zJuC2sFg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.339.2.tgz"; + sha512 = "BpXMOZX/jj/4fHOq2gfSlAPE9+DNe/WEqNCbQ68uy1U9NA1tucGJf3B376NofsgXCYIrJ0tw5Mjf1yfq7F4Vxw=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -77451,7 +77664,7 @@ in sources."debug-4.2.0" ]; }) - (sources."snyk-docker-plugin-3.10.0" // { + (sources."snyk-docker-plugin-3.12.0" // { dependencies = [ sources."debug-4.2.0" ]; @@ -77911,10 +78124,10 @@ in ssb-server = nodeEnv.buildNodePackage { name = "ssb-server"; packageName = "ssb-server"; - version = "16.0.0"; + version = "16.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-server/-/ssb-server-16.0.0.tgz"; - sha512 = "pmAXsxC5OIzwciT1IcTNXI36qMWJJr7zLjq6Hft8fsijaw3NMh5eyGq72UMbeHIdaTPESmtg7Y2cuVuPhv3vrA=="; + url = "https://registry.npmjs.org/ssb-server/-/ssb-server-16.0.1.tgz"; + sha512 = "cast7wQRxqUSiRVyFoaTtymeukwSh5nlfDj5ShHmdnh0qmfi4uQnvPuBA5BBgC3WEtI/ozgNjAc1/vqJFgILig=="; }; dependencies = [ sources."abstract-leveldown-6.0.3" @@ -77935,6 +78148,7 @@ in sources."assign-symbols-1.0.0" sources."async-each-1.0.3" sources."async-single-1.0.5" + sources."async-write-2.1.0" sources."atob-2.1.2" (sources."atomic-file-2.0.1" // { dependencies = [ @@ -78093,26 +78307,36 @@ in sources."level-codec-6.2.0" ]; }) + sources."flumedb-2.1.4" sources."flumelog-offset-3.4.4" (sources."flumeview-hashtable-1.1.1" // { dependencies = [ sources."atomic-file-1.1.5" ]; }) - sources."flumeview-level-3.0.14" + (sources."flumeview-level-4.0.3" // { + dependencies = [ + sources."abstract-leveldown-6.2.3" + sources."level-6.0.1" + sources."level-js-5.0.2" + sources."mkdirp-1.0.4" + ]; + }) (sources."flumeview-links-1.0.1" // { dependencies = [ sources."deep-equal-2.0.3" + sources."flumeview-level-3.0.14" sources."isarray-2.0.5" sources."map-filter-reduce-3.2.2" ]; }) (sources."flumeview-query-7.2.2" // { dependencies = [ + sources."flumeview-level-3.0.14" sources."map-filter-reduce-3.2.2" ]; }) - sources."flumeview-reduce-1.3.16" + sources."flumeview-reduce-1.3.17" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."for-own-0.1.5" @@ -78288,6 +78512,7 @@ in ]; }) sources."mkdirp-0.5.5" + sources."monotonic-timestamp-0.0.9" sources."moo-0.5.1" sources."ms-2.1.2" sources."multiblob-1.13.7" @@ -78590,6 +78815,12 @@ in sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" sources."ssb-config-3.4.4" + (sources."ssb-db-20.1.0" // { + dependencies = [ + sources."glob-7.1.6" + sources."rimraf-3.0.2" + ]; + }) sources."ssb-ebt-5.6.7" sources."ssb-friends-4.1.4" (sources."ssb-gossip-1.1.1" // { @@ -78606,7 +78837,7 @@ in sources."ssb-msgs-5.2.0" sources."ssb-no-auth-1.0.0" sources."ssb-onion-1.0.0" - (sources."ssb-ooo-1.3.2" // { + (sources."ssb-ooo-1.3.3" // { dependencies = [ sources."flumecodec-0.0.1" sources."level-codec-6.2.0" @@ -78614,10 +78845,11 @@ in }) sources."ssb-plugins-1.0.4" sources."ssb-private1-1.0.1" - sources."ssb-query-2.4.3" + sources."ssb-query-2.4.4" sources."ssb-ref-2.13.9" sources."ssb-replicate-1.3.2" sources."ssb-unix-socket-1.0.0" + sources."ssb-validate-4.1.0" sources."ssb-ws-6.2.3" sources."stack-0.1.0" (sources."static-extend-0.1.2" // { @@ -78820,7 +79052,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.693.0" // { + (sources."aws-sdk-2.696.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -83286,7 +83518,7 @@ in }) (sources."eslint-plugin-vue-6.2.2" // { dependencies = [ - sources."acorn-7.2.0" + sources."acorn-7.3.1" sources."debug-4.2.0" sources."eslint-scope-5.1.0" sources."espree-6.2.1" @@ -84384,7 +84616,7 @@ in sources."eslint-visitor-keys-1.1.0" (sources."espree-6.2.1" // { dependencies = [ - sources."acorn-7.2.0" + sources."acorn-7.3.1" ]; }) sources."esprima-4.0.1" diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 43bf5415ce01..e9d4deefb459 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-06-01"; + rev = "2020-06-08"; version = "unstable-${rev}"; - sha256 = "0chm47mrd4hybhvzn4cndq2ck0mj948mm181p1i1j1w0ms7zk1fg"; - cargoSha256 = "0yaz50f7hirlcs8bxc5dh170lch9l1gscwayan71k3pz23wkvlzs"; + sha256 = "0ywwsb717d1rwcy2yij58sj123pan0fb80sbsiqqprcln0aaspip"; + cargoSha256 = "1c6rmrhx7q4qcanr26yzlwc2rp1hh55m80jn56hy6hfcvwcdaij4"; }; rust-analyzer = callPackage ./wrapper.nix {} { From dbf352aca1d0e860fd1b3c8fe7ebd08257e6b103 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 12 Jun 2020 16:08:39 -0700 Subject: [PATCH 1535/3452] casperjs: remove --- pkgs/development/tools/casperjs/default.nix | 56 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 pkgs/development/tools/casperjs/default.nix diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix deleted file mode 100644 index 80786a10f5f1..000000000000 --- a/pkgs/development/tools/casperjs/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchFromGitHub, fontsConf, phantomjs2, python, nodePackages }: - -let version = "1.1.1"; - -in stdenv.mkDerivation { - - pname = "casperjs"; - inherit version; - - src = fetchFromGitHub { - owner = "casperjs"; - repo = "casperjs"; - rev = version; - sha256 = "187prrm728xpn0nx9kxfxa4fwd7w25z78nsxfk6a6kl7c5656jpz"; - }; - - buildInputs = [ phantomjs2 python nodePackages.eslint ]; - - patchPhase = '' - substituteInPlace bin/casperjs --replace "/usr/bin/env python" "${python}/bin/python" \ - --replace "'phantomjs'" "'${phantomjs2}/bin/phantomjs'" - ''; - - dontBuild = true; - - doCheck = true; - checkPhase = '' - export FONTCONFIG_FILE=${fontsConf} - make test - ''; - - installPhase = '' - cp -r . $out - ''; - - meta = { - - description = '' - Navigation scripting & testing utility for PhantomJS and SlimerJS - ''; - - longDescription = '' - CasperJS is a navigation scripting & testing utility for PhantomJS and - SlimerJS (still experimental). It eases the process of defining a full - navigation scenario and provides useful high-level functions, methods & - syntactic sugar for doing common tasks. - ''; - - homepage = "http://casperjs.org"; - license = stdenv.lib.licenses.mit; - - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.linux; - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d96a16b13998..33b2c84f327a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -66,6 +66,7 @@ mapAliases ({ buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 bundler_HEAD = bundler; # added 2015-11-15 cantarell_fonts = cantarell-fonts; # added 2018-03-03 + casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken."; catfish = xfce.catfish; # added 2019-12-22 cgmanager = throw "cgmanager was deprecated by lxc and therefore removed from nixpkgs."; # added 2020-06-05 checkbashism = checkbashisms; # added 2016-08-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 128d580d1903..145975d96b49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10149,10 +10149,6 @@ in cask = callPackage ../development/tools/cask { }; - casperjs = callPackage ../development/tools/casperjs { - inherit (texFunctions) fontsConf; - }; - cbrowser = callPackage ../development/tools/misc/cbrowser { }; ccache = callPackage ../development/tools/misc/ccache { }; From 3e10731b0868ff766bca498fdb77202176272e7e Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Fri, 12 Jun 2020 12:58:35 +0800 Subject: [PATCH 1536/3452] ffmpeg-full: add librsvg support --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 4f03f775fff6..95be159b2e19 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -82,6 +82,7 @@ #, libnut ? null # NUT (de)muxer, native (de)muser exists , libogg ? null # Ogg container used by vorbis & theora , libopus ? null # Opus de/encoder +, librsvg ? null # SVG protocol , libssh ? null # SFTP protocol , libtheora ? null # Theora encoder , libv4l ? null # Video 4 Linux support @@ -355,6 +356,7 @@ stdenv.mkDerivation rec { (enableFeature (libmysofa != null) "libmysofa") #(enableFeature (libnut != null) "libnut") (enableFeature (libopus != null) "libopus") + (enableFeature (librsvg != null) "librsvg") (enableFeature (libssh != null) "libssh") (enableFeature (libtheora != null) "libtheora") (enableFeature (if isLinux then libv4l != null else false) "libv4l2") @@ -416,7 +418,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa - libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 + libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib From 34d1beb1b4811f873987d681562d1727a352e133 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 12 Jun 2020 11:38:39 -0400 Subject: [PATCH 1537/3452] rclone: 1.52.0 -> 1.52.1 --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 6489c69b161a..b2ad47e9b4be 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "rclone"; - version = "1.52.0"; + version = "1.52.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0v0f3pv8qgk8ggrhm4p9brra1ppj53b51jhgh5xi0rhgpxss0d6r"; + sha256 = "1v91c3wydpixi0p0afclp4baxchigy3czlm1mq9hn6cw973z6spf"; }; goPackagePath = "github.com/rclone/rclone"; From c539d7c1c7dd420f5dae6aed44201e89cd87ca12 Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Fri, 12 Jun 2020 22:30:46 -0400 Subject: [PATCH 1538/3452] playerctl: enable bash completions --- pkgs/tools/audio/playerctl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 3541453bafe4..6d7d92808c1f 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl gobject-introspection ]; buildInputs = [ glib ]; + mesonFlags = [ "-Dbash-completions=true" ]; + meta = with stdenv.lib; { description = "Command-line utility and library for controlling media players that implement MPRIS"; homepage = "https://github.com/acrisci/playerctl"; From 896959cf66f0b1ba4072f5297363801817c0a061 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 13 Jun 2020 10:55:22 +0530 Subject: [PATCH 1539/3452] tup: 0.7.8 -> 0.7.9 --- pkgs/development/tools/build-managers/tup/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 709528b2ad30..ca25a6584fd5 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tup"; - version = "0.7.8"; + version = "0.7.9"; src = fetchFromGitHub { owner = "gittup"; repo = "tup"; rev = "v${version}"; - sha256 = "07dmz712zbs5kayf98kywp7blssgh0y2gc1623jbsynmqwi77mcb"; + sha256 = "1b9rllwfdmjvfmwvzqfbqfi1flf4y9zzjmyp0dizq23gpkvhi42f"; }; nativeBuildInputs = [ pkgconfig ]; @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://gittup.org/tup/"; license = licenses.gpl2; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux ++ platforms.darwin; }; } From 3065ab3a925a8a9654e904e44f5c4cb2ae4184c4 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 13 Jun 2020 10:56:20 +0530 Subject: [PATCH 1540/3452] tup: add setupHook --- .../tools/build-managers/tup/default.nix | 2 + .../tools/build-managers/tup/setup-hook.sh | 44 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/tools/build-managers/tup/setup-hook.sh diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index ca25a6584fd5..09420cb7058b 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { cp tup.1 $out/share/man/man1/ ''; + setupHook = ./tup/setup-hook.sh; + meta = with stdenv.lib; { description = "A fast, file-based build system"; longDescription = '' diff --git a/pkgs/development/tools/build-managers/tup/setup-hook.sh b/pkgs/development/tools/build-managers/tup/setup-hook.sh new file mode 100644 index 000000000000..5bf64ae59d35 --- /dev/null +++ b/pkgs/development/tools/build-managers/tup/setup-hook.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +tupConfigurePhase() { + runHook preConfigure + + echo -n CONFIG_TUP_ARCH= >> tup.config + case "$system" in + "i686-*") echo i386 >> tup.config;; + "x86_64-*") echo x86_64 >> tup.config;; + "powerpc-*") echo powerpc >> tup.config;; + "powerpc64-*") echo powerpc64 >> tup.config;; + "ia64-*") echo ia64 >> tup.config;; + "alpha-*") echo alpha >> tup.config;; + "sparc-*") echo sparc >> tup.config;; + "aarch64-*") echo arm64 >> tup.config;; + "arm*") echo arm >> tup.config;; + esac + + echo "${tupConfig-}" >> tup.config + + tup init + tup generate tupBuild.sh + + runHook postConfigure +} + +if [ -z "${dontUseTupConfigure-}" -a -z "${configurePhase-}" ]; then + configurePhase=tupConfigurePhase +fi + + +tupBuildPhase() { + runHook preBuild + + pushd . + . tupBuild.sh + popd + + runHook postBuild +} + +if [ -z "${dontUseTupBuild-}" -a -z "${buildPhase-}" ]; then + buildPhase=tupBuildPhase +fi From de20ec04f969f71f9b54bc35f0f379214b551eec Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 13 Jun 2020 11:03:55 +0530 Subject: [PATCH 1541/3452] tup: fix setup hook location --- pkgs/development/tools/build-managers/tup/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 09420cb7058b..80ee38105ca5 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cp tup.1 $out/share/man/man1/ ''; - setupHook = ./tup/setup-hook.sh; + setupHook = ./setup-hook.sh; meta = with stdenv.lib; { description = "A fast, file-based build system"; From b8a9e3eea123b8eb25d8f3b852c06f5eb8b284b7 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 20 May 2020 17:59:23 +0530 Subject: [PATCH 1542/3452] nixos/lib/make-disk-image.nix: VDI support --- nixos/lib/make-disk-image.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 5e86ea479d51..9364aab32770 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -39,7 +39,7 @@ , name ? "nixos-disk-image" -, # Disk image format, one of qcow2, qcow2-compressed, vpc, raw. +, # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw. format ? "raw" }: @@ -57,6 +57,7 @@ let format' = format; in let filename = "nixos." + { qcow2 = "qcow2"; + vdi = "vdi"; vpc = "vhd"; raw = "img"; }.${format}; From d45fd11a81fe150e4a1f98f132f49863354b5e60 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 7 Jun 2020 17:50:47 +0100 Subject: [PATCH 1543/3452] reuse: 0.7.0 -> 0.11.0 --- pkgs/tools/package-management/reuse/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 13a3a85f082d..b51f0d061a9f 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { pname = "reuse"; - version = "0.7.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; rev = "v${version}"; - sha256 = "04i8zd66cs152h28k9085nqg937wp31pz2yqywaldx1gywijyd8h"; + sha256 = "08dzvrv28ylbq1bm16lakwzyqq530fcbrl71k33zyb84mvgszy97"; }; propagatedBuildInputs = [ @@ -21,6 +21,7 @@ buildPythonApplication rec { license-expression requests setuptools + setuptools_scm ]; checkInputs = [ pytest ]; From 906b72919107560424bc79fae7cb21abd8c4f50f Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Sat, 13 Jun 2020 08:49:24 +0200 Subject: [PATCH 1544/3452] vscode, vscodium: add update.sh script --- pkgs/applications/editors/vscode/update.sh | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100755 pkgs/applications/editors/vscode/update.sh diff --git a/pkgs/applications/editors/vscode/update.sh b/pkgs/applications/editors/vscode/update.sh new file mode 100755 index 000000000000..7453cc9c89c8 --- /dev/null +++ b/pkgs/applications/editors/vscode/update.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +command -v grep >/dev/null 2>&1 || { echo >&2 "[grep] is required, but not installed. Aborting."; exit 1; } +command -v awk >/dev/null 2>&1 || { echo >&2 "[awk] is required, but not installed. Aborting."; exit 1; } +command -v sed >/dev/null 2>&1 || { echo >&2 "[sed] is required, but not installed. Aborting."; exit 1; } +command -v curl >/dev/null 2>&1 || { echo >&2 "[curl] is required, but not installed. Aborting."; exit 1; } +command -v nix-prefetch-url >/dev/null 2>&1 || { echo >&2 "[nix-prefetch-url] is required, but not installed. Aborting."; exit 1; } + +ROOT="$(dirname "$(readlink -f "$0")")" +if [ ! -f "$ROOT/vscode.nix" ]; then + echo "ERROR: cannot find vscode.nix in $ROOT" + exit 1 +fi +if [ ! -f "$ROOT/vscodium.nix" ]; then + echo "ERROR: cannot find vscodium.nix in $ROOT" + exit 1 +fi + +# VSCode + +VSCODE_VER=$(curl -s -L "https://code.visualstudio.com/Download" | grep "is now available" | awk -F'' '{print $1}' | awk -F'>' '{print $NF}') +VSCODE_VER=$(curl -s -L "https://code.visualstudio.com/updates/v${VSCODE_VER/./_}" | grep "Downloads:" | awk -F'code.visualstudio.com/' '{print $2}' | awk -F'/' '{print $1}') +sed -i "s/version = \".*\"/version = \"${VSCODE_VER}\"/" "$ROOT/vscode.nix" + +VSCODE_LINUX_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-x64/stable" +VSCODE_LINUX_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_URL}) +sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODE_LINUX_SHA256}\"/" "$ROOT/vscode.nix" + +VSCODE_DARWIN_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/darwin/stable" +VSCODE_DARWIN_SHA256=$(nix-prefetch-url ${VSCODE_DARWIN_URL}) +sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODE_DARWIN_SHA256}\"/" "$ROOT/vscode.nix" + +# VSCodium + +VSCODIUM_VER=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/VSCodium/vscodium/releases/latest | awk -F'/' '{print $NF}') +sed -i "s/version = \".*\"/version = \"${VSCODIUM_VER}\"/" "$ROOT/vscodium.nix" + +VSCODIUM_LINUX_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz" +VSCODIUM_LINUX_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_URL}) +sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_SHA256}\"/" "$ROOT/vscodium.nix" + +VSCODIUM_DARWIN_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-${VSCODIUM_VER}.zip" +VSCODIUM_DARWIN_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_URL}) +sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_SHA256}\"/" "$ROOT/vscodium.nix" \ No newline at end of file From 05e16d2886e90d799b5076099142b68def21cf6e Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Sat, 13 Jun 2020 08:56:51 +0200 Subject: [PATCH 1545/3452] vscode, vscodium: use nix-shell to install dependencies --- pkgs/applications/editors/vscode/update.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/vscode/update.sh b/pkgs/applications/editors/vscode/update.sh index 7453cc9c89c8..d573fdf04aaf 100755 --- a/pkgs/applications/editors/vscode/update.sh +++ b/pkgs/applications/editors/vscode/update.sh @@ -1,10 +1,5 @@ -#!/usr/bin/env bash - -command -v grep >/dev/null 2>&1 || { echo >&2 "[grep] is required, but not installed. Aborting."; exit 1; } -command -v awk >/dev/null 2>&1 || { echo >&2 "[awk] is required, but not installed. Aborting."; exit 1; } -command -v sed >/dev/null 2>&1 || { echo >&2 "[sed] is required, but not installed. Aborting."; exit 1; } -command -v curl >/dev/null 2>&1 || { echo >&2 "[curl] is required, but not installed. Aborting."; exit 1; } -command -v nix-prefetch-url >/dev/null 2>&1 || { echo >&2 "[nix-prefetch-url] is required, but not installed. Aborting."; exit 1; } +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnugrep gnused gawk ROOT="$(dirname "$(readlink -f "$0")")" if [ ! -f "$ROOT/vscode.nix" ]; then From 0905a5d99031c213c20c962e9501a2202602741b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 5 Jun 2020 22:51:43 +0200 Subject: [PATCH 1546/3452] =?UTF-8?q?ocamlPackages.vg:=200.9.3=20=E2=86=92?= =?UTF-8?q?=200.9.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/vg/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index 0a127e49fdc2..d33f03a0d347 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg , uchar, result, gg, uutf, otfm -, js_of_ocaml, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, +, js_of_ocaml, js_of_ocaml-ppx, pdfBackend ? true, # depends on uutf and otfm htmlcBackend ? true # depends on js_of_ocaml }: @@ -11,7 +11,7 @@ let inherit (stdenv.lib) optionals versionAtLeast; pname = "vg"; - version = "0.9.3"; + version = "0.9.4"; webpage = "https://erratique.ch/software/${pname}"; in @@ -25,14 +25,14 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "0jj5hrqxdb6yyplnz0r7am4mbjzgcn876qp7sqs2x93a97fk6lwd"; + sha256 = "181sz6l5xrj5jvwg4m2yqsjzwp2s5h8v0mwhjcwbam90kdfx2nak"; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ uchar result gg ] ++ optionals pdfBackend [ uutf otfm ] - ++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ocamlbuild js_of_ocaml-ppx ]; + ++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ppx ]; buildPhase = topkg.buildPhase + " --with-uutf ${boolToString pdfBackend}" From c055851648cdf5545e7d5256498aa7c3a67eed8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 13 Jun 2020 09:53:41 +0200 Subject: [PATCH 1547/3452] mesa: 20.0.7 -> 20.0.8 https://lists.freedesktop.org/archives/mesa-dev/2020-June/224501.html /cc PR #89105; this is indeed announced to be the last 20.0 version. --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 03977c74f11d..7ae59c119a0e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with stdenv.lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.0.7"; # Update only to the final (last planned) release (i.e. X.Y.MAX)? + version = "20.0.8"; # Update only to the final (last planned) release (i.e. X.Y.MAX)? branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0y517qpdg6v6dsdgzb365p03m30511sbyh8pq0mcvhvjwy7javpy"; + sha256 = "6cf0c010df89680f9b2bc6432ff01400031795e39bceda7535fa00af06740b6c"; }; prePatch = "patchShebangs ."; From a89e9a2eecaf9c77a16f68fc93ef4c791dfafa63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Fri, 12 Jun 2020 18:19:54 +0200 Subject: [PATCH 1548/3452] kubectx: re-pack, switch from bash to go With release 0.9, kubectx was rewritten in go. For more info see https://github.com/ahmetb/kubectx/releases/tag/v0.9.0 --- pkgs/development/tools/kubectx/default.nix | 40 +++++----------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index 8b980dc7e31e..b4cbb3cee634 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -1,8 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, kubectl, makeWrapper }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: -with lib; - -stdenv.mkDerivation rec { +buildGoModule rec { pname = "kubectx"; version = "0.9.0"; @@ -13,41 +11,19 @@ stdenv.mkDerivation rec { sha256 = "1b22jk8zl944w5zn3s7ybkkbmzp9519x32pfqwd1malfly7dzf55"; }; - buildInputs = [ makeWrapper ]; + vendorSha256 = "168hfdc2rfwpz2ls607bz5vsm1aw4brhwm8hmbiq1n1l2dn2dj0y"; - dontBuild = true; - doCheck = false; + nativeBuildInputs = [ installShellFiles ]; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/zsh/site-functions - mkdir -p $out/share/bash-completion/completions - mkdir -p $out/share/fish/vendor_completions.d - - cp kubectx $out/bin - cp kubens $out/bin - - # Provide ZSH completions - cp completion/kubectx.zsh $out/share/zsh/site-functions/_kubectx - cp completion/kubens.zsh $out/share/zsh/site-functions/_kubens - - # Provide BASH completions - cp completion/kubectx.bash $out/share/bash-completion/completions/kubectx - cp completion/kubens.bash $out/share/bash-completion/completions/kubens - - # Provide FISH completions - cp completion/*.fish $out/share/fish/vendor_completions.d/ - - for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${makeBinPath [ kubectl ]} - done + postInstall = '' + installShellCompletion completion/* ''; - meta = { + meta = with stdenv.lib; { description = "Fast way to switch between clusters and namespaces in kubectl!"; license = licenses.asl20; homepage = "https://github.com/ahmetb/kubectx"; - maintainers = with maintainers; [ periklis ]; + maintainers = with maintainers; [ jlesquembre ]; platforms = with platforms; unix; }; } From a7ea828f09d5b227cab62224422416fda108b57e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 13 Jun 2020 09:12:26 +0200 Subject: [PATCH 1549/3452] pythonRemoveBinBytecodeHook: fix explanation --- .../python/hooks/python-remove-bin-bytecode-hook.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh b/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh index 2add23f23165..1180694294db 100644 --- a/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh @@ -1,9 +1,9 @@ -# Setup hook for detecting conflicts in Python packages +# Setup hook for removing bytecode from the bin folder echo "Sourcing python-remove-bin-bytecode-hook.sh" -# Check if we have two packages with the same name in the closure and fail. -# If this happens, something went wrong with the dependencies specs. -# Intentionally kept in a subdirectory, see catch_conflicts/README.md. +# The bin folder is added to $PATH and should only contain executables. +# It may happen there are executables with a .py extension for which +# bytecode is generated. This hook removes that bytecode. pythonRemoveBinBytecodePhase () { if [ -d "$out/bin" ]; then From 818cf7827bd5950a41cdc17db81f19ee2cbcc851 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 12 Jun 2020 21:28:27 +0200 Subject: [PATCH 1550/3452] buildPythonPackage: recompile bytecode for reproducibility Due to a change in pip the unpacked wheels are no longer reproducible. We recompile the bytecode to cleanup this error. https://github.com/NixOS/nixpkgs/issues/81441 --- .../interpreters/python/hooks/default.nix | 11 +++++++++ .../hooks/python-recompile-bytecode-hook.sh | 24 +++++++++++++++++++ .../python/mk-python-derivation.nix | 2 ++ pkgs/top-level/python-packages.nix | 1 + 4 files changed, 38 insertions(+) create mode 100644 pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 4d736426f3bf..d14eb9cbb09d 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -1,5 +1,6 @@ # Hooks for building Python packages. { python +, lib , callPackage , makeSetupHook , disabledIf @@ -97,6 +98,16 @@ in rec { }; } ./python-namespaces-hook.sh) {}; + pythonRecompileBytecodeHook = callPackage ({ }: + makeSetupHook { + name = "python-recompile-bytecode-hook"; + substitutions = { + inherit pythonInterpreter pythonSitePackages; + compileArgs = lib.concatStringsSep " " (["-q" "-f" "-i -"] ++ lib.optionals isPy3k ["-j $NIX_BUILD_CORES"]); + bytecodeName = if isPy3k then "__pycache__" else "*.pyc"; + }; + } ./python-recompile-bytecode-hook.sh ) {}; + pythonRemoveBinBytecodeHook = callPackage ({ }: makeSetupHook { name = "python-remove-bin-bytecode-hook"; diff --git a/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh b/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh new file mode 100644 index 000000000000..649d0c17ea0c --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/python-recompile-bytecode-hook.sh @@ -0,0 +1,24 @@ +# Setup hook for recompiling bytecode. +# https://github.com/NixOS/nixpkgs/issues/81441 +echo "Sourcing python-recompile-bytecode-hook.sh" + +# Remove all bytecode from the $out output. Then, recompile only site packages folder +# Note this effectively duplicates `python-remove-bin-bytecode`, but long-term +# this hook should be removed again. + +pythonRecompileBytecodePhase () { + # TODO: consider other outputs than $out + + items="$(find "$out" -name "@bytecodeName@")" + if [[ -n $items ]]; then + for pycache in $items; do + rm -rf "$pycache" + done + fi + + find "$out"/@pythonSitePackages@ -name "*.py" -exec @pythonInterpreter@ -OO -m compileall @compileArgs@ {} + +} + +if [ -z "${dontUsePythonRecompileBytecode-}" ]; then + postPhases+=" pythonRecompileBytecodePhase" +fi diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 22938a455852..41efddbb3e02 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -17,6 +17,7 @@ , pythonCatchConflictsHook , pythonImportsCheckHook , pythonNamespacesHook +, pythonRecompileBytecodeHook , pythonRemoveBinBytecodeHook , pythonRemoveTestsDirHook , setuptoolsBuildHook @@ -110,6 +111,7 @@ let python wrapPython ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? + pythonRecompileBytecodeHook # Remove when solved https://github.com/NixOS/nixpkgs/issues/81441 pythonRemoveTestsDirHook ] ++ lib.optionals catchConflicts [ setuptools pythonCatchConflictsHook diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0aa27ff933ea..f68b9482aa31 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -118,6 +118,7 @@ in { pythonCatchConflictsHook pythonImportsCheckHook pythonNamespacesHook + pythonRecompileBytecodeHook pythonRemoveBinBytecodeHook pythonRemoveTestsDirHook setuptoolsBuildHook From b4f85b97f548cf5ed776f56916c38dcd06f214e0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 13 Jun 2020 10:40:39 +0200 Subject: [PATCH 1551/3452] python.pkgs.pip: 20.1 -> 20.1.1 --- pkgs/development/python-modules/pip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 8c2247c24aa6..e4ace129d996 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pip"; - version = "20.1"; + version = "20.1.1"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "0s9z72cpa15p2bp7zq1lid8k2ykrznfzjwpq5f41v3f30faraxg7"; + sha256 = "01wq01ysv0ijcrg8a4mj72zb8al15b8vw8g3ywhxq53kbsyhfxn4"; name = "${pname}-${version}-source"; }; From 4aa1511b703ab6e8f6047a27886ff8fc48aa0140 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 05:56:08 +0000 Subject: [PATCH 1552/3452] libnftnl: 1.1.5 -> 1.1.7 --- pkgs/development/libraries/libnftnl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 4aac04a4d028..f9def04f99b7 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - version = "1.1.5"; + version = "1.1.7"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; - sha256 = "1wqlxf76bkqf3qhka9sw32qhb2ni20q1k6rn3iril2kw482lvpk6"; + sha256 = "13zd90bfrr0q3j0l0cbc8kiizccw6n8gp727kqnfljh024zw3nr0"; }; nativeBuildInputs = [ pkgconfig ]; From 858acc3ee50c0e5138c493de35b7cbbb36e6323d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 01:12:06 +0000 Subject: [PATCH 1553/3452] harfbuzz: 2.6.4 -> 2.6.7 --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index c2a924c7e023..823c123d52ad 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,7 +8,7 @@ }: let - version = "2.6.4"; + version = "2.6.7"; inherit (stdenv.lib) optional optionals optionalString; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.xz"; - sha256 = "04iwq13w6zkdhljmsxrzgg4fyh04qnwfn57rgrl9kmijc7cvh4wl"; + sha256 = "065jg6s8xix45s4msj0l2r0iycw5yyyjdylripv7pyfzdk883r29"; }; postPatch = '' From b5a814cb5df2c04421b4da24adb96eb3b761386b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 22:58:28 +0000 Subject: [PATCH 1554/3452] iptables: 1.8.4 -> 1.8.5 --- pkgs/os-specific/linux/iptables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 7502769c3aed..c9c342ad7682 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -6,12 +6,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.8.4"; + version = "1.8.5"; pname = "iptables"; src = fetchurl { url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; - sha256 = "0z0mgs1ghvn3slc868mgbf2g26njgrzcy5ggyb5w4i55j1a3lflr"; + sha256 = "02a3575ypdpg6a2x752mhk3f7h1381ymkq1n0gss6fp6292xfmyl"; }; nativeBuildInputs = [ pkgconfig pruneLibtoolFiles flex bison ]; From f67bc3314038e43d5dd6db0e6e5d2a4b9890971f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 12:04:16 +0000 Subject: [PATCH 1555/3452] libyaml: 0.2.4 -> 0.2.5 --- pkgs/development/libraries/libyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 7f723cf2ef8e..37b8ebcc3efa 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libyaml"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "yaml"; repo = "libyaml"; rev = version; - sha256 = "04z25mvw86jhzyrj0h8mlgisvj9glc5ww9g0cymzjfsd7z33gnmy"; + sha256 = "18zsnsxc53pans4a01cs4401a2cjk3qi098hi440pj4zijifgcsb"; }; nativeBuildInputs = [ autoreconfHook ]; From 0d4fba91682dcfa553b89f680d895e233a74a964 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 05:26:01 +0000 Subject: [PATCH 1556/3452] lcms2: 2.9 -> 2.10 --- pkgs/development/libraries/lcms2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 2de11a3bd406..2584e26b3c0b 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libtiff, libjpeg, zlib }: stdenv.mkDerivation rec { - name = "lcms2-2.9"; + name = "lcms2-2.10"; src = fetchurl { url = "mirror://sourceforge/lcms/${name}.tar.gz"; - sha256 = "083xisy6z01zhm7p7rgk4bx9d6zlr8l20qkfv1g29ylnhgwzvij8"; + sha256 = "0ipkw2r8h3yhm4vn5nx04dz5s943x9fw023fhrrnjz2c97yi3m2h"; }; outputs = [ "bin" "dev" "out" ]; From dbb4452ee31df81c2d1dbbd35d34dd1ac736df55 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 12:39:35 +0000 Subject: [PATCH 1557/3452] man: 2.9.0 -> 2.9.2 --- pkgs/tools/misc/man-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index f19e5fd5b9df..7b8835622c8d 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: stdenv.mkDerivation rec { - name = "man-db-2.9.0"; + name = "man-db-2.9.2"; src = fetchurl { url = "mirror://savannah/man-db/${name}.tar.xz"; - sha256 = "0qg2sdn8mayya0ril484iz1r7hi46l68d2d80cr6lvc7x3csqjjx"; + sha256 = "0z04kwv5ymmd0pzadpaag696jfckg6rbz8x4jrgj09bmqqk3yf3v"; }; outputs = [ "out" "doc" ]; From 1b6e357424ea1fb0f1d4b36ecc8e2c0f9a3cae14 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 9 Jun 2020 17:30:33 +0200 Subject: [PATCH 1558/3452] kmod: 26 -> 27 --- pkgs/os-specific/linux/kmod/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index de025b436f54..f1cc4558b05e 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "kmod"; - version = "26"; + version = "27"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/${pname}/${pname}-${version}.tar.xz"; - sha256 = "17dvrls70nr3b3x1wm8pwbqy4r8a5c20m0dhys8mjhsnpg425fsp"; + sha256 = "035wzfzjx4nwidk747p8n085mgkvy531ppn16krrajx2dkqzply1"; }; nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ]; @@ -38,8 +38,16 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://www.kernel.org/pub/linux/utils/kernel/kmod/"; description = "Tools for loading and managing Linux kernel modules"; + longDescription = '' + kmod is a set of tools to handle common tasks with Linux kernel modules + like insert, remove, list, check properties, resolve dependencies and + aliases. These tools are designed on top of libkmod, a library that is + shipped with kmod. + ''; + homepage = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/"; + downloadPage = "https://www.kernel.org/pub/linux/utils/kernel/kmod/"; + changelog = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/plain/NEWS?h=v${version}"; license = licenses.lgpl21; platforms = platforms.unix; }; From c8d064eec16122db9a727c0bba971c2bf80a6bc0 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Thu, 4 Jun 2020 13:51:27 -0700 Subject: [PATCH 1559/3452] gstreamer: Fix wrapper quoting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The bug was that the inner double quotes in "\$("…")" are not actually inner like they would be in "$("…")". We could write "\$(\"…\")", but using single quotes on the outside makes everything simpler. Fixes #63751. Signed-off-by: Anders Kaseorg --- pkgs/development/libraries/gstreamer/core/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index f4810feada87..9c4f3ee0251d 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { postInstall = '' for prog in "$dev/bin/"*; do # We can't use --suffix here due to quoting so we craft the export command by hand - wrapProgram "$prog" --run "export GST_PLUGIN_SYSTEM_PATH=\$GST_PLUGIN_SYSTEM_PATH"$\{GST_PLUGIN_SYSTEM_PATH:+:\}"\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" + wrapProgram "$prog" --run 'export GST_PLUGIN_SYSTEM_PATH=$GST_PLUGIN_SYSTEM_PATH''${GST_PLUGIN_SYSTEM_PATH:+:}$(unset _tmp; for profile in $NIX_PROFILES; do _tmp="$profile/lib/gstreamer-1.0''${_tmp:+:}$_tmp"; done; printf '%s' "$_tmp")' done ''; From fc94ec9baf9cb15f7acd4eb28df604f32a160519 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 06:56:12 +0000 Subject: [PATCH 1560/3452] libmbim: 1.22.0 -> 1.23.900 --- pkgs/development/libraries/libmbim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 9e40133170aa..8750ee599ce6 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.22.0"; + version = "1.23.900"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "0f0zmbvnhdsqbf3hw5bimq67n57mhd8yad1ia823cb6i3kmph1sw"; + sha256 = "0ikzjs44q44cj4m786gvm575a7x61rgmav6b60n2y74pgqvj3791"; }; outputs = [ "out" "dev" "man" ]; From aee70358c502c5c9414df42bfd4e8744bf81f5dc Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Fri, 12 Jun 2020 09:51:27 -0700 Subject: [PATCH 1561/3452] ocamlPackages.tls: 0.12.0 -> 0.12.1 --- pkgs/development/ocaml-modules/tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index dea03f2b38a7..0c3eaf33e782 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; - version = "0.12.0"; + version = "0.12.1"; pname = "tls"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "0fy38qmy7rcld1b4qzz4ycl1fr0v1wa7qd24125lpd6hly86fn57"; + sha256 = "09jhzjhni3il5bmy2c6gylmg9s45ppckjc7nm5nyg5dbm699cwxg"; }; useDune2 = true; From c9963a8ec459370f30f1a830b429372a62e8df39 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 6 Jun 2020 09:47:45 +0200 Subject: [PATCH 1562/3452] =?UTF-8?q?ocamlPackages.ocsigen-toolkit:=202.5.?= =?UTF-8?q?0=20=E2=86=92=202.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 4dfca784dfa3..a0f3136de22b 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "ocsigen-toolkit"; name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.5.0"; + version = "2.7.0"; propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ]; buildInputs = [ ocaml findlib opaline ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "ocsigen"; repo = pname; rev = version; - sha256 = "0hll8qr363pbb65jnr2w36zcbplbwn08xb7826ayiwigakj783p9"; + sha256 = "0jan5779nc0jf993hmvfii15ralcs20sm4mcnqwqrnhjbq6f6zpk"; }; createFindlibDestdir = true; From ff53f0930e0effde74823ed7fa1bb7d521a627df Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 12 Jun 2020 20:07:39 +0200 Subject: [PATCH 1563/3452] ocamlPackages.dns(-client): 4.5.0 -> 4.6.0 --- pkgs/development/ocaml-modules/dns/client.nix | 10 +++++++--- pkgs/development/ocaml-modules/dns/default.nix | 8 ++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix index 0dd0541138c8..a6dc40de24ea 100644 --- a/pkgs/development/ocaml-modules/dns/client.nix +++ b/pkgs/development/ocaml-modules/dns/client.nix @@ -1,5 +1,6 @@ { lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-time -, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv }: +, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv +, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest }: buildDunePackage { pname = "dns-client"; @@ -7,8 +8,11 @@ buildDunePackage { useDune2 = true; - propagatedBuildInputs = [ dns mtime ocaml_lwt randomconv mirage-clock mirage-time - mirage-random mirage-stack mirage-crypto-rng ]; + propagatedBuildInputs = [ cstruct fmt logs dns rresult randomconv domain-name ipaddr + ocaml_lwt mirage-stack mirage-random mirage-time mirage-clock + mtime mirage-crypto-rng ]; + checkInputs = [ alcotest ]; + doCheck = true; meta = dns.meta // { description = "Pure DNS resolver API"; diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index 01bbffd40b94..68a8ad8da4ed 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -1,19 +1,19 @@ { lib, buildDunePackage, fetchurl, alcotest -, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, rresult +, cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, rresult, astring, fmt }: buildDunePackage rec { pname = "dns"; - version = "4.5.0"; + version = "4.6.0"; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz"; - sha256 = "10jrnnxvp06rvzk285wibyi9hn15qhjnqjy9xsfbwl8yhmzzqnq0"; + sha256 = "1gkswpc91j4ps60bp52ggg4qwj5g88f49x6p6d619p4x8vmhjylv"; }; - propagatedBuildInputs = [ cstruct domain-name duration gmap ipaddr logs lru metrics ptime rresult ]; + propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ]; doCheck = true; checkInputs = lib.optional doCheck alcotest; From 82a0240bb06e4f795ff450805787c3b9a11a368e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 13 Jun 2020 12:23:42 +0200 Subject: [PATCH 1564/3452] fuse3: 3.9.1 -> 3.9.2 (#90232) --- pkgs/os-specific/linux/fuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 415226509b7b..4d2e12367de7 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.9.1"; - sha256Hash = "1i3f4h3vnjxls8hdi6w2n2ksrgbs7brbzj65rvxginyxicykh857"; + version = "3.9.2"; + sha256Hash = "10xsbly7rv895c9zv4fqmnrxbdc0kd1qhlk75x4m9cv95f93k843"; }; } From 0e18e5db994f416580e8c6fbe3351a721ee5ec35 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Fri, 8 May 2020 14:15:41 +0200 Subject: [PATCH 1565/3452] nixos/resolved: Include dbus alias of resolved unit This will make dbus socket activation for it work When `systemd-resolved` is restarted; this would lead to unavailability of DNS lookups. You're supposed to use DBUS socket activation to buffer resolved requests; such that restarts happen without downtime --- nixos/modules/system/boot/resolved.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index b7aaef575ac1..b024f9cf5ee9 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -148,6 +148,7 @@ in systemd.services.systemd-resolved = { wantedBy = [ "multi-user.target" ]; + aliases = [ "dbus-org.freedesktop.resolve1.service" ]; restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ]; }; From cd1dedac67d4b077a556a660ef5724c909da8006 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Tue, 19 May 2020 11:04:14 +0200 Subject: [PATCH 1566/3452] nixos/networkd: Make activatible through dbus and netlink With this systemd buffers netlink messages in early boot from the kernel itself; and passes them on to networkd for processing once it's started. Makes sure no routing messages are missed. Also makes an alias so that dbus can activate this unit. Upstream has this too. --- nixos/modules/system/boot/networkd.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 9b34b12e73a5..b0545363b330 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1178,14 +1178,22 @@ in users.users.systemd-network.group = "systemd-network"; systemd.additionalUpstreamSystemUnits = [ - "systemd-networkd.service" "systemd-networkd-wait-online.service" + "systemd-networkd-wait-online.service" + "systemd-networkd.service" + "systemd-networkd.socket" ]; systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks; + # systemd-networkd is socket-activated by kernel netlink route change + # messages. It is important to have systemd buffer those on behalf of + # networkd. + systemd.sockets.systemd-networkd.wantedBy = [ "sockets.target" ]; + systemd.services.systemd-networkd = { wantedBy = [ "multi-user.target" ]; + aliases = [ "dbus-org.freedesktop.network1.service" ]; restartTriggers = map (x: x.source) (attrValues unitFiles); # prevent race condition with interface renaming (#39069) requires = [ "systemd-udev-settle.service" ]; From 71a6d32c18edd0312a7436910b00d21d5e6d4c0f Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Tue, 19 May 2020 11:06:32 +0200 Subject: [PATCH 1567/3452] nixos/timesyncd: Make dbus-activatible Upstream has this alias too; so that dbus activation works. What I don't fully understand is why this would ever be useful given this unit is already started way in early boot; even before dbus is up. But lets just keep behaviour similar to upstream and then ask these questions to upstream. --- nixos/modules/system/boot/timesyncd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index 9e2f36ca01f8..35fb5578b070 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -41,6 +41,7 @@ with lib; systemd.services.systemd-timesyncd = { wantedBy = [ "sysinit.target" ]; + aliases = [ "dbus-org.freedesktop.timesync1.service" ]; restartTriggers = [ config.environment.etc."systemd/timesyncd.conf".source ]; }; From 2e5019b92c83d1ebd9e94e12bc5a3eab05c388e6 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 5 Jun 2020 15:19:19 +0200 Subject: [PATCH 1568/3452] dnschain: remove package and NixOS module The software is unmaintained since ~2014 and the package can't be built anymore (issue #89205). --- nixos/modules/misc/ids.nix | 2 - nixos/modules/module-list.nix | 1 - .../modules/services/networking/dnschain.nix | 184 ------------------ .../modules/services/networking/namecoind.nix | 5 - pkgs/development/node-packages/default.nix | 8 - .../node-packages/node-packages.json | 1 - 6 files changed, 201 deletions(-) delete mode 100644 nixos/modules/services/networking/dnschain.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 85e5534e906f..3409e7ba22ea 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -239,7 +239,6 @@ in shout = 206; gateone = 207; namecoin = 208; - dnschain = 209; #lxd = 210; # unused kibana = 211; xtreemfs = 212; @@ -549,7 +548,6 @@ in #shout = 206; #unused gateone = 207; namecoin = 208; - #dnschain = 209; #unused lxd = 210; # unused #kibana = 211; xtreemfs = 212; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 978d33e75852..85264ff09e40 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -601,7 +601,6 @@ ./services/networking/dhcpcd.nix ./services/networking/dhcpd.nix ./services/networking/dnscache.nix - ./services/networking/dnschain.nix ./services/networking/dnscrypt-proxy2.nix ./services/networking/dnscrypt-wrapper.nix ./services/networking/dnsdist.nix diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix deleted file mode 100644 index 003609ea7054..000000000000 --- a/nixos/modules/services/networking/dnschain.nix +++ /dev/null @@ -1,184 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfgs = config.services; - cfg = cfgs.dnschain; - - dataDir = "/var/lib/dnschain"; - username = "dnschain"; - - configFile = pkgs.writeText "dnschain.conf" '' - [log] - level = info - - [dns] - host = ${cfg.dns.address} - port = ${toString cfg.dns.port} - oldDNSMethod = NO_OLD_DNS - externalIP = ${cfg.dns.externalAddress} - - [http] - host = ${cfg.api.hostname} - port = ${toString cfg.api.port} - tlsPort = ${toString cfg.api.tlsPort} - - ${cfg.extraConfig} - ''; - -in - -{ - - ###### interface - - options = { - - services.dnschain = { - - enable = mkEnableOption '' - DNSChain, a blockchain based DNS + HTTP server. - To resolve .bit domains set services.namecoind.enable = true; - and an RPC username/password. - ''; - - dns.address = mkOption { - type = types.str; - default = "127.0.0.1"; - description = '' - The IP address the DNSChain resolver will bind to. - Leave this unchanged if you do not wish to directly expose the resolver. - ''; - }; - - dns.externalAddress = mkOption { - type = types.str; - default = cfg.dns.address; - description = '' - The IP address used by clients to reach the resolver and the value of - the namecoin.dns record. Set this in case the bind address - is not the actual IP address (e.g. the machine is behind a NAT). - ''; - }; - - dns.port = mkOption { - type = types.int; - default = 5333; - description = '' - The port the DNSChain resolver will bind to. - ''; - }; - - api.hostname = mkOption { - type = types.str; - default = "0.0.0.0"; - description = '' - The hostname (or IP address) the DNSChain API server will bind to. - ''; - }; - - api.port = mkOption { - type = types.int; - default = 8080; - description = '' - The port the DNSChain API server (HTTP) will bind to. - ''; - }; - - api.tlsPort = mkOption { - type = types.int; - default = 4433; - description = '' - The port the DNSChain API server (HTTPS) will bind to. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - example = '' - [log] - level = debug - ''; - description = '' - Additional options that will be appended to the configuration file. - ''; - }; - - }; - - services.dnsmasq.resolveDNSChainQueries = mkOption { - type = types.bool; - default = false; - description = '' - Resolve .bit top-level domains using DNSChain and namecoin. - ''; - }; - - services.pdns-recursor.resolveDNSChainQueries = mkOption { - type = types.bool; - default = false; - description = '' - Resolve .bit top-level domains using DNSChain and namecoin. - ''; - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - services.dnsmasq.servers = optionals cfgs.dnsmasq.resolveDNSChainQueries - [ "/.bit/127.0.0.1#${toString cfg.dns.port}" - "/.dns/127.0.0.1#${toString cfg.dns.port}" - ]; - - services.pdns-recursor = mkIf cfgs.pdns-recursor.resolveDNSChainQueries { - forwardZonesRecurse = - { bit = "127.0.0.1:${toString cfg.dns.port}"; - dns = "127.0.0.1:${toString cfg.dns.port}"; - }; - luaConfig ='' - addNTA("bit", "namecoin doesn't support DNSSEC") - addNTA("dns", "namecoin doesn't support DNSSEC") - ''; - }; - - users.users.${username} = { - description = "DNSChain daemon user"; - home = dataDir; - createHome = true; - uid = config.ids.uids.dnschain; - extraGroups = optional cfgs.namecoind.enable "namecoin"; - }; - - systemd.services.dnschain = { - description = "DNSChain daemon"; - after = optional cfgs.namecoind.enable "namecoind.target"; - wantedBy = [ "multi-user.target" ]; - - serviceConfig = { - User = "dnschain"; - Restart = "on-failure"; - ExecStart = "${pkgs.nodePackages.dnschain}/bin/dnschain"; - }; - - preStart = '' - # Link configuration file into dnschain home directory - configPath=${dataDir}/.dnschain/dnschain.conf - mkdir -p ${dataDir}/.dnschain - if [ "$(realpath $configPath)" != "${configFile}" ]; then - rm -f $configPath - ln -s ${configFile} $configPath - fi - ''; - }; - - }; - - meta.maintainers = with lib.maintainers; [ rnhmjoj ]; - -} diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix index ead7f0859434..6ca99e1321bd 100644 --- a/nixos/modules/services/networking/namecoind.nix +++ b/nixos/modules/services/networking/namecoind.nix @@ -149,11 +149,6 @@ in config = mkIf cfg.enable { - services.dnschain.extraConfig = '' - [namecoin] - config = ${configFile} - ''; - users.users.namecoin = { uid = config.ids.uids.namecoin; description = "Namecoin daemon user"; diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 7ff3db8894ec..9d7d4f9671dd 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -39,14 +39,6 @@ let meta.broken = since "12"; }; - dnschain = super.dnschain.override { - buildInputs = [ pkgs.makeWrapper super.coffee-script ]; - postInstall = '' - wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin - ''; - meta.broken = since "14"; - }; - bitwarden-cli = pkgs.lib.overrideDerivation super."@bitwarden/cli" (drv: { name = "bitwarden-cli-${drv.version}"; }); diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 9ea5b2ec15d9..3a4036758f17 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -60,7 +60,6 @@ , "csslint" , "dat" , "dhcp" -, "dnschain" , "dockerfile-language-server-nodejs" , "elasticdump" , "elm-oracle" From 8fa6c0d12d2ebf1c1640c07a54151f2e3f111427 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 8 Jun 2020 00:17:32 +0200 Subject: [PATCH 1569/3452] nixos/release-notes: document dnschain removal --- nixos/doc/manual/release-notes/rl-2009.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 8bf9c16e6f8a..7f31a0b5f9a6 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -455,6 +455,14 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; initrd file has not been deleted. + + + The DNSChain + package and NixOS module have been removed from Nixpkgs as the software is + unmaintained and can't be built. For more information see issue + #89205. + + From 1c61d8707ac8ecf76a656255ee5bb6df978894dd Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Sat, 13 Jun 2020 11:52:46 +0000 Subject: [PATCH 1570/3452] openjdk: added myself as maintainer --- pkgs/development/compilers/openjdk/11.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index ef496f5f7c52..f29de168633d 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -135,7 +135,7 @@ let homepage = "http://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ edwtjo asbachb ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; }; From 890485a2bd8ab4318048e24987d91986a4758ed3 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Sat, 13 Jun 2020 11:51:57 +0000 Subject: [PATCH 1571/3452] openjdk: 11.0.6 -> 11.0.7 --- pkgs/development/compilers/openjdk/11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index f29de168633d..9edb70074c7d 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -10,7 +10,7 @@ let major = "11"; - update = ".0.6"; + update = ".0.7"; build = "ga"; openjdk = stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ let src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; - sha256 = "1w6n0cnz9izpjb3sc870q7a0jz85a6c7fiszymxin10cnsajkzir"; + sha256 = "14daacng9ndxf4kmvsn7nracwfiwwmw5rha8rkk3723pfk9g8q7p"; }; nativeBuildInputs = [ pkgconfig autoconf ]; From fe50bab788fd4f4fa58ca22996bcefc2724d0d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 12 Jun 2020 17:09:45 +0200 Subject: [PATCH 1572/3452] buildRustCrate: set CARGO_FEATURE_* when running the build script Cargo sets `CARGO_FEATURE_*` for all features when running a build script: https://doc.rust-lang.org/cargo/reference/environment-variables.html#environment-variables-cargo-sets-for-build-scripts Some crates have build scripts (e.g. openblas-src) that rely on the feature variables being properly set. Since we now need several representations of features, this change also updates `createFeatures` to be a list of features, rather than `rustc` feature arguments. `configureCrate` and `buildCrate` then build the required representations as-needed. Fixes #68978 --- .../rust/build-rust-crate/build-crate.nix | 4 +-- .../rust/build-rust-crate/configure-crate.nix | 22 +++++++++++++--- .../rust/build-rust-crate/default.nix | 17 ++++++++---- .../rust/build-rust-crate/test/default.nix | 26 +++++++++++++++++++ 4 files changed, 58 insertions(+), 11 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index d6d1cebb2e91..f82effdbca7c 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkRustcDepArgs, rust }: +{ lib, stdenv, mkRustcDepArgs, mkRustcFeatureArgs, rust }: { crateName, dependencies, crateFeatures, crateRenames, libName, release, libPath, @@ -13,7 +13,7 @@ ++ ["-C codegen-units=$NIX_BUILD_CORES"] ++ ["--remap-path-prefix=$NIX_BUILD_TOP=/" ] ++ [(mkRustcDepArgs dependencies crateRenames)] - ++ [crateFeatures] + ++ [(mkRustcFeatureArgs crateFeatures)] ++ extraRustcOpts ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--target ${rust.toRustTarget stdenv.hostPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" # since rustc 1.42 the "proc_macro" crate is part of the default crate prelude diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index c47bc00938c1..8e2f5f7f35e0 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, echo_colored, noisily, mkRustcDepArgs }: -{ build +{ lib, stdenv, echo_colored, noisily, mkRustcDepArgs, mkRustcFeatureArgs }: +{ + build , buildDependencies , colors , completeBuildDeps @@ -30,6 +31,9 @@ let version_ = lib.splitString "-" crateVersion; optLevel = if release then 3 else 0; completeDepsDir = lib.concatStringsSep " " completeDeps; completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps; + envFeatures = lib.concatStringsSep " " ( + map (f: lib.replaceChars ["-"] ["_"] (lib.toUpper f)) crateFeatures + ); in '' ${echo_colored colors} ${noisily colors verbose} @@ -161,14 +165,24 @@ in '' EXTRA_BUILD_FLAGS="$EXTRA_BUILD_FLAGS $(tr '\n' ' ' < target/link.build)" fi noisily rustc --crate-name build_script_build $BUILD --crate-type bin ${rustcOpts} \ - ${crateFeatures} --out-dir target/build/${crateName} --emit=dep-info,link \ + ${mkRustcFeatureArgs crateFeatures} --out-dir target/build/${crateName} --emit=dep-info,link \ -L dependency=target/buildDeps ${buildDeps} --cap-lints allow $EXTRA_BUILD_FLAGS --color ${colors} mkdir -p target/build/${crateName}.out export RUST_BACKTRACE=1 BUILD_OUT_DIR="-L $OUT_DIR" mkdir -p $OUT_DIR - target/build/${crateName}/build_script_build > target/build/${crateName}.opt + + ( + # Features should be set as environment variable for build scripts: + # https://doc.rust-lang.org/cargo/reference/environment-variables.html#environment-variables-cargo-sets-for-build-scripts + for feature in ${envFeatures}; do + export CARGO_FEATURE_$feature=1 + done + + target/build/${crateName}/build_script_build > target/build/${crateName}.opt + ) + set +e EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ') diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index d9ed26f1d94a..d559aba16165 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -45,14 +45,17 @@ let " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}") ) dependencies; + # Create feature arguments for rustc. + mkRustcFeatureArgs = lib.concatMapStringsSep " " (f: ''--cfg feature=\"${f}\"''); + inherit (import ./log.nix { inherit lib; }) noisily echo_colored; configureCrate = import ./configure-crate.nix { - inherit lib stdenv echo_colored noisily mkRustcDepArgs; + inherit lib stdenv echo_colored noisily mkRustcDepArgs mkRustcFeatureArgs; }; buildCrate = import ./build-crate.nix { - inherit lib stdenv mkRustcDepArgs rust; + inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs rust; }; installCrate = import ./install-crate.nix { inherit stdenv; }; @@ -233,8 +236,11 @@ stdenv.mkDerivation (rec { ++ lib.concatMap (dep: dep.completeBuildDeps ++ dep.completeDeps) buildDependencies ); - crateFeatures = lib.optionalString (crate ? features) - (lib.concatMapStringsSep " " (f: ''--cfg feature=\"${f}\"'') (crate.features ++ features)); + # Create a list of features that are enabled by the crate itself and + # through the features argument of buildRustCrate. Exclude features + # with a forward slash, since they are passed through to dependencies. + crateFeatures = lib.optionals (crate ? features) + (builtins.filter (f: !lib.hasInfix "/" f) (crate.features ++ features)); libName = if crate ? libName then crate.libName else crate.crateName; libPath = if crate ? libPath then crate.libPath else ""; @@ -244,7 +250,8 @@ stdenv.mkDerivation (rec { metadata = let depsMetadata = lib.foldl' (str: dep: str + dep.metadata) "" (dependencies ++ buildDependencies); hashedMetadata = builtins.hashString "sha256" - (crateName + "-" + crateVersion + "___" + toString crateFeatures + "___" + depsMetadata); + (crateName + "-" + crateVersion + "___" + toString (mkRustcFeatureArgs crateFeatures) + + "___" + depsMetadata); in lib.substring 0 10 hashedMetadata; build = crate.build or ""; diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index bdd6c86d5f07..24ddc11459ec 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -344,6 +344,32 @@ let buildTests = true; expectedTestOutputs = [ "test baz_false ... ok" ]; }; + buildScriptFeatureEnv = { + crateName = "build-script-feature-env"; + features = [ "some-feature" "crate/another_feature" ]; + src = symlinkJoin { + name = "build-script-feature-env"; + paths = [ + (mkFile "src/main.rs" '' + #[cfg(test)] + #[test] + fn feature_not_visible() { + assert!(std::env::var("CARGO_FEATURE_SOME_FEATURE").is_err()); + assert!(option_env!("CARGO_FEATURE_SOME_FEATURE").is_none()); + } + fn main() {} + '') + (mkFile "build.rs" '' + fn main() { + assert!(std::env::var("CARGO_FEATURE_SOME_FEATURE").is_ok()); + assert!(option_env!("CARGO_FEATURE_SOME_FEATURE").is_none()); + } + '') + ]; + }; + buildTests = true; + expectedTestOutputs = [ "test feature_not_visible ... ok" ]; + }; # Regression test for https://github.com/NixOS/nixpkgs/pull/88054 # Build script output should be rewritten as valid env vars. buildScriptIncludeDirDeps = let From 8bbe246516a4fa45af23fba00166285f733d13fd Mon Sep 17 00:00:00 2001 From: Jos van Bakel Date: Sun, 8 Mar 2020 12:16:05 +0100 Subject: [PATCH 1573/3452] sonic-pi: 3.1.0 -> 3.2.2 --- pkgs/applications/audio/sonic-pi/default.nix | 43 +++++++++++--------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 534ea1358803..d80632a08f59 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , fftwSinglePrec , ruby -, libffi , aubio , cmake , pkgconfig @@ -12,7 +11,6 @@ , bash , jack2Full , supercollider -, qscintilla , qwt , osmid }: @@ -24,14 +22,14 @@ let in mkDerivation rec { - version = "3.1.0"; + version = "3.2.2"; pname = "sonic-pi"; src = fetchFromGitHub { owner = "samaaron"; repo = "sonic-pi"; rev = "v${version}"; - sha256 = "0gi4a73szaa8iz5q1gxgpsnyvhhghcfqm6bfwwxbix4m5csbfgh9"; + sha256 = "1nlkpkpg9iz2hvf5pymvk6lqhpdpjbdrvr0hrnkc3ymj7llvf1cm"; }; buildInputs = [ @@ -39,10 +37,8 @@ mkDerivation rec { cmake pkgconfig qtbase - qscintilla qwt ruby - libffi aubio supercollider_single_prec boost @@ -71,23 +67,34 @@ mkDerivation rec { popd pushd app/gui/qt - cp -f ruby_help.tmpl ruby_help.h - ../../server/ruby/bin/qt-doc.rb -o ruby_help.h + cp -f utils/ruby_help.tmpl utils/ruby_help.h + ../../server/ruby/bin/qt-doc.rb -o utils/ruby_help.h - substituteInPlace SonicPi.pro \ - --replace "LIBS += -lrt -lqt5scintilla2" \ - "LIBS += -lrt -lqscintilla2 -lqwt" + lrelease lang/*.ts - lrelease SonicPi.pro - qmake SonicPi.pro - - make + mkdir build + pushd build + cmake -G "Unix Makefiles" .. + make + popd popd ''; installPhase = '' runHook preInstall - cp -r . $out + + mkdir $out + cp -r {bin,etc} $out/ + + # Copy server whole. + mkdir -p $out/app + cp -r app/server $out/app/ + + # Copy only necessary files for the gui app. + mkdir -p $out/app/gui/qt/build + cp -r app/gui/qt/{book,fonts,help,html,images,image_source,info,lang,theme} $out/app/gui/qt/ + cp app/gui/qt/build/sonic-pi $out/app/gui/qt/build/sonic-pi + runHook postInstall ''; @@ -103,9 +110,7 @@ mkDerivation rec { homepage = "https://sonic-pi.net/"; description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Phlogistique kamilchm ]; + maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict ]; platforms = lib.platforms.linux; - # sonic-pi depends on ruby 2.4 which we don't support anymore - broken = true; }; } From dde87455eddee287d605a24ccacbfc8e67f2c19c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 13 Jun 2020 15:15:10 +0200 Subject: [PATCH 1574/3452] bundler-audit: 0.6.1 -> 0.7.0.1 --- pkgs/tools/security/bundler-audit/Gemfile.lock | 6 +++--- pkgs/tools/security/bundler-audit/default.nix | 1 + pkgs/tools/security/bundler-audit/gemset.nix | 12 ++++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/bundler-audit/Gemfile.lock b/pkgs/tools/security/bundler-audit/Gemfile.lock index 107e425bc579..f130b57912b4 100644 --- a/pkgs/tools/security/bundler-audit/Gemfile.lock +++ b/pkgs/tools/security/bundler-audit/Gemfile.lock @@ -1,10 +1,10 @@ GEM remote: https://rubygems.org/ specs: - bundler-audit (0.6.1) + bundler-audit (0.7.0.1) bundler (>= 1.2.0, < 3) - thor (~> 0.18) - thor (0.20.3) + thor (>= 0.18, < 2) + thor (1.0.1) PLATFORMS ruby diff --git a/pkgs/tools/security/bundler-audit/default.nix b/pkgs/tools/security/bundler-audit/default.nix index 6bcb341a8343..c24831f26b06 100644 --- a/pkgs/tools/security/bundler-audit/default.nix +++ b/pkgs/tools/security/bundler-audit/default.nix @@ -21,6 +21,7 @@ bundlerEnv rec { - Does not require a network connection. ''; homepage = "https://github.com/rubysec/bundler-audit"; + changelog = "https://github.com/rubysec/bundler-audit/blob/v${version}/ChangeLog.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ primeos nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/bundler-audit/gemset.nix b/pkgs/tools/security/bundler-audit/gemset.nix index 56d78b3e8f16..2121a3c08e55 100644 --- a/pkgs/tools/security/bundler-audit/gemset.nix +++ b/pkgs/tools/security/bundler-audit/gemset.nix @@ -1,19 +1,23 @@ { bundler-audit = { dependencies = ["thor"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pm22xpn3xyymsainixnrk8v3l3xi9bzwkjkspx00cfzp84xvxbq"; + sha256 = "04l9rs56rlvihbr2ybkrigjajgd3swa98lxvmdl8iylj1g5m7n0j"; type = "gem"; }; - version = "0.6.1"; + version = "0.7.0.1"; }; thor = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; type = "gem"; }; - version = "0.20.3"; + version = "1.0.1"; }; } \ No newline at end of file From e3fa38ec16314ab4fedd0d6305d81079c55d5cba Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 8 Jun 2020 20:01:32 +0200 Subject: [PATCH 1575/3452] rav1e: 0.3.2 -> 0.3.3 The Cargo.lock file is not included in the master branch but it is currently added for the releases (e.g. [0]). Since the GitHub deploy action currently fails for other reasons [1] we should use the Cargo.lock from the repository instead. [0]: https://github.com/xiph/rav1e/commit/80573d2bf733494b69c27cc3fd87f4b31e71d1d1 [1]: https://github.com/xiph/rav1e/issues/2373 --- pkgs/tools/video/rav1e/default.nix | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 02f6d12278a4..245f74bb5455 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -1,31 +1,17 @@ -{ rustPlatform, fetchFromGitHub, fetchurl, stdenv, lib, nasm }: +{ rustPlatform, fetchFromGitHub, lib, nasm }: rustPlatform.buildRustPackage rec { pname = "rav1e"; - version = "0.3.2"; + version = "0.3.3"; - src = stdenv.mkDerivation rec { - name = "${pname}-${version}-source"; - - src = fetchFromGitHub { - owner = "xiph"; - repo = "rav1e"; - rev = "v${version}"; - sha256 = "0qqw397yfglwj9kg45imhx1p5bb0nsx2gkaxj4lcc9i1hav6ia43"; - }; - cargoLock = fetchurl { - url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock"; - sha256 = "1kdr3q97vq3mip1h7iv2iy9qzlgb69y6nwjzbw9nfi7dl7ip6q3l"; - }; - - installPhase = '' - mkdir -p $out - cp -R ./* $out/ - cp ${cargoLock} $out/Cargo.lock - ''; + src = fetchFromGitHub { + owner = "xiph"; + repo = "rav1e"; + rev = "v${version}"; + sha256 = "0a9dryag4x35a2c45qiq1j5xk9ydcpw1g6kici85d2yrc2z3hwrx"; }; - cargoSha256 = "03zsvavk7wskz843qxwwcymhclarcp6nfxwa1mwna3nmzvlm1hwb"; + cargoSha256 = "1xaincrmpicp0skf9788w5631x1hxvifvq06hh5ribdz79zclzx3"; nativeBuildInputs = [ nasm ]; From a209c46bc2ee3b9df2f3ec8fd09532f6ddc0fd03 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 13 Jun 2020 15:25:02 +0200 Subject: [PATCH 1576/3452] inxi: 3.1.01-1 -> 3.1.03-1 --- pkgs/tools/system/inxi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index df2e1b229f7b..bb3ba6ec3713 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.1.01-1"; + version = "3.1.03-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "0r204w0r06ibdr4dck7yw2nmvj7xq68bjr7xwwiy7liqdml0n0yc"; + sha256 = "0539hvlq021wxhbwzdp7qliiq1jgw60mxlwrwx0z2x8qi1zqdzg6"; }; buildInputs = [ perl makeWrapper ]; From ad141fcbcb305fd6b5f93edf69d9be6026fa3db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 13 Jun 2020 17:15:25 +0200 Subject: [PATCH 1577/3452] rav1e: fix meta.homepage evaluation It was broken by e3fa38ec1. --- pkgs/tools/video/rav1e/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 245f74bb5455..b8e43fe4f10f 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { libaom (the reference encoder) is too slow. Features: https://github.com/xiph/rav1e#features ''; - inherit (src.src.meta) homepage; + inherit (src.meta) homepage; changelog = "https://github.com/xiph/rav1e/releases/tag/v${version}"; license = licenses.bsd2; maintainers = [ maintainers.primeos ]; From c3b0a4c8bc7e2b044b21d5e65d352b476a515f3f Mon Sep 17 00:00:00 2001 From: misuzu Date: Sat, 13 Jun 2020 18:26:07 +0300 Subject: [PATCH 1578/3452] python3Packages.pygdbmi disable tests on macOS --- pkgs/development/python-modules/pygdbmi/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/pkgs/development/python-modules/pygdbmi/default.nix index 447fbdfcdc44..b3d1fb3d26df 100644 --- a/pkgs/development/python-modules/pygdbmi/default.nix +++ b/pkgs/development/python-modules/pygdbmi/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , gdb @@ -19,6 +20,9 @@ buildPythonPackage rec { checkInputs = [ gdb ]; + # tests require gcc for some reason + doCheck = !stdenv.hostPlatform.isDarwin; + postPatch = '' # tries to execute flake8, # which is likely to break on flake8 updates From 021570aaf03da92a288bf1db4ed84814967073ab Mon Sep 17 00:00:00 2001 From: Jesper Geertsen Jonsson Date: Sat, 13 Jun 2020 20:07:34 +0200 Subject: [PATCH 1579/3452] lmdb: 0.9.24 -> 0.9.25 Change to official repo. The Github read-only mirror is abandoned. --- pkgs/development/libraries/lmdb/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 513e842edfa5..64f6fccefa79 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -1,14 +1,13 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "lmdb"; - version = "0.9.24"; + version = "0.9.25"; - src = fetchFromGitHub { - owner = "LMDB"; - repo = "lmdb"; + src = fetchgit { + url = "https://git.openldap.org/openldap/openldap.git"; rev = "LMDB_${version}"; - sha256 = "088q6m8fvr12w43s461h7cvpg5hj8csaqj6n9pci150dz7bk5lxm"; + sha256 = "0i60zlca8r6fib23gdgl4c80gxpx24772ggpvz94yr7zaai4k11w"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; From 0697ad33c0bb50f010d209e13baab4e86ab52763 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 13 Jun 2020 20:14:52 +0200 Subject: [PATCH 1580/3452] libxslt: fix darwin build ld: library not found for -lintl clang-7: error: linker command failed with exit code 1 (use -v to see invocation) make[3]: *** [Makefile:544: libxsltmod.la] Error 1 --- pkgs/development/libraries/libxslt/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index a03fca12581f..cf91d7656bf0 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,10 +1,8 @@ -{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python, libgcrypt +{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, gettext, python, libgcrypt , cryptoSupport ? false , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform }: -with stdenv.lib; - stdenv.mkDerivation rec { pname = "libxslt"; version = "1.1.34"; @@ -17,6 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; buildInputs = [ libxml2.dev ] + ++ stdenv.lib.optional stdenv.isDarwin gettext ++ stdenv.lib.optionals pythonSupport [ libxml2.py python ] ++ stdenv.lib.optionals cryptoSupport [ libgcrypt ]; @@ -27,14 +26,14 @@ stdenv.mkDerivation rec { "--without-debug" "--without-mem-debug" "--without-debugger" - ] ++ optional pythonSupport "--with-python=${python}" - ++ optional (!cryptoSupport) "--without-crypto"; + ] ++ stdenv.lib.optional pythonSupport "--with-python=${python}" + ++ stdenv.lib.optional (!cryptoSupport) "--without-crypto"; postFixup = '' moveToOutput bin/xslt-config "$dev" moveToOutput lib/xsltConf.sh "$dev" moveToOutput share/man/man1 "$bin" - '' + optionalString pythonSupport '' + '' + stdenv.lib.optionalString pythonSupport '' mkdir -p $py/nix-support echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs moveToOutput ${python.libPrefix} "$py" From c1b9f86cdd2789d213f149944173dd4afac37c71 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 13 Jun 2020 19:05:15 +0000 Subject: [PATCH 1581/3452] php < 7.4: Fix validation of PKG_CONFIG var They were assuming it is an absolute path, but it (conventionally) can be something to look up on the PATH too. Fixes #90202 --- pkgs/development/interpreters/php/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 6ab682d97e6c..b56824c77238 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -195,9 +195,10 @@ let hardeningDisable = [ "bindnow" ]; - preConfigure = '' - # Don't record the configure flags since this causes unnecessary - # runtime dependencies + preConfigure = + # Don't record the configure flags since this causes unnecessary + # runtime dependencies + '' for i in main/build-defs.h.in scripts/php-config.in; do substituteInPlace $i \ --replace '@CONFIGURE_COMMAND@' '(omitted)' \ @@ -206,7 +207,14 @@ let done export EXTENSION_DIR=$out/lib/php/extensions - + '' + # PKG_CONFIG need not be a relative path + + lib.optionalString (! lib.versionAtLeast version "7.4") '' + for i in $(find . -type f -name "*.m4"); do + substituteInPlace $i \ + --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null' + done + '' + '' ./buildconf --copy --force if test -f $src/genfiles; then From 6e125ae9e45dd5bd7c0fb979dc59ff5da9b39df6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 13 Jun 2020 14:25:44 -0700 Subject: [PATCH 1582/3452] heimer: 1.16.0 -> 1.17.0 --- pkgs/applications/misc/heimer/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 628ec7900417..7709a42baee1 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "0j00652lgcfy5vr001c24agnfnm9v2l4r5vvvb2484mfck335grf"; + sha256 = "1sxdi1an9x62q9vwv7r2761my4dva6nc63n9861swxjjk18hmmar"; }; nativeBuildInputs = [ cmake ]; @@ -19,5 +19,6 @@ mkDerivation rec { homepage = "https://github.com/juzzlin/Heimer"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; + platforms = platforms.linux; }; } From 33918638e57217363cef5a0d10b949bd8d2b04f6 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Thu, 11 Jun 2020 08:50:14 +0200 Subject: [PATCH 1583/3452] vscode: 1.45.1 -> 1.46.0 --- pkgs/applications/editors/vscode/vscode.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index e6e767c7db22..7ca981b2958d 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0zdg6z6h0h8vvwdrnihwd76bik41spv6xbw7cdh7hz97sjsh15zq"; - x86_64-darwin = "1c5c24vj8nqsxx8hwfj04as7vsl9gnl97yniw36pdfgv88v8qzin"; + x86_64-linux = "0hmmqdamsjhjy1q8m85bs081cwmskpsp57rkj7vc2wj918wgissm"; + x86_64-darwin = "00xwvi53h9rnwyba12jmsp6grkymmn6vjibypaxb96q7q7p894gh"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.45.1"; + version = "1.46.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From e25e560120054e56377fa0612f693d73e85da6b7 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Fri, 12 Jun 2020 08:11:14 +0200 Subject: [PATCH 1584/3452] vscodium: 1.45.1 -> 1.46.0 --- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 8a191e157fa0..fd48a4b1084e 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1m965d8ggg2ffbhyrgadfrgikcavyjszc3sgbsd930b8pxrmqlxp"; - x86_64-darwin = "017fj7imjxa0n3r7c9kcz7192rxkw18bry6rfkv2hycfja70j5qj"; + x86_64-linux = "088nsflscak315704vqnh8m4q7601fczglbhdz5i70kfyg89ar4w"; + x86_64-darwin = "0fxpx1ydsag4gyn2kq5ddq55lpw15w176p3fypk80fyfix4kziqf"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.45.1"; + version = "1.46.0"; pname = "vscodium"; executableName = "codium"; From 091c2979ee4e814c130807f613513ed2ad115a16 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Fri, 13 Mar 2020 22:32:07 -0400 Subject: [PATCH 1585/3452] pythonPackages.fake-useragent: init at 0.1.11 --- .../python-modules/fake-useragent/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/fake-useragent/default.nix diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix new file mode 100644 index 000000000000..fb85408dd3d2 --- /dev/null +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage, six, pytest }: + +buildPythonPackage rec { + pname = "fake-useragent"; + version = "0.1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "0dfz3bpmjmaxlhda6hfgsac7afb65pljibi8zkp9gc0ffn5rj161"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ pytest ]; + + meta = with stdenv.lib; { + description = "Up to date simple useragent faker with real world database"; + homepage = "https://github.com/hellysmile/fake-useragent"; + license = licenses.asl20; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ea7ee183549..55b7a1d22867 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2808,6 +2808,8 @@ in { fake_factory = callPackage ../development/python-modules/fake_factory { }; + fake-useragent = callPackage ../development/python-modules/fake-useragent { }; + factory_boy = callPackage ../development/python-modules/factory_boy { }; Fabric = callPackage ../development/python-modules/Fabric { }; From f9559836d10b7bfde58170682785945c48bf464d Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Sun, 7 Jun 2020 14:21:54 -0400 Subject: [PATCH 1586/3452] pythonPackages.scrapy-fake-useragent: init at 1.2.0 --- .../scrapy-fake-useragent/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/scrapy-fake-useragent/default.nix diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix new file mode 100644 index 000000000000..26e142434c59 --- /dev/null +++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, fake-useragent, scrapy }: + +buildPythonPackage rec { + pname = "scrapy-fake-useragent"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "02mayk804vdl15wjpx7jcjkc4zgrra4izf6iv00mcxq4fd4ck03l"; + }; + + propagatedBuildInputs = [ fake-useragent ]; + + checkInputs = [ pytest scrapy ]; + + meta = with stdenv.lib; { + description = "Random User-Agent middleware based on fake-useragent"; + homepage = "https://github.com/alecxe/scrapy-fake-useragent"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55b7a1d22867..00104604b3a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6902,6 +6902,8 @@ in { scrapy = callPackage ../development/python-modules/scrapy { }; + scrapy-fake-useragent = callPackage ../development/python-modules/scrapy-fake-useragent { }; + pandocfilters = callPackage ../development/python-modules/pandocfilters { }; pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; From 0a3c9949ba30c4a0b00c5fe1f9decd0c252c3a08 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Sun, 7 Jun 2020 14:22:29 -0400 Subject: [PATCH 1587/3452] pythonPackages.scrapy-deltafetch: init at 1.2.1 --- .../scrapy-deltafetch/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/scrapy-deltafetch/default.nix diff --git a/pkgs/development/python-modules/scrapy-deltafetch/default.nix b/pkgs/development/python-modules/scrapy-deltafetch/default.nix new file mode 100644 index 000000000000..cf6f8a010714 --- /dev/null +++ b/pkgs/development/python-modules/scrapy-deltafetch/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, scrapy, bsddb3 }: + +buildPythonPackage rec { + pname = "scrapy-deltafetch"; + version = "1.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1m511psddvlapg492ny36l8rzy7z4i39yx6a1agxzfz6s9b83fq8"; + }; + + propagatedBuildInputs = [ bsddb3 scrapy ]; + + checkInputs = [ pytest ]; + + meta = with stdenv.lib; { + description = "Scrapy spider middleware to ignore requests to pages containing items seen in previous crawls"; + homepage = "https://github.com/scrapy-plugins/scrapy-deltafetch"; + license = licenses.bsd3; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00104604b3a3..4aa900ae1a07 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6904,6 +6904,8 @@ in { scrapy-fake-useragent = callPackage ../development/python-modules/scrapy-fake-useragent { }; + scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { }; + pandocfilters = callPackage ../development/python-modules/pandocfilters { }; pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; From 187a7f90732ab6687b82880e33bbed3ae5a24978 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Sun, 7 Jun 2020 14:23:12 -0400 Subject: [PATCH 1588/3452] pythonPackages.scrapy-splash: init at 0.7.2 --- .../python-modules/scrapy-splash/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/scrapy-splash/default.nix diff --git a/pkgs/development/python-modules/scrapy-splash/default.nix b/pkgs/development/python-modules/scrapy-splash/default.nix new file mode 100644 index 000000000000..7799186d6216 --- /dev/null +++ b/pkgs/development/python-modules/scrapy-splash/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage, pytest, hypothesis, scrapy }: + +buildPythonPackage rec { + pname = "scrapy-splash"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dg7csdza2hzqskd9b9gx0v3saqsch4f0fwdp0a3p0822aqqi488"; + }; + + checkInputs = [ pytest hypothesis scrapy ]; + + meta = with stdenv.lib; { + description = "Scrapy+Splash for JavaScript integration"; + homepage = "https://github.com/scrapy-plugins/scrapy-splash"; + license = licenses.bsd3; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4aa900ae1a07..a91912b36bfa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6906,6 +6906,8 @@ in { scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { }; + scrapy-splash = callPackage ../development/python-modules/scrapy-splash { }; + pandocfilters = callPackage ../development/python-modules/pandocfilters { }; pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; From ca8e5a63d3a3fce5e243b56035c5276f72adb2c0 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Sat, 13 Jun 2020 17:23:22 +0200 Subject: [PATCH 1589/3452] vimPlugins: update Signed-off-by: Sirio Balmelli --- pkgs/misc/vim-plugins/generated.nix | 330 ++++++++++++++-------------- 1 file changed, 165 insertions(+), 165 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 4ecfa222de74..e3714edc0aef 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-05-22"; + version = "2020-06-11"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "7265ceb6d050d1a4642741d248f11e4f2abd37e1"; - sha256 = "172ip0wbrmrwxhv5nvpgb0g982w9smyzlwg16gphrjiwnxllj1w7"; + rev = "1428c7b29e50af56f53ee1d587679d97a027dd72"; + sha256 = "0zhrgfsk7fvs8wabgdp5ps73ggsghsw19cnjvlbw4cnib6p9176a"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -269,12 +269,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2020-05-24"; + version = "2020-06-09"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "b2e7a69945c2b452598a1d4fa25d8fc94aa8b02c"; - sha256 = "03fx03pdw4bwqyd4jyk0ixb5fhv900x0lg615ig0i4qg9nqjnc8n"; + rev = "932648c890d27b3a1f0e5f5f63e4564384dfdb63"; + sha256 = "1p1lrxk45qphpmnkszhaks7li0h3y3biif9427n6mjckl860g5c7"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -401,36 +401,36 @@ let coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-06-02"; + version = "2020-06-13"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "8c89226acc29fe2695e8f86355c04ce1587f0fda"; - sha256 = "04616lzpch9r5cj6nh4dw4b666iyi314n95mi62n5qcaibr6r85s"; + rev = "2c98c9f34718f5f639bfaae1c193fbe39749f7fc"; + sha256 = "126yqr53y4y30p4sp7942nic6lql6lfx0a1wb0psrrvrc8ccbbpp"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2020-05-12"; + version = "2020-06-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "b45372104d2234612f89658570887c55e6efea83"; - sha256 = "1p7ah0dr31h0pllx00ms46fd5pmkp604zlkk08z40w54hzhr5qhh"; + rev = "bbddf4a9447848cdd18a693268bffcc0fe523c08"; + sha256 = "11c5rnlf45wz0slvl0gcqcdc9xb859pxy44xynfbbsl0ii1l8zc1"; }; meta.homepage = "https://github.com/neoclide/coc-git/"; }; coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2020-05-25"; + version = "2020-06-10"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "d9756fd65dc1d6740e797fa22d3f6f4fdb2b00d5"; - sha256 = "14qc9ny12y52rbxn0gcwh6cpqc2zpwgb4jlla5p72w9pfh9gfh6z"; + rev = "38b0b30355f85a7952a2e6602fdb1cdf9141a501"; + sha256 = "0wmdfcglvixfqahjg3lc5q7y36wk6lzczr5nhnwixh9cis1nybx6"; }; meta.homepage = "https://github.com/josa42/coc-go/"; }; @@ -521,12 +521,12 @@ let coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-06-01"; + version = "2020-06-12"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "0286d7f11647dca4a63d84fe4101dbabc7731c04"; - sha256 = "068aqynvzsnrz2dh68zdy40h342nfrf8kvv9234qdr91mhbvrxv4"; + rev = "b6ed6dad8c9f57e2ee84b60c0cf69c88c5ccf3bc"; + sha256 = "0abvls1vxyzxzsrlmm5javahsxxslgli43b1ffbrk7cz8cbhgdsy"; }; meta.homepage = "https://github.com/ckipp01/coc-metals/"; }; @@ -605,12 +605,12 @@ let coc-rust-analyzer = buildVimPluginFrom2Nix { pname = "coc-rust-analyzer"; - version = "2020-06-04"; + version = "2020-06-11"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "acd5e7fca38dbc8ad8bfe9f187f1f4e6ee64ea88"; - sha256 = "14qyszmyzykibdkdv38cypc8gmhaz0301prirjbpf2gijryk922b"; + rev = "a2e98801bcbe88d100f2fcb23087ba61203ad101"; + sha256 = "0a2a6pjvbb29syhh796z3gfrgjx4vpkbjirsgzdfb12icigbjdz7"; }; meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/"; }; @@ -629,12 +629,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2020-05-20"; + version = "2020-06-10"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "f5e7a3575a04ee9cacd659380d0d0118fa4bb5cd"; - sha256 = "0zrllqqdgf1ckzgaxhk7459cbkv7x1vkfgwsvilcjspxaww1s1bv"; + rev = "a36f36afe7094562756202d1bb88c1f80597393e"; + sha256 = "117idj29gk8psj27zmwazanwxf4br08mlkcpnkxyw6blm5aibzpp"; }; meta.homepage = "https://github.com/neoclide/coc-snippets/"; }; @@ -785,12 +785,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-06-04"; + version = "2020-06-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "d992e129997d9bda225a4e59ed5e5a57fca1896a"; - sha256 = "0f4vsg2fbwn4jpfj8lv8ib8i8adzvr9inw4q861w87zssk65bi8g"; + rev = "d66250193333f786b0706d4f1aebbd3e17505c43"; + sha256 = "0k4f0xf9h6v5xhvkzklg233x6y15bn22yg07g3nkgh10b8mpspbs"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1014,12 +1014,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-05-30"; + version = "2020-06-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "5d8133aba89acaab3b532b15eed8e6cba77b1cd2"; - sha256 = "1gw73cybp1qxgnqfa6hn6g2ky30canhmrchf550kp5j8nflqa887"; + rev = "bc2a3fcbe9db21623dcc7c2d5c4c1b1289283dfc"; + sha256 = "00gyrfhz7mf93swqzi4n459vbk9rpcqsc9qfzgnv38myh800s2ih"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1062,12 +1062,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-06-01"; + version = "2020-06-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "7c971aa2e40853b21f7967788e9ea3baa4e97ab2"; - sha256 = "04v3v14g7nnmc6rhz5vpppqgkk8z67am4nc6k8jwbrv61sq1ga6b"; + rev = "6139d4cd2d6944be8b713766f92f521eaa056c18"; + sha256 = "0v64fj9jjq51h2cr1haih4ac4kffvzp6g0gli2vs4vjcbjbcil5r"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1209,12 +1209,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2020-05-30"; + version = "2020-06-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "2994bf57fed476a5b9878e842b14b5b5c5b22211"; - sha256 = "0y22nay6qkn0sl74hlhhri3hjw5r3fwmmxby3j9q0avszlmq7352"; + rev = "64a8663e529686fc43390942672ff2b33beda0e3"; + sha256 = "1z8axvcrzip4bgmnn62p3q7rr3y7avkf7l4k2r266bkxwgsmh50k"; }; meta.homepage = "https://github.com/Shougo/deoplete-lsp/"; }; @@ -1293,12 +1293,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-06-02"; + version = "2020-06-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "921688d72168e436c82f3d413a5de7d78369a0c7"; - sha256 = "01wpq4majnhh4lxmai0ix5dqvfxrbdsj2pic785x3kaqn4all31w"; + rev = "e04bfc18b604c54ebc319d2eebf8fe3a830a9212"; + sha256 = "01bf55zbw2v2qzbpk0jm5j4dhq8rs78m2pbljsnl2772vll4iv38"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1341,12 +1341,12 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2020-04-08"; + version = "2020-06-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "31533d9c6c2723dfb4cf5691c83f330a3a0ccddd"; - sha256 = "1ygm4g90zv009iqv8k8n4930a7gpij5jxbz7dqq2dfyj4jn37rkf"; + rev = "4719626bfd477f1189dd9992614ff452d3ea3caf"; + sha256 = "0bpaav7yf06wlzfiyx6iylxan8a9hici041pnmlw7kgf176h6w7b"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; @@ -1548,12 +1548,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-06-01"; + version = "2020-06-07"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "5aa5977d744d1183806079d307f023b0c5ceaaef"; - sha256 = "0b7lgdr66q99dfc73iwgb11pd4b465qmslfzqypsp8jamckk1jii"; + rev = "8f1e73b598d27d78dfb5843be19a73b6a3b222b1"; + sha256 = "0zdimx6q2fivimdvh0cnm6w718vjxj0abv67869ijh1d4mfrmvyf"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1572,24 +1572,24 @@ let gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2020-06-04"; + version = "2020-06-05"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "632d0a72c83cd0ccf7f40cb64470dc84f51bdce2"; - sha256 = "0q5cj2zpcdxmwm8dcj0nbyffjs1a075fgqbang4s0ikangbhx586"; + rev = "47b6900c425614d4ba22223c13a23920f0618d9f"; + sha256 = "0agswv1r5nxbnw0nddhw9vqvrfsvsgh18nwrg83c01sj97075qmv"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-05-17"; + version = "2020-06-06"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "64f693f6581c3acdee71897eaba7c4e793eaa946"; - sha256 = "194njs7nfdmpnv1bkadamvicp735834kq0ijha5s41i492hb589i"; + rev = "bddd18ffabbdb10ca1fadf25e7d7d1201470f444"; + sha256 = "1sxh3zdrwajz0nabqbzg24sxlc8kwiqrwh4mvrwavwyh7xr29jxd"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1632,12 +1632,12 @@ let goyo-vim = buildVimPluginFrom2Nix { pname = "goyo-vim"; - version = "2019-06-13"; + version = "2020-06-08"; src = fetchFromGitHub { owner = "junegunn"; repo = "goyo.vim"; - rev = "6b6ed2734084fdbb6315357ddcaecf9c8e6f143d"; - sha256 = "1ywlz1hn54kxyp5q0angriaarimq7ys7m6sk6l4x8jr1g2yh0afz"; + rev = "3e129198bba7d6b50406902002ad7d213a6cccaa"; + sha256 = "1b2wsxbg27nmwxrncwddkl2ck8hbiqdqi821vl9d1fl5nx042y2b"; }; meta.homepage = "https://github.com/junegunn/goyo.vim/"; }; @@ -1897,12 +1897,12 @@ let Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { pname = "Jenkinsfile-vim-syntax"; - version = "2019-12-31"; + version = "2020-06-05"; src = fetchFromGitHub { owner = "martinda"; repo = "Jenkinsfile-vim-syntax"; - rev = "164b457d87b65c6ca9e5998b69c6cd24248f62ac"; - sha256 = "14s26hlsdqys7br84l9wiyvhcy17s6966mhgr9n6sdqmhz6lc4nm"; + rev = "a701341879c6db93f5dffa37f4589eef3c4ded85"; + sha256 = "0nm3lf37l1g8lpa4yz1va0s6vw0vw99zghy3dzq933j0kqmspgvp"; }; meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/"; }; @@ -1921,12 +1921,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2020-05-21"; + version = "2020-06-06"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "2d0b6e4018d6cc01b96ab326ff6495876200866d"; - sha256 = "1ijmxxw63mraa5afddahfvwbh9acrf11q7g6hf32k6923rfccrnq"; + rev = "f0fab9a2df5223815f7dc46f44f69566aa9e51d1"; + sha256 = "145wxlv5rifk93lvai17625r1c94lnbi8rnda0vidr0dhhgcl7v7"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2029,12 +2029,12 @@ let lf-vim = buildVimPluginFrom2Nix { pname = "lf-vim"; - version = "2020-05-12"; + version = "2020-06-11"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "8dbdb135f3704790f9e66a141d2785d4b65c238d"; - sha256 = "0phfqg6ax79vsz1sy6pvjflz1929x58k7nifiqki9bzp2m6knls9"; + rev = "8eef4095f0ca4ec37b6877b7b01047146e987c6b"; + sha256 = "17clfc8shmv485r6anpkkcq88x6n2pm54ir1pjy852spzykycika"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; @@ -2245,12 +2245,12 @@ let neco-ghc = buildVimPluginFrom2Nix { pname = "neco-ghc"; - version = "2018-05-13"; + version = "2020-06-06"; src = fetchFromGitHub { owner = "eagletmt"; repo = "neco-ghc"; - rev = "682869aca5dd0bde71a09ba952acb59c543adf7d"; - sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h"; + rev = "b4ea02c537975a5a2bf00cb5f24cd784b2b6f5ad"; + sha256 = "13la3slqkljn7y8y9p8ic3majnvjf7pnrwr16cdpacklmz733x1f"; }; meta.homepage = "https://github.com/eagletmt/neco-ghc/"; }; @@ -2317,12 +2317,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-05-17"; + version = "2020-06-12"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "a3561bf2032a162bc9f53d96fa4e5a2ada98854c"; - sha256 = "15lsxwf4f1mg5h716zikwv1hbb0i41d24hrvyrqhwqlnqbwizlbi"; + rev = "1cee66fe6219f8cc698eb244ba4001bdad1d09cb"; + sha256 = "0w5hw5qc5n0i2hal91nilmxazskixv6c1rcszgqar4dfh951kazy"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2377,12 +2377,12 @@ let neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-05-12"; + version = "2020-06-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "70f855d93c4bc727873c42111432660cf6929cdc"; - sha256 = "1gh7vh3qc9k8xhpmcvhdn5nfff81y7hkfky0mgs75a97mkd8qhnz"; + rev = "a52edf794bae0174a682131333c891717633994b"; + sha256 = "1k3ncjlikdbsjk33fi14y88yqywrpzdfz8kwzjfxjlidbzzlzk0w"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -2449,12 +2449,12 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2020-02-19"; + version = "2020-06-08"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "c62e618a1ab5a50a4028e3296500ba29d9b033d8"; - sha256 = "0w4bxj423dxxkcxnfmipf8x5jfm058rq4g3m98wzcz5zbambv3qs"; + rev = "fade3d4b26f5a0d58f256a06ba7b0a04d9fb4f3b"; + sha256 = "1vb5n4g5x3hpnc013gjf8frxxdrcq1zdcm3mpx90b0cjxi252cn3"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -2569,12 +2569,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-06-02"; + version = "2020-06-13"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "a7fdf268b1c51f6395900e437060728701aa8b77"; - sha256 = "04v1g4sa6dccaffrlkmyh410ppza5zlrnrapf9c3sfj6bmsr4jd3"; + rev = "9ec118cdc7ce6442bf8beba903ab395b2f60190f"; + sha256 = "1idam76jwvs82c2384y4az4rqp5cg29qhic12fnpy8m74b3rqla8"; }; meta.homepage = "https://github.com/neovim/nvim-lsp/"; }; @@ -2617,12 +2617,12 @@ let onehalf = buildVimPluginFrom2Nix { pname = "onehalf"; - version = "2020-05-06"; + version = "2020-06-11"; src = fetchFromGitHub { owner = "sonph"; repo = "onehalf"; - rev = "970abdf26b399100cbb59c6b6e693c4ff877c59d"; - sha256 = "1v34n0cz7jkx0wlbl6kv693qgifs0frcw4mv32ll36pmqfyb4m0h"; + rev = "3aa42a39ed3cddde0c53976a700b81b8a7067890"; + sha256 = "0x01c7930hlzvjac3r2wbkdha8j6mmhyk7nwgdazh1z4sxqjyj1l"; }; meta.homepage = "https://github.com/sonph/onehalf/"; }; @@ -2965,12 +2965,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-05-13"; + version = "2020-06-11"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "953b10061f595496b35aec84b75c413ee5751a23"; - sha256 = "1abacayriz439lj4r3s1x92pp3wwxqav3kqsanxq9k6f6p2b2fyb"; + rev = "0d8ce07aaa3b95e61bf319b25bb3b1a4ecc780c2"; + sha256 = "0bwj60zvafv5z61yy66ab6ng1ilnj20k3xnxl6myzvfn70rsp5yd"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -3169,12 +3169,12 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2020-05-16"; + version = "2020-06-11"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "99d12007112b63b8e3fd0fcf435471ac63ccf030"; - sha256 = "1mar7v4sp3zbvbczs54n8zj17bh042g0384ichwvqkamfcfxgdid"; + rev = "03dc38772d59e78de3d87b27438fecab70dd6688"; + sha256 = "0xn972gppr87lx37p01x1ikh2nwn56szhgnikw1v269vnysic15m"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -3278,12 +3278,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-05-30"; + version = "2020-06-11"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "a36880be2217814b7034f05eb0f402e8183befc9"; - sha256 = "16rj8pv8b9knbxi2967h96kgwp4r631kmpxdy74xsf938z4cya0j"; + rev = "56399f446c64d187c106e112afa4d97985508eba"; + sha256 = "1bmfv09lxwq9b8hp4v2avmd979178lm60xxf5g0qiifrr4ym2gqk"; }; meta.homepage = "https://github.com/majutsushi/tagbar/"; }; @@ -3483,12 +3483,12 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2020-04-20"; + version = "2020-06-09"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "ce061819e4304a9ff2f82779e12e5a30363ab47c"; - sha256 = "0k9gmf2rdvnlfqqhjlk206wimlh5di3smmrr9cgz0djq5pd3r5jz"; + rev = "76e95c6f8c863f5079cd103b18990684bb02d525"; + sha256 = "0v3w117bimd74r9i209hgqy75x83hdd3za26l8g729w56kqgq5r8"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; @@ -3543,12 +3543,12 @@ let verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog-vim"; - version = "2020-05-24"; + version = "2020-06-12"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "e2449daa3272a6d5ad33e433cca3208bf68607a7"; - sha256 = "16w1nskfxsfs9dhk1yxmk16i5vjg0wq8l3fsqwa0904rh5wnakjn"; + rev = "c37bcf010fcb73599d690d8da6ac966dac02a07e"; + sha256 = "1f4kicgr7wv0dprvr91wi4lmk0d9bb9f4wcng4rfkq1cdwfkqdw4"; }; meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; @@ -3807,12 +3807,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-05-31"; + version = "2020-06-11"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "d221dc531298f467a6901861b0360741c2a387b0"; - sha256 = "0w4lwpynn5cj9si3apyfmxb8x8hv0acggsyfvmhpi41638sz2310"; + rev = "ee85ed4c673b859cf8c3626a6669b8e3cd2392fa"; + sha256 = "1wayink1n9l590kfi28xp37kw186g7j0dr5kgfr7xz8mk2g0wg0k"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -3843,12 +3843,12 @@ let vim-anzu = buildVimPluginFrom2Nix { pname = "vim-anzu"; - version = "2018-02-28"; + version = "2020-06-10"; src = fetchFromGitHub { owner = "osyo-manga"; repo = "vim-anzu"; - rev = "45b60d37cb9de90f6c89f7ddeacb7ae430ebcae2"; - sha256 = "1p5lh4xsv9xsl8kx0h1bg6iy0if4a69hvairq69p50ffka83pv00"; + rev = "1b95ec384487e559f0ee70e0f46c33683ff533ac"; + sha256 = "0q6s9bb1yv7ir2al4gv69vv4c8m09j1ax47qbhchgz23iwka3vmz"; }; meta.homepage = "https://github.com/osyo-manga/vim-anzu/"; }; @@ -4023,12 +4023,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2020-06-02"; + version = "2020-06-08"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "e083709f482332e5ff765f4d7b7901d51ddc9ef4"; - sha256 = "0d46h4jx01mib4wyj60qx4r34y201gaj1vpkb48pkw9qlsaqs31i"; + rev = "90335990808167d910671a625f3ee9de9aac1058"; + sha256 = "1rq0ivynsq35h5kpzpd963bgkbx9lb26wlxrb2l8xha0zzzsmhpz"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -4215,12 +4215,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-05-30"; + version = "2020-06-12"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "15b532ebd4455d9d099e9ccebab09915e0562754"; - sha256 = "0cfiwdaj43fx2gq7916i98iyn3ky79d359ylgpznczn88k37s1wi"; + rev = "84ec4562c21882dfe80b779cd645c607ec9d9727"; + sha256 = "1nv7aivnrxa91b2ylxzfiss46r9m2qf13v8wlhav85mgd51nhj99"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -4371,12 +4371,12 @@ let vim-elm-syntax = buildVimPluginFrom2Nix { pname = "vim-elm-syntax"; - version = "2020-01-25"; + version = "2020-06-10"; src = fetchFromGitHub { owner = "andys8"; repo = "vim-elm-syntax"; - rev = "846a5929bff5795256fbca96707e451dbc755e36"; - sha256 = "05jkx4dbkb646wy0igqpwc55iamm0a030dswhirg6nyl3x6qzgym"; + rev = "68cd8988fe9eaa190052fadaee0fea2c21338d4c"; + sha256 = "0yhvx8k83xfzmgy10r9mz0rjagbyzx5rrmn8123vw49ncksvw49q"; }; meta.homepage = "https://github.com/andys8/vim-elm-syntax/"; }; @@ -4455,12 +4455,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2020-04-18"; + version = "2020-06-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "6c968f26f0bd3dd04b18fad8761e0e9e1220a3da"; - sha256 = "1x74j3gghfmqh1mxswzhb6d0zdll735r5lrgn4g3z580y15h37w5"; + rev = "15fcf3db308ce34a12c1e41a88178c7cccea0d96"; + sha256 = "148qjhln1v4cv15idsn36n82g0g7bjq2vhf0il9a6djwycf374kb"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -4611,12 +4611,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-05-29"; + version = "2020-06-10"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "9784226ba766662d298554a5c66fd938497f2233"; - sha256 = "19f28c3wasgck78xqdygsyiwv17qqh69nkn9n1gajcbmbr55lhzn"; + rev = "e31e9bb35f7346caab4fcf972d44449bdfd3230a"; + sha256 = "1mmasjz0d6nyjjrlgwiz9kd420l16q90mhscwz3i65xw0zqlmcgj"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -4647,12 +4647,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-05-31"; + version = "2020-06-09"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "8e72eef0b35839db0a028a37bd28debc20c1201b"; - sha256 = "0rpay08m3q0syvw9ks45b3cvggghi1350h7dp87bx24jd3dqvdvf"; + rev = "354774cd7aea891cf553c34d79582be3346c1615"; + sha256 = "0pqmm6s50vxs9788f6avgwrdp1vi5mv3lzrxi2nxqdxvrcxngk93"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -4887,12 +4887,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2020-02-21"; + version = "2020-06-09"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "80dafb9b0e7b9f4ce7c843d4104f455c8c5b1f42"; - sha256 = "1yijaj1dqfmw4dsdmgj01sxizyraisxwjqh2hhbq93pdln4lm51f"; + rev = "0778289e391c419f7a3af9de8229f798ee292013"; + sha256 = "1l5s5f4fw96w437rdf85lym7g75hnz8sb2fdj9hygyg0sp42r0cf"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -5044,12 +5044,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2020-05-16"; + version = "2020-06-09"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "5e8eac9d8e38c273cc05c359730a2a74a1578f2b"; - sha256 = "0biyf2vzvnqzzdykq0agf1hzs2ynbbly4fxfwrfablznbdgsm0pz"; + rev = "3b88595805ac7c0499dc05bc8aa5cc7909c6f5b7"; + sha256 = "04yjjcfmaby466krqzmvwg0cb2ydri6pj49x48z15h4s9ac47p66"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -5164,12 +5164,12 @@ let vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2020-05-25"; + version = "2020-06-08"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "b3e6f3dfaa922cda7771a4db20d3ae0267e08133"; - sha256 = "1jx814sqs0n0mrdi2lrh6xa3d2cmgyc78176gd5c1n8k5q7qkp40"; + rev = "d5f2af4883351aa437ca1c3157d21917dc2bb1b0"; + sha256 = "0bdyhbablays384gssfdfavkxcrwcj89y8vn5kdk11xs0r78b5wr"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -5224,24 +5224,24 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-06-02"; + version = "2020-06-10"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "baa44d450043cc020e1d6f0609d0e081bbcc6f9e"; - sha256 = "07m2wqich31pxp9jgh3fzjqqdm7vdjh8rjf67d4l6kkf13dw89yh"; + rev = "b34ad0fdd1223e5c1c39d23c01f13954ca2ad500"; + sha256 = "1zqk0zimq2qyqhhfb5693zkcxz16vyrd7k2wd488avqi1jbhiffc"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2020-05-29"; + version = "2020-06-13"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "2636a0fabaae80e3bebdb3c571220aebf875dfcf"; - sha256 = "1vcc8gaikbgdq1k4f3jdjrmlwad1z44g3biifgqyp0sgd7bjd9lp"; + rev = "5c49c44be62e595d3d1d81a15259cd1bfc722825"; + sha256 = "0nr7hbwpwzzzxinpjfdlaia3ys6vrw10i3wbjhr41iga6gkg6w2v"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -5644,12 +5644,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-06-03"; + version = "2020-06-08"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "6583b990321f03500505dc43a3f62cbbc7369862"; - sha256 = "1k9y119xwb84fgsyyp1npjh5z1wlbbm1922n411h70cfa4928rfh"; + rev = "01aab60adef47c6606aa68c8783f5b994fda9fc4"; + sha256 = "1x5m98k20ncvhz6sngzxwhh74s2ll3d119p1g0di4vr59rkx8szq"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -5668,12 +5668,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-06-01"; + version = "2020-06-13"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "5b3866302755da9e5a917ca42a38a4a03fb5f3e5"; - sha256 = "0v6ll98j44hgmczhl6cp4rw734x582iz7942cw5jmbp7wg83nz88"; + rev = "a86c0179ebc99b15d403e3f1d4a4cfff83b47de8"; + sha256 = "0bsq2nvzxb6j0zn6c9hvrsz47ahcp3iki5acz4l1y841xgd880zm"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -5992,12 +5992,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2020-05-18"; + version = "2020-06-08"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "dfa1e55fe1c7f309f8cce4db0243f14f6edb2d4c"; - sha256 = "0p1hnjwhqmrczwns7h8gsmdl95yxcb6sqw59xshz7ji0b80h45mf"; + rev = "c3d450eb5f5e76d99d23b10493d4e08c5bb1ae71"; + sha256 = "0ms0c36zsqqpxrq4mx9k5viblcapw9kpjm9cdrs8fnldlz6i0yhh"; }; meta.homepage = "https://github.com/mhinz/vim-signify/"; }; @@ -6148,12 +6148,12 @@ let vim-spirv = buildVimPluginFrom2Nix { pname = "vim-spirv"; - version = "2019-11-20"; + version = "2020-06-12"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "e71404f92990aa4718925ade568427c0d8631469"; - sha256 = "0aimpcz6vvrkcfgsj0xp12xdy1l83n387rsy74dzk23a220d59na"; + rev = "9b005a0569fa5e18f71fcccbacda227c1cef7eaa"; + sha256 = "0qby4bfjav2xijh732l7d2jli0adnv6cc8kcalbh5315vi4mpnfk"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -6292,12 +6292,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-06-03"; + version = "2020-06-08"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "e819de903fe10fdcbb3714f3e96bafd918e4d117"; - sha256 = "05jh89rgd4p6mkryv5dm83jhxfmg1k77rk4zq35i8dy8i6cvi41z"; + rev = "2f185e0e5b0e7344c1e391045dc33a2e7a41d8eb"; + sha256 = "1djl6phjc7vzhwbaxsc70mqp1f83iz99bcfyghphs9fhgdg46jiz"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -6532,12 +6532,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-05-30"; + version = "2020-06-08"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "40991d51a6a3b22d56eefe9f6145602dfe1d494b"; - sha256 = "0kawg12w7ssk58lv6ppv85c75x4af7dbkw9ngx7n91y1f1wkinjj"; + rev = "f972b5357af0e5c9b840f8e82eceb313891ef8b2"; + sha256 = "0ngvl4ikd45d1nhfpnpp003mfwx9mv5ywgk9mi5fjn2bc9a2y4l7"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -6592,12 +6592,12 @@ let vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2020-05-25"; + version = "2020-06-10"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "786dceaab0987e164dcee125b8ff6111851df625"; - sha256 = "01afdf37fqz6i9g9371yh0ymv9lsw81z52vcpnwyysbj8n7qswwc"; + rev = "dffbb044f7974bf4615960689a3ff64e63daeab3"; + sha256 = "0ggnz2bz6mh9i38cgpkf87j27bhr8klk9a4ws57rkwfz3qppd4lj"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -6784,12 +6784,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-06-02"; + version = "2020-06-09"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "7ef9c50aaf110debb54a8b1f4bafcb34ec86a623"; - sha256 = "1i9phcxb29x14n202971vflqlwd9y2wa74v8aic4xhvqb5rli8as"; + rev = "49bc335fffa40a7b7b84b6110b57ebcbaaf019ea"; + sha256 = "06zdj0pgr6d8vddx87rk36lb00nngydl367g06zi8jkx4673rzz8"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -6832,12 +6832,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-05-23"; + version = "2020-06-06"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "dab956b05534359fd4e498b45e518f63f097ae9c"; - sha256 = "1wf7plybcrrdx459f0g2rzzl9drik7w264y0i1jxf43y7nlm138n"; + rev = "bfd70f620d30dc756d8ae57056b7a67a3fbbff22"; + sha256 = "1a60qbswwdl58pqg6d9llj4l96h9vz7vp99s7ji0zjg8vzzklyxm"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -6965,12 +6965,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-05-25"; + version = "2020-06-12"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "27362f850ceca80e5369f46512fdd3ba042de4d7"; - sha256 = "1gm8z7rshn2ffc3hdwif2910ckbz01x6aysp0yk8nfmqb7iacnjc"; + rev = "8bc02ee4877bfe07ed92cc4d471c353f1ab84ef6"; + sha256 = "1m1qhyqax7pdrsw9zdwy64d8rg5hcvmbyl8fqmbhz22lxdg5bvzv"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; From d6d07f262b171bb1e415e1a06c52288af056a98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 13 Jun 2020 14:20:46 +0200 Subject: [PATCH 1590/3452] python3Packages.somajo: 2.0.5 -> 2.0.6 Changelog: https://github.com/tsproisl/SoMaJo/releases/tag/v2.0.6 --- pkgs/development/python-modules/somajo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 306737c40028..958c9ab82662 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "SoMaJo"; - version = "2.0.5"; + version = "2.0.6"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "01zvmqilnndh2b257z7bhcc7av5vhjm1g8gmdiiw15gcd2xfmqjs"; + sha256 = "08nicj3nj6pi6djli26gf0kf3s2da9ysn1cpkyw7j88v8vav0p7s"; }; propagatedBuildInputs = [ regex ]; From 490fc040be1c85ab7f61fa72e0cb4cc1a5adec7c Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 14 Jun 2020 00:19:11 +0200 Subject: [PATCH 1591/3452] images: remove original files when using zstd for compression --- nixos/lib/make-iso9660-image.sh | 2 +- nixos/modules/installer/cd-dvd/sd-image.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index eb9edcd70269..d64fe9a365e7 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -129,7 +129,7 @@ fi if test -n "$compressImage"; then echo "Compressing image..." - zstd -T$NIX_BUILD_CORES $out/iso/$isoName + zstd -T$NIX_BUILD_CORES --rm $out/iso/$isoName fi mkdir -p $out/nix-support diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 589bf74263b9..98c12e30633c 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -190,7 +190,7 @@ in fsck.vfat -vn firmware_part.img dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS if test -n "$compressImage"; then - zstd -T$NIX_BUILD_CORES $img + zstd -T$NIX_BUILD_CORES --rm $img fi ''; }) {}; From a53a6565afa505b6ad9e4c0915b5e5a1dd545674 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 14 Jun 2020 01:20:49 +0200 Subject: [PATCH 1592/3452] fira-code: 4 -> 5 --- pkgs/data/fonts/fira-code/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 2048bc797c9b..2fd5a4bb2241 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "4"; + version = "5"; in fetchzip { name = "fira-code-${version}"; @@ -9,11 +9,10 @@ in fetchzip { postFetch = '' mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "0n9qkng31ydvpdjc1an4ylpfy4x883c6czhyzvhjsmavd7bv4j9a"; + sha256 = "0y2871fd4l304gd7x5xmqyxv5ch9zrqng83xl95rdhlj9zqqk4fz"; meta = with stdenv.lib; { homepage = "https://github.com/tonsky/FiraCode"; From 660973d8239797a63a7de91478c9126dee707ca1 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Sun, 14 Jun 2020 01:54:03 +0200 Subject: [PATCH 1593/3452] nextcloud: 18.0.4 -> 18.0.6 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 9a7cc077508f..048de16ceed3 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -33,7 +33,7 @@ in { }; nextcloud18 = generic { - version = "18.0.4"; - sha256 = "0aa3f4xbkzacfw0h9aic0ywk5mqlwka83qaszizj8lmk68kf3n7s"; + version = "18.0.6"; + sha256 = "1chmkg31jc1nr53y8r886mmd2jzb78094mrx7ggcfpjfkkv8b89s"; }; } From ac45656b129ae657719fee2086439d5a0bfc076b Mon Sep 17 00:00:00 2001 From: Irene Knapp Date: Sat, 13 Jun 2020 15:59:38 -0700 Subject: [PATCH 1594/3452] thunderbird: Patch rpath to find libudev, which is part of systemd. --- .../networking/mailreaders/thunderbird/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 2ba2d2fca63e..9ebf5839344c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -43,6 +43,7 @@ , rustc , sqlite , stdenv +, systemd , unzip , which , writeScript @@ -305,11 +306,11 @@ stdenv.mkDerivation rec { ) ''; - # FIXME: This can probably be removed as soon as we package a - # Thunderbird >=71.0 since XUL shouldn't be anymore (in use)? + # FIXME: The XUL portion of this can probably be removed as soon as we + # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)? postFixup = '' local xul="$out/lib/thunderbird/libxul.so" - patchelf --set-rpath "${libnotify}/lib:$(patchelf --print-rpath $xul)" $xul + patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul ''; doInstallCheck = true; From c615ba3f6a6ff1b9c6d73d1ecd2e9fd2d9278f3a Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sat, 13 Jun 2020 19:53:56 -0700 Subject: [PATCH 1595/3452] alacritty: install example config A user recently asked where to find Alacritty's default config on NixOS [1], since we don't have `/usr/share/doc/` (which is where other operating systems, like Arch, install it). Now it can be accessed by building alacritty and referring to `result/share/doc/alacritty.yml`. [1] https://logs.nix.samueldr.com/nixos/2020-06-13#3598860; --- pkgs/applications/misc/alacritty/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 9e04a738db30..6bd35bd51eb3 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -121,6 +121,8 @@ rustPlatform.buildRustPackage rec { install -dm 755 "$out/share/man/man1" gzip -c extra/alacritty.man > "$out/share/man/man1/alacritty.1.gz" + install -Dm 644 alacritty.yml $out/share/doc/alacritty.yml + install -dm 755 "$terminfo/share/terminfo/a/" tic -xe alacritty,alacritty-direct -o "$terminfo/share/terminfo" extra/alacritty.info mkdir -p $out/nix-support From 8dc2ec290a8f66c07b03cf231799bed2c838a477 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 04:42:03 +0000 Subject: [PATCH 1596/3452] adoptopenjdk-icedtea-web: 1.8.3 -> 1.8.4 --- .../compilers/adoptopenjdk-icedtea-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index 72ed184357c1..b62b9c95ef6a 100644 --- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "adoptopenjdk-icedtea-web"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "AdoptOpenJDK"; repo = "IcedTea-Web"; rev = "icedtea-web-${version}"; - sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq"; + sha256 = "0pxijw9v5k4j840jczglx9qyfd57df390g5jdaz3qafblfg0k10n"; }; nativeBuildInputs = [ autoreconfHook pkgconfig bc ]; From 8bbc4b0361fbf103eb293bf229368aebc83192b3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 14 Jun 2020 08:32:58 +0200 Subject: [PATCH 1597/3452] python: flake8: 3.8.2 -> 3.8.3 --- pkgs/development/python-modules/flake8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index d4f78e41bb67..b5ef6686a461 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "flake8"; - version = "3.8.2"; + version = "3.8.3"; src = fetchPypi { inherit pname version; - sha256 = "c69ac1668e434d37a2d2880b3ca9aafd54b3a10a3ac1ab101d22f29e29cf8634"; + sha256 = "f04b9fcbac03b0a3e58c0ab3a0ecc462e023a9faf046d57794184028123aa208"; }; checkInputs = [ pytest mock pytestrunner ]; From 9d11a2722c5b93c272b5b8f413b52721aa81a140 Mon Sep 17 00:00:00 2001 From: Greg Roodt Date: Fri, 12 Jun 2020 07:56:29 +1000 Subject: [PATCH 1598/3452] argo: 2.6.1 -> 2.8.1 --- .../networking/cluster/argo/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 7179a2915434..3ef2412a9f5c 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "2.6.1"; + version = "2.8.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "12wq79h4m8wlzf18r66965mbbjjb62kvnxdj50ra7nxa8jjxpsmf"; + sha256 = "193nxc27fh37wf035mclvwwwxjjfc8nnbncg009fg19ycqmvmgvc"; }; - vendorSha256 = "0dhzr62x2lzf3w0j2r496cr7jvkdcavfqaqr2xh972k3qqc9caky"; + vendorSha256 = "1p9b2m20gxc7iyq08mvllf5dpi4m06aw233sb45d05d624kw4aps"; subPackages = [ "cmd/argo" ]; @@ -39,6 +39,15 @@ buildGoModule rec { ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app ''; + buildFlagsArray = '' + -ldflags= + -s -w + -X github.com/argoproj/argo.version=${version} + -X github.com/argoproj/argo.gitCommit=${src.rev} + -X github.com/argoproj/argo.gitTreeState=clean + -X github.com/argoproj/argo.gitTag=${version} + ''; + meta = with lib; { description = "Container native workflow engine for Kubernetes"; homepage = "https://github.com/argoproj/argo"; @@ -46,4 +55,4 @@ buildGoModule rec { maintainers = with maintainers; [ groodt ]; platforms = platforms.unix; }; -} \ No newline at end of file +} From a9df1f768af3725a4a7d292e11cf92f7f5ef0765 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 12 Jun 2020 12:22:36 -0400 Subject: [PATCH 1599/3452] diffoscope: 146 -> 147 --- pkgs/tools/misc/diffoscope/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index c98ca9cc1661..a4d787b1fc14 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man +{ lib, stdenv, fetchurl, fetchpatch, runCommand, makeWrapper, python3Packages, docutils, help2man , abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg_4, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "146"; + version = "147"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "1iy4f05ws7qsd5p7hadc1979l77543pwi2c5zx1yr5zc674kwb3y"; + sha256 = "1pichn3l10401cqk08zrys2ya9b6cjznk7ra28awnmvlg6l1cypj"; }; outputs = [ "out" "man" ]; @@ -28,6 +28,12 @@ python3Packages.buildPythonApplication rec { patches = [ ./ignore_links.patch ./skip-failing-test.patch + + # Fix for CBFS comparator + (fetchpatch { + url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/39ec527371c469d61e4afc04b3ee6ae3563f7b4c.patch"; + sha256 = "1mzdcbxg3ad5ynpf79phvif5hzckmhf7vzd82l1sffhlqxh0v4h3"; + }) ]; postPatch = '' From 37b0c7f9da554bed36539780c1a3849796ed9cd5 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 12 Jun 2020 12:23:16 -0400 Subject: [PATCH 1600/3452] diffoscope: add danielfullmer as maintainer --- pkgs/tools/misc/diffoscope/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index a4d787b1fc14..dfd227f917ed 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -88,7 +88,7 @@ python3Packages.buildPythonApplication rec { ''; homepage = "https://diffoscope.org/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dezgeg ma27 ]; + maintainers = with maintainers; [ dezgeg ma27 danielfullmer ]; platforms = platforms.unix; }; } From b188f230cb8bc9302cd82b310042ac036935f58a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 13 Jun 2020 14:25:33 +0200 Subject: [PATCH 1601/3452] drawio: 13.0.3 -> 13.2.2 Changelog: https://github.com/jgraph/drawio-desktop/releases/tag/v13.2.2 --- 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 8281596374cc..7026d133658f 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.0.3"; + version = "13.2.2"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "104pfwipm8ch9xqlsz1gh18icr1p6i3n4c77bbdjakxcy4s5n7sg"; + sha256 = "0npqw4ih047d9s1yyllcvcih2r61fgji4rvzsw88r02mj5q5rgdn"; }; nativeBuildInputs = [ From 27e13f4f64bca4392a9a541054f8bcb3177cc2cf Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 13 Jun 2020 21:37:57 -0400 Subject: [PATCH 1602/3452] nix-universal-prefetch: 0.2.0 -> 0.3.0 --- .../package-management/nix-universal-prefetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-universal-prefetch/default.nix b/pkgs/tools/package-management/nix-universal-prefetch/default.nix index 7079904735d7..224ccd1cd9ed 100644 --- a/pkgs/tools/package-management/nix-universal-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-universal-prefetch/default.nix @@ -6,13 +6,13 @@ # No gems used, so mkDerivation is fine. stdenv.mkDerivation rec { pname = "nix-universal-prefetch"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "samueldr"; repo = "nix-universal-prefetch"; rev = "v${version}"; - sha256 = "1id9iaibrm2d3fa9dkcxnb3sd0j1vh502181gdd199a1cfsmzh1i"; + sha256 = "1nmxp6846ip2x3mibys3ymgi0813g18p9szqnsciiib3dbis4kwf"; }; installPhase = '' From 28878c9ffdaacff3c01188eb1ad4058fd6c00533 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 10 Jun 2020 02:11:49 +0200 Subject: [PATCH 1603/3452] dragonfly-reverb: 3.0.0 -> 3.1.1 --- pkgs/applications/audio/dragonfly-reverb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index 99c07ba8f5fe..b42929ff2040 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dragonfly-reverb"; - version = "3.0.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "1z2x33lzpd26dv1p29ca7vy8mjfzkfpin35iq46spwd9k3sqn1ja"; + sha256 = "188cm45hr0i33m4h2irql1wrsmsfis65s706wjiid0z59q47rf9p"; fetchSubmodules = true; }; From 0a146054bdf6f70f66de4426f84c9358521be31e Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 9 Jun 2020 21:13:06 +0900 Subject: [PATCH 1604/3452] flashplayer: 32.0.0.371 -> 32.0.0.387 --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index d45a3c9f864a..707bf2056f0e 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -45,11 +45,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.371"; + version = "32.0.0.387"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1nks2wx74b21hv0l7bnrzkxn7c6p6r8zgwbqvy3cqpi8famyr5v9"; + sha256 = "1igs8nh3zpfcps97ahzh7kknx3rddh6yliig8lxf6jskbpf0qgzf"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index a9f05ba1da9a..e967578a7cef 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.371"; + version = "32.0.0.387"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1zrl7cxcl9hkafji15br8wp5vf9a5lb88xcpz6vi9q73j45mhzjd" + "1wmk60lnlrj9f8dvk4b6j7pqyl00w00qbzbdw4awzx91wmgfc4x0" else - "0cgnsn9zanadbacb660mj4k103cdyb2cak7ixnp1varqklss83n6" + "1afjxhi5jzn8zbkva940i9fayzxj1r3n6rqsiny02fpnv0waypfy" else if arch == "x86_64" then - "1zc90gjixfhjng7pbx8vci1l69wf5m40149178zwzs6kz4ma5hb2" + "0si8rx955kyfsprk5465hfzafxvrdm7g686q7p5xykmh88nck6k2" else - "0fqgas1g52a0zir2cxz3anizk3lkmwl68nbcn5rihgvjfqykbhn8"; + "02pw2knvgdkahyp7lmy7fmynmplaz5wswdz48h3sdj6ibr066h97"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 3015d506427d..9d7d6eeeee86 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { pname = "flashplayer-standalone"; - version = "32.0.0.371"; + version = "32.0.0.387"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0n3bk2y1djaqrdygnr81n8lsnj2k60kaziffl41zpdvzi1jc7wgn" + "1yxdwmm2gz162rmc9hwlccqgq613gnrihjicnzgan4vk7hjlga5y" else - "18ll9rnfhbnz54q4d7q9fb13lix4i62zr6z6n574qvwngrvbrr8a"; + "0hm5is3giz45a4v9m77q0i1dgyhpqqkagpjndbnynsnl9a61r0ly"; }; nativeBuildInputs = [ unzip ]; From e0ac44ef45212aadb4ef320dfe5560d4b8fa90de Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Wed, 27 May 2020 19:04:55 -0500 Subject: [PATCH 1605/3452] findutils: fix undeclared xargs dep on echo When invoked without a command parameter, xargs runs echo from PATH. This change patches xargs to use a specific Nix-built echo. --- pkgs/tools/misc/findutils/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 1b69b80be70f..230e401ef82f 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5"; }; + postPatch = '' + substituteInPlace xargs/xargs.c --replace 'char default_cmd[] = "echo";' 'char default_cmd[] = "${coreutils}/bin/echo";' + ''; + patches = [ ./no-install-statedir.patch ]; From c5a4f818989f8ad590b613e63aebfd97c0f3992c Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Fri, 13 Mar 2020 14:42:53 -0700 Subject: [PATCH 1606/3452] libaio: 0.3.110 -> 0.3.111 & update source url from fedorahosted to pagure fedorahosted.org was retired on March 1st, 2017 The changes in da47c32b2ff39e52fbed1622c34b86bc88d7c217.patch are included in this release. --- pkgs/os-specific/linux/libaio/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index 63d446319d6f..ac000976a680 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -1,19 +1,14 @@ { stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - version = "0.3.110"; + version = "0.3.111"; pname = "libaio"; src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/libaio/${pname}-${version}.tar.gz"; - sha256 = "0zjzfkwd1kdvq6zpawhzisv7qbq1ffs343i5fs9p498pcf7046g0"; + url = "https://pagure.io/libaio/archive/${pname}-${version}/${pname}-${pname}-${version}.tar.gz"; + sha256 = "1fih2y2js0dl9qshpyb14m0nnxlms2527shgcxg0hnbflv5igg76"; }; - patches = [ (fetchpatch { - url = "https://pagure.io/libaio/c/da47c32b2ff39e52fbed1622c34b86bc88d7c217.patch"; - sha256 = "1kqpiswjn549s3w3m89bw5qkl7bw5pvq6gp5cdzd926ymlgivj5c"; - }) ]; - postPatch = '' patchShebangs harness From 727e7d8039ca11aff682e39bf3817f09012cf924 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Sat, 13 Jun 2020 14:41:22 -0700 Subject: [PATCH 1607/3452] steam: switch to correct runtime tarball In my previous commit (593c28b) I used the wrong upstream artifact for the runtime. After reading the documentation in the ValveSoftware/steam-runtime repo, I now know that the steam-runtime tarball is what I actually wanted. I also used 'diff' to compare the various artifacts with the old runtime this package used before, and the steam-runtime one is certainly the closest. Most importantly, switching to the right steam-runtime package reportedly fixes issues for other users (fixes #90229). This also entirely removes the amd64/i386 split from runtime.nix because the upstream package bundles both together, and if that's how upstream wants to distribute this, it seems best to follow their lead. --- pkgs/games/steam/runtime.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index 44d80c0d7948..6d81d6c775e2 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -1,4 +1,4 @@ -{ stdenv, steamArch, fetchurl, }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { @@ -6,20 +6,15 @@ stdenv.mkDerivation rec { # from https://repo.steampowered.com/steamrt-images-scout/snapshots/ version = "0.20200417.0"; - src = - if steamArch == "amd64" then fetchurl { - url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/com.valvesoftware.SteamRuntime.Platform-amd64,i386-scout-runtime.tar.gz"; - sha256 = "0kps8i5v23sycqm69xz389n8k831jd7ncsmlrkky7nib2q91rbvj"; - name = "scout-runtime-${version}.tar.gz"; - } else fetchurl { - url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/com.valvesoftware.SteamRuntime.Platform-i386-scout-runtime.tar.gz"; - sha256 = "03fhac1r25xf7ia2pd35wjw360v5pa9h4870yrhhygp9h7v4klzf"; - name = "scout-runtime-i386-${version}.tar.gz"; - }; + src = fetchurl { + url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz"; + sha256 = "0d4dfl6i31i8187wj8rr9yvmrg32bx96bsgs2ya21b00czf070sy"; + name = "scout-runtime-${version}.tar.gz"; + }; buildCommand = '' mkdir -p $out - tar -C $out -x --strip=1 -f $src files/ + tar -C $out --strip=1 -x -f $src ''; meta = with stdenv.lib; { From e1b93806ba17694f8891577b98e09eab92cd026d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 14 Jun 2020 09:11:14 +0200 Subject: [PATCH 1608/3452] autogen: try fixing on darwin and cause no rebuild elsewhere. In commit 2988780 I forgot that patchelf makes no sense there. --- pkgs/development/tools/misc/autogen/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 2911855e7023..3e634bedfd19 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "lib" "out" "man" "info" ]; nativeBuildInputs = [ - which pkgconfig perl autoreconfHook/*patches applied*/ + which pkgconfig perl autoreconfHook/*patches applied*/ ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # autogen needs a build autogen when cross-compiling buildPackages.buildPackages.autogen buildPackages.texinfo @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { sed -e "s|$lib/lib|/no-such-autogen-lib-path|" -i $f done + '' + stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # remove /build/** from RPATHs for f in "$bin"/bin/*; do local nrp="$(patchelf --print-rpath "$f" | sed -E 's@(:|^)/build/[^:]*:@\1@g')" From 2d50195be2fca44e671875077906906d0c0bf8c3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 7 Jun 2020 15:58:42 +0200 Subject: [PATCH 1609/3452] =?UTF-8?q?coqPackages.flocq:=203.2.0=20?= =?UTF-8?q?=E2=86=92=203.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/flocq/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index e0c32bc430ed..c5d3a295f2bc 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -2,11 +2,11 @@ let params = if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { - version = "3.2.0"; - sha256 = "15bi36x7zj0glsb3s2gwqd4wswhfzh36rbp7imbyff53a7nna95l"; + version = "3.3.1"; + sha256 = "0k1nfgiszmai5dihhpfa5mgq9rwigl0n38dw10jn79x89xbdpyh5"; } else { version = "2.6.1"; - sha256 = "1y4czkfrd8p37vwv198nns4hz1brfv71na17pxsidwpxy7qnyfw1"; + sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj"; } ; in @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]); buildPhase = '' - ${bash}/bin/bash autogen.sh + ${bash}/bin/bash autogen.sh || autoconf ${bash}/bin/bash configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Flocq ./remake ''; @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { }; 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 af632c92887a99ccb09413918d523025bfa64a3f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 14 Jun 2020 10:27:32 +0200 Subject: [PATCH 1610/3452] 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 3bdac5cfd8fb985ec4c6657bb25bb5f82c0f7257 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 08:28:08 +0000 Subject: [PATCH 1611/3452] amass: 3.6.2 -> 3.7.2 --- pkgs/tools/networking/amass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index ebe67b27e7c7..e2bc592f7a8f 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.6.2"; + version = "3.7.2"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1ih681790sp0lqfbsl153dpr5vzxp1jjza28pajrqjzs7zyjmkgs"; + sha256 = "1acjqpa9xg9ji2mzxag57yq589cdq3rh78a8vz8wnkkkp7b8why8"; }; - vendorSha256 = "1f8za3z5pv1pznbd91fk5j4y8qg93qk5zvnchjl7inyirciawdf6"; + vendorSha256 = "1s8g0qqg3m6hdvc5v3s86l3ba5grmyhx0lf2ymi39k5dpcg8l19s"; outputs = [ "out" "wordlists" ]; From 01ee5c9271052fda43eadc702198cb980e073f53 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 14 Jun 2020 10:11:12 +0200 Subject: [PATCH 1612/3452] manual: use less weird way of installing nixos tools --- nixos/doc/manual/installation/installing-from-other-distro.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index 8ed45899fd7f..45d68f8787f1 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -89,7 +89,7 @@ nixpkgs https://nixos.org/channels/nixpkgs-unstable NixOS partition. They are installed by default on NixOS, but you don't have NixOS yet.. -$ nix-env -iE "_: with import <nixpkgs/nixos> { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]" +$ nix-env -f '<nixpkgs/nixos>' --arg configuration {} -iA config.system.build.{nixos-generate-config,nixos-install,nixos-enter,manual.manpages} From 3348912c563d49621671cbfc29ceae721efe9ee1 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sun, 14 Jun 2020 12:17:36 +0300 Subject: [PATCH 1613/3452] handbrake: 1.3.2 -> 1.3.3 M pkgs/applications/video/handbrake/default.nix --- pkgs/applications/video/handbrake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index bbbb60bdf511..b56c26dff78d 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -51,13 +51,13 @@ assert stdenv.isDarwin -> AudioToolbox != null stdenv.mkDerivation rec { pname = "handbrake"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "HandBrake"; repo = "HandBrake"; rev = version; - sha256 = "04z3hcy7m5yvma849rlrsx2wdqmkilkl1qds9yrzr2ydpw697f85"; + sha256 = "0bsmk37543zv3p32a7wxnh2w483am23ha2amj339q3nnb4142krn"; extraPostFetch = '' echo "DATE=$(date +"%F %T %z" -r $out/NEWS.markdown)" > $out/version.txt ''; From 95f56eddce338d3477ab059d55ea929d56a3c704 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 09:34:50 +0000 Subject: [PATCH 1614/3452] binaryen: 93 -> 94 --- pkgs/development/compilers/binaryen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 3a03f633ff0d..651c88704da3 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,11 +1,11 @@ { stdenv, cmake, python3, fetchFromGitHub, emscriptenRev ? null, substituteAll }: let - defaultVersion = "93"; + defaultVersion = "94"; # Map from git revs to SHA256 hashes sha256s = { - version_93 = "15y3703ha6mxcq168br0wlydas5rq66msrcsd650zrjz0ndxwsfx"; + version_94 = "1wk20fhyppb2ljni7ifqnsx9kl1kcl6c0svc0qljf0bs6rvr9qdm"; "1.39.1" = "0ygm9m5322h4vfpf3j63q32qxk2l26yk62hh7dkb49j51zwl1y3y"; }; in From 29f3a2fd1a913735759b008afa0c40e9e5d765e2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 14 Jun 2020 11:55:12 +0200 Subject: [PATCH 1615/3452] fscrypt-experimental: 0.2.8 -> 0.2.9 --- pkgs/os-specific/linux/fscrypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index 608a6d5fa70a..aee406b03f0c 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "fscrypt"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "google"; repo = "fscrypt"; rev = "v${version}"; - sha256 = "0433f9kx43842ic8dydxhz8plyyrrxvqqwg7kd5ghn599ix28avy"; + sha256 = "020hhdarbn3bwlc2j2g89868v8nfx8562z1a778ihpvvsa4ykr31"; }; postPatch = '' From fcc3603ed82cca5c5b178d05eb5180b4f578870a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 10:09:34 +0000 Subject: [PATCH 1616/3452] bitwarden_rs: 1.15.0 -> 1.15.1 --- pkgs/tools/security/bitwarden_rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 158485dc982f..f2d0eb9b7d3a 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -8,13 +8,13 @@ let in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "12mr7d0mjlh7za4nc3s7cizzbd6v0zfmd7q9s0f7pqz56vw5m21s"; + sha256 = "1982bfprixdp8mx2hwidfvsi0zy7wmzf40m9m3cl5r7i2qydznwb"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "0nacc8xvbkdzbyx4c17hdh03v9ykpis74pbpxkn6v95njw14wq53"; + cargoSha256 = "08cygzgv82i10cj8lkjdah0arrdmlfcbdjwc8piwa629rr0584zf"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' From b3a8e07fa076eba98588bca07f79a8270e6ec725 Mon Sep 17 00:00:00 2001 From: cmacrae Date: Sun, 14 Jun 2020 11:24:38 +0100 Subject: [PATCH 1617/3452] yabai: 3.1.2 -> 3.2.0 --- pkgs/os-specific/darwin/yabai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index b4a7fc4c695c..5d8c8f60aec6 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yabai"; - version = "3.1.2"; + version = "3.2.0"; src = fetchFromGitHub { owner = "koekeishiya"; repo = pname; rev = "v${version}"; - sha256 = "01vkx8nqds4f7nnzml4qf976xm89w6psxbpswkn98r5k03zfa8r0"; + sha256 = "1iq5p4k6klffglxfhmzc2jvlilwn0w97vb5v4b91spiyp39nqcfw"; }; buildInputs = [ Carbon Cocoa ScriptingBridge ]; From 1356bc3d365bf6d3f64d9c16a0d2e5850670077c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 10:27:47 +0000 Subject: [PATCH 1618/3452] blockbook: 0.3.3 -> 0.3.4 --- pkgs/servers/blockbook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 627ac42efd20..2988df802fbd 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -14,14 +14,14 @@ buildGoModule rec { pname = "blockbook"; - version = "0.3.3"; + version = "0.3.4"; commit = "b6961ca"; src = fetchFromGitHub { owner = "trezor"; repo = "blockbook"; rev = "v${version}"; - sha256 = "01nb4if2dix2h95xvqvafil325jjw2a4v1izb9mad0cjqcf8rk6n"; + sha256 = "0da1kav5x2xcmwvdgfk1q70l1k0sqqj3njgx2xx885d40m6qbnrs"; }; vendorSha256 = "1qjlvhizl8cy06cgf4phia70bgbm4lj57z5z2gyr8aglx98bnpdn"; From e4183aaa7637285696ca739e49b9a383be9139da Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sun, 14 Jun 2020 12:32:59 +0200 Subject: [PATCH 1619/3452] betaflight-configurator: 10.6.0 -> 10.7.0 --- .../science/robotics/betaflight-configurator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 4684ba8c1937..66b9a1ef63a1 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { inherit pname; - version = "10.6.0"; + version = "10.7.0"; src = fetchurl { url = "https://github.com/betaflight/${pname}/releases/download/${version}/${pname}_${version}_linux64.zip"; - sha256 = "09hayzhwangh8b81r038p320vbg0xxlyzrdp9pcmfyxp6s00xslw"; + sha256 = "07r60n9422g5sm7x5b62p044cp961l51vx0s8ig2hy24s74hkam1"; }; nativeBuildInputs = [ wrapGAppsHook ]; From 03690ba290ef3f4612d022d3651bbaa6d6879621 Mon Sep 17 00:00:00 2001 From: Philipp Riegger Date: Thu, 11 Jun 2020 12:34:51 +0200 Subject: [PATCH 1620/3452] sane-backends: 1.0.28 -> 1.0.30 --- pkgs/applications/graphics/sane/backends/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 6aba42d33e63..ad2681d25fe5 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "1.0.28"; + version = "1.0.30"; src = fetchurl { - url = "https://gitlab.com/sane-project/backends/uploads/9e718daff347826f4cfe21126c8d5091/sane-backends-${version}.tar.gz"; - sha256 = "00yy8q9hqdf0zjxxl4d8njr9zf0hhi3a9ib23ikc2anqf8zhy9ii"; + url = "https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/sane-backends-${version}.tar.gz"; + sha256 = "18vryaycps3zpjzxh0wjgg8nv2f4pdvcfxxmdfj28qbzqjlrcp9z"; }; }) From f96842292ffae0cbc067e503fe0e75e904da1d05 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 14 Jun 2020 09:57:15 +0200 Subject: [PATCH 1621/3452] mono: don't propagate a dependency to glib-dev This was added in 2005 back in r51ce4ea2. This was not commented or explained anywhere, and it does not seem to be necessary anymore according to some quick testing I did. Reduces mono closure size by ~100M. --- pkgs/development/compilers/mono/generic.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index f22771a35e9d..e4d99dcec955 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { ] ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]); - propagatedBuildInputs = [glib]; - configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" From 0cb5116fafd1611b0eabc371098259158a0d89b9 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 14 Jun 2020 11:56:33 +0200 Subject: [PATCH 1622/3452] gio-sharp: add missing glib dependency --- pkgs/development/libraries/gio-sharp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index d7df4ab72127..a19febbfd66e 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp-2_0 }: +{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, glib, gtk-sharp-2_0 }: stdenv.mkDerivation rec { pname = "gio-sharp"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoconf automake which ]; - buildInputs = [ mono gtk-sharp-2_0 ]; + buildInputs = [ mono glib gtk-sharp-2_0 ]; dontStrip = true; From 8dd26c6d858c57b7e55e4ef685502739c23d40f4 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 14 Jun 2020 11:58:12 +0200 Subject: [PATCH 1623/3452] dotnetPackages.FSharpAutoComplete: add missing glib dependency --- pkgs/top-level/dotnet-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 3b58e1937b60..f14ae3133b8b 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -4,6 +4,7 @@ , fetchurl , fetchFromGitHub , fetchNuGet +, glib , pkgconfig , mono , fsharp @@ -544,6 +545,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { buildInputs = [ fsharp + glib dotnetPackages.FSharpCompilerService dotnetPackages.NewtonsoftJson dotnetPackages.NDeskOptions From 711146caeb2a4bf86d54951a16fb882d3a28a402 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sun, 14 Jun 2020 12:54:13 +0200 Subject: [PATCH 1624/3452] pivx: 4.0.2 -> 4.1.1 --- pkgs/applications/blockchains/pivx.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index 600e462b390e..16ea2dc43e74 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, wrapQtAppsHook ? null -, openssl_1_0_2, db48, boost, zlib, miniupnpc, gmp +, openssl, db48, boost, zlib, miniupnpc, gmp , qrencode, glib, protobuf, yasm, libevent , utillinux, qtbase ? null, qttools ? null , enableUpnp ? false @@ -10,17 +10,17 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pivx-${version}"; - version = "4.0.2"; + version = "4.1.1"; src = fetchFromGitHub { owner = "PIVX-Project"; repo= "PIVX"; rev = "v${version}"; - sha256 = "12lnp318k8dx1sar24zfmv2imnzs30srssnlpb31y7hcxhz0wpc5"; + sha256 = "03ndk46h6093v8s18d5iffz48zhlshq7jrk6vgpjfs6z2iqgd2sy"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ]; - buildInputs = [ glib gmp openssl_1_0_2 db48 yasm boost zlib libevent miniupnpc protobuf utillinux ] + buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf utillinux ] ++ optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { ++ optional disableWallet "--disable-wallet" ++ optional disableDaemon "--disable-daemon" ++ optionals withGui [ "--with-gui=yes" - "--with-unsupported-ssl" # TODO remove this ASAP "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -56,9 +55,5 @@ stdenv.mkDerivation rec { homepage = "https://www.dash.org"; maintainers = with maintainers; [ wucke13 ]; platforms = platforms.unix; - # TODO - # upstream doesn't support newer openssl versions - # https://github.com/PIVX-Project/PIVX/issues/748 - # openssl_1_0_2 should be replaced with openssl ASAP }; } From fb3caa93a4e970412c8aec311b085c65af5e48e1 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 14 Jun 2020 12:56:52 +0200 Subject: [PATCH 1625/3452] pythonPackages.pythonnet: add missing glib dependency --- pkgs/development/python-modules/pythonnet/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index 0027c8d32a63..82ddb8c810b0 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -9,6 +9,7 @@ , pkgconfig , dotnetbuildhelpers , clang +, glib , mono }: @@ -63,6 +64,7 @@ buildPythonPackage rec { ]; buildInputs = [ + glib mono psutil # needed for memory leak tests ]; From a0b01992314b877c547c4b4fc036296e431a3243 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sun, 14 Jun 2020 13:04:53 +0200 Subject: [PATCH 1626/3452] dqlite: 1.4.1 -> 1.4.4 --- pkgs/development/libraries/dqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index aed7dc59bcbc..9ebdeda781de 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.4.1"; + version = "1.4.4"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "v${version}"; - sha256 = "04h3wbfv6bkzzmcwaja33x2qkj3czn0p6fgbdgqd1xli8sx2c2k4"; + sha256 = "0wm7vkapjg8hdjm6bi48hwsf4w4ppgn3r655gqms5ssjxm50m15d"; }; nativeBuildInputs = [ autoreconfHook file pkgconfig ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sqlite-replication ]; - # tests hang for ever on x86_64-linux + # tests fail doCheck = false; outputs = [ "dev" "out" ]; From cca946c83c9f55c32d881ba31f726e1309feaf0f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 11:05:57 +0000 Subject: [PATCH 1627/3452] cassowary: 0.7.0 -> 0.11.0 --- pkgs/tools/networking/cassowary/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index be1df3394396..e76a505fe9d7 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cassowary"; - version = "0.7.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "rogerwelin"; repo = pname; rev = "v${version}"; - sha256 = "0p5vcs25h5nj36dm9yjmdjymcq0zldm3zlqfppxcjx862h48k8zj"; + sha256 = "161wzcdq7kpny6fzxsqk2ivnah0xwmh2knv37jn0x18lclga1k9s"; }; - vendorSha256 = "1m5jaqf5jrib415k0i7w6rf5bjjwfn572wk94jwfpwjcbbvh8fck"; + vendorSha256 = "1qgilmkai9isbbg4pzqic6i8v5z8cay0ilw1gb69z4a6f2q4zhkp"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From ec1fe345da0c18c13bb704a49b81ff97867d4bc9 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sun, 14 Jun 2020 13:09:01 +0200 Subject: [PATCH 1628/3452] raft-canonical: 0.9.18 -> 0.9.23 --- .../development/libraries/raft-canonical/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index ed3d7ae9e701..68c4a95d0b68 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "raft-canonical"; - version = "0.9.18"; + version = "0.9.23"; src = fetchFromGitHub { owner = "canonical"; repo = "raft"; rev = "v${version}"; - sha256 = "0f613aiyxqskz9d10f7r37ar9ngqsf9qsyk3jjf7s5l14wh6vl5k"; + sha256 = "0swn95cf11fqczllmxr0nj3ig532rw4n3w6g3ckdnqka8520xjyr"; }; nativeBuildInputs = [ autoreconfHook file pkgconfig ]; @@ -18,13 +18,7 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace /usr/bin/ " " ''; - # test fails - # - #append/finalizeSegment [ ERROR ] - #Error: test/integration/test_uv_append.c:264: assertion failed: test_dir_has_file(f->dir, "0000000000000001-0000000000000004") is not true - #Error: child killed by signal 6 (Aborted) - - doCheck = false; + doCheck = true; outputs = [ "dev" "out" ]; From b52d80d198af31bf0810e24621b43603027a194b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Abdelkader=20Mart=C3=ADnez=20P=C3=A9rez?= Date: Sun, 14 Jun 2020 13:13:55 +0200 Subject: [PATCH 1629/3452] gosec: 1.2.0 -> 2.3.0 --- pkgs/development/tools/gosec/default.nix | 29 ++-- pkgs/development/tools/gosec/deps.nix | 193 ----------------------- 2 files changed, 14 insertions(+), 208 deletions(-) delete mode 100644 pkgs/development/tools/gosec/deps.nix diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 2600d13cab93..f11a7fc35d69 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -1,29 +1,28 @@ -{ buildGoPackage -, lib -, fetchFromGitHub -}: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gosec"; - version = "1.2.0"; + version = "2.3.0"; goPackagePath = "github.com/securego/gosec"; - excludedPackages = ''cmd/tlsconfig''; + + subPackages = [ "cmd/gosec" ]; src = fetchFromGitHub { owner = "securego"; - repo = "gosec"; - rev = version; - sha256 = "1420yl4cjp4v4xv0l0wbahgl6bjhz77lx5va9hqa6abddmqvx1hg"; + repo = pname; + rev = "v${version}"; + sha256 = "0z782rr4z0nhlj6cmjd17pbi65zabpmb83mv4y93wi4qa7kkpm2g"; }; - goDeps = ./deps.nix; + vendorSha256 = "0zrmhqcid8xr6i1xxg3s8sll8a667w2vmn5asdw0b43k6k3h941p"; - meta = with lib; { - description = "Golang security checker"; + meta = with stdenv.lib; { homepage = "https://github.com/securego/gosec"; - license = licenses.asl20 ; - maintainers = with maintainers; [ kalbasit ]; + description = "Golang security checker"; + license = licenses.asl20; + maintainers = with maintainers; [ kalbasit nilp0inter ]; platforms = platforms.linux ++ platforms.darwin; }; } + diff --git a/pkgs/development/tools/gosec/deps.nix b/pkgs/development/tools/gosec/deps.nix deleted file mode 100644 index 80a77e7fb807..000000000000 --- a/pkgs/development/tools/gosec/deps.nix +++ /dev/null @@ -1,193 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "0de1eaf82fa3"; - sha256 = "177af7bjq6clmkqshnmnwlpwvx80kpi2277q275iwq59lp48viq1"; - }; - } - - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - - { - goPackagePath = "github.com/nbutton23/zxcvbn-go"; - fetch = { - type = "git"; - url = "https://github.com/nbutton23/zxcvbn-go"; - rev = "a22cb81b2ecd"; - sha256 = "0hm16vc7xrw0cqla6xcn59bb7n2sa0j8rkniywn5dqnbrpza12cd"; - }; - } - - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "11459a886d9c"; - sha256 = "1nswc1fnrrs792qbix05h91bilj8rr3wxmxgwi97p2gjk0r292zh"; - }; - } - - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "dcabb60a477c"; - sha256 = "1775lv5jbsgv3ghq5v2827slqlhqdadrzc1nkpq4y0hdv2qzrgkm"; - }; - } - - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - - { - goPackagePath = "github.com/ryanuber/go-glob"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/go-glob"; - rev = "256dc444b735"; - sha256 = "07rsd7hranghwc68ib0r2zxd9d5djanzjvd84j9dgj3wqsyg5mi2"; - }; - } - - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "8351a756f30f"; - sha256 = "0b6m579i3wrx1m69mqkdng5gjfssprxx0pg45kzrdi68sh0zr5d1"; - }; - } - - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6f"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; - }; - } - - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "164713f0dfce"; - sha256 = "1qn9vvyqsaaj0az0rbilzc4pfv9sl4vh78c2g37yya5gcdnarh3w"; - }; - } - - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "1cbadb444a80"; - sha256 = "0ih9ysagh4ylj08393497sscf3yziybc6acg4mrh0wa7mld75j56"; - }; - } - - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "e531a2a1c15f"; - sha256 = "0740w56nmjqdj7ld1h3gpcpi3x8n81bdx0pp267rz9hmwkrb2s1c"; - }; - } - - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "eb3733d160e7"; - sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; - }; - } -] From 6bd79857e9dba58514553b910aee4fb792771e0c Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sun, 14 Jun 2020 13:27:38 +0200 Subject: [PATCH 1630/3452] apmplanner2: 2.0.27-rc1 -> 2.0.28-rc1 --- .../science/robotics/apmplanner2/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index ede698e2b0b4..e6d1c544ee4c 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -5,23 +5,15 @@ mkDerivation rec { pname = "apmplanner2"; - version = "2.0.27-rc1"; + version = "2.0.28-rc1"; src = fetchFromGitHub { owner = "ArduPilot"; repo = "apm_planner"; rev = version; - sha256 = "1k0786mjzi49nb6yw4chh9l4dmkf9gybpxg9zqkr5yg019nyzcvd"; + sha256 = "18yn8bdz5hmgb0m5hlk8bibz4cj4g25w75pm1rvc4ds0mr1qgyjd"; }; - patches = [ - # can be dropped after 2.0.27-rc1 - (fetchpatch { - url = "https://github.com/ArduPilot/apm_planner/commit/299ff23b5e9910de04edfc06b6893bb06b47a57b.patch"; - sha256 = "16rc81iwqp2i46g6bm9lbvcjfsk83999r9h8w1pz0mys7rsilvqy"; - }) - ]; - buildInputs = [ alsaLib libsndfile flite openssl udev SDL2 qtbase qtscript qtwebkit qtserialport qtsvg qtdeclarative qtquickcontrols2 @@ -35,7 +27,7 @@ mkDerivation rec { preFixup = '' ln --relative --symbolic $out/share/APMPlanner2/* $out/bin/ substituteInPlace $out/share/applications/apmplanner2.desktop \ - --replace /usr $out + --replace /usr $out ''; enableParallelBuilding = true; From 3315103ed73a963858f490074754da00aa13acc3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 11:32:29 +0000 Subject: [PATCH 1631/3452] chezmoi: 1.8.1 -> 1.8.2 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 75b10bc32ca7..eb372b6b5671 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "1b8y0wq3myhvjdnwl0i4x85iil7i7kmsjajvbw1a47afm83jkbaw"; + sha256 = "0s2a0q3lgrdz7w69sacn23k4dybw6wrk63xxnylj88wss7mqnpj8"; }; - vendorSha256 = "1za47n08iamhfl4ky928rixgadflmz86vnmnwbczd167bdndh5rq"; + vendorSha256 = "0hpjvpai2i9jn8hlxhx4pvvawjh6lfmlz7ffi320pp7vanzqhch1"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" From 6b8e83428a3518fb8c4a2e4a802695223c96600e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 11:37:17 +0000 Subject: [PATCH 1632/3452] circleci-cli: 0.1.7868 -> 0.1.7971 --- pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 7144c2bd0ae5..8c87e1642df3 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.7868"; + version = "0.1.7971"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "1a9gnqrkvifrwr8wpv5f6zv8xs8myzbzlhn5w72xxzh2gxdaflwg"; + sha256 = "0nrmdql3h9jnfgmp8898c9v07f5h5r9dvabaqhk98r6a77g3rr98"; }; vendorSha256 = "0y35ps2pw9z7gi4z50byd1py87bf2jdvj7l7w2gxpppmhi83myc9"; From 5f1ff4bf9085899c331ead403d771c1830ef776e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 11:48:08 +0000 Subject: [PATCH 1633/3452] cloudfoundry-cli: 6.46.1 -> 6.51.0 --- pkgs/development/tools/cloudfoundry-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index 1fa45a32c05f..9d0c1ab92ff4 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "cloudfoundry-cli"; - version = "6.46.1"; + version = "6.51.0"; goPackagePath = "code.cloudfoundry.org/cli"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "0dqrkimwhw016icgyf4cyipzy6vdz5jgickm33xxd9018dh3ibwq"; + sha256 = "189cqng7y12knqm4n1bfajbc2lx027rwb44wddmj5iya27i7fv8f"; }; nativeBuildInputs = [ installShellFiles ]; From 5cdf80e7e1b445f487777e3c4636bd7ea435fec3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 11:53:24 +0000 Subject: [PATCH 1634/3452] cointop: 1.4.4 -> 1.4.6 --- pkgs/applications/misc/cointop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index ef897d2ea598..8d91531dd1f8 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cointop"; - version = "1.4.4"; + version = "1.4.6"; src = fetchFromGitHub { owner = "miguelmota"; repo = pname; rev = version; - sha256 = "12yi1lmyd5y4cgcjclkczf93jj7wd6k8aqnhq21dd1mx65l77swv"; + sha256 = "1mkb97x73vzxnbvhnxx3msicr1z0b3sjmydx257ax3nscrmf1l5z"; }; goPackagePath = "github.com/miguelmota/cointop"; From c92b33df884be886ecdff697ec36b4c39cc4cfdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Jun 2020 13:39:40 +0200 Subject: [PATCH 1635/3452] ttwatch: 2018-12-04 -> 2020-02-05 --- pkgs/tools/misc/ttwatch/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index afd5139565c8..8788608876ea 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchFromGitHub, cmake, perl, openssl, curl, libusb1 +{ stdenv, fetchFromGitHub +, cmake, perl, pkgconfig +, openssl, curl, libusb1, protobufc , enableUnsafe ? false }: stdenv.mkDerivation { pname = "ttwatch"; - version = "2018-12-04"; + version = "2020-02-05"; src = fetchFromGitHub { owner = "ryanbinns"; repo = "ttwatch"; - rev = "eeb4e19bf7ca7ca2cee7f5fbeb483b27198d86a1"; - sha256 = "18384apdkq35120cgmda686d293354aibwcq2hwhvvjmnq49fnzr"; + rev = "bfdf1372515574e1fb3871dc1039f8d8a5dbdada"; + sha256 = "07nd4dbkchxy8js1h1f6pzn63pls2afww97wyiiw6zid43mpqyg4"; }; - nativeBuildInputs = [ cmake perl ]; - buildInputs = [ openssl curl libusb1 ]; + nativeBuildInputs = [ cmake perl pkgconfig ]; + buildInputs = [ openssl curl libusb1 protobufc ]; cmakeFlags = stdenv.lib.optional enableUnsafe [ "-Dunsafe=on" ]; From 4f7d82999145ca1d4514c3c72d510a2dbe1b5d52 Mon Sep 17 00:00:00 2001 From: Joe <55846624+rtldg@users.noreply.github.com> Date: Sun, 14 Jun 2020 07:36:29 +0000 Subject: [PATCH 1636/3452] discord: add libuuid to nativeBuildInputs The libuuid.so.1 file can't be found and this allows the package builder to find it. --- pkgs/applications/networking/instant-messengers/discord/base.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index 653da669d386..c2af3e4d3e7d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -17,6 +17,7 @@ in stdenv.mkDerivation rec { autoPatchelfHook cups libdrm + libuuid libX11 libXScrnSaver libXtst From 720128ce7e8e39597895109b7687b511510048ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 12:16:51 +0000 Subject: [PATCH 1637/3452] consul: 1.7.3 -> 1.7.4 --- pkgs/servers/consul/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index a702626e1c14..d550a5cb699e 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.7.3"; + version = "1.7.4"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "05p893mfdrlf5fy9ywwnqb7blw1ffidgviyyh6a3bp82wk49f8ph"; + sha256 = "0yx0ry8gwgvw1mkz3nv4rn2pwslm0q7jxlk70gaw6386mxxmj0sk"; }; passthru.tests.consul = nixosTests.consul; From 08096e8ccf005b7bec460f5247f097aa1b997077 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 14 Jun 2020 14:18:30 +0200 Subject: [PATCH 1638/3452] systemd: 245.5 -> 245.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit changes: - aa0cb635f1 (tag: v245.6) network: L2TP fix crash - 9774347b57 Fix typo. - 2cac801f0f stat-util: trivial empty_or_null() tweaks - b054e69bf9 Check ambient set against bounding set prior to applying ambient set - bed695375a udev: when the BSD lock on a block device is taken, don't complain - 66fcfdfde7 core: add forgotten return in error path - 05dd19fad3 shared/efi-loader: remove check that uses absolute tick value - 753a71ad1d gpt: include homed GPT partition type in well-known partition table - 3668722049 units: don't set PrivateNetwork= in systemd-homed.service - 2bca2d77d3 resolved-dns-query: remove dns_query_candidate_is_routable - a3f6020432 sd-network: fix inverted error message - a7a9fe3c93 network: allow empty assignment to PreferredLifetime= - 8df6fc1241 Update resolvectl zsh completion - c1a83277d0 shared: treat generator units as vendor units - 1f382d818d tree-wide: fix bad errno checks - 667c207683 bus-message: immediately reject messages with invalid type - 116a8eadb6 bus-message: fix negative offset with ~empty message - 4d5779d886 load-fragment: fix a typo - c8b6de003a NEWS: retroactively document Family= - cf6b8e6ec5 man: fix dir name in sysctl.d(5) - 6d009b7a25 journalctl,elsewhere: make sure --file=foo fails with sane error msg if foo is not readable - cf786ef164 makefs: log about OOM condition - 0b1839822f blockdev: propagate one more unexpected error - d78ce949d0 repart: don't insist on coming up on partition label ourselves - 9e1363fcc6 journal: fix dropping first record during upload to remote journal - 50cb4e418d meson: initialize time-epoch to reproducible builds compatible value - 76abe079b7 limit-util: quieten a very common debug message that is misleading - b3e484a3b1 shared: fix integer overflow in calendarspec - 0c29eea969 repart: suppress complaints about lack of BLKRRPART when operating on regular file - 3db52f5ed8 repart: explain when we exit early and don't do a thing - d99cba3aaa mount: introduce mount_is_nofail() helper - 7bc4bcea15 mount: default startup dependencies and default network ones are orthogonal - 7fe617fa53 mount: introduce mount_add_default_ordering_dependencies() - e1c091b6d4 automount: fix handling of default dependencies for automount units - ae05a137c9 mount: let pid1 alone handle the default dependencies for mount units - f1fb197176 mount: mount unit activated by automount unit should be only ordered against the automount unit - c9bcc69703 generator: don't generate device dependencies for extrinsic mounts - ebac09ea0a fstab-util: introduce fstab_is_extrinsic() - a20e4ea0ed device: drop refuse_after - 2799fffac1 man: drop some left-over mentions of StandardOutput=syslog - 144aff9c3b sd-netlink: remove unused RTNL_WQUEUE_MAX define - 34ca8df8e1 test: Add return 0 to main() function (even it is not strictly necessary) - 6e03f328a9 network: 'cur' variable cannot be null, so simplify code - 8d0c97f6ca tree-wide: Initialize _cleanup_ variables if needed - 4f174e49ae netlink: Fix assert condition on n_containers - 3905ce532c journald: Increase stdout buffer size sooner, when almost full - 5a37eb7c61 core: don't bind varlink socket if running in test mode - 33fff72ce6 pam_systemd: also print debug lines when ending a session - ba9af79ccb pam_systemd_home: use correct macro for converting ptr to fd - 6199235489 Fix misuse of PAM_PROMPT_ECHO_OFF in systemd-homed - c180a2c452 shared/ethtool-util: hush gcc warnings about array bounds - 1addba4aac core: fix compilation with gcc -O3 - 9c46b97161 random-util: use ERRNO_IS_NOT_SUPPORTED() macro - d85f9093d2 tmpfiles: clarify that "!" lines are filtered before collisions are checked - 2fac966a5c man: mention the exclamation mark and minus sign literally, to make things searchable - 4f61be3373 man: clarify that exit status name mappings are unaffected by SuccessExitStatus= - b747d74a41 seccomp-util: add new syscalls from kernel 5.6 to syscall filter table - c30d8caf8b tree-wide: Replace assert() by assert_se() when there is side effect - b6e8e3be7e networkctl: use uint64_t for link speed throughout - be66ce6089 tree-wide: use CMSG_SPACE() (and not CMSG_LEN()) to allocate control buffers - 1cb197798a man: suffix pam options with "=" where arg is required too - a5fe01d3da test: Use assert_se() where variables are only checked by assert - 6960efd198 tree-wide: Fix, replace assert() by assert_se() when there is side effect - 93c1b03074 tree-wide: Mark as _unused_ variables that are only used in assert() - c7679d7a9f tree-wide: Workaround -Wnonnull GCC bug - 073b257fd7 man: bring example PAM snippet of pam_systemd and pam_systemd_home back in sync - 855291a81c man: highlight relevant lines in pam_systemd_home.so example PAM snippet - f89ad7c0fd login: include pam_systemd_home.so in the default PAM snippet we ship for user@.service - 9357f9466f test: Skip test-boot-timestamps on permission denied - cad4ebe14e sysusers: be extra careful when locking accounts - 551e6f233a shared/install: print name of offending file in error - c6a2e51232 systemctl: fix --root support in querying presets - 6f1eedbfdd systemctl: fix hint when 'systemctl help' is given - 925521df7c shared/unit-file: fix resolution of absoulute symlinks with --root - 756ba362e8 man: mention that ProtectSystem= also takes care of /efi - 4f77cf43b5 man: systemd.service: systemd-analyze exit-codes -> exit-status - 7c6ea7a053 man: expand on the star…end/repetition time expressions - e06b940792 calendarspec: be more graceful with two kinds of calendar expressions - f3dd0b476d calendarspec: minor simplification - 3581c16d56 shutdown: fix spacing in shutdown error message - 9556255349 nspawn: mount custom paths before writing to /etc - 37447b7e78 repart: fix partition maximum size segfault - 7f231ba503 link: Add units and fix typo in (Rx|Tx)BufferSize= manpage. Clean up the implementation slightly - e75d2cdb0b main: bump RLIMIT_MEMLOCK by physical RAM size - e16b9a1e31 nspawn: be more careful with creating/chowning directories to overmount - 765d184a69 homectl: say "home area" in more places - c11bff4fa7 userdbctl: make --help fit in 80 columns - 0e56c2ef3f shell-completion/zsh: update systemd-analyze completions - 2bb580f994 zsh: fix disable/enable completion - 607a19a309 cgroup-util: check for SYSFS_MAGIC when detecting cgroup format - ddb3c38efc stat-util: no need to open a file to check fs type - bd8842304c sysusers,tmpfiles: always mention error when failing to replace specifiers - bdea9b65d2 sysusers: add accidentally forgotten 'return' - 17b059774d man: document binfmt's new --unregister switch - 560380d8ec binfmt: also unregister binfmt entries from unit - 80835d9c51 binfmt: modernize code a bit - a1745741b8 shutdown: unregister all binfmt_misc entries before entering shutdown loop - b637445950 shared: add common helper for unregistering all binfmt entries - 0215625e99 home: fix strv NUL termination - 038988baa1 networkd: don't do lldp rx nor tx on bond devices - 9512d576d9 sd-bus: Fix typo in sd_bus_message_append_array docs - 63cef71dd0 shared: add NULL callback check in one more place - 6b91ca22a2 core: fix unused variable warning when !HAVE_SECCOMP - f7c1c79c57 udev: prepare memory for extra NUL termination for NULSTR - 69e0ef0d99 tree-wide: use recvmsg_safe() at various places - cd0a84d4e9 socket-util: add recvmsg_safe() wrapper that handles MSG_CTRUNC - 2bb48c704b sd-bus: work around ubsan warning - c147bba1fb shared: Don't try calling NULL callback in bus_wait_for_units_clear - f907491463 run: don't wait for start job to complete when running interactively anyway - d3d1550a5d man: Fix typo "multiplied with" -> "multiplied by" - ae5a9f27c5 core: make sure we don't get confused when setting TERM for a tty fd - a07d3eaf76 man: document that VirtualEthernetExtra= has nothing to do with Bridge= - 35fe81078e core: add debug log when a job in the activation queue is not runnable - a0cd882be8 core: add log_get_max_level check optimization in log_unit_full - 2a6ad1093c util: return the correct correct wd from inotify helpers - 9ec244c5c1 core: minor error code handling fixes - a799283c91 man: document how to get the boot menu with zero time-out - 7263e86c8d resolved: return org.freedesktop.resolve1.DnsError.NXDOMAIN on LLMNR resolution failure - 6eab4c2b3e man: use manpages.ubuntu.com for resolvconf(8) link - 75ccec5cde man: add a note that resolvconf updates /etc/resolv.conf in specific circumstances - 3e3a31743a resolvectl: fix indentation of hexdump'ed packets - 6576058fab journald: add configuration option for enabling/disabling audit during journald startup - 52c5909f15 man/systemd-service: clarify env variable expansion - ac08df59c0 resolved: fix typo in an unused function and add comment --- ...ts-for-uninitialised-encrypted-devic.patch | 2 +- ...on-t-try-to-unmount-nix-or-nix-store.patch | 22 +++++++++---------- .../systemd/0003-Fix-NixOS-containers.patch | 8 +++---- ...004-Look-for-fsck-in-the-right-place.patch | 2 +- ...some-NixOS-specific-unit-directories.patch | 2 +- ...f-a-useless-message-in-user-sessions.patch | 4 ++-- ...d-timedated-disable-methods-that-cha.patch | 2 +- .../linux/systemd/0008-Fix-hwdb-paths.patch | 2 +- ...e-usr-share-zoneinfo-to-etc-zoneinfo.patch | 4 ++-- ...calectl-use-etc-X11-xkb-for-list-x11.patch | 2 +- ...te-statedir-and-don-t-touch-prefixdi.patch | 6 ++--- ...configuration-into-out-share-factory.patch | 12 +++++----- ...-environment-when-calling-generators.patch | 6 ++--- ...4-add-rootprefix-to-lookup-dir-paths.patch | 2 +- ...-execute-scripts-in-etc-systemd-syst.patch | 6 ++--- ...ecute-scripts-in-etc-systemd-system-.patch | 2 +- ...s.service-Update-ConditionFileNotEmp.patch | 2 +- ...-placeholder-for-DEFAULT_PATH_NORMAL.patch | 2 +- pkgs/os-specific/linux/systemd/default.nix | 6 ++--- 19 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index c88d0eeeff2b..ab04ea91644e 100644 --- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,4 +1,4 @@ -From b873e4c0de3e24f2ec9370e5a217247217e90587 Mon Sep 17 00:00:00 2001 +From 22f46f55c81d84e83a4614856d84e63c8400165c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:46:30 +0100 Subject: [PATCH 01/18] Start device units for uninitialised encrypted devices diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch index 4f94cb465d4e..c52a13c9a41c 100644 --- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,4 +1,4 @@ -From bdd3ff777dd8253ff5732118dd6de0fa9a9b95fe Mon Sep 17 00:00:00 2001 +From e5b2b1e90d055068936336f6f01639bcde251b96 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Apr 2013 13:16:57 +0200 Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store @@ -7,18 +7,18 @@ They'll still be remounted read-only. https://github.com/NixOS/nixos/issues/126 --- - src/core/mount.c | 2 ++ - src/shutdown/umount.c | 2 ++ + src/shared/fstab-util.c | 2 ++ + src/shutdown/umount.c | 2 ++ 2 files changed, 4 insertions(+) -diff --git a/src/core/mount.c b/src/core/mount.c -index 1c4aefd734..a5553226f8 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -412,6 +412,8 @@ static bool mount_is_extrinsic(Mount *m) { - - if (PATH_IN_SET(m->where, /* Don't bother with the OS data itself */ - "/", /* (strictly speaking redundant: should already be covered by the perpetual flag check above) */ +diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c +index b19127be09..f9adca1100 100644 +--- a/src/shared/fstab-util.c ++++ b/src/shared/fstab-util.c +@@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) { + /* Don't bother with the OS data itself */ + if (PATH_IN_SET(mount, + "/", + "/nix", + "/nix/store", "/usr", diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index 73aab8dd91ca..e96593a59387 100644 --- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -1,4 +1,4 @@ -From c28b3b2e254433e93549ee6fe8c93b43ce455776 Mon Sep 17 00:00:00 2001 +From ca7f6286c518d7ef3877458bbdf8e01f5518ab0e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Apr 2014 10:59:28 +0200 Subject: [PATCH 03/18] Fix NixOS containers @@ -10,10 +10,10 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 734dee1130..a97b1a4bc9 100644 +index 51d0c2a75b..4d3451ff3b 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -5018,6 +5018,7 @@ static int run(int argc, char *argv[]) { +@@ -5017,6 +5017,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { @@ -21,7 +21,7 @@ index 734dee1130..a97b1a4bc9 100644 const char *p, *q; if (arg_pivot_root_new) -@@ -5032,6 +5033,7 @@ static int run(int argc, char *argv[]) { +@@ -5031,6 +5032,7 @@ static int run(int argc, char *argv[]) { r = -EINVAL; goto finish; } diff --git a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch index e10726a2cb1f..4b2c059afd59 100644 --- a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch +++ b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch @@ -1,4 +1,4 @@ -From baf52609ad18785aa1d2cd043185ae9438d59411 Mon Sep 17 00:00:00 2001 +From c87cc5b1cf9c37f195e6b362352279e14289554e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 May 2014 14:10:10 +0200 Subject: [PATCH 04/18] Look for fsck in the right place diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index 23aa893362b5..d12a6c828600 100644 --- a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -1,4 +1,4 @@ -From 45f80155b7c2edb1e73c233283f1ab1582e1cfbe Mon Sep 17 00:00:00 2001 +From 450c133c1815b473136b2a5540f9213fef5506ee Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 19 Dec 2014 14:46:17 +0100 Subject: [PATCH 05/18] Add some NixOS-specific unit directories diff --git a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch index 0b57dc1f9c89..ac3d3b0bd6fe 100644 --- a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -1,4 +1,4 @@ -From d52058070c0c12bb05f82460f0b4b55678b724e9 Mon Sep 17 00:00:00 2001 +From f88a9bb1e6080b539ed0116caa9781e7f6755f54 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 May 2015 15:39:38 +0200 Subject: [PATCH 06/18] Get rid of a useless message in user sessions @@ -13,7 +13,7 @@ in containers. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/unit.c b/src/core/unit.c -index 97e1b0004c..d3cc2ba9ec 100644 +index c306183555..3db39fa435 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -2043,7 +2043,8 @@ static void unit_check_binds_to(Unit *u) { diff --git a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch index 5703c4f43fd4..70fc147232b7 100644 --- a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -1,4 +1,4 @@ -From 409fc808794942ad1736c2cc74853d9792e4ad02 Mon Sep 17 00:00:00 2001 +From e2b25ce3606d05ff8a387185c41ab32fb2a36161 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 6 Dec 2015 14:26:36 +0100 Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch index a9bf9abee520..36d82e22f8c7 100644 --- a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch +++ b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch @@ -1,4 +1,4 @@ -From b56fc7b6ae8014eb2f71924c89498f395a1a81bd Mon Sep 17 00:00:00 2001 +From 5a6aad633a7ceffd62b009ce0c4ab6673129f7ff Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 7 Jul 2016 02:47:13 +0300 Subject: [PATCH 08/18] Fix hwdb paths diff --git a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index 12a9dd5a77f6..8b5c807e4a89 100644 --- a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -1,4 +1,4 @@ -From 4d304a321796db4de827aa39a149bea23d039214 Mon Sep 17 00:00:00 2001 +From b509dbd302a7933ae0002f44b99aac6a1fd5775b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 11 Oct 2016 13:12:08 +0300 Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo @@ -79,7 +79,7 @@ index 901fbf0815..b57bdd8fbe 100644 (void) mkdir_parents(etc_localtime, 0755); if (symlink(e, etc_localtime) < 0) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index a97b1a4bc9..aed60439e3 100644 +index 4d3451ff3b..1adb91335c 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1657,8 +1657,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u diff --git a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch index 7e6453f2ddd3..b18ffb401664 100644 --- a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch +++ b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -1,4 +1,4 @@ -From cb3f1ec1793cbf74c4b5663e038bd49ff4576192 Mon Sep 17 00:00:00 2001 +From b5665ef8b9266c662c3a137df1ef1721cdff346e Mon Sep 17 00:00:00 2001 From: Imuli Date: Wed, 19 Oct 2016 08:46:47 -0400 Subject: [PATCH 10/18] localectl: use /etc/X11/xkb for list-x11-* diff --git a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch index 080cd4670e6f..bc9efaed23ee 100644 --- a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch +++ b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -1,4 +1,4 @@ -From 0ffb786d0e12a61899af448b1e4dd32a53ea5a8e Mon Sep 17 00:00:00 2001 +From be6b5c37779302384079b22b7fd767daad878fa9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 11 Feb 2018 04:37:44 +0100 Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir @@ -8,10 +8,10 @@ Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build -index fc216d22da..078db3bb5d 100644 +index c09115e06a..62eba4186c 100644 --- a/meson.build +++ b/meson.build -@@ -3176,9 +3176,6 @@ install_data('LICENSE.GPL2', +@@ -3184,9 +3184,6 @@ install_data('LICENSE.GPL2', 'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION', install_dir : docdir) diff --git a/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch index 2961a2ebe56f..5d67ce0ca31e 100644 --- a/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch +++ b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch @@ -1,4 +1,4 @@ -From 3dbcdab1ba22c4eeca6d61718c09bcb9b5551764 Mon Sep 17 00:00:00 2001 +From 9262f52b0e30cf8c39d9f7684a8c0e8fd4887cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 26 Feb 2018 14:25:57 +0000 Subject: [PATCH 12/18] Install default configuration into $out/share/factory @@ -44,7 +44,7 @@ index 4df6dabf89..02d8d69095 100644 meson.add_install_script('sh', '-c', 'test -n "$DESTDIR" || @0@/systemd-hwdb update' diff --git a/meson.build b/meson.build -index 078db3bb5d..6e1a6483fc 100644 +index 62eba4186c..b0b2edbb5a 100644 --- a/meson.build +++ b/meson.build @@ -154,6 +154,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d') @@ -57,7 +57,7 @@ index 078db3bb5d..6e1a6483fc 100644 bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi') testsdir = join_paths(prefixdir, 'lib/systemd/tests') systemdstatedir = join_paths(localstatedir, 'lib/systemd') -@@ -2503,7 +2506,7 @@ if conf.get('ENABLE_BINFMT') == 1 +@@ -2511,7 +2514,7 @@ if conf.get('ENABLE_BINFMT') == 1 meson.add_install_script('sh', '-c', mkdir_p.format(binfmtdir)) meson.add_install_script('sh', '-c', @@ -66,7 +66,7 @@ index 078db3bb5d..6e1a6483fc 100644 endif if conf.get('ENABLE_REPART') == 1 -@@ -2604,7 +2607,7 @@ executable('systemd-sleep', +@@ -2612,7 +2615,7 @@ executable('systemd-sleep', install_dir : rootlibexecdir) install_data('src/sleep/sleep.conf', @@ -75,7 +75,7 @@ index 078db3bb5d..6e1a6483fc 100644 exe = executable('systemd-sysctl', 'src/sysctl/sysctl.c', -@@ -2916,7 +2919,7 @@ if conf.get('HAVE_KMOD') == 1 +@@ -2924,7 +2927,7 @@ if conf.get('HAVE_KMOD') == 1 meson.add_install_script('sh', '-c', mkdir_p.format(modulesloaddir)) meson.add_install_script('sh', '-c', @@ -84,7 +84,7 @@ index 078db3bb5d..6e1a6483fc 100644 endif exe = executable('systemd-nspawn', -@@ -3159,7 +3162,7 @@ install_subdir('factory/etc', +@@ -3167,7 +3170,7 @@ install_subdir('factory/etc', install_dir : factorydir) install_data('xorg/50-systemd-user.sh', diff --git a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch index 5aa397afe8e6..11d2dc26e38d 100644 --- a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch +++ b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch @@ -1,4 +1,4 @@ -From 0b0510aa72cf8026f34f300efa3f150f45971404 Mon Sep 17 00:00:00 2001 +From 05c2761f6a981c8576fc47a3dd8beb5a2af3ef09 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 2 Nov 2018 21:15:42 +0100 Subject: [PATCH 13/18] inherit systemd environment when calling generators. @@ -16,10 +16,10 @@ executables that are being called from managers. 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 25afdbea04..7afd5e5a37 100644 +index 4412e7a849..b799eeca95 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -3896,9 +3896,14 @@ static int manager_run_generators(Manager *m) { +@@ -3901,9 +3901,14 @@ static int manager_run_generators(Manager *m) { argv[4] = NULL; RUN_WITH_UMASK(0022) diff --git a/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch index 91c091baa9e7..06b00b82cb96 100644 --- a/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch +++ b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch @@ -1,4 +1,4 @@ -From 4bd20cf0450455e2f9831b09ba91811ba3d58961 Mon Sep 17 00:00:00 2001 +From c70029539d0aec5df0c1e4203359335a3841a1e5 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 9 May 2019 11:15:22 +0200 Subject: [PATCH 14/18] add rootprefix to lookup dir paths diff --git a/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index 2bc75e279282..6431b56ea3e3 100644 --- a/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -1,4 +1,4 @@ -From f23a1e00de028048a2a21d322493039cce7ee214 Mon Sep 17 00:00:00 2001 +From 98580b4aa34f3d2e7401f54d6561c5af27ea3437 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 20:45:55 +0300 Subject: [PATCH 15/18] systemd-shutdown: execute scripts in @@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c -index 15e6c1799e..412bdefe74 100644 +index 523040b57c..561d91c94c 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c -@@ -298,7 +298,7 @@ int main(int argc, char *argv[]) { +@@ -299,7 +299,7 @@ int main(int argc, char *argv[]) { _cleanup_free_ char *cgroup = NULL; char *arguments[3], *watchdog_device; int cmd, r, umount_log_level = LOG_INFO; diff --git a/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch index 97f63c02c380..c27d1a10d588 100644 --- a/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -1,4 +1,4 @@ -From 758b8211e6e76524d62a2e0ffcf37dcf55e3be87 Mon Sep 17 00:00:00 2001 +From 3821e20966ee20f74986041f33c4934ad20385b2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 20:46:58 +0300 Subject: [PATCH 16/18] systemd-sleep: execute scripts in diff --git a/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch index 2a0bb0103f54..9fae2d5767cd 100644 --- a/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch +++ b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch @@ -1,4 +1,4 @@ -From ce9fe2249c91fdfb224eaffce63e3dbdb4a5c25d Mon Sep 17 00:00:00 2001 +From b07defe819e0f66d08563690b3a5abea5da08620 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 7 Mar 2020 22:40:27 +0100 Subject: [PATCH 17/18] kmod-static-nodes.service: Update ConditionFileNotEmpty diff --git a/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch index 08b2fa056f8b..321817dad6ff 100644 --- a/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -1,4 +1,4 @@ -From 55b69fc1b5441e3aff8f1ab684ba8eed3718a32d Mon Sep 17 00:00:00 2001 +From 9c1ac48a7d95c09bef5a924bb5db6908596403b4 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 8 Mar 2020 01:05:54 +0100 Subject: [PATCH 18/18] path-util.h: add placeholder for DEFAULT_PATH_NORMAL diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 722b4db9a80a..8f8e44354702 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -31,7 +31,7 @@ let gnupg-minimal = gnupg.override { bzip2 = null; }; in stdenv.mkDerivation { - version = "245.5"; + version = "245.6"; pname = "systemd"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! @@ -39,8 +39,8 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "systemd"; repo = "systemd-stable"; - rev = "9a506b7e9291d997a920af9ac299e7b834368119"; - sha256 = "19qd92hjlsljr6x5mbw1l2vdzz5y9hy7y7g0dwgpfifb0lwkxqbr"; + rev = "aa0cb635f1f6a4d9b50ed2cca7782f3f751be933"; + sha256 = "191f0r1g946bsqxky00z78wygsxi9pld11y2q4374bshnpsff2ll"; }; patches = [ From bddef29a88c7844c5a0e8264e199853956d8adf8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 12:35:46 +0000 Subject: [PATCH 1639/3452] cpu-x: 4.0.0 -> 4.0.1 --- pkgs/applications/misc/cpu-x/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index fb81bbdd40c7..a92ca30c5d80 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cpu-x"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "00xngmlayblvkg3l0rcfpxmnkkdz49ydh4smlhpii23gqii0rds3"; + sha256 = "191zkkswlbbsw492yygc3idf7wh3bxs97drrqvqqw0mqvrzykxm3"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm makeWrapper ]; From 33a7767fa1951dfda001f0313ea12eb37b43eb8e Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 14 Jun 2020 14:39:46 +0200 Subject: [PATCH 1640/3452] fira-code: 5 -> 5.2 --- pkgs/data/fonts/fira-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 2fd5a4bb2241..4f0fb1e81c16 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "5"; + version = "5.2"; in fetchzip { name = "fira-code-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "0y2871fd4l304gd7x5xmqyxv5ch9zrqng83xl95rdhlj9zqqk4fz"; + sha256 = "16v62wj872ba4w7qxn4l6zjgqh7lrpwh1xax1bp1x9dpz08mnq06"; meta = with stdenv.lib; { homepage = "https://github.com/tonsky/FiraCode"; From 3d62c20133da3e29d67ece2180656787a73ea2fd Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 15 May 2020 13:27:45 +0200 Subject: [PATCH 1641/3452] plex: 1.19.2.2852 -> 1.19.4.2935 --- pkgs/servers/plex/raw.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index aa8bac28bbdc..c916a0949d93 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.19.3.2852-219a9974e"; + version = "1.19.4.2935-79e214ead"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0sp7lnzf3zrwdmcg54mpvml89q1cbaq6s1cl9gj2z31xfiz07a26"; + sha256 = "0wzbdr89janyrbilvxrxfvhy02c1j5dsrcyjxnj4ryab0qc4sv04"; }; outputs = [ "out" "basedb" ]; From ea09233a4672ec163041df671fe4bac43e8ed87e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 12:58:02 +0000 Subject: [PATCH 1642/3452] dapper: 0.4.1 -> 0.5.1 --- pkgs/development/tools/dapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/development/tools/dapper/default.nix index d5c7d309e98d..c2dadeb6a933 100644 --- a/pkgs/development/tools/dapper/default.nix +++ b/pkgs/development/tools/dapper/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { pname = "dapper"; - version = "0.4.1"; + version = "0.5.1"; goPackagePath = "github.com/rancher/dapper"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "rancher"; repo = "dapper"; rev = "v${version}"; - sha256 = "03rmkmlvhmfwcln5v1rqww1kirxm0d1p58h6pj8f5fnhk9spb162"; + sha256 = "0sf56ii4sn2wdq5kiyl02sgvq0lvynzgiq8v5wrkkabj5107fiqw"; }; patchPhase = '' substituteInPlace main.go --replace 0.0.0 ${version} From 0c30b9ef730770cf6ddd8b0c8c846affd8c30404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Jun 2020 15:10:07 +0200 Subject: [PATCH 1643/3452] python.pkgs.dot2tex: enable python3 and run tests --- .../python-modules/dot2tex/default.nix | 24 +++- .../python-modules/dot2tex/path.patch | 104 ++++++++++++++++++ .../python-modules/dot2tex/test.patch | 12 ++ pkgs/top-level/python-packages.nix | 4 +- 4 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/python-modules/dot2tex/path.patch create mode 100644 pkgs/development/python-modules/dot2tex/test.patch diff --git a/pkgs/development/python-modules/dot2tex/default.nix b/pkgs/development/python-modules/dot2tex/default.nix index f671cdc9642a..03445f79117f 100644 --- a/pkgs/development/python-modules/dot2tex/default.nix +++ b/pkgs/development/python-modules/dot2tex/default.nix @@ -1,8 +1,11 @@ { stdenv +, python , buildPythonPackage , fetchPypi -, isPy3k +, substituteAll , pyparsing +, graphviz +, texlive }: buildPythonPackage rec { @@ -14,11 +17,26 @@ buildPythonPackage rec { sha256 = "1kp77wiv7b5qib82i3y3sn9r49rym43aaqm5aw1bwnzfbbq2m6i9"; }; - # Tests fail with 3.x. Furthermore, package is no longer maintained. - disabled = isPy3k; + patches = [ + (substituteAll { + src = ./path.patch; + inherit graphviz; + }) + ./test.patch # https://github.com/kjellmf/dot2tex/issues/5 + ]; propagatedBuildInputs = [ pyparsing ]; + checkInputs = [ + (texlive.combine { + inherit (texlive) scheme-small preview pstricks; + }) + ]; + + checkPhase = '' + ${python.interpreter} tests/test_dot2tex.py + ''; + meta = with stdenv.lib; { description = "Convert graphs generated by Graphviz to LaTeX friendly formats"; homepage = "https://github.com/kjellmf/dot2tex"; diff --git a/pkgs/development/python-modules/dot2tex/path.patch b/pkgs/development/python-modules/dot2tex/path.patch new file mode 100644 index 000000000000..4e05b7a8dff3 --- /dev/null +++ b/pkgs/development/python-modules/dot2tex/path.patch @@ -0,0 +1,104 @@ +diff --git a/dot2tex/dotparsing.py b/dot2tex/dotparsing.py +index 391b5dc..6dc77a3 100644 +--- a/dot2tex/dotparsing.py ++++ b/dot2tex/dotparsing.py +@@ -180,18 +180,8 @@ def __find_executables(path): + def find_graphviz(): + """Locate Graphviz's executables in the system. + +- Tries three methods: +- +- First: Windows Registry (Windows only) +- This requires Mark Hammond's pywin32 is installed. +- +- Secondly: Search the path +- It will look for 'dot', 'twopi' and 'neato' in all the directories +- specified in the PATH environment variable. +- +- Thirdly: Default install location (Windows only) +- It will look for 'dot', 'twopi' and 'neato' in the default install +- location under the "Program Files" directory. ++ It will look for 'dot', 'twopi' and 'neato' in ++ @graphviz@/bin. + + It will return a dictionary containing the program names as keys + and their paths as values. +@@ -199,75 +189,9 @@ def find_graphviz(): + If this fails, it returns None. + """ + +- # Method 1 (Windows only) +- # +- if os.sys.platform == 'win32': +- try: +- import win32api, win32con +- +- # Get the GraphViz install path from the registry +- # +- hkey = win32api.RegOpenKeyEx(win32con.HKEY_LOCAL_MACHINE, +- "SOFTWARE\AT&T Research Labs\Graphviz", 0, win32con.KEY_QUERY_VALUE) +- +- path = win32api.RegQueryValueEx(hkey, "InstallPath")[0] +- win32api.RegCloseKey(hkey) +- +- # Now append the "bin" subdirectory: +- # +- path = os.path.join(path, "bin") +- progs = __find_executables(path) +- if progs is not None: +- # print("Used Windows registry") +- return progs +- +- except ImportError: +- # Print a messaged suggesting they install these? +- # +- log.debug('The win32api is not installed') +- pass +- except: +- log.debug('Failed to access the registry key') +- +- # Method 2 (Linux, Windows etc) +- # +- if 'PATH' in os.environ: +- for path in os.environ['PATH'].split(os.pathsep): +- progs = __find_executables(path) +- if progs is not None: +- return progs +- +- # Method 3 (Windows only) +- # +- if os.sys.platform == 'win32': +- # Try and work out the equivalent of "C:\Program Files" on this +- # machine (might be on drive D:, or in a different language) +- # +- if 'PROGRAMFILES' in os.environ: +- # Note, we could also use the win32api to get this +- # information, but win32api may not be installed. +- +- path = os.path.join(os.environ['PROGRAMFILES'], 'ATT', 'GraphViz', 'bin') +- +- else: +- # Just in case, try the default... +- path = r"C:\Program Files\att\Graphviz\bin" +- +- progs = __find_executables(path) +- +- if progs is not None: +- # print("Used default install location") +- return progs +- +- for path in ( +- '/usr/bin', '/usr/local/bin', +- '/opt/local/bin', +- '/opt/bin', '/sw/bin', '/usr/share', +- '/Applications/Graphviz.app/Contents/MacOS/'): +- progs = __find_executables(path) +- if progs is not None: +- # print("Used path") +- return progs ++ progs = __find_executables('@graphviz@/bin') ++ if progs is not None: ++ return progs + + # Failed to find GraphViz + # diff --git a/pkgs/development/python-modules/dot2tex/test.patch b/pkgs/development/python-modules/dot2tex/test.patch new file mode 100644 index 000000000000..9ead8ac5ee5c --- /dev/null +++ b/pkgs/development/python-modules/dot2tex/test.patch @@ -0,0 +1,12 @@ +diff --git a/tests/test_dot2tex.py b/tests/test_dot2tex.py +index 74b01ed..7be9aba 100644 +--- a/tests/test_dot2tex.py ++++ b/tests/test_dot2tex.py +@@ -147,6 +147,7 @@ class NeedsQuotesTests(unittest.TestCase): + + class MultipleStatements(unittest.TestCase): + # https://github.com/kjellmf/dot2tex/issues/5 ++ @unittest.skip('fails upstream') + def test_semicolon(self): + """Test for issue 5""" + testgraph1 = """ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00960b457252..f984ed6f89b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6773,7 +6773,9 @@ in { jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { }; - dot2tex = callPackage ../development/python-modules/dot2tex { }; + dot2tex = callPackage ../development/python-modules/dot2tex { + inherit (pkgs) graphviz; + }; poezio = callPackage ../applications/networking/instant-messengers/poezio { inherit (pkgs) pkgconfig; From 423552868506d4ff8d7eef9e7fba34e5c367a665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Jun 2020 15:10:39 +0200 Subject: [PATCH 1644/3452] dot2tex: use python3 --- 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 bd298ce24ea2..1d1ab18fbeda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10357,7 +10357,7 @@ in dolt = callPackage ../servers/sql/dolt { }; - dot2tex = pythonPackages.dot2tex; + dot2tex = with python3.pkgs; toPythonApplication dot2tex; doxygen = callPackage ../development/tools/documentation/doxygen { qt4 = null; From 89561e0be585172038501d076ace0b592d6feff3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 13:13:26 +0000 Subject: [PATCH 1645/3452] delve: 1.2.0 -> 1.4.1 --- pkgs/development/tools/delve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 33eda13b6044..b990fe10b05c 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "delve"; - version = "1.2.0"; + version = "1.4.1"; goPackagePath = "github.com/go-delve/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "1xz1xm0lb1arwm3w2ydq5y5xglq60fc0q46x9xndr3i9j0rm8bxh"; + sha256 = "007bc69r26w0sv6v9mbjdnmnkahpfk5998isx81ma7cinqdhi1cj"; }; meta = with stdenv.lib; { From 89c3e73dad0970b26183e415555fb0379ba33e7a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 14 Jun 2020 15:12:23 +0200 Subject: [PATCH 1646/3452] hardware/u2f: remove module udev gained native support to handle FIDO security tokens, so we don't need a module which only added the now obsolete udev rules. Fixes: https://github.com/NixOS/nixpkgs/issues/76482 --- nixos/doc/manual/release-notes/rl-2009.xml | 6 +++++ nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 6 +++++ nixos/modules/services/hardware/u2f.nix | 23 ------------------- .../libraries/libu2f-host/default.nix | 4 ---- 5 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 nixos/modules/services/hardware/u2f.nix diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 848e5e63a9c3..a702b2a0f241 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -543,6 +543,12 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; in the Grafana documentation. + + + The hardware.u2f module, which was installing udev rules + was removed, as udev gained native support to handle FIDO security tokens. + + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 321fec5fb517..8a517314429f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -362,7 +362,6 @@ ./services/hardware/throttled.nix ./services/hardware/trezord.nix ./services/hardware/triggerhappy.nix - ./services/hardware/u2f.nix ./services/hardware/udev.nix ./services/hardware/udisks2.nix ./services/hardware/upower.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index c91febdb710f..1dc7f8533176 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -55,6 +55,12 @@ with lib; prey-bash-client is deprecated upstream '') + (mkRemovedOptionModule ["hardware" "u2f" ] '' + The U2F modules module was removed, as all it did was adding the + udev rules from libu2f-host to the system. Udev gained native support + to handle FIDO security tokens, so this isn't necessary anymore. + '') + # Do NOT add any option renames here, see top of the file ]; } diff --git a/nixos/modules/services/hardware/u2f.nix b/nixos/modules/services/hardware/u2f.nix deleted file mode 100644 index bb4b2f05f890..000000000000 --- a/nixos/modules/services/hardware/u2f.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; -let - cfg = config.hardware.u2f; -in { - options = { - hardware.u2f = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable U2F hardware support. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - services.udev.packages = [ pkgs.libu2f-host ]; - }; -} - diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index 3becd075b255..f033aa9f610f 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -14,10 +14,6 @@ stdenv.mkDerivation rec { doCheck = true; - postInstall = '' - install -D -t $out/lib/udev/rules.d 70-u2f.rules - ''; - meta = with stdenv.lib; { homepage = "https://developers.yubico.com/libu2f-host"; description = "A C library and command-line tool that implements the host-side of the U2F protocol"; From d14559707ae96cf891f584c289ec26346459cb6e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 13:26:24 +0000 Subject: [PATCH 1647/3452] dnscontrol: 3.0.0 -> 3.2.0 --- pkgs/applications/networking/dnscontrol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index e8500872d52c..70e107c063fb 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "dnscontrol"; - version = "3.0.0"; + version = "3.2.0"; goPackagePath = "github.com/StackExchange/dnscontrol"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "1j8i4k7bqkqmi6dmc9fxfab49a7qigig72rlbga902lw336p6cc7"; + sha256 = "1lrn1whmx9zkyvs505zxrsmnr5s6kpj3kjkr6rblfwdlnadkgfj7"; }; subPackages = [ "." ]; From 063abf2af82be20509e31e5f008a47cc5e19561f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 13:31:33 +0000 Subject: [PATCH 1648/3452] doctl: 1.45.0 -> 1.45.1 --- pkgs/development/tools/doctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 5fe7ca69b036..e65fb4a64b73 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.45.0"; + version = "1.45.1"; vendorSha256 = null; @@ -30,7 +30,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "1wnrvswysms8p26d8hnxpimx12bhi3sa9k4kwd2dbxg74569gq6d"; + sha256 = "1zzdjpbag23kr6j3c7zkgqaavlna1q792qhs6s234vxm85zmwh4j"; }; meta = with lib; { From 0a56f10920502120adb9ff59d0fc59f26cb7ce84 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 14:05:54 +0000 Subject: [PATCH 1649/3452] easyrpg-player: 0.6.2 -> 0.6.2.1 --- pkgs/games/easyrpg-player/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/easyrpg-player/default.nix b/pkgs/games/easyrpg-player/default.nix index 1a540c6489c6..79628d0d2ae9 100644 --- a/pkgs/games/easyrpg-player/default.nix +++ b/pkgs/games/easyrpg-player/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "easyrpg-player"; - version = "0.6.2"; + version = "0.6.2.1"; src = fetchFromGitHub { owner = "EasyRPG"; repo = "Player"; rev = version; - sha256 = "1xjisqxmx1jc1afsr55hyr0l9v20gvchllby76pygkfkgifyidyp"; + sha256 = "19wpjvlkjmjhdv1dbph6i2da1xx479zhr532x0ili1aphw1j9hi6"; }; nativeBuildInputs = [ cmake doxygen pkgconfig ]; From f1a4b100fd198678a737759ce0cae994f4f75a58 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Sun, 7 Jun 2020 22:41:43 -0400 Subject: [PATCH 1650/3452] nixos/corerad: add settings option to supersede configFile Signed-off-by: Matt Layher --- nixos/modules/services/networking/corerad.nix | 43 +++++++++++++++++-- nixos/tests/corerad.nix | 35 +++++++++++---- 2 files changed, 67 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/networking/corerad.nix b/nixos/modules/services/networking/corerad.nix index 1a2c4aec6651..2d4d414aae10 100644 --- a/nixos/modules/services/networking/corerad.nix +++ b/nixos/modules/services/networking/corerad.nix @@ -4,14 +4,48 @@ with lib; let cfg = config.services.corerad; + + writeTOML = name: x: + pkgs.runCommandNoCCLocal name { } '' + echo '${builtins.toJSON x}' | ${pkgs.go-toml}/bin/jsontoml > $out + ''; + in { - meta = { - maintainers = with maintainers; [ mdlayher ]; - }; + meta.maintainers = with maintainers; [ mdlayher ]; options.services.corerad = { enable = mkEnableOption "CoreRAD IPv6 NDP RA daemon"; + settings = mkOption { + type = types.uniq types.attrs; + example = literalExample '' + { + interfaces = [ + # eth0 is an upstream interface monitoring for IPv6 router advertisements. + { + name = "eth0"; + monitor = true; + } + # eth1 is a downstream interface advertising IPv6 prefixes for SLAAC. + { + name = "eth1"; + advertise = true; + prefix = [{ prefix = "::/64"; }]; + } + ]; + # Optionally enable Prometheus metrics. + debug = { + address = "localhost:9430"; + prometheus = true; + }; + } + ''; + description = '' + Configuration for CoreRAD, see + for supported values. Ignored if configFile is set. + ''; + }; + configFile = mkOption { type = types.path; example = literalExample "\"\${pkgs.corerad}/etc/corerad/corerad.toml\""; @@ -27,6 +61,9 @@ in { }; config = mkIf cfg.enable { + # Prefer the config file over settings if both are set. + services.corerad.configFile = mkDefault (writeTOML "corerad.toml" cfg.settings); + systemd.services.corerad = { description = "CoreRAD IPv6 NDP RA daemon"; after = [ "network.target" ]; diff --git a/nixos/tests/corerad.nix b/nixos/tests/corerad.nix index 741fa448f680..72ab255b1916 100644 --- a/nixos/tests/corerad.nix +++ b/nixos/tests/corerad.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ( nodes = { router = {config, pkgs, ...}: { config = { - # This machines simulates a router with IPv6 forwarding and a static IPv6 address. + # This machine simulates a router with IPv6 forwarding and a static IPv6 address. boot.kernel.sysctl = { "net.ipv6.conf.all.forwarding" = true; }; @@ -14,13 +14,25 @@ import ./make-test-python.nix ( enable = true; # Serve router advertisements to the client machine with prefix information matching # any IPv6 /64 prefixes configured on this interface. - configFile = pkgs.writeText "corerad.toml" '' - [[interfaces]] - name = "eth1" - advertise = true - [[interfaces.prefix]] - prefix = "::/64" - ''; + # + # This configuration is identical to the example in the CoreRAD NixOS module. + settings = { + interfaces = [ + { + name = "eth0"; + monitor = true; + } + { + name = "eth1"; + advertise = true; + prefix = [{ prefix = "::/64"; }]; + } + ]; + debug = { + address = "localhost:9430"; + prometheus = true; + }; + }; }; }; }; @@ -66,5 +78,12 @@ import ./make-test-python.nix ( assert ( "/64 scope global temporary" in addrs ), "SLAAC temporary address was not configured on client after router advertisement" + + with subtest("Verify HTTP debug server is configured"): + out = router.succeed("curl localhost:9430/metrics") + + assert ( + "corerad_build_info" in out + ), "Build info metric was not found in Prometheus output" ''; }) From 814893b27410a9a1a78698b417dc6ea801933747 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 14:20:11 +0000 Subject: [PATCH 1651/3452] ergo: 3.2.5 -> 3.2.6 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index bae7326c2554..29990dae4049 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "0vaq6cqz03ps0fg3rvk298jnbf8mazvmyfcj7zsf1cgw41xdjjcf"; + sha256 = "1a38j7dy6ax9xvcjbdkiz0z33ln4rlmgrxznvqhdf11j70g1sr6x"; }; nativeBuildInputs = [ makeWrapper ]; From bfa7b0c3c0a0c7895e3b1040fd2e4534768b2a4f Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Wed, 20 May 2020 16:02:01 -0400 Subject: [PATCH 1652/3452] notepadqq: remoe unnecesary fetchSubmodules There are none to fetch, as verified by changing the hash and retrying. This will now use the faster fetchzip path through fetchFromGitHub. --- pkgs/applications/editors/notepadqq/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index a51f5106930e..cd4fe34ef33b 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "notepadqq"; version = "1.4.8"; + src = fetchFromGitHub { owner = "notepadqq"; repo = "notepadqq"; rev = "v${version}"; sha256 = "0lbv4s7ng31dkznzbkmp2cvkqglmfj6lv4mbg3r410fif2nrva7k"; - fetchSubmodules = true; }; nativeBuildInputs = [ From 4c5c996c2b2b083ceadb7d0c6170527f28469bc5 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 3 May 2020 20:06:35 -0400 Subject: [PATCH 1653/3452] rippled: fix build after boost 1.72 upgrade This was broken in #84182; pinning back to 1.71 fixes the build. --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3760114301e0..4fe90fc8091c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16253,8 +16253,9 @@ in libtool = darwin.cctools; }; + # Fails to compile with boost >= 1.72 rippled = callPackage ../servers/rippled { - boost = boost17x; + boost = boost171; }; rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { From b2bed0657a8f1734116b775b7d86e6f8b49a6744 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 6 Jun 2020 13:49:29 -0400 Subject: [PATCH 1654/3452] helmsman: 3.4.1 -> 3.4.3 --- pkgs/applications/networking/cluster/helmsman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index 097213568065..5fb0b3658851 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmsman"; - version = "3.4.1"; + version = "3.4.3"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "0h89lgp3n7nd7dy8nq4bfxg938imdjsvs1k6yg8j37vgdmi24sa6"; + sha256 = "0jbinnzdw32l7zh02k81gnw9rnqi8f5k5sp2qv8p9l9kgziaycvn"; }; vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl"; From 984991169436ce1fbad044451479b8eeab34dbdb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 14:47:50 +0000 Subject: [PATCH 1655/3452] findomain: 1.5.0 -> 1.7.0 --- pkgs/tools/networking/findomain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index e19442576988..69e09b60d02a 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "1.5.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "1w3parmk3836v5ghn3cgcxyk0alk05r5ljl3j1fpnly5xvl131rd"; + sha256 = "1q8yxl4y8f787a0q87gxgj1p9lgzhhfk3fgysq9xj8yfvwm8abji"; }; - cargoSha256 = "1cs076cgkzjan6y78a3bhriv2q2s83hp5vzhkjwz4dqn83r6b8hx"; + cargoSha256 = "02d538j13v3f1dc99vpzhby42ps7lig000idwdsxa1mwkjxrf2z2"; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; From fceb6f82df640db0b602b00bb78c99d019d19398 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 15:04:52 +0000 Subject: [PATCH 1656/3452] flow: 0.126.1 -> 0.127.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 8df10222a88e..aed991dab30a 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.126.1"; + version = "0.127.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1acmhyhbl4s2c907nj8jwgg9fjjrfr306vagwkcx2lza4clb2aan"; + sha256 = "0daacbb4il3mm8fkbk5qlpvzp3pmrqagq2hr1gsjaf8vnmissvvm"; }; installPhase = '' From 801e325a3882b15373b90f8dc6960cd189744cc7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 15:10:15 +0000 Subject: [PATCH 1657/3452] fly: 6.1.0 -> 6.3.0 --- .../tools/continuous-integration/fly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 3bf48084bbd8..bdad33dee742 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "6.1.0"; + version = "6.3.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "14sm3xwhm6pfln18i9f9dyj7s2wcri43rxj4s1cja7nwqr5sqb3x"; + sha256 = "006qkg661hzbc2gpcnpxm09bp1kbb98y0bgdr49bjlnapcmdgr1b"; }; - vendorSha256 = "1c099sn5rrvj805va1lyjlbv7i2g1z5bxyaisv5l9365z0lv1cwm"; + vendorSha256 = "03az7l9rf2syw837zliny82xhkqlad16z0vfcg5h21m3bhz6v6jy"; subPackages = [ "fly" ]; From 915b4831752f5766b7e9a21a3a15f45aa4df075e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 15:29:31 +0000 Subject: [PATCH 1658/3452] ft2-clone: 1.24 -> 1.25_fix --- pkgs/applications/audio/ft2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index c5661f3336f7..acf373fc41af 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.24"; + version = "1.25_fix"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "0wb7xsc2m9f4q5zsf5ai6h6c0558lkziv30b5a8ic64wp0layr6k"; + sha256 = "0q2mcp3xpgwilmiwzr9nnxlyg9c1kynh6cxzlyd95n520j00s6i7"; }; nativeBuildInputs = [ cmake ]; From 3b6d8c2bb59c376b35f4ced1b0eea6cce36f9eaf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 15:38:14 +0000 Subject: [PATCH 1659/3452] gauge: 1.0.4 -> 1.1.1 --- pkgs/development/tools/gauge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index c9df63cabb78..c9a462f1832e 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gauge"; - version = "1.0.4"; + version = "1.1.1"; goPackagePath = "github.com/getgauge/gauge"; excludedPackages = ''\(build\|man\)''; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - sha256 = "1b52kpv5561pyjvqi8xmidarqp6lcyyy4sjsl4qjx4cr7hmk8kc7"; + sha256 = "01x4838jljhhhcwfh6zbhy3g7l7nqvypv3g0ch9n2amsf2s16s3l"; }; meta = with stdenv.lib; { From 621ef1c238f2452f455cc2309d879e115e9357fc Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Sun, 14 Jun 2020 18:51:51 +0300 Subject: [PATCH 1660/3452] pythonPackages.flake8: fix dependencies --- pkgs/development/python-modules/flake8/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index b5ef6686a461..761690ba9c0a 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, pythonOlder , mock, pytest, pytestrunner -, configparser, enum34, mccabe, pycodestyle, pyflakes, entrypoints, functools32, typing +, configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing, importlib-metadata }: buildPythonPackage rec { @@ -13,10 +13,11 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock pytestrunner ]; - propagatedBuildInputs = [ entrypoints pyflakes pycodestyle mccabe ] + propagatedBuildInputs = [ pyflakes pycodestyle mccabe ] ++ stdenv.lib.optionals (pythonOlder "3.2") [ configparser functools32 ] ++ stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ] - ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; + ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ] + ++ stdenv.lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; checkPhase = '' py.test tests From 4d0824b56f7145c17ab9931da1fd70c42ebd3636 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 16:28:11 +0000 Subject: [PATCH 1661/3452] gotop: 3.5.3 -> 4.0.1 --- pkgs/tools/system/gotop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index bc6d24cf9175..0d8deb11b9e1 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotop"; - version = "3.5.3"; + version = "4.0.1"; src = fetchFromGitHub { owner = "xxxserxxx"; repo = pname; rev = "v${version}"; - sha256 = "0m1a5bdqjgsm9fy3d2c6r4nil013cizqyqf19k6r4p9bq8rajnzp"; + sha256 = "10qfzmq1wdgpvv319khzicalix1x4fqava0wry3bzz84k5c9dabs"; }; - vendorSha256 = "1pxp0a1hldkdmh174adhq8q0wyz005g7wm8yxknchvp7krxi9r0v"; + vendorSha256 = "1crphp41bfivfmfp3cl7pjca3ypds6mr3847msd4wvfq4g6imk55"; meta = with stdenv.lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; From f5112ccf45440c653b0e281fb16fb9ab8739241e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 16:34:20 +0000 Subject: [PATCH 1662/3452] govc: 0.22.1 -> 0.23.0 --- pkgs/tools/virtualization/govc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index e3329ea13f11..433da1b07f27 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "govc"; - version = "0.22.1"; + version = "0.23.0"; goPackagePath = "github.com/vmware/govmomi"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "1z4am6143jrrls0023flnqgadm1z9p60w09cp1j5pnslm60vvw78"; + sha256 = "05nb5xd90kbazdx4l9bw72729dh5hrcaqdi9wpf5ma7bz7mw9wzi"; }; meta = { From 468c6dd46f13a01b7411808895f052d388b8a060 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 17:17:28 +0000 Subject: [PATCH 1663/3452] hexyl: 0.7.0 -> 0.8.0 --- pkgs/tools/misc/hexyl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index e67b0116df16..d9bed8c607d0 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hexyl"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "0blq81zpmzldngk9ymcg56syspjp1g1ziap4z69idv05mfkf6sp3"; + sha256 = "0aj2sysl0spf5zlcd5kfzlw97w7dzf9x93pv0d1v9blnbd1rz7lm"; }; - cargoSha256 = "09kccd1brcbvzimm05dyybwrkganqxdkjrvzgcf1l93xs1z2h94b"; + cargoSha256 = "1am9vs7l2wzgwqakrsl27x1y7jpn9xaqa4kr48wwqzka401h6j4m"; meta = with stdenv.lib; { changelog = "https://github.com/sharkdp/hexyl/releases/tag/v${version}"; From 3717d074e775070fe66928bf23e0cfc43f0f657c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 17:22:53 +0000 Subject: [PATCH 1664/3452] 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 562beabff3e24062a7b62843644f2c90cddc691e Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Sun, 14 Jun 2020 13:30:17 -0400 Subject: [PATCH 1665/3452] nixos/corerad: use passAsFile while converting settings JSON to TOML Signed-off-by: Matt Layher --- nixos/modules/services/networking/corerad.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/corerad.nix b/nixos/modules/services/networking/corerad.nix index 2d4d414aae10..5d73c0a0d779 100644 --- a/nixos/modules/services/networking/corerad.nix +++ b/nixos/modules/services/networking/corerad.nix @@ -6,9 +6,11 @@ let cfg = config.services.corerad; writeTOML = name: x: - pkgs.runCommandNoCCLocal name { } '' - echo '${builtins.toJSON x}' | ${pkgs.go-toml}/bin/jsontoml > $out - ''; + pkgs.runCommandNoCCLocal name { + passAsFile = ["config"]; + config = builtins.toJSON x; + buildInputs = [ pkgs.go-toml ]; + } "jsontoml < $configPath > $out"; in { meta.maintainers = with maintainers; [ mdlayher ]; From 246e6cdd74e15fa380bbfe08891a93794d9ddf37 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 18:12:39 +0000 Subject: [PATCH 1666/3452] 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 7961573d7237a19f8178468b478e8e4c65099212 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 14 Jun 2020 19:22:01 +0200 Subject: [PATCH 1667/3452] scdoc: 1.10.1 -> 1.11.0 --- pkgs/tools/typesetting/scdoc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index 356433bac41c..5b6cf5e22f21 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "scdoc"; - version = "1.10.1"; + version = "1.11.0"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz"; - sha256 = "13x7g1r56bshvfmlvapvz35ywnbgsh337kywb5kcv8nc6b3j3q40"; + sha256 = "17cjh3lcfppyl2mzpanylla93gdgdv5spc8jldshvayzizhfghwa"; }; postPatch = '' @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { C99. ''; homepage = "https://git.sr.ht/~sircmpwn/scdoc"; + changelog = "https://git.sr.ht/~sircmpwn/scdoc/refs/${version}"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; From 625b7e5a32c342134f2a48f3af2d41f904b2e54a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 18:45:16 +0000 Subject: [PATCH 1668/3452] keybase: 5.4.2 -> 5.5.1 --- pkgs/tools/security/keybase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index bbc99c2ac410..ee1cfa9d2a41 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "keybase"; - version = "5.4.2"; + version = "5.5.1"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/kbnm" "go/keybase" ]; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "08lw5aw962f75xi42bwbgba94hiql2n2jnsxrkx84czi0ijs1wlr"; + sha256 = "03y69zmzbnfay173xkbzvnhh8zjjd2rfnqmpgr0wvh1psn7mgpsh"; }; patches = [ From 098aae8ee7edd9645c80e1b8f5f771f1ec1e5af7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 14 Jun 2020 14:56:06 -0400 Subject: [PATCH 1669/3452] linux/hardened/patches/4.14: 4.14.183.a -> 4.14.184.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 2e4ea7478065..b7ee2d48f475 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.183.a.patch", - "sha256": "0k9dg37q3hcm13iyw662indwy23aylc03ldqfn7613c7ymqmbzj7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.183.a/linux-hardened-4.14.183.a.patch" + "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" }, "4.19": { "name": "linux-hardened-4.19.127.a.patch", From 7049657cad245101fbbb03eb7c3175d8f85b86d3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 14 Jun 2020 14:56:13 -0400 Subject: [PATCH 1670/3452] linux/hardened/patches/4.19: 4.19.127.a -> 4.19.128.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 b7ee2d48f475..2b5f598f0f06 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.184.a/linux-hardened-4.14.184.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.127.a.patch", - "sha256": "00nfcs5yn2a70an3ygzzv4s3qa3hf7pni4ad70aw87vyvrqlyx3k", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.127.a/linux-hardened-4.19.127.a.patch" + "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" }, "5.4": { "name": "linux-hardened-5.4.45.a.patch", From 9132965db90ab52294f581ebfeb770c2ee573b5e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 14 Jun 2020 14:56:17 -0400 Subject: [PATCH 1671/3452] linux/hardened/patches/5.4: 5.4.45.a -> 5.4.46.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 2b5f598f0f06..c3a7ecc048f8 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.128.a/linux-hardened-4.19.128.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.45.a.patch", - "sha256": "0gihrcxqg3hax20xhvna4lmgsivari6wwsyqz09w34v8p1fhd5nx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.45.a/linux-hardened-5.4.45.a.patch" + "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" }, "5.6": { "name": "linux-hardened-5.6.17.a.patch", From 4392b4401c27ee6aa8c3dc1f2e3ce50f4e960108 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 14 Jun 2020 14:56:19 -0400 Subject: [PATCH 1672/3452] linux/hardened/patches/5.6: 5.6.17.a -> 5.6.18.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 c3a7ecc048f8..654615ebe500 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.46.a/linux-hardened-5.4.46.a.patch" }, "5.6": { - "name": "linux-hardened-5.6.17.a.patch", - "sha256": "0nci30k7xh56b6454cd0hkpvpkfqb98cqdpvjaamlnmiphz4sk1f", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.17.a/linux-hardened-5.6.17.a.patch" + "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" } } From 893bdd3bdf2f90f4fb501add264a124b9f2321f8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 14 Jun 2020 15:16:33 -0400 Subject: [PATCH 1673/3452] bluejeans-gui: 2.1.0 -> 2.3.0 --- .../networking/instant-messengers/bluejeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 14fbd4db1a00..60b73d3d9ed2 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.1.0"; + version = "2.3.0"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans.rpm"; - sha256 = "1zhh0pla5gk75p8x84va9flvnk456pbcm1n6x8l82c9682fwr7dd"; + sha256 = "06lcpkga8h0zpl2wlysj6n979f0yg361frp3zr0vwzln3fiil2a7"; }; nativeBuildInputs = [ rpmextract makeWrapper ]; From d7764f71f1107650c0dad6bd929e5e76d5e71b96 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 14 Jun 2020 15:17:41 -0400 Subject: [PATCH 1674/3452] bluejeans-gui: fix desktop entry --- .../networking/instant-messengers/bluejeans/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 60b73d3d9ed2..bd71166be222 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -110,6 +110,9 @@ stdenv.mkDerivation rec { --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/opt/BlueJeans \ --set LD_PRELOAD "$out"/opt/BlueJeans/liblocaltime64_stub.so + substituteInPlace "$out"/share/applications/bluejeans-v2.desktop \ + --replace "/opt/BlueJeans/bluejeans-v2" "$out/bin/bluejeans" + patchShebangs "$out" ''; From 265b1509c633371bdf3074f1410d3c4a59cc58c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 19:22:13 +0000 Subject: [PATCH 1675/3452] lazydocker: 0.8 -> 0.9 --- pkgs/tools/misc/lazydocker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index b63892178d91..d0c4d71c58a6 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "lazydocker"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazydocker"; rev = "v${version}"; - sha256 = "02x03nmkbj0133bziaqmqlh3x515w3n01iqvg7q6b55r7nan7hv7"; + sha256 = "08j2qp632fdmswnb92wxa9lhnal4mrmq6gmxaxngnxiqgkfx37zy"; }; goPackagePath = "github.com/jesseduffield/lazydocker"; From 8528ae8ce477a2edb70dda9bea8bebd3a0657f7d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 19:26:31 +0000 Subject: [PATCH 1676/3452] lazygit: 0.20.3 -> 0.20.4 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index d08c9057c0fe..c3ae1eb30e87 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.20.3"; + version = "0.20.4"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "1p05lfm74g28ci5575vr22q5db50h19fcvc3lzddp0vyiw570isl"; + sha256 = "134f04ybzgghm7ghyxair111aflmkjrbfj0bkxfp1w0a3jm6sfsk"; }; meta = with stdenv.lib; { From e63bfcef9698db1f343b357e19358f20cd88a6fb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 19:32:20 +0000 Subject: [PATCH 1677/3452] lean: 3.15.0 -> 3.16.2 --- pkgs/applications/science/logic/lean/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 451aab6c049a..7fcc4cdd062e 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.15.0"; + version = "3.16.2"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0fl8v8n53fr5qdnabici1mj3zpmjrkssx970y3q4m48s68q665v6"; + sha256 = "0fvm7gvbr5kn258sqpnxa7dvzz84iv1dx1n066vih5gz80plz4lh"; }; nativeBuildInputs = [ cmake ]; From 610ac2c81f7b592c3dcc3a17476836890a6ac60c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 8 Jun 2020 08:01:44 +0200 Subject: [PATCH 1678/3452] =?UTF-8?q?ocamlPackages.ocsigen-start:=202.16.1?= =?UTF-8?q?=20=E2=86=92=202.18.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ocsigen-start/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index cc6650df1578..637c06e98dcf 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ocsigen-start-${version}"; - version = "2.16.1"; + version = "2.18.0"; buildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "ocsigen"; repo = "ocsigen-start"; rev = version; - sha256 = "1pzpyrd3vbhc7zvzh6bv44793ikx5bglpd5p4wk5jj65v1w39jwd"; + sha256 = "0wvh4c26g6qd6i1fryilcqz9giz7v6pnhc90sknhxh6jmwrbjl50"; }; meta = { From 07e09428a651b6e6db97c2813b06a80bdd5232bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 19:42:50 +0000 Subject: [PATCH 1679/3452] 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 e08c199856cbc93eb3a03af63dda8ddf9d50d133 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 20:47:35 +0000 Subject: [PATCH 1680/3452] librealsense: 2.34.0 -> 2.35.2 --- pkgs/development/libraries/librealsense/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 8fd90c60bdad..21f80f80efa0 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.34.0"; + version = "2.35.2"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "0bi7pszrryz18aqna0z73mb1hzz2vqdb0m00pf93hnwc2hba7hwm"; + sha256 = "14vf76vlyhh7b4yjzsnqpg1x3wdhwxrf1syvgf8wyxbjwb9plw82"; }; buildInputs = [ From 0b1eb52866ece933d461867b3cca72554403b9ba Mon Sep 17 00:00:00 2001 From: Even Brenden Date: Tue, 9 Jun 2020 11:22:02 +0200 Subject: [PATCH 1681/3452] sof-firmware: 1.4.2 -> 1.5.1 --- .../linux/firmware/sof-firmware/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index 73ab46b3c8a6..a9fc44e48cc8 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -1,28 +1,33 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: with stdenv.lib; stdenv.mkDerivation rec { pname = "sof-firmware"; - version = "1.4.2"; + version = "1.5.1"; - src = fetchurl { - url = "https://www.alsa-project.org/files/pub/misc/sof/${pname}-${version}.tar.bz2"; - sha256 = "1nkh020gjm45vxd6fvmz63hj16ilff2nl5avvsklajjs6xci1sf5"; + src = fetchFromGitHub { + owner = "thesofproject"; + repo = "sof-bin"; + rev = "ae61d2778b0a0f47461a52da0d1f191f651e0763"; + sha256 = "0j6bpwz49skvdvian46valjw4anwlrnkq703n0snkbngmq78prba"; }; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - rm lib/firmware/intel/{sof/LICENCE,sof-tplg/LICENCE} - mkdir $out - cp -r lib $out/lib + mkdir -p $out/lib/firmware/intel + + sed -i 's/ROOT=.*$/ROOT=$out/g' go.sh + sed -i 's/VERSION=.*$/VERSION=v${version}/g' go.sh + + ./go.sh ''; meta = with stdenv.lib; { description = "Sound Open Firmware"; homepage = "https://www.sofproject.org/"; license = with licenses; [ bsd3 isc ]; - maintainers = with maintainers; [ lblasc ]; + maintainers = with maintainers; [ lblasc evenbrenden ]; platforms = with platforms; linux; }; } From a0e49e39ea9de3ff5da7f0367ec74f6d78458c39 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 21:06:58 +0000 Subject: [PATCH 1682/3452] litecoin: 0.17.1 -> 0.18.1 --- pkgs/applications/blockchains/litecoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix index ec1658b595d3..22cfa3dbb91e 100644 --- a/pkgs/applications/blockchains/litecoin.nix +++ b/pkgs/applications/blockchains/litecoin.nix @@ -13,13 +13,13 @@ with stdenv.lib; mkDerivation rec { name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.17.1"; + version = "0.18.1"; src = fetchFromGitHub { owner = "litecoin-project"; repo = "litecoin"; rev = "v${version}"; - sha256 = "08a0ghs4aa9m3qv3ppydyshfibykdwxk07i1vcqvg0ycqisdpb7y"; + sha256 = "11753zhyx1kmrlljc6kbjwrcb06dfcrsqvmw3iaki9a132qk6l5c"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From c2f945b43a18252d0d107a150d190161afe51063 Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Sun, 17 May 2020 01:23:54 -0700 Subject: [PATCH 1683/3452] amarok: 2.9.0-20190824 -> amarok-unstable 2020-06-12 This commit bumps amarok to the most recent commit in master and adds liblastfm as a dependency to make use of the last.fm integration that has been re-enabled in upstream master (it was disabled for a while due to breakage on Qt5). I also updated the package name and version to match [the stipulations in the Nixpxgs manual](https://nixos.org/nixpkgs/manual/#sec-package-naming). --- pkgs/applications/audio/amarok/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 29d97d8bc8ab..063cfcaa9fae 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -3,21 +3,21 @@ , qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine , karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem , fftw, phonon, plasma-framework, threadweaver -, curl, ffmpeg_3, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras +, curl, ffmpeg_3, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras }: mkDerivation rec { - pname = "amarok"; - version = "2.9.0-20190824"; + pname = "amarok-unstable"; + version = "2020-06-12"; src = fetchgit { # master has the Qt5 version as of April 2018 but a formal release has not # yet been made so change this back to the proper upstream when such a # release is out - url = "git://anongit.kde.org/amarok.git"; + url = "https://invent.kde.org/multimedia/amarok.git"; # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - rev = "457fbda25a85a102bfda92aa7137e7ef5e4c8b00"; - sha256 = "1ig2mg8pqany6m2zplkrvldcv4ibxwsypnyv5igm7nz7ax82cd5j"; + rev = "fece39b0e81db310b6a6e08f93d83b0d498cd02b"; + sha256 = "12casnq6w5yp2jlvnr466pjpkn0vriry8jzfq2qkjl564y0vhy9x"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; @@ -26,7 +26,7 @@ mkDerivation rec { qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem phonon plasma-framework threadweaver - curl fftw ffmpeg_3 gdk-pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static + curl fftw ffmpeg_3 gdk-pixbuf libaio liblastfm libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static pcre snappy taglib taglib_extras ]; From 5d81f6da23d97fec7698fe5ad5d745adeac01160 Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Sun, 14 Jun 2020 21:53:13 +0000 Subject: [PATCH 1684/3452] out-of-tree: 1.3.0 -> 1.4.0 --- pkgs/development/tools/out-of-tree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix index d46696a32af9..ff5a3ec1b54f 100644 --- a/pkgs/development/tools/out-of-tree/default.nix +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "out-of-tree"; - version = "1.3.0"; + version = "1.4.0"; buildInputs = [ makeWrapper ]; src = fetchgit { rev = "refs/tags/v${version}"; url = "https://code.dumpstack.io/tools/${pname}.git"; - sha256 = "02xh23nbwyyf087jqkm97jbnwpja1myaz190q5r166mpwcdpz2dn"; + sha256 = "1rn824l3dzh3xjxsbzzj053qg1abhzjimc8l73r0n5qrl44k2qk2"; }; - vendorSha256 = "1dk0cipdgj2yyg1bc9l7nvy4y373pmqwy8xiyc0wg7pchb4h9p7s"; + vendorSha256 = "0kg5c4h7xnwfcfshrh5n76xv98wzr73kxzr8q65iphsjimbxcpy3"; postFixup = '' wrapProgram $out/bin/out-of-tree \ From 33aa224625a9d970d4cf4194cfa46709c0908620 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 22:01:40 +0000 Subject: [PATCH 1685/3452] minishift: 1.34.0 -> 1.34.2 --- pkgs/applications/networking/cluster/minishift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index 0c932396e9e2..cd11bcbb431c 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -4,7 +4,7 @@ }: let - version = "1.34.0"; + version = "1.34.2"; # Update these on version bumps according to Makefile centOsIsoVersion = "v1.15.0"; @@ -18,7 +18,7 @@ in buildGoPackage rec { owner = "minishift"; repo = "minishift"; rev = "v${version}"; - sha256 = "0nc1g4lmz5ww6rjyyanp9vq4sj6fvi9zf9qjc4lpsmapddhjkdy7"; + sha256 = "1xzjzmjs2ijg7zzw53v02lgrg1j82jd7ljcn6lprg01hhvfrwgg7"; }; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; From 731f722289f4beebbd2cf884156388ecfe28da1e Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Mon, 8 Jun 2020 18:08:57 +0100 Subject: [PATCH 1686/3452] julius: init at 1.4.1 --- pkgs/games/julius/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/games/julius/default.nix diff --git a/pkgs/games/julius/default.nix b/pkgs/games/julius/default.nix new file mode 100644 index 000000000000..d1dad86e1c54 --- /dev/null +++ b/pkgs/games/julius/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, libpng }: + +stdenv.mkDerivation rec { + pname = "julius"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "bvschaik"; + repo = "julius"; + rev = "v${version}"; + sha256 = "12hhnhdwgz7hd3hlndbnk15pxggm1375qs0764ija4nl1gbpb110"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL2 SDL2_mixer libpng ]; + + meta = with stdenv.lib; { + description = "An open source re-implementation of Caesar III"; + homepage = "https://github.com/bvschaik/julius"; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ Thra11 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26a5e269629a..c2f5db82bac4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10611,6 +10611,8 @@ in jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder; + julius = callPackage ../games/julius { }; + kafkacat = callPackage ../development/tools/kafkacat { }; kati = callPackage ../development/tools/build-managers/kati { }; From b5bb2015795e6bee3d87f81eb406caedd991e903 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Mon, 8 Jun 2020 19:50:52 +0100 Subject: [PATCH 1687/3452] augustus: init at 1.4.1a --- pkgs/games/augustus/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/games/augustus/default.nix diff --git a/pkgs/games/augustus/default.nix b/pkgs/games/augustus/default.nix new file mode 100644 index 000000000000..cabe419ef5bc --- /dev/null +++ b/pkgs/games/augustus/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, libpng }: + +stdenv.mkDerivation rec { + pname = "augustus"; + version = "1.4.1a"; + + src = fetchFromGitHub { + owner = "Keriew"; + repo = "augustus"; + rev = "v${version}"; + sha256 = "1xqv8j8jh3f13fjhyf7hk1anrn799cwwsvsd75kpl9n5yh5s1j5y"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL2 SDL2_mixer libpng ]; + + meta = with stdenv.lib; { + description = "An open source re-implementation of Caesar III. Fork of Julius incorporating gameplay changes"; + homepage = "https://github.com/Keriew/augustus"; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ Thra11 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2f5db82bac4..57d9cc5a5479 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10613,6 +10613,8 @@ in julius = callPackage ../games/julius { }; + augustus = callPackage ../games/augustus { }; + kafkacat = callPackage ../development/tools/kafkacat { }; kati = callPackage ../development/tools/build-managers/kati { }; From b254684245298df9ca9424b022f45e39a1fd4bcb Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 15 Jun 2020 08:39:21 +1000 Subject: [PATCH 1688/3452] ncdu: 1.15 -> 1.15.1 https://dev.yorhel.nl/ncdu/changes --- pkgs/tools/misc/ncdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 71b7f9c6cd47..2d56ab9c09bd 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ncdu"; - version = "1.15"; + version = "1.15.1"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "1ywpa8yg74a5xa46f0qig92xw5z5s1lmspwzcslr497brk2ksnaa"; + sha256 = "1c1zxalm5asyhn4p1hd51h7khw17515gbqmvdz63kc8xpx6xqbdh"; }; buildInputs = [ ncurses ]; From a8b635ee12d932452091e3f09d353f1ba8731c78 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 23:00:23 +0000 Subject: [PATCH 1689/3452] namecoin: nc0.19.1 -> nc0.20.0 --- pkgs/applications/blockchains/namecoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix index 02f2249862d0..d52d87b9571c 100644 --- a/pkgs/applications/blockchains/namecoin.nix +++ b/pkgs/applications/blockchains/namecoin.nix @@ -3,14 +3,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "nc0.19.1"; + version = "nc0.20.0"; name = "namecoin" + toString (optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = "namecoin"; repo = "namecoin-core"; rev = version; - sha256 = "13rdvngrl2w0gk7km3sd9fy8yxzgxlkcwn50ajsbrhgzl8kx4q7m"; + sha256 = "115nlsq5g169mj4qjmkhxx1bnx740871zqyng9zbm2y4i0xf71c4"; }; nativeBuildInputs = [ From 4af06a5177f1a7ee9fbb72268de036a38f73022f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 23:29:41 +0000 Subject: [PATCH 1690/3452] nomad: 0.11.1 -> 0.11.3 --- pkgs/applications/networking/cluster/nomad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index da668b9589af..990679a86688 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "nomad"; - version = "0.11.1"; + version = "0.11.3"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "1pcn1bk7sqhhsrm3izqljwyrwdz6bdlplrajvjzka39l3k6f9hgc"; + sha256 = "1p7g7x2gl77h1w7aip3xji3s530fj46gspargz4j3i6h4wkyvafb"; }; # ui: From a3a4d969a0a4e14694096c2dffebbf4d823417ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 21:18:33 +0000 Subject: [PATCH 1691/3452] luigi: 2.8.13 -> 3.0.0 --- pkgs/applications/networking/cluster/luigi/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index ced4c45d059d..c6e2b7d85598 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "luigi"; - version = "2.8.13"; + version = "3.0.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0x14549iwj7r1knc0hmic9ny9hp960yjjqi4mxl78jb69gd3bhmf"; + sha256 = "1km9fnq4pf0iqqcmz94idm0zb3l92zinz0bn6ip86xqhchafd4vf"; }; propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ]; @@ -18,12 +18,13 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = ["--prefix PYTHONPATH . :"]; meta = with lib; { - homepage = "https://github.com/spotify/luigi"; description = "Python package that helps you build complex pipelines of batch jobs"; longDescription = '' Luigi handles dependency resolution, workflow management, visualization, handling failures, command line integration, and much more. ''; + homepage = "https://github.com/spotify/luigi"; + changelog = "https://github.com/spotify/luigi/releases/tag/${version}"; license = [ licenses.asl20 ]; maintainers = [ maintainers.bhipple ]; }; From 8520ec69c602becde66de89c1e3725188049407a Mon Sep 17 00:00:00 2001 From: Greg Roodt Date: Mon, 15 Jun 2020 10:23:26 +1000 Subject: [PATCH 1692/3452] buildkite-cli: init at 1.1.0 (#89399) --- .../buildkite-cli/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/continuous-integration/buildkite-cli/default.nix diff --git a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix new file mode 100644 index 000000000000..06d69c152bad --- /dev/null +++ b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "buildkite-cli"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "buildkite"; + repo = "cli"; + rev = "v${version}"; + sha256 = "05hz59qzadkk4ji5icv5sxih31pnn0abnmiwcyfa2mr3l5jaqjnd"; + }; + + vendorSha256 = "0jxh3yhh0sdvaykhinxngpipk369hw8z1y3g2z4c1115m5rjp2bb"; + + subPackages = [ "cmd/bk" ]; + + buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + + meta = with lib; { + description = "A command line interface for Buildkite"; + homepage = "https://github.com/buildkite/cli"; + license = licenses.mit; + maintainers = with maintainers; [ groodt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bce69ba6630b..f97c3c30a8c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10141,6 +10141,8 @@ in buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)"; buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent { }; + buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { }; + libbpf = callPackage ../os-specific/linux/libbpf { }; bpftool = callPackage ../os-specific/linux/bpftool { }; From 57a49ce3a464c43df97bbf826559efc073aab24c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 00:57:30 +0000 Subject: [PATCH 1693/3452] picard-tools: 2.22.9 -> 2.23.0 --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index a1616774d5d7..85d92d3af843 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.22.9"; + version = "2.23.0"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0qm32a58b2asiw8rnw1r6vz3bi61vfdan6wyr9f78fj4d07q7n53"; + sha256 = "0yhgfz5jjw55ipgdb32wjdcb01xx2g9ikgvwinnfwswx50iscf5a"; }; nativeBuildInputs = [ makeWrapper ]; From 557f56d46568d309f31a735fa16075f3de457f2b Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Sun, 14 Jun 2020 14:01:44 -0700 Subject: [PATCH 1694/3452] liblastfm: 1.1.0 -> liblastfm-unstable 2019-08-23 --- .../libraries/liblastfm/default.nix | 31 +++++++++---------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 762e707528a6..830e125685e7 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -1,27 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, which, cmake +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, cmake , fftwSinglePrec, libsamplerate, qtbase , darwin }: -let version = "1.1.0"; in - stdenv.mkDerivation rec { - pname = "liblastfm"; - inherit version; + pname = "liblastfm-unstable"; + version = "2019-08-23"; - # Upstream does not package git tags as tarballs. Get tarball from github. - src = fetchurl { - url = "https://github.com/lastfm/liblastfm/tarball/${version}"; - name = "${pname}-${version}.tar.gz"; - sha256 = "1j34xc30vg7sfszm2jx9mlz9hy7p1l929fka9wnfcpbib8gfi43x"; + src = fetchFromGitHub { + owner = "lastfm"; + repo = "liblastfm"; + rev = "2ce2bfe1879227af8ffafddb82b218faff813db9"; + sha256 = "1crih9xxf3rb109aqw12bjqv47z28lvlk2dpvyym5shf82nz6yd0"; }; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'find_package(Qt5Core QUIET)' \ - 'find_package(Qt5 REQUIRED COMPONENTS Core Network Sql Test Xml)' - ''; + patches = [(fetchpatch { + url = "https://github.com/lastfm/liblastfm/commit/9c5d072b55f2863310e40291677e6397e9cbc3c2.patch"; + name = "0001-Remove-deprecated-staging-server-and-fix-test-for-QT5-at-Ubuntu-19.10.patch"; + sha256 = "04r14prydxshjgfws3pjajjmp2msszhjjs1mjh8s66yg29vq620l"; + })]; - prefixKey = "--prefix "; nativeBuildInputs = [ pkgconfig which cmake ]; buildInputs = [ fftwSinglePrec libsamplerate qtbase ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; @@ -31,7 +28,7 @@ stdenv.mkDerivation rec { repositories.git = "git://github.com/lastfm/liblastfm.git"; description = "Official LastFM library"; platforms = platforms.unix; - maintainers = [ maintainers.phreedom ]; + maintainers = [ maintainers.phreedom ]; license = licenses.gpl3; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 03efd40d2714..2212c49c715f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -252,6 +252,7 @@ mapAliases ({ libjpeg_drop = libjpeg_original; # added 2020-06-05 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 + liblastfm = libsForQt5.liblastfm; # added 2020-06-14 liblrdf = lrdf; # added 2018-04-25 libqrencode = qrencode; # added 2019-01-01 librdf = lrdf; # added 2020-03-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c08a79a3a05d..a290429fcae5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13074,8 +13074,6 @@ in liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; - liblastfm = libsForQt5.callPackage ../development/libraries/liblastfm { }; - liblcf = callPackage ../development/libraries/liblcf { }; liblqr1 = callPackage ../development/libraries/liblqr-1 { }; @@ -14349,6 +14347,8 @@ in libktorrent = callPackage ../development/libraries/libktorrent { }; + liblastfm = callPackage ../development/libraries/liblastfm { }; + libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { }; libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; From 0bb9260fa8ee03bbf5cb36e08e7a7f9810157585 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 01:45:45 +0000 Subject: [PATCH 1695/3452] pt2-clone: 1.17 -> 1.19 --- pkgs/applications/audio/pt2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index b72406b064dd..8121c0caeec8 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.17"; + version = "1.19"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "0paagzc1c7gdnvs2wwsw2h15d0x8a7fl995qq3pi06g8kmdm85pi"; + sha256 = "0lr8gq4immc5cx1wr5ng6ccxs9afbd2dk6i0n5np25z14dvbvk3k"; }; nativeBuildInputs = [ cmake ]; From 3e2b8a19c0c9db8ca1a7d6093401a2e94e3e10b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 01:53:10 +0000 Subject: [PATCH 1696/3452] pueue: 0.5.1 -> 0.6.0 --- pkgs/applications/misc/pueue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index a51cd75e7990..db84f5fbb9bf 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "1n85b41kvx7x7qdizdnq1p0zrkap4gkwnnvhh4pz6j9njxj8d9ir"; + sha256 = "06jxj89ya91grrwxfs7l1ahy46y993kxsc8gpkxajc0j5ihax2al"; }; - cargoSha256 = "0hkkz74hllc5dzmgls6bgdxsdr871df2fn51sa3shv68ah0avxff"; + cargoSha256 = "191j3lpd24ycissw0y2hv65i1cjzf24draamq3sxv7hv0sxcjw4d"; nativeBuildInputs = [ installShellFiles ]; From b663749a25f2a645877d8ab59166eea6f8c6f3c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 01:59:09 +0000 Subject: [PATCH 1697/3452] qbec: 0.11.2 -> 0.12.0 --- pkgs/applications/networking/cluster/qbec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index a48016d5069c..0689fd096b3b 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "qbec"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "1lf9srkmi7r6p3him19akzag13hj8arwlkm9mdy8a8fg1ascqbm4"; + sha256 = "0vy1cqqyga68qjbvyhsgl281qkbsvhvmwbxc93hygsxzm9kczy4p"; }; - vendorSha256 = "1cyr621fb6hxwswz9lf75brc9qjy1n9rqjkwi6r8s3y6nhw20db6"; + vendorSha256 = "15hbjghi2ifylg7nr85qlk0alsy97h9zj6hf5w84m76dla2bcjf3"; meta = with lib; { description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; From ded0d3bd0e3920916e46fcddb017f570d053f0f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 02:42:48 +0000 Subject: [PATCH 1698/3452] rmlint: 2.10.0 -> 2.10.1 --- pkgs/tools/misc/rmlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 4dd440850120..2ea1668409a5 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "rmlint"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "sahib"; repo = "rmlint"; rev = "v${version}"; - sha256 = "1r7j1bmm83p6wdw0jhvkm4sa568r534zsy45bvas7qq4433jl019"; + sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x"; }; CFLAGS="-I${stdenv.lib.getDev utillinux}/include"; From 7439aad737c00915ecc09703ba65721d0513f563 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 15 Jun 2020 11:01:25 +0800 Subject: [PATCH 1699/3452] wxGTK3: make gtk2 and gtk3 specific variants --- .../libraries/wxwidgets/3.0/default.nix | 14 +++++++------ .../libraries/wxwidgets/3.1/default.nix | 12 ++++++----- pkgs/top-level/all-packages.nix | 21 +++++++++++++++++-- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 8de7f99fe5fd..da29eacdc0e9 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig -, gtk2, gtk3, libXinerama, libSM, libXxf86vm -, xorgproto, gstreamer, gst-plugins-base, GConf, setfile +, libXinerama, libSM, libXxf86vm +, gtk2, GConf ? null, gtk3 +, xorgproto, gstreamer, gst-plugins-base, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms -, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms +, withMesa ? libGLSupported , libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true @@ -28,9 +29,10 @@ stdenv.mkDerivation rec { sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1"; }; - buildInputs = - [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer - gst-plugins-base GConf ] + buildInputs = [ + libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base + ] ++ optionals withGtk2 [ gtk2 GConf ] + ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU ++ optional withWebKit webkitgtk ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index 99f86974cdb4..790968a88f76 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig -, gtk2, gtk3, libXinerama, libSM, libXxf86vm -, xorgproto, gstreamer, gst-plugins-base, GConf, setfile +, libXinerama, libSM, libXxf86vm +, gtk2, GConf ? null, gtk3 +, xorgproto, gstreamer, gst-plugins-base, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported, libGLU ? null, libGL ? null , compat28 ? false, compat30 ? true, unicode ? true @@ -27,9 +28,10 @@ stdenv.mkDerivation rec { sha256 = "0gfdhb7xq5vzasm7s1di39nchv42zsp0dmn4v6knzb7mgsb107wb"; }; - buildInputs = - [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer - gst-plugins-base GConf ] + buildInputs = [ + libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base + ] ++ optionals withGtk2 [ gtk2 GConf ] + ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU ++ optional withWebKit webkitgtk ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 934575e01ecf..7e98b1f9c18d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15139,6 +15139,9 @@ in wxGTK = wxGTK28; + wxGTK30 = wxGTK30-gtk2; + wxGTK31 = wxGTK31-gtk2; + wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { inherit (gnome2) GConf; }; @@ -15149,18 +15152,32 @@ in inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; }; - wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0 { + wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { + withGtk2 = true; inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; - wxGTK31 = callPackage ../development/libraries/wxwidgets/3.1 { + wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 { + withGtk2 = false; + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + }; + + wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { + withGtk2 = true; inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; + wxGTK31-gtk3 = callPackage ../development/libraries/wxwidgets/3.1 { + withGtk2 = false; + inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + }; + wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; inherit (darwin.stubs) setfile rez derez; From a84278aee5fa0cfb0da6707628539f9b1256f6c3 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 15 Jun 2020 11:01:53 +0800 Subject: [PATCH 1700/3452] filezilla: use wxGTK30-gtk3 instead of local override --- .../networking/ftp/filezilla/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 96a4227b36e1..04f0296fe82e 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -10,16 +10,10 @@ , pugixml , sqlite , tinyxml -, wxGTK30 +, wxGTK30-gtk3 , xdg_utils }: -let - # we can drop this when wxgtk is built with gtk3 by default - # see: https://github.com/NixOS/nixpkgs/pull/73145 - wxgtk' = wxGTK30.override { compat26 = false; withGtk2 = false; }; - -in stdenv.mkDerivation rec { pname = "filezilla"; version = "3.48.1"; @@ -52,8 +46,8 @@ stdenv.mkDerivation rec { pugixml sqlite tinyxml - wxgtk' - wxgtk'.gtk + wxGTK30-gtk3 + wxGTK30-gtk3.gtk xdg_utils ]; From 78f5a644fe7b1c8cdcdef6e357fc0c9f44cb36f5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 15 Jun 2020 11:02:19 +0800 Subject: [PATCH 1701/3452] spek: 0.8.3 -> unstable-2018-12-29 Build using the newly introduced wxGTK30-gtk3 in order to drop old gtk2 and ffmpeg dependencies. --- pkgs/applications/audio/spek/default.nix | 25 ++++++++++++------------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index 88b22c59ae50..d6918b192315 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -1,27 +1,28 @@ -{ stdenv, fetchzip, autoconf, automake, intltool, pkgconfig, ffmpeg, wxGTK }: +{ stdenv, fetchFromGitHub, autoreconfHook, intltool, pkgconfig, ffmpeg, wxGTK30-gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "spek"; - version = "0.8.3"; + version = "unstable-2018-12-29"; - src = fetchzip { - name = "${pname}-${version}-src"; - url = "https://github.com/alexkay/spek/archive/v${version}.tar.gz"; - sha256 = "0y4hlhswpqkqpsglrhg5xbfy1a6f9fvasgdf336vhwcjqsc3k2xv"; + src = fetchFromGitHub { + owner = "alexkay"; + repo = "spek"; + rev = "f071c2956176ad53c7c8059e5c00e694ded31ded"; + sha256 = "1l9gj9c1n92zlcjnyjyk211h83dk0idk644xnm5rs7q40p2zliy5"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake intltool ffmpeg wxGTK ]; + # needed for autoreconfHook + AUTOPOINT="intltoolize --automake --copy"; - preConfigure = '' - ./autogen.sh - ''; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; + + buildInputs = [ ffmpeg wxGTK30-gtk3 wxGTK30-gtk3.gtk ]; meta = with stdenv.lib; { description = "Analyse your audio files by showing their spectrogram"; homepage = "http://spek.cc/"; license = licenses.gpl3; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.all; - maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e98b1f9c18d..96e38d5280b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22194,9 +22194,7 @@ in soxr = callPackage ../applications/misc/audio/soxr { }; - spek = callPackage ../applications/audio/spek { - ffmpeg = ffmpeg_2; - }; + spek = callPackage ../applications/audio/spek { }; spotify = callPackage ../applications/audio/spotify { libgcrypt = libgcrypt_1_5; From c6f8333fa43427a1e62a8f87929f82ac1893debe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 03:29:51 +0000 Subject: [PATCH 1702/3452] skaffold: 1.10.1 -> 1.11.0 --- pkgs/development/tools/skaffold/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 2d87c490452b..e104784fbe8f 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.10.1"; + version = "1.11.0"; # rev is the ${version} commit, mainly for skaffold version command output rev = "931a70a6334436735bfc4ff7633232dd5fc73cc1"; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "1qi4b0304jjpv5npa5yfrrfg7yv5p838qqql3sgx4f47ysyyq0as"; + sha256 = "035xp34m8kzb75mivgf3kw026n2h6g2a7j2mi32nxl1a794w36zi"; }; nativeBuildInputs = [ installShellFiles ]; From 914b060f26fb0f92fbf496721e5245be97cd767a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 04:03:39 +0000 Subject: [PATCH 1703/3452] strawberry: 0.6.10 -> 0.6.12 --- pkgs/applications/audio/strawberry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index dce73c386707..4a195b4c3456 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.6.10"; + version = "0.6.12"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "0qf510hlxbndqzwq62mdzfclqxr3caf1a34kd770k84x8vrb4pld"; + sha256 = "0p09xp7andfg0gvarzc979pwglr0xjj1c0cziqj0c9z7p1v0fkws"; }; buildInputs = [ From 154cbdece1e00cf36b193e131f97a77e22633dcf Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 15 Jun 2020 11:34:25 +0800 Subject: [PATCH 1704/3452] limesuite: use wxGTK30-gtk3 --- pkgs/applications/radio/limesuite/default.nix | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index ef36eac28e42..7cadceab5611 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -1,14 +1,11 @@ { stdenv, fetchFromGitHub, cmake -, sqlite, wxGTK30, libusb1, soapysdr +, sqlite, wxGTK30-gtk3, libusb1, soapysdr , mesa_glu, libX11, gnuplot, fltk } : -let - version = "20.01.0"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "limesuite"; - inherit version; + version = "20.01.0"; src = fetchFromGitHub { owner = "myriadrf"; @@ -17,14 +14,16 @@ in stdenv.mkDerivation { sha256 = "01z4idcby2lm34bbnpbp400ski7p61jjiir6sy6dalnvsl52m7vx"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DOpenGL_GL_PREFERENCE=GLVND" + ]; + buildInputs = [ libusb1 sqlite - wxGTK30 + wxGTK30-gtk3 fltk gnuplot libusb1 @@ -34,11 +33,8 @@ in stdenv.mkDerivation { ]; postInstall = '' - mkdir -p $out/lib/udev/rules.d - cp ../udev-rules/64-limesuite.rules $out/lib/udev/rules.d - - mkdir -p $out/share/limesuite - cp bin/Release/lms7suite_mcu/* $out/share/limesuite + install -Dm444 -t $out/lib/udev/rules.d ../udev-rules/64-limesuite.rules + install -Dm444 -t $out/share/limesuite bin/Release/lms7suite_mcu/* ''; meta = with stdenv.lib; { From 227561d5f829779f6a2b1e0009983f10e83d68fe Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 15 Jun 2020 11:34:38 +0800 Subject: [PATCH 1705/3452] cubicsdr: use wxGTK31-gtk3 --- pkgs/applications/radio/cubicsdr/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index ef4d68af54c6..c85299606c03 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp, - pkgconfig, soapysdr-with-plugins, wxGTK, enableDigitalLab ? false }: + pkgconfig, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }: stdenv.mkDerivation rec { pname = "cubicsdr"; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK ]; + + buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK31-gtk3 ]; cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ stdenv.lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96e38d5280b9..1c4282153ab1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19128,7 +19128,7 @@ in ctop = callPackage ../tools/system/ctop { }; - cubicsdr = callPackage ../applications/radio/cubicsdr { wxGTK = wxGTK31; }; + cubicsdr = callPackage ../applications/radio/cubicsdr { }; cum = callPackage ../applications/misc/cum { }; From 6c579f0487c449ae676aaddc122f5df3708c1d03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 04:35:28 +0000 Subject: [PATCH 1706/3452] tfsec: 0.19.0 -> 0.21.0 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 49009570e57b..251162efd8f7 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.19.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "liamg"; repo = pname; rev = "v${version}"; - sha256 = "1ddyvkv0949p0b6m1rwai5r87mca5xwyjwsjq7gbyqz9h10bv7nf"; + sha256 = "0mmh161zwrkjwpw01zcgh7hsap7lgdxhg191bajzig6vlq287jyh"; }; goPackagePath = "github.com/liamg/tfsec"; From 29a8f5ce82ce9a7c635a74d1033978baba6659c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 05:04:46 +0000 Subject: [PATCH 1707/3452] topgrade: 4.5.0 -> 4.7.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 529252901a4a..21e464c6d29e 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.5.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "0df79vlbclv1qx4zwir728c6ggqfawxh2x1py16m5q0ga1hd799j"; + sha256 = "1hg03mj3rd778hq1856139nwz7y5gykwvg7xhxlsiabv7gr06m2m"; }; - cargoSha256 = "0wwxh71i94h68sryckbvrr43gd19qjcs0cgcpycnimkhdcdy8nlj"; + cargoSha256 = "14qv2157jhj7hilvqi3c00p11rzv0vvimr4d34nyspgzxz2si6sm"; buildInputs = lib.optional stdenv.isDarwin Foundation; From 5e36efff54285f388cd909d8a04a2d31d5fba090 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 05:19:12 +0000 Subject: [PATCH 1708/3452] trompeloeil: 37 -> 38 --- pkgs/development/libraries/trompeloeil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix index 782af4ab0331..625b16cc99a0 100644 --- a/pkgs/development/libraries/trompeloeil/default.nix +++ b/pkgs/development/libraries/trompeloeil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trompeloeil"; - version = "37"; + version = "38"; src = fetchFromGitHub { owner = "rollbear"; repo = "trompeloeil"; rev = "v${version}"; - sha256 = "04f9vpzh4fc15w4ynirzs9ipm9r31dbggb2zilmk0fj4qr79am42"; + sha256 = "068q4xx09vwjs7i89w47qzymdb4l6jqi27gx2jmd3yb6fp2k7nsb"; }; nativeBuildInputs = [ cmake ]; From ee44fed637ef9423677a035d4fa6433928d5c62d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 05:37:35 +0000 Subject: [PATCH 1709/3452] video2midi: 0.4.0.1 -> 0.4.0.2 --- pkgs/tools/audio/video2midi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix index dca8a0610da8..cf9297119e9f 100644 --- a/pkgs/tools/audio/video2midi/default.nix +++ b/pkgs/tools/audio/video2midi/default.nix @@ -8,7 +8,7 @@ let }); in pythonPackages.buildPythonApplication rec { pname = "video2midi"; - version = "0.4.0.1"; + version = "0.4.0.2"; format = "other"; @@ -16,7 +16,7 @@ in pythonPackages.buildPythonApplication rec { owner = "svsdval"; repo = pname; rev = version; - sha256 = "1869w60kprjdikqk4iwx058zri2jg4aznzlg668w9myka4mp01r9"; + sha256 = "174ijn8bc306529scd23szvgx1apanm2qmwk4lwmi64rhkm6dapx"; }; propagatedBuildInputs = with pythonPackages; [ opencv3_ midiutil pygame pyopengl ]; From fa43a4a13e676310da04261a726b8efd33bd18ab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 15 Jun 2020 08:25:38 +0200 Subject: [PATCH 1710/3452] Revert "python: botocore: 1.16.6 -> 1.16.23" Broke awscli. This reverts commit 0b81332a85912d95e84b3650665a634e14eb3a57. --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 060abad204b0..9bf977f831dd 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.16.23"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.16.6"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "5831068c9b49b4c91b0733e0ec784a7733d8732359d73c67a07a0b0868433cae"; + sha256 = "b9c8e0aa07770b7b371d586db41eef46e70bfc4ab47f7a1ee1acd4e9c811c6c9"; }; propagatedBuildInputs = [ From 33983aaa23ac98b0e7e9a745df98ceff7993dee0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 15 Jun 2020 08:28:38 +0200 Subject: [PATCH 1711/3452] Revert "Revert "python: botocore: 1.16.6 -> 1.16.23"" Fixed with python packages set update. This reverts commit fa43a4a13e676310da04261a726b8efd33bd18ab. --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 9bf977f831dd..060abad204b0 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.16.6"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.16.23"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "b9c8e0aa07770b7b371d586db41eef46e70bfc4ab47f7a1ee1acd4e9c811c6c9"; + sha256 = "5831068c9b49b4c91b0733e0ec784a7733d8732359d73c67a07a0b0868433cae"; }; propagatedBuildInputs = [ From 4a09efd5235b6dd60d16d04267cd6a526d8dc673 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 06:33:14 +0000 Subject: [PATCH 1712/3452] yeetgif: 1.23.5 -> 1.23.6 --- pkgs/applications/graphics/yeetgif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/yeetgif/default.nix b/pkgs/applications/graphics/yeetgif/default.nix index 157ef3753e08..3ae1b98661a6 100644 --- a/pkgs/applications/graphics/yeetgif/default.nix +++ b/pkgs/applications/graphics/yeetgif/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "yeetgif"; - version = "1.23.5"; + version = "1.23.6"; goPackagePath = "github.com/sgreben/yeetgif"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "sgreben"; repo = pname; rev = version; - sha256 = "1yz4pps8g378lvmi92cnci6msjj7fprp9bxqmnsyn6lqw7s2wb47"; + sha256 = "05z1ylsra60bb4cvr383g9im94zsph1dgicqbv5p73qgs634ckk7"; }; meta = with lib; { From d6a4ee1193b0923137ae24f82d973d3e6a932ba0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 11 Jun 2020 10:22:31 +0200 Subject: [PATCH 1713/3452] ocamlPackages.js_of_ocaml_2: remove at 2.7 & 2.8.4 --- .../tools/ocaml/js_of_ocaml/default.nix | 40 ------------------- pkgs/top-level/ocaml-packages.nix | 10 +---- 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/js_of_ocaml/default.nix diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix deleted file mode 100644 index 7f6426c9610d..000000000000 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild -, cmdliner, tyxml, reactivedata, cppo, which, base64, uchar, yojson -}: - -let version = if stdenv.lib.versionAtLeast ocaml.version "4.02" - then "2.8.4" else "2.7"; -in - -stdenv.mkDerivation { - pname = "js_of_ocaml"; - inherit version; - src = fetchurl { - url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz"; - sha256 = { - "2.7" = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj"; - "2.8.4" = "098ph50s9kqw6rc3qjn39zv9b5swdf4qr44afwqfkkjgjs5d7vbl"; - }.${version}; - }; - - buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild - cmdliner reactivedata cppo which base64 ] - ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast ocaml.version "4.02") [ yojson tyxml ]; - propagatedBuildInputs = [ lwt camlp4 ppx_deriving ] - ++ stdenv.lib.optional (version == "2.8.4") uchar; - - patches = [ ./Makefile.conf.diff ]; - - createFindlibDestdir = true; - - meta = with stdenv.lib; { - homepage = "http://ocsigen.org/js_of_ocaml/"; - description = "Compiler of OCaml bytecode to Javascript. It makes it possible to run Ocaml programs in a Web browser"; - license = licenses.lgpl2; - platforms = ocaml.meta.platforms or []; - maintainers = [ - maintainers.gal_bolle - ]; - broken = versionAtLeast ocaml.version "4.05"; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 602e131ad9e6..130bd3449827 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -401,15 +401,7 @@ let jingoo = callPackage ../development/ocaml-modules/jingoo { }; - js_of_ocaml = - if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/tools/ocaml/js_of_ocaml/3.0.nix { } - else js_of_ocaml_2; - - js_of_ocaml_2 = callPackage ../development/tools/ocaml/js_of_ocaml { - base64 = base64_2; - lwt = lwt2; - }; + js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml/3.0.nix { }; js_of_ocaml-camlp4 = callPackage ../development/tools/ocaml/js_of_ocaml/camlp4.nix {}; From a0d4f232d778f39549c2c243c3017019edea3d94 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 14 Jun 2020 21:54:51 +0200 Subject: [PATCH 1714/3452] =?UTF-8?q?ocamlPackages.js=5Fof=5Focaml:=20rena?= =?UTF-8?q?me=20file=20to=20=E2=80=9Cdefault.nix=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/ocaml/js_of_ocaml/{3.0.nix => default.nix} | 0 pkgs/top-level/ocaml-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/tools/ocaml/js_of_ocaml/{3.0.nix => default.nix} (100%) diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix similarity index 100% rename from pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix rename to pkgs/development/tools/ocaml/js_of_ocaml/default.nix diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 130bd3449827..4be489c76ebb 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -401,7 +401,7 @@ let jingoo = callPackage ../development/ocaml-modules/jingoo { }; - js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml/3.0.nix { }; + js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { }; js_of_ocaml-camlp4 = callPackage ../development/tools/ocaml/js_of_ocaml/camlp4.nix {}; From e047ab105909214dd88b0247b79dd79cf7f41c61 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 15 Jun 2020 08:55:09 +0200 Subject: [PATCH 1715/3452] mutt: 1.14.2 -> 1.14.3 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 c188e46d0076..30b3194d590b 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.2"; + version = "1.14.3"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0cdcls0x6f2w99hkjz48hxhnx86w3bnyxzibchdc9yspih770bz2"; + sha256 = "0wd4cv1c9hqymvml979g607nh3xxmlyx1ifc4r4qf39v6grnsmdi"; }; patches = optional smimeSupport (fetchpatch { From 407a3d4c5e5c2685040a402c96c3228b4403c296 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Fri, 17 Apr 2020 08:43:49 +0200 Subject: [PATCH 1716/3452] linux config: SND_HDA_CODEC_CA0132_DSP for <5.7 The default enable for SND_HDA_CODEC_CA0132_DSP was already merged into 5.7-rc1 [1], which means we can adjust the whenOlder to 5.7. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=652bb5d8df4b3a79ed350db35cda12637e63efa7 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1cec678d1534..03477a7f887c 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -255,7 +255,7 @@ let SND_HDA_RECONFIG = yes; # Support reconfiguration of jack functions # Support configuring jack functions via fw mechanism at boot SND_HDA_PATCH_LOADER = yes; - SND_HDA_CODEC_CA0132_DSP = whenOlder "5.8" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon + SND_HDA_CODEC_CA0132_DSP = whenOlder "5.7" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon SND_OSSEMUL = yes; SND_USB_CAIAQ_INPUT = yes; # Enable PSS mixer (Beethoven ADSP-16 and other compatible) From 6a4e1419a5b5f341d377ba3542cfc0f3fbbeed1e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 01:15:12 -0700 Subject: [PATCH 1717/3452] keycard-cli: 0.0.12 -> 0.4.0 (#90390) --- pkgs/tools/security/keycard-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keycard-cli/default.nix b/pkgs/tools/security/keycard-cli/default.nix index a76c102b2bb9..73eab6c3dec9 100644 --- a/pkgs/tools/security/keycard-cli/default.nix +++ b/pkgs/tools/security/keycard-cli/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "keycard-cli"; - version = "0.0.12"; + version = "0.4.0"; goPackagePath = "github.com/status-im/keycard-cli"; subPackages = [ "." ]; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "status-im"; repo = pname; rev = version; - sha256 = "1jnbaq57i6i9bad1hcvd28mxfqq6v8rv806c6l74vlb79ff4v1wb"; + sha256 = "0917vl5lw8wgvyn5l8q6xa8bqh342fibaa38syr8hmz8b09qkh38"; }; buildFlagsArray = [ From ed3f7ab3a43af49c1dba9a75b7c7e5dce987c8f6 Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Mon, 15 Jun 2020 10:00:19 +0200 Subject: [PATCH 1718/3452] nimmm: init at 0.1.2 nimmm is a terminal file manager written in nim. --- maintainers/maintainer-list.nix | 6 +++ pkgs/applications/misc/nimmm/default.nix | 57 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 65 insertions(+) create mode 100644 pkgs/applications/misc/nimmm/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b75cb49467a0..36d2dc2335ec 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3652,6 +3652,12 @@ githubId = 41977; name = "Joachim Fasting"; }; + joachimschmidt557 = { + email = "joachim.schmidt557@outlook.com"; + github = "joachimschmidt557"; + githubId = 28556218; + name = "Joachim Schmidt"; + }; joamaki = { email = "joamaki@gmail.com"; github = "joamaki"; diff --git a/pkgs/applications/misc/nimmm/default.nix b/pkgs/applications/misc/nimmm/default.nix new file mode 100644 index 000000000000..16400d76f64a --- /dev/null +++ b/pkgs/applications/misc/nimmm/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitHub, nim, termbox, pcre }: + +let + noise = fetchFromGitHub { + owner = "jangko"; + repo = "nim-noise"; + rev = "db1e86e312413e4348fa82c02340784316a89cc1"; + sha256 = "0n9l2dww5smrsl1xfqxjnxz3f1srb72lc1wl3pdvs6xfyf44qzlh"; + }; + + nimbox = fetchFromGitHub { + owner = "dom96"; + repo = "nimbox"; + rev = "6a56e76c01481176f16ae29b7d7c526bd83f229b"; + sha256 = "15x1sdfxa1xcqnr68705jfnlv83lm0xnp2z9iz3pgc4bz5vwn4x1"; + }; + + lscolors = fetchFromGitHub { + owner = "joachimschmidt557"; + repo = "nim-lscolors"; + rev = "v0.3.3"; + sha256 = "0526hqh46lcfsvymb67ldsc8xbfn24vicn3b8wrqnh6mag8wynf4"; + }; + +in stdenv.mkDerivation rec { + pname = "nimmm"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "joachimschmidt557"; + repo = "nimmm"; + rev = "v${version}"; + sha256 = "1zpq181iz6g7yfi298gjwv33b89l4fpnkjprimykah7py5cpw67w"; + }; + + nativeBuildInputs = [ nim ]; + buildInputs = [ termbox pcre ]; + + NIX_LDFLAGS = "-lpcre"; + + buildPhase = '' + export HOME=$TMPDIR; + nim -p:${noise} -p:${nimbox} -p:${lscolors}/src c -d:release src/nimmm.nim + ''; + + installPhase = '' + install -Dt $out/bin src/nimmm + ''; + + meta = with stdenv.lib; { + description = "Terminal file manager written in nim"; + homepage = "https://github.com/joachimschmidt557/nimmm"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.joachimschmidt557 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b75778322fe..c1a625565d68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5514,6 +5514,8 @@ in nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; + nimmm = callPackage ../applications/misc/nimmm { }; + nitrogen = callPackage ../tools/X11/nitrogen {}; nms = callPackage ../tools/misc/nms { }; From c8d1771277f8db40e1f2e81e11a25e7a72a35633 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 08:42:02 +0000 Subject: [PATCH 1719/3452] 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 61f834833b0ad688817c6f26201aa12a2b26872e Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Tue, 14 Apr 2020 14:34:46 +0200 Subject: [PATCH 1720/3452] nixos/acme: turn around test probes' dependencies Reads a bit more naturally, and now the changes to the acme-${cert}.service actually reflect what would be needed were you to do the same in production. e.g. "for dns-01, your service that needs the cert needs to pull in the cert" --- nixos/tests/acme.nix | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index fc41dc1eb5ff..f871d0ea5fcf 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -48,10 +48,9 @@ in import ./make-test-python.nix ({ lib, ... }: { security.acme.certs."standalone.test" = { webroot = "/var/lib/acme/acme-challenges"; }; - systemd.targets."acme-finished-standalone.test" = {}; - systemd.services."acme-standalone.test" = { - wants = [ "acme-finished-standalone.test.target" ]; - before = [ "acme-finished-standalone.test.target" ]; + systemd.targets."acme-finished-standalone.test" = { + after = [ "acme-standalone.test.service" ]; + wantedBy = [ "acme-standalone.test.service" ]; }; services.nginx.enable = true; services.nginx.virtualHosts."standalone.test" = { @@ -68,10 +67,11 @@ in import ./make-test-python.nix ({ lib, ... }: { # A target remains active. Use this to probe the fact that # a service fired eventhough it is not RemainAfterExit - systemd.targets."acme-finished-a.example.test" = {}; + systemd.targets."acme-finished-a.example.test" = { + after = [ "acme-a.example.test.service" ]; + wantedBy = [ "acme-a.example.test.service" ]; + }; systemd.services."acme-a.example.test" = { - wants = [ "acme-finished-a.example.test.target" ]; - before = [ "acme-finished-a.example.test.target" ]; after = [ "nginx.service" ]; }; @@ -89,10 +89,11 @@ in import ./make-test-python.nix ({ lib, ... }: { security.acme.server = "https://acme.test/dir"; specialisation.second-cert.configuration = {pkgs, ...}: { - systemd.targets."acme-finished-b.example.test" = {}; + systemd.targets."acme-finished-b.example.test" = { + after = [ "acme-b.example.test.service" ]; + wantedBy = [ "acme-b.example.test.service" ]; + }; systemd.services."acme-b.example.test" = { - wants = [ "acme-finished-b.example.test.target" ]; - before = [ "acme-finished-b.example.test.target" ]; after = [ "nginx.service" ]; }; services.nginx.virtualHosts."b.example.test" = { @@ -115,10 +116,12 @@ in import ./make-test-python.nix ({ lib, ... }: { user = config.services.nginx.user; group = config.services.nginx.group; }; - systemd.targets."acme-finished-example.test" = {}; + systemd.targets."acme-finished-example.test" = { + after = [ "acme-example.test.service" ]; + wantedBy = [ "acme-example.test.service" ]; + }; systemd.services."acme-example.test" = { - wants = [ "acme-finished-example.test.target" ]; - before = [ "acme-finished-example.test.target" "nginx.service" ]; + before = [ "nginx.service" ]; wantedBy = [ "nginx.service" ]; }; services.nginx.virtualHosts."c.example.test" = { From 60247e8560c22695cd21addd92ffe16d75fc7401 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Tue, 14 Apr 2020 15:00:50 +0200 Subject: [PATCH 1721/3452] nixos/acme: Add regression test for #81842 --- nixos/tests/acme-issue-81842.nix | 61 ++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 nixos/tests/acme-issue-81842.nix diff --git a/nixos/tests/acme-issue-81842.nix b/nixos/tests/acme-issue-81842.nix new file mode 100644 index 000000000000..be8436009382 --- /dev/null +++ b/nixos/tests/acme-issue-81842.nix @@ -0,0 +1,61 @@ +# When nginx depends on a service that is slow to start up, requesting +# certificates fail. Reproducer for +# https://github.com/NixOS/nixpkgs/issues/81842 +import ./make-test-python.nix { + name = "acme-issue-81842"; + nodes = { + letsencrypt = { nodes, lib, ... }: { + imports = [ ./common/letsencrypt ]; + # TODO: Move out to common ? + }; + webserver = { nodes, config, pkgs, lib, ... }: { + imports = [ ./common/letsencrypt/common.nix ]; + + # TODO move to common? + security.acme.server = "https://acme-v02.api.letsencrypt.org/dir"; + + systemd.services.my-slow-service = { + wantedBy = [ "multi-user.target" "nginx.service" ]; + before = [ "nginx.service" ]; + preStart = "sleep 5"; + script = "${pkgs.python3}/bin/python -m http.server"; + }; + + # Probe to measure that acme-a.example.com.service fired + systemd.targets."acme-finished-a.example.com" = { + after = [ "acme-a.example.com.service" ]; + wantedBy = [ "acme-a.example.com.service" ]; + }; + + # TODO: Move to pebble dns server. get rid of the resolver.nix hacks + networking.extraHosts = '' + ${config.networking.primaryIPAddress} a.example.com + ''; + + + networking.firewall.allowedTCPPorts = [ 80 443 ]; + + services.nginx = { + enable = true; + virtualHosts."a.example.com" = { + forceSSL = true; + enableACME = true; + locations."/".proxyPass = "http://localhost:8000"; + }; + }; + }; + client = { nodes, ... }: { imports = [ ./common/letsencrypt/common.nix ]; }; + }; + testScript = { nodes, ... }: + '' + letsencrypt.wait_for_unit("default.target") + letsencrypt.wait_for_unit("pebble.service") + client.wait_for_unit("default.target") + client.succeed("curl https://acme-v02.api.letsencrypt.org:15000/roots/0 > /tmp/ca.crt") + client.succeed( + "curl https://acme-v02.api.letsencrypt.org:15000/intermediate-keys/0 >> /tmp/ca.crt" + ) + webserver.wait_for_unit("acme-finished-a.example.com.target") + client.succeed("curl --cacert /tmp/ca.crt https://a.example.com/") + ''; +} From 681cc105ceaad05b23d483b3b40abc32364e3062 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Tue, 14 Apr 2020 14:55:05 +0200 Subject: [PATCH 1722/3452] nixos/acme: Make sure nginx is running before certs are requested This fixes https://github.com/NixOS/nixpkgs/issues/81842 We should probably also fix this for Apache, which recently also learned to use ACME. --- nixos/modules/services/web-servers/nginx/default.nix | 4 ++++ nixos/tests/acme.nix | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 8a015bb3556c..4c4b7f39e6bb 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -693,6 +693,10 @@ in wantedBy = [ "multi-user.target" ]; wants = concatLists (map (vhostConfig: ["acme-${vhostConfig.serverName}.service" "acme-selfsigned-${vhostConfig.serverName}.service"]) acmeEnabledVhosts); after = [ "network.target" ] ++ map (vhostConfig: "acme-selfsigned-${vhostConfig.serverName}.service") acmeEnabledVhosts; + # Nginx needs to be started in order to be able to request certificates + # (it's hosting the acme challenge after all) + # This fixes https://github.com/NixOS/nixpkgs/issues/81842 + before = map (vhostConfig: "acme-${vhostConfig.serverName}.service") acmeEnabledVhosts; stopIfChanged = false; preStart = '' ${cfg.preStart} diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index f871d0ea5fcf..826dd8f97d1f 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -71,9 +71,6 @@ in import ./make-test-python.nix ({ lib, ... }: { after = [ "acme-a.example.test.service" ]; wantedBy = [ "acme-a.example.test.service" ]; }; - systemd.services."acme-a.example.test" = { - after = [ "nginx.service" ]; - }; services.nginx.enable = true; @@ -93,9 +90,6 @@ in import ./make-test-python.nix ({ lib, ... }: { after = [ "acme-b.example.test.service" ]; wantedBy = [ "acme-b.example.test.service" ]; }; - systemd.services."acme-b.example.test" = { - after = [ "nginx.service" ]; - }; services.nginx.virtualHosts."b.example.test" = { enableACME = true; forceSSL = true; From cfd672a94d3a5a1505871658bbceb06344dfe80f Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Tue, 14 Apr 2020 15:05:02 +0200 Subject: [PATCH 1723/3452] nixos/acme: Also fix ordering for apache --- nixos/modules/services/web-servers/apache-httpd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 8abee7130d7c..e1d1217943bf 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -708,6 +708,7 @@ in wantedBy = [ "multi-user.target" ]; wants = concatLists (map (hostOpts: [ "acme-${hostOpts.hostName}.service" "acme-selfsigned-${hostOpts.hostName}.service" ]) vhostsACME); after = [ "network.target" "fs.target" ] ++ map (hostOpts: "acme-selfsigned-${hostOpts.hostName}.service") vhostsACME; + before = map (hostOpts: "acme-${hostOpts.hostName}.service") vhostsACME; path = [ pkg pkgs.coreutils pkgs.gnugrep ]; From 0952336d1d048617b9c976e90c4078ebe0c7ab46 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Tue, 14 Apr 2020 20:04:44 +0200 Subject: [PATCH 1724/3452] nixos/acme: Move regression test into acme.nix --- nixos/tests/acme-issue-81842.nix | 61 -------------------------------- nixos/tests/acme.nix | 31 ++++++++++++++++ 2 files changed, 31 insertions(+), 61 deletions(-) delete mode 100644 nixos/tests/acme-issue-81842.nix diff --git a/nixos/tests/acme-issue-81842.nix b/nixos/tests/acme-issue-81842.nix deleted file mode 100644 index be8436009382..000000000000 --- a/nixos/tests/acme-issue-81842.nix +++ /dev/null @@ -1,61 +0,0 @@ -# When nginx depends on a service that is slow to start up, requesting -# certificates fail. Reproducer for -# https://github.com/NixOS/nixpkgs/issues/81842 -import ./make-test-python.nix { - name = "acme-issue-81842"; - nodes = { - letsencrypt = { nodes, lib, ... }: { - imports = [ ./common/letsencrypt ]; - # TODO: Move out to common ? - }; - webserver = { nodes, config, pkgs, lib, ... }: { - imports = [ ./common/letsencrypt/common.nix ]; - - # TODO move to common? - security.acme.server = "https://acme-v02.api.letsencrypt.org/dir"; - - systemd.services.my-slow-service = { - wantedBy = [ "multi-user.target" "nginx.service" ]; - before = [ "nginx.service" ]; - preStart = "sleep 5"; - script = "${pkgs.python3}/bin/python -m http.server"; - }; - - # Probe to measure that acme-a.example.com.service fired - systemd.targets."acme-finished-a.example.com" = { - after = [ "acme-a.example.com.service" ]; - wantedBy = [ "acme-a.example.com.service" ]; - }; - - # TODO: Move to pebble dns server. get rid of the resolver.nix hacks - networking.extraHosts = '' - ${config.networking.primaryIPAddress} a.example.com - ''; - - - networking.firewall.allowedTCPPorts = [ 80 443 ]; - - services.nginx = { - enable = true; - virtualHosts."a.example.com" = { - forceSSL = true; - enableACME = true; - locations."/".proxyPass = "http://localhost:8000"; - }; - }; - }; - client = { nodes, ... }: { imports = [ ./common/letsencrypt/common.nix ]; }; - }; - testScript = { nodes, ... }: - '' - letsencrypt.wait_for_unit("default.target") - letsencrypt.wait_for_unit("pebble.service") - client.wait_for_unit("default.target") - client.succeed("curl https://acme-v02.api.letsencrypt.org:15000/roots/0 > /tmp/ca.crt") - client.succeed( - "curl https://acme-v02.api.letsencrypt.org:15000/intermediate-keys/0 >> /tmp/ca.crt" - ) - webserver.wait_for_unit("acme-finished-a.example.com.target") - client.succeed("curl --cacert /tmp/ca.crt https://a.example.com/") - ''; -} diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 826dd8f97d1f..a81884737213 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -99,6 +99,7 @@ in import ./make-test-python.nix ({ lib, ... }: { ''; }; }; + specialisation.dns-01.configuration = {pkgs, config, nodes, lib, ...}: { security.acme.certs."example.test" = { domain = "*.example.test"; @@ -129,6 +130,26 @@ in import ./make-test-python.nix ({ lib, ... }: { ''; }; }; + + # When nginx depends on a service that is slow to start up, requesting used to fail + # certificates fail. Reproducer for https://github.com/NixOS/nixpkgs/issues/81842 + specialisation.slow-startup.configuration = { pkgs, config, nodes, lib, ...}: { + systemd.services.my-slow-service = { + wantedBy = [ "multi-user.target" "nginx.service" ]; + before = [ "nginx.service" ]; + preStart = "sleep 5"; + script = "${pkgs.python3}/bin/python -m http.server"; + }; + systemd.targets."acme-finished-d.example.com" = { + after = [ "acme-d.example.com.service" ]; + wantedBy = [ "acme-d.example.com.service" ]; + }; + services.nginx.virtualHosts."d.example.com" = { + forceSSL = true; + enableACME = true; + locations."/".proxyPass = "http://localhost:8000"; + }; + }; }; client = {nodes, lib, ...}: { @@ -204,5 +225,15 @@ in import ./make-test-python.nix ({ lib, ... }: { client.succeed( "curl --cacert /tmp/ca.crt https://c.example.test/ | grep -qF 'hello world'" ) + + with subtest("Can request certificate of nginx when startup is delayed"): + webserver.succeed( + "${switchToNewServer}" + ) + webserver.succeed( + "/run/current-system/specialisation/slow-startup/bin/switch-to-configuration test" + ) + webserver.wait_for_unit("acme-finished-d.example.com.target") + client.succeed("curl --cacert /tmp/ca.crt https://d.example.com/") ''; }) From f49eb2cc3579458f707a784999dd0c8f189a083a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 15 Jun 2020 04:20:00 -0500 Subject: [PATCH 1725/3452] rage: install manpages and completions --- pkgs/tools/security/rage/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index cdba2f2beb01..26ae27dff6b2 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, Security }: +{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, Security }: rustPlatform.buildRustPackage rec { pname = "rage"; @@ -13,8 +13,20 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "08njl8irkqkfxj54pz4sx3l9aqb40h10wxb82zza52pqd4zapgn6"; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + postBuild = '' + cargo run --example generate-docs + cargo run --example generate-completions + ''; + + postInstall = '' + installManPage target/manpages/* + installShellCompletion target/completions/*.{bash,fish,zsh} + ''; + meta = with stdenv.lib; { description = "A simple, secure and modern encryption tool with small explicit keys, no config options, and UNIX-style composability"; homepage = "https://github.com/str4d/rage"; From 573d41ddbe1ac0b66272e922b4f10bf4ab87e2fd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 15 Jun 2020 04:20:00 -0500 Subject: [PATCH 1726/3452] gitAndTools.git-subtrac: 0.02 -> 0.03 --- .../git-and-tools/git-subtrac/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix index df29eb152353..be67beef299f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-subtrac"; - version = "0.02"; + version = "0.03"; src = fetchFromGitHub { owner = "apenwarr"; repo = pname; rev = "v${version}"; - sha256 = "1nj950r38sxzrgw69m1xphm7a4km2g29iw2897gfx4wx57jl957k"; + sha256 = "1ky04h18vg1yl9lykbhkmf25qslg0z2qzziy8c7afmvzvvvhm2v5"; }; vendorSha256 = "1ccwbhzwys8sl3m2rs2lp70snzsi2a0ahnnq8kn15rrlvsv5qahf"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; -} \ No newline at end of file +} From b288c361de1afcc79cc3032569742c259f62cc8c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 15 Jun 2020 04:20:00 -0500 Subject: [PATCH 1727/3452] gitAndTools.git-gone: 0.3.2 -> 0.3.6 --- .../version-management/git-and-tools/git-gone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index 32350fa538db..46decaf3cc12 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.3.2"; + version = "0.3.6"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "v${version}"; - sha256 = "0zc4cb1dg30np5yc4ymkr894qs2bk0r123i302md00niayk4njyd"; + sha256 = "0wpmabd5lshsga3dhv1hix7i99f1f82rpl6kjmpi315whg11kki3"; }; - cargoSha256 = "1d892889ml7sqyxzmjipq5fvizb4abqhmmn450qm7yam9fn5q5wf"; + cargoSha256 = "0ayqsrhy6hpi20gfryhnwl2c1na4nnmzxkp7him104cc07vsdllq"; nativeBuildInputs = [ pkgconfig makeWrapper installShellFiles ]; From bb70e10541ecb85d4f908db362e3d34846b6302a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 15 Jun 2020 04:20:00 -0500 Subject: [PATCH 1728/3452] 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 10bf0f2cd9155bdf98dd02019b84943d532e47d2 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 15 Jun 2020 09:43:07 +0000 Subject: [PATCH 1729/3452] deno: 1.0.5 -> 1.1.0 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 28e438fa1e95..199d7f81fe0f 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.0.5"; + version = "1.1.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "1hlmgcppr01bddvp28js010hhlzyx2lm7g7lq9nrcjazfw7kd2pf"; + sha256 = "11rxfnjam1kr8piiw0s4r0qg8rj4qfpppp6dixk1hhsq2iwbnzj6"; fetchSubmodules = true; }; - cargoSha256 = "1jqaryr7np6h65a1bqr952h0vllsvd6v6v6wvivc7933dcbhdal4"; + cargoSha256 = "107i9zvlwiwad58c7lmh6zl9iwlqn1h8qk7zf7x68b6498p8nh7d"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; From 5adbf9ad3962f3df137c8332fdfd21bca2387730 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 15 Jun 2020 10:45:43 +0100 Subject: [PATCH 1730/3452] deno: fix update script dependency nix-prefetch-url comes with nix and isn't a package on it's own --- pkgs/development/web/deno/update/update.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/deno/update/update.ts b/pkgs/development/web/deno/update/update.ts index ab13cee9dbe2..18d451480137 100755 --- a/pkgs/development/web/deno/update/update.ts +++ b/pkgs/development/web/deno/update/update.ts @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell /* -#!nix-shell -i "deno run --allow-net --allow-run --allow-read --allow-write" -p deno git nix-prefetch nix-prefetch-url +#!nix-shell -i "deno run --allow-net --allow-run --allow-read --allow-write" -p deno git nix-prefetch */ import { commit, From 8cd8da2c88aff714ba164fbc4e359c694a45edee Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Mon, 15 Jun 2020 12:09:27 +0200 Subject: [PATCH 1731/3452] 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 77bf0246b754af2f730bc99360eaac1b1d43a09b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 15 Jun 2020 12:15:47 +0200 Subject: [PATCH 1732/3452] wayvnc: Add the missing dependency on librt See #90452. For some reason the build was working initially but stated failing after some other changes. The problem is a missing dependency to link with librt for shm_open and shm_unlink [0]. Fix #90452. [0]: https://www.man7.org/linux/man-pages/man3/shm_open.3.html --- .../remote/wayvnc/add-missing-librt.patch | 20 +++++++++++++++++++ .../networking/remote/wayvnc/default.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/networking/remote/wayvnc/add-missing-librt.patch diff --git a/pkgs/applications/networking/remote/wayvnc/add-missing-librt.patch b/pkgs/applications/networking/remote/wayvnc/add-missing-librt.patch new file mode 100644 index 000000000000..e2d617bcc7ca --- /dev/null +++ b/pkgs/applications/networking/remote/wayvnc/add-missing-librt.patch @@ -0,0 +1,20 @@ +diff --git a/meson.build b/meson.build +index cc6fa03..7c2b280 100644 +--- a/meson.build ++++ b/meson.build +@@ -24,6 +24,7 @@ add_project_arguments(c_args, language: 'c') + cc = meson.get_compiler('c') + + libm = cc.find_library('m', required: false) ++librt = cc.find_library('rt', required: false) + + pixman = dependency('pixman-1') + libuv = dependency('libuv') +@@ -65,6 +66,7 @@ sources = [ + + dependencies = [ + libm, ++ librt, + pixman, + libuv, + egl, diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index 865710184f93..4ca6ae952580 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0aa12fkbwhzs0g2pqw1b27l33nn5dpbcvsf1z8h88kwsf9xdvb2r"; }; + patches = [ ./add-missing-librt.patch ]; + postPatch = '' substituteInPlace meson.build \ --replace "version: '0.1.0'" "version: '${version}'" From 4ece3459701c58c4e371e4fb30dbd402a9315777 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 15 Jun 2020 12:43:04 +0200 Subject: [PATCH 1733/3452] gtk-doc: dont recompile bytecode Would not build otherwise. The hooks needs to be fixed. https://github.com/NixOS/nixpkgs/pull/90208#issuecomment-644051108 --- pkgs/development/tools/documentation/gtk-doc/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 3c0b0cff548f..c93ee954ceab 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -68,6 +68,10 @@ python3.pkgs.buildPythonApplication rec { --replace "${python3}" "" ''; + # find: ‘...-gtk-doc-1.32/lib/python3.8/site-packages’: No such file or directory + # https://github.com/NixOS/nixpkgs/pull/90208#issuecomment-644051108 + dontUsePythonRecompileBytecode = true; + passthru = { # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch; From 886dacab6dcbbd9b7638149ae4a16f17d853305f Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Mon, 15 Jun 2020 13:56:54 +0200 Subject: [PATCH 1734/3452] blockbook: fix commit Co-authored-by: 1000101 --- pkgs/servers/blockbook/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 2988df802fbd..4afabb858c38 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { pname = "blockbook"; version = "0.3.4"; - commit = "b6961ca"; + commit = "eb4e10a"; src = fetchFromGitHub { owner = "trezor"; From dd25ff3b8add157af1b2eaa899d44545223782e7 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 9 Jun 2020 22:09:45 +0200 Subject: [PATCH 1735/3452] routinator: 0.7.0 -> 0.7.1 --- pkgs/servers/routinator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 46416c982760..1174d0802ae8 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "1qbaibmbiw3pffi0cm6d06k1gra4acgxr97gj7f1ckvql5rni4h0"; + sha256 = "12fgvalv12v8690pxmsdg179r170d4mc1kynsb25fm0zggy838jn"; }; - cargoSha256 = "138h99l3vv34higbqj59fa88w7c63c80g3rw07n9j2f834cvr901"; + cargoSha256 = "01118mnb5gm0xqi2c8jj3fk8y55jnnyg9zgn2g4xn7f3i8dcczka"; meta = with stdenv.lib; { description = "An RPKI Validator written in Rust"; From 0be2f125e52564c2a33062bf1b2db44c05db9064 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 15 Jun 2020 21:09:12 +0900 Subject: [PATCH 1736/3452] purescript: 0.13.6 -> 0.13.8 --- .../development/compilers/purescript/purescript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 6f61068738af..5143b83df45b 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.13.6"; + version = "0.13.8"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "04kwjjrriyizpvhs96jgyx21ppyd1ynblk24i5825ywxlw9hja25"; + sha256 = "058w8w24g7xbdkn5l97jfj9dcg81vkfh3w8112anj982lynk6391"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "012znrj32aq96qh1g2hscdvhl3flgihhimiz40agk0dykpksblns"; + sha256 = "01xb9sl6rmg02ypdrv4n0mkzmdr5y9rajcdmg9c3j46q7z6q9mxy"; }; From 0a2b461959c95076c3957f8e40c616efe1ef94e4 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 15 Jun 2020 21:10:29 +0900 Subject: [PATCH 1737/3452] purescript: add cdepillabout as maintainer --- pkgs/development/compilers/purescript/purescript/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 5143b83df45b..8a7fb96723a7 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { description = "A strongly-typed functional programming language that compiles to JavaScript"; homepage = "https://www.purescript.org/"; license = licenses.bsd3; - maintainers = [ maintainers.justinwoo maintainers.mbbx6spp ]; + maintainers = with maintainers; [ justinwoo mbbx6spp cdepillabout ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } From 5b99300261558d347bf5d7d3c1422b7a9baea99c Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 15 Jun 2020 16:29:57 +0300 Subject: [PATCH 1738/3452] python37Packages.pydantic: fix tests --- pkgs/development/python-modules/pydantic/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index ef33b6fb2bd5..371bfba2f0f9 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , ujson , email_validator , typing-extensions @@ -22,6 +23,14 @@ buildPythonPackage rec { sha256 = "0fwrx7p6d5vskg9ibganahiz9y9299idvdmzhjw62jy84gn1vrb4"; }; + # fix tests, remove on next version bump + patches = [ + (fetchpatch { + url = "https://github.com/samuelcolvin/pydantic/commit/a5b0e741e585040a0ab8b0be94dd9dc2dd3afcc7.patch"; + sha256 = "0v91ac3dw23rm73370s2ns84vi0xqbfzpvj84zb7xdiicx8fhmf1"; + }) + ]; + propagatedBuildInputs = [ ujson email_validator From 2791806a33498a388b98e0210770f16a1c51413a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 13:31:31 +0000 Subject: [PATCH 1739/3452] prometheus-consul-exporter: 0.3.0 -> 0.6.0 --- pkgs/servers/monitoring/prometheus/consul-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index 4267d8d34c11..ad6d366a2214 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "consul_exporter"; - version = "0.3.0"; + version = "0.6.0"; goPackagePath = "github.com/prometheus/consul_exporter"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "prometheus"; repo = "consul_exporter"; rev = "v${version}"; - sha256 = "1zffbxyfmqpbdqkx5rb5vjgd9j4p4zcrh6jvn1zhbdzrcs7khnd9"; + sha256 = "0s30blb4d8zw9f6x7dsnc1rxmxzsaih9w3xxxgr6c9xsm347mj86"; }; meta = with stdenv.lib; { From d6c90aea17d20061763a8079303fcaadccbd6090 Mon Sep 17 00:00:00 2001 From: "Narazaki, Shuji" Date: Mon, 15 Jun 2020 09:40:14 +0900 Subject: [PATCH 1740/3452] 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 b24cd9444e7082fbe00475e09acdeb868b17cedc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 14:20:40 +0000 Subject: [PATCH 1741/3452] cppcheck: 2.0 -> 2.1 --- pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index bdd275a218b8..8e2c28336cf7 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0gssnb50cndr77xva4nar4a82ii0vfqy96dlm27gb7pd6xmd6xsz"; + sha256 = "1xx5i6z9a36h7k4ipikrk2zidk7jcjv8ryqyq2m5hnwy0gpyw9mb"; }; buildInputs = [ pcre ] ++ stdenv.lib.optionals withZ3 [ z3 ]; From 6c8b614ed1a90ca0b704f24316ee66a018843f4c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 14:32:45 +0000 Subject: [PATCH 1742/3452] 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 a136ba726a90e6e64e6619376bc8b65130ab1559 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 14:45:15 +0000 Subject: [PATCH 1743/3452] cinnamon.cinnamon-translations: 4.4.2 -> 4.6.0 --- pkgs/desktops/cinnamon/cinnamon-translations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index b2a3acd07229..ce630999147d 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "4.4.2"; + version = "4.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1n1nkapcgxmbv0l8hrx5cf588pi4ifx12xbz46lq4p1ijrlfivba"; + sha256 = "04rlgcbz02n9kj1w12xa56b7f4x10y6g91hsl70zmag568mdclzz"; }; nativeBuildInputs = [ From 813bd1ae837a30a57b08ae69c9d6edade5eea9d9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 14:50:26 +0000 Subject: [PATCH 1744/3452] container-linux-config-transpiler: 0.7.0 -> 0.9.0 --- .../tools/container-linux-config-transpiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix index 005c5d55b79d..b5200e22cad8 100644 --- a/pkgs/development/tools/container-linux-config-transpiler/default.nix +++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "ct"; - version = "0.7.0"; + version = "0.9.0"; goPackagePath = "github.com/coreos/container-linux-config-transpiler"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "coreos"; repo = "container-linux-config-transpiler"; rev = "v${version}"; - sha256="058zjk9yqgdli55gc6y48455il6wjpslyz2r2ckk2ki9c5qc8b7c"; + sha256="1w6nvgrl5qp3ci9igflk9dlk3020psv5m4f3p57f3qcx9vrcl4lw"; }; buildFlagsArray = '' From 8a73cd873409400ef01530523bf8d11fae82334c Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 15 Jun 2020 18:03:13 +0300 Subject: [PATCH 1745/3452] qmapshack: 1.14.1 -> 1.15.0 (#90496) --- pkgs/applications/misc/qmapshack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix index edb5a9b37889..1a8758955cef 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/pkgs/applications/misc/qmapshack/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "qmapshack"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "Maproom"; repo = pname; rev = "V_${version}"; - sha256 = "0hghynb4ac98fg1pwc645zriqkghxwp8mr3jhr87pa6fh0y848py"; + sha256 = "157bssrbwcc1w58b0v60jb3wrjf2ig4z6z6crjnpvflkqj5p8vwy"; }; nativeBuildInputs = [ cmake ]; From 5953625fa5235f3b947cc4d884b138f0ca4c475b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 15 Jun 2020 11:10:00 -0400 Subject: [PATCH 1746/3452] linux: 5.7-rc6 -> 5.8-rc1 --- pkgs/os-specific/linux/kernel/common-config.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1cec678d1534..36fb39fd1308 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -206,8 +206,8 @@ let B43_PHY_HT = option yes; BCMA_HOST_PCI = option yes; RTW88 = whenAtLeast "5.2" module; - RTW88_8822BE = whenAtLeast "5.2" yes; - RTW88_8822CE = whenAtLeast "5.2" yes; + RTW88_8822BE = mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; + RTW88_8822CE = mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ]; }; fb = { diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index f2f0fac3b7dd..2a7a1fa93425 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,15 +3,15 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7-rc6"; - extraMeta.branch = "5.7"; + version = "5.8-rc1"; + extraMeta.branch = "5.1"; # modDirVersion needs to be x.y.z, will always add .0 modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0g04zwdxks7pa5q6shl5xl2rml1w95rxq7sqkkadj11mpk2k89w4"; + sha256 = "1gb7g2vrgg0zz281lv1ir1r0535spc40j65p0azmdxlk24fkfxfc"; }; # Should the testing kernels ever be built on Hydra? From 9b13828f79d95cf50dced03e90706796370738c1 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Mon, 15 Jun 2020 17:32:33 +0200 Subject: [PATCH 1747/3452] libgcc: fix Darwin cross compile late fallout from 1ac5398: the build variables were changed from infix to suffix notation --- pkgs/development/libraries/gcc/libgcc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index d638c2bb2788..f579da5f1d6c 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -63,7 +63,7 @@ stdenvNoLibs.mkDerivation rec { export CPP_FOR_TARGET=${stdenvNoLibs.cc}/bin/$CPP export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD - export NIX_BUILD_CFLAGS_COMPILE+=' -DGENERATOR_FILE=1' + export NIX_CFLAGS_COMPILE_FOR_BUILD+=' -DGENERATOR_FILE=1' "$sourceRoot/../gcc/configure" $gccConfigureFlags From e1aff9e44d6c7b808c7f4cd2b735708685c5e718 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 15 Jun 2020 17:46:39 +0200 Subject: [PATCH 1748/3452] perlPackages.CryptEksblowfish: fix darwin build --- 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 89bf25c15908..a6cba6ccdc77 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3614,7 +3614,7 @@ let sha256 = "3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c"; }; propagatedBuildInputs = [ ClassMix ]; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; }; CryptIDEA = buildPerlPackage { From 482a91e122cc76354a04af72b2c6657de3879216 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 16:02:21 +0000 Subject: [PATCH 1749/3452] cimg: 2.9.0 -> 2.9.1 --- pkgs/development/libraries/cimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 8a67ab09a195..312f927767dd 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "1x43c1w2kzr6h3j7y3kwiwb7nba0iymck6bq9psvp53mh9xxrfd1"; + sha256 = "0vl7dscbms4834gm1000sp17pr714pbqwicn40pbl85mxr3pnjp3"; }; installPhase = '' From 1ef76221a0659e3b555cffdcbae4e9784b2f605c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 15 Jun 2020 18:14:48 +0200 Subject: [PATCH 1750/3452] perlPackages.CryptMySQL: fix darwin build --- 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 89bf25c15908..36f417d3e644 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3734,7 +3734,7 @@ let sha256 = "93ebdfaaefcfe9ab683f0121c85f24475d8197f0bcec46018219e4111434dde3"; }; propagatedBuildInputs = [ DigestSHA1 ]; - perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; }; CryptRijndael = buildPerlPackage { From 09fd67354e52dfd6eefd4a87e2818dd0ca85e4df Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Mon, 15 Jun 2020 09:20:49 -0700 Subject: [PATCH 1751/3452] fish: install docs to $out/share/doc/fish Otherwise, it ended up going to $out/share/doc, which would pollute this shared directory, as well as clash with other similarly misbehaving packages. --- pkgs/shells/fish/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 11d9e48008fa..420aac7607e4 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -125,6 +125,10 @@ let pcre2 ]; + cmakeFlags = [ + "-DCMAKE_INSTALL_DOCDIR=${placeholder "out"}/share/doc/fish" + ]; + preConfigure = '' patchShebangs ./build_tools/git_version_gen.sh ''; From 3e0fca9635d5691b52204751722240bf02eac76d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 16:25:12 +0000 Subject: [PATCH 1752/3452] clipgrab: 3.8.11 -> 3.8.12 --- pkgs/applications/video/clipgrab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index fc752f1bd1fd..2eda7fe1dab3 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -5,10 +5,10 @@ mkDerivation rec { pname = "clipgrab"; - version = "3.8.11"; + version = "3.8.12"; src = fetchurl { - sha256 = "0jpfdmyzjasq4x1xvk7b1cmhhq6fz6ydvvbwz2wclph367x496xk"; + sha256 = "1nnph6sn4mpdj20hngwr57ripmdp60w3vrn89s8ssy7cjv500ngd"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; From d3e96b4c3a943766aa276d505b5217cf330ca1a3 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 15 Jun 2020 18:43:07 +0200 Subject: [PATCH 1753/3452] 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 1754/3452] 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 80f321e834d2b77159a76e4995c045b59df5952c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 15 Jun 2020 18:56:24 +0200 Subject: [PATCH 1755/3452] python2.pkgs.linecache2: don't recompile bytecode --- pkgs/development/python-modules/linecache2/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/linecache2/default.nix b/pkgs/development/python-modules/linecache2/default.nix index 9890d382742c..a2c7080e2701 100644 --- a/pkgs/development/python-modules/linecache2/default.nix +++ b/pkgs/development/python-modules/linecache2/default.nix @@ -2,9 +2,10 @@ , buildPythonPackage , fetchPypi , pbr +, isPy3k }: -buildPythonPackage rec { +buildPythonPackage (rec { pname = "linecache2"; version = "1.0.0"; @@ -22,5 +23,8 @@ buildPythonPackage rec { homepage = "https://github.com/testing-cabal/linecache2"; license = licenses.psfl; }; - -} +# TODO: move into main set, this was to avoid a rebuild +} // stdenv.lib.optionalAttrs (!isPy3k ) { + # syntax error in tests. Tests are likely Python 3 only. + dontUsePythonRecompileBytecode = !isPy3k; +}) From 7e5769c70c0eed7ac2ca916595abcd341e53cd9c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 15 Jun 2020 19:02:19 +0200 Subject: [PATCH 1756/3452] python2.pkgs.pexpect: don't recompile bytecode --- pkgs/development/python-modules/pexpect/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix index 651c48dbeb7b..aead62913c7b 100644 --- a/pkgs/development/python-modules/pexpect/default.nix +++ b/pkgs/development/python-modules/pexpect/default.nix @@ -2,9 +2,10 @@ , buildPythonPackage , fetchPypi , ptyprocess +, isPy3k }: -buildPythonPackage rec { +buildPythonPackage (rec { pname = "pexpect"; version = "4.8.0"; @@ -40,4 +41,8 @@ buildPythonPackage rec { any platform that supports the standard Python pty module. ''; }; -} +# TODO: move into main set, this was to avoid a rebuild +} // lib.optionalAttrs (!isPy3k ) { + # syntax error in _async module, likely intended only for Python 3. + dontUsePythonRecompileBytecode = !isPy3k; +}) From 6c9186d267c8ac6bebcb13fed0038a606bb6aa89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 15 Jun 2020 19:08:59 +0200 Subject: [PATCH 1757/3452] postfix: 3.5.2 -> 3.5.3 (#90493) --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 3b14fab68753..585a6196831b 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "1hxy9458apnzfg4n0alncsdgy5dwzn5dbn4xm46iv15xynbj9gz3"; + sha256 = "0xcd9pmv2p4znn6bqvka19h5h2lw90inyxrm5020acd0yaf0i0g3"; }; nativeBuildInputs = [ makeWrapper m4 ]; From b4ea1062bcafab6242d14cd8c3a0b7ad4afd4181 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 04:57:20 +0000 Subject: [PATCH 1758/3452] linuxPackages_hardened.chipsec: 1.4.9 -> 1.5.1 --- pkgs/tools/security/chipsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index 387fa4d750bd..5dccf295065c 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -2,13 +2,13 @@ , kernel ? null, withDriver ? false }: pythonPackages.buildPythonApplication rec { pname = "chipsec"; - version = "1.4.9"; + version = "1.5.1"; src = fetchFromGitHub { owner = "chipsec"; repo = "chipsec"; rev = version; - sha256 = "1p6w8294w5z2f4jwc22mqaggv5qajvmf9iifv7fl7wdz3wsvskrk"; + sha256 = "1rxr9i08a22m15slvlkrhnki30jixi2ds096kmmc2nqzfr9yibmb"; }; nativeBuildInputs = [ From 004c6c149aae67256853e7cd69a86626a04d02d1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 17:10:46 +0000 Subject: [PATCH 1759/3452] datovka: 4.15.0 -> 4.15.1 --- pkgs/applications/networking/datovka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index 976541177ddb..6dc996c79754 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -11,11 +11,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.15.0"; + version = "4.15.1"; src = fetchurl { url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz"; - sha256 = "1f311qnyiay34iqpik4x492py46my89j4nnbdf6qcidnydzas8r1"; + sha256 = "0ab1s1r6zrqxcfjnij5ar352kzyrl1m92c04nqk6hahpzzma2p3r"; }; buildInputs = [ libisds qmake qtbase qtsvg libxml2 ]; From fbfa6449f01cd4bb6e028ebf90d2e75abfd79842 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Mon, 15 Jun 2020 20:29:02 +0300 Subject: [PATCH 1760/3452] ArchiSteamFarm: 4.2.0.6 -> 4.2.2.1 (#90219) --- .../misc/ArchiSteamFarm/default.nix | 38 +++++++------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index c165003d8f8c..6201d881a882 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -1,27 +1,15 @@ -{ stdenv, fetchurl, unzip, makeWrapper, autoPatchelfHook -, zlib, lttng-ust, curl, icu, openssl }: +{ stdenv, fetchurl, unzip, makeWrapper, dotnetCorePackages, jq }: stdenv.mkDerivation rec { pname = "ArchiSteamFarm"; - version = "4.2.0.6"; + version = "4.2.2.1"; - src = { - x86_64-linux = fetchurl { - url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-linux-x64.zip"; - sha256 = "05hx6q1lkbjbqhwi9xxvm7ycnsnpl1cnqzyy2yn0q4x27im399cn"; - }; - armv7l-linux = fetchurl { - url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-linux-arm.zip"; - sha256 = "0l8irqrpl5vbjj84k4makj2ph2z6kpny7qz51zrzbgwhrlw0w4vg"; - }; - aarch64-linux = fetchurl { - url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-linux-arm64.zip"; - sha256 = "0hg2g4i8sj3fxqfy4imz1iarby1d9f8dh59j266lbbdf2vfz2cml"; - }; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + src = fetchurl { + url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-generic.zip"; + sha256 = "0pr9rrhi44yl99c2i12rimmc4mhbh0ma9jn17cgsh8p0kbj8sq94"; + }; - nativeBuildInputs = [ unzip makeWrapper autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc zlib lttng-ust curl ]; + nativeBuildInputs = [ unzip makeWrapper jq ]; sourceRoot = "."; @@ -29,23 +17,25 @@ stdenv.mkDerivation rec { dist=$out/opt/asf mkdir -p $dist cp -r * $dist - chmod +x $dist/ArchiSteamFarm - makeWrapper $dist/ArchiSteamFarm $out/bin/ArchiSteamFarm \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ icu openssl ] }" \ + + jq "del(.runtimeOptions.framework.version)" ArchiSteamFarm.runtimeconfig.json > $dist/ArchiSteamFarm.runtimeconfig.json + + makeWrapper ${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet $out/bin/ArchiSteamFarm \ + --add-flags $dist/ArchiSteamFarm.dll \ --add-flags "--path ~/.config/asf" \ --run "mkdir -p ~/.config/asf" \ --run "cd ~/.config/asf" \ --run "[ -d config ] || cp --no-preserve=mode -r $dist/config ." \ --run "[ -d logs ] || cp --no-preserve=mode -r $dist/logs ." \ --run "[ -d plugins ] || cp --no-preserve=mode -r $dist/plugins ." \ - --run "[ -d www ] || cp --no-preserve=mode -r $dist/www ." \ + --run "[ -d www ] || ln -sf $dist/www ." ''; meta = with stdenv.lib; { description = "Application with primary purpose of idling Steam cards from multiple accounts simultaneously"; homepage = "https://github.com/JustArchiNET/ArchiSteamFarm"; license = licenses.asl20; - platforms = [ "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; + platforms = dotnetCorePackages.aspnetcore_3_1.meta.platforms; maintainers = with maintainers; [ gnidorah ]; hydraPlatforms = []; }; From e8a39c8acf2ecd8ee7be39f8e171ee7b0505425e Mon Sep 17 00:00:00 2001 From: gnidorah Date: Mon, 15 Jun 2020 20:51:03 +0300 Subject: [PATCH 1761/3452] munt: 2.3.0 -> 2.4.0 (#89008) Co-authored-by: Dmitry Kalinkin --- pkgs/applications/audio/munt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix index c9a1e9bea808..bf9710fb17ee 100644 --- a/pkgs/applications/audio/munt/default.nix +++ b/pkgs/applications/audio/munt/default.nix @@ -9,14 +9,14 @@ let categories = "Audio;AudioVideo;"; }; in mkDerivation rec { - version = "2.3.0"; + version = "2.4.0"; pname = "munt"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = with stdenv.lib.versions; "${pname}_${major version}_${minor version}_${patch version}"; - sha256 = "0fjhshs4w942rlfksalalqshflbq83pyz1z0hcq53falh9v54cyw"; + rev = with stdenv.lib.versions; "libmt32emu_${major version}_${minor version}_${patch version}"; + sha256 = "0521i7js5imlsxj6n7181w5szfjikam0k4vq1d2ilkqgcwrkg6ln"; }; postInstall = '' @@ -31,7 +31,7 @@ in mkDerivation rec { meta = with stdenv.lib; { description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; homepage = "http://munt.sourceforge.net/"; - license = licenses.gpl2; + license = with licenses; [ lgpl21 gpl3 ]; platforms = platforms.linux; maintainers = with maintainers; [ gnidorah ]; }; From 92f39f763eaf93eb4da9e310bba8c1a4638215ae Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Mon, 15 Jun 2020 13:51:29 -0400 Subject: [PATCH 1762/3452] buildbot: 2.8.1 -> 2.8.2 (#90383) --- pkgs/development/python-modules/buildbot/default.nix | 4 ++-- pkgs/development/python-modules/buildbot/pkg.nix | 2 +- pkgs/development/python-modules/buildbot/plugins.nix | 10 +++++----- pkgs/development/python-modules/buildbot/worker.nix | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 2b2e703026d8..c5a12c997d9d 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.8.1"; + version = "2.8.2"; src = fetchPypi { inherit pname version; - sha256 = "1nrbn8a2c56l5j0axmn9ijaviw0a6nrd34sg81r5j05mzzpb69is"; + sha256 = "0rdrz2zkd6xaf9kb5l41xmbfzq618sz498w23irshih4c802pdv5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index ebf8fb9c94e7..4bb8613afeab 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "03ppmrnpyd77azylv1c673cffk6x53j9flx4i99k33bljmdy8iv4"; + sha256 = "1yz3k6dg15q4911x8kjy396dccfgrs50mjz278l09p6zmm71llax"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 302615dc469c..4c5aa374562a 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "051y4z70dq0j343rb02wn3a1vkdbi8khjfib2msa80vdld3nxcyv"; + sha256 = "19qwr0h6qavznx8rfjq6zjccyd2y7x4nc8asldvay3b44xfsr385"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0chw111j2c6ybvbb09x39zg7ghjz4ysw67wbpcmzd1v5jnwbaqdi"; + sha256 = "1wfhwmb1d32k8isk7k8525pmkfih8hlvy53zsj19l3gvjm0da9gw"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "14v2lj65ccgmijxqrr61vpgba30q6w5vnisz78y3hbf3qpxmmd7g"; + sha256 = "0g62v0maz3b9bmjvvjcin6ayg0f5k0n8m93zk75lagyr69g5vaka"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "03q9am237f2r8ivqm1dfkyzm3bmns4xjn99c27ps6dw9an15f73a"; + sha256 = "0dlq8pchgccc66gfdlssydacisia5fbwc8b4gd8f9gcbish8jmf7"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0wv5ghsfmhkbk96zimihcwn16rxjz1q1g5ppahb8gfrclmzhdynl"; + sha256 = "193nni55py6yzw730yyp5va2n4313sjf6a7jmi0xs9bivvvzg5w9"; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 936ef661eeee..05938e43ad69 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "1cba1zmm3gfw3ikax7q4vbrxnvjxlby79x5lc4fg9c3igbm0nmwj"; + sha256 = "0p1w6ailp6xpa6ckl5prj413ilxx5s3lga5mzqxj9nn00vni8ik2"; }; propagatedBuildInputs = [ twisted future ]; From 470ce4784e825663dd3357c4e8de07b8012e354f Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 23 Mar 2020 02:13:02 +0100 Subject: [PATCH 1763/3452] nixos/users: validate password hashes --- nixos/modules/config/users-groups.nix | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 141e43fec39b..7fbbfcec7510 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -600,6 +600,38 @@ in { } ]; + warnings = + builtins.filter (x: x != null) ( + flip mapAttrsToList cfg.users (name: user: + # This regex matches a subset of the Modular Crypto Format (MCF)[1] + # informal standard. Since this depends largely on the OS or the + # specific implementation of crypt(3) we only support the (sane) + # schemes implemented by glibc and BSDs. In particular the original + # DES hash is excluded since, having no structure, it would validate + # common mistakes like typing the plaintext password. + # + # [1]: https://en.wikipedia.org/wiki/Crypt_(C) + let + sep = "\\$"; + base64 = "[a-zA-Z0-9./]+"; + id = "[a-z0-9-]+"; + value = "[a-zA-Z0-9/+.-]+"; + options = "${id}(=${value})?(,${id}=${value})*"; + scheme = "${id}(${sep}${options})?"; + content = "${base64}${sep}${base64}"; + mcf = "^${sep}${scheme}${sep}${content}$"; + in + if (user.hashedPassword != null + && builtins.match mcf user.hashedPassword == null) + 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 + check the value of option `users.users."${name}".hashedPassword`. + '' + else null + )); + }; } From 7003d6ebf30391d24fcf05bb0929d6793b452413 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 18:36:24 +0000 Subject: [PATCH 1764/3452] pantheon.elementary-code: 3.4.0 -> 3.4.1 --- pkgs/desktops/pantheon/apps/elementary-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 82036c8b8e21..086e0cf7a57b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "3.4.0"; + version = "3.4.1"; repoName = "code"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0b1vdgb1xvh5lqbral3r0qaq05zd5q5ywxw02fggpyy8nyxs3z8f"; + sha256 = "158zrzyyy507rxcbsb5am9768zbakpwrl61ixab57zla7z51l0g0"; }; passthru = { From 0f7fb7d62f5f084a1cf218e510c95dadcd5590b7 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 14 Jun 2020 14:58:51 -0400 Subject: [PATCH 1765/3452] nixos/release-notes: Amend note about image compression --- nixos/doc/manual/release-notes/rl-2009.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 848e5e63a9c3..1dfbd4220440 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -481,7 +481,7 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; - SD and ISO images are now compressed by default using zstd. + SD images are now compressed by default using zstd. The compression for ISO images has also been changed to zstd, but ISO images are still not compressed by default. From 14842196b84ee97175dee292e97d62d743b2d57e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 18:47:59 +0000 Subject: [PATCH 1766/3452] gnome3.evolution: 3.36.2 -> 3.36.3 --- pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 467971b2dba4..b9ac719004aa 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.36.2"; + version = "3.36.3"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12ii8crp4v4bpdxrc2rkxwdxqz3qjizyfgfrmir9pcyxlg0lh2f5"; + sha256 = "00yann3cibbsap7vh6qq08aklvydynmk6gmljkzd80kc52m6rqal"; }; nativeBuildInputs = [ From 6cdbb1fb1febfd97ab4490fba461c9eb6453fa33 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Mon, 15 Jun 2020 21:03:03 +0200 Subject: [PATCH 1767/3452] bind: set BUILD_CC for cross compilation This is due to a hint by @Ericson2314 in https://github.com/NixOS/nixpkgs/pull/86166#issuecomment-633153996 --- pkgs/servers/dns/bind/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index a7581ccbb119..2aae5634cc5e 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -54,7 +54,8 @@ stdenv.mkDerivation rec { "--without-eddsa" "--with-aes" ] ++ lib.optional stdenv.isLinux "--with-libcap=${libcap.dev}" - ++ lib.optional enableSeccomp "--enable-seccomp"; + ++ lib.optional enableSeccomp "--enable-seccomp" + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILD_CC=$(CC_FOR_BUILD)"; postInstall = '' moveToOutput bin/bind9-config $dev From 7c68f54d9526bd2d83853ca916cc01a0490f661c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jun 2020 08:33:32 +0100 Subject: [PATCH 1768/3452] cquery: remove --- .../development/tools/misc/cquery/default.nix | 64 ------------------- pkgs/development/tools/misc/cquery/wrapper | 12 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 -- 4 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 pkgs/development/tools/misc/cquery/default.nix delete mode 100644 pkgs/development/tools/misc/cquery/wrapper diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix deleted file mode 100644 index 33a8bf1df61d..000000000000 --- a/pkgs/development/tools/misc/cquery/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ fetchFromGitHub, makeWrapper -, cmake, llvmPackages, ncurses -, runtimeShell }: - -let - src = fetchFromGitHub { - owner = "cquery-project"; - repo = "cquery"; - rev = "a95a6503d68a85baa25465ce147b7fc20f4a552e"; - sha256 = "0rxbdln7dqkdw4q8rhclssgwypq16g9flkwmaabsr8knckbszxrx"; - fetchSubmodules = true; - }; - - stdenv = llvmPackages.stdenv; - -in -stdenv.mkDerivation { - pname = "cquery"; - version = "2018-10-14"; - - inherit src; - - nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = with llvmPackages; [ clang clang-unwrapped llvm ncurses ]; - - cmakeFlags = [ - "-DSYSTEM_CLANG=ON" - "-DCLANG_CXX=ON" - ]; - - shell = runtimeShell; - postFixup = '' - # We need to tell cquery where to find the standard library headers. - - standard_library_includes="\\\"-isystem\\\", \\\"${stdenv.lib.getDev stdenv.cc.libc}/include\\\"" - standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\"" - export standard_library_includes - - wrapped=".cquery-wrapped" - export wrapped - - mv $out/bin/cquery $out/bin/$wrapped - substituteAll ${./wrapper} $out/bin/cquery - chmod --reference=$out/bin/$wrapped $out/bin/cquery - ''; - - doInstallCheck = true; - installCheckPhase = '' - pushd ${src} - $out/bin/cquery --ci --test-unit - - # The integration tests have to be disabled because cquery ignores `--init` - # if they are invoked, which means it won't find the system includes. - #$out/bin/cquery --ci --test-index - ''; - - meta = with stdenv.lib; { - description = "A c/c++ language server powered by libclang"; - homepage = "https://github.com/cquery-project/cquery"; - license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.tobim ]; - }; -} diff --git a/pkgs/development/tools/misc/cquery/wrapper b/pkgs/development/tools/misc/cquery/wrapper deleted file mode 100644 index 8b3e57290429..000000000000 --- a/pkgs/development/tools/misc/cquery/wrapper +++ /dev/null @@ -1,12 +0,0 @@ -#! @shell@ -e - -initString="--init={\"cacheDirectory\": \"/tmp/cquery\", \"extraClangArguments\": [@standard_library_includes@" - -if [ "${NIX_CFLAGS_COMPILE}" != "" ]; then - read -a cflags_array <<< ${NIX_CFLAGS_COMPILE} - initString+=$(printf ', \"%s\"' "${cflags_array[@]}") -fi - -initString+="]}" - -exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 03efd40d2714..92f4f0fa414b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -88,6 +88,7 @@ mapAliases ({ cpp-gsl = microsoft_gsl; # added 2019-05-24 cupsBjnp = cups-bjnp; # added 2016-01-02 cups_filters = cups-filters; # added 2016-08 + cquery = throw "cquery has been removed because it is abandoned by upstream. Consider switching to clangd or ccls instead."; # added 2020-06-15 cv = progress; # added 2015-09-06 d1x_rebirth = dxx-rebirth; # added 2018-04-25 d2x_rebirth = dxx-rebirth; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b75778322fe..c19a89edf500 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10274,12 +10274,6 @@ in cpplint = callPackage ../development/tools/analysis/cpplint { }; - cquery = callPackage ../development/tools/misc/cquery { - # 7 is the default, but only on Linux, so keep this for now - llvmPackages = llvmPackages_7; - }; - - ccls = callPackage ../development/tools/misc/ccls { llvmPackages = llvmPackages_8; stdenv = llvmPackages_8.stdenv; From efb4e8d764f84661958fae9ca48a8de8d7a875a4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 19:50:38 +0000 Subject: [PATCH 1769/3452] di: 4.47.3 -> 4.48 --- pkgs/tools/system/di/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix index 239544d20a6d..0a6ae26547bf 100644 --- a/pkgs/tools/system/di/default.nix +++ b/pkgs/tools/system/di/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "di"; - version = "4.47.3"; + version = "4.48"; src = fetchurl { url = "https://gentoo.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0m4npba50sf5s61g5z3xd2r7937zwja941f2h3f081xi24c2hfck"; + sha256 = "0crvvfsxh8ryc0j19a2x52i9zacvggm8zi6j3kzygkcwnpz4km8r"; }; makeFlags = [ "INSTALL_DIR=$(out)" ]; From 4cf34b8fbcf1c6c35ab5bd20015cc97e0f3378ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 19:58:13 +0000 Subject: [PATCH 1770/3452] evince: 3.36.3 -> 3.36.5 --- pkgs/desktops/gnome-3/core/evince/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index e268b8f8f121..d9d9f916d46d 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.36.3"; + version = "3.36.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1clx580n8vb6w0fhdbmcsxs07yczdgidyax1y7280rafyzvvsbmg"; + sha256 = "0z79jl0j9xq9wgwkfr0d1w1qrdy4447y8shs407n5srr0vixc3bg"; }; postPatch = '' From 7304a4ae4ba63220d2974530e37e339c0f00bdbe Mon Sep 17 00:00:00 2001 From: Greg Roodt Date: Mon, 15 Jun 2020 20:51:21 +1000 Subject: [PATCH 1771/3452] qbec: add ldflags --- .../applications/networking/cluster/qbec/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 0689fd096b3b..4118d25d4f76 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, go, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "qbec"; @@ -13,10 +13,18 @@ buildGoModule rec { vendorSha256 = "15hbjghi2ifylg7nr85qlk0alsy97h9zj6hf5w84m76dla2bcjf3"; + buildFlagsArray = '' + -ldflags= + -s -w + -X github.com/splunk/qbec/internal/commands.version=${version} + -X github.com/splunk/qbec/internal/commands.commit=${src.rev} + -X github.com/splunk/qbec/internal/commands.goVersion=${lib.getVersion go} + ''; + meta = with lib; { description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; homepage = "https://github.com/splunk/qbec"; license = licenses.asl20; maintainers = with maintainers; [ groodt ]; }; -} \ No newline at end of file +} From fcecf15dc4105663f1dec7d954249824d3e555e8 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 15 Jun 2020 23:48:42 +0200 Subject: [PATCH 1772/3452] system-config-printer: Fix ABRT: free(): invalid pointer Apply patches picked from upstream as done on debian. Will be included in next upstream release. --- .../misc/system-config-printer/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index e9ee91de6776..8a0c881a277b 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook +{ stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook , docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify , gobject-introspection, libsecret, packagekit @@ -24,7 +24,20 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.am --replace /bin/bash ${bash}/bin/bash ''; - patches = [ ./detect_serverbindir.patch ]; + patches = [ + ./detect_serverbindir.patch + + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958104 + # (Fixes will be included in next upstream release.) + (fetchpatch { + url = "https://github.com/OpenPrinting/system-config-printer/commit/cf9903466c1a2d18a701f3b5e8c7e03483e1244d.patch"; + sha256 = "03gpav618w50q90m2kdkgwclc7fv17m493fgjd633zfavb5kqr3n"; + }) + (fetchpatch { + url = "https://github.com/OpenPrinting/system-config-printer/commit/b9289dfe105bdb502f183f0afe7a115ecae5f2af.patch"; + sha256 = "12w47hy3ly4phh8jcqxvdnd5sgbnbp8dnscjd7d5y2i43kxj7b23"; + }) + ]; buildInputs = [ glib udev libusb1 cups From e1e3911536105cc6bf6f72e414dbb4025c9d2c6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 14:49:41 -0700 Subject: [PATCH 1773/3452] gnome3.gnome-desktop: 3.36.2 -> 3.36.3.1 (#90534) --- pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 94de64c9ea98..22b3f17b4256 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "3.36.2"; + version = "3.36.3.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12f724inw3sv289xqprvwh8r3qw89z67m74j3hyhkbp1n7f99y9q"; + sha256 = "0zkbx5inprjpf4abqwn0bxc2d1rwbhv450cjh1wgz82ylagi3vab"; }; nativeBuildInputs = [ From 1a5df8f680ead6d505ae776653fdaa5b1c6a393c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 15 Jun 2020 23:58:39 +0200 Subject: [PATCH 1774/3452] chromium: 83.0.4103.97 -> 83.0.4103.106 https://chromereleases.googleblog.com/2020/06/stable-channel-update-for-desktop_15.html This update includes 4 security fixes. CVEs: CVE-2020-6505 CVE-2020-6506 CVE-2020-6507 --- .../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 ced9c2454b55..65dda4931422 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 = "1di0fhhv6lljc2b50i0i8qx5y5xswgxz1bimpda790sb3b1xsdzx"; - sha256bin64 = "1f5qwx4476l4fvbw9w2i22i080bahlf83dzzpnbny7hk831g7msw"; - version = "84.0.4147.38"; + sha256 = "0wsqxq8xxcafmjxsjkagysrcbr6qryiyqn6m3ysp256aam7z3d88"; + sha256bin64 = "03jff1sdv05hbn37cw0ij0r4rils0q11lnnhxg52igg633jzwyc1"; + version = "84.0.4147.45"; }; dev = { - sha256 = "07h3i4ab7yj05ndrqchzf3f9wr809qb3dj2gfc1653mkjmba8h07"; - sha256bin64 = "10jdq5mr7qby0m26l5lbsqcbh9bhjdpmpbkkcvv9wm2259rwjxr5"; - version = "85.0.4164.2"; + sha256 = "16rmzyzjmxmhmr5yqbzqbwf5sq94iqcwlm04fkafiwcycd17nyhs"; + sha256bin64 = "0wjmc1wdmwiq9d1f5gk4c9jkj1p116kaz9nb0hvhjf01iv07xl2m"; + version = "85.0.4168.2"; }; stable = { - sha256 = "10vg0fmwlkzpnixhhhcwccxshqdfq7rh0ribij7wgkw42bv0bi0j"; - sha256bin64 = "09vz7ygixs7lwlsvbby3dmc2gz0vpjwalzdh6l6apc4dngyr095k"; - version = "83.0.4103.97"; + sha256 = "0bvy17ymlih87n4ymnzvyn0m34ghmr1yasvy7gxv02qbw6i57lfg"; + sha256bin64 = "00hjr5y0cczs6h2pxrigpmjiv24456948v32q7mr7x5ysr5kxpn6"; + version = "83.0.4103.106"; }; } From b586b07cfae862fb75ed84193a38b2db473b5b4c Mon Sep 17 00:00:00 2001 From: Colin L Rice Date: Wed, 3 Jun 2020 23:10:45 -0400 Subject: [PATCH 1775/3452] Add c00w as a maintainer --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b75cb49467a0..f7a7ce20c708 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1157,6 +1157,12 @@ githubId = 24417923; name = "Renaud"; }; + c00w = { + email = "nix@daedrum.net"; + github = "c00w"; + githubId = 486199; + name = "Colin"; + }; c0deaddict = { email = "josvanbakel@protonmail.com"; github = "c0deaddict"; From 3050bbe9d45970cffb5823f66bb296367746e803 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 13 Jun 2020 16:48:52 +1000 Subject: [PATCH 1776/3452] maintainers/teams: add golang --- maintainers/team-list.nix | 14 ++++++++++++++ pkgs/development/compilers/go/1.13.nix | 2 +- pkgs/development/compilers/go/1.14.nix | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 1fed6a4d9bf7..25a4995b733e 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -34,6 +34,20 @@ with lib.maintainers; { scope = "Maintain Freedesktop.org packages for graphical desktop."; }; + golang = { + members = [ + c00w + cstrahan + Frostman + kalbasit + mic92 + orivej + rvolosatovs + zowoq + ]; + scope = "Maintain Golang compilers."; + }; + gnome = { members = [ hedning diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index 8b013bbd6503..48e4d9bdc6c4 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -236,7 +236,7 @@ stdenv.mkDerivation rec { homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ]; + maintainers = teams.golang.members; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 9aaf85c598fc..560af19e2010 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -236,7 +236,7 @@ stdenv.mkDerivation rec { homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ]; + maintainers = teams.golang.members; platforms = platforms.linux ++ platforms.darwin; }; } From bfa1712590b2875dc921eb3273f303f206c1b3e2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 22:16:05 +0000 Subject: [PATCH 1777/3452] fwupd: 1.4.2 -> 1.4.4 --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 87a37feb1cc8..c2bffc6fa738 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -87,11 +87,11 @@ in stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.4.2"; + version = "1.4.4"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "1wch1n0z89ymfxx7ganiab4h64rdxr54rcg37n5nshw35bc3f390"; + sha256 = "03yn96kxs53vxcbza17y99rdhbjlybv44gkc90vaj6301grxahnp"; }; # libfwupd goes to lib From 6270712773c7918c117fe8b33db536ea6ef8b69b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 13 Jun 2020 15:18:53 -0400 Subject: [PATCH 1778/3452] pythonPackages.awkward1: 0.2.22 -> 0.2.23 This fixes the build. The 0.2.23 is the last version compatible with numba 0.49. --- pkgs/development/python-modules/awkward1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward1/default.nix b/pkgs/development/python-modules/awkward1/default.nix index 0c2b3338690f..e3549e0a4a85 100644 --- a/pkgs/development/python-modules/awkward1/default.nix +++ b/pkgs/development/python-modules/awkward1/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward1"; - version = "0.2.22"; + version = "0.2.23"; src = fetchPypi { inherit pname version; - sha256 = "c64a8ad0204743d49cf2f8775f92d9c23dd9d7eb6996a61f4a9de57a53d429f9"; + sha256 = "d7458b499959af66e0a640e29e6b676a39cc9614cd504e5a2e8f8d0c7f546597"; }; nativeBuildInputs = [ cmake ]; From 7603529b515d64141907ca7a61bdf7ad3b803fb2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 22:28:56 +0000 Subject: [PATCH 1779/3452] gallery-dl: 1.14.0 -> 1.14.1 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index c73a28d0febd..6b8f6aa38cf8 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.14.0"; + version = "1.14.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0ckqxibyf14lgl1aj5pv79bmfanacgcc96x6mdwfp2dnbvfjk71b"; + sha256 = "0w4zmfbsr7xdymrrmdvcc0kqz11ql8j067ghlr84faqlsnx09z74"; }; doCheck = false; From 55c09a884adc4a3ee609b088ef5d8712ba0e9ddb Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 28 May 2020 01:07:30 +0200 Subject: [PATCH 1780/3452] nixos/modules/system/boot/networkd: enable socket activation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since cd1dedac67d4b077a556a660ef5724c909da8006 systemd-networkd has it's netlink socket created via a systemd.socket unit. One might think that this doesn't make much sense since networkd is just going to create it's own socket on startup anyway. The difference here is that we have configuration-time control over things like socket buffer sizes vs compile-time constants. For larger setups where networkd has to create a lot of (virtual) devices the default buffer size of currently 128MB is not enough. A good example is a machine with >100 virtual interfaces (e.g., wireguard tunnels, VLANs, …) that all have to be brought up during startup. The receive buffer size will spike due to all the generated message from the new interfaces. Eventually some of the message will be dropped since there is not enough (permitted) buffer space available. By having networkd start through / with a netlink socket created by systemd we can configure the `ReceiveBufferSize` parameter in the socket options without recompiling networkd. Since the actual memory requirements depend on hardware, timing, exact configurations etc. it isn't currently possible to infer a good default from within the NixOS module system. Administrators are advised to monitor the logs of systemd-networkd for `rtnl: kernel receive buffer overrun` spam and increase the memory as required. Note: Increasing the ReceiveBufferSize doesn't allocate any memory. It just increases the upper bound on the kernel side. The memory allocation depends on the amount of messages that are queued on the kernel side of the netlink socket. --- nixos/doc/manual/release-notes/rl-2009.xml | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index a8a16bcc14fd..436611253385 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -566,6 +566,38 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; was removed, as udev gained native support to handle FIDO security tokens. + + + With this release systemd-networkd (when enabled through ) + has it's netlink socket created through a systemd.socket unit. This gives us control over + socket buffer sizes and other parameters. For larger setups where networkd has to create a lot of (virtual) + devices the default buffer size (currently 128MB) is not enough. + + + On a machine with >100 virtual interfaces (e.g., wireguard tunnels, VLANs, …), that all have to + be brought up during system startup, the receive buffer size will spike for a brief period. + Eventually some of the message will be dropped since there is not enough (permitted) buffer + space available. + + + By having systemd-networkd start with a netlink socket created by + systemd we can configure the ReceiveBufferSize= parameter + in the socket options (i.e. systemd.sockets.systemd-networkd.socketOptions.ReceiveBufferSize) + without recompiling systemd-networkd. + + + Since the actual memory requirements depend on hardware, timing, exact + configurations etc. it isn't currently possible to infer a good default + from within the NixOS module system. Administrators are advised to + monitor the logs of systemd-networkd for rtnl: kernel receive buffer + overrun spam and increase the memory limit as they see fit. + + + Note: Increasing the ReceiveBufferSize= doesn't allocate any memory. It just increases + the upper bound on the kernel side. The memory allocation depends on the amount of messages that are + queued on the kernel side of the netlink socket. + + From ab1ae1088e1988373af8acd4a3637deceedbb3cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Mon, 15 Jun 2020 15:09:48 +0200 Subject: [PATCH 1781/3452] pycurl: Exclude flaky multi_timer_test. Fixes #77304 --- pkgs/development/python-modules/pycurl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 6b6aad2b2342..7531bb8f7bbc 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -47,7 +47,8 @@ buildPythonPackage rec { and not test_libcurl_ssl_openssl" \ --ignore=tests/getinfo_test.py \ --ignore=tests/memory_mgmt_test.py \ - --ignore=tests/multi_memory_mgmt_test.py + --ignore=tests/multi_memory_mgmt_test.py \ + --ignore=tests/multi_timer_test.py ''; preConfigure = '' From 3141a111313a0ba51c3f88fbdbe51b4dbc3fdfac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 23:19:59 +0000 Subject: [PATCH 1782/3452] gnome3.gnome-control-center: 3.36.2 -> 3.36.3 --- pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 79d28ae8ced8..d282fec2e851 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -68,11 +68,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.36.2"; + version = "3.36.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05vqhj5z4w4vaphp541zxxkx6x781m371l2gqnq2vhnnqvqfz9g0"; + sha256 = "0739qcwfwrimfrpf3gaakkf7ipwy3virs096kkhkxjmy1nbls5xw"; }; nativeBuildInputs = [ From 37583e45a2ed9f9030ba8d931c89938fe7660eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Thu, 28 May 2020 20:14:05 +0200 Subject: [PATCH 1783/3452] hplip: 3.20.3 -> 3.20.5 --- pkgs/misc/drivers/hplip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index b1853e28589c..9a6a12d873a4 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -12,16 +12,16 @@ let name = "hplip-${version}"; - version = "3.20.3"; + version = "3.20.5"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "0sh6cg7yjc11x1cm4477iaslj9n8ksghs85hqwgfbk7m5b2pw2a1"; + sha256 = "004bbd78487b7803cdcf2a96b00de938797227068c4de43ee7ad7d174c4e475a"; }; plugin = fetchurl { url = "https://developers.hp.com/sites/default/files/${name}-plugin.run"; - sha256 = "13xyv30jqjysfk7gh0gyn7qj0pb0qvk2rlbhm85a3lw7bjycal8g"; + sha256 = "ff3dedda3158be64b985efbf636890ddda5b271ae1f1fbd788219e1344a9c2e7"; }; hplipState = substituteAll { From 4da94b52700038ff3eaaabc0e94bd2f130c3da9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 16 Jun 2020 01:35:30 +0200 Subject: [PATCH 1784/3452] mpv: fix umpv --- pkgs/applications/video/mpv/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index ad6383046b1b..5b3ad7a98311 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -54,7 +54,7 @@ let ; umpvWrapperArgs = lib.strings.escapeShellArgs ([ "--argv0" "'$0'" - "--set" "MPV" "$out/bin/mpv" + "--set" "MPV" "${placeholder "out"}/bin/mpv" ] ++ extraUmpvWrapperArgs) ; in From ac73a609605c1793ae7a1b7b2ff66d6fb1b246a6 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Mon, 15 Jun 2020 20:14:46 -0400 Subject: [PATCH 1785/3452] searx: fix missing dependency version Fixes #90060 --- pkgs/servers/web-apps/searx/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index d0ff13917969..bcfa8a410219 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -25,7 +25,8 @@ buildPythonApplication rec { --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \ --replace 'pyopenssl==19.0.0' 'pyopenssl' \ --replace 'python-dateutil==2.8.0' 'python-dateutil==2.8.*' \ - --replace 'pyyaml==5.1' 'pyyaml' + --replace 'pyyaml==5.1' 'pyyaml' \ + --replace 'requests[socks]==2.22.0' 'requests[socks]' substituteInPlace requirements-dev.txt \ --replace 'plone.testing==5.0.0' 'plone.testing' \ --replace 'pep8==1.7.0' 'pep8==1.7.*' \ From 7e3519a7cf273e80c0b055158e9bd2d5ea1c11ad Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sun, 14 Jun 2020 13:16:30 -0400 Subject: [PATCH 1786/3452] nixos/systemd-boot: update bootloader if needed --- .../loader/systemd-boot/systemd-boot-builder.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index f48a085ce57a..788b2014cedf 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -197,6 +197,22 @@ def main(): subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "install"]) else: subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "--no-variables", "install"]) + else: + # Update bootloader to latest if needed + systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[1] + sdboot_status = subprocess.check_output(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True) + + # See status_binaries() in systemd bootctl.c for code which generates this + m = re.search("^\W+File:.*/EFI/(BOOT|systemd)/.*\.efi \(systemd-boot (\d+)\)$", + sdboot_status, re.IGNORECASE | re.MULTILINE) + if m is None: + print("could not find any previously installed systemd-boot") + else: + sdboot_version = m.group(2) + if systemd_version > sdboot_version: + print("updating systemd-boot from %s to %s" % (sdboot_version, systemd_version)) + subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "update"]) + mkdir_p("@efiSysMountPoint@/efi/nixos") mkdir_p("@efiSysMountPoint@/loader/entries") From 5cd28326dbe955c4793bb79ba8a927f7454974c4 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sun, 14 Jun 2020 14:14:43 -0400 Subject: [PATCH 1787/3452] nixos/systemd-boot: add test for updating --- nixos/tests/systemd-boot.nix | 57 ++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index e911c3933616..eba4729d6de8 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -6,26 +6,53 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; -makeTest { - name = "systemd-boot"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ]; - - machine = { pkgs, lib, ... }: { +let + common = { virtualisation.useBootLoader = true; virtualisation.useEFIBoot = true; boot.loader.systemd-boot.enable = true; }; +in +{ + basic = makeTest { + name = "systemd-boot"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ]; - testScript = '' - machine.start() - machine.wait_for_unit("multi-user.target") + machine = common; - machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") + testScript = '' + machine.start() + machine.wait_for_unit("multi-user.target") - # Ensure we actually booted using systemd-boot. - # Magic number is the vendor UUID used by systemd-boot. - machine.succeed( - "test -e /sys/firmware/efi/efivars/LoaderEntrySelected-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f" - ) - ''; + machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") + + # Ensure we actually booted using systemd-boot + # Magic number is the vendor UUID used by systemd-boot. + machine.succeed( + "test -e /sys/firmware/efi/efivars/LoaderEntrySelected-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f" + ) + ''; + }; + + update = makeTest { + name = "systemd-boot-update"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ]; + + machine = common; + + testScript = '' + machine.succeed("mount -o remount,rw /boot") + + # Replace version inside sd-boot with something older. See magic[] string in systemd src/boot/efi/boot.c + machine.succeed( + """ + find /boot -iname '*.efi' -print0 | \ + xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot 001 ####/' '{}' + """ + ) + + output = machine.succeed("/run/current-system/bin/switch-to-configuration boot") + assert "updating systemd-boot from 001 to " in output + ''; + }; } From 42b92250b95a9092b7fc08dd623ec23bbffe96ce Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 30 Apr 2020 23:57:39 +0200 Subject: [PATCH 1788/3452] nixos/systemd-boot: fix default boot entry selection https://github.com/systemd/systemd/commit/6cd12ebcfe459466257ea63022a32515d756e719 changed behaviour - now the "default" entry needs to identity an entry with its full name, including the ".conf". Reported-In: https://github.com/NixOS/nixpkgs/issues/86422 --- .../system/boot/loader/systemd-boot/systemd-boot-builder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 788b2014cedf..d8baed65c6df 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -47,9 +47,9 @@ def write_loader_conf(profile, generation): if "@timeout@" != "": f.write("timeout @timeout@\n") if profile: - f.write("default nixos-%s-generation-%d\n" % (profile, generation)) + f.write("default nixos-%s-generation-%d.conf\n".format(profile, generation)) else: - f.write("default nixos-generation-%d\n" % (generation)) + f.write("default nixos-generation-%d.conf\n".format(generation)) if not @editor@: f.write("editor 0\n"); f.write("console-mode @consoleMode@\n"); From 52f1332cbad1f83f81ff96637feb5f093e8adb31 Mon Sep 17 00:00:00 2001 From: Chuck Date: Mon, 15 Jun 2020 17:33:14 -0700 Subject: [PATCH 1789/3452] atom: 1.42.0 -> 1.48.0 atom-beta: 1.43.0-beta0 -> 1.49.0-beta0 This version bump includes node-gyp 3.7.0 -> 5.1.0 in Atom's apm/package-lock.json, which, per https://github.com/nodejs/node-gyp/issues/1687 , finally allows python3 to be used instead of EOL'd python2 for atom-package installation. --- pkgs/applications/editors/atom/default.nix | 8 ++++---- pkgs/applications/editors/atom/env.nix | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index fbe08dbfe7b7..dec3c7955011 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -3,14 +3,14 @@ let versions = { atom = { - version = "1.42.0"; - sha256 = "1ira528nwxi30jfwyivlac3wkkqb9d2z4jhxwq5m7mnpm5yli6jy"; + version = "1.48.0"; + sha256 = "1693bxbylf6jhld9bdcr5pigk36wqlbj89praldpz9s96yxig9s1"; }; atom-beta = { - version = "1.43.0"; + version = "1.49.0"; beta = 0; - sha256 = "06if3w5hx7njmyal0012zawn8f5af1z4bjcbzj2c0gd15nlsgm95"; + sha256 = "1fr6m4a7shdj3wpn6g4n95cqpkkg2x9srwjf7bqxv9f3d5jb1y33"; }; }; diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index cf783053679a..5e3c1070ad2b 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,6 +1,7 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk +, at-spi2-core }: let @@ -10,7 +11,7 @@ let xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify - xorg.libxcb libsecret libuuid at-spi2-atk + xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core ]; libPathNative = lib.makeLibraryPath packages; From 96d1403e7f48605ad9378dc8bf7452d0026787d1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 15 Jun 2020 17:50:53 -0700 Subject: [PATCH 1790/3452] cpplint: 1.3.0 -> 1.5.1 --- pkgs/development/tools/analysis/cpplint/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index 577a09e8de99..61aee215031a 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -2,20 +2,21 @@ python3Packages.buildPythonApplication rec { pname = "cpplint"; - version = "1.3.0"; + version = "1.5.1"; # Fetch from github instead of pypi, since the test cases are not in the pypi archive src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "107v7bp35kxbv9v7wl79h7115z1m4b48rhasp0cnivql1grd277i"; + sha256 = "0k927mycj1k4l3fbxrk597bhcjl2nrpaas1imbjgk64cyq8dv7lh"; }; postPatch = '' patchShebangs cpplint_unittest.py ''; + checkInputs = with python3Packages; [ pytest pytestrunner ]; checkPhase = '' ./cpplint_unittest.py ''; From 24c1e9c598dd7d862c7dd3ed9da529e5183fe34a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 09:26:13 +0000 Subject: [PATCH 1791/3452] bdf2sfd: 1.1.1 -> 1.1.2 --- pkgs/tools/misc/bdf2sfd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/tools/misc/bdf2sfd/default.nix index 15154f73a699..ca67525bb8c4 100644 --- a/pkgs/tools/misc/bdf2sfd/default.nix +++ b/pkgs/tools/misc/bdf2sfd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bdf2sfd"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "fcambus"; repo = pname; rev = version; - sha256 = "02dzvrgwpgbd0wgfnlpiv2qlwvspwl7a0qh8cg363lpnxv8akw9q"; + sha256 = "1fhdl739a4v8296wpn2390fhlb6vlg9m1zik7mql4l9008ncd5mv"; }; nativeBuildInputs = [ cmake ]; From 0aa73fdf13bba1d4b380c487dd40817075834ba5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 11:19:48 +0000 Subject: [PATCH 1792/3452] certstrap: 1.1.1 -> 1.2.0 --- pkgs/tools/security/certstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix index fb3c00e48f91..4d2e2fe7e950 100644 --- a/pkgs/tools/security/certstrap/default.nix +++ b/pkgs/tools/security/certstrap/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "certstrap"; - version = "1.1.1"; + version = "1.2.0"; goPackagePath = "github.com/square/certstrap"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "square"; repo = "certstrap"; rev = "v${version}"; - sha256 = "0j7gi2nzykny7i0gjax9vixw72l9jcm4wnwxgm72hh1pji0ysa8n"; + sha256 = "1ymchnn7c9g3pq7rw4lrwsd6z3wfjx90g7qgrw6r5hssl77mnscj"; }; meta = with stdenv.lib; { From acd91479edee358f226332eb4b34468368f18c68 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 01:05:26 +0000 Subject: [PATCH 1793/3452] gitAndTools.git-open: 2.0.0 -> 2.1.0 --- .../version-management/git-and-tools/git-open/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix index 10f221b63882..f7b2120cca02 100644 --- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-open"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "paulirish"; repo = "git-open"; rev = "v${version}"; - sha256 = "0lprzrjsqrg83gixfaiw26achgd8l7s56jknsjss4p7y0w1fxm05"; + sha256 = "11n46bngvca5wbdbfcxzjhjbfdbad7sgf7h9gf956cb1q8swsdm0"; }; buildInputs = [ makeWrapper ]; From 83f56d4ccbf57562051aaedb8c8b3b59a0eb712a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 01:35:17 +0000 Subject: [PATCH 1794/3452] 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 3780ac36603f107a29bc49e21d6794401b798afe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 01:40:44 +0000 Subject: [PATCH 1795/3452] gnome3.gnome-boxes: 3.36.4 -> 3.36.5 --- pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index fd7205e08fd0..eed28908bf33 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "3.36.4"; + version = "3.36.5"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16l0mq2ydmywcdya1795mcy8syg4zkmz9ws3pzjcqv5y4m7cjj03"; + sha256 = "1khvyhgd3p41fvvknga1hdl0p1ks4kj4cwsiaw28v1sy6nzclm2c"; }; doCheck = true; From b8c3d5b5ee1d4014afad922ec1cc69081f534934 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 01:53:25 +0000 Subject: [PATCH 1796/3452] fluent-bit: 1.4.5 -> 1.4.6 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 439979068f5a..d882c6efb5e8 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "0kxbq174a5fdcdh1hvnrlk79cg7lyily7iskfxhyz9l26qana9jp"; + sha256 = "0qxyjmgl85q7xk629l548bpzizma5n4j1r6nqbwh9j15ajvq7mq8"; }; nativeBuildInputs = [ cmake flex bison ]; From 18154b0a44b349368c2b31f839f8283ccbd70c6c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 01:58:09 +0000 Subject: [PATCH 1797/3452] gitAndTools.git-filter-repo: 2.27.0 -> 2.27.1 --- .../git-and-tools/git-filter-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix index 78011604cdd7..e4c57be2357c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "git-filter-repo"; - version = "2.27.0"; + version = "2.27.1"; src = fetchurl { url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1vry0pqwi0p82m3wflr0wyf88wn75l049w18xf9f5z43xd9vpva1"; + sha256 = "07r32n31ryflgz1ds3dz5s3ixv7li3scxwavy9mzbzdhq6bbzl28"; }; buildInputs = [ pythonPackages.python ]; From 5aeb03a06e2b0ca40158aea40a54ce1173435d79 Mon Sep 17 00:00:00 2001 From: Michael Reilly Date: Mon, 15 Jun 2020 22:10:18 -0400 Subject: [PATCH 1798/3452] katago: 1.4.2 -> 1.4.4 --- pkgs/games/katago/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 0a9ebd9e3eb4..fd4303eb2b1d 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -35,13 +35,13 @@ let in env.mkDerivation rec { pname = "katago"; - version = "1.4.2"; + version = "1.4.4"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "0qdc9hgbzd175b2xkjs62dy6gyybcn9lf1mifiyhjbzjpgv192h4"; + sha256 = "14xs2bm8sky9cdsjdahjqs82q6blzcw05f5d9r1h171dm1hcx566"; }; # To workaround CMake 3.17.0's new buggy behavior wrt CUDA Compiler testing diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58d88fdfb9fa..e3ffb4f070d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23857,8 +23857,8 @@ in katagoWithCuda = katago.override { cudaSupport = true; - cudnn = cudnn_cudatoolkit_10_1; - cudatoolkit = cudatoolkit_10_1; + cudnn = cudnn_cudatoolkit_10_2; + cudatoolkit = cudatoolkit_10_2; }; klavaro = callPackage ../games/klavaro {}; From cb053733b57b733919a4815f8f25ead9f3a8e20b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 02:36:48 +0000 Subject: [PATCH 1799/3452] graylog: 3.3.0 -> 3.3.1 --- pkgs/tools/misc/graylog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 17ea28724782..8530d04b49a3 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1ydplg2lifql5s4bh64a4lwqp1q5vrvbljhn1pnxv9vz0ab73q1k"; + sha256 = "1jcv2dqm49vbz810ypv024r3lqgz804l06yhhwshrih61xzj7dvh"; }; dontBuild = true; From 9130ec5be1dc37f9c7c2fd3af6f7cb0f9fa641eb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 02:41:22 +0000 Subject: [PATCH 1800/3452] jc: 1.11.2 -> 1.11.6 --- pkgs/development/python-modules/jc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index e7942760b72c..e48fec89b9d7 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.11.2"; + version = "1.11.6"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "1gsvjgypjgw5a0k85kdvbbf7q6wspmv6z76acrgnidhav8sdn4dm"; + sha256 = "0jyygq7zmam7yriiv5j4d6mpjdi2p3p7d53bn3qwfzkh4ifsbfan"; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; From af65170aa029bb2ba28dba6589234733e5af66b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 03:35:17 +0000 Subject: [PATCH 1801/3452] janet: 1.9.1 -> 1.10.0 --- pkgs/development/interpreters/janet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index f6f4e36532ec..32312401f963 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "1zdiwddnppwg5zrizy2ypd449zj4mivib76h73xhvr1syl7dk7sc"; + sha256 = "0kx3c4v0481b4xx239w10ajwp8ngq8smxzh3m77dazd89r997n1g"; }; nativeBuildInputs = [ meson ninja ]; From 789d6a5a4d26e51f0112147db49c4bc6c769b8e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 03:40:01 +0000 Subject: [PATCH 1802/3452] jamulus: 3.5.5 -> 3.5.6 --- pkgs/applications/audio/jamulus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index 835e786353c5..498d980676d7 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "jamulus"; - version = "3.5.5"; + version = "3.5.6"; src = fetchFromGitHub { owner = "corrados"; repo = "jamulus"; rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "04h0nwlj71qbp7h4yn8djqchrf47jk8rab9zp9bh9pnkcyv60h27"; + sha256 = "00vd6kffsf3vqfwaxjvln63x3n0q32f385qc51fn5iyj54410x0f"; }; nativeBuildInputs = [ pkg-config qmake ]; From 72d867a120523c9a2a72d524357a06652deed465 Mon Sep 17 00:00:00 2001 From: Daniel Duan Date: Mon, 15 Jun 2020 21:06:09 -0700 Subject: [PATCH 1803/3452] tre-command: 0.2.3 -> 0.3.1 Also, change `pname` to match the actual desired name. Avoid name conflict with the other (older) package named `tre`. --- pkgs/tools/system/tre-command/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix index bc0fa7ea988d..b420126a95e6 100644 --- a/pkgs/tools/system/tre-command/default.nix +++ b/pkgs/tools/system/tre-command/default.nix @@ -1,17 +1,17 @@ { rustPlatform, fetchFromGitHub, stdenv }: rustPlatform.buildRustPackage rec { - pname = "tre"; - version = "0.2.3"; + pname = "tre-command"; + version = "0.3.1"; src = fetchFromGitHub { owner = "dduan"; repo = "tre"; rev = "v${version}"; - sha256 = "1fazw2wn738iknbv54gv7qll7d4q2gy9bq1s3f3cv21cdv6bqral"; + sha256 = "1fm3fszy7fd0dgf5dwm35nb0ym0waw92iyx128lr2vlbyzln6ija"; }; - cargoSha256 = "16bvnwgjf3kj99d77j1pkldbasxfwy55sj9sv9vf2z6llfmzfabd"; + cargoSha256 = "0sk4dn5rrqhkaxm76y1d7rsjsw6pdjdhb2xv7qqrlivfk6y5k31x"; meta = with stdenv.lib; { description = "Tree command, improved"; From 7a891404668a43e85b73081ff7c5579ca1feead1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 06:43:29 +0000 Subject: [PATCH 1804/3452] krop: 0.5.1 -> 0.6.0 --- pkgs/applications/graphics/krop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix index 2337dfb370ef..c88d04826d14 100644 --- a/pkgs/applications/graphics/krop/default.nix +++ b/pkgs/applications/graphics/krop/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "krop"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "arminstraub"; repo = pname; rev = "v${version}"; - sha256 = "0b1zqpks4vzq7sfhf7r9qrshr77f1ncj18x7d0fa3g29rxa42dcr"; + sha256 = "1ygzc7vlwszqmsd3v1dsqp1dpsn6inx7g8gck63alvf88dbn8m3s"; }; propagatedBuildInputs = with python3Packages; [ From 4378ec4805ea6cb501d566692ddb3c5638d94b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 15 Jun 2020 08:34:06 +0100 Subject: [PATCH 1805/3452] i3pystatus: 2019-06-10 -> 2020-06-12 --- .../window-managers/i3/pystatus.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 29bda8e4e2b0..1a6d3d591e1d 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -1,26 +1,32 @@ { stdenv, fetchFromGitHub, libpulseaudio, python3Packages, extraLibs ? [] }: -python3Packages.buildPythonApplication rec { +let + ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${stdenv.lib.makeLibraryPath [ libpulseaudio ]}\""; +in python3Packages.buildPythonApplication rec { # i3pystatus moved to rolling release: # https://github.com/enkore/i3pystatus/issues/584 - version = "unstable-2019-06-10"; + version = "unstable-2020-06-12"; pname = "i3pystatus"; - src = fetchFromGitHub - { + src = fetchFromGitHub { owner = "enkore"; repo = "i3pystatus"; - rev = "56ce08d0ff8d5d64950d6b588ebede35a95e0ce2"; - sha256 = "12938860jbcly1xwhd71jvy2dff28pwv9kqh6mab1859148bzmcg"; + rev = "dad5eb0c5c8a2ecd20c37ade4732586c6e53f44b"; + sha256 = "18ygvkl92yr69kxsym57k1mc90asdxpz4b943i61qr0s4fc5n4mq"; }; propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw ] ++ [ libpulseaudio ] ++ extraLibs; - libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ]; - ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudioPath}\""; # LC_TIME != C results in locale.Error: unsupported locale setting - makeWrapperArgs = [ "--set LC_TIME C" ldWrapperSuffix ]; # libpulseaudio.so is loaded manually + makeWrapperArgs = [ + "--set" "LC_TIME" "C" + ldWrapperSuffix + ]; # libpulseaudio.so is loaded manually + + postConfigure = '' + makeWrapperArgs+=("--set" "GI_TYPELIB_PATH" "$GI_TYPELIB_PATH") + ''; postInstall = '' makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \ From 85ebbbbd3d78571454ebd4228efc3ae8b04c7691 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 15 Jun 2020 23:23:23 -0500 Subject: [PATCH 1806/3452] python38Packages.aiohttp: fix build on darwin --- pkgs/development/python-modules/aiohttp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 2f623dd0f0ef..c58944a59d72 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , fetchPypi , pythonOlder -, pythonAtLeast , attrs , chardet , multidict @@ -14,7 +13,6 @@ , pytestrunner , pytestCheckHook , gunicorn -, pytest-timeout , async_generator , pytest_xdist , pytestcov @@ -63,6 +61,8 @@ buildPythonPackage rec { "test_read_boundary_with_incomplete_chunk" "test_read_incomplete_chunk" "test_request_tracing_exception" + ] ++ lib.optionals stdenv.isDarwin [ + "test_close" ]; # aiohttp in current folder shadows installed version From 2892f69e13c7a845cbbe677766bd55782c049d50 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 07:19:02 +0000 Subject: [PATCH 1807/3452] kmymoney: 5.0.8 -> 5.1.0 --- pkgs/applications/office/kmymoney/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 6137a4dc1ad8..e15615f78a34 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "kmymoney"; - version = "5.0.8"; + version = "5.1.0"; src = fetchurl { url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "1h6l01a08f1xgk4dfpndl7rmgbp9npm58qi760jwl2gggprwwsxc"; + sha256 = "0l8kywq77yaf1bqgdqswrai9ws6a2l11drg0wgyi7f8js7qnif9d"; }; # Hidden dependency that wasn't included in CMakeLists.txt: From 5360dec935e26d5b76eb53c42e4c45f6608f05e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 11 Jun 2020 10:43:37 +0100 Subject: [PATCH 1808/3452] i3pystatus: fix desktop notifications --- .../window-managers/i3/pystatus.nix | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 1a6d3d591e1d..beefdaf891c6 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -1,8 +1,13 @@ -{ stdenv, fetchFromGitHub, libpulseaudio, python3Packages, extraLibs ? [] }: +{ stdenv +, fetchFromGitHub +, libpulseaudio +, libnotify +, gobject-introspection +, python3Packages +, wrapGAppsHook +, extraLibs ? [] }: -let - ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${stdenv.lib.makeLibraryPath [ libpulseaudio ]}\""; -in python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { # i3pystatus moved to rolling release: # https://github.com/enkore/i3pystatus/issues/584 version = "unstable-2020-06-12"; @@ -15,23 +20,26 @@ in python3Packages.buildPythonApplication rec { sha256 = "18ygvkl92yr69kxsym57k1mc90asdxpz4b943i61qr0s4fc5n4mq"; }; - propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw ] ++ - [ libpulseaudio ] ++ extraLibs; + buildInputs = [ libpulseaudio libnotify gobject-introspection ]; + + propagatedBuildInputs = with python3Packages; [ + keyring colour netifaces psutil basiciw pygobject3 + ] ++ extraLibs; - # LC_TIME != C results in locale.Error: unsupported locale setting makeWrapperArgs = [ + # LC_TIME != C results in locale.Error: unsupported locale setting "--set" "LC_TIME" "C" - ldWrapperSuffix - ]; # libpulseaudio.so is loaded manually + "--suffix" "LD_LIBRARY_PATH" ":" "${stdenv.lib.makeLibraryPath [ libpulseaudio ]}" + ]; - postConfigure = '' - makeWrapperArgs+=("--set" "GI_TYPELIB_PATH" "$GI_TYPELIB_PATH") + postPatch = '' + makeWrapperArgs+=(--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH") ''; postInstall = '' makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \ --prefix PYTHONPATH : "$PYTHONPATH" \ - ${ldWrapperSuffix} + ''${makeWrapperArgs[@]} ''; # no tests in tarball From 58ec4d5c77f0a97018cd801d87d5d29202d7bd0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 6 Jun 2020 12:46:00 +0200 Subject: [PATCH 1809/3452] doc: `pip install` flags are specified with `pipInstallFlags` The documentation incorrectly stated that `installFlags` are passed to `pip install`. --- doc/languages-frameworks/python.section.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 7da839ee4826..dc10483ce694 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -764,9 +764,6 @@ following are specific to `buildPythonPackage`: * `dontWrapPythonPrograms ? false`: Skip wrapping of Python programs. * `permitUserSite ? false`: Skip setting the `PYTHONNOUSERSITE` environment variable in wrapped programs. -* `installFlags ? []`: A list of strings. Arguments to be passed to `pip - install`. To pass options to `python setup.py install`, use - `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]`. * `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"pyproject"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is @@ -782,6 +779,9 @@ following are specific to `buildPythonPackage`: * `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this defaults to `"python3.8-"` for Python 3.8, etc., and in case of applications to `""`. +* `pipInstallFlags ? []`: A list of strings. Arguments to be passed to `pip + install`. To pass options to `python setup.py install`, use + `--install-option`. E.g., `pipInstallFlags=["--install-option='--cpp_implementation'"]`. * `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). * `preShellHook`: Hook to execute commands before `shellHook`. From f2592c0b946d09b6ab627bd9815ebfcc4e8d0f9c Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 13 Jun 2020 13:54:07 +0530 Subject: [PATCH 1810/3452] kristall: init at 0.2 --- .../networking/browsers/kristall/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/networking/browsers/kristall/default.nix diff --git a/pkgs/applications/networking/browsers/kristall/default.nix b/pkgs/applications/networking/browsers/kristall/default.nix new file mode 100644 index 000000000000..34f23f452388 --- /dev/null +++ b/pkgs/applications/networking/browsers/kristall/default.nix @@ -0,0 +1,30 @@ +{ lib, mkDerivation, fetchFromGitHub, qtbase, qtmultimedia }: + +mkDerivation rec { + pname = "kristall"; + version = "0.2"; + src = fetchFromGitHub { + owner = "MasterQ32"; + repo = "kristall"; + rev = "V" + version; + sha256 = "08k3rg0sa91ra0nzla5rw806nnncnyvq1s7k09k5i74fvcsnpqyp"; + }; + + buildInputs = [ qtbase qtmultimedia ]; + + qmakeFlags = [ "src/kristall.pro" ]; + + installPhase = '' + install -Dt $out/bin kristall + install -D Kristall.desktop $out/share/applications/net.random-projects.kristall.desktop + ''; + + meta = with lib; + src.meta // { + description = + "Graphical small-internet client, supports gemini, http, https, gopher, finger"; + homepage = "https://random-projects.net/projects/kristall.gemini"; + maintainers = with maintainers; [ ehmry ]; + inherit (qtmultimedia.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3ffb4f070d5..8dcdd527d144 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4684,6 +4684,8 @@ in kippo = callPackage ../servers/kippo { }; + kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { }; + kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; ma1sd = callPackage ../servers/ma1sd { }; From 0f0bcec11cb60288329a8f6313284cef29c8325e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 16 Jun 2020 10:41:57 +0200 Subject: [PATCH 1811/3452] fwupd: Add passthru consistency test We need to keep the passthru.filesInstalledToEtc and passthru.defaultBlacklistedPlugins in sync with the package contents so let's add a test to enforce that. --- nixos/modules/services/hardware/fwupd.nix | 35 +- .../linux/firmware/fwupd/default.nix | 402 ++++++++++-------- 2 files changed, 235 insertions(+), 202 deletions(-) diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix index e586af25c2b1..222ac8e487eb 100644 --- a/nixos/modules/services/hardware/fwupd.nix +++ b/nixos/modules/services/hardware/fwupd.nix @@ -6,6 +6,23 @@ with lib; let cfg = config.services.fwupd; + + customEtc = { + "fwupd/daemon.conf" = { + source = pkgs.writeText "daemon.conf" '' + [fwupd] + BlacklistDevices=${lib.concatStringsSep ";" cfg.blacklistDevices} + BlacklistPlugins=${lib.concatStringsSep ";" cfg.blacklistPlugins} + ''; + }; + "fwupd/uefi.conf" = { + source = pkgs.writeText "uefi.conf" '' + [uefi] + OverrideESPMountPoint=${config.boot.loader.efi.efiSysMountPoint} + ''; + }; + }; + originalEtc = let mkEtcFile = n: nameValuePair n { source = "${cfg.package}/etc/${n}"; }; @@ -96,22 +113,8 @@ in { environment.systemPackages = [ cfg.package ]; - environment.etc = { - "fwupd/daemon.conf" = { - source = pkgs.writeText "daemon.conf" '' - [fwupd] - BlacklistDevices=${lib.concatStringsSep ";" cfg.blacklistDevices} - BlacklistPlugins=${lib.concatStringsSep ";" cfg.blacklistPlugins} - ''; - }; - "fwupd/uefi.conf" = { - source = pkgs.writeText "uefi.conf" '' - [uefi] - OverrideESPMountPoint=${config.boot.loader.efi.efiSysMountPoint} - ''; - }; - - } // originalEtc // extraTrustedKeys // testRemote; + # customEtc overrides some files from the package + environment.etc = originalEtc // customEtc // extraTrustedKeys // testRemote; services.dbus.packages = [ cfg.package ]; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index c2bffc6fa738..af9237d1d833 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -51,6 +51,7 @@ , flashrom , tpm2-tools , nixosTests +, runCommand }: let @@ -83,203 +84,232 @@ let # Experimental haveFlashrom = false; -in - -stdenv.mkDerivation rec { - pname = "fwupd"; - version = "1.4.4"; - - src = fetchurl { - url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "03yn96kxs53vxcbza17y99rdhbjlybv44gkc90vaj6301grxahnp"; - }; - - # libfwupd goes to lib - # daemon, plug-ins and libfwupdplugin go to out - # CLI programs go to out - outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ]; - - nativeBuildInputs = [ - meson - ninja - gtk-doc - pkgconfig - gobject-introspection - intltool - shared-mime-info - valgrind - gcab - docbook_xml_dtd_43 - docbook_xsl - help2man - libxslt - python - wrapGAppsHook - vala - ]; - - buildInputs = [ - polkit - libxmlb - gusb - sqlite - libarchive - libsoup - elfutils - gnu-efi - libyaml - libgudev - colord - libjcat - libuuid - glib-networking - json-glib - umockdev - bash-completion - cairo - freetype - fontconfig - pango - tpm2-tss - efivar - ] ++ stdenv.lib.optionals haveDell [ - libsmbios - ]; - - patches = [ - ./fix-paths.patch - ./add-option-for-installation-sysconfdir.patch - - # Install plug-ins and libfwupdplugin to out, - # they are not really part of the library. - ./install-fwupdplugin-to-out.patch - - # Installed tests are installed to different output - # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle. - (substituteAll { - src = ./installed-tests-path.patch; - # Needs a different set of modules than po/make-images. - inherit installedTestsPython; - }) - ]; - - postPatch = '' - patchShebangs \ - contrib/get-version.py \ - contrib/generate-version-script.py \ - meson_post_install.sh \ - po/make-images \ - po/make-images.sh \ - po/test-deps + runPythonCommand = name: buildCommandPython: runCommand name { + nativeBuildInputs = [ python3 ]; + inherit buildCommandPython; + } '' + exec python3 -c "$buildCommandPython" ''; - # /etc/os-release not available in sandbox - # doCheck = true; + self = stdenv.mkDerivation rec { + pname = "fwupd"; + version = "1.4.4"; - preFixup = let - binPath = [ - efibootmgr - bubblewrap - tpm2-tools - ] ++ stdenv.lib.optional haveFlashrom flashrom; - in '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - # See programs reached with fu_common_find_program_in_path in source - --prefix PATH : "${stdenv.lib.makeBinPath binPath}" - ) - ''; + src = fetchurl { + url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; + sha256 = "03yn96kxs53vxcbza17y99rdhbjlybv44gkc90vaj6301grxahnp"; + }; - mesonFlags = [ - "-Dgtkdoc=true" - "-Dplugin_dummy=true" - "-Dudevdir=lib/udev" - "-Dsystemd_root_prefix=${placeholder "out"}" - "-Dinstalled_test_prefix=${placeholder "installedTests"}" - "-Defi-libdir=${gnu-efi}/lib" - "-Defi-ldsdir=${gnu-efi}/lib" - "-Defi-includedir=${gnu-efi}/include/efi" - "--localstatedir=/var" - "--sysconfdir=/etc" - "-Dsysconfdir_install=${placeholder "out"}/etc" + # libfwupd goes to lib + # daemon, plug-ins and libfwupdplugin go to out + # CLI programs go to out + outputs = [ "out" "lib" "dev" "devdoc" "man" "installedTests" ]; - # We do not want to place the daemon into lib (cyclic reference) - "--libexecdir=${placeholder "out"}/libexec" - # Our builder only adds $lib/lib to rpath but some things link - # against libfwupdplugin which is in $out/lib. - "-Dc_link_args=-Wl,-rpath,${placeholder "out"}/lib" - ] ++ stdenv.lib.optionals (!haveDell) [ - "-Dplugin_dell=false" - "-Dplugin_synaptics=false" - ] ++ stdenv.lib.optionals (!haveRedfish) [ - "-Dplugin_redfish=false" - ] ++ stdenv.lib.optionals haveFlashrom [ - "-Dplugin_flashrom=true" - ]; + nativeBuildInputs = [ + meson + ninja + gtk-doc + pkgconfig + gobject-introspection + intltool + shared-mime-info + valgrind + gcab + docbook_xml_dtd_43 + docbook_xsl + help2man + libxslt + python + wrapGAppsHook + vala + ]; - FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file - - # error: “PolicyKit files are missing” - # https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428 - PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions"; - - # TODO: wrapGAppsHook wraps efi capsule even though it is not elf - dontWrapGApps = true; - - preCheck = '' - addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share" - ''; - - # so we need to wrap the executables manually - postFixup = '' - find -L "$out/bin" "$out/libexec" -type f -executable -print0 \ - | while IFS= read -r -d ''' file; do - if [[ "$file" != *.efi ]]; then - echo "Wrapping program $file" - wrapGApp "$file" - fi - done - ''; - - # /etc/fwupd/uefi.conf is created by the services.hardware.fwupd NixOS module - passthru = { - filesInstalledToEtc = [ - "fwupd/ata.conf" - # "fwupd/daemon.conf" # already created by the module - "fwupd/redfish.conf" - "fwupd/remotes.d/lvfs-testing.conf" - "fwupd/remotes.d/lvfs.conf" - "fwupd/remotes.d/vendor.conf" - "fwupd/remotes.d/vendor-directory.conf" - "fwupd/thunderbolt.conf" - "fwupd/upower.conf" - # "fwupd/uefi.conf" # already created by the module - "pki/fwupd/GPG-KEY-Hughski-Limited" - "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" - "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" - "pki/fwupd/LVFS-CA.pem" - "pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata" - "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service" - "pki/fwupd-metadata/LVFS-CA.pem" + buildInputs = [ + polkit + libxmlb + gusb + sqlite + libarchive + libsoup + elfutils + gnu-efi + libyaml + libgudev + colord + libjcat + libuuid + glib-networking + json-glib + umockdev + bash-completion + cairo + freetype + fontconfig + pango + tpm2-tss + efivar ] ++ stdenv.lib.optionals haveDell [ - "fwupd/remotes.d/dell-esrt.conf" + libsmbios ]; - # BlacklistPlugins key in fwupd/daemon.conf - defaultBlacklistedPlugins = [ - "test" - "invalid" + patches = [ + ./fix-paths.patch + ./add-option-for-installation-sysconfdir.patch + + # Install plug-ins and libfwupdplugin to out, + # they are not really part of the library. + ./install-fwupdplugin-to-out.patch + + # Installed tests are installed to different output + # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle. + (substituteAll { + src = ./installed-tests-path.patch; + # Needs a different set of modules than po/make-images. + inherit installedTestsPython; + }) ]; - tests = { - installedTests = nixosTests.installed-tests.fwupd; + postPatch = '' + patchShebangs \ + contrib/get-version.py \ + contrib/generate-version-script.py \ + meson_post_install.sh \ + po/make-images \ + po/make-images.sh \ + po/test-deps + ''; + + # /etc/os-release not available in sandbox + # doCheck = true; + + preFixup = let + binPath = [ + efibootmgr + bubblewrap + tpm2-tools + ] ++ stdenv.lib.optional haveFlashrom flashrom; + in '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + # See programs reached with fu_common_find_program_in_path in source + --prefix PATH : "${stdenv.lib.makeBinPath binPath}" + ) + ''; + + mesonFlags = [ + "-Dgtkdoc=true" + "-Dplugin_dummy=true" + "-Dudevdir=lib/udev" + "-Dsystemd_root_prefix=${placeholder "out"}" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + "-Defi-libdir=${gnu-efi}/lib" + "-Defi-ldsdir=${gnu-efi}/lib" + "-Defi-includedir=${gnu-efi}/include/efi" + "--localstatedir=/var" + "--sysconfdir=/etc" + "-Dsysconfdir_install=${placeholder "out"}/etc" + + # We do not want to place the daemon into lib (cyclic reference) + "--libexecdir=${placeholder "out"}/libexec" + # Our builder only adds $lib/lib to rpath but some things link + # against libfwupdplugin which is in $out/lib. + "-Dc_link_args=-Wl,-rpath,${placeholder "out"}/lib" + ] ++ stdenv.lib.optionals (!haveDell) [ + "-Dplugin_dell=false" + "-Dplugin_synaptics=false" + ] ++ stdenv.lib.optionals (!haveRedfish) [ + "-Dplugin_redfish=false" + ] ++ stdenv.lib.optionals haveFlashrom [ + "-Dplugin_flashrom=true" + ]; + + FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + + # error: “PolicyKit files are missing” + # https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428 + PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions"; + + # TODO: wrapGAppsHook wraps efi capsule even though it is not elf + dontWrapGApps = true; + + preCheck = '' + addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share" + ''; + + # so we need to wrap the executables manually + postFixup = '' + find -L "$out/bin" "$out/libexec" -type f -executable -print0 \ + | while IFS= read -r -d ''' file; do + if [[ "$file" != *.efi ]]; then + echo "Wrapping program $file" + wrapGApp "$file" + fi + done + ''; + + passthru = { + filesInstalledToEtc = [ + "fwupd/ata.conf" + "fwupd/daemon.conf" + "fwupd/redfish.conf" + "fwupd/remotes.d/lvfs-testing.conf" + "fwupd/remotes.d/lvfs.conf" + "fwupd/remotes.d/vendor.conf" + "fwupd/remotes.d/vendor-directory.conf" + "fwupd/thunderbolt.conf" + "fwupd/upower.conf" + "fwupd/uefi.conf" + "pki/fwupd/GPG-KEY-Hughski-Limited" + "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" + "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" + "pki/fwupd/LVFS-CA.pem" + "pki/fwupd-metadata/GPG-KEY-Linux-Foundation-Metadata" + "pki/fwupd-metadata/GPG-KEY-Linux-Vendor-Firmware-Service" + "pki/fwupd-metadata/LVFS-CA.pem" + ] ++ stdenv.lib.optionals haveDell [ + "fwupd/remotes.d/dell-esrt.conf" + ]; + + # BlacklistPlugins key in fwupd/daemon.conf + defaultBlacklistedPlugins = [ + "test" + "invalid" + ]; + + tests = let + listToPy = list: "[${stdenv.lib.concatMapStringsSep ", " (f: "'${f}'") list}]"; + in { + installedTests = nixosTests.installed-tests.fwupd; + + passthruMatches = runPythonCommand "fwupd-test-passthru-matches" '' + import itertools + import configparser + import os + import pathlib + + etc = '${self}/etc' + package_etc = set(itertools.chain.from_iterable([[os.path.relpath(os.path.join(prefix, file), etc) for file in files] for (prefix, dirs, files) in os.walk(etc)])) + passthru_etc = set(${listToPy passthru.filesInstalledToEtc}) + assert len(package_etc - passthru_etc) == 0, f'fwupd package contains the following paths in /etc that are not listed in passthru.filesInstalledToEtc: {package_etc - passthru_etc}' + assert len(passthru_etc - package_etc) == 0, f'fwupd package lists the following paths in passthru.filesInstalledToEtc that are not contained in /etc: {passthru_etc - package_etc}' + + config = configparser.RawConfigParser() + config.read('${self}/etc/fwupd/daemon.conf') + package_blacklisted_plugins = config.get('fwupd', 'BlacklistPlugins').rstrip(';').split(';') + passthru_blacklisted_plugins = ${listToPy passthru.defaultBlacklistedPlugins} + assert package_blacklisted_plugins == passthru_blacklisted_plugins, f'Default blacklisted plug-ins in the package {package_blacklisted_plugins} do not match those listed in passthru.defaultBlacklistedPlugins {passthru_blacklisted_plugins}' + + pathlib.Path(os.getenv('out')).touch() + ''; + }; + }; + + meta = with stdenv.lib; { + homepage = "https://fwupd.org/"; + maintainers = with maintainers; [ jtojnar ]; + license = [ licenses.gpl2 ]; + platforms = platforms.linux; }; }; - meta = with stdenv.lib; { - homepage = "https://fwupd.org/"; - maintainers = with maintainers; [ jtojnar ]; - license = [ licenses.gpl2 ]; - platforms = platforms.linux; - }; -} +in self From 1ab1a027d5ef7fd0478cdd5f726717192e0084c0 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 15 Jun 2020 22:01:23 +0200 Subject: [PATCH 1812/3452] youtube-dl: 2020.06.06 -> 2020.06.16.1 https://github.com/ytdl-org/youtube-dl/releases/tag/2020.06.16.1 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index dc2d3cf8a1e8..9e28e8785732 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.06.06"; + version = "2020.06.16.1"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1qrrr14glv0jv377n61paq55b6k58jpnwbz2sp5xfl4wnxy5hqny"; + sha256 = "1q0080cvxpfakgbzigbnl9adnga3jz1sqig2rsiq52rarqbc01px"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 35f3cb442b41161eaac78d404e86d56b2774eb31 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Tue, 16 Jun 2020 12:10:43 +0200 Subject: [PATCH 1813/3452] webdis: 0.1.9 -> 0.1.10 --- pkgs/development/tools/database/webdis/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/development/tools/database/webdis/default.nix index fd705c4fc1b0..96b39e42d101 100644 --- a/pkgs/development/tools/database/webdis/default.nix +++ b/pkgs/development/tools/database/webdis/default.nix @@ -2,23 +2,15 @@ stdenv.mkDerivation rec { pname = "webdis"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "nicolasff"; repo = pname; rev = version; - sha256 = "1kglzbs1sw3w05i678qr3lv4pxia20k2a8s3pjhfcxdlnlcy23sk"; + sha256 = "1hn4fq0asivfs56rw9ck1vc3g6h6fnwywh8v4zs2bkyn62fg9mcw"; }; - patches = [ - # Do not use DESTDIR. See: https://github.com/nicolasff/webdis/pull/172 - (fetchpatch { - url = "https://github.com/nicolasff/webdis/commit/a44a2964a59f2e583f4945eeb65cd19235059270.patch"; - sha256 = "0i41p98gc201vpp5ppjc9gxdyb1bpimr0qrvibaf3iq3sy4jr1gb"; - }) - ]; - buildInputs = [ hiredis http-parser jansson libevent ]; makeFlags = [ From 0181c1bd2bfc0f371b0adc0d904ec40aeb76672e Mon Sep 17 00:00:00 2001 From: fadenb Date: Tue, 16 Jun 2020 10:35:18 +0000 Subject: [PATCH 1814/3452] graylogPlugins: Update plugins graylog-enterprise-integrations: 3.3.0 -> 3.3.1 graylog-integrations: 3.3.0 -> 3.3.1 --- pkgs/tools/misc/graylog/plugins.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 5dbcc7479e5d..ec6c16f53131 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -64,10 +64,10 @@ in { enterprise-integrations = glPlugin rec { name = "graylog-enterprise-integrations-${version}"; pluginName = "graylog-plugin-enterprise-integrations"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://downloads.graylog.org/releases/graylog-enterprise-integrations/graylog-enterprise-integrations-plugins-${version}.tgz"; - sha256 = "1480ccii3nzvm0jp1xm2iddgc789zcwbgd19201q7p3v0ph02yj8"; + sha256 = "0la91f5hfakrp5d37q3r1z15zzya9vmwgp8gf5ifkh6fasa811ll"; }; installPhase = '' mkdir -p $out/bin @@ -75,7 +75,7 @@ in { cp ${pluginName}-${version}.jar $out/bin/${pluginName}-${version}.jar ''; meta = { - homepage = "https://docs.graylog.org/en/3.2/pages/integrations.html#enterprise"; + homepage = "https://docs.graylog.org/en/3.3/pages/integrations.html#enterprise"; description = "Integrations are tools that help Graylog work with external systems (unfree enterprise integrations)"; license = stdenv.lib.licenses.unfree; }; @@ -96,10 +96,10 @@ in { integrations = glPlugin rec { name = "graylog-integrations-${version}"; pluginName = "graylog-plugin-integrations"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://downloads.graylog.org/releases/graylog-integrations/graylog-integrations-plugins-${version}.tgz"; - sha256 = "08cpxviwk2p4zsgbr2h3symr88rf3fjfz1kkg4iglvdc5mqf71xx"; + sha256 = "1k90q50p4ly9d8fj0riyb1xw0bd6f8wm2xmkr71908j2v0jaskpq"; }; installPhase = '' mkdir -p $out/bin From 8599272c1dcedf670bdd831ff7bb1fa37c5b8924 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 16 Jun 2020 07:38:45 -0400 Subject: [PATCH 1815/3452] slack: 4.4.2 -> 4.4.3 (linux), 4.4.2 -> 4.6.0 (darwin) --- .../networking/instant-messengers/slack/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 9cf436ff18f3..ad831eb82a59 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -40,13 +40,13 @@ let throwSystem = throw "Unsupported system: ${system}"; sha256 = { - x86_64-darwin = "0z731q00bwljlcmbjwqphyys7skqms1vg87pyi4nsvjmc7kjx7qg"; - x86_64-linux = "0wrs0i2bqv21ivy8s88khbww28b3gsw4abbbbjc76mqma9b0bajs"; + x86_64-darwin = "09daxnqxyccshkrmr7ysgjvgvgmlgd590ym68fz0l8n6ayfpkgw0"; + x86_64-linux = "00ihhsgxm441nsmav7pq4n4y9s7p2r4x5dqld160658xyqi836cq"; }.${system} or throwSystem; version = { - x86_64-darwin = "4.4.2"; - x86_64-linux = "4.4.2"; + x86_64-darwin = "4.6.0"; + x86_64-linux = "4.4.3"; }.${system} or throwSystem; meta = with stdenv.lib; { From 106be3f6fea049da299d1da85d012faea1c8e70e Mon Sep 17 00:00:00 2001 From: Pierre Allix Date: Tue, 16 Jun 2020 13:48:57 +0200 Subject: [PATCH 1816/3452] lib/attrsets: fix typo in the comment of mapAttrsRecursiveCond --- lib/attrsets.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 7d84c25de77a..82bea7af31fc 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -253,7 +253,7 @@ rec { /* Like `mapAttrsRecursive', but it takes an additional predicate function that tells it whether to recursive into an attribute set. If it returns false, `mapAttrsRecursiveCond' does not - recurse, but does apply the map function. It is returns true, it + recurse, but does apply the map function. If it returns true, it does recurse, and does not apply the map function. Type: From adff8a2ee9cc23314759fbe2a289a5f7c45ab60b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 13:52:30 +0000 Subject: [PATCH 1817/3452] libqmi: 1.24.12 -> 1.25.900 --- pkgs/development/libraries/libqmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index ec72578ba278..c3dc1e9996f1 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.24.12"; + version = "1.25.900"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "0scb8a2kh0vnzx6kxanfy2s2slnfppvrwg202rxv30m8p2i92frd"; + sha256 = "0a96f4ab7qy4szwzqs8ir2mvsnpqzk7zsiv6zahlhpf0jhp1vxf7"; }; outputs = [ "out" "dev" "devdoc" ]; From 1e55d5c20dba35ac6a0e8290ba645a30d4851878 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 14:36:56 +0000 Subject: [PATCH 1818/3452] menumaker: 0.99.11 -> 0.99.12 --- pkgs/applications/misc/menumaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix index 22cf63e536c7..f76d6cb6b8a8 100644 --- a/pkgs/applications/misc/menumaker/default.nix +++ b/pkgs/applications/misc/menumaker/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "menumaker"; - version = "0.99.11"; + version = "0.99.12"; src = fetchurl { url = "mirror://sourceforge/menumaker/${pname}-${version}.tar.gz"; - sha256 = "0dprndnhwm7b803zkp4pisiq06ic9iv8vr42in5is47jmvdim0wx"; + sha256 = "034v5204bsgkzzk6zfa5ia63q95gln47f7hwf96yvad5hrhmd8z3"; }; format = "other"; From b3fa11fa3e1b272ad9846c580206bec21f698309 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Tue, 16 Jun 2020 08:10:24 -0700 Subject: [PATCH 1819/3452] node-exporter: 1.0.0 -> 1.0.1 --- pkgs/servers/monitoring/prometheus/node-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index ba10cfa1485a..8d5134437d98 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "node_exporter"; - version = "1.0.0"; + version = "1.0.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/node_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "12v7vaknvll3g1n7730miwxiwz8nbjq8y18lzljq9d9s8apcy32f"; + sha256 = "1r0xx81r9v019fl0iv078yl21ndhb356y7s7zx171zi02k7a4p2l"; }; # FIXME: tests fail due to read-only nix store From 9702e0ce4d543b3fb9db0404aa18c90cd58c2f31 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 6 Jun 2020 11:28:37 +0000 Subject: [PATCH 1820/3452] libiio: 0.19 -> 0.20 --- pkgs/development/libraries/libiio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 03a907162b12..03324c15d8f7 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libiio"; - version = "0.19"; + version = "0.20"; src = fetchFromGitHub { owner = "analogdevicesinc"; repo = "libiio"; rev = "refs/tags/v${version}"; - sha256 = "1r67h5mayx9krh3mmzs5vz20mvwb2lw04hpbyyisygl01ndc77kq"; + sha256 = "1929gvizkqmm9cwh3vihxxszfxvgcp5saq9q6chdk3fpdhzajc00"; }; outputs = [ "out" "lib" "dev" "python" ]; From 275ee808f730e9f12a81d149b67b5dd1ebecc761 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 May 2020 23:26:39 +0000 Subject: [PATCH 1821/3452] memtier-benchmark: 1.2.17 -> 1.3.0 --- pkgs/tools/networking/memtier-benchmark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix index 3579002e4169..a45c3a2e33a1 100644 --- a/pkgs/tools/networking/memtier-benchmark/default.nix +++ b/pkgs/tools/networking/memtier-benchmark/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "memtier-benchmark"; - version = "1.2.17"; + version = "1.3.0"; src = fetchFromGitHub { owner = "redislabs"; repo = "memtier_benchmark"; rev = "refs/tags/${version}"; - sha256 = "18cka6sv3w8ffa81126nzi04if9g1wd3i3apxsgmv7xm2p8fsa39"; + sha256 = "0m2qnnc71qpdj8w421bxn0zxz6ddvzy7b0n19jvyncnzvk1ff0sq"; }; patchPhase = '' From 9317014be174796c41e8bc827bbfa2e6666b5fed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Jun 2020 00:25:45 +0000 Subject: [PATCH 1822/3452] opendht: 2.1.1 -> 2.1.3 --- pkgs/development/libraries/opendht/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index a62138e8ccf4..c8b1205bc91b 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.1.1"; + version = "2.1.3"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "10sbiwjljxi0a1q3xakmf6v02x3yf38ljvjpql70q4rqggqj9zhh"; + sha256 = "0qz9mdkanz4vd38bdpwvcwvbpzf19i6019rmqw3k1vh5mh22ljhr"; }; nativeBuildInputs = From b4e428ecd0535b73c42cd15ffc6028fd00a7c5ba Mon Sep 17 00:00:00 2001 From: Renzo Carbonara Date: Thu, 4 Jun 2020 14:31:17 +0300 Subject: [PATCH 1823/3452] pg_ed25519: init at 0.2 PostgreSQL extension for signing and verifying ed25519 signatures. --- .../servers/sql/postgresql/ext/pg_ed25519.nix | 31 +++++++++++++++++++ pkgs/servers/sql/postgresql/packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/ext/pg_ed25519.nix diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix new file mode 100644 index 000000000000..95d45b2663d9 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, postgresql }: + +stdenv.mkDerivation rec { + pname = "pg_ed25519"; + version = "0.2"; + + src = fetchurl { + url = "https://gitlab.com/dwagin/${pname}/-/archive/${version}/${pname}-${version}.tar.bz2"; + sha256 = "0q46pvk1vq5w3al6i3inzlw6w7za3n7p1gd4wfbbxzvzh7qnynda"; + }; + + buildInputs = [ postgresql ]; + + installPhase = '' + mkdir -p $out/bin # For buildEnv to setup proper symlinks. See #22653 + mkdir -p $out/{lib,share/postgresql/extension} + + cp *.so $out/lib + cp *.sql $out/share/postgresql/extension + cp *.control $out/share/postgresql/extension + ''; + + meta = with stdenv.lib; { + description = "PostgreSQL extension for signing and verifying ed25519 signatures"; + homepage = "https://gitlab.com/dwagin/pg_ed25519"; + maintainers = [ maintainers.renzo ]; + platforms = postgresql.meta.platforms; + license = licenses.mit; + }; +} + diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 15735a82c52e..d4dafe7ddb14 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -13,6 +13,8 @@ self: super: { pg_bigm = super.callPackage ./ext/pg_bigm.nix { }; + pg_ed25519 = super.callPackage ./ext/pg_ed25519.nix { }; + pg_repack = super.callPackage ./ext/pg_repack.nix { }; pg_similarity = super.callPackage ./ext/pg_similarity.nix { }; From 56f04cb368db1d8609a135331856576030cb1c20 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Tue, 16 Jun 2020 17:27:22 +0200 Subject: [PATCH 1824/3452] ssb/patchwork-classic: remove Marked as deprecated by upstream, hasn't been updated in years. --- .../ssb/patchwork-classic/default.nix | 106 ------------------ pkgs/top-level/all-packages.nix | 2 - 2 files changed, 108 deletions(-) delete mode 100644 pkgs/applications/networking/ssb/patchwork-classic/default.nix diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix deleted file mode 100644 index 74a02f47c3bf..000000000000 --- a/pkgs/applications/networking/ssb/patchwork-classic/default.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ stdenv, fetchurl, lib, makeWrapper, - # build dependencies - alsaLib, atk, cairo, cups, dbus, expat, fontconfig, - freetype, gdk-pixbuf, glib, gnome2, nspr, nss, xorg, - glibc, systemd -}: - -stdenv.mkDerivation { - - version = "2.12.0"; - - pname = "patchwork-classic"; - - src = fetchurl { - url = "https://github.com/ssbc/patchwork-classic-electron/releases/download/v2.12.0/ssb-patchwork-electron_2.12.0_linux-amd64.deb"; - sha256 = "1rvp07cgqwv7ac319p0qwpfxd7l8f53m1rlvvig7qf7q23fnmbsj"; - }; - - sourceRoot = "."; - - unpackCmd = '' - ar p "$src" data.tar.xz | tar xJ - ''; - - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/bin - cp -R usr/share opt $out/ - - # fix the path in the desktop file - substituteInPlace \ - $out/share/applications/ssb-patchwork-electron.desktop \ - --replace /opt/ $out/opt/ - - # symlink the binary to bin/ - ln -s $out/opt/ssb-patchwork-electron/ssb-patchwork-electron $out/bin/patchwork-classic - ''; - - - preFixup = let - packages = [ - alsaLib - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gnome2.GConf - gnome2.gtk - gnome2.pango - nspr - nss - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - stdenv.cc.cc.lib - stdenv.cc.cc - glibc - ]; - libPathNative = lib.makeLibraryPath packages; - libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; - libPath = "${libPathNative}:${libPath64}"; - in '' - # patch executable - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}:$out/opt/ssb-patchwork-electron" \ - $out/opt/ssb-patchwork-electron/ssb-patchwork-electron - - # patch libnode - patchelf \ - --set-rpath "${libPath}" \ - $out/opt/ssb-patchwork-electron/libnode.so - - # libffmpeg is for some reason not executable - chmod a+x $out/opt/ssb-patchwork-electron/libffmpeg.so - - # fix missing libudev - ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/ssb-patchwork-electron/libudev.so.1 - wrapProgram $out/opt/ssb-patchwork-electron/ssb-patchwork-electron \ - --prefix LD_LIBRARY_PATH : $out/opt/ssb-patchwork-electron - ''; - - meta = with stdenv.lib; { - description = "Electron wrapper for Patchwork Classic: run as a desktop app outside the browser"; - homepage = "https://github.com/ssbc/patchwork-classic-electron"; - license = licenses.gpl3; - maintainers = with maintainers; [ mrVanDalo ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8465c5060030..2a1e00e590eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5871,8 +5871,6 @@ in patchage = callPackage ../applications/audio/patchage { }; - patchwork-classic = callPackage ../applications/networking/ssb/patchwork-classic { }; - pcapfix = callPackage ../tools/networking/pcapfix { }; pbzip2 = callPackage ../tools/compression/pbzip2 { }; From fe26b6241cc6f591130d9bb1e4b6cba7aaa942e8 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Tue, 16 Jun 2020 17:28:47 +0200 Subject: [PATCH 1825/3452] ssb-patchwork: move to ssb-patchwork dir Since there's no other ssb package anymore (see previous commit), there's no need to group them together in a common subdirectory. --- .../networking/{ssb/patchwork => ssb-patchwork}/default.nix | 0 pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/applications/networking/{ssb/patchwork => ssb-patchwork}/default.nix (100%) diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb-patchwork/default.nix similarity index 100% rename from pkgs/applications/networking/ssb/patchwork/default.nix rename to pkgs/applications/networking/ssb-patchwork/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a1e00e590eb..cd9d7dbe5745 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6840,7 +6840,7 @@ in svgcleaner = callPackage ../tools/graphics/svgcleaner { }; - ssb-patchwork = callPackage ../applications/networking/ssb/patchwork { }; + ssb-patchwork = callPackage ../applications/networking/ssb-patchwork { }; ssdeep = callPackage ../tools/security/ssdeep { }; @@ -15768,7 +15768,7 @@ in hiawatha = callPackage ../servers/http/hiawatha {}; - home-assistant = callPackage ../servers/home-assistant { + home-assistant = callPackage ../servers/home-assistant { python3 = python37; }; From 4fbf2d1b1b57db69d3d4c86c3ecd7eff8f4b33d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 11:39:18 +0000 Subject: [PATCH 1826/3452] bmake: 20200506 -> 20200606 --- pkgs/development/tools/build-managers/bmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 499ef7a19b31..b119b5a38105 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20200506"; + version = "20200606"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "1qiq6lvlg2hqiq03slv4vzv3bn4cr3w95r3i6m5fa4hgn2dkrhqa"; + sha256 = "00kh1g8z6808ylbfcn9afpb0xmb99k302dfdsmyx1rsn65xs58v7"; }; nativeBuildInputs = [ getopt ]; From 95eb2b296e6b000ef127f9fd34bafc8452d12f59 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 15:54:55 +0000 Subject: [PATCH 1827/3452] mosquitto: 1.6.8 -> 1.6.10 --- pkgs/servers/mqtt/mosquitto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index b52cfb09d4f1..8f632ed9b58f 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "mosquitto"; - version = "1.6.8"; + version = "1.6.10"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - sha256 = "1py13vg3vwwwg6jdnmq46z6rlzb84r4ggqsmsrn4yar5hrw9pa90"; + sha256 = "0g9iywm0s08b0ax1qx4j5lixfc1m6p48lv14vlil6wns4azc3fsc"; }; postPatch = '' From 385cfde32f080466652955af127f46c701fa6bd7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 15 Jun 2020 17:38:57 -0700 Subject: [PATCH 1828/3452] python3Packages.invoke: don't recompile bytecode Has vendored code, a given .py might not be compatible --- pkgs/development/python-modules/invoke/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index 45f3ee7a04db..7189727cf3a8 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -20,6 +20,9 @@ buildPythonPackage rec { # errors with vendored libs doCheck = false; + # has vendored python2 code + dontUsePythonRecompileBytecode = true; + meta = { description = "Pythonic task execution"; license = lib.licenses.bsd2; From 2d0934775c9063f3563715b23954fe1787211da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 16 Jun 2020 16:19:19 +0100 Subject: [PATCH 1829/3452] python3.pkgs.pyls-black: mark as broken --- pkgs/development/python-modules/pyls-black/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix index d21002f91606..478b08b26471 100644 --- a/pkgs/development/python-modules/pyls-black/default.nix +++ b/pkgs/development/python-modules/pyls-black/default.nix @@ -27,6 +27,9 @@ buildPythonPackage rec { homepage = "https://github.com/rupert/pyls-black"; description = "Black plugin for the Python Language Server"; license = licenses.mit; + # Not compatible with 0.33.1 + # https://github.com/rupert/pyls-black/issues/24 + broken = true; # since 2020-06-16 maintainers = [ maintainers.mic92 ]; }; } From 93acf27f06cea9355e5d8df6dec4461784f3a0a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 16 Jun 2020 16:20:46 +0100 Subject: [PATCH 1830/3452] python3.pkgs.pyls-mypy: 0.1.6 -> 0.1.8 --- .../python-modules/pyls-mypy/default.nix | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix index b4fd98607d8a..b9cf9738ed42 100644 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -1,29 +1,45 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , future, python-language-server, mypy, configparser -, pytest, mock, isPy3k, pytestcov, coverage +, pytestCheckHook, mock, isPy3k, pytestcov, coverage +, fetchpatch }: buildPythonPackage rec { pname = "pyls-mypy"; - version = "0.1.6"; + version = "0.1.8"; src = fetchFromGitHub { owner = "tomv564"; repo = "pyls-mypy"; rev = version; - sha256 = "0c1111m9h6f05frkyj6i757q9y2lijpbv8nxmwgp3nqbpkvfnmrk"; + sha256 = "14giyvcrq4w3asm1nyablw70zkakkcsr76chk5a41alxlk4l2alb"; }; - disabled = !isPy3k; + # presumably tests don't find typehints ? + doCheck = false; - checkPhase = '' - HOME=$TEMPDIR pytest + disabledTests = [ + "test_parse_line_without_line" + ]; + + preCheck = '' + export HOME=$TEMPDIR ''; - checkInputs = [ pytest mock pytestcov coverage ]; + patches = [ + # makes future optional + (fetchpatch { + url = "https://github.com/tomv564/pyls-mypy/commit/2949582ff5f39b1de51eacc92de6cfacf1b5ab75.patch"; + sha256 = "0bqkvdy5mxyi46nhq5ryynf465f68b6ffy84hmhxrigkapz085g5"; + }) + ]; + + checkInputs = [ mock pytestcov coverage pytestCheckHook ]; propagatedBuildInputs = [ - mypy python-language-server future configparser + mypy python-language-server configparser + ] ++ lib.optional (isPy27) [ + future ]; meta = with lib; { From 8a9556a36aabb3cd64dd53e4b059ce9969249e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 16 Jun 2020 15:55:21 +0100 Subject: [PATCH 1831/3452] python38.pkgs.rope: enable build --- pkgs/development/python-modules/rope/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index c7b75bab7424..fd7bf55ad52c 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -4,8 +4,6 @@ buildPythonPackage rec { pname = "rope"; version = "0.17.0"; - disabled = pythonAtLeast "3.8"; # 0.17 should support Python 3.8 - src = fetchPypi { inherit pname version; sha256 = "658ad6705f43dcf3d6df379da9486529cf30e02d9ea14c5682aa80eb33b649e1"; From 141a029ad733a539f20b34c1ff14f5511f55a05b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 16 Jun 2020 16:12:57 +0100 Subject: [PATCH 1832/3452] python3.python-jsonrpc-server: enable python38 build --- .../python-jsonrpc-server/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 587f27fd51be..586c6edfa829 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,6 +1,7 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder , pytest, mock, pytestcov, coverage , future, futures, ujson, isPy38 +, fetchpatch }: buildPythonPackage rec { @@ -16,6 +17,8 @@ buildPythonPackage rec { postPatch = '' sed -i 's/version=versioneer.get_version(),/version="${version}",/g' setup.py + # https://github.com/palantir/python-jsonrpc-server/issues/36 + sed -i -e 's!ujson<=!ujson>=!' setup.py ''; checkInputs = [ @@ -26,7 +29,16 @@ buildPythonPackage rec { pytest ''; - disabled = isPy38; + patches = [ + (fetchpatch { + url = "https://github.com/palantir/python-jsonrpc-server/commit/0a04cc4e9d44233b1038b12d63cd3bd437c2374e.patch"; + sha256 = "177zdnp1808r2pg189bvzab44l8i2alsgv04kmrlhhnv40h66qyg"; + }) + (fetchpatch { + url = "https://github.com/palantir/python-jsonrpc-server/commit/5af6e43d0c1fb9a6a29b96d38cfd6dbeec85d0ea.patch"; + sha256 = "1gx7lc1jxar1ngqqfkdn21s46y1mfnjf7ky2886ydk53nkaba91m"; + }) + ]; propagatedBuildInputs = [ future ujson ] ++ stdenv.lib.optional (pythonOlder "3.2") futures; From 557644a1258902d20619679755dfa393b4fdad07 Mon Sep 17 00:00:00 2001 From: eta Date: Tue, 16 Jun 2020 16:24:18 +0100 Subject: [PATCH 1833/3452] swiften: unbreak package using Arch patch and scons flags The `swiften` XMPP library was broken as of 2019. This commit fixes it, by copying a patch from the Arch Linux PKGBUILD (https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/swift) and by using the same scons flags in that PKGBUILD. Additionally, we use the SWIFTEN_INSTALLDIR env variable to actually put something in the output. Of note is the flag swiften_dll=1, which means that the library is now built dynamically. --- .../libraries/swiften/build-fix.patch | 32 +++++++++++++++++++ .../development/libraries/swiften/default.nix | 9 ++++-- 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/swiften/build-fix.patch diff --git a/pkgs/development/libraries/swiften/build-fix.patch b/pkgs/development/libraries/swiften/build-fix.patch new file mode 100644 index 000000000000..01814cadfbd4 --- /dev/null +++ b/pkgs/development/libraries/swiften/build-fix.patch @@ -0,0 +1,32 @@ +diff -wbBur swift-4.0.2/Swift/QtUI/UserSearch/QtUserSearchWindow.h swift-4.0.2.my/Swift/QtUI/UserSearch/QtUserSearchWindow.h +--- swift-4.0.2/Swift/QtUI/UserSearch/QtUserSearchWindow.h 2018-04-06 13:06:46.000000000 +0300 ++++ swift-4.0.2.my/Swift/QtUI/UserSearch/QtUserSearchWindow.h 2019-10-08 20:52:23.171475337 +0300 +@@ -9,6 +9,7 @@ + #include + + #include ++#include + + #include + +diff -wbBur swift-4.0.2/Swiften/Network/PlatformNATTraversalWorker.cpp swift-4.0.2.my/Swiften/Network/PlatformNATTraversalWorker.cpp +--- swift-4.0.2/Swiften/Network/PlatformNATTraversalWorker.cpp 2018-04-06 13:06:46.000000000 +0300 ++++ swift-4.0.2.my/Swiften/Network/PlatformNATTraversalWorker.cpp 2019-10-08 21:12:25.284754131 +0300 +@@ -157,7 +157,7 @@ + miniUPnPInterface = new MiniUPnPInterface(); + miniUPnPSupported = miniUPnPInterface->isAvailable(); + } +- SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl; ++// SWIFT_LOG(debug) << "UPnP NAT traversal supported: " << miniUPnPSupported << std::endl; + if (miniUPnPSupported) { + return miniUPnPInterface; + } +@@ -168,7 +168,7 @@ + natPMPInterface = new NATPMPInterface(); + natPMPSupported = natPMPInterface->isAvailable(); + } +- SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl; ++// SWIFT_LOG(debug) << "NAT-PMP NAT traversal supported: " << natPMPSupported << std::endl; + if (natPMPSupported) { + return natPMPInterface; + } diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index bdac55fe2ec3..19bacdd2a614 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -12,17 +12,21 @@ stdenv.mkDerivation rec { sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w"; }; - patches = [ ./scons.patch ]; + patches = [ ./scons.patch ./build-fix.patch ]; sconsFlags = [ "openssl=${openssl.dev}" "boost_includedir=${boost.dev}/include" "boost_libdir=${boost.out}/lib" "boost_bundled_enable=false" + "max_jobs=1" + "optimize=1" + "debug=0" + "swiften_dll=1" ]; preInstall = '' installTargets="$out" - installFlags+=" SWIFT_INSTALLDIR=$out" + installFlags+=" SWIFTEN_INSTALLDIR=$out" ''; enableParallelBuilding = true; @@ -33,6 +37,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.twey ]; - broken = true; # Broken since 2019-11-20 (https://hydra.nixos.org/build/114681755) }; } From 5d52144fecb057889a9f928271698dac8ecf40f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 16 Jun 2020 16:05:13 +0100 Subject: [PATCH 1834/3452] python3.pkgs.python-language-server: 0.31.9 -> 0.33.1 --- .../python-language-server/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 9f42839960d3..c223ccb89b8c 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -21,15 +21,20 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.31.9"; + version = "0.33.1"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "06hd6a1hhd57hrq4vbwfs0saplkhsrz2krv8kq9kw4fz4hx7zj74"; + sha256 = "064ck4ikrrrhq8wjpbs5k6hzkrjvfg91pd6351471xpsij0kj16f"; }; + postPatch = '' + # https://github.com/palantir/python-jsonrpc-server/issues/36 + sed -i -e 's!ujson<=!ujson>=!' setup.py + ''; + # The tests require all the providers, disable otherwise. doCheck = providers == ["*"]; @@ -53,10 +58,8 @@ buildPythonPackage rec { "test_pandas_completions" "test_matplotlib_completions" "test_snippet_parsing" + "test_numpy_hover" ] ++ stdenv.lib.optional isPy27 "test_flake8_lint"; - # checkPhase = '' - # HOME=$TEMPDIR pytest -k "not test_pyqt_completion and not - # ''; propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ] ++ stdenv.lib.optional (withProvider "autopep8") autopep8 From 0f5aa1901509d79b62e0fa4925261e67e08de523 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 16:09:18 +0000 Subject: [PATCH 1835/3452] monetdb: 11.35.19 -> 11.37.7 --- pkgs/servers/sql/monetdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 5a58a52210af..ec232b864637 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -3,7 +3,7 @@ }: let - version = "11.35.19"; + version = "11.37.7"; in stdenv.mkDerivation { pname = "monetdb"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "1qfgsv1k23sn6jl7jbxmfh7w7hyzmh8r1cddl4kksqrw41q6h82q"; + sha256 = "00z6c7z4f9ww43574nz32b06rw5ln5fy3hlml32h2wrwsg0cj5jh"; }; postPatch = '' From 9954d5a583c14ce81ebdeb4f9ea456a6bdd82d9f Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 16 Jun 2020 11:19:04 -0500 Subject: [PATCH 1836/3452] verilator: 4.034 -> 4.036 Signed-off-by: Austin Seipp --- pkgs/applications/science/electronics/verilator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 189e09f8241b..0613e22bbda0 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.034"; + version = "4.036"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "02xqvl9ic21jpda0xldh4ihqwl4ss8389s8fklgx5d98xq37pval"; + sha256 = "1sy02pgq3kvk8548l57hsh08vfbqdg8dghj8mwlybdi8fdjz4z1h"; }; enableParallelBuilding = true; From c2e1f9bc070e31d25b4ae8368b539b9f3b6da9c9 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 16 Jun 2020 11:27:38 -0500 Subject: [PATCH 1837/3452] yosys: 2020.06.11 -> 2020.06.16 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 332824185616..09e51e4c6471 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.11"; + version = "2020.06.16"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "a1785e988b2b51dac32985dd6b0afdcedc6bda1d"; - sha256 = "0987f5vm2zb0i02c3vlw21gihky2cfj5l9b78ddzhxfiv0qfkdfp"; + rev = "39ba90a8b84d740b670a9f1df5148b824d441c63"; + sha256 = "1ncscbhyq4f07d28l32j37y5d84vyqxfx0fbzhb7nzfhplk8hh0s"; }; enableParallelBuilding = true; From 7f38e921156a0f72c05a0709be4832b5a43b89dc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 16:45:11 +0000 Subject: [PATCH 1838/3452] man-pages: 5.06 -> 5.07 --- pkgs/data/documentation/man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index a9a64fb40299..5d58284cb663 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "man-pages"; - version = "5.06"; + version = "5.07"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz"; - sha256 = "0l7ypgl36jswa077qvdh1rcsvnwr64vja6cc32bab86sm41akf3h"; + sha256 = "13b3q7c67r0wkla4pdihl1qh09k67ms2z5jgzfqgpdqqy6mgziwd"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; From 1c7936fb2c16427a7d41462405414240b51f1ad8 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 16 Jun 2020 17:14:30 +0200 Subject: [PATCH 1839/3452] botocore: 1.16.24 -> 1.17.3 --- pkgs/development/python-modules/botocore/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 90f608e38645..0e4870a4300f 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.16.24"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.17.3"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "17bc71415186efb86a25dd674f78064cdd85139485967d5a0741c7b83d62cf5b"; + sha256 = "0mrkkb7vc7jdxrr9gyg92i6ar801kpss53nfqp1di6xfi4jxkx0k"; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.py --replace ",<0.16" "" + substituteInPlace setup.py --replace "docutils>=0.10,<0.16" "docutils>=0.10" ''; checkInputs = [ mock nose ]; From 19a01f3b5c60d9ad38a60a08fb1cc76352f49cee Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 16 Jun 2020 17:15:32 +0200 Subject: [PATCH 1840/3452] boto3: 1.13.24 -> 1.14.3 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 2c42bf75a5e3..53a2be0b8d1f 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.13.24"; # N.B: if you change this, change botocore too + version = "1.14.3"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "5df1f3f84587b4d812f6f178031119b80920822b459bbb70ad49f431128655dc"; + sha256 = "1qapj3hbbj116x7yca3m9ivl44iisrk0cppri9sk3b1mpv371a0v"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From aa1c7dc77e6d30d92e46fbfed0eca91cb532b9b3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 16 Jun 2020 17:15:49 +0200 Subject: [PATCH 1841/3452] awscli: 1.18.74 -> 1.18.80 --- pkgs/tools/admin/awscli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 56cafb2cec21..02d25b07ab1a 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -19,15 +19,15 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.74"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.80"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "1681945m9wxzqx4yv09zxskkbs2fd8rz1r3krjpwrpar3iiq1nmj"; + sha256 = "0519rlc0m0888ag7s55lz516vsgif5pws6rzhmclbbw38g4wmb2k"; }; postPatch = '' - substituteInPlace setup.py --replace ",<0.16" "" + substituteInPlace setup.py --replace "docutils>=0.10,<0.16" "docutils>=0.10" ''; # No tests included From cd0cfb2ed1355bcb14a2a733a55bc12b22de516c Mon Sep 17 00:00:00 2001 From: Ada Avery <2561504+SquircleSpace@users.noreply.github.com> Date: Sat, 6 Jun 2020 02:46:57 -0700 Subject: [PATCH 1842/3452] raspberrypi-tools: 2018-10-03 -> 2020-5-28 --- ...tools-dont-install-sysv-init-scripts.patch | 20 ------------------- .../linux/firmware/raspberrypi/tools.nix | 8 +++----- 2 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch b/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch deleted file mode 100644 index e12aeeb0cdb8..000000000000 --- a/pkgs/os-specific/linux/firmware/raspberrypi/tools-dont-install-sysv-init-scripts.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt -index aed0e83..b325676 100644 ---- a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt -+++ b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt -@@ -17,15 +17,6 @@ target_link_libraries(vcfiled - install(TARGETS vcfiled - RUNTIME DESTINATION sbin) - --configure_file (etc/init.d/vcfiled ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled) -- --# script to start up vcfiled at start of day --install(PROGRAMS ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled -- DESTINATION /etc/init.d) --# install locally to the installation directory too --install(PROGRAMS ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled -- DESTINATION ${VMCS_INSTALL_PREFIX}/share/install) -- - # test program for vcfiled_check library - add_executable(vcfiled_lock_test vcfiled_lock_test.c) - target_link_libraries(vcfiled_lock_test vcfiled_check) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix index e3fa90ac388d..6c4d49e4e240 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix @@ -2,17 +2,15 @@ stdenv.mkDerivation { pname = "raspberrypi-tools"; - version = "2018-10-03"; + version = "2020-05-28"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "de4a7f2e3c391e2d3bc76af31864270e7802d9ac"; - sha256 = "0w96xa98ngdk9m6wv185w8waa7wm2hkn2bhxz52zd477hchzrxlg"; + rev = "f97b1af1b3e653f9da2c1a3643479bfd469e3b74"; + sha256 = "1r7n05rv96hqjq0rn0qzchmfqs0j7vh3p8jalgh66s6l0vms5mwy"; }; - patches = [ ./tools-dont-install-sysv-init-scripts.patch ]; - nativeBuildInputs = [ cmake pkgconfig ]; preConfigure = '' From 893b1a33fa86ad5e4cce6ea50ca650c27b7058c6 Mon Sep 17 00:00:00 2001 From: Ada Avery <2561504+SquircleSpace@users.noreply.github.com> Date: Sat, 6 Jun 2020 02:44:39 -0700 Subject: [PATCH 1843/3452] linux_rpi: 1.20190925 -> 1.20200601 --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 31a2cc2aa157..a3d2bfd4836c 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,8 @@ { stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, rpiVersion, ... } @ args: let - modDirVersion = "4.19.75"; - tag = "1.20190925"; + modDirVersion = "4.19.118"; + tag = "1.20200601"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -12,7 +12,7 @@ lib.overrideDerivation (buildLinux (args // { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "0l91kb4jjxg4fcp7d2aqm1fj34ns137rys93k907mdgnarcliafs"; + sha256 = "11jzsmnd1qry2ir9vmsv0nfdzjpgkn5yab5ylxcz406plc073anp"; }; defconfig = { From 271a9a012b7497984b236f1d136e58386677cf7d Mon Sep 17 00:00:00 2001 From: Ada Avery <2561504+SquircleSpace@users.noreply.github.com> Date: Sat, 6 Jun 2020 02:50:30 -0700 Subject: [PATCH 1844/3452] rpiboot-unstable: 2018-03-27 -> 2020-5-11 --- pkgs/development/misc/rpiboot/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/unstable.nix index 1591a1efd17a..a8f7e4795e77 100644 --- a/pkgs/development/misc/rpiboot/unstable.nix +++ b/pkgs/development/misc/rpiboot/unstable.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libusb1 }: let - version = "2018-03-27"; + version = "2020-05-11"; name = "rpiboot-unstable-${version}"; in stdenv.mkDerivation { inherit name; @@ -9,8 +9,8 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "raspberrypi"; repo = "usbboot"; - rev = "fb86716935f2e820333b037a2ff93a338ad9b695"; - sha256 = "163g7iw7kf6ra71adx6lf1xzf3kv20bppva15ljwn54jlah5mv98"; + rev = "c650cd747c1d0597487dcf319bf95b5ba775d78b"; + sha256 = "17kapny79dh05vfmrniqdvz6xhpwnqnw0511ycfx4qcjh4krxh8n"; }; nativeBuildInputs = [ libusb1 ]; From df9950ed7bdda48170bef68a839b3bfae0acb10f Mon Sep 17 00:00:00 2001 From: Ada Avery <2561504+SquircleSpace@users.noreply.github.com> Date: Sat, 6 Jun 2020 13:12:47 -0700 Subject: [PATCH 1845/3452] raspberrypifw: 1.20190925 -> 1.20200601 --- pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index bd9c58d33c9c..77a284446366 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "raspberrypi-firmware"; - version = "1.20190925"; + version = "1.20200601"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "0xyj3f04dcfnl9hp8hakgwcb1msqh7934n0pclcmzy47xjkz7ris"; + sha256 = "1vm038f9digwg8gdxl2bypzlip3ycjb6bl56274gh5i9abl6wjvf"; }; installPhase = '' From 1af7900cd29258b59fb432d52afa78a7220337a2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 15 Jun 2020 17:38:57 -0700 Subject: [PATCH 1846/3452] python3Packages.invoke: don't recompile bytecode Has vendored code, a given .py might not be compatible --- pkgs/development/python-modules/invoke/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index 45f3ee7a04db..7189727cf3a8 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -20,6 +20,9 @@ buildPythonPackage rec { # errors with vendored libs doCheck = false; + # has vendored python2 code + dontUsePythonRecompileBytecode = true; + meta = { description = "Pythonic task execution"; license = lib.licenses.bsd2; From 77730556e070f73bdfecc46794a03b66a41647b7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 Jun 2020 19:22:31 +0200 Subject: [PATCH 1847/3452] microcodeIntel: 20200609 -> 20200616 --- pkgs/os-specific/linux/microcode/intel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index bbf584b2fa3b..475288a0b6f6 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20200609"; + version = "20200616"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "0vzsv0fqp44dhmvj6syjjab3cs1bc4r0g7g97lna8l91vj2yin9j"; + sha256 = "13jrs8hwh7dhjjb9kncb8lk199afaxglkh1cfisl6zca1h36g563"; }; nativeBuildInputs = [ iucode-tool libarchive ]; From 0d51c0c9b0db3d84f4e0b2004b4e48ec8de2d5ac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 18:21:58 +0000 Subject: [PATCH 1848/3452] numix-icon-theme: 20.03.20 -> 20.06.07 --- pkgs/data/icons/numix-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 56bb2f3808fb..30e212629e86 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme"; - version = "20.03.20"; + version = "20.06.07"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "092f8k38xf9yz898nrangm0ia211d41z8kx0v6njfqfgpiad1s7q"; + sha256 = "1yp9parc8ihmai8pswf4qzrqd88qpls87ipq8ylx38yqns7wsn4h"; }; nativeBuildInputs = [ gtk3 ]; From 88f749545c8a3299bdf6f856285c32058063f6cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Tue, 16 Jun 2020 15:55:01 +0200 Subject: [PATCH 1849/3452] hplip: Add missing library Otherwise, things like `hp-setup` fail finding gi: ``` HP Linux Imaging and Printing System (ver. 3.20.5) Printer/Fax Setup Utility ver. 9.0 Copyright (c) 2001-18 HP Development Company, LP This software comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to distribute it under certain conditions. See COPYING file for more details. Traceback (most recent call last): File "/nix/store/rmzq8c4n47s4q4p31w18waz0zrba2ljl-hplip-3.20.5/share/hplip/setup.py", line 314, in ui = import_module(ui_package + ".setupdialog") File "/nix/store/n0b076p351ma864q38if4yglsg99hw2s-python3-3.8.3/lib/python3.8/importlib/__init__.py", line 127, in import_module return _bootstrap._gcd_import(name[level:], package, level) File "", line 1014, in _gcd_import File "", line 991, in _find_and_load File "", line 975, in _find_and_load_unlocked File "", line 671, in _load_unlocked File "", line 783, in exec_module File "", line 219, in _call_with_frames_removed File "/nix/store/rmzq8c4n47s4q4p31w18waz0zrba2ljl-hplip-3.20.5/share/hplip/ui5/setupdialog.py", line 31, in from base import device, utils, models, pkit File "/nix/store/rmzq8c4n47s4q4p31w18waz0zrba2ljl-hplip-3.20.5/share/hplip/base/pkit.py", line 38, in from gi import _gobject as gobject ModuleNotFoundError: No module named 'gi' ``` --- pkgs/misc/drivers/hplip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 2ecd163fbf24..daedbe73e200 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -72,7 +72,7 @@ python3Packages.buildPythonApplication { pythonPath = with python3Packages; [ dbus pillow - pygobject2 + pygobject3 reportlab usbutils sip From 907353b1e43195af775c6dc2075479774cb49783 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 16 Jun 2020 20:34:30 +0200 Subject: [PATCH 1850/3452] hplip: use wrapQtApp Otherwise, things like hp-setup segfault if you run them from another nixpkgs checkout: ``` HP Linux Imaging and Printing System (ver. 3.20.5) Printer/Fax Setup Utility ver. 9.0 Copyright (c) 2001-18 HP Development Company, LP This software comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to distribute it under certain conditions. See COPYING file for more details. qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in "" This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem. [1] 4543 abort (core dumped) result/bin/hp-setup ``` --- pkgs/misc/drivers/hplip/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index daedbe73e200..98ced28b8773 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -5,7 +5,7 @@ , net-snmp, openssl, perl, nettools , bash, coreutils, utillinux # To remove references to gcc-unwrapped -, removeReferencesTo +, removeReferencesTo, qt5 , withQt5 ? true , withPlugin ? false , withStaticPPDInstall ? false @@ -67,7 +67,10 @@ python3Packages.buildPythonApplication { zlib ]; - nativeBuildInputs = [ pkgconfig removeReferencesTo ]; + nativeBuildInputs = [ + pkgconfig + removeReferencesTo + ] ++ stdenv.lib.optional withQt5 qt5.wrapQtAppsHook; pythonPath = with python3Packages; [ dbus @@ -219,6 +222,10 @@ python3Packages.buildPythonApplication { --replace {,${utillinux}/bin/}logger \ --replace {/usr,$out}/bin remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/*.so) + '' + stdenv.lib.optionalString withQt5 '' + for f in $out/bin/hp-*;do + wrapQtApp $f + done ''; # There are some binaries there, which reference gcc-unwrapped otherwise. From c6d32d816cf0340a462d71d1daba2f7a80edc1b5 Mon Sep 17 00:00:00 2001 From: marius851000 Date: Tue, 16 Jun 2020 20:45:23 +0200 Subject: [PATCH 1851/3452] openmw: 0.45.0 -> 0.46.0 (#90589) --- pkgs/games/openmw/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index cae97dc42158..22f3ea8d6ad3 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -6,19 +6,19 @@ let src = fetchFromGitHub { owner = "OpenMW"; repo = "osg"; - rev = "2b4c8e37268e595b82da4b9aadd5507852569b87"; - sha256 = "0admnllxic6dcpic0h100927yw766ab55dix002vvdx36i6994jb"; + rev = "1556cd7966ebc1c80b6626988d2b25fb43a744cf"; + sha256 = "0d74hijzmj82nx3jkv5qmr3pkgvplra0b8fbjx1y3vmzxamb0axd"; }; }); in mkDerivationWith stdenv.mkDerivation rec { - version = "0.45.0"; + version = "0.46.0"; pname = "openmw"; src = fetchFromGitHub { owner = "OpenMW"; repo = "openmw"; rev = "${pname}-${version}"; - sha256 = "1r87zrsnza2v9brksh809zzqj6zhk5xj15qs8iq11v1bscm2a2j4"; + sha256 = "0rm32zsmxvr6b0jjihfj543skhicbw5kg6shjx312clhlm035w2x"; }; enableParallelBuilding = true; From 7903e4b4e04258eb224d1c3b78e5ae0d8e971354 Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Tue, 16 Jun 2020 21:01:49 +0200 Subject: [PATCH 1852/3452] libressl_3_1: 3.1.2 -> 3.1.3 --- pkgs/development/libraries/libressl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index fc797cf32881..bb9fb7772892 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -69,7 +69,7 @@ in { }; libressl_3_1 = generic { - version = "3.1.2"; - sha256 = "14nqg34yc9bm64hz96hhlvm00gwn2acjs0hcwhs9l50plrz2z2pq"; + version = "3.1.3"; + sha256 = "184znscbkww65aavy2p4v4xncalp1ni19c2w5yvfq4pnmhb06sy7"; }; } From 147dff2b5dd8904c473ef3538aa47c430c5e2f5f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 19:38:27 +0000 Subject: [PATCH 1853/3452] prometheus-mysqld-exporter: 0.11.0 -> 0.12.1 --- pkgs/servers/monitoring/prometheus/mysqld-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 3ef947b28738..8787a39de32a 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "mysqld_exporter"; - version = "0.11.0"; + version = "0.12.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/mysqld_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "mysqld_exporter"; - sha256 = "1684jf96dy5bs0y0689vlcw82lqw8kw2phlnp6pq1cq56fcwdxjn"; + sha256 = "0nzbfzx4dzs3cagdid1fqddrqimgr8x6r8gmmxglrss05c8srgs8"; }; meta = with stdenv.lib; { From 912a58428c71ca73426c25c9d4eac69f119a0517 Mon Sep 17 00:00:00 2001 From: James Kay Date: Tue, 16 Jun 2020 20:44:10 +0100 Subject: [PATCH 1854/3452] 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 db20a2371cf67678aa01411b6cc40704000f05b9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 16 Jun 2020 23:02:48 +0300 Subject: [PATCH 1855/3452] krop: move libsForQt5.poppler out of propagatedBuildInputs (#87790) --- pkgs/applications/graphics/krop/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix index c88d04826d14..ee4906769770 100644 --- a/pkgs/applications/graphics/krop/default.nix +++ b/pkgs/applications/graphics/krop/default.nix @@ -15,9 +15,11 @@ python3Packages.buildPythonApplication rec { pyqt5 pypdf2 poppler-qt5 - libsForQt5.poppler ghostscript ]; + buildInputs = [ + libsForQt5.poppler + ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; makeWrapperArgs = [ From b6654d9d6cad615835d6d60b9a8da8f41bfdcc77 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 12:55:33 -0700 Subject: [PATCH 1856/3452] python2Packages: default to dontUsePythonRecompileBytecode = true; --- .../development/interpreters/python/mk-python-derivation.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 41efddbb3e02..595102524091 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -165,6 +165,11 @@ let # Python packages built through cross-compilation are always for the host platform. disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; + # many packages that support python2, may include code + # which python2 is not able to compile + # mkDerivation hash will not change when passed null attrs + dontUsePythonRecompileBytecode = attrs.dontUsePythonRecompileBytecode or (if python.isPy27 then true else null); + meta = { # default to python's platforms platforms = python.meta.platforms; From 393f5fc5f192cd665c6131c1def87166a9eab228 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 12:56:22 -0700 Subject: [PATCH 1857/3452] python2Packages.freezegun: disable tests for python2 Contains python3 exclusive code --- pkgs/development/python-modules/freezegun/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 3a45e0942f83..92254b94dee9 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , dateutil , six , mock @@ -19,6 +20,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ dateutil six ]; checkInputs = [ mock nose pytest ]; + # contains python3 specific code + doCheck = !isPy27; meta = with stdenv.lib; { description = "FreezeGun: Let your Python tests travel through time"; From 0d4134de4a3436fabf7ea8afbac3c0a3028d0fbb Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 16 Jun 2020 14:34:03 +0200 Subject: [PATCH 1858/3452] nixos/systemd: Update warning for restarting oneshots Restart= can be anything other than on-success and always for onehost units as of https://github.com/systemd/systemd/pull/13754/commits/10e72727eeeeb1a495303ec406fa8d1e1a83dc6e which is contained in systemd 245. --- nixos/modules/system/boot/systemd.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 99892a28115c..a8e51fc09014 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -826,8 +826,13 @@ in config = { warnings = concatLists (mapAttrsToList (name: service: - optional (service.serviceConfig.Type or "" == "oneshot" && service.serviceConfig.Restart or "no" != "no") - "Service ‘${name}.service’ with ‘Type=oneshot’ must have ‘Restart=no’") cfg.services); + let + type = service.serviceConfig.Type or ""; + restart = service.serviceConfig.Restart or "no"; + in optional + (type == "oneshot" && (restart == "always" || restart == "on-success")) + "Service '${name}.service' with 'Type=oneshot' cannot have 'Restart=always' or 'Restart=on-success'") + cfg.services); system.build.units = cfg.units; From 9ef6349dcdd33c41ef4a4fb6423f0abb6c918f52 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 13:28:57 -0700 Subject: [PATCH 1859/3452] pythonPackages.JPype: disable for python2 setup.py is no longer python2 compatible --- pkgs/development/python-modules/JPype1/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index b70879952f4e..ca30631a68e3 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -1,12 +1,14 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , pytest }: buildPythonPackage rec { pname = "JPype1"; version = "0.7.5"; + disabled = isPy27; src = fetchPypi { inherit pname version; From d5ca07e16024b2696caa1e08019de670bd3307a9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 13:30:52 -0700 Subject: [PATCH 1860/3452] pythonPackages.astral: disable for python2 ``` Processing ./astral-2.2-py2-none-any.whl ERROR: Package 'astral' requires a different Python: 2.7.18 not in '>=3.6' ``` --- pkgs/development/python-modules/astral/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 11a29f5d37a9..13c9932a1283 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytz, requests, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest }: buildPythonPackage rec { pname = "astral"; version = "2.2"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 8db288ee06a05688fbe6d1a8ff55e03e5e1e40a7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 13:32:05 -0700 Subject: [PATCH 1861/3452] pythonPackages.av: disable for python2 Uses shlex commands which aren't present in python2 ``` from shlex import quote ImportError: cannot import name quote ``` --- pkgs/development/python-modules/av/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 123a53d5cf3a..3a2fcc04d046 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , numpy , ffmpeg_4 , pkgconfig @@ -9,6 +10,7 @@ buildPythonPackage rec { pname = "av"; version = "8.0.2"; + disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; From 625653c36d1d6a585feedfa19a8838b4e3a70d12 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 13:39:28 -0700 Subject: [PATCH 1862/3452] pythonPackages.auth0-python: fix tests --- .../python-modules/auth0-python/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index e2fafb3aef75..fed673453d19 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -3,6 +3,7 @@ , fetchPypi , requests , mock +, pytestCheckHook }: buildPythonPackage rec { @@ -20,6 +21,17 @@ buildPythonPackage rec { checkInputs = [ mock + pytestCheckHook + ]; + + pytestFlagsArray = [ + # jwt package is not available in nixpkgs + "--ignore=auth0/v3/test/authentication/test_token_verifier.py" + ]; + + # tries to ping websites (e.g. google.com) + disabledTests = [ + "can_timeout" ]; meta = with lib; { From c3597a127ad55f5e2f59c5966716291aee791e55 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 13:41:57 -0700 Subject: [PATCH 1863/3452] pythonPackages.avro: fix build --- pkgs/development/python-modules/avro/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 48ccd891c857..58c3b46cdba4 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pycodestyle, isort }: buildPythonPackage rec { pname = "avro"; @@ -10,6 +10,9 @@ buildPythonPackage rec { sha256 = "4487f0e91d0d44142bd08b3c6da57073b720c3effb02eeb4e2e822804964c56b"; }; + nativeBuildInputs = [ pycodestyle ]; + propagatedBuildInputs = [ isort ]; + meta = with stdenv.lib; { description = "A serialization and RPC framework"; homepage = "https://pypi.python.org/pypi/avro/"; From fe1a38a2e2e092d8804a177be0bd0601455fba37 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 13:42:37 -0700 Subject: [PATCH 1864/3452] pythonPackages.base58: disable python2 python2 abandoned upstream --- pkgs/development/python-modules/base58/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix index e0d4d59fc035..53f5f0599e86 100644 --- a/pkgs/development/python-modules/base58/default.nix +++ b/pkgs/development/python-modules/base58/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest, pyhamcrest }: +{ stdenv, fetchPypi, buildPythonPackage, isPy27, pytest, pyhamcrest }: buildPythonPackage rec { pname = "base58"; version = "2.0.0"; + disabled = isPy27; # python 2 abandoned upstream src = fetchPypi { inherit pname version; From 37019137751b55452a21564c8489bac7cbefb3aa Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 13:45:50 -0700 Subject: [PATCH 1865/3452] pythonPackages.cfgv: disable python2, abandoned --- pkgs/development/python-modules/cfgv/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix index c040ae7a5f3f..e1b3dfc8e2b1 100644 --- a/pkgs/development/python-modules/cfgv/default.nix +++ b/pkgs/development/python-modules/cfgv/default.nix @@ -1,8 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi, six }: +{ lib, buildPythonPackage, fetchPypi, isPy27, six }: buildPythonPackage rec { pname = "cfgv"; version = "3.1.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 03b2293d8baa9663a01f5d94bf9f39866f7d23cb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 13:46:14 -0700 Subject: [PATCH 1866/3452] pythonPackages.cloudpickle: disable python2, abandoned --- pkgs/development/python-modules/cloudpickle/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index e59f1d8afc42..551dd06f630b 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, mock }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytest, mock }: buildPythonPackage rec { pname = "cloudpickle"; version = "1.4.1"; + disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; From e6f7592065116f954edcab4ea2d62ec01a718024 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 13:48:32 -0700 Subject: [PATCH 1867/3452] pythonPackages.etelemetry: disabled python2, abandoned --- pkgs/development/python-modules/etelemetry/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/etelemetry/default.nix b/pkgs/development/python-modules/etelemetry/default.nix index 0b9879ea715a..041847089e94 100644 --- a/pkgs/development/python-modules/etelemetry/default.nix +++ b/pkgs/development/python-modules/etelemetry/default.nix @@ -1,8 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi, requests, pytest }: +{ lib, buildPythonPackage, fetchPypi, isPy27, requests, pytest }: buildPythonPackage rec { version = "0.2.1"; pname = "etelemetry"; + disabled = isPy27; src = fetchPypi { inherit pname version; From f8bf71047b50fd0728eb975d98dba19b35d5809a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 13:49:20 -0700 Subject: [PATCH 1868/3452] pythonPackages.coveralls: disabled python2, abandoned --- pkgs/development/python-modules/coveralls/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index c7d046eb0196..c81cd3c666a3 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -1,6 +1,7 @@ { buildPythonPackage , lib , fetchPypi +, isPy27 , mock , pytest , pytestrunner @@ -15,8 +16,8 @@ buildPythonPackage rec { pname = "coveralls"; - name = "${pname}-python-${version}"; version = "2.0.0"; + disabled = isPy27; # wanted by tests src = fetchPypi { From 77fe6c1c760201f377cce500b9fc81d2a399e593 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 13:50:24 -0700 Subject: [PATCH 1869/3452] pythonPackages.coveralls: disabled python2, not compatible --- pkgs/development/python-modules/dpath/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index c9c9ad179811..548bd5168385 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ stdenv, fetchPypi, buildPythonPackage, isPy27 , mock, pytestCheckHook, nose, hypothesis }: buildPythonPackage rec { pname = "dpath"; version = "2.0.1"; + disabled = isPy27; # uses python3 imports src = fetchPypi { inherit pname version; From 24e93ca4a65a2ce406c076834e405c0a193e09a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 13:52:18 -0700 Subject: [PATCH 1870/3452] gnome3.nautilus: 3.36.2 -> 3.36.3 (#90632) --- pkgs/desktops/gnome-3/core/nautilus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index b926f9b627f1..6145178de1e0 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "3.36.2"; + version = "3.36.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1yknaz8n0l949sr8j3b7kdm0cm5mx2dp4n4k577m492hk6akqrr6"; + sha256 = "1y0fsd7j48v4qkc051cg41mz7jycgw4vd4g37lw682p7n5xgrjmn"; }; nativeBuildInputs = [ From 622e5db89ee72d790e5eaaac3285dac1ceda7719 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 13:56:39 -0700 Subject: [PATCH 1871/3452] pythonPackages.filemagic: disable python2, no longer compat --- pkgs/development/python-modules/filemagic/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/filemagic/default.nix b/pkgs/development/python-modules/filemagic/default.nix index 2feda678f744..ef8f6933e8fe 100644 --- a/pkgs/development/python-modules/filemagic/default.nix +++ b/pkgs/development/python-modules/filemagic/default.nix @@ -4,6 +4,7 @@ buildPythonPackage { pname = "filemagic"; version = "1.6"; + disabled = !isPy3k; # asserts on ResourceWarning # Don't use the PyPI source because it's missing files required for testing src = fetchFromGitHub { @@ -18,7 +19,7 @@ buildPythonPackage { "'${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; - checkInputs = [ (if isPy3k then mock else unittest2) ]; + checkInputs = [ mock ] ++ lib.optionals (!isPy3k) [ unittest2 ]; meta = with lib; { description = "File type identification using libmagic"; From de231741d15c9d6ee4a4ee60583106263c8073e2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 13:57:19 -0700 Subject: [PATCH 1872/3452] pythonPackages.humanize: disable python2, setup.py is py3 only --- pkgs/development/python-modules/humanize/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 10f1b8000688..418a8e203e4b 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , mock , setuptools_scm }: @@ -8,6 +9,7 @@ buildPythonPackage rec { version = "2.4.0"; pname = "humanize"; + disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; From d377538c0d50cb77eeaba5652dc063844f2cb111 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 13:59:06 -0700 Subject: [PATCH 1873/3452] pythonPackages.flake8-debugger: fix python <3.8 builds --- .../python-modules/flake8-debugger/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index 1f41c0a6849a..81b903621b52 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -1,4 +1,10 @@ -{ lib, fetchPypi, buildPythonPackage, flake8, pycodestyle, pytestrunner, pytest }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder +, flake8 +, importlib-metadata +, pycodestyle +, pytestrunner +, pytest +}: buildPythonPackage rec { pname = "flake8-debugger"; @@ -11,7 +17,8 @@ buildPythonPackage rec { nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ flake8 pycodestyle ]; + propagatedBuildInputs = [ flake8 pycodestyle ] + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; checkInputs = [ pytest ]; From 974f59445746e2a03439101b15816275eb91fb06 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 13:59:29 -0700 Subject: [PATCH 1874/3452] pythonPackages.httptools: disable python2, abandoned --- pkgs/development/python-modules/httptools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix index c63b098d324c..ed25195e3f28 100644 --- a/pkgs/development/python-modules/httptools/default.nix +++ b/pkgs/development/python-modules/httptools/default.nix @@ -1,11 +1,13 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 }: buildPythonPackage rec { pname = "httptools"; version = "0.1.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 1a230cfb207a82d29843981cdd0e26dc0a8de0a0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 14:01:20 -0700 Subject: [PATCH 1875/3452] pythonPackages.http-ece: fix builds --- pkgs/development/python-modules/http-ece/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/http-ece/default.nix b/pkgs/development/python-modules/http-ece/default.nix index eafa429b439e..638191ee7fc4 100644 --- a/pkgs/development/python-modules/http-ece/default.nix +++ b/pkgs/development/python-modules/http-ece/default.nix @@ -1,5 +1,5 @@ -{ lib, fetchPypi, buildPythonPackage -, coverage, flake8, mock, nose +{ lib, fetchPypi, buildPythonPackage, pythonOlder +, coverage, flake8, mock, nose, importlib-metadata , cryptography }: buildPythonPackage rec { @@ -11,7 +11,8 @@ buildPythonPackage rec { sha256 = "1y5ln09ji4dwpzhxr77cggk02kghq7lql60a6969a5n2lwpvqblk"; }; - propagatedBuildInputs = [ cryptography ]; + propagatedBuildInputs = [ cryptography ] + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; checkInputs = [ coverage flake8 mock nose ]; From ad3f2ad42e300a617f5cea761631a4573d5bbca9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 14:02:08 -0700 Subject: [PATCH 1876/3452] pythonPackages.inflection: disable python2, abandoned --- pkgs/development/python-modules/inflection/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix index f41e72def8d1..bf370d7ebf34 100644 --- a/pkgs/development/python-modules/inflection/default.nix +++ b/pkgs/development/python-modules/inflection/default.nix @@ -1,8 +1,9 @@ -{ lib, fetchPypi, buildPythonPackage, pytest } : +{ lib, fetchPypi, buildPythonPackage, isPy27, pytest } : buildPythonPackage rec { pname = "inflection"; version = "0.4.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 478cd630153b0469a991013eaf8212e947e67729 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 14:03:23 -0700 Subject: [PATCH 1877/3452] pythonPackages.limnoria: disable python2, abandoned --- pkgs/development/python-modules/limnoria/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 567cd3b22066..a4800e70ffc3 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -1,12 +1,14 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , pkgs }: buildPythonPackage rec { pname = "limnoria"; version = "2020.04.11"; + disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; From f6626b6842fa500134297cb14e765a06f889f48b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 14:04:19 -0700 Subject: [PATCH 1878/3452] pythonPackages.mutagen: disable python2, abandoned --- pkgs/development/python-modules/mutagen/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 4aacc0891db3..9494d2c84a66 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , fetchpatch , hypothesis , pycodestyle @@ -13,6 +14,7 @@ buildPythonPackage rec { pname = "mutagen"; version = "1.44.0"; + disabled = isPy27; # abandoned src = fetchPypi { inherit pname version; From d017475b751d6f314a32a266f3db4f852dd73539 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 14:09:02 -0700 Subject: [PATCH 1879/3452] python2Packages.mutagen: freeze at 1.43 --- .../python-modules/mutagen/1.43.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 ++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/mutagen/1.43.nix diff --git a/pkgs/development/python-modules/mutagen/1.43.nix b/pkgs/development/python-modules/mutagen/1.43.nix new file mode 100644 index 000000000000..3947dc05fa47 --- /dev/null +++ b/pkgs/development/python-modules/mutagen/1.43.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, hypothesis +, pycodestyle +, pyflakes +, pytest +, setuptools +, pkgs +}: + +buildPythonPackage rec { + pname = "mutagen"; + version = "1.43.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "125m0pkiw5lsffc0236xdlxfhwpr8csvxpmg6855405qy4wjv61s"; + }; + + propagatedBuildInputs = [ setuptools ]; + checkInputs = [ + pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz + pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis + ]; + LC_ALL = "en_US.UTF-8"; + + meta = with lib; { + description = "Python multimedia tagging library"; + homepage = "https://mutagen.readthedocs.io"; + license = licenses.lgpl2Plus; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 48867a92f9d7..199554f2c521 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4655,7 +4655,10 @@ in { mutag = callPackage ../development/python-modules/mutag { }; - mutagen = callPackage ../development/python-modules/mutagen { }; + mutagen = if isPy27 then + callPackage ../development/python-modules/mutagen/1.43.nix { } + else + callPackage ../development/python-modules/mutagen { }; muttils = callPackage ../development/python-modules/muttils { }; From bbaeb07059c5ade10c9e90fed3108eae05cf2059 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 14:10:30 -0700 Subject: [PATCH 1880/3452] python2Packages.ordered-set: disable python2, abandoned --- pkgs/development/python-modules/ordered-set/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ordered-set/default.nix b/pkgs/development/python-modules/ordered-set/default.nix index 0bc91ec7f15c..4a9e6fefe066 100644 --- a/pkgs/development/python-modules/ordered-set/default.nix +++ b/pkgs/development/python-modules/ordered-set/default.nix @@ -1,8 +1,9 @@ -{ buildPythonPackage, fetchPypi, lib, pytest }: +{ buildPythonPackage, fetchPypi, lib, isPy27, pytest }: buildPythonPackage rec { pname = "ordered-set"; version = "4.0.1"; + disabled = isPy27; checkInputs = [ pytest ]; From e70fb9e81f5f4380c03e5f21c1d615947245b100 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 14:11:10 -0700 Subject: [PATCH 1881/3452] python2Packages.pipdate: disable python2, abandoned --- pkgs/development/python-modules/pipdate/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index 021b0f543ecc..4e730df1c91d 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , appdirs , requests , pytest @@ -9,6 +10,7 @@ buildPythonPackage rec { pname = "pipdate"; version = "0.5.1"; + disabled = isPy27; # abandoned src = fetchPypi { inherit pname version; From 46c455e031cca7ac0face202a2873174f291e25f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 14:12:30 -0700 Subject: [PATCH 1882/3452] python2Packages.pytest-openfiles: disable python2, abandoned --- pkgs/development/python-modules/pytest-openfiles/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/pkgs/development/python-modules/pytest-openfiles/default.nix index 64fd8422ea8d..bb7bdf03d00d 100644 --- a/pkgs/development/python-modules/pytest-openfiles/default.nix +++ b/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , pytest , pytestCheckHook , psutil @@ -10,6 +11,7 @@ buildPythonPackage rec { pname = "pytest-openfiles"; version = "0.5.0"; + disabled = isPy27; # abandoned src = fetchPypi { inherit pname version; From 9b38751608bed8d346850cfb74b1bd6ff89dd33e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 14:14:04 -0700 Subject: [PATCH 1883/3452] pythonPackages.pytest-isort: fix tests --- pkgs/development/python-modules/pytest-isort/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index 4c380b312e5e..96f78426dbac 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, isort }: +{ lib, buildPythonPackage, fetchPypi, isPy27, mock, pytest, isort }: buildPythonPackage rec { pname = "pytest-isort"; @@ -11,7 +11,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ isort ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest ] + ++ lib.optionals isPy27 [ mock ]; checkPhase = '' py.test -vs --cache-clear From 3b3afc42923435f936060145b61e5bf8cb5699ad Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 28 Oct 2019 22:13:45 +0000 Subject: [PATCH 1884/3452] melonDS: init at 0.8.3 --- pkgs/misc/emulators/melonDS/default.nix | 29 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/misc/emulators/melonDS/default.nix diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/misc/emulators/melonDS/default.nix new file mode 100644 index 000000000000..de8b5e03552d --- /dev/null +++ b/pkgs/misc/emulators/melonDS/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, gtk3, curl, libpcap }: + +stdenv.mkDerivation rec { + pname = "melonDS"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "Arisotura"; + repo = pname; + rev = version; + sha256 = "1lqmfwjpkdqfkns1aaxlp4yrg6i0r66mxfr4rrj7b5286k44hqwn"; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ SDL2 gtk3 curl libpcap ]; + + postInstall = '' + install -Dm644 romlist.bin "$out/share/melonDS/romlist.bin" + ''; + + meta = with stdenv.lib; { + homepage = "http://melonds.kuribo64.net/"; + description = "Work in progress Nintendo DS emulator"; + license = licenses.gpl3; + maintainers = with maintainers; [ artemist ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8465c5060030..1862fa3dbd17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20864,6 +20864,8 @@ in meld = callPackage ../applications/version-management/meld { }; + melonDS = callPackage ../misc/emulators/melonDS { }; + meme = callPackage ../applications/graphics/meme { }; mendeley = libsForQt5.callPackage ../applications/office/mendeley { From 59678c11527e90426f9382d3beca0a89317f033f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 16 Jun 2020 23:18:42 +0200 Subject: [PATCH 1885/3452] riot-web: 1.6.4 -> 1.6.5 https://github.com/vector-im/riot-web/releases/tag/v1.6.5 --- .../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 942917a46757..c08d1dbe0332 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.4"; + version = "1.6.5"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0n99ivpfsz48zl0nibhkmli26sks2lpd2h0iph73f2w1p7zw1ln2"; + sha256 = "0mx7ql76cbivc0d9gzix51bc1rdp9yg9vjx05mbf5r9sxrwmihz5"; }; installPhase = '' From dcf36b65c3f9c2753bc51d4e45fce4f98b823c31 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 16 Jun 2020 23:19:20 +0200 Subject: [PATCH 1886/3452] riot-desktop: 1.6.4 -> 1.6.5 https://github.com/vector-im/riot-desktop/releases/tag/v1.6.5 --- .../instant-messengers/riot/riot-desktop-package.json | 4 ++-- .../instant-messengers/riot/riot-desktop-yarndeps.nix | 8 ++++---- .../networking/instant-messengers/riot/riot-desktop.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 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 acb63ff7454f..f9a5ebdbebe3 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.4", + "version": "1.6.5", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -48,7 +48,7 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-js-sdk": "6.2.1", + "matrix-js-sdk": "6.2.2", "mkdirp": "^1.0.3", "needle": "^2.3.2", "node-pre-gyp": "^0.14.0", 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 e6573a508184..30e1c9464755 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.1.tgz"; + name = "matrix_js_sdk___matrix_js_sdk_6.2.2.tgz"; path = fetchurl { - name = "matrix_js_sdk___matrix_js_sdk_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.1.tgz"; - sha1 = "d5f76491a650c0a36fcdd078cff59f2da96edd7b"; + 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"; }; } { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 64652afd7e4d..acdf40e772ea 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.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "05z7mggsp33m7ljl4ibk9r4dccglbsc2arp4i3dknq364zdga3m2"; + sha256 = "1snmfn98z63a8ahh5c7y7h00i8qsdq6wsnidmjjrkzcz3mchfq60"; }; electron = electron_7; From 024a30e9f2c0867b671edcb9346e2d6e8dea10d5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 16 Jun 2020 14:19:33 -0700 Subject: [PATCH 1887/3452] python2Packages.traits: disable python2, abandoned --- pkgs/development/python-modules/traits/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index 2c343daf5504..36963987b38c 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , python , pytest , numpy @@ -9,6 +10,7 @@ buildPythonPackage rec { pname = "traits"; version = "6.1.0"; + disabled = isPy27; # setup.py no longer py3 compat src = fetchPypi { inherit pname version; From b4350f3176c420efa48cf552514e320a20e3d7d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 16 Jun 2020 22:22:04 +0100 Subject: [PATCH 1888/3452] python3.pkgs.jedi: remove unused postPatch https://github.com/davidhalter/jedi/blob/8aaa8e00446f801c023bb4b056f51ac6f3d99e99/requirements.txt --- pkgs/development/python-modules/jedi/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 7abcc81e5936..77d3e3e4d8a0 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -9,10 +9,6 @@ buildPythonPackage rec { sha256 = "df40c97641cb943661d2db4c33c2e1ff75d491189423249e989bcea4464f3030"; }; - postPatch = '' - substituteInPlace requirements.txt --replace "parso==0.1.0" "parso" - ''; - checkInputs = [ pytest glibcLocales tox pytestcov ]; propagatedBuildInputs = [ parso ]; From 13a14e2bfe4ff3b7da222624ce5749218105e465 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 16 Jun 2020 16:53:20 -0400 Subject: [PATCH 1889/3452] melonDS: init at 0.8.3 --- pkgs/misc/emulators/melonDS/default.nix | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/misc/emulators/melonDS/default.nix index de8b5e03552d..94fbeba0e075 100644 --- a/pkgs/misc/emulators/melonDS/default.nix +++ b/pkgs/misc/emulators/melonDS/default.nix @@ -1,8 +1,13 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, gtk3, curl, libpcap }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, gtk3, libpcap, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "melonDS"; version = "0.8.3"; + ## When updating to the release after 0.8.3, + ## - Uncomment: + ## cmakeFlags = [ "-UUNIX_PORTABLE" ]; + ## - Remove the postInstall, since cmake should then take care of installing icons, .desktop file, and romlist.bin + ## (see https://github.com/Arisotura/melonDS/pull/546) src = fetchFromGitHub { owner = "Arisotura"; @@ -12,18 +17,25 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ SDL2 gtk3 curl libpcap ]; + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ]; + buildInputs = [ SDL2 gtk3 libpcap ]; postInstall = '' - install -Dm644 romlist.bin "$out/share/melonDS/romlist.bin" + install -Dm644 -t $out/share/melonDS/ ../romlist.bin + install -Dm644 -t $out/share/applications/ ../flatpak/*.desktop + + for i in ../icon/melon_*.png; do + d="''${i##*_}" + d="$out/share/icons/hicolor/''${d%.png}/apps" + install -D $i "$d/net.kuribo64.melonds.png" + done ''; meta = with stdenv.lib; { homepage = "http://melonds.kuribo64.net/"; description = "Work in progress Nintendo DS emulator"; - license = licenses.gpl3; - maintainers = with maintainers; [ artemist ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ artemist benley ]; platforms = platforms.linux; }; } From 6cbbe4dbba0137299722da44f8ab07b04cbf40db Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 25 May 2020 01:03:23 +0530 Subject: [PATCH 1890/3452] rtl8821ce: 5.2.5_1.26055.20180108 -> 5.5.2_34066.20200325 The rtl8821ce repository was updated to address for ABI changes to Linux but our package was too far behind, resulting in breakages as reported in #88068 Fixes: #88068 --- pkgs/os-specific/linux/rtl8821ce/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 4be462991223..cadc844ac454 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation rec { name = "rtl8821ce-${kernel.version}-${version}"; - version = "5.2.5_1.26055.20180108"; + version = "5.5.2_34066.20200325"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "ab6154e150bbc7d12b0525d4cc1298ae196e45de"; - sha256 = "1my0hidqnv4s7hi5897m81pq0sjw05np0g27hlkg9fwb83b5kzsg"; + rev = "69765eb288a8dfad3b055b906760b53e02ab1dea"; + sha256 = "17jiw25k74kv5lnvgycvj2g1n06hbrpjz6p4znk4a62g136rhn4s"; }; hardeningDisable = [ "pic" ]; From 51e995cc055f95ee4d7d0313cc5b9a71378e5afc Mon Sep 17 00:00:00 2001 From: tmplt Date: Tue, 16 Jun 2020 23:42:56 +0200 Subject: [PATCH 1891/3452] nixos/physlock: add suspend-then-hibernate to suspend/hibernate units --- nixos/modules/services/security/physlock.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix index 61bcd84f2e64..690eb70079d8 100644 --- a/nixos/modules/services/security/physlock.nix +++ b/nixos/modules/services/security/physlock.nix @@ -107,6 +107,7 @@ in ++ cfg.lockOn.extraTargets; before = optional cfg.lockOn.suspend "systemd-suspend.service" ++ optional cfg.lockOn.hibernate "systemd-hibernate.service" + ++ optional (cfg.lockOn.hibernate || cfg.lockOn.suspend) "systemd-suspend-then-hibernate.service" ++ cfg.lockOn.extraTargets; serviceConfig = { Type = "forking"; From 56762ad60a449abfa8c4b5faf46ec11e11889d13 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 21:59:34 +0000 Subject: [PATCH 1892/3452] opentx: 2.3.7 -> 2.3.9 --- pkgs/applications/misc/opentx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index f20d5ccdc4ac..a117ecc06a9c 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "opentx"; - version = "2.3.7"; + version = "2.3.9"; src = fetchFromGitHub { owner = "opentx"; repo = "opentx"; rev = "release/${version}"; - sha256 = "1wl3bk7s8h20dfys1hblzxc0br9zlwhcqlghgsbn81ki0xb6jmkf"; + sha256 = "0kh3jdy1pgvns8lrncf61ayaq0hmsv41j8xv4r4rf17zyvjl0qph"; }; enableParallelBuilding = true; From 9fc60b36cbd5839d40571f0fba3b57824d2604bd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 12 Jun 2020 03:02:49 +0200 Subject: [PATCH 1893/3452] matrix-synapse: 1.14.0 -> 1.15.1 https://github.com/matrix-org/synapse/releases/tag/v1.15.0 https://github.com/matrix-org/synapse/releases/tag/v1.15.1 --- pkgs/servers/matrix-synapse/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 15df735b7072..f2abcc4c024b 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.14.0"; + version = "1.15.1"; src = fetchPypi { inherit pname version; - sha256 = "09drdqcjvpk9s3hq5rx9yxsxq0wak5fg5gfaiqfnbnxav2c2v7kq"; + sha256 = "1hfyqp5bzsqp002synxp9jcm9fwzw9p0gcklmycmv616x3flylkf"; }; patches = [ @@ -58,6 +58,7 @@ buildPythonApplication rec { unpaddedbase64 typing-extensions authlib + pyjwt ] ++ lib.optional enableSystemd systemd; checkInputs = [ mock parameterized openssl ]; From 213275ca72e271acc0881bcce4a1e7e8cb58ac8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 17 Jun 2020 00:42:12 +0200 Subject: [PATCH 1894/3452] protobufc: 1.3.1 -> 1.3.3 (#90327) --- pkgs/development/libraries/protobufc/1.3.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/pkgs/development/libraries/protobufc/1.3.nix index 304f9d61f397..82126727282c 100644 --- a/pkgs/development/libraries/protobufc/1.3.nix +++ b/pkgs/development/libraries/protobufc/1.3.nix @@ -1,12 +1,11 @@ { callPackage, fetchFromGitHub, ... } @ args: -callPackage ./generic.nix (args // { - version = "1.3.1"; +callPackage ./generic.nix (args // rec { + version = "1.3.3"; src = fetchFromGitHub { owner = "protobuf-c"; repo = "protobuf-c"; - #rev = "v${version}"; - rev = "9412830d0680150d429d2aa170b8d7218ab49397"; - sha256 = "175cmaj5231iqzhf5a9sxw2y3i165chk3681m1b5mp8di927q5ai"; + rev = "v${version}"; + sha256 = "13948amsjj9xpa4yl6amlyk3ksr96bbd4ngshh2yzflwcslhg6gv"; }; }) From fc179ef8a6968a171a51de4b69bbd9b147f4cb7e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 3 Jun 2020 23:54:36 +0200 Subject: [PATCH 1895/3452] nixos/dovecot2: add autoexpunge setting To automatically purge old email. See also https://wiki.dovecot.org/MailboxSettings --- nixos/modules/services/mail/dovecot.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 9fbf0c19752c..ee797f9c42f1 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -125,6 +125,8 @@ let mailboxConfig = mailbox: '' mailbox "${mailbox.name}" { auto = ${toString mailbox.auto} + '' + optionalString (mailbox.autoexpunge != null) '' + autoexpunge = ${mailbox.autoexpunge} '' + optionalString (mailbox.specialUse != null) '' special_use = \${toString mailbox.specialUse} '' + "}"; @@ -148,6 +150,15 @@ let example = "Junk"; description = "Null if no special use flag is set. Other than that every use flag mentioned in the RFC is valid."; }; + autoexpunge = mkOption { + type = types.nullOr types.str; + default = null; + example = "60d"; + description = '' + To automatically remove all email from the mailbox which is older than the + specified time. + ''; + }; }; }; in From 70187773bc2c029a090d21d554c795a3bdf4635e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 23:15:26 +0000 Subject: [PATCH 1896/3452] openmpi: 4.0.3 -> 4.0.4 --- pkgs/development/libraries/openmpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 38041e6b5d80..5c185f630d98 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -19,7 +19,7 @@ assert !cudaSupport || cudatoolkit != null; let - version = "4.0.3"; + version = "4.0.4"; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { src = with stdenv.lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "00zxcw99gr5n693cmcmn4f6a47vx1ywna895p0x7p163v37gw0hl"; + sha256 = "1i0slg2dxjdgw513aml1n9dsbdxn2fimi2b5712d5r9z4ar4xqj7"; }; postPatch = '' From f360637db440d612be71ba9011a2a7d78eb6f7e4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Jun 2020 02:08:34 +0200 Subject: [PATCH 1897/3452] bees: fix documentation build by moving to python3 --- pkgs/tools/filesystems/bees/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index c6bb07e7b87d..e87cecbf8fd3 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, pythonPackages, utillinux }: +{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, utillinux }: let @@ -22,7 +22,7 @@ let ]; nativeBuildInputs = [ - pythonPackages.markdown # documentation build + python3Packages.markdown # documentation build ]; preBuild = '' From 52633ca14b372f7a502fd4cf1e457a29f30cf648 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 17 Jun 2020 01:57:39 +0200 Subject: [PATCH 1898/3452] linuxPackages.wireguard: 1.0.20200520 -> 1.0.20200611 https://lists.zx2c4.com/pipermail/wireguard/2020-June/005480.html --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 4617db5e7671..6af465da4731 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200520"; + version = "1.0.20200611"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "1zggpm0zh6m30b9mchj3bg3z721k346r5m5a130inp779s4xm0sm"; + sha256 = "0a8xsjxp8krmm2px07x9qw8nhvp5ispf4mnc6k59p0qp26qbva5d"; }; hardeningDisable = [ "pic" ]; From cf810b54e097d8a561b28f46767feac5dd111bd9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 17 Jun 2020 01:58:14 +0200 Subject: [PATCH 1899/3452] vagrant: 2.2.8 -> 2.2.9 https://github.com/hashicorp/vagrant/blob/v2.2.9/CHANGELOG.md#229-may-07-2020 --- pkgs/development/tools/vagrant/default.nix | 4 ++-- pkgs/development/tools/vagrant/gemset.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 32e205a6f8d3..338e8f68d355 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.8"; + version = "2.2.9"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "0nvxda0dyhncgcl9qs34l4rj0jbdbg65a3ii5765p4899z6gzx95"; + sha256 = "0fbickjjliaw3cpkh3pl9bp56b2gcqn87c5ag67amc450ah43rdq"; deps = bundlerEnv rec { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index f5d70b912df5..00838c6e0c55 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -85,10 +85,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; gssapi = { dependencies = ["ffi"]; @@ -149,10 +149,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; + sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.3"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; @@ -212,10 +212,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zin0q26wc5p7zb7glpwary7ms60s676vcq987yv22jgm6hnlwlh"; + sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; type = "gem"; }; - version = "3.2020.0425"; + version = "3.2020.0512"; }; multi_json = { groups = ["default"]; From 612b7f71a0af7d665a289dfdbdfa6bcd50c2694b Mon Sep 17 00:00:00 2001 From: Andy Tockman Date: Tue, 16 Jun 2020 19:48:50 -0500 Subject: [PATCH 1900/3452] feh: add enableAutoreload option This change enables the inotify-based auto-reload feature of feh, which causes images to be refreshed when the image file changes. --- pkgs/applications/graphics/feh/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index cecd2a3776d3..4782d9201480 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, makeWrapper , xorg, imlib2, libjpeg, libpng -, curl, libexif, jpegexiforient, perlPackages }: +, curl, libexif, jpegexiforient, perlPackages +, enableAutoreload ? true }: with stdenv.lib; @@ -21,7 +22,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" "exif=1" - ] ++ optional stdenv.isDarwin "verscmp=0"; + ] ++ optional stdenv.isDarwin "verscmp=0" + ++ optional enableAutoreload "inotify=1"; installTargets = [ "install" ]; postInstall = '' From a2e6ff2cceea8190f19409e10e5590f57a3b8072 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 4 Jun 2020 14:01:51 +1000 Subject: [PATCH 1901/3452] buildGoModule: require vendorSha256 to be set in packages --- pkgs/development/go-modules/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 9baeefe1b2cb..0d8b382167e5 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -17,7 +17,7 @@ # # if vendorSha256 is null, then we won't fetch any dependencies and # rely on the vendor folder within the source. -, vendorSha256 ? null +, vendorSha256 # Whether to delete the vendor folder supplied with the source. , deleteVendor ? false From f6ac90cd0953dc34ceb77c5da0d2a3b1cac6ca93 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 12 Jun 2020 09:01:50 +1000 Subject: [PATCH 1902/3452] dnscrypt-proxy2: 2.0.43 -> 2.0.44 https://github.com/DNSCrypt/dnscrypt-proxy/releases/tag/2.0.44 --- pkgs/tools/networking/dnscrypt-proxy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 508d9ecd0f30..d5b92c17a65a 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "dnscrypt-proxy2"; - version = "2.0.43"; + version = "2.0.44"; vendorSha256 = null; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "DNSCrypt"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "1c12y8h7dww72a3agb74vr5fzxzy6k8394rdbgz9knk82fdwah1c"; + sha256 = "08bg60j5z349blj5sip1f8f793q12ix3zmqkayym5nf69s1pfm7l"; }; meta = with stdenv.lib; { From 78e324d2726127828a15f87a75b4d3199a8955ec Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 13 Jun 2020 12:31:01 +1000 Subject: [PATCH 1903/3452] treewide: ffmpeg_4 -> ffmpeg --- .../audio/pulseaudio-modules-bt/default.nix | 6 +++--- .../networking/browsers/firefox/wrapper.nix | 4 ++-- .../telegram/tdesktop/default.nix | 4 ++-- .../networking/remote/waypipe/default.nix | 4 ++-- pkgs/applications/video/mpv/default.nix | 4 ++-- .../video/wf-recorder/default.nix | 4 ++-- .../development/libraries/wlroots/default.nix | 4 ++-- .../development/python-modules/av/default.nix | 4 ++-- .../tools/poetry2nix/poetry2nix/overrides.nix | 2 +- pkgs/tools/X11/xpra/default.nix | 4 ++-- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 20 ++++++------------- 13 files changed, 30 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index 49cc83189359..556dd5f10619 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pulseaudio , pkgconfig -, ffmpeg_4 +, ffmpeg , patchelf , fdk_aac , libtool @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { buildInputs = [ pulseaudio - ffmpeg_4 + ffmpeg fdk_aac libtool ldacbt @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do orig_rpath=$(patchelf --print-rpath "$so") patchelf \ - --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ + --set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ "$so" done ''; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 52773bf291a6..7505e7e21967 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, ffmpeg_4, xorg, libpulseaudio, libcanberra-gtk2, libglvnd +, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd , gnome3/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , tridactyl-native @@ -66,7 +66,7 @@ let ++ extraNativeMessagingHosts ); libs = lib.optionals stdenv.isLinux [ udev libva ] - ++ lib.optional ffmpegSupport ffmpeg_4 + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optional gdkWayland libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 388144c4e12f..d4493355951f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchurl, fetchsvn , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash -, dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , tl-expected, hunspell # TODO: Shouldn't be required: , pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst @@ -42,7 +42,7 @@ mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash - dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3 + dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 tl-expected hunspell # TODO: Shouldn't be required: pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix index 03be60a99489..c72c7c6da8ab 100644 --- a/pkgs/applications/networking/remote/waypipe/default.nix +++ b/pkgs/applications/networking/remote/waypipe/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitLab , meson, ninja, pkgconfig, scdoc , wayland, wayland-protocols, openssh -, mesa, lz4, zstd, ffmpeg_4, libva +, mesa, lz4, zstd, ffmpeg, libva }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland wayland-protocols # Optional dependencies: - mesa lz4 zstd ffmpeg_4 libva + mesa lz4 zstd ffmpeg libva ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 51d284f277a1..697a468f8908 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,6 +1,6 @@ { config, stdenv, fetchurl, fetchFromGitHub, fetchpatch , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which -, ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs +, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs , nv-codec-headers, lua, libuchardet, libiconv ? null , CoreFoundation, Cocoa, CoreAudio, MediaPlayer @@ -155,7 +155,7 @@ in stdenv.mkDerivation rec { ++ optional swiftSupport swift; buildInputs = [ - ffmpeg_4 freetype libass libpthreadstubs + ffmpeg freetype libass libpthreadstubs luaEnv libuchardet mujs ] ++ optional alsaSupport alsaLib ++ optional archiveSupport libarchive diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix index cb97e5b1090b..09b67149f5a9 100644 --- a/pkgs/applications/video/wf-recorder/default.nix +++ b/pkgs/applications/video/wf-recorder/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland, scdoc -, wayland-protocols, ffmpeg_4, x264, libpulseaudio, ocl-icd, opencl-headers +, wayland-protocols, ffmpeg, x264, libpulseaudio, ocl-icd, opencl-headers }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ]; buildInputs = [ - wayland-protocols ffmpeg_4 x264 libpulseaudio ocl-icd opencl-headers + wayland-protocols ffmpeg x264 libpulseaudio ocl-icd opencl-headers ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 104e0c3440aa..33db6e9d75b1 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland , libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg_4 +, libpng, ffmpeg }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGL wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg_4 + libpng ffmpeg ]; postInstall = '' diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 7ccc569a87e5..ca750f32dba9 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , numpy -, ffmpeg_4 +, ffmpeg , pkgconfig }: @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ numpy ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ffmpeg_4 ]; + buildInputs = [ ffmpeg ]; # Tests require downloading files from internet doCheck = false; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index c5ae5e191211..62f2ed6e3065 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -24,7 +24,7 @@ self: super: nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; + buildInputs = old.buildInputs ++ [ pkgs.ffmpeg ]; } ); diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 91a58438c17d..6fe433daf8b9 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk , wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which -, ffmpeg_4, x264, libvpx, libwebp, x265 +, ffmpeg, x264, libvpx, libwebp, x265 , libfakeXinerama , gst_all_1, pulseaudio, gobject-introspection , pam }: @@ -60,7 +60,7 @@ in buildPythonApplication rec { pango cairo gdk-pixbuf atk.out gtk3 glib - ffmpeg_4 libvpx x264 libwebp x265 + ffmpeg libvpx x264 libwebp x265 gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index dfd227f917ed..5e5550e0b41d 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, runCommand, makeWrapper, python3Packages, docutils, help2man , abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc -, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg_4, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar +, e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R , sng, sqlite, squashfsTools, tcpdump, odt2txt, unzip, wabt, xxd, xz, zip, zstd , enableBloat ? false @@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec { ]) ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit ] ++ lib.optionals enableBloat ([ - abootimg apksigner apktool cbfstool colord ffmpeg_4 fpc ghc ghostscriptX giflib gnupg gnumeric + abootimg apksigner apktool cbfstool colord ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric hdf5 imagemagick llvm jdk mono odt2txt openssh pdftk poppler_utils qemu R tcpdump wabt ] ++ (with python3Packages; [ binwalk guestfs h5py ])); diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 9e28e8785732..94f4de6e364f 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, buildPythonPackage -, zip, ffmpeg_4, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc +, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the # manpage argument in place in case someone wants to use this derivation to @@ -36,7 +36,7 @@ buildPythonPackage rec { makeWrapperArgs = let packagesToBinPath = [ atomicparsley ] - ++ lib.optional ffmpegSupport ffmpeg_4 + ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional rtmpSupport rtmpdump ++ lib.optional phantomjsSupport phantomjs2; in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e2316652719..52cdce81aab7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1968,7 +1968,7 @@ in interlock = callPackage ../servers/interlock {}; - jellyfin = callPackage ../servers/jellyfin { ffmpeg = ffmpeg_4; }; + jellyfin = callPackage ../servers/jellyfin { }; jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; @@ -11719,8 +11719,6 @@ in ffmpeg = ffmpeg_4; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { - ffmpeg = ffmpeg_4; - # The following need to be fixed on Darwin frei0r = if stdenv.isDarwin then null else frei0r; game-music-emu = if stdenv.isDarwin then null else game-music-emu; @@ -12077,7 +12075,7 @@ in gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer { - callPackage = newScope { libav = pkgs.ffmpeg_4; }; + callPackage = newScope { libav = pkgs.ffmpeg; }; inherit (darwin.apple_sdk.frameworks) CoreServices; }); @@ -13811,7 +13809,7 @@ in withGUI = false; }; - mlt = callPackage ../development/libraries/mlt { ffmpeg = ffmpeg_4; }; + mlt = callPackage ../development/libraries/mlt { }; mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { }; @@ -14367,9 +14365,7 @@ in kpmcore = callPackage ../development/libraries/kpmcore { }; - mlt = callPackage ../development/libraries/mlt/qt-5.nix { - ffmpeg = ffmpeg_4; - }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; openbr = callPackage ../development/libraries/openbr { }; @@ -18871,7 +18867,6 @@ in bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { - ffmpeg = ffmpeg_4; glew = glew110; }; @@ -21382,7 +21377,7 @@ in obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; - obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { ffmpeg = ffmpeg_4; }; + obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; @@ -23663,7 +23658,6 @@ in inherit (plasma5) oxygen; inherit (kdeApplications) akonadi-contacts; inherit (kdeFrameworks) kcalendarcore; - ffmpeg = ffmpeg_4; opencv3 = opencv3WithoutCuda; }; @@ -26370,9 +26364,7 @@ in vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; - vbam = callPackage ../misc/emulators/vbam { - ffmpeg = ffmpeg_4; - }; + vbam = callPackage ../misc/emulators/vbam { }; vice = callPackage ../misc/emulators/vice { giflib = giflib_4_1; From 0b420ecce44226ac8079a1fa07fe93bde40301db Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 17 Jun 2020 11:24:51 +1000 Subject: [PATCH 1904/3452] conmon: 2.0.17 -> 2.0.18 --- pkgs/applications/virtualization/conmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index be6196855e2b..d5abb569e7b1 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.17"; + version = "2.0.18"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "01bicv0qr4aiahkw9cp6igk3jv1fqkbxmsp80nfvq6rxx873v0q7"; + sha256 = "0f32g048jamfhrds68vzirx8iqizr45wf2d4bfvdsk176amrj4k0"; }; nativeBuildInputs = [ pkg-config ]; From 2643082af4edab6d76dc1400312105f5735a348e Mon Sep 17 00:00:00 2001 From: "EEva (JPotier)" Date: Wed, 3 Jun 2020 17:09:25 +0300 Subject: [PATCH 1905/3452] hikari: init at 2.0.2 --- .../window-managers/hikari/default.nix | 75 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 77 insertions(+) create mode 100644 pkgs/applications/window-managers/hikari/default.nix diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix new file mode 100644 index 000000000000..274c75a3c13c --- /dev/null +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -0,0 +1,75 @@ +{ stdenv, fetchzip, + pkgconfig, bmake, + cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman, + libucl, wayland, wayland-protocols, wlroots, + features ? { + gammacontrol = true; + layershell = true; + screencopy = true; + xwayland = true; + } +}: + +let + pname = "hikari"; + version = "2.0.2"; +in + +stdenv.mkDerivation { + inherit pname version; + + src = fetchzip { + url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; + sha256 = "1a3i01936pw11hrmjmrhzzwpndl1jqjgx376m5m724wd1j9awm68"; + }; + + nativeBuildInputs = [ pkgconfig bmake ]; + + buildInputs = [ + cairo + glib + libevdev + libinput + libxkbcommon + linux-pam + pango + pixman + libucl + wayland + wayland-protocols + wlroots + ]; + + enableParallelBuilding = true; + + # Must replace GNU Make by bmake + buildPhase = with stdenv.lib; concatStringsSep " " ( + [ "bmake" "-j$NIX_BUILD_CORES" "PREFIX=$out" ] + ++ optional stdenv.isLinux "WITH_POSIX_C_SOURCE=YES" + ++ mapAttrsToList (feat: enabled: + optionalString enabled "WITH_${toUpper feat}=YES" + ) features + ); + + # Can't suid in nix store + # Run hikari as root (it will drop privileges as early as possible), or create + # a systemd unit to give it the necessary permissions/capabilities. + patchPhase = '' + substituteInPlace Makefile --replace '4555' '555' + ''; + + installPhase = '' + bmake \ + PREFIX=$out \ + install + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Stacking Wayland compositor which is actively developed on FreeBSD but also supports Linux"; + homepage = "https://hikari.acmelabs.space"; + license = licenses.bsd2; + platforms = platforms.linux ++ platforms.freebsd; + maintainers = with maintainers; [ jpotier ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe2a3831c164..0c7690bf3efa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20205,6 +20205,8 @@ in pulseSupport = config.pulseaudio or false; }; + hikari = callPackage ../applications/window-managers/hikari { }; + i3 = callPackage ../applications/window-managers/i3 { xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; }; From 0b671216bb3a170ba720b34c2640574999849d2e Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 17 Jun 2020 08:23:34 +0200 Subject: [PATCH 1906/3452] binwalk: disable Qt support by default --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9871624e830..331f7292b930 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1927,7 +1927,9 @@ in { bids-validator = callPackage ../development/python-modules/bids-validator { }; - binwalk = callPackage ../development/python-modules/binwalk { }; + binwalk = callPackage ../development/python-modules/binwalk { + pyqtgraph = null; + }; binwalk-full = appendToName "full" (self.binwalk.override { pyqtgraph = self.pyqtgraph; From 3d6107d4237cbf993c1b91630d925ad154268c95 Mon Sep 17 00:00:00 2001 From: Philipp Riegger Date: Mon, 15 Jun 2020 16:30:26 +0200 Subject: [PATCH 1907/3452] factorio{,-headless}-experimental: 0.18.30 -> 0.18.32 --- pkgs/games/factorio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index fde3d31716eb..3b47cb40ad0f 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -53,11 +53,11 @@ let x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { stable = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; }; - experimental = bdist { sha256 = "0dm2s8iz7247i3j8cl5f4i3kipnmn5514gm21p7b4ahj6fhpc7pf"; version = "0.18.30"; withAuth = true; }; + experimental = bdist { sha256 = "1h0gv7cdn999hm2fl93kq6g98bzd1x3c8afq8v0a04dqjarjgr86"; version = "0.18.32"; withAuth = true; }; }; headless = { stable = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; }; - experimental = bdist { sha256 = "1c5jiqva2z58lghm6bhvjdj2n61xk8b8ss2hx80qsywgh3nqafr3"; version = "0.18.30"; }; + experimental = bdist { sha256 = "017ggrsnhwyfgx99q0wjagafjvk5pb6lcxl72y37gig72bfcapab"; version = "0.18.32"; }; }; demo = { stable = bdist { sha256 = "07qknasaqvzl9vy1fglm7xmdi7ynhmslrb0a209fhbfs0s7qqlgi"; version = "0.17.79"; }; From 9836a3042219fa2d975270f31748585bb6a73b5d Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 16 Jun 2020 15:15:11 +0200 Subject: [PATCH 1908/3452] bazel-buildtools: 3.2.0 -> 3.2.1 --- .../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 0d2d1f318443..2f026c9d99c0 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.0"; + version = "3.2.1"; goPackagePath = "github.com/bazelbuild/buildtools"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "bazelbuild"; repo = "buildtools"; rev = version; - sha256 = "0r3vc47w5vxgy5rzh75q0lng1c490ic1a1dcc0ih7dcl6i5p1p88"; + sha256 = "1f2shjskcmn3xpgvb9skli5xaf942wgyg5ps7r905n1zc0gm8izn"; }; goDeps = ./deps.nix; From 745245a62a78ec3b13040b9fc947b3943ecc9838 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Tue, 16 Jun 2020 23:11:12 +0200 Subject: [PATCH 1909/3452] vlc: 3.0.10 -> 3.0.11 Includes a security fix for CVE-2020-13428. Also available at: http://git.videolan.org/?p=vlc/vlc-3.0.git;a=blobdiff;f=modules/packetizer/hxxx_nal.c;h=6bdfd5a2a58ab9397d5758726ef16dfb27fec2a0;hp=73450606e382329a301e04d37c5ac259951448e8;hb=d5c43c21c747ff30ed19fcca745dea3481c733e0;hpb=441907f4352107737523bf9cfb56eabe3563edb4 Release notes: http://git.videolan.org/?p=vlc/vlc-3.0.git;a=tag;h=1519d3219a8d151bca792f40003051fa8b967734 --- pkgs/applications/video/vlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 3ee662f73c53..91fb36c39748 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -25,11 +25,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wra stdenv.mkDerivation rec { pname = "vlc"; - version = "3.0.10"; + version = "3.0.11"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/${pname}-${version}.tar.xz"; - sha256 = "0cackl1084hcmg4myf3kvjvd6sjxmzn0c0qkmanz6brvgzyanrm9"; + sha256 = "06a9hfl60f6l0fs5c9ma5s8np8kscm4ala6m2pdfji9lyfna351y"; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of From e5055647e6680389ccb5d0d21f98dcf02756cdce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 17 Jun 2020 09:39:19 +0000 Subject: [PATCH 1910/3452] 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 4eb9c8cae5be59dc176afabdd82247271b02ff78 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Wed, 17 Jun 2020 11:15:49 +0200 Subject: [PATCH 1911/3452] olm: fix homepage link --- pkgs/development/libraries/olm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index c84e66608f2a..d5c230862333 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Implements double cryptographic ratchet and Megolm ratchet"; license = stdenv.lib.licenses.asl20; - homepage = "https://matrix.org/git/olm/about"; + homepage = "https://gitlab.matrix.org/matrix-org/olm"; platforms = with stdenv.lib.platforms; darwin ++ linux; }; } From 52c906147c5bbf65fea3e56954241d69d02fda99 Mon Sep 17 00:00:00 2001 From: pablo1107 Date: Mon, 15 Jun 2020 19:27:16 -0300 Subject: [PATCH 1912/3452] luaPackages.ldbus: init at scm-0 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 27 +++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 11 ++++++++ 3 files changed, 39 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 89a1c0bbbe09..8cc63963370d 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -18,6 +18,7 @@ dkjson,,,,, fifo,,,,, http,,,,,vcunat inspect,,,,, +ldbus,,http://luarocks.org/dev,,, ldoc,,,,, lgi,,,,, linenoise,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 2dbda51bfe8b..7eae27d85c6f 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -359,6 +359,33 @@ inspect = buildLuarocksPackage { license.fullName = "MIT "; }; }; +ldbus = buildLuarocksPackage { + pname = "ldbus"; + version = "scm-0"; + + knownRockspec = (fetchurl { + url = "https://luarocks.org/dev/ldbus-scm-0.rockspec"; + sha256 = "1yhkw5y8h1qf44vx31934k042cmnc7zcv2k0pv0g27wsmlxrlznx"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/daurnimator/ldbus.git", + "rev": "9e176fe851006037a643610e6d8f3a8e597d4073", + "date": "2019-08-16T14:26:05+10:00", + "sha256": "06wcz4i5b7kphqbry274q3ivnsh331rxiyf7n4qk3zx2kvarq08s", + "fetchSubmodules": true +} + '') ["date"]) ; + + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/daurnimator/ldbus"; + description = "A Lua library to access dbus."; + license.fullName = "MIT/X11"; + }; +}; ldoc = buildLuarocksPackage { pname = "ldoc"; version = "1.4.6-2"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 30be2c197a5d..94edbd0737b7 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -76,6 +76,17 @@ with super; */ }); + ldbus = super.ldbus.override({ + extraVariables = { + DBUS_DIR="${pkgs.dbus.lib}"; + DBUS_ARCH_INCDIR="${pkgs.dbus.lib}/lib/dbus-1.0/include"; + DBUS_INCDIR="${pkgs.dbus.dev}/include/dbus-1.0"; + }; + buildInputs = with pkgs; [ + dbus + ]; + }); + ljsyscall = super.ljsyscall.override(rec { version = "unstable-20180515"; # package hasn't seen any release for a long time From a866a6b7f09997a98722fef3592404431ae782dd Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sun, 14 Jun 2020 18:16:43 -0600 Subject: [PATCH 1913/3452] tut: 0.0.8 -> 0.0.9 There has been a new release that fixes a crash-causing bug. https://github.com/RasmusLindroth/tut/releases/tag/0.0.9 --- pkgs/applications/misc/tut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 30868a9900e7..7b9efb6bbe5d 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "tut"; - version = "0.0.8"; + version = "0.0.9"; goPackagePath = "github.com/RasmusLindroth/tut"; goDeps = ./deps.nix; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "0wb5lf0zbhmg962p71bqlpyxn8f1n9fp1jh7y7fcg6w5mga8gqq3"; + sha256 = "19y6brw1d6dlp2gnkdpbp261662h5j46rmiqg73cxhrlws0y0kfk"; }; meta = with stdenv.lib; { From 06aec4278173e26e7871b5fa515f6ecff961d5bc Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 16 Jun 2020 19:23:48 +0200 Subject: [PATCH 1914/3452] gns3-gui: Fix the build For Python 3.8 jsonschema 3.2.0 is required instead of 2.6.0. --- 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 2524731cd05c..7a0861ee3c19 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -5,8 +5,8 @@ let # TODO: This package requires qt5Full to launch defaultOverrides = commonOverrides ++ [ - (mkOverride "jsonschema" "2.6.0" - "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg") + (mkOverride "jsonschema" "3.2.0" + "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") ]; python = python3.override { From e76f83c266f7b03afe798cfcd9ff068ac369d5e4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 17 Jun 2020 08:13:07 -0400 Subject: [PATCH 1915/3452] oh-my-zsh: 2020-06-10 -> 2020-06-17 --- 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 a062b346fda0..6896904ec9a4 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-10"; + version = "2020-06-17"; pname = "oh-my-zsh"; - rev = "db94f60d342ba2be7dbe3bfd86f4edb335c2a6a7"; + rev = "d47447a5e63715ae6ab6c2f46924dc8766c8e746"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "14zvbnrnkcmqnjbw71j4jgfm7gkrgpchkfrpdw006q25gqxj0bgm"; + sha256 = "1hfinbmwwinvqnv3ldcja8gqh9n6ll6749055vk8icdixa9jwcyl"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 4b5880f01563b1303d60da83c703742b713059f5 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 17 Jun 2020 08:27:55 -0400 Subject: [PATCH 1916/3452] xdg_utils: xdg-open: add $out to PATH Otherwise, xdg-open cannot call xdg-mime and this does not work: "${pkgs.xdg_utils}/bin/xdg-open" --- pkgs/tools/X11/xdg-utils/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 64b205bada58..ccea6a2233cc 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { xset() { ${xset}/bin/xset "$@"; }\ perl() { PERL5LIB=${perlPath} ${perlPackages.perl}/bin/perl "$@"; }\ mimetype() { ${perlPackages.FileMimeInfo}/bin/mimetype "$@"; }\ + PATH=$PATH:'"$out"'/bin\ &#' -i "$out"/bin/* substituteInPlace $out/bin/xdg-open \ From e8ddc0cfa73d61d12bd824e03cf9b49bbcfd70e5 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 17 Jun 2020 08:32:34 -0400 Subject: [PATCH 1917/3452] google-chrome: add coreutils to PATH google-chrome-stable can't run without coreutils in PATH --- .../networking/browsers/google-chrome/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index e5cd08f7df7f..fb30bbfd2b6c 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -7,6 +7,9 @@ , dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , kerberos, libdrm, mesa +# Command line programs +, coreutils + # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -58,7 +61,7 @@ let liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core - kerberos libdrm mesa + kerberos libdrm mesa coreutils ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; From bbd12947de648afdf0895f6f816a29955c3b0e38 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 17 Jun 2020 14:51:59 +0200 Subject: [PATCH 1918/3452] python.pkgs.py3to2: don't recompile bytecode --- pkgs/development/python-modules/3to2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix index ff64a6d1a473..8870388c2846 100644 --- a/pkgs/development/python-modules/3to2/default.nix +++ b/pkgs/development/python-modules/3to2/default.nix @@ -24,6 +24,8 @@ buildPythonPackage rec { # Test failing due to upstream issue (https://bitbucket.org/amentajo/lib3to2/issues/50/testsuite-fails-with-new-python-35) doCheck = false; + dontUsePythonRecompileBytecode = true; + meta = { homepage = "https://bitbucket.org/amentajo/lib3to2"; description = "Refactors valid 3.x syntax into valid 2.x syntax, if a syntactical conversion is possible"; From b7aec77a7ba690dc9643a9989ad4e38b65fee4c6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 17 Jun 2020 14:54:03 +0200 Subject: [PATCH 1919/3452] buildPythonPackage: don't recompile bytecode There are too many regressions. Instead of reverting all the work that has been done on this so far, let's just disable it Python-wide. That way we can investigate and fix it easier. --- .../interpreters/python/mk-python-derivation.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 595102524091..a632efa416ee 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -165,10 +165,8 @@ let # Python packages built through cross-compilation are always for the host platform. disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; - # many packages that support python2, may include code - # which python2 is not able to compile - # mkDerivation hash will not change when passed null attrs - dontUsePythonRecompileBytecode = attrs.dontUsePythonRecompileBytecode or (if python.isPy27 then true else null); + # For now, revert recompilation of bytecode. + dontUsePythonRecompileBytecode = true; meta = { # default to python's platforms From e829b1aeb0bf8f4fef9ac4779bd0e8cedb903b86 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 17 Jun 2020 15:59:35 +0300 Subject: [PATCH 1920/3452] dashing: 2018-02-15 -> 0.4.0 --- pkgs/tools/misc/dashing/default.nix | 19 ++--- pkgs/tools/misc/dashing/deps.nix | 112 +++++++++++++++++++++++++--- 2 files changed, 111 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index 8d7f16b5beca..2f4c117c615f 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -1,21 +1,22 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - pname = "dashing-unstable"; - version = "2018-02-15"; - rev = "0e0519d76ed6bbbe02b00ee1d1ac24697d349f49"; + pname = "dashing"; + version = "0.4.0"; goPackagePath = "github.com/technosophos/dashing"; - src = fetchgit { - inherit rev; - url = "https://github.com/technosophos/dashing"; - sha256 = "066njyk3c1fqqr0v6aa6knp3dnksmh6hnl9d84fgd4wzyw3ma2an"; + src = fetchFromGitHub { + owner = "technosophos"; + repo = pname; + rev = version; + sha256 = "0mhv0w5q5vpynbfi21n5i3yw2165bppdlg0amvbv86n9z4c21h89"; }; goDeps = ./deps.nix; + buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; + meta = with stdenv.lib; { description = "A Dash Generator Script for Any HTML"; homepage = "https://github.com/technosophos/dashing"; diff --git a/pkgs/tools/misc/dashing/deps.nix b/pkgs/tools/misc/dashing/deps.nix index 4ad5a10149ec..a87de8674ff1 100644 --- a/pkgs/tools/misc/dashing/deps.nix +++ b/pkgs/tools/misc/dashing/deps.nix @@ -1,21 +1,30 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } { goPackagePath = "github.com/andybalholm/cascadia"; fetch = { type = "git"; url = "https://github.com/andybalholm/cascadia"; - rev = "901648c87902174f774fac311d7f176f8647bdaa"; - sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; + rev = "903109d295d5"; + sha256 = "1zprh6wfyf4f5c6nw1bgyyfx3niydsnbdyvpi18fc378wmh4hlq4"; }; } { - goPackagePath = "github.com/codegangsta/cli"; + goPackagePath = "github.com/cpuguy83/go-md2man"; fetch = { type = "git"; - url = "https://github.com/codegangsta/cli"; - rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff"; - sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "f79a8a8ca69d"; + sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; }; } { @@ -23,8 +32,53 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-sqlite3"; - rev = "d896508f87298565da02ed92730e7065c3de10b8"; - sha256 = "19q0rv171wx73rwdp81rkj9ys3r5jaav94b3j06gprg59phb98bs"; + rev = "v2.0.1"; + sha256 = "1i3v0j5144iir1n31nahbq9rs2picraphyh5qx9n9rz1d5w1v8zy"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v2.0.1"; + sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "v1.0.0"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v2.0.0"; + sha256 = "0ybpg48s08sm46xsbb42yk14zrsm7pr9808khh6f9fca7s3c7fns"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; }; } { @@ -32,8 +86,44 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "61147c48b25b599e5b561d2e9c4f3e1ef489ca41"; - sha256 = "1520pdlw9a9s41ad1cf1z6y2ff4j96zbn82qffrxqk02bqlr9f5w"; + rev = "e7e4b65ae663"; + sha256 = "0phil62b9cqvllhfjqqm1jpyk2dxg1dvd88pq2044nc3sxni7w8b"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d0b11bdaac8a"; + sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } ] From 2ee84ca8e2adb0ef5b5ea52ad38fe0e107893d3e Mon Sep 17 00:00:00 2001 From: jakobrs Date: Wed, 17 Jun 2020 13:36:06 +0000 Subject: [PATCH 1921/3452] nixos/manual: Document `boot.debug1mounts` and clarify what `exit` does with `shell_on_fail` (#89365) * nixos/manual: document boot.debug1mounts * nixos/manual: clarify what `exit` does with shell_on_fail --- .../manual/administration/boot-problems.xml | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/administration/boot-problems.xml b/nixos/doc/manual/administration/boot-problems.xml index 5fa0b29e6d62..badc374ebcfd 100644 --- a/nixos/doc/manual/administration/boot-problems.xml +++ b/nixos/doc/manual/administration/boot-problems.xml @@ -19,9 +19,9 @@ - Start a root shell if something goes wrong in stage 1 of the boot process - (the initial ramdisk). This is disabled by default because there is no - authentication for the root shell. + Allows the user to start a root shell if something goes wrong in stage 1 + of the boot process (the initial ramdisk). This is disabled by default + because there is no authentication for the root shell. @@ -49,6 +49,22 @@ + + + boot.debug1mounts + + + + Like boot.debug1 or + boot.debug1devices, but runs stage1 until all + filesystems that are mounted during initrd are mounted (see + + ). As a motivating example, this could be useful if you've forgotten to set + + on a file system. + + + boot.trace @@ -90,6 +106,15 @@ 1. + + Notice that for boot.shell_on_fail, + boot.debug1, boot.debug1devices, and + boot.debug1mounts, if you did not + select "start the new shell as pid 1", and you exit from + the new shell, boot will proceed normally from the point where it failed, as + if you'd chosen "ignore the error and continue". + + If no login prompts or X11 login screens appear (e.g. due to hanging dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start From 459cf94991754d391f7808bbc306f52653298ada Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Sat, 9 May 2020 19:16:06 -0700 Subject: [PATCH 1922/3452] Nixpkgs support for `dhall-to-nixpkgs` The motivation for this change is to enable a new Dhall command-line utility called `dhall-to-nixpkgs` which converts Dhall packages to buildable Nix packages. You can think of `dhall-to-nixpkgs` as the Dhall analog of `cabal2nix`. You can find the matching pull request for `dhall-to-nixpkgs` here: https://github.com/dhall-lang/dhall-haskell/pull/1826 The two main changes required to support `dhall-to-nixpkgs` are: * Two new `buildDhall{Directory,GitHub}Package` utilities are added `dhall-to-nixpkgs` uses these in the generated output * `pkgs.dhallPackages` now selects a default version for each package using the `prefer` utility All other versions are still buildable via a `passthru` attribute --- pkgs/development/dhall-modules/Prelude.nix | 29 ++++------- .../dhall-modules/dhall-kubernetes.nix | 31 ++++-------- .../dhall-modules/dhall-packages.nix | 39 +++++---------- .../dhall/build-dhall-directory-package.nix | 25 ++++++++++ .../dhall/build-dhall-github-package.nix | 50 +++++++++++++++++++ pkgs/top-level/dhall-packages.nix | 28 +++++++++-- 6 files changed, 130 insertions(+), 72 deletions(-) create mode 100644 pkgs/development/interpreters/dhall/build-dhall-directory-package.nix create mode 100644 pkgs/development/interpreters/dhall/build-dhall-github-package.nix diff --git a/pkgs/development/dhall-modules/Prelude.nix b/pkgs/development/dhall-modules/Prelude.nix index c689f7156fb4..6af08edf88a7 100644 --- a/pkgs/development/dhall-modules/Prelude.nix +++ b/pkgs/development/dhall-modules/Prelude.nix @@ -1,26 +1,17 @@ -{ buildDhallPackage, fetchFromGitHub, lib }: +{ buildDhallGitHubPackage, lib }: let makePrelude = - version: - lib.makeOverridable - ( { rev, sha256, file ? "package.dhall" }: - buildDhallPackage { - name = "Prelude-${version}"; + version: { rev, sha256 }: + buildDhallGitHubPackage { + name = "Prelude-${version}"; + owner = "dhall-lang"; + repo = "dhall-lang"; + directory = "Prelude"; + file = "package.dhall"; - code = - let - src = fetchFromGitHub { - owner = "dhall-lang"; - repo = "dhall-lang"; - - inherit rev sha256; - }; - - in - "${src}/Prelude/${file}"; - } - ); + inherit rev sha256; + }; in lib.mapAttrs makePrelude { diff --git a/pkgs/development/dhall-modules/dhall-kubernetes.nix b/pkgs/development/dhall-modules/dhall-kubernetes.nix index 23a1123eacb3..2de89d63ec37 100644 --- a/pkgs/development/dhall-modules/dhall-kubernetes.nix +++ b/pkgs/development/dhall-modules/dhall-kubernetes.nix @@ -1,29 +1,16 @@ -{ buildDhallPackage, fetchFromGitHub, lib }: +{ buildDhallGitHubPackage, lib }: let makeDhallKubernetes = - version: - lib.makeOverridable - ( { rev - , sha256 - , file ? "package.dhall" - }: - buildDhallPackage { - name = "dhall-kubernetes-${version}"; + version: { rev, sha256 }: + buildDhallGitHubPackage { + name = "dhall-kubernetes-${version}"; + owner = "dhall-lang"; + repo = "dhall-kubernetes"; + file = "package.dhall"; - code = - let - src = fetchFromGitHub { - owner = "dhall-lang"; - repo = "dhall-kubernetes"; - - inherit rev sha256; - }; - - in - "${src}/${file}"; - } - ); + inherit rev sha256; + }; in lib.mapAttrs makeDhallKubernetes { diff --git a/pkgs/development/dhall-modules/dhall-packages.nix b/pkgs/development/dhall-modules/dhall-packages.nix index 34ebbed68699..866b689e38a1 100644 --- a/pkgs/development/dhall-modules/dhall-packages.nix +++ b/pkgs/development/dhall-modules/dhall-packages.nix @@ -1,47 +1,32 @@ -{ buildDhallPackage, dhall-kubernetes, fetchFromGitHub, lib, Prelude }: +{ buildDhallGitHubPackage, dhall-kubernetes, lib, Prelude }: let makeDhallPackages = - version: - lib.makeOverridable - ( { rev - , sha256 - , dependencies - }: - buildDhallPackage { - name = "dhall-packages-${version}"; + version: { rev, sha256, dependencies }: + buildDhallGitHubPackage { + name = "dhall-packages-${version}"; + owner = "EarnestResearch"; + repo = "dhall-packages"; + file = "package.dhall"; - inherit dependencies; - - code = - let - src = fetchFromGitHub { - owner = "EarnestResearch"; - repo = "dhall-packages"; - - inherit rev sha256; - }; - - in - "${src}/package.dhall"; - } - ); + inherit rev sha256 dependencies; + }; in lib.mapAttrs makeDhallPackages { "0.11.1" = let - k8s_6a47bd = dhall-kubernetes."3.0.0".override { + k8s_6a47bd = dhall-kubernetes.override { rev = "6a47bd50c4d3984a13570ea62382a3ad4a9919a4"; sha256 = "1azqs0x2kia3xw93rfk2mdi8izd7gy9aq6qzbip32gin7dncmfhh"; }; - k8s_4ad581 = dhall-kubernetes."3.0.0".override { + k8s_4ad581 = dhall-kubernetes.override { rev = "4ad58156b7fdbbb6da0543d8b314df899feca077"; sha256 = "12fm70qbhcainxia388svsay2cfg9iksc6mss0nvhgxhpypgp8r0"; }; - k8s_fee24c = dhall-kubernetes."3.0.0".override { + k8s_fee24c = dhall-kubernetes.override { rev = "fee24c0993ba0b20190e2fdb94e386b7fb67252d"; sha256 = "11d93z8y0jzrb8dl43gqha9z96nxxqkl7cbxpz8hw8ky9x6ggayk"; }; diff --git a/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix new file mode 100644 index 000000000000..b4401a85d141 --- /dev/null +++ b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix @@ -0,0 +1,25 @@ +{ buildDhallPackage, lib }: + +# This is a minor variation on `buildDhallPackage` that splits the `code` +# argument into `src` and `file` in such a way that you can easily override +# the `file` +# +# This function is used by `dhall-to-nixpkgs` when given a directory +lib.makeOverridable + ( { # Arguments passed through to `buildDhallPackage` + name + , dependencies ? [] + , source ? false + + , src + , # The file to import, relative to the root directory + file ? "package.dhall" + }: + + buildDhallPackage { + inherit name dependencies source; + + code = "${src}/${file}"; + } + ) + diff --git a/pkgs/development/interpreters/dhall/build-dhall-github-package.nix b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix new file mode 100644 index 000000000000..9289e9b656d3 --- /dev/null +++ b/pkgs/development/interpreters/dhall/build-dhall-github-package.nix @@ -0,0 +1,50 @@ +{ buildDhallPackage, fetchFromGitHub, lib }: + +# This function is used by `dhall-to-nixpkgs` when given a GitHub repository +lib.makeOverridable + ( { # Arguments passed through to `buildDhallPackage` + name + , dependencies ? [] + , source ? false + + , # The directory containing the Dhall files, if other than the root of the + # repository + directory ? "" + , # The file to import, relative to the above directory + file ? "package.dhall" + + # Arguments passed through to `fetchFromGitHub` + , owner + , repo + , rev + # Extra arguments passed through to `fetchFromGitHub`, such as the hash + # or `fetchSubmodules` + , ... + }@args: + + buildDhallPackage { + inherit name dependencies source; + + code = + let + src = fetchFromGitHub ({ + name = "${name}-source"; + + inherit owner repo rev; + } // removeAttrs args [ + "name" + "dependencies" + "source" + "directory" + "file" + "owner" + "repo" + "rev" + ]); + + prefix = lib.optionalString (directory != "") "${directory}/"; + + in + "${src}/${prefix}${file}"; + } + ) diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix index 6cdd84c22799..9d4801e9dc5c 100644 --- a/pkgs/top-level/dhall-packages.nix +++ b/pkgs/top-level/dhall-packages.nix @@ -8,20 +8,40 @@ let let callPackage = newScope self; + prefer = version: path: + let + packages = callPackage path { }; + + in + packages."${version}".overrideAttrs (_: { + passthru = packages; + } + ); + buildDhallPackage = callPackage ../development/interpreters/dhall/build-dhall-package.nix { }; + buildDhallGitHubPackage = + callPackage ../development/interpreters/dhall/build-dhall-github-package.nix { }; + + buildDhallDirectoryPackage = + callPackage ../development/interpreters/dhall/build-dhall-directory-package.nix { }; + in - { inherit buildDhallPackage; + { inherit + buildDhallPackage + buildDhallGitHubPackage + buildDhallDirectoryPackage + ; dhall-kubernetes = - callPackage ../development/dhall-modules/dhall-kubernetes.nix { }; + prefer "3.0.0" ../development/dhall-modules/dhall-kubernetes.nix; dhall-packages = - callPackage ../development/dhall-modules/dhall-packages.nix { }; + prefer "0.11.1" ../development/dhall-modules/dhall-packages.nix; Prelude = - callPackage ../development/dhall-modules/Prelude.nix { }; + prefer "13.0.0" ../development/dhall-modules/Prelude.nix; }; in From eb296c501011675953ef1a93445359fb6d6dffed Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Sun, 24 May 2020 18:15:15 +0200 Subject: [PATCH 1923/3452] wesnoth: 1.14.11 -> 1.14.12 --- pkgs/games/wesnoth/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 20ec0a978f5b..2eb45ded7e29 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf +{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf , pango, gettext, boost, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu , Cocoa, Foundation , enableTools ? false @@ -6,11 +6,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.14.11"; + version = "1.14.12"; - src = fetchurl { - url = "mirror://sourceforge/sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1i8mz6gw3qar09bscczhki0g4scj8pl58v85rp0g55r4bcq41l5v"; + src = fetchFromGitHub { + rev = version; + owner = "wesnoth"; + repo = "wesnoth"; + sha256 = "0xpypy0yfjmjp3apvlh51nm19p1cjhjw2p547kvmrckm7y6naaw8"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { adventures. ''; - homepage = "http://www.wesnoth.org/"; + homepage = "https://www.wesnoth.org/"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; From a978b1151680a00ce7528782073f6402520f51b4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 17 Jun 2020 16:34:59 +0200 Subject: [PATCH 1924/3452] libqmi: enable introspection Also stop using pkg-config alias --- pkgs/development/libraries/libqmi/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index c3dc1e9996f1..15a2a1db18fa 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, python3, libgudev, libmbim }: +{ stdenv, fetchurl, pkg-config, gobject-introspection, glib, python3, libgudev, libmbim }: stdenv.mkDerivation rec { pname = "libqmi"; @@ -13,10 +13,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-udev-base-dir=${placeholder "out"}/lib/udev" + "--enable-introspection" ]; nativeBuildInputs = [ - pkgconfig + pkg-config + gobject-introspection python3 ]; From d6af70fa90e520df286533776ab9aea4753a56de Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Wed, 17 Jun 2020 12:39:10 +0200 Subject: [PATCH 1925/3452] libjcat: 0.1.2 -> 0.1.3 Fixes: https://nvd.nist.gov/vuln/detail/CVE-2020-10759 Changelog: https://github.com/hughsie/libjcat/blob/0.1.3/NEWS See also: https://github.com/justinsteven/advisories/blob/master/2020_fwupd_dangling_s3_bucket_and_CVE-2020-10759_signature_verification_bypass.md --- pkgs/development/libraries/libjcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index 1d6f274cbb3b..bbf0db233821 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.2"; + version = "0.1.3"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "0smd1i6gzpp34gv494jcnx40wm36v1s8bypqlfrf8l6q9cl77gyd"; + sha256 = "157bi1v9qqk45rkq7lg08l7g3bxwacl4h89vnr7msjmg0hri36kc"; }; patches = [ From 8e94e61aec5c2065788a10850d1f9d9caa3f969b Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 12:46:53 +0200 Subject: [PATCH 1926/3452] tpm2-tss: 2.3.2 -> 2.4.1 --- pkgs/development/libraries/tpm2-tss/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index b264c3bc6c6e..5a62c8e45ecd 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -1,32 +1,24 @@ { stdenv, lib, fetchurl, fetchpatch -, cmocka, doxygen, ibm-sw-tpm2, iproute, openssl, perl, pkgconfig, procps +, cmocka, doxygen, ibm-sw-tpm2, iproute, openssl, perl, pkgconfig, procps, json_c, curl , uthash, which }: stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "2.3.2"; + version = "2.4.1"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "19jg09sxy3aj4dc1yv32jjv0m62cnmhjlw02jbh4d4pk2439m4l2"; + sha256 = "03g6l64nzkpadjyabmbhnhs8648iqb95fviinnpslggzp75azmsq"; }; - patches = [ - # Fix test failure. see https://github.com/tpm2-software/tpm2-tss/pull/1585 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/tpm2-software/tpm2-tss/pull/1585.patch"; - sha256 = "0ak3l588ahzv3yx1gfa4sa6p74lsffxzkr23ppznm34wvlcci86n"; - }) - ]; - nativeBuildInputs = [ doxygen perl pkgconfig # For unit tests and integration tests. ibm-sw-tpm2 iproute procps which ]; buildInputs = [ - openssl + openssl json_c curl # For unit tests and integration tests. cmocka uthash ]; From de064be98405ba4767735cf2efe33a9828809d11 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 13:00:02 +0200 Subject: [PATCH 1927/3452] tpm2-tss: enable parallel building --- pkgs/development/libraries/tpm2-tss/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 5a62c8e45ecd..a242484e8976 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { cmocka uthash ]; + enableParallelBuilding = true; + postPatch = "patchShebangs script"; configureFlags = [ From 1ec50ac39efead05c70b65949ebf32ed8070ba50 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 13:47:34 +0200 Subject: [PATCH 1928/3452] tpm2-tss: extract checkPhase dependencies into checkInputs --- pkgs/development/libraries/tpm2-tss/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index a242484e8976..b2595193aad2 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -14,13 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ doxygen perl pkgconfig - # For unit tests and integration tests. - ibm-sw-tpm2 iproute procps which ]; buildInputs = [ openssl json_c curl - # For unit tests and integration tests. - cmocka uthash + ]; + checkInputs = [ + cmocka uthash ibm-sw-tpm2 iproute procps which ]; enableParallelBuilding = true; From 09791689dfa4e9a5c1fdfadb51e531f670078752 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 15:14:42 +0200 Subject: [PATCH 1929/3452] tpm2-tss: build from source instead of release tarball --- .../libraries/tpm2-tss/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index b2595193aad2..f4d8b58a0da2 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -1,27 +1,30 @@ -{ stdenv, lib, fetchurl, fetchpatch -, cmocka, doxygen, ibm-sw-tpm2, iproute, openssl, perl, pkgconfig, procps, json_c, curl -, uthash, which +{ stdenv, lib, fetchFromGitHub +, autoreconfHook, autoconf-archive, pkg-config, doxygen, perl +, openssl, json_c, curl, libgcrypt +, cmocka, uthash, ibm-sw-tpm2, iproute, procps, which }: stdenv.mkDerivation rec { pname = "tpm2-tss"; version = "2.4.1"; - src = fetchurl { - url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "03g6l64nzkpadjyabmbhnhs8648iqb95fviinnpslggzp75azmsq"; + src = fetchFromGitHub { + owner = "tpm2-software"; + repo = pname; + rev = version; + sha256 = "09x5czaj4a8cyf8cxavcasx3yy1kik1s45a90c7zvxb7y1kfp9zs"; }; nativeBuildInputs = [ - doxygen perl pkgconfig - ]; - buildInputs = [ - openssl json_c curl + autoreconfHook autoconf-archive pkg-config doxygen perl libgcrypt.dev ]; + buildInputs = [ openssl json_c curl libgcrypt ]; checkInputs = [ cmocka uthash ibm-sw-tpm2 iproute procps which ]; + preAutoreconf = "./bootstrap"; + enableParallelBuilding = true; postPatch = "patchShebangs script"; From ef9e6b3aa8516fd68cdad91c19aed9be5b6fafa5 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 18:23:01 +0200 Subject: [PATCH 1930/3452] tpm2-tss: remove libgcrypt from explicit build inputs --- pkgs/development/libraries/tpm2-tss/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index f4d8b58a0da2..2421d3f88990 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook autoconf-archive pkg-config doxygen perl libgcrypt.dev + autoreconfHook autoconf-archive pkg-config doxygen perl ]; buildInputs = [ openssl json_c curl libgcrypt ]; checkInputs = [ From fb667c1beb7c67d131008fe4044f2f744d9dedcf Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 12:47:37 +0200 Subject: [PATCH 1931/3452] tpm2-abrmd: 2.2.0 -> 2.3.2 --- pkgs/tools/security/tpm2-abrmd/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index fbebde2e7bf6..76e511662bac 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, lib -, tpm2-tss, pkgconfig, glib, which, dbus, cmocka }: +, makeWrapper, tpm2-tss, pkgconfig, glib, which, dbus, cmocka }: stdenv.mkDerivation rec { pname = "tpm2-abrmd"; - version = "2.2.0"; + version = "2.3.2"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1lbfhyyh9k54r8s1h8ca2czxv4hg0yq984kdh3vqh3990aca0x9a"; + sha256 = "040d01pdzkj0nc1c0vsf6gfqf28cgil03ix8dasijvhiha4c20nz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ tpm2-tss glib which dbus cmocka ]; @@ -19,6 +19,14 @@ stdenv.mkDerivation rec { #configureFlags = [ "--enable-unit" ]; doCheck = false; + # Even though tpm2-tss is in the RUNPATH, starting from 2.3.0 abrmd + # seems to require the path to the device TCTI (used for accessing + # /dev/tpm0) in it's LD_LIBRARY_PATH + postFixup = '' + wrapProgram $out/bin/tpm2-abrmd \ + --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ tpm2-tss ]}" + ''; + meta = with lib; { description = "TPM2 resource manager, accessible via D-Bus"; homepage = "https://github.com/tpm2-software/tpm2-tools"; From 3cc29166a72dc743ca6771143bfb72b431907650 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 13:18:11 +0200 Subject: [PATCH 1932/3452] tpm2-abrmd: enable parallel building --- pkgs/tools/security/tpm2-abrmd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index 76e511662bac..b1edf6123707 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { tpm2-tss glib which dbus cmocka ]; + enableParallelBuilding = true; + # Unit tests are currently broken as the check phase attempts to start a dbus daemon etc. #configureFlags = [ "--enable-unit" ]; doCheck = false; From 1a1ab9474e17dd0e65306dbce00e638d582324bf Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 15:01:11 +0200 Subject: [PATCH 1933/3452] tpm2-abrmd: build from source instead of release tarball --- pkgs/tools/security/tpm2-abrmd/default.nix | 27 ++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index b1edf6123707..de584438ed62 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -1,22 +1,31 @@ -{ stdenv, fetchurl, lib -, makeWrapper, tpm2-tss, pkgconfig, glib, which, dbus, cmocka }: +{ stdenv, lib, fetchFromGitHub +, autoreconfHook, pkg-config, autoconf-archive, makeWrapper, which +, tpm2-tss, glib, dbus +, cmocka +}: stdenv.mkDerivation rec { pname = "tpm2-abrmd"; version = "2.3.2"; - src = fetchurl { - url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "040d01pdzkj0nc1c0vsf6gfqf28cgil03ix8dasijvhiha4c20nz"; + src = fetchFromGitHub { + owner = "tpm2-software"; + repo = pname; + rev = version; + sha256 = "0jzglnlb700clcq6mjhhgvcq29a6893h888wsn9fbrh4f255sw8q"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ - tpm2-tss glib which dbus cmocka - ]; + nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook autoconf-archive which ]; + buildInputs = [ tpm2-tss glib dbus cmocka ]; enableParallelBuilding = true; + # Emulate the required behavior of ./bootstrap in the original + # package + preAutoreconf = '' + echo "${version}" > VERSION + ''; + # Unit tests are currently broken as the check phase attempts to start a dbus daemon etc. #configureFlags = [ "--enable-unit" ]; doCheck = false; From a7aab1fff33573d3ef58c4c9b80ce603e8fc8f48 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jun 2020 15:01:40 +0200 Subject: [PATCH 1934/3452] tpm2-abrmd: separate checkPhase dependencies into checkInputs --- pkgs/tools/security/tpm2-abrmd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index de584438ed62..6fe116d7015a 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook autoconf-archive which ]; - buildInputs = [ tpm2-tss glib dbus cmocka ]; + buildInputs = [ tpm2-tss glib dbus ]; + checkInputs = [ cmocka ]; enableParallelBuilding = true; From 4e5b9f8b2e3298e6d9d3cfc81829798b0e070691 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 17 Jun 2020 17:07:40 +0200 Subject: [PATCH 1935/3452] nvme-cli: 1.11.2 -> 1.12 --- pkgs/os-specific/linux/nvme-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index c05adb33eca1..80a00082b81a 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "1.11.2"; + version = "1.12"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "0ngh7zffjf6ac8b22hdi4ry7hjlafih172hrbpw8j17r7c0wjy9i"; + sha256 = "0ldky34sn0m5c4hgiip0fkzm465nca69bhxicpd5dg8wxhzxqrp3"; }; nativeBuildInputs = [ pkg-config ]; From 9c300b6e2c8a40eea623a66b55d870806a5208ec Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 1 May 2020 00:03:05 +0200 Subject: [PATCH 1936/3452] virtualbox-guest-additions: fix dlopen of libXrandr The library could not be loaded which prevented autoresizing when using the VMSVGA adapter. --- .../virtualization/virtualbox/guest-additions/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 4275bc0542e8..3a9f8eeed437 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,6 +19,7 @@ let dlopenLibs = [ { name = "libdbus-1.so"; pkg = dbus; } { name = "libXfixes.so"; pkg = xorg.libXfixes; } + { name = "libXrandr.so"; pkg = xorg.libXrandr; } ]; in stdenv.mkDerivation rec { From ec9792a3f55dca1985b8ce61e73dd746b320effd Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 1 May 2020 00:05:55 +0200 Subject: [PATCH 1937/3452] nixos/virtualbox-guest: add vmware driver VMSGVA is recommended by virtualbox for Linux clients. Compared to VBoxVGA and VBoxSVGA it also supports 3D acceleration. Adding the driver makes nixos work with all three supported graphics card types. --- nixos/modules/virtualisation/virtualbox-guest.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index 834b994e92d2..486951983d30 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -68,7 +68,7 @@ in SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd" ''; } (mkIf cfg.x11 { - services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" "modesetting" ]; + services.xserver.videoDrivers = mkOverride 50 [ "vmware" "virtualbox" "modesetting" ]; services.xserver.config = '' From 6c2d12f1fa221468558e8e68141d2a3b25f853bd Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 1 May 2020 15:50:58 +0200 Subject: [PATCH 1938/3452] nixos/manual: recommend VMSVGA as graphics adapter Virtualbox recommends VMSVGA for Linux guests. It is also currently the only one supporting 3D acceleration and it works out of the box with NixOS and auto screen resizing. --- nixos/doc/manual/installation/installing-virtualbox-guest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml index 0ba909fa953f..1cffeed48079 100644 --- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml @@ -49,7 +49,7 @@ - Click on Settings / Display / Screen and select VBoxVGA as Graphics Controller + Click on Settings / Display / Screen and select VMSVGA as Graphics Controller From f29063ff0bc0348ab7b64ad8f1038e9ecb065727 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 17 Jun 2020 18:42:36 +0200 Subject: [PATCH 1939/3452] nixos/virtualbox-image: change graphics adapter to vmswga --- nixos/modules/virtualisation/virtualbox-image.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 788b4d9d9761..136bbad60a43 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -72,6 +72,7 @@ in { audiocontroller = "ac97"; audio = "alsa"; audioout = "on"; + graphicscontroller = "vmsvga"; rtcuseutc = "on"; usb = "on"; usbehci = "on"; From 7198d973c100958b1fd014db98ba4bc03c31ac26 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 14 Jun 2020 04:56:50 +0200 Subject: [PATCH 1940/3452] wireshark: compile with QT_NO_DEBUG to avoid depending on qt*-dev --- pkgs/applications/networking/sniffers/wireshark/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index c6dc66a0ca78..d025222b0100 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -31,6 +31,9 @@ in stdenv.mkDerivation { "-DCMAKE_INSTALL_LIBDIR=lib" ]; + # Avoid referencing -dev paths because of debug assertions. + NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; + nativeBuildInputs = [ bison cmake flex pkgconfig ] ++ optional withQt qt5.wrapQtAppsHook; From 9daa1838d3d06fda9a5aee03738e677d7a5837ba Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Wed, 17 Jun 2020 18:59:35 +0200 Subject: [PATCH 1941/3452] fish: replace use of tr with string split This shaves about 4ms off fish start time. Before (profiled with 'fish --profile prof.txt -c fish_prompt'): 225 4636 ----> set -l __nix_profile_paths (echo $NIX_PROFILES | /nix/store/m5ajgnzp2512na31brwfmydwk3l1gawb-coreutils-8.31/bin/tr ' ' '\n')[-1..1] 4411 4411 -----> echo $NIX_PROFILES | /nix/store/m5ajgnzp2512na31brwfmydwk3l1gawb-coreutils-8.31/bin/tr ' ' '\n' After: 190 248 ----> set -l __nix_profile_paths (string split ' ' $NIX_PROFILES)[-1..1] --- pkgs/shells/fish/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 11d9e48008fa..57c52a411d38 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -79,7 +79,7 @@ let # additional profiles are expected in order of precedence, which means the reverse of the # NIX_PROFILES variable (same as config.environment.profiles) - set -l __nix_profile_paths (echo $NIX_PROFILES | ${coreutils}/bin/tr ' ' '\n')[-1..1] + set -l __nix_profile_paths (string split ' ' $NIX_PROFILES)[-1..1] set __extra_completionsdir \ $__nix_profile_paths"/etc/fish/completions" \ From 84e25cf478d8f81070659a30f5181b0e11a028ff Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Wed, 17 Jun 2020 18:59:56 +0200 Subject: [PATCH 1942/3452] fish: use -p to prepend profile directories --- pkgs/shells/fish/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 57c52a411d38..a6ce7bf6d23a 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -81,18 +81,15 @@ let # NIX_PROFILES variable (same as config.environment.profiles) set -l __nix_profile_paths (string split ' ' $NIX_PROFILES)[-1..1] - set __extra_completionsdir \ + set -p __extra_completionsdir \ $__nix_profile_paths"/etc/fish/completions" \ - $__nix_profile_paths"/share/fish/vendor_completions.d" \ - $__extra_completionsdir - set __extra_functionsdir \ + $__nix_profile_paths"/share/fish/vendor_completions.d" + set -p __extra_functionsdir \ $__nix_profile_paths"/etc/fish/functions" \ - $__nix_profile_paths"/share/fish/vendor_functions.d" \ - $__extra_functionsdir - set __extra_confdir \ + $__nix_profile_paths"/share/fish/vendor_functions.d" + set -p __extra_confdir \ $__nix_profile_paths"/etc/fish/conf.d" \ - $__nix_profile_paths"/share/fish/vendor_conf.d" \ - $__extra_confdir + $__nix_profile_paths"/share/fish/vendor_conf.d" end ''; From ec618a9120acb298e69afe9d02478722978781ec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 17 Jun 2020 16:46:08 +0200 Subject: [PATCH 1943/3452] python.pkgs.bleach: add missing dependency `packaging` --- pkgs/development/python-modules/bleach/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 1b10fe166f8a..9b27ae254903 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -6,6 +6,7 @@ , six , html5lib , setuptools +, packaging }: buildPythonPackage rec { @@ -18,11 +19,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ six html5lib setuptools ]; - - postPatch = '' - substituteInPlace setup.py --replace ",<3dev" "" - ''; + propagatedBuildInputs = [ packaging six html5lib setuptools ]; # Disable network tests checkPhase = '' From 35040cfafdba3a08d68e6cd23169e6617c5e7a77 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 14 Jun 2020 01:30:18 +0200 Subject: [PATCH 1944/3452] rmlint: fix running rmlint --gui rmlint has a `--gui` option which is writing a python "bootstrap" script in `/tmp`. It currently can't find its own python modules, as we don't prefix `PYTHONPATH` to point to it. Also, there's some other runtime dependencies, mostly due to using gtk from python(3), which also needs to be preprended to `PYTHONPATH`. The `rmlint` GUI components also execute `rmlint` again with `--version` to determine some features, for which we need to prefix `PATH` with `$out/bin`. --- pkgs/tools/misc/rmlint/default.nix | 53 ++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 2ea1668409a5..936c78b695d1 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -1,6 +1,22 @@ -{ stdenv, fetchFromGitHub -, gettext, pkgconfig, scons -, glib, json-glib, libelf, sphinx, utillinux }: +{ stdenv +, cairo +, fetchFromGitHub +, gettext +, glib +, gobject-introspection +, gtksourceview3 +, json-glib +, libelf +, makeWrapper +, pango +, pkgconfig +, polkit +, python3 +, scons +, sphinx +, utillinux +, wrapGAppsHook +, withGui ? false }: with stdenv.lib; stdenv.mkDerivation rec { @@ -17,14 +33,39 @@ stdenv.mkDerivation rec { CFLAGS="-I${stdenv.lib.getDev utillinux}/include"; nativeBuildInputs = [ - pkgconfig sphinx gettext scons + pkgconfig + sphinx + gettext + scons + ] ++ stdenv.lib.optionals withGui [ + makeWrapper + wrapGAppsHook ]; buildInputs = [ - glib json-glib libelf utillinux + glib + json-glib + libelf + utillinux + ] ++ stdenv.lib.optionals withGui [ + cairo + gobject-introspection + gtksourceview3 + pango + polkit + python3 + python3.pkgs.pygobject3 ]; - prefixKey = "--prefix="; + # this doesn't seem to support configureFlags, and appends $out afterwards, + # so add the --without-gui in front of it + prefixKey = stdenv.lib.optionalString (!withGui) " --without-gui " + "--prefix="; + + # in GUI mode, this shells out to itself, and tries to import python modules + postInstall = stdenv.lib.optionalString withGui '' + gappsWrapperArgs+=(--prefix PATH : "$out/bin") + gappsWrapperArgs+=(--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${python3.pkgs.pygobject3}):$(toPythonPath ${python3.pkgs.pycairo})") + ''; meta = { description = "Extremely fast tool to remove duplicates and other lint from your filesystem"; From 84b7946079c3f7581818e722c9055a59b16d0bd6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 02:21:20 +0000 Subject: [PATCH 1945/3452] flyway: 6.4.3 -> 6.4.4 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 1349d4c009aa..adb36d8e92cb 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.4.3"; + version = "6.4.4"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "05gbqc3hvi7yiqf03iwyamvvhc3jmyfvv1989527psdzhxs8gw7b"; + sha256 = "16zckqq64jv3031ssrvzw4ny98gnxhy2hsdp877i38zxqsvzdcym"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From bfc1914423f2367ae150c775c95b05b85b94faca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 08:32:58 +0000 Subject: [PATCH 1946/3452] libfprint: 1.90.1 -> 1.90.2 --- pkgs/development/libraries/libfprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index e2552ba713e0..7c6168c3d3e4 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.90.1"; + version = "1.90.2"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "0fdaak7qjr9b4482g7fhhqpyfdqpxq5kpmyzkp7f5i7qq2ynb78a"; + sha256 = "0g890y49anqd7yfz86iyvywxgbfmfmj6813fy58m5n8jain7iy1b"; }; nativeBuildInputs = [ From 0505a47c8e6177196600bbb327c68e3fd8bd0c9b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 23:09:51 +0000 Subject: [PATCH 1947/3452] gitkraken: 7.0.0 -> 7.0.1 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 88f8df4e2547..2afed8c099c8 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "7.0.0"; + version = "7.0.1"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "0ws1gb7fgy72s6hxkf9g16x565m58k1cdzx9ldcdghfffimz4cqx"; + sha256 = "0vj2ggbm617fypl69ksbrbl048xp4v6wc46y4sp7hrk6lg0gw1b0"; }; dontBuild = true; From 7b104edf89dbba80d1d7acd1c2910f1b845428e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 17:30:39 +0000 Subject: [PATCH 1948/3452] eagle: 9.6.1 -> 9.6.2 --- pkgs/applications/science/electronics/eagle/eagle.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 58bdd5c722da..4cfad20e695f 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -13,11 +13,11 @@ let in mkDerivation rec { pname = "eagle"; - version = "9.6.1"; + version = "9.6.2"; src = fetchurl { url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; - sha256 = "1iq4aahrh4g3549vbr7gka5y2h7f17n3yafzl21njc2mkqb12jdw"; + sha256 = "18syygnskl286kn8aqfzzdsyzq59d2w19y1h1ynyxsnrvkyv71h0"; }; desktopItem = makeDesktopItem { From 03ff03db4f5d423af4d97a310cad2e315b575825 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 23:27:35 +0000 Subject: [PATCH 1949/3452] freetds: 1.1.40 -> 1.1.42 --- pkgs/development/libraries/freetds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index f244bdc7ad2b..c1b9318130c1 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.1.40"; + version = "1.1.42"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "0wc7xxf8fzpp3pc3hpsamnykn0vjkq53qp53nyxjjcri8g0ch7wq"; + sha256 = "02phnk88zv4f8byx954784w8mh33knsslwvj266jfyrmxz6hxxxg"; }; buildInputs = [ From ec13b27348f98e74e0fbb1ab5e5723ec3127b7a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 02:07:43 +0000 Subject: [PATCH 1950/3452] gmm: 5.3 -> 5.4 --- pkgs/development/libraries/gmm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index eb23f5c82c23..278059465ecb 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gmm"; - version = "5.3"; + version = "5.4"; src = fetchurl { url = "mirror://savannah/getfem/stable/${pname}-${version}.tar.gz"; - sha256 = "0lkjd3n0298w1dli446z320sn7mqdap8h9q31nydkbw2k7b4db46"; + sha256 = "0mhygfpsdyr0d4h3sn6g7nxn149yrlqv7r2h34yqkrpv1q4daqvi"; }; meta = with stdenv.lib; { From 36f5cb2a8857987f1bcfef39c726b943d35cc9ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 23:33:05 +0000 Subject: [PATCH 1951/3452] amiri: 0.112 -> 0.113 --- pkgs/data/fonts/amiri/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/amiri/default.nix b/pkgs/data/fonts/amiri/default.nix index 9ecde1939e8c..9867b84757aa 100644 --- a/pkgs/data/fonts/amiri/default.nix +++ b/pkgs/data/fonts/amiri/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "0.112"; + version = "0.113"; in fetchzip rec { name = "Amiri-${version}"; url = "https://github.com/alif-type/amiri/releases/download/${version}/${name}.zip"; - sha256 = "13j8kglgca296czxjz1xvrbz6yx05s2xassiliyszndbkrhn6bkl"; + sha256 = "0v5xm4spyww8wy6j9kpb01ixrakw7wp6jng4xnh220iy6yqcxm7v"; postFetch = '' unzip $downloadedFile From d588c2dcc5507f15decd21732c5f033abf7c2c01 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 23:58:51 +0000 Subject: [PATCH 1952/3452] geekbench: 5.1.1 -> 5.2.0 --- pkgs/tools/misc/geekbench/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index 153a74f94567..9c250390e11c 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "1wjyn3fkc2zgj0xrd73kidrg1d1wqmil278ak36wf87685w4n0b1"; + sha256 = "1rvzll57igivhlxp058mhmcbq07q2zr52xbi1wyn85qr9ihrhx08"; }; dontConfigure = true; From 7449170e6bbcfa01c6e8bba8f55f2658a589b5bf Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Wed, 17 Jun 2020 11:37:38 -0700 Subject: [PATCH 1953/3452] alertmanager: 0.20.0 -> 0.21.0 --- pkgs/servers/monitoring/prometheus/alertmanager.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 9402fa44eed2..1e0c152631f9 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "alertmanager"; - version = "0.20.0"; + version = "0.21.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "1bq6vbpy25k7apvs2ga3fbp1cbnv9j0y1g1khvz2qgz6a2zvhgg3"; + sha256 = "0zrzyaqs73pz4rmj4xaj15x4n1542m0nb7jqm2j77k07j75r5w41"; }; buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' From 30efcbccffe85803e769d6db21c34125ea755bab Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Wed, 17 Jun 2020 11:38:00 -0700 Subject: [PATCH 1954/3452] alertmanager: add Frostman to maintainers --- pkgs/servers/monitoring/prometheus/alertmanager.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 1e0c152631f9..f5c7c062c878 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -35,7 +35,7 @@ buildGoPackage rec { description = "Alert dispatcher for the Prometheus monitoring system"; homepage = "https://github.com/prometheus/alertmanager"; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz globin ]; + maintainers = with maintainers; [ benley fpletz globin Frostman ]; platforms = platforms.unix; }; } From 2ea468a8d57a5e468b35f933a0318b60fcf448e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 12:47:54 +0000 Subject: [PATCH 1955/3452] asunder: 2.9.5 -> 2.9.6 --- pkgs/applications/audio/asunder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index 7d90ac36f366..998535a8eb0b 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.9.5"; + version = "2.9.6"; pname = "asunder"; src = fetchurl { url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2"; - sha256 = "069x6az2r3wlb2hd07iz0hxpxwknw7s9h7pyhnkmzv1pw9ci3kk4"; + sha256 = "1ycnd82lh7qy1pcbngd4b41s16j9hnm2kyfrncg4cwr3bfk7yg7a"; }; nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; From 59e7c74f4c94701ff445a876b03afcadb0dc473c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 11:33:46 +0000 Subject: [PATCH 1956/3452] beancount: 2.2.3 -> 2.3.0 --- pkgs/development/python-modules/beancount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 045dd14da0d8..9709037792dc 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -4,14 +4,14 @@ , ply, python_magic, pytest, requests }: buildPythonPackage rec { - version = "2.2.3"; + version = "2.3.0"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0pcfl2rx2ng06i4f9izdpnlnb1k0rdzsckbzzn4cn4ixfzyssm0m"; + sha256 = "04i788glp2cslwi67dixy1pi5l0izcl078i9mrd1j1sh8f99cvcs"; }; # Tests require files not included in the PyPI archive. From 5af11c6a0da8239175b9369415198e9ff9fe4b6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 05:44:53 +0000 Subject: [PATCH 1957/3452] vis: 0.5 -> 0.6 --- pkgs/applications/editors/vis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 85f78035a0f3..5191b916b6c5 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "vis"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { rev = "v${version}"; - sha256 = "1vhq6hprkgj90iwl5vl3pxs3xwc01mx8yhi6c1phzry5agqqp8jb"; + sha256 = "1zjm89cn3rfq8fxpwp66khy53s6vqlmw6q103qyyvix8ydzxdmsh"; repo = "vis"; owner = "martanne"; }; From 09a09c3aed597b362edff6861e2c1eadb97d9da8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 12:22:46 +0000 Subject: [PATCH 1958/3452] bacula: 9.6.3 -> 9.6.5 --- pkgs/tools/backup/bacula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index a9fd2f19b897..8bf253a7b121 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }: stdenv.mkDerivation rec { - name = "bacula-9.6.3"; + name = "bacula-9.6.5"; src = fetchurl { url = "mirror://sourceforge/bacula/${name}.tar.gz"; - sha256 = "02jvijwfw8nqrq61pyr5b9d5zjpmrsimkg6dq42rbd71g2k6a4zc"; + sha256 = "0yn7qwkzix78bs811vmrn5gbywy7ggnsv72mdjz2lirqc6w3a3si"; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] From 8a61274a5d41980dfb3e930c76e7f682ec089e4c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 12:30:39 +0000 Subject: [PATCH 1959/3452] alsaUtils: 1.2.2 -> 1.2.3 --- pkgs/os-specific/linux/alsa-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index f05bb6a0d59c..470536db4b7b 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-utils"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; - sha256 = "1wz460by17rmxrcydn583rd4lhj6wlvqs6x1j5pdzxn5g3app024"; + sha256 = "1ai1z4kf91b1m3qrpwqkc1af5vm2fkdkknqv95xdwf19q94aw6gz"; }; patchPhase = '' From 2c65581b4d99f538dacd0f63e2e080ea774b2adf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 13:45:58 +0000 Subject: [PATCH 1960/3452] ckbcomp: 1.194 -> 1.195 --- pkgs/tools/X11/ckbcomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index dc665bf9c41b..74a6777d9491 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.194"; + version = "1.195"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "0fkabv05j5dj10mfrpjyvv7lnxl9qaqkbjhwj72r18i9i4019vgh"; + sha256 = "0d0xagigs5k3appzz5lzxdjncvnkgz4amz6ks7imiq8kkjixvmfy"; }; buildInputs = [ perl ]; From 6326c02e0e958833744603e7c3720e70aba3bdac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 04:16:52 +0000 Subject: [PATCH 1961/3452] telegraf: 1.14.3 -> 1.14.4 --- pkgs/servers/monitoring/telegraf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index adc42173f8e5..388d7fe37908 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.14.3"; + version = "1.14.4"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,7 +14,7 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "11rd54brdbxb5ari6zan7gyr0fa1m0rmwcn5a8h8dla3xprw30wp"; + sha256 = "0kbf1r9b9xylq0akmklzy94pcljayhdjm539fwazp5c1364qmbjm"; }; vendorSha256 = "05nj99hl5f5l0a2aswy19wmbm94hd1h03r227gmn419dkzc5hpah"; From 778ffb0334b25e51142b7c5858bcd76249d3079b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 05:53:10 +0000 Subject: [PATCH 1962/3452] webhook: 2.6.8 -> 2.7.0 --- pkgs/servers/http/webhook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix index d40adb171a63..fe428926704e 100644 --- a/pkgs/servers/http/webhook/default.nix +++ b/pkgs/servers/http/webhook/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "webhook"; - version = "2.6.8"; + version = "2.7.0"; goPackagePath = "github.com/adnanh/webhook"; excludedPackages = [ "test" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "adnanh"; repo = "webhook"; rev = version; - sha256 = "05q6nv04ml1gr4k79czg03i3ifl05xq29iapkgrl3k0a36czxlgs"; + sha256 = "1spiqjy0z84z96arf57bn6hyvfsd6l8w6nv874mbis6vagifikci"; }; meta = with lib; { From df7aef73f75d3e34afce0c8bf0b22fb48b4bf89f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 03:54:16 +0000 Subject: [PATCH 1963/3452] stella: 6.1.2 -> 6.2 --- pkgs/misc/emulators/stella/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 14189e5b3871..591b2daaf15b 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "stella"; - version = "6.1.2"; + version = "6.2"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; rev = version; - sha256 = "0m4vdgn7gqhga7hamy4djnlkfgz78gfkmg8by3mai5lw0cps7hr1"; + sha256 = "1d97g4m686xsj6r5vy5x74ys9yk0hcpdppxh714n8hhcc9aglm19"; }; nativeBuildInputs = [ pkgconfig ]; From 47d8d4a54d3e94b8be622a8ea523d144ab440e97 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 23:10:39 +0000 Subject: [PATCH 1964/3452] nats-server: 2.1.0 -> 2.1.7 --- pkgs/servers/nats-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 3685589fa70a..743fc0fa1e56 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "nats-server"; - version = "2.1.0"; + version = "2.1.7"; goPackagePath = "github.com/nats-io/${pname}"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "1zp43v69cawbp6bpby1vx51z6nyv8gxnnl2qkhwr9zrgnhlcflnl"; + sha256 = "08wqaqar964p9adc0ma8dqg0rf88rylk1m2mddlbbqmd6l4h6m27"; }; meta = { From 00c9983e02f0a211ef0ca4335371cc50dd4a1b26 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 04:28:26 +0000 Subject: [PATCH 1965/3452] terraform-providers.libvirt: 0.6.1 -> 0.6.2 --- .../cluster/terraform-providers/libvirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index daffb5930903..42ed3d21066f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { pname = "terraform-provider-libvirt"; - version = "0.6.1"; + version = "0.6.2"; goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; @@ -27,7 +27,7 @@ buildGoPackage rec { owner = "dmacvicar"; repo = "terraform-provider-libvirt"; rev = "v${version}"; - sha256 = "1l2n97nj6g44n7bhnbjwmv36xi6754p4iq2qnpkdh39x4384a0zz"; + sha256 = "1wkpns047ccff0clfb1108wjax1qb5v06hky0i3h2wpzysll7r7b"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; From 99d0aefab9e578b6daea6e694d1ed3d23cc6f467 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 12:08:47 +0000 Subject: [PATCH 1966/3452] activemq: 5.15.12 -> 5.15.13 --- pkgs/development/libraries/apache-activemq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 7ea38b6472b8..c09fb8d91ee1 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.15.12"; + version = "5.15.13"; src = fetchurl { - sha256 = "14v117r9zqvrqr79h66r0dm9lyxq3104rcdizcnvk0syz0zbwps1"; + sha256 = "1hzapnd0lbiid243xiaz8kv67al8griccjj4dabml62hqhrk9k96"; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; From 02bbd55229bbd8128db89aea5d95b97c5af5bd4b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 06:01:15 +0000 Subject: [PATCH 1967/3452] wkhtmltopdf: 0.12.5 -> 0.12.6 --- pkgs/tools/graphics/wkhtmltopdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index ee083c3e301b..093ab9ad5c43 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -3,14 +3,14 @@ , openssl, libX11, libXext, libXrender }: mkDerivation rec { - version = "0.12.5"; + version = "0.12.6"; pname = "wkhtmltopdf"; src = fetchFromGitHub { owner = "wkhtmltopdf"; repo = "wkhtmltopdf"; rev = version; - sha256 = "0i6b6z3f4szspbbi23qr3hv22j9bhmcj7c1jizr7y0ra43mrgws1"; + sha256 = "0m2zy986kzcpg0g3bvvm815ap9n5ann5f6bdy7pfj6jv482bm5mg"; }; buildInputs = [ From 29e87975da628a7eeb2c0a90a28012062337d20b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 06:16:10 +0000 Subject: [PATCH 1968/3452] xmrig: 5.11.2 -> 5.11.3 --- pkgs/applications/misc/xmrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 8fb07b1ae79c..d4d93c77ed42 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "5.11.2"; + version = "5.11.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1mhqa9jb4475phhqnkc7k1mwgkan7zp7y4z2c7n2x43r48ghxpfx"; + sha256 = "019g64rp6g0b0w17bm9l4q5lh7szc6ai8r3bfmy98ngi929r4rl7"; }; nativeBuildInputs = [ cmake ]; From 595883171e677fd4782967f6223cef0c4bc57d6f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 20:57:02 +0000 Subject: [PATCH 1969/3452] liquibase: 3.9.0 -> 3.10.0 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index a92c96684a48..ae993f9611e0 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.9.0"; + version = "3.10.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0qasiggaxix3gmmvax00k83q4pd1c1b5wx8ayyplaszkgr9advb8"; + sha256 = "1h5mcbs6mkk6cqjm8qm63rynz7611gq32v2jirl1qn71x2s7pq6y"; }; buildInputs = [ jre makeWrapper ]; From 5013183ff98aa1c9c0068e8d76ee8018c69e7e17 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 06:20:33 +0000 Subject: [PATCH 1970/3452] xmrig-proxy: 5.10.2 -> 5.11.0 --- pkgs/applications/misc/xmrig/proxy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 524e2a99ae92..39cd50204095 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "5.10.2"; + version = "5.11.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "1mkamkqhqj7nbvaxdim1rbc3f5sw410wzly4ln73ackzlvdwn319"; + sha256 = "0wwvsmanvcn0kbb5zqrj8786yg9rmdbink6rsnsm7ifak1iwvls9"; }; nativeBuildInputs = [ cmake ]; From fc9ddd85c48db80ada7d96efe0480a43a2637fe8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 21:30:20 +0000 Subject: [PATCH 1971/3452] matterircd: 0.18.2 -> 0.19.4 --- pkgs/servers/mattermost/matterircd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index bb6d1584a670..d644e985db5a 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "matterircd"; - version = "0.18.2"; + version = "0.19.4"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "0g57g91v7208yynf758k9v73jdhz4fbc1v23p97rzrl97aq0rd5r"; + sha256 = "1kwyk6gy4d4v2rzyr7vwvi8vm69rz1hdn0gkpan2kh1p63z77gbv"; }; goPackagePath = "github.com/42wim/matterircd"; From ce1ea86f1bc24521e5c59f081b8529600cd13422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 16 Jun 2020 17:26:11 +0200 Subject: [PATCH 1972/3452] python3Packages.spacy: 2.2.4 -> 2.3.0 Changelog: https://github.com/explosion/spaCy/releases/tag/v2.3.0 --- pkgs/development/python-modules/spacy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 6a54cc1ec715..f0a143ec30c7 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.2.4"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1fgm1zlw8mjhmk64skxs79ymhcningml13y9c9fy7rj1b1yadwzh"; + sha256 = "0nri437dyapiq5gx8lbmjdfvqw2cnw3di13kp44rzr17bm5yh2jv"; }; propagatedBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { # ''; postPatch = '' - substituteInPlace setup.cfg --replace "thinc==7.4.0" "thinc>=7.4.0,<8" + substituteInPlace setup.cfg --replace "thinc==7.4.1" "thinc>=7.4.1,<8" ''; meta = with lib; { @@ -62,5 +62,5 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/spaCy"; license = licenses.mit; maintainers = with maintainers; [ danieldk sdll ]; - }; + }; } From b0909224e7643d8e6c2a6cef047c3b1302ea4f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 16 Jun 2020 17:48:19 +0200 Subject: [PATCH 1973/3452] python3Packages.spacy_models: 2.2.5 -> 2.3.0 Update all *existing* models for compatibility with spaCy 2.3.0. --- .../python-modules/spacy/models.json | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index 1f1558b23c39..1c02b05d303e 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,108 +1,108 @@ [{ "pname": "de_core_news_md", - "version": "2.2.5", - "sha256": "1jkc4r0f1916k5qpmpnwawsbnrbscq250q7b1llgxi70f2xyw9gk", + "version": "2.3.0", + "sha256": "0kxir1w000r5fn1kpa38m7688xinkn2mk1m82aiwqlck3r72jdi6", "license": "cc-by-sa-40" }, { "pname": "de_core_news_sm", - "version": "2.2.5", - "sha256": "10z30hirfwa692m0zp6wk60ccvqj84i5vjaiyyzd21innysb5y3g", + "version": "2.3.0", + "sha256": "00cbmrf4njg28laysapdnp4rv4lw4yw03rxkynw1ain5fwb0izl7", "license": "cc-by-sa-40" }, { "pname": "el_core_news_md", - "version": "2.2.5", - "sha256": "1jjmf6rf1hjgqswhpqq2l5w7s351k4kk93c7rr85iv2754f71h36", + "version": "2.3.0", + "sha256": "170x8bzm5nf02mhkxyxjk58yk2639hsjb5b9prcc69500c0vmnp0", "license": "cc-by-sa-40" }, { "pname": "el_core_news_sm", - "version": "2.2.5", - "sha256": "00h55fc27d3jfm3knyidz7a4rasiz7qs4wfs3sl0ndq815yvag0l", + "version": "2.3.0", + "sha256": "10mh3za4jvr07rawzk8ps642rp11s3smraj9xvrxflik4fqkz18b", "license": "cc-by-sa-40" }, { "pname": "en_core_web_lg", - "version": "2.2.5", - "sha256": "1shd4gkshr4a92fhvrjhzn1abywnrcf548cv3dz8dhmi0wxa4klr", + "version": "2.3.0", + "sha256": "0mfa5wz31ya295jhyj489gb4qy806zmpq1zc11bvv5alv2m35if2", "license": "cc-by-sa-40" }, { "pname": "en_core_web_md", - "version": "2.2.5", - "sha256": "1x32vl2a75ps2iyhysjvdygd366zs546s82yzqwj2m7jcsdszrxy", + "version": "2.3.0", + "sha256": "1ys8sqkhiap1mq6mhbkbq8bc07lvl68xngbx725xkwvirzl5gabh", "license": "cc-by-sa-40" }, { "pname": "en_core_web_sm", - "version": "2.2.5", - "sha256": "1vna6zik7863hahxdgz0s80kbbfyw42h4c1k5jby9lkzr5jr1dk0", + "version": "2.3.0", + "sha256": "04icv9qf4pj53ll8vqxcjl2a723q1k00i7lifk8wx5saif28g37a", "license": "cc-by-sa-40" }, { "pname": "en_vectors_web_lg", - "version": "2.1.0", - "sha256": "1sq41pr70215f2s8k35x5ni4w0i4xhbzbfg3iyxgbp1b35gizg94", + "version": "2.3.0", + "sha256": "13g012rwh0bcxx3ii5mmygqzyryah1y3zd000zhidnacc1x1g743", "license": "cc-by-sa-40" }, { "pname": "es_core_news_md", - "version": "2.2.5", - "sha256": "0b50gd2mx1klr6ss0fsj58qmw2wpbawwv015pr9vq3j7jq805scl", + "version": "2.3.0", + "sha256": "0nz33bmpr3rxqbnv6vb1id8pkfsvh8ii8vqplwgb3b8772kmpzy2", "license": "cc-by-sa-40" }, { "pname": "es_core_news_sm", - "version": "2.2.5", - "sha256": "19hrpxg1a5bvf9j9wlm03rkxfkgrldky7alsgl8bdwnwq3vpbgfi", + "version": "2.3.0", + "sha256": "02xqhg4m0gg5r9yibvl02zixkll6w0nsmbdhp07y5yyaqjarc90d", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_md", - "version": "2.2.5", - "sha256": "1y4dqbcwa7gg6z8q84n0j4my7gyia7a2z7pln71sqa78pin06r9b", + "version": "2.3.0", + "sha256": "04fk212ksac3bp9dj7dmzsdcnbqmbsgymsic6ddcv9zbfdv5d0db", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_sm", - "version": "2.2.5", - "sha256": "1q2kvznbylyz4frxy5rbvpm5jvm7bfin8g3dks0c1k9hhdymv35y", + "version": "2.3.0", + "sha256": "0kldww855z67qfc9maa9z1lsvdf5vj5vc8gj0x3h68kv5n1xr4h0", "license": "cc-by-sa-40" }, { "pname": "it_core_news_sm", - "version": "2.2.5", - "sha256": "02r3x308s5kn62xpa2cizxfw7cyjk48zm9i6r4vhs8kycmp9z0px", + "version": "2.3.0", + "sha256": "1c3ywqa8li0j7cyvd1xqbb096y61978hd6qv7rc6cxxjdhmkrrds", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_sm", - "version": "2.2.5", - "sha256": "0vy0cff1fw33srqyi93vj03rnzqr8f62p1hwi565b0sb8v3n4p08", + "version": "2.3.0", + "sha256": "0r3rbqgz4897wyhz5jli30lryb45039f4rlvn4q0364cg1pm92g9", "license": "cc-by-sa-40" }, { "pname": "nb_core_news_sm", - "version": "2.2.5", - "sha256": "1kdn3qwlmmd52sjrvi97aiv7xp260bka009jjal79l3qrz4czrw1", + "version": "2.3.0", + "sha256": "07b7xri2q3m7fvn9a2gjc1044a3f14231vr32hrw96h7k6vg95h7", "license": "mit" }, { "pname": "nl_core_news_sm", - "version": "2.2.1", - "sha256": "0gw9a1j3v4f15cxcz7zr7dz7mqi2a3541b04q6kj74gg397li4ny", + "version": "2.3.0", + "sha256": "0alvz7pn7cj0yax8h5gp71vrdblh3mcsmyhzgiddsd44ry35nxnj", "license": "cc-by-sa-40" }, { "pname": "pt_core_news_sm", - "version": "2.2.5", - "sha256": "02p617ybh6wqmq1scch9dgim44rhhj0k81sbw8nysv20pc6wb89a", + "version": "2.3.0", + "sha256": "1vcvzdg9f93x0vaafkk9l9xhpmaavfj0cf0l3p06c5kx2d76f9ph", "license": "cc-by-sa-40" }, { "pname": "xx_ent_wiki_sm", - "version": "2.2.0", - "sha256": "0niwnd1mdaji92yp2dqsbmr0w420gpaybb1ppbqr1rmk6bwgyhsb", + "version": "2.3.0", + "sha256": "0x3zmmybl5kh4dn5prkfmr4q5j9bh13p40qc3rhdfi0i3jxc11pn", "license": "cc-by-sa-40" }] From 1b6ab4ef7e21701a9a691a76448581ee83660029 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 19:17:14 +0000 Subject: [PATCH 1974/3452] kubeless: 1.0.4 -> 1.0.6 --- pkgs/applications/networking/cluster/kubeless/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix index 48540bffb536..5b1f12452469 100644 --- a/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "kubeless"; - version = "1.0.4"; + version = "1.0.6"; src = fetchFromGitHub { owner = "kubeless"; repo = "kubeless"; rev = "v${version}"; - sha256 = "1f5w6kn9rsaxx9nf6kzyjkzm3s9ycy1c8h78hb61v4x915xd3040"; + sha256 = "1fcdyd1jf0yibfx9jc16m0vmazm2jymps92llh3vh5zqd36bxbyd"; }; goPackagePath = "github.com/kubeless/kubeless"; From 07600d718c54c38cbe9d8f5cd0bf47adb2aaaddd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 13:55:20 +0000 Subject: [PATCH 1975/3452] cpp-hocon: 0.2.1 -> 0.2.2 --- pkgs/development/libraries/cpp-hocon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index dc742a5c051a..01da4753b0e6 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "cpp-hocon"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { - sha256 = "0ar7q3rp46m01wvfa289bxnk9xma3ydc67by7i4nrpz8vamvhwc3"; + sha256 = "1c8zy4hi0182k0vfx5l8bjq1iv7lvvw1zi4vy3429s898rx7z3d3"; rev = version; repo = "cpp-hocon"; owner = "puppetlabs"; From e198af2067d612487ba5138950a7bb82ffbb0d03 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 20:07:55 +0000 Subject: [PATCH 1976/3452] liblouis: 3.13.0 -> 3.14.0 --- pkgs/development/libraries/liblouis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 83d08dc019bf..5d0459b4f308 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.13.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "1srpafxdw4627lyv92cn8wd9zda3507qpp5s2z66bsln8jnb1mza"; + sha256 = "0v6w8b9r994mkkbm2gqgd7k5yfmdhgbabh0j1gmn375nyvhy4qqh"; }; outputs = [ "out" "dev" "man" "info" "doc" ]; From 1b47d503de407bd6437921bd6d7ef3cd4177d547 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 19:12:45 +0000 Subject: [PATCH 1977/3452] kubecfg: 0.13.1 -> 0.16.0 --- pkgs/applications/networking/cluster/kubecfg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index bf4ec9492157..b8bef9ecc052 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.13.1"; in +let version = "0.16.0"; in buildGoPackage { pname = "kubecfg"; @@ -10,7 +10,7 @@ buildGoPackage { owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "0x2mg13p8r1sgqr1bbzh57kfymb8z392y43djgks2agc7rjnd45f"; + sha256 = "1ipw7r9fyqbh1bjvk7ifmj3skh799ly90y4ph37r8mqk1wb92rz4"; }; goPackagePath = "github.com/bitnami/kubecfg"; From d93e3ad74f5f64451d009c9125d893262e01bfcf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 17:47:49 +0000 Subject: [PATCH 1978/3452] icingaweb2: 2.7.3 -> 2.8.0 --- pkgs/servers/icingaweb2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index c4aaedf4ab67..a35b54592721 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec { pname = "icingaweb2"; - version = "2.7.3"; + version = "2.8.0"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "1qdsrpk6jbq9b4v4f2lfpdqs1yh3irbsm5fx02wxnnwvad05bcfv"; + sha256 = "18q3d15w7d46g4vyq4iph5c1bbxcl8ikcdc8djrfi30wx36ziybs"; }; nativeBuildInputs = [ makeWrapper ]; From 526472bbd6c22620b48536222cac87f8d6b0515e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 19:08:13 +0000 Subject: [PATCH 1979/3452] kube-router: 0.3.1 -> 0.4.0 --- pkgs/applications/networking/cluster/kube-router/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index a3cb55ce329c..cd946284fa77 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kube-router"; - version = "0.3.1"; + version = "0.4.0"; goPackagePath = "github.com/cloudnativelabs/kube-router"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "06azrghcxp6n4bvrqxpwhmg60qk4jqcrkl1lh1rardlzhl71lk1h"; + sha256 = "1g1y3l87a4il9g2yrl1ryx8xfd4x220azxhr3rxm5l9vhnnjwswa"; }; buildFlagsArray = '' From bfd4de099ca318366cb85f8239762e47fbba7250 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 18:32:51 +0000 Subject: [PATCH 1980/3452] kapacitor: 1.5.4 -> 1.5.5 --- pkgs/servers/monitoring/kapacitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index 93f0531887c1..6f2e51fffd61 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kapacitor"; - version = "1.5.4"; + version = "1.5.5"; goPackagePath = "github.com/influxdata/kapacitor"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "kapacitor"; rev = "v${version}"; - sha256 = "1sd0gwqwa2bk81lshs8cy49mk1nh4azjkk0283rh0rkimy90l0zz"; + sha256 = "17zk7fs6yl5hmhr3inwkafwmg2ihaicj43gdi5888dinhpa9bij1"; }; meta = with lib; { From 514c250e728a15b07efcafe792554200e212a85e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 15:59:53 +0000 Subject: [PATCH 1981/3452] gllvm: 1.2.3 -> 1.2.6 --- pkgs/development/tools/gllvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index c0c398926352..6b64a088353e 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "gllvm"; - version = "1.2.3"; + version = "1.2.6"; goPackagePath = "github.com/SRI-CSL/gllvm"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "SRI-CSL"; repo = "gllvm"; rev = "v${version}"; - sha256 = "12kdgsma62nzksvw266qm3ivkbz62ma93dd25wy0p19789v4fi7s"; + sha256 = "0qzmrprc7npc0ln6mhkjrm8fgh2n94rdylixk11p6imxyx5fj3gg"; }; meta = with stdenv.lib; { From fdc434621ceb398efac51e3e899a879b9d79349a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 16:42:28 +0000 Subject: [PATCH 1982/3452] goxel: 0.10.5 -> 0.10.6 --- pkgs/applications/graphics/goxel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 6fb5b91c2a92..40d0f4a3db8a 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goxel"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${version}"; - sha256 = "1b63jqryq19qa81g1ml6d85f27wj1ci3h56r02cl9xn8di5p674f"; + sha256 = "1wmxy5wfk1xrqgz0y0zcr4vkddylqc70cv4vzk117x6whjnldsm3"; }; patches = [ ./disable-imgui_ini.patch ]; From 96744012446c41664268ec49300eba221381e3fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 15:51:16 +0000 Subject: [PATCH 1983/3452] gh-ost: 1.0.47 -> 1.0.49 --- pkgs/tools/misc/gh-ost/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix index d78e7f9439fd..17893ef18ae6 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -2,8 +2,8 @@ let goPackagePath = "github.com/github/gh-ost"; - version = "1.0.47"; - sha256 = "0yyhkqis4j2cl6w2drrjxdy5j8x9zp4j89gsny6w4ql8gm5qgvvk"; + version = "1.0.49"; + sha256 = "0mncjhmv25wnhgjkn9gwkz2gzh0v6954w47ql7fs2iqr9al111dq"; in buildGoPackage ({ From 01fd63bee2191e6fbcb6b1017419c7ebbf1793bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 16:12:17 +0000 Subject: [PATCH 1984/3452] go-protobuf: 1.3.2 -> 1.4.2 --- pkgs/development/tools/go-protobuf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index 43731b72a55a..62a750269209 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-protobuf"; - version = "1.3.2"; + version = "1.4.2"; src = fetchFromGitHub { owner = "golang"; repo = "protobuf"; rev = "v${version}"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + sha256 = "0m5z81im4nsyfgarjhppayk4hqnrwswr3nix9mj8pff8x9jvcjqw"; }; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = "04w9vhkrwb2zfqk73xmhignjyvjqmz1j93slkqp7v8jj2dhyla54"; meta = with stdenv.lib; { homepage = "https://github.com/golang/protobuf"; From 30823d5389a38a43e8cb797677079f0dc95f2ef7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 18:27:05 +0000 Subject: [PATCH 1985/3452] jx: 2.1.31 -> 2.1.65 --- pkgs/applications/networking/cluster/jx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index df39e5d86768..304a3c6fa289 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jx"; - version = "2.1.31"; + version = "2.1.65"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "1rbdmqi6m042jxd3hhqw821l567s9zzzgp0cvx8467yfi449qipn"; + sha256 = "0zkp0z5qpqw44bjnl20xna7s251k7jsxccqnqkdqqrzmqjpkkwgx"; }; - vendorSha256 = "1jn636sv6ak6hngw4fpgxqm6gfay2ip6g3gafjb3m4adcc5n9f8s"; + vendorSha256 = "0zi2n8fywzy87yfwcx7di74s8mx0468zmg6kwjln7mwhr6q23adf"; subPackages = [ "cmd/jx" ]; From 979fdaefa4c8ff8224f5881b27faae361f0e3628 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 14:52:55 +0000 Subject: [PATCH 1986/3452] flannel: 0.11.0 -> 0.12.0 --- pkgs/tools/networking/flannel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index a52088ed231d..7ecfb559dcc7 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "flannel"; - version = "0.11.0"; + version = "0.12.0"; rev = "v${version}"; goPackagePath = "github.com/coreos/flannel"; @@ -13,7 +13,7 @@ buildGoPackage rec { inherit rev; owner = "coreos"; repo = "flannel"; - sha256 = "0akxlrrsm2w51g0qd7dnsdy0hdajx98sdhxw4iknjr2kn7j3gph9"; + sha256 = "04g7rzgyi3xs3sf5p1a9dmd08crdrz6y1b02ziv3444qk40jyswd"; }; meta = { From fe0d7fbcd1e7afa8562ea32c8bb1c8b3c76d1c88 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 15:14:57 +0000 Subject: [PATCH 1987/3452] flyctl: 0.0.123 -> 0.0.131 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 339286015917..1a7a3d6607f4 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.123"; + version = "0.0.131"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "1gs796n2cw8kpfsqr21zqxzp8dmnhhmjfy7vnpi838566i5ql9q3"; + sha256 = "0b9qrraydihw4wglif3rjmjlqdsgxh873023z3rgrvf7dwrhc9y0"; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "10wcyxzkwvbhf86dq1rh852zgdg28draay0515zp459z34vv4zna"; + vendorSha256 = "1gxz9pp4zl8q7pmwg9z261fjrjfr658k1sn5nq1xzz51wrlzg9ag"; buildFlagsArray = [ "-ldflags=-s -w -X github.com/superfly/flyctl/flyctl.Version=${version} -X github.com/superfly/flyctl/flyctl.Commit=${src.rev} -X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000 -X github.com/superfly/flyctl/flyctl.Environment=production" ]; From 1b56c5b9209bce050a97a51b585e59fd9b391a12 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 12:53:38 +0000 Subject: [PATCH 1988/3452] curlcpp: 1.1 -> 1.4 --- pkgs/development/libraries/curlcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index 274a657cb1af..9f2710f42a46 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curlcpp"; - version = "1.1"; + version = "1.4"; src = fetchFromGitHub { owner = "JosephP91"; repo = "curlcpp"; rev = version; - sha256 = "025qg5hym73xrvyhalv3jgbf9jqnnzkdjs3zwsgbpqx58zyd5bg5"; + sha256 = "1zx76jcddqk4zkcdb6p7rsmkjbbjm2cj6drj0c8hdd61ms1d0f3n"; }; buildInputs = [ cmake curl ]; From 51c901433b40bdf17460bc527f8d3cd4e1b2d402 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 12:24:47 +0000 Subject: [PATCH 1989/3452] convoy: 0.5.0 -> 0.5.2 --- pkgs/tools/filesystems/convoy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix index 77d6dca066a4..f12187be810f 100644 --- a/pkgs/tools/filesystems/convoy/default.nix +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { pname = "convoy"; - version = "0.5.0"; + version = "0.5.2"; goPackagePath = "github.com/rancher/convoy"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "rancher"; repo = "convoy"; - sha256 = "0ihy0cfq7sa2wml904ajwr165hx2mas3jb1bqk3i0m4fg1lx1xw1"; + sha256 = "09nygrxd5hril4xcfsvgjg74xxhhimznqq4sdk0f360c5ra0dbhj"; }; buildInputs = [lvm2]; From 4acf4330fe0dd923dcc42e9a1084283e79c10f80 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 17:39:46 +0000 Subject: [PATCH 1990/3452] i2pd: 2.30.0 -> 2.32.1 --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 7c6e6ada4c5a..b686ea4d04f2 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.30.0"; + version = "2.32.1"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1wvn8hs2ps3yzxzv05jnbm7zr1v8gv0phbx38m7l5xhqjmrpnscw"; + sha256 = "15ng2c7i3jxmhpc2q0dl8arc72qbsq9y9paz5hgln907yy7dqx7c"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] From f6eeb8cb0aee5e55c2b345ce23b165e4da09731c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 08:37:26 +0000 Subject: [PATCH 1991/3452] aminal: 0.8.6 -> 0.9.0 --- pkgs/applications/misc/aminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/misc/aminal/default.nix index dff6b15494bb..7f04a93d6a32 100644 --- a/pkgs/applications/misc/aminal/default.nix +++ b/pkgs/applications/misc/aminal/default.nix @@ -11,7 +11,7 @@ buildGoPackage rec { pname = "aminal"; - version = "0.8.6"; + version = "0.9.0"; goPackagePath = "github.com/liamg/aminal"; @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "liamg"; repo = "aminal"; rev = "v${version}"; - sha256 = "0qhjdckj2kr0vza6qssd9z8dfrsif1qxb1mal1d4wgdsy12lrmwl"; + sha256 = "0syv9md7blnl6i19zf8s1xjx5vfz6s755fxyg2ply0qc1pwhsj8n"; }; preBuild = '' From 19a7c8f0bcd8ac591df13897b906e8abd8186821 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Jun 2020 00:48:09 +0000 Subject: [PATCH 1992/3452] plantuml: 1.2020.10 -> 1.2020.12 --- pkgs/tools/misc/plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 09dba27a1efe..cb8cf1ec0a8e 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.10"; + version = "1.2020.12"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "00azasannh77ns3wpy6yrlw77pgq89frx0f4c7gk1gqiqjavsvdy"; + sha256 = "0c0270kjw8vg8nphharap2p66yl72j5k4k3s5r9klafgp3sg4sjj"; }; nativeBuildInputs = [ makeWrapper ]; From d8963f2a85091c5daab50c8b2328f95741e4b0c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 20:44:29 +0000 Subject: [PATCH 1993/3452] openwsman: 2.6.11 -> 2.7.0 --- pkgs/development/libraries/openwsman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 17df9eee84e8..a16b8356e618 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "openwsman"; - version = "2.6.11"; + version = "2.7.0"; src = fetchFromGitHub { owner = "Openwsman"; repo = "openwsman"; rev = "v${version}"; - sha256 = "0s8xdxrxnh1l0v41n5cw89b89rrlqlxn1yj14sw224230y8m70ka"; + sha256 = "19dj38jyzhhhvk863cikcwk5awzlq3337pxmsaqqm4wrcygrkfmx"; }; nativeBuildInputs = [ cmake pkgconfig ]; From fdbe373e57b7d0e2be95ece20462e7ea063096a5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 17:38:47 +0000 Subject: [PATCH 1994/3452] munin: 2.0.61 -> 2.0.63 --- pkgs/servers/monitoring/munin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index ecbed520bbdc..22828e574497 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.61"; + version = "2.0.63"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "0gjbz8zdj1rdx2azgpdh64isna0l77wm42gr1jhwb5an3lf6sgxs"; + sha256 = "0p1gzy6in15d6596b260qa0a144x8n8567cxdq0x4arw18004s3a"; }; buildInputs = [ From 48d85ac3aa5c78f81526b1282bdb3cc61428d6b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 20:25:12 +0000 Subject: [PATCH 1995/3452] openfortivpn: 1.14.0 -> 1.14.1 --- pkgs/tools/networking/openfortivpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index bd1c02f9b545..a5e46c6bc575 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.14.0"; + version = "1.14.1"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "1qn48sp3ydbik7nc9x5l22gvvnr99f89jy1lvnf64bdg218kr0z7"; + sha256 = "1r9lp19fmqx9dw33j5967ydijbnacmr80mqnhbbxyqiw4k5c10ds"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From bba6d992f88241b3252d860ac5711420d7d03c14 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 19:48:51 +0000 Subject: [PATCH 1996/3452] osinfo-db: 20200515 -> 20200529 --- pkgs/data/misc/osinfo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 4460e7b40d7c..87425defb879 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20200515"; + version = "20200529"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "1m9idmmb1sjf24lp9lgng2m1jj09mn9fa9pnz36fdv5q0lskgscj"; + sha256 = "0mbrf9j5wmjhc6jixvhp4jqyxixh1717lqrmzmipdg99xnzba81n"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; From 0c03dbf0a38ee4f8e04ed282bd1ce0f942591b3b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 10:46:43 +0000 Subject: [PATCH 1997/3452] libnetfilter_queue: 1.0.3 -> 1.0.4 --- pkgs/development/libraries/libnetfilter_queue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 556db28f8568..55e07c03b287 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl, libnfnetlink }: stdenv.mkDerivation rec { - version = "1.0.3"; + version = "1.0.4"; pname = "libnetfilter_queue"; src = fetchurl { url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${pname}-${version}.tar.bz2"; - sha256 = "0x77m1fvbqzz5z64jz59fb6j8dvv8b9pg4fmznqwax4x6imjcncq"; + sha256 = "0w7s6g8bikch1m4hnxdakpkwgrkw64ikb6wb4v4zvgyiywrk5yai"; }; nativeBuildInputs = [ pkgconfig ]; From 59f0025dc08caf41481f4a6756a395e074683db1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 07:03:22 +0000 Subject: [PATCH 1998/3452] libsolv: 0.7.13 -> 0.7.14 --- pkgs/development/libraries/libsolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 9443846acf1e..d559efd3aab5 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.13"; + version = "0.7.14"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "1hjk7r7047i451xjgw72in62pya1h1436fvx945vxlvswl5s6iw8"; + sha256 = "10klbgknl2njbjl4k0l50ii7afwqrl1691ar4ry3snmc8chb1z7g"; }; cmakeFlags = [ From 4d200ee63cbe0d887ceb2a30816e98fb4d6e197e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 03:14:30 +0000 Subject: [PATCH 1999/3452] kdev-python: 5.5.1 -> 5.5.2 --- pkgs/applications/editors/kdevelop5/kdev-python.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 80a5436c9556..9fb251d52957 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-python"; - version = "5.5.1"; + version = "5.5.2"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "0k4j2kp77sz2p8s77wmcawia81bx7vfb2nnh9lqxzdk2mmlg387c"; + sha256 = "1qxvsz19iv5fr0nvz75b13knmsbkhkgvlvrhip8y4j66ypscs652"; }; cmakeFlags = [ From 621c1f0042c0aba886cc450a16564eca2c98afde Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 20:14:57 +0000 Subject: [PATCH 2000/3452] libmysofa: 1.0 -> 1.1 --- pkgs/development/libraries/audio/libmysofa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index df0eecfd0be9..5324fe0685d6 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "053inxfl2n6wdgvnn02kf63m92r48ch4wqix9mqf3rgcf1bfkyfa"; + sha256 = "12jzap5fh0a1fmfy4z8z4kjjlwi0qzdb9z59ijdlyqdzwxnzkccx"; }; nativeBuildInputs = [ cmake ]; From 84696de0f9aac1f14bd049cc2b5a8fc223d9ed8d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 23:55:56 +0000 Subject: [PATCH 2001/3452] interception-tools: 0.1.1 -> 0.2.1 --- pkgs/tools/inputmethods/interception-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index a6aed47d964c..39a28214fe20 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -2,14 +2,14 @@ libevdev, udev }: let - version = "0.1.1"; + version = "0.2.1"; baseName = "interception-tools"; in stdenv.mkDerivation { name = "${baseName}-${version}"; src = fetchurl { url = "https://gitlab.com/interception/linux/tools/repository/v${version}/archive.tar.gz"; - sha256 = "14g4pphvylqdb922va322z1pbp12ap753hcf7zf9sii1ikvif83j"; + sha256 = "0lqz89wsf9r5xdgflincysxg4l8fpgg5z8zczhhrg9s5787srfzi"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 32b567cbd622d483008ad2085dc0249341a34590 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 22:42:16 +0000 Subject: [PATCH 2002/3452] grml-zsh-config: 0.16.2 -> 0.17.2 --- pkgs/shells/zsh/grml-zsh-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 3a34be6304b7..4a287e084449 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.16.2"; + version = "0.17.2"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "08a63cdjpbvgnja0637zbm8qif4qn8ydgkwcfq3145bxfh5rq8wz"; + sha256 = "1h17xdlxhnjqirqwksi8qhx2lyajz7b0hmvb80i7313splhjp6hn"; }; buildInputs = [ zsh coreutils txt2tags procps ] From 76a3219aa1dfbf01aa13df58ec2ba91d46c46709 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 23:43:27 +0000 Subject: [PATCH 2003/3452] herbstluftwm: 0.8.1 -> 0.8.3 --- pkgs/applications/window-managers/herbstluftwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 7dc715e126cd..e547cea3c54c 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -8,11 +8,11 @@ assert withDoc -> asciidoc != null; stdenv.mkDerivation rec { pname = "herbstluftwm"; - version = "0.8.1"; + version = "0.8.3"; src = fetchurl { url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"; - sha256 = "0c1lf82z6a56g8asin91cmqhzk3anw0xwc44b31bpjixadmns57y"; + sha256 = "1qmb4pjf2f6g0dvcg11cw9njwmxblhqzd70ai8qnlgqw1iz3nkm1"; }; outputs = [ From 3f5c873d263fc54ef43e84b20457e48ab18099d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 01:38:28 +0000 Subject: [PATCH 2004/3452] intel-graphics-compiler: 1.0.3627 -> 1.0.4062 --- .../development/compilers/intel-graphics-compiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index e3dfa8ea324c..6374846f4407 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.3627"; + version = "1.0.4062"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "1x9fjvf7rbhil09am2v9j2jhwysdvwgshf9zidbirjgfrqn573h8"; + sha256 = "1fr9mb7s5f0kiwxf04lqbyqbxfsvki0kwnpcy41m3p3la22mqz47"; }; nativeBuildInputs = [ clang cmake bison flex llvm python ]; From e607ed083df9e24551f8fd757582ec59a3c4382a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 22:37:51 +0000 Subject: [PATCH 2005/3452] google-authenticator: 1.08 -> 1.09 --- pkgs/os-specific/linux/google-authenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index e04b83143507..ce90a1d432f7 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "google-authenticator-libpam"; - version = "1.08"; + version = "1.09"; src = fetchurl { url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz"; - sha256 = "1432sfgjv7xlas1saa0whnvqim2pb12g2522x3nf5a8v4qq7avbg"; + sha256 = "0dyhgizl2jcrnfn5sxipxawqrbr6qgjh7aggw8fz3hix861pj7db"; }; nativeBuildInputs = [ autoreconfHook ]; From 188394a666e66d21e1d2a9332c65db4cdffad24e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 04:13:26 +0000 Subject: [PATCH 2006/3452] visualvm: 2.0 -> 2.0.2 --- pkgs/development/tools/java/visualvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 3f33ff7c13a0..c59f6716a7b6 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.0"; + version = "2.0.2"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "057dzf7xkb4fdv4bc2fgw7mxnxclcjmflafx3n2qw0qcdky18gzr"; + sha256 = "19h5804izhdhdwbpyfbfqsjwmnabz2djbhkv7gvzs66jxc6q8mgx"; }; desktopItem = makeDesktopItem { From f27facee88fa81c5403df593975bf668e1616a14 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 03:53:02 +0000 Subject: [PATCH 2007/3452] txt2man: 1.6.0 -> 1.7.0 --- pkgs/tools/misc/txt2man/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index c7d8837f8235..6013dc1c26b9 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "txt2man"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { url = "https://github.com/mvertes/txt2man/archive/${pname}-${version}.tar.gz"; - sha256 = "168cj96974n2z0igin6j1ic1m45zyic7nm5ark7frq8j78rrx4zn"; + sha256 = "06jf8hqav095db1v3njavx0rphmpmi3mgki4va6qkxjnvmdx4742"; }; preConfigure = '' From e487f9f708dd7b47d5e4aebb0533d3349b3f1ed3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 12:43:06 +0000 Subject: [PATCH 2008/3452] avocode: 4.6.4 -> 4.7.0 --- pkgs/applications/graphics/avocode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 098aee119e60..fa97ceb5eb2f 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.6.4"; + version = "4.7.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "1hkqv2lix58my009i61cy0vpazxqpzapfhxkw5439ndn6qk1782d"; + sha256 = "0kn0422k4vi2qifasnkd0cjf5l6z0rmkqv6l46ygxk3qyykjnqcm"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ From fa678b3228a697dc8d62cb73c929cead795c81a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Jun 2020 23:19:13 +0000 Subject: [PATCH 2009/3452] guile-cairo: 1.11.0 -> 1.11.1 --- pkgs/development/guile-modules/guile-cairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 99e3ddf34f17..000932cc010a 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "guile-cairo"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz"; - sha256 = "11fn2x2973dizzw94fkz6rj9crsyzchphq5097lvbkvqpzbyidyp"; + sha256 = "1gc642r9ndsjhhmh9bl5cbd3dwvy4dpxwhr0zpsw43y9nmz37xpl"; }; nativeBuildInputs = [ pkgconfig ]; From 650617253e8397634b7e3e4518c1c14168c1b100 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 12 Jun 2020 03:05:26 +0200 Subject: [PATCH 2010/3452] maintainers/teams: add matrix team --- maintainers/team-list.nix | 12 ++++++++++++ nixos/modules/services/misc/matrix-synapse.nix | 1 + nixos/tests/matrix-synapse.nix | 4 ++-- .../instant-messengers/riot/riot-desktop.nix | 2 +- .../networking/instant-messengers/riot/riot-web.nix | 2 +- pkgs/servers/matrix-synapse/default.nix | 2 +- 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 25a4995b733e..703a6a031d6f 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -57,6 +57,18 @@ with lib.maintainers; { scope = "Maintain GNOME desktop environment and platform."; }; + matrix = { + members = [ + ma27 + pacien + fadenb + mguentner + ekleog + ralith + ]; + scope = "Maintain the ecosystem around Matrix, a decentralized messenger."; + }; + php = { members = [ aanderse diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 8ed4bbdd031c..e982eb16fa70 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -727,5 +727,6 @@ in { ]; meta.doc = ./matrix-synapse.xml; + meta.maintainers = teams.matrix.members; } diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix index f3623aa3c094..9ca808721763 100644 --- a/nixos/tests/matrix-synapse.nix +++ b/nixos/tests/matrix-synapse.nix @@ -29,8 +29,8 @@ import ./make-test-python.nix ({ pkgs, ... } : let in { name = "matrix-synapse"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ corngood ]; + meta = with pkgs.stdenv.lib; { + maintainers = teams.matrix.members; }; nodes = { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index acdf40e772ea..b05f64c13822 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -78,7 +78,7 @@ in mkYarnPackage rec { description = "A feature-rich client for Matrix.org"; homepage = "https://about.riot.im/"; license = licenses.asl20; - maintainers = with maintainers; [ pacien worldofpeace ma27 ]; + maintainers = teams.matrix.members; inherit (electron.meta) platforms; }; } diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index c08d1dbe0332..cc4eb4161f1b 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; homepage = "http://riot.im/"; - maintainers = with stdenv.lib.maintainers; [ bachp pacien ma27 ]; + maintainers = stdenv.lib.teams.matrix.members; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; hydraPlatforms = []; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 15df735b7072..e159261e2997 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -76,6 +76,6 @@ buildPythonApplication rec { homepage = "https://matrix.org"; description = "Matrix reference homeserver"; license = licenses.asl20; - maintainers = with maintainers; [ ralith roblabla ekleog pacien ma27 ]; + maintainers = teams.matrix.members; }; } From e826a6ce03dcee02ba2696e169dbb18711f73917 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 4 Jun 2020 16:10:32 +0200 Subject: [PATCH 2011/3452] nixos/dovecot2: refactor mailboxes option Specifying mailboxes as a list isn't a good approach since this makes it impossible to override values. For backwards-compatibility, it's still possible to declare a list of mailboxes, but a deprecation warning will be shown. --- nixos/doc/manual/release-notes/rl-2009.xml | 23 +++++++++++++++++++++ nixos/modules/services/mail/dovecot.nix | 24 ++++++++++++++++++---- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index d1eecd65085c..900b1103f2b1 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -614,6 +614,29 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; queued on the kernel side of the netlink socket. + + + Specifying mailboxes in the dovecot2 module + as a list is deprecated and will break eval in 21.03. Instead, an attribute-set should be specified where the name + should be the key of the attribute. + + + This means that a configuration like this +{ + services.dovecot2.mailboxes = [ + { name = "Junk"; + auto = "create"; + } + ]; +} + should now look like this: +{ + services.dovecot2.mailboxes = { + Junk.auto = "create"; + }; +} + + diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index ee797f9c42f1..51cbcbf1cbc8 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -134,8 +134,9 @@ let mailboxes = { ... }: { options = { name = mkOption { - type = types.strMatching ''[^"]+''; + type = types.nullOr (types.strMatching ''[^"]+''); example = "Spam"; + default = null; description = "The name of the mailbox."; }; auto = mkOption { @@ -334,9 +335,24 @@ in }; mailboxes = mkOption { - type = types.listOf (types.submodule mailboxes); - default = []; - example = [ { name = "Spam"; specialUse = "Junk"; auto = "create"; } ]; + type = with types; let m = submodule mailboxes; in either (listOf m) (attrsOf m); + default = {}; + apply = x: + if isList x then warn "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.03!" x + else mapAttrsToList (name: value: + if value.name != null + then throw '' + When specifying dovecot2 mailboxes as attributes, declaring + a `name'-attribute is prohibited! The name ${value.name} should + be the attribute key! + '' + else value // { inherit name; } + ) x; + example = literalExample '' + { + Spam = { specialUse = "Junk"; auto = "create"; }; + } + ''; description = "Configure mailboxes and auto create or subscribe them."; }; From 5baa7541d73e57f26d1da9ca0c663cc7be31f256 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Wed, 17 Jun 2020 13:50:59 -0700 Subject: [PATCH 2012/3452] agda: fix manual build /build/doc/manual-full.xml:12764:35: error: ID "build-phase" has already been defined /build/doc/manual-full.xml:9029:33: error: first occurrence of ID "build-phase" --- doc/languages-frameworks/agda.section.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index 72b895f5da12..9ce046d05b6f 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/doc/languages-frameworks/agda.section.md @@ -67,13 +67,13 @@ A derivation can then be written using `agdaPackages.mkDerivation`. This has sim + `libraryName` should be the name that appears in the `*.agda-lib` file, defaulting to `pname`. + `libraryFile` should be the file name of the `*.agda-lib` file, defaulting to `${libraryName}.agda-lib`. -### Build phase +### Building Agda packages The default build phase for `agdaPackages.mkDerivation` simply runs `agda` on the `Everything.agda` file. If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden. Additionally, a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the `Everything.agda` file. `agda` and the Agda libraries contained in `buildInputs` are made available during the build phase. -### Install phase +### Installing Agda packages The default install phase copies agda source files, agda interface files (`*.agdai`) and `*.agda-lib` files to the output directory. This can be overridden. From fb02974b97768ec4b553a5c9b8bec7f5e00e7499 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Jun 2020 03:39:15 +0000 Subject: [PATCH 2013/3452] kdevelop-unwrapped: 5.5.1 -> 5.5.2 --- pkgs/applications/editors/kdevelop5/kdevelop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 476819369cf1..e07e7300048a 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "kdevelop"; - version = "5.5.1"; + version = "5.5.2"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "18hxwkdbfw0qs3p19jv6d8wwwdzb9m087891i8w2bzkn21fd5pmy"; + sha256 = "1nkl3z1n1l7ly2zvmbx2sdhx5q72wcvpwhzsz3qgw1474qd9i3i2"; }; nativeBuildInputs = [ From 8899d9a36fc48b8fa15f1fa73107b1e67be60ba9 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Thu, 4 Jun 2020 19:23:02 +0200 Subject: [PATCH 2014/3452] netbeans: 11.3 -> 12.0 --- pkgs/applications/editors/netbeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index b2a13e3db7cd..ecc3c058f702 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "11.3"; + version = "12.0"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - sha512 = "ae828836138b5a4156d58df24dd4053be58018cb6b5beb179cb0f4cd8b5db72d2a7356a434d01157aacb78d228732950cf4e3a0b6c725da8e053b6ccd91075d6"; + sha512 = "91030c9628a08acd85f1a58a7f71eec2e57dc85841c1c475cc6311335b5d8cdc10c1198274b9668b7f61a28d04b07661247dc1c3e36b8e29214aec3748e499e4"; }; buildCommand = '' From 275a913971097f3b784a81706baaa4bf39e74bc7 Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Thu, 4 Jun 2020 19:23:35 +0200 Subject: [PATCH 2015/3452] netbeans: updated jdk to latest lts release --- nixos/doc/manual/release-notes/rl-2009.xml | 5 +++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 900b1103f2b1..9bbbecc05692 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -637,6 +637,11 @@ 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. + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47c3a0b8914b..980d280c7810 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21333,7 +21333,9 @@ in navit = libsForQt5.callPackage ../applications/misc/navit { }; - netbeans = callPackage ../applications/editors/netbeans { }; + netbeans = callPackage ../applications/editors/netbeans { + jdk = jdk11; + }; ncdu = callPackage ../tools/misc/ncdu { }; From 4044d81d5cea617e58ec9682f9cc447dde326850 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 17 Jun 2020 16:19:01 -0400 Subject: [PATCH 2016/3452] IPFS NixOS module: Socket unit file more precise The systemd socket unit files now more precisely track the IPFS configuration, by including any multaddr they can make a `ListenStream` for. (The daemon doesn't currently support anything which would use `ListDatagram`, so we don't need to worry about that.) The tests use some of these features. --- .../services/network-filesystems/ipfs.nix | 30 +++++++++++++++---- nixos/tests/ipfs.nix | 11 +++++-- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index a3bd40135d19..7d18410ff0a4 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -12,6 +12,19 @@ let (optionalString (cfg.defaultMode == "norouting") "--routing=none") ] ++ cfg.extraFlags); + splitMulitaddr = addrRaw: lib.tail (lib.splitString "/" addrRaw); + + multiaddrToListenStream = addrRaw: let + addr = splitMulitaddr addrRaw; + s = builtins.elemAt addr; + in if s 0 == "ip4" && s 2 == "tcp" + then "${s 1}:${s 3}" + else if s 0 == "ip6" && s 2 == "tcp" + then "[${s 1}]:${s 3}" + else if s 0 == "unix" + then "/${lib.concatStringsSep "/" (lib.tail addr)}" + else null; # not valid for listen stream, skip + in { ###### interface @@ -80,7 +93,10 @@ in { swarmAddress = mkOption { type = types.listOf types.str; - default = [ "/ip4/0.0.0.0/tcp/4001" "/ip6/::/tcp/4001" ]; + default = [ + "/ip4/0.0.0.0/tcp/4001" + "/ip6/::/tcp/4001" + ]; description = "Where IPFS listens for incoming p2p connections"; }; @@ -250,14 +266,18 @@ in { systemd.sockets.ipfs-gateway = { wantedBy = [ "sockets.target" ]; - socketConfig.ListenStream = [ "" ] - ++ lib.optional (cfg.gatewayAddress == opt.gatewayAddress.default) [ "127.0.0.1:8080" "[::1]:8080" ]; + socketConfig.ListenStream = let + fromCfg = multiaddrToListenStream cfg.gatewayAddress; + in [ "" ] ++ lib.optional (fromCfg != null) fromCfg; }; systemd.sockets.ipfs-api = { wantedBy = [ "sockets.target" ]; - socketConfig.ListenStream = [ "" "%t/ipfs.sock" ] - ++ lib.optional (cfg.apiAddress == opt.apiAddress.default) [ "127.0.0.1:5001" "[::1]:5001" ]; + # We also include "%t/ipfs.sock" because tere is no way to put the "%t" + # in the multiaddr. + socketConfig.ListenStream = let + fromCfg = multiaddrToListenStream cfg.apiAddress; + in [ "" "%t/ipfs.sock" ] ++ lib.optional (fromCfg != null) fromCfg; }; }; diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix index 82234f969226..9c0ff5306e06 100644 --- a/nixos/tests/ipfs.nix +++ b/nixos/tests/ipfs.nix @@ -7,21 +7,28 @@ import ./make-test-python.nix ({ pkgs, ...} : { nodes.machine = { ... }: { services.ipfs = { enable = true; + # Also will add a unix domain socket socket API address, see module. + startWhenNeeded = true; apiAddress = "/ip4/127.0.0.1/tcp/2324"; }; }; testScript = '' start_all() - machine.wait_for_unit("ipfs") - machine.wait_until_succeeds("ipfs --api /ip4/127.0.0.1/tcp/2324 id") + # IPv4 activation + + machine.succeed("ipfs --api /ip4/127.0.0.1/tcp/2324 id") ipfs_hash = machine.succeed( "echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | awk '{ print $2 }'" ) machine.succeed(f"ipfs cat /ipfs/{ipfs_hash.strip()} | grep fnord") + # Unix domain socket activation + + machine.stop_job("ipfs") + ipfs_hash = machine.succeed( "echo fnord2 | ipfs --api /unix/run/ipfs.sock add | awk '{ print $2 }'" ) From 1894b5a912632fffbe27f69fbd40c1241e36e9e9 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Wed, 17 Jun 2020 16:03:03 -0700 Subject: [PATCH 2017/3452] bat-extras: 20200408 -> 20200515-dev --- pkgs/tools/misc/bat-extras/default.nix | 42 ++++++++++++-------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index 0f98b819b0f7..36adc09cdba1 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -1,5 +1,6 @@ -{ stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, ncurses, bat -# batgrep and batwatch +{ stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, bat +# batdiff, batgrep, and batwatch +, coreutils , less # batgrep , ripgrep @@ -10,34 +11,35 @@ , withRustFmt ? rustfmt != null, rustfmt ? null # batwatch , withEntr ? entr != null, entr ? null - }: +# batdiff +, gitMinimal +, withDelta ? gitAndTools?delta, gitAndTools ? null +}: let # Core derivation that all the others are based on. # This includes the complete source so the per-script derivations can run the tests. core = stdenv.mkDerivation rec { pname = "bat-extras"; - version = "20200408"; + # there hasn't been a release since 2020-05-01 but there are important bugfixes + # to the test suite so we'll pull the latest commit as of 2020-06-17. + version = "20200515-dev"; # latest commit was dated 2020-05-15 src = fetchFromGitHub { owner = "eth-p"; repo = pname; - rev = "v${version}"; - sha256 = "184d5rwasfpgbj2k98alg3wy8jmzna2dgfik98w2a297ky67s51v"; + rev = "3029b6749f61f7514e9eef30e035cfab0e31eb1d"; + sha256 = "08mb94k2n182ql97c5s5j1v7np25ivynn5g0418whrx11ra41wr7"; fetchSubmodules = true; }; - nativeBuildInputs = [ bash makeWrapper ]; + # bat needs to be in the PATH during building so EXECUTABLE_BAT picks it up + nativeBuildInputs = [ bash bat ]; dontConfigure = true; postPatch = '' - substituteInPlace lib/constants.sh \ - --replace 'EXECUTABLE_BAT="bat"' 'EXECUTABLE_BAT="${bat}/bin/bat"' - patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh - wrapProgram .test-framework/bin/best.sh \ - --prefix PATH : "${ncurses}/bin" ''; buildPhase = '' @@ -131,17 +133,13 @@ let stdenv.lib.optional cond dep; in { - batgrep = script "batgrep" [ less ripgrep ]; - batman = (script "batman" []).overrideAttrs (drv: { - doCheck = stdenv.isDarwin; # test fails on Linux due to SIGPIPE (eth-p/bat-extras#19) - }); - batwatch = script "batwatch" ([ less ] ++ optionalDep withEntr entr); - prettybat = (script "prettybat" ([] + batdiff = script "batdiff" ([ less coreutils gitMinimal ] ++ optionalDep withDelta gitAndTools.delta); + batgrep = script "batgrep" [ less coreutils ripgrep ]; + batman = script "batman" []; + batwatch = script "batwatch" ([ less coreutils ] ++ optionalDep withEntr entr); + prettybat = script "prettybat" ([] ++ optionalDep withShFmt shfmt ++ optionalDep withPrettier nodePackages.prettier ++ optionalDep withClangTools clang-tools - ++ optionalDep withRustFmt rustfmt) - ).overrideAttrs (drv: { - doCheck = stdenv.isDarwin; # test fails on Linux due to SIGPIPE (eth-p/bat-extras#19) - }); + ++ optionalDep withRustFmt rustfmt); } From f795df26cfd0cb746be89f9e004a25d85e0d8465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 18 Jun 2020 01:45:11 +0200 Subject: [PATCH 2018/3452] consul.passthru.tests: Refactor: Extract variable --- nixos/tests/consul.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/tests/consul.nix b/nixos/tests/consul.nix index 6600dae4770b..785963d1a7cc 100644 --- a/nixos/tests/consul.nix +++ b/nixos/tests/consul.nix @@ -66,6 +66,7 @@ let services.consul = let thisConsensusServerHost = builtins.elemAt allConsensusServerHosts index; + numConsensusServers = builtins.length allConsensusServerHosts; in assert builtins.elem thisConsensusServerHost allConsensusServerHosts; { @@ -73,12 +74,12 @@ let inherit webUi; extraConfig = defaultExtraConfig // { server = true; - bootstrap_expect = builtins.length allConsensusServerHosts; + bootstrap_expect = numConsensusServers; retry_join = # If there's only 1 node in the network, we allow self-join; # otherwise, the node must not try to join itself, and join only the other servers. # See https://github.com/hashicorp/consul/issues/2868 - if builtins.length allConsensusServerHosts == 1 + if numConsensusServers == 1 then allConsensusServerHosts else builtins.filter (h: h != thisConsensusServerHost) allConsensusServerHosts; bind_addr = ip; From 777d1c0944e931bf5bb3538982c144b8916d1b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 18 Jun 2020 01:48:19 +0200 Subject: [PATCH 2019/3452] consul.passthru.tests: Refactor let bindings --- nixos/tests/consul.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/nixos/tests/consul.nix b/nixos/tests/consul.nix index 785963d1a7cc..a5188d128304 100644 --- a/nixos/tests/consul.nix +++ b/nixos/tests/consul.nix @@ -55,31 +55,28 @@ let server = index: { pkgs, ... }: let - ip = builtins.elemAt allConsensusServerHosts index; + thisConsensusServerHost = builtins.elemAt allConsensusServerHosts index; + ip = thisConsensusServerHost; # since we already use IPs to identify servers in { networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ - { address = builtins.elemAt allConsensusServerHosts index; prefixLength = 16; } + { address = ip; prefixLength = 16; } ]; networking.firewall = firewallSettings; services.consul = - let - thisConsensusServerHost = builtins.elemAt allConsensusServerHosts index; - numConsensusServers = builtins.length allConsensusServerHosts; - in assert builtins.elem thisConsensusServerHost allConsensusServerHosts; { enable = true; inherit webUi; extraConfig = defaultExtraConfig // { server = true; - bootstrap_expect = numConsensusServers; + bootstrap_expect = builtins.length allConsensusServerHosts; retry_join = # If there's only 1 node in the network, we allow self-join; # otherwise, the node must not try to join itself, and join only the other servers. # See https://github.com/hashicorp/consul/issues/2868 - if numConsensusServers == 1 + if builtins.length allConsensusServerHosts == 1 then allConsensusServerHosts else builtins.filter (h: h != thisConsensusServerHost) allConsensusServerHosts; bind_addr = ip; From 25d665634a1bd38515320beabf85a6e23545bac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 18 Jun 2020 01:49:24 +0200 Subject: [PATCH 2020/3452] consul.passthru.tests: Refactor: Extract variable --- nixos/tests/consul.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/tests/consul.nix b/nixos/tests/consul.nix index a5188d128304..eb7dd45923fc 100644 --- a/nixos/tests/consul.nix +++ b/nixos/tests/consul.nix @@ -55,6 +55,7 @@ let server = index: { pkgs, ... }: let + numConsensusServers = builtins.length allConsensusServerHosts; thisConsensusServerHost = builtins.elemAt allConsensusServerHosts index; ip = thisConsensusServerHost; # since we already use IPs to identify servers in @@ -71,12 +72,12 @@ let inherit webUi; extraConfig = defaultExtraConfig // { server = true; - bootstrap_expect = builtins.length allConsensusServerHosts; + bootstrap_expect = numConsensusServers; retry_join = # If there's only 1 node in the network, we allow self-join; # otherwise, the node must not try to join itself, and join only the other servers. # See https://github.com/hashicorp/consul/issues/2868 - if builtins.length allConsensusServerHosts == 1 + if numConsensusServers == 1 then allConsensusServerHosts else builtins.filter (h: h != thisConsensusServerHost) allConsensusServerHosts; bind_addr = ip; From a59a972413cef886eb7b2f048aa8dc08a61bf1a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 18 Jun 2020 02:08:17 +0200 Subject: [PATCH 2021/3452] consul.passthru.tests: Fix failure on current consul. Fixes #90613. Done by setting `autopilot.min_quorum = 3`. Techncially, this would have been required to keep the test correct since Consul's "autopilot" "Dead Server Cleanup" was enabled by default (I believe that was in Consul 0.8). Practically, the issue only occurred with our NixOS test with releases >= `1.7.0-beta2` (see #90613). The setting itself is available since Consul 1.6.2. However, this setting was not documented clearly enough for anybody to notice, and only the upstream issue https://github.com/hashicorp/consul/issues/8118 I filed brought that to light. As explained there, the test could also have been made pass by applying the more correct rolling reboot procedure -m.wait_until_succeeds("[ $(consul members | grep -o alive | wc -l) == 5 ]") +m.wait_until_succeeds( + "[ $(consul operator raft list-peers | grep true | wc -l) == 3 ]" +) but we also intend to test that Consul can regain consensus even if the quorum gets temporarily broken. --- nixos/tests/consul.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/tests/consul.nix b/nixos/tests/consul.nix index eb7dd45923fc..ffbbd835885e 100644 --- a/nixos/tests/consul.nix +++ b/nixos/tests/consul.nix @@ -73,6 +73,10 @@ let extraConfig = defaultExtraConfig // { server = true; bootstrap_expect = numConsensusServers; + # Tell Consul that we never intend to drop below this many servers. + # Ensures to not permanently lose consensus after temporary loss. + # See https://github.com/hashicorp/consul/issues/8118#issuecomment-645330040 + autopilot.min_quorum = numConsensusServers; retry_join = # If there's only 1 node in the network, we allow self-join; # otherwise, the node must not try to join itself, and join only the other servers. From 13e2c75c932adac6a198e35b04e2cb9a1eaf86cf Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sun, 10 May 2020 21:49:52 -0700 Subject: [PATCH 2022/3452] nixos/sudo: default rule should be first In /etc/sudoers, the last-matched rule will override all previously-matched rules. Thus, make the default rule show up first (but still allow some wiggle room for a user to `mkBefore` it), before any user-defined rules. --- nixos/modules/security/sudo.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index e3e43177def3..1ed5269c5ae7 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -173,7 +173,9 @@ in config = mkIf cfg.enable { - security.sudo.extraRules = [ + # We `mkOrder 600` so that the default rule shows up first, but there is + # still enough room for a user to `mkBefore` it. + security.sudo.extraRules = mkOrder 600 [ { groups = [ "wheel" ]; commands = [ { command = "ALL"; options = (if cfg.wheelNeedsPassword then [ "SETENV" ] else [ "NOPASSWD" "SETENV" ]); } ]; } From 701c0eb4897554a6d783869420195878132475e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 18 Jun 2020 02:43:11 +0200 Subject: [PATCH 2023/3452] consul.passthru.tests: Refactor into functions. For better naming and commentary. --- nixos/tests/consul.nix | 64 +++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 23 deletions(-) diff --git a/nixos/tests/consul.nix b/nixos/tests/consul.nix index ffbbd835885e..a3fc9166695f 100644 --- a/nixos/tests/consul.nix +++ b/nixos/tests/consul.nix @@ -107,40 +107,58 @@ in { for m in machines: m.wait_for_unit("consul.service") + + def wait_for_healthy_servers(): + for m in machines: + m.wait_until_succeeds("[ $(consul members | grep -o alive | wc -l) == 5 ]") + + + wait_for_healthy_servers() + # Also wait for clients to be alive. for m in machines: m.wait_until_succeeds("[ $(consul members | grep -o alive | wc -l) == 5 ]") client1.succeed("consul kv put testkey 42") client2.succeed("[ $(consul kv get testkey) == 42 ]") - # Test that the cluster can tolearate failures of any single server: - for server in servers: - server.crash() - # For each client, wait until they have connection again - # using `kv get -recurse` before issuing commands. - client1.wait_until_succeeds("consul kv get -recurse") - client2.wait_until_succeeds("consul kv get -recurse") + def rolling_reboot_test(): + """ + Tests that the cluster can tolearate failures of any single server, + following the recommended rolling upgrade procedure from + https://www.consul.io/docs/upgrading#standard-upgrades + """ - # Do some consul actions while one server is down. - client1.succeed("consul kv put testkey 43") - client2.succeed("[ $(consul kv get testkey) == 43 ]") - client2.succeed("consul kv delete testkey") + for server in servers: + server.crash() - # Restart crashed machine. - server.start() + # For each client, wait until they have connection again + # using `kv get -recurse` before issuing commands. + client1.wait_until_succeeds("consul kv get -recurse") + client2.wait_until_succeeds("consul kv get -recurse") - # Wait for recovery. - for m in machines: - m.wait_until_succeeds("[ $(consul members | grep -o alive | wc -l) == 5 ]") + # Do some consul actions while one server is down. + client1.succeed("consul kv put testkey 43") + client2.succeed("[ $(consul kv get testkey) == 43 ]") + client2.succeed("consul kv delete testkey") - # Wait for client connections. - client1.wait_until_succeeds("consul kv get -recurse") - client2.wait_until_succeeds("consul kv get -recurse") + # Restart crashed machine. + server.start() - # Do some consul actions with server back up. - client1.succeed("consul kv put testkey 44") - client2.succeed("[ $(consul kv get testkey) == 44 ]") - client2.succeed("consul kv delete testkey") + # Wait for recovery. + wait_for_healthy_servers() + + # Wait for client connections. + client1.wait_until_succeeds("consul kv get -recurse") + client2.wait_until_succeeds("consul kv get -recurse") + + # Do some consul actions with server back up. + client1.succeed("consul kv put testkey 44") + client2.succeed("[ $(consul kv get testkey) == 44 ]") + client2.succeed("consul kv delete testkey") + + + # Run the tests. + rolling_reboot_test() ''; }) From 811bcbe74a7838244f88462a21828d08bf7cc4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 18 Jun 2020 02:45:42 +0200 Subject: [PATCH 2024/3452] consul.passthru.tests: Use correct server health test. From: https://github.com/hashicorp/consul/issues/8118#issuecomment-645330040 --- nixos/tests/consul.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/nixos/tests/consul.nix b/nixos/tests/consul.nix index a3fc9166695f..c6f2ac8b2f6c 100644 --- a/nixos/tests/consul.nix +++ b/nixos/tests/consul.nix @@ -109,8 +109,23 @@ in { def wait_for_healthy_servers(): + # See https://github.com/hashicorp/consul/issues/8118#issuecomment-645330040 + # for why the `Voter` column of `list-peers` has that info. + # TODO: The `grep true` relies on the fact that currently in + # the output like + # # consul operator raft list-peers + # Node ID Address State Voter RaftProtocol + # server3 ... 192.168.1.3:8300 leader true 3 + # server2 ... 192.168.1.2:8300 follower true 3 + # server1 ... 192.168.1.1:8300 follower false 3 + # `Voter`is the only boolean column. + # Change this to the more reliable way to be defined by + # https://github.com/hashicorp/consul/issues/8118 + # once that ticket is closed. for m in machines: - m.wait_until_succeeds("[ $(consul members | grep -o alive | wc -l) == 5 ]") + m.wait_until_succeeds( + "[ $(consul operator raft list-peers | grep true | wc -l) == 3 ]" + ) wait_for_healthy_servers() From bcdac2e2fdfe5144a7752f85489d37532a1b332e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 18 Jun 2020 03:05:54 +0200 Subject: [PATCH 2025/3452] consul.passthru.tests: Refactor: Extract function --- nixos/tests/consul.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/tests/consul.nix b/nixos/tests/consul.nix index c6f2ac8b2f6c..3e26dcad2cae 100644 --- a/nixos/tests/consul.nix +++ b/nixos/tests/consul.nix @@ -128,10 +128,18 @@ in { ) + def wait_for_all_machines_alive(): + """ + Note that Serf-"alive" does not mean "Raft"-healthy; + see `wait_for_healthy_servers()` for that instead. + """ + for m in machines: + m.wait_until_succeeds("[ $(consul members | grep -o alive | wc -l) == 5 ]") + + wait_for_healthy_servers() # Also wait for clients to be alive. - for m in machines: - m.wait_until_succeeds("[ $(consul members | grep -o alive | wc -l) == 5 ]") + wait_for_all_machines_alive() client1.succeed("consul kv put testkey 42") client2.succeed("[ $(consul kv get testkey) == 42 ]") From b3b27ed008a7813fa03f45f3e9f02aa3b68a450c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 18 Jun 2020 03:06:24 +0200 Subject: [PATCH 2026/3452] consul.passthru.tests: Add 2 more tests --- nixos/tests/consul.nix | 50 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/nixos/tests/consul.nix b/nixos/tests/consul.nix index 3e26dcad2cae..ee85f1d0b917 100644 --- a/nixos/tests/consul.nix +++ b/nixos/tests/consul.nix @@ -145,11 +145,16 @@ in { client2.succeed("[ $(consul kv get testkey) == 42 ]") - def rolling_reboot_test(): + def rolling_reboot_test(proper_rolling_procedure=True): """ Tests that the cluster can tolearate failures of any single server, following the recommended rolling upgrade procedure from - https://www.consul.io/docs/upgrading#standard-upgrades + https://www.consul.io/docs/upgrading#standard-upgrades. + + Optionally, `proper_rolling_procedure=False` can be given + to wait only for each server to be back `Healthy`, not `Stable` + in the Raft consensus, see Consul setting `ServerStabilizationTime` and + https://github.com/hashicorp/consul/issues/8118#issuecomment-645330040. """ for server in servers: @@ -168,8 +173,12 @@ in { # Restart crashed machine. server.start() - # Wait for recovery. - wait_for_healthy_servers() + if proper_rolling_procedure: + # Wait for recovery. + wait_for_healthy_servers() + else: + # NOT proper rolling upgrade procedure, see above. + wait_for_all_machines_alive() # Wait for client connections. client1.wait_until_succeeds("consul kv get -recurse") @@ -181,7 +190,40 @@ in { client2.succeed("consul kv delete testkey") + def all_servers_crash_simultaneously_test(): + """ + Tests that the cluster will eventually come back after all + servers crash simultaneously. + """ + + for server in servers: + server.crash() + + for server in servers: + server.start() + + # Wait for recovery. + wait_for_healthy_servers() + + # Wait for client connections. + client1.wait_until_succeeds("consul kv get -recurse") + client2.wait_until_succeeds("consul kv get -recurse") + + # Do some consul actions with servers back up. + client1.succeed("consul kv put testkey 44") + client2.succeed("[ $(consul kv get testkey) == 44 ]") + client2.succeed("consul kv delete testkey") + + # Run the tests. + + print("rolling_reboot_test()") rolling_reboot_test() + + print("all_servers_crash_simultaneously_test()") + all_servers_crash_simultaneously_test() + + print("rolling_reboot_test(proper_rolling_procedure=False)") + rolling_reboot_test(proper_rolling_procedure=False) ''; }) From d3e1b77ac3d3dcf7686108c489c1c2c615790232 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Wed, 17 Jun 2020 22:06:05 +0200 Subject: [PATCH 2027/3452] json_c: add patch for CVE-2020-12762 Fixes: https://nvd.nist.gov/vuln/detail/CVE-2020-12762 --- pkgs/development/libraries/json-c/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index 81ebc7baeb06..a3ddfe4c63c5 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf }: +{ stdenv, fetchurl, fetchpatch, autoconf }: stdenv.mkDerivation rec { name = "json-c-0.13.1"; @@ -7,6 +7,15 @@ stdenv.mkDerivation rec { sha256 = "0ch1v18wk703bpbyzj7h1mkwvsw4rw4qdwvgykscypvqq10678ll"; }; + patches = [ + # https://nvd.nist.gov/vuln/detail/CVE-2020-12762 + (fetchpatch { + name = "CVE-2020-12762.patch"; + url = "https://github.com/json-c/json-c/commit/865b5a65199973bb63dff8e47a2f57e04fec9736.patch"; + sha256 = "1g5afk4khhm1sb70xrva1pyznshcw3ipzp1g5z60dpzxy303pp6h"; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoconf ]; # for autoheader From 6457a26021136eafdb7c2063653010ce4fce36de Mon Sep 17 00:00:00 2001 From: Jesse Wattenbarger Date: Wed, 8 Apr 2020 21:52:50 -0400 Subject: [PATCH 2028/3452] maintainers: add jwatt --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 38ed481b7c63..14675f3e23bc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3901,6 +3901,12 @@ githubId = 2396926; name = "Justin Woo"; }; + jwatt = { + email = "jwatt@broken.watch"; + github = "jjwatt"; + githubId = 2397327; + name = "Jesse Wattenbarger"; + }; jwiegley = { email = "johnw@newartisans.com"; github = "jwiegley"; From 2d3371713897cb124abf351f9aed2377a4b2fadf Mon Sep 17 00:00:00 2001 From: Jesse Wattenbarger Date: Wed, 8 Apr 2020 21:56:26 -0400 Subject: [PATCH 2029/3452] dasm: init at 2.20.13 Co-authored-by: Daniel Schaefer --- pkgs/development/compilers/dasm/default.nix | 34 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/compilers/dasm/default.nix diff --git a/pkgs/development/compilers/dasm/default.nix b/pkgs/development/compilers/dasm/default.nix new file mode 100644 index 000000000000..1eb233b90b7f --- /dev/null +++ b/pkgs/development/compilers/dasm/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "dasm"; + version = "2.20.13"; + + src = fetchFromGitHub { + owner = "dasm-assembler"; + repo = "dasm"; + rev = version; + sha256 = "1nr4kvw42vyc6i4p1c06jlih11rhbjjxc27dc7cx5qj635xf4jcf"; + }; + + configurePhase = false; + installPhase = '' + mkdir -p $out/bin + install bin/* $out/bin + ''; + + preCheck = '' + patchShebangs ./test/ + ''; + + checkTarget = "test"; + doCheck = true; + + meta = with stdenv.lib; { + description = "Assembler for 6502 and other 8-bit microprocessors"; + homepage = "https://dasm-assembler.github.io"; + license = licenses.gpl2; + maintainers = [ maintainers.jwatt ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 311a9d48e68c..31c01fda93e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8212,6 +8212,8 @@ in scry = callPackage ../development/tools/scry {}; + dasm = callPackage ../development/compilers/dasm/default.nix { }; + dbmate = callPackage ../development/tools/database/dbmate { }; devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; From 110d6a8b987844024a621443be4fb285d92e904e Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 17 Jun 2020 20:43:56 -0700 Subject: [PATCH 2030/3452] platformio: 4.3.1 -> 4.3.4 --- pkgs/development/arduino/platformio/core.nix | 4 ++-- .../arduino/platformio/use-local-spdx-license-list.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index 0d333a49d37a..d83013dbbde5 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -51,14 +51,14 @@ let in buildPythonApplication rec { pname = "platformio"; - version = "4.3.1"; + version = "4.3.4"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "1dxnjy60zpkgyrbvbf6b9qi6m37gm8gwjmxwfj30npr1y7rvxwrw"; + sha256 = "0vf2j79319ypr4yrdmx84853igkb188sjfvlxgw06rlsvsm3kacq"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch index 16294a4d6cd6..953eb3c92893 100644 --- a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch @@ -8,7 +8,7 @@ index be49b3ee..d1390a88 100644 def load_spdx_licenses(): - r = requests.get( - "https://raw.githubusercontent.com/spdx/license-list-data" -- "/v3.8/json/licenses.json" +- "/v3.9/json/licenses.json" - ) - r.raise_for_status() - return r.json() From f9e5ca8e58d6cddb182cb155be079829898d1a2d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 16 Jun 2020 08:18:35 +1000 Subject: [PATCH 2031/3452] ffmpeg: 4.2.3 -> 4.3 --- pkgs/development/libraries/ffmpeg/4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 1a7c619a122c..de1bfff6f910 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -5,8 +5,8 @@ }@args: callPackage ./generic.nix (rec { - version = "4.2.3"; - branch = "4.2"; - sha256 = "0pkrariwjv25k7inwshch7b5820ly3hsp991amyb60rkqc8v4zi1"; + version = "4.3"; + branch = "4.3"; + sha256 = "1qnnhd2b0g5sg72pclxs3i8sxzz0raky69k7w9cmpba9zh973s57"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; } // args) From 05c4c9e72931e25ba8615c6377f718680c470b87 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 16 Jun 2020 09:07:06 +1000 Subject: [PATCH 2032/3452] ffmpeg-full: drop unneeded patch --- .../libraries/ffmpeg-full/default.nix | 2 -- .../prefer-libdav1d-over-libaom.patch | 19 ------------------- 2 files changed, 21 deletions(-) delete mode 100644 pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 95be159b2e19..666aafef7f44 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -242,8 +242,6 @@ stdenv.mkDerivation rec { pname = "ffmpeg-full"; inherit (ffmpeg) src version; - patches = [ ./prefer-libdav1d-over-libaom.patch ]; - prePatch = '' patchShebangs . '' + stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch b/pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch deleted file mode 100644 index 789bfc2674fa..000000000000 --- a/pkgs/development/libraries/ffmpeg-full/prefer-libdav1d-over-libaom.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c -index d2f9a39ce5..2342399a8e 100644 ---- a/libavcodec/allcodecs.c -+++ b/libavcodec/allcodecs.c -@@ -679,13 +679,13 @@ extern AVCodec ff_pcm_mulaw_at_encoder; - extern AVCodec ff_pcm_mulaw_at_decoder; - extern AVCodec ff_qdmc_at_decoder; - extern AVCodec ff_qdm2_at_decoder; -+extern AVCodec ff_libdav1d_decoder; - extern AVCodec ff_libaom_av1_decoder; - extern AVCodec ff_libaom_av1_encoder; - extern AVCodec ff_libaribb24_decoder; - extern AVCodec ff_libcelt_decoder; - extern AVCodec ff_libcodec2_encoder; - extern AVCodec ff_libcodec2_decoder; --extern AVCodec ff_libdav1d_decoder; - extern AVCodec ff_libdavs2_decoder; - extern AVCodec ff_libfdk_aac_encoder; - extern AVCodec ff_libfdk_aac_decoder; From 2b075f7310b544cac529e98d2c6f0a7fb2817550 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 16 Jun 2020 13:54:31 +1000 Subject: [PATCH 2033/3452] nv-codec-headers: 9.0.18.1 -> 9.1.23.1 --- pkgs/development/libraries/nv-codec-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nv-codec-headers/default.nix b/pkgs/development/libraries/nv-codec-headers/default.nix index f74030a02df8..8d3c2179bff9 100644 --- a/pkgs/development/libraries/nv-codec-headers/default.nix +++ b/pkgs/development/libraries/nv-codec-headers/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "nv-codec-headers"; - version = "9.0.18.1"; + version = "9.1.23.1"; src = fetchgit { url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; rev = "n${version}"; - sha256 = "0354fivb92ix341jds7a7qn3mgwimrnxbganhlhr4vayj25c3hw5"; + sha256 = "1xfvb3mhz6wfx9c732888xa82ivaig903lhvvrqqzs31qfznsplh"; }; makeFlags = [ "PREFIX=$(out)" ]; From 9b2cb88855366f4de3a7e51dc8803cba9966f5cf Mon Sep 17 00:00:00 2001 From: Julien Langlois Date: Thu, 18 Jun 2020 01:03:58 -0400 Subject: [PATCH 2034/3452] wine-staging: 5.5 -> 5.10 Keep up to date with latest staging developments. --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 964e08674ca6..dd3cae339ca1 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "5.5"; + version = "5.10"; url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; - sha256 = "1z7mvl6fgk7cg8vmy157r8azcz89srnckbzvsc6cva7a1fdi7qx0"; + sha256 = "0g9k094biyjc0ng3vnncdr1psf0ykn36nqirrqdzc5y82s9a1alv"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "0wcj73xcxsk5897m5fg14cjir2md167m09jjjv9z9n6157bfr9fw"; + sha256 = "1nnj52g0kp7i38qw85sp5qsf7gph1hh3ywibrdfpjmjpyj30v7sw"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From c4a797d59b21fabf982557f1d047c355f08cac87 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 10 Jun 2020 04:20:38 +1000 Subject: [PATCH 2035/3452] iperf3: 3.7 -> 3.8.1 https://github.com/esnet/iperf/blob/master/RELNOTES.md#iperf-38-2020-06-08 https://github.com/esnet/iperf/blob/master/RELNOTES.md#iperf-381-2020-06-10 --- pkgs/tools/networking/iperf/3.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index 4506fbb11e36..4910ff21da62 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, openssl, fetchpatch }: stdenv.mkDerivation rec { - name = "iperf-3.7"; + pname = "iperf"; + version = "3.8.1"; src = fetchurl { - url = "https://downloads.es.net/pub/iperf/${name}.tar.gz"; - sha256 = "033is7b5grfbiil98jxlz4ixp9shm44x6hy8flpsyz1i4h108inq"; + url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"; + sha256 = "15pdgnan9krf3dijan9in73ir8rcmhk3iw8085d732is4zrq1c75"; }; buildInputs = [ openssl ]; From 98dda1a838751d02ccb9a9c283627fcc02e34d0a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 18 Jun 2020 05:41:56 +0000 Subject: [PATCH 2036/3452] zoom-us: 5.0.418682.0603 -> 5.1.412382.0614 Add @doronbehar as maintainer, and update list of files to install. --- .../networking/instant-messengers/zoom-us/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 7f5cf65e0937..e82fbc7bebce 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.0.418682.0603"; + version = "5.1.412382.0614"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1vlba3jgp3dr16n5g29l0dpdd054d8h6lkwk3a6346shvd46mpja"; + sha256 = "07xb3v5i08wq0a3my9id91gizsxj5ppqvxmcbdy04j7yn4i1jm9x"; }; }; @@ -60,7 +60,6 @@ in mkDerivation { "zcacert.pem" "zoom" "zoom.sh" - "zoomlinux" "zopen" ]; in '' @@ -126,7 +125,7 @@ in mkDerivation { description = "zoom.us video conferencing application"; license = stdenv.lib.licenses.unfree; platforms = builtins.attrNames srcs; - maintainers = with stdenv.lib.maintainers; [ danbst tadfisher ]; + maintainers = with stdenv.lib.maintainers; [ danbst tadfisher doronbehar ]; }; } From 986079275b4e64c1c429a3939cbce85576e30b3b Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 11 May 2020 11:08:29 +0200 Subject: [PATCH 2037/3452] lib/attrsets: add getMan function --- lib/attrsets.nix | 1 + lib/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 82bea7af31fc..d91d7a0cd47e 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -469,6 +469,7 @@ rec { getBin = getOutput "bin"; getLib = getOutput "lib"; getDev = getOutput "dev"; + getMan = getOutput "man"; /* Pick the outputs of packages to place in buildInputs */ chooseDevOutputs = drvs: builtins.map getDev drvs; diff --git a/lib/default.nix b/lib/default.nix index e7f59a67abbd..7387e9d9f1ff 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -77,7 +77,7 @@ let genAttrs isDerivation toDerivation optionalAttrs zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil recursiveUpdate matchAttrs overrideExisting getOutput getBin - getLib getDev chooseDevOutputs zipWithNames zip + getLib getDev getMan chooseDevOutputs zipWithNames zip recurseIntoAttrs dontRecurseIntoAttrs; inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count From dfff485819775fd6ddbf922351ea381bb4b657d2 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 1 May 2020 18:34:18 +0200 Subject: [PATCH 2038/3452] man-db: remove NixOS-specific configuration When using --with-config-file, all man-db programs completely ignore the systemwide configuration in /etc/man_db.conf: it means on NixOS there is no way to change the configuration without rebuilding man-db, which in turn causes a mass-rebuild. To solve this problem this commit removes the NixOS-specific configuration in man-db, which wasn't the appropriate place to begin with: the package is expected to work on non-NixOS systems as well. Also a small patch now ensure /etc/man_db.conf is used, if available, before the bundled configuration. --- pkgs/tools/misc/man-db/default.nix | 8 ++-- .../misc/man-db/systemwide-man-db-conf.patch | 39 +++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/misc/man-db/systemwide-man-db-conf.patch diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 7b8835622c8d..f5cbef8b0226 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -15,18 +15,17 @@ stdenv.mkDerivation rec { buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) checkInputs = [ libiconv /* for 'iconv' binary */ ]; + patches = [ ./systemwide-man-db-conf.patch ]; + postPatch = '' # Remove all mandatory manpaths. Nixpkgs makes no requirements on # these directories existing. sed -i 's/^MANDATORY_MANPATH/# &/' src/man_db.conf.in - # Add Nixpkgs and NixOS-related manpaths - echo "MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man" >> src/man_db.conf.in - echo "MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man" >> src/man_db.conf.in + # Add Nix-related manpaths echo "MANPATH_MAP /nix/var/nix/profiles/default/bin /nix/var/nix/profiles/default/share/man" >> src/man_db.conf.in # Add mandb locations for the above - echo "MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos" >> src/man_db.conf.in echo "MANDB_MAP /nix/var/nix/profiles/default/share/man /var/cache/man/nixpkgs" >> src/man_db.conf.in ''; @@ -34,7 +33,6 @@ stdenv.mkDerivation rec { "--disable-setuid" "--disable-cache-owner" "--localstatedir=/var" - # Don't try /etc/man_db.conf by default, so we avoid error messages. "--with-config-file=${placeholder "out"}/etc/man_db.conf" "--with-systemdtmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" diff --git a/pkgs/tools/misc/man-db/systemwide-man-db-conf.patch b/pkgs/tools/misc/man-db/systemwide-man-db-conf.patch new file mode 100644 index 000000000000..2d4477776bb1 --- /dev/null +++ b/pkgs/tools/misc/man-db/systemwide-man-db-conf.patch @@ -0,0 +1,39 @@ +commit 9089291006a4258c39c75a920ad536b61504251a +Author: rnhmjoj +Date: Fri May 1 19:32:15 2020 +0200 + + check for systemwide man_db.conf before the bundled one + +diff --git a/src/manp.c b/src/manp.c +index 5441339..0bbf566 100644 +--- a/src/manp.c ++++ b/src/manp.c +@@ -841,18 +841,24 @@ void read_config_file (bool optional) + } + + if (getenv ("MAN_TEST_DISABLE_SYSTEM_CONFIG") == NULL) { +- config_file = fopen (CONFIG_FILE, "r"); ++ const char *config_filepath; ++ if (access ("/etc/man_db.conf", F_OK) != -1) { ++ config_filepath = "/etc/man_db.conf"; ++ } else { ++ config_filepath = CONFIG_FILE; ++ } ++ config_file = fopen (config_filepath, "r"); + if (config_file == NULL) { + if (optional) + debug ("can't open %s; continuing anyway\n", +- CONFIG_FILE); ++ config_filepath); + else + error (FAIL, 0, + _("can't open the manpath " + "configuration file %s"), +- CONFIG_FILE); ++ config_filepath); + } else { +- debug ("From the config file %s:\n", CONFIG_FILE); ++ debug ("From the config file %s:\n", config_filepath); + + add_to_dirlist (config_file, 0); + fclose (config_file); From edc6a76cc025ef972979dad6692e0fd5d5cfcbbb Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 1 May 2020 18:48:39 +0200 Subject: [PATCH 2039/3452] nixos/documentation: add option to generate caches Previously the NixOS-specific configuration for man-db was in the package itself and /etc/man.conf was completely ignored. This change moves it to /etc/man_db.conf, making declarative configuration practical again. It's now possible to generate the mandb caches for all packages installed through NixOS `environment.systemPackages` at build-time. The standard location for the stateful cache (/var/cache/man) is also configured to allow users to run `mandb` manually if they wish. Since generating the cache can be expensive the option is off by default. --- nixos/modules/misc/documentation.nix | 38 +++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 7ad4be9a02e6..71a40b4f4d6e 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -102,6 +102,16 @@ in ''; }; + man.generateCaches = mkOption { + type = types.bool; + default = false; + description = '' + Whether to generate the manual page index caches using + mandb(8). This allows searching for a page or + keyword using utilities like apropos(1). + ''; + }; + info.enable = mkOption { type = types.bool; default = true; @@ -187,7 +197,33 @@ in environment.systemPackages = [ pkgs.man-db ]; environment.pathsToLink = [ "/share/man" ]; environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman"; - environment.etc."man.conf".source = "${pkgs.man-db}/etc/man_db.conf"; + environment.etc."man_db.conf".text = + let + manualPages = pkgs.buildEnv { + name = "man-paths"; + paths = config.environment.systemPackages; + pathsToLink = [ "/share/man" ]; + extraOutputsToInstall = ["man"]; + ignoreCollisions = true; + }; + manualCache = pkgs.runCommandLocal "man-cache" { } + '' + echo "MANDB_MAP ${manualPages}/share/man $out" > man.conf + ${pkgs.man-db}/bin/mandb -C man.conf -psc + ''; + in + '' + # Manual pages paths for NixOS + MANPATH_MAP /run/current-system/sw/bin /run/current-system/sw/share/man + MANPATH_MAP /run/wrappers/bin /run/current-system/sw/share/man + + ${optionalString cfg.man.generateCaches '' + # Generated manual pages cache for NixOS (immutable) + MANDB_MAP /run/current-system/sw/share/man ${manualCache} + ''} + # Manual pages caches for NixOS + MANDB_MAP /run/current-system/sw/share/man /var/cache/man/nixos + ''; }) (mkIf cfg.info.enable { From 4dd95c0cfc19bf7c4b9e5b5f3098d6b28d503037 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 18 Jun 2020 10:36:24 +0200 Subject: [PATCH 2040/3452] nixos/release-notes: mention new man.generateCaches option --- nixos/doc/manual/release-notes/rl-2009.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 9bbbecc05692..31cabce1d536 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -110,6 +110,15 @@ systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ]; + + + Two new option documentation.man.generateCaches + has been added to automatically generate the man-db caches, which are needed by utilities + like whatis and apropos. The caches are generated during the build of + the NixOS configuration: since this can be expensive when a large number of packages are installed, the + feature is disabled by default. + + From 9e7da183828cf83efc794ddde40ff5ead7fc6631 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Tue, 31 Mar 2020 15:57:40 +0800 Subject: [PATCH 2041/3452] swiftshader: init at 2020-06-17 --- .../libraries/swiftshader/default.nix | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/libraries/swiftshader/default.nix diff --git a/pkgs/development/libraries/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix new file mode 100644 index 000000000000..3965f46bd8d8 --- /dev/null +++ b/pkgs/development/libraries/swiftshader/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchgit, python3, cmake, jq, libX11, libXext }: + +stdenv.mkDerivation rec { + pname = "swiftshader"; + version = "2020-06-17"; + + src = fetchgit { + url = "https://swiftshader.googlesource.com/SwiftShader"; + rev = "763957e6b4fc1aa360ab19c4109b8b26686783e8"; + sha256 = "0sdh48swx0qyq2nfkv1nggs14am0qc7z239qrxb69p2ddqm76g1s"; + }; + + nativeBuildInputs = [ cmake python3 jq ]; + buildInputs = [ libX11 libXext ]; + + # Make sure we include the drivers and icd files in the output as the cmake + # generated install command only puts in the spirv-tools stuff. + installPhase = '' + runHook preInstall + + # + # Vulkan driver + # + vk_so_path="$out/lib/libvk_swiftshader.so" + mkdir -p "$(dirname "$vk_so_path")" + mv Linux/libvk_swiftshader.so "$vk_so_path" + + vk_icd_json="$out/share/vulkan/icd.d/vk_swiftshader_icd.json" + mkdir -p "$(dirname "$vk_icd_json")" + jq ".ICD.library_path = \"$vk_so_path\"" "$vk_icd_json" + + # + # GL driver + # + gl_so_path="$out/lib/libEGL.so" + mkdir -p "$(dirname "$gl_so_path")" + mv Linux/libEGL.so "$gl_so_path" + + gl_icd_json="$out/share/glvnd/egl_vendor.d/swiftshader.json" + mkdir -p "$(dirname "$gl_icd_json")" + cat >"$gl_icd_json" < Date: Thu, 18 Jun 2020 00:46:43 +0300 Subject: [PATCH 2042/3452] 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 544ba1db6f9ba65b328ea1095baee2b92d7e1048 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Wed, 17 Jun 2020 11:13:44 +0200 Subject: [PATCH 2043/3452] prometheus-redis-exporter: init at 1.7.0 --- .../prometheus/redis-exporter-deps.nix | 390 ++++++++++++++++++ .../monitoring/prometheus/redis-exporter.nix | 32 ++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 423 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/redis-exporter-deps.nix create mode 100644 pkgs/servers/monitoring/prometheus/redis-exporter.nix diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/redis-exporter-deps.nix new file mode 100644 index 000000000000..33747715fbef --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/redis-exporter-deps.nix @@ -0,0 +1,390 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "fb15b899a751"; + sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "c3de453c63f4"; + sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "v1.0.1"; + sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; + }; + } + { + goPackagePath = "github.com/cespare/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/cespare/xxhash"; + rev = "v2.1.1"; + sha256 = "0rl5rs8546zj1vzggv38w93wx0b5dvav7yy5hzxa8kw7iikv1cgr"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.9.0"; + sha256 = "09038mnw705h7isbjp8dzgp2i04bp5rqkmifxvwc5xkh75s00qpw"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.4.0"; + sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.4.0"; + sha256 = "1fjvl5n77abxz5qsd4mgyvjq19x43c5bfvmq62mq3m5plx6zksc8"; + }; + } + { + goPackagePath = "github.com/gomodule/redigo"; + fetch = { + type = "git"; + url = "https://github.com/gomodule/redigo"; + rev = "v1.8.2"; + sha256 = "0wp37175n4lgkq234px9vx0c7mdx8sx3d45zky73az8zbabirwga"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.4.0"; + sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "v1.0.0"; + sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.9"; + sha256 = "0pkn2maymgl9v6vmq9q1si8xr5bbl88n6981y0lx09px6qxb29qx"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.3"; + sha256 = "1yrsd4s8vhjnxhwbigirymz89dn6qfjnhn28i33vvvdgf96j6ypl"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v1.6.0"; + sha256 = "0wwkx69in9dy5kzd3z6rrqf5by8cwl9r7r17fswcpx9rl3g61x1l"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "v0.2.0"; + sha256 = "0jffnz94d6ff39fr96b5w8i8yk26pwnrfggzz8jhi8k0yihg2c9d"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "v0.9.1"; + sha256 = "12pyywb02p7d30ccm41mwn69qsgqnsgv1w9jlqrrln2f1svnbqch"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "v0.0.11"; + sha256 = "1msc8bfywsmrgr2ryqjdqwkxiz1ll08r3qgvaka2507z1wpcpj2c"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.6.0"; + sha256 = "1zf9is1yxxnna0d1pyag2m9ziy3l27zb2j92p9msm1gx5jjrvzzj"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.5.1"; + sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "d28f0bde5980"; + sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "cd5d95a43a6e"; + sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "1957bb5e6d1f"; + sha256 = "0imqk4l9785rw7ddvywyf8zn7k3ga6f17ky8rmf8wrri7nknr03f"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "9bdfabe68543"; + sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; + }; + } + { + goPackagePath = "google.golang.org/protobuf"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/protobuf"; + rev = "v1.21.0"; + sha256 = "12bwln8z1lf9105gdp6ip0rx741i4yfz1520gxnp8861lh9wcl63"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "41f04d3bba15"; + sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.5"; + sha256 = "08smz8dfyxp02ha74my9iszqa5qzgl3ksi28ilyp8lqipssiq6fg"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix new file mode 100644 index 000000000000..13172bdde0df --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -0,0 +1,32 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "redis_exporter"; + version = "1.7.0"; + + goPackagePath = "github.com/oliver006/redis_exporter"; + + src = fetchFromGitHub { + owner = "oliver006"; + repo = "redis_exporter"; + rev = "v${version}"; + sha256 = "0rwaxpylividyxz0snfgck32kvpgjkhg20bmdnlp35cdzxcxi8m1"; + }; + + goDeps = ./redis-exporter-deps.nix; + + buildFlagsArray = '' + -ldflags= + -X main.BuildVersion=${version} + -X main.BuildCommitSha=unknown + -X main.BuildDate=unknown + ''; + + meta = with stdenv.lib; { + description = "Prometheus exporter for Redis metrics"; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ srhb ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b75778322fe..69207598fa2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16198,6 +16198,7 @@ in prometheus-postgres-exporter = callPackage ../servers/monitoring/prometheus/postgres-exporter.nix { }; prometheus-process-exporter = callPackage ../servers/monitoring/prometheus/process-exporter.nix { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; + prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { }; prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; From 9740f61b318e1797615d010a8c2330279e8a20b6 Mon Sep 17 00:00:00 2001 From: Erik Skytthe Date: Wed, 17 Jun 2020 12:10:03 +0200 Subject: [PATCH 2044/3452] maintainers: add eskytthe --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b75cb49467a0..0c895f629645 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2448,6 +2448,12 @@ githubId = 7432848; name = "Daniel Albert"; }; + eskytthe = { + email = "eskytthe@gmail.com"; + github = "eskytthe"; + githubId = 2544204; + name = "Erik Skytthe"; + }; Esteth = { email = "adam.copp@gmail.com"; name = "Adam Copp"; From ac3a50122bb33ee72a0a243673bf2c619ec86486 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Wed, 17 Jun 2020 14:06:50 +0200 Subject: [PATCH 2045/3452] prometheus-redis-exporter: add eskytthe to maintainers --- pkgs/servers/monitoring/prometheus/redis-exporter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 13172bdde0df..ea15fecc8ef0 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -26,7 +26,7 @@ buildGoPackage rec { description = "Prometheus exporter for Redis metrics"; inherit (src.meta) homepage; license = licenses.mit; - maintainers = with maintainers; [ srhb ]; + maintainers = with maintainers; [ eskytthe srhb ]; platforms = platforms.unix; }; } From 344e64a4d970a180fc0bc1054cb5fd503dc1daa8 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Thu, 18 Jun 2020 07:46:52 +0200 Subject: [PATCH 2046/3452] nixos/prometheus-redis-exporter: init --- .../monitoring/prometheus/exporters.nix | 1 + .../monitoring/prometheus/exporters/redis.nix | 19 +++++++++++++++++++ nixos/tests/prometheus-exporters.nix | 14 ++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/redis.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 0318acae50f7..29f402b212fe 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -39,6 +39,7 @@ let "node" "postfix" "postgres" + "redis" "rspamd" "snmp" "surfboard" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/redis.nix b/nixos/modules/services/monitoring/prometheus/exporters/redis.nix new file mode 100644 index 000000000000..befbcb21f766 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/redis.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.redis; +in +{ + port = 9121; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-redis-exporter}/bin/redis_exporter \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 4dbd64312224..75c4ca12db24 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -475,6 +475,20 @@ let ''; }; + redis = { + exporterConfig = { + enable = true; + }; + metricProvider.services.redis.enable = true; + exporterTest = '' + wait_for_unit("redis.service") + wait_for_unit("prometheus-redis-exporter.service") + wait_for_open_port(6379) + wait_for_open_port(9121) + wait_until_succeeds("curl -sSf localhost:9121/metrics | grep -q 'redis_up 1'") + ''; + }; + rspamd = { exporterConfig = { enable = true; From bb7b4cdfcb60d547d010114beb626311777cc3da Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 18 Jun 2020 04:20:00 -0500 Subject: [PATCH 2047/3452] nodejs-12_x: 12.18.0 -> 12.18.1 Changelog: https://github.com/nodejs/node/releases/tag/v12.18.1 --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index c28657c3bb1d..214292afbbe1 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.18.0"; - sha256 = "0gxi0cxkiylxr4spm3vg6n9w3x82770xaazhax8pydkqlcv8cs6l"; + version = "12.18.1"; + sha256 = "0yjwd8yilm85wkginvhhchcikjsl8g3l3qagbg0l2y1hg8f0anfa"; } From 79987057c4bb8364941e1ed9a95f2b5724bb9c83 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Thu, 18 Jun 2020 17:27:27 +0800 Subject: [PATCH 2048/3452] exfat: fix cross compilation --- pkgs/os-specific/linux/exfat/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index e66ac4d65ab9..59f9c709e5fa 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "ARCH=${stdenv.hostPlatform.platform.kernelArch}" + ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; installPhase = '' From 64b2789c4e3b27cb66c25d0e05d5516c8fbd17c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Thu, 18 Jun 2020 11:32:39 +0200 Subject: [PATCH 2049/3452] clojure: 1.10.1.507 -> 1.10.1.547 Patch no longer need, added upstream: https://clojure.atlassian.net/browse/TDEPS-150 --- .../interpreters/clojure/TDEPS-150.patch | 23 ------------------- .../interpreters/clojure/default.nix | 6 ++--- 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 pkgs/development/interpreters/clojure/TDEPS-150.patch diff --git a/pkgs/development/interpreters/clojure/TDEPS-150.patch b/pkgs/development/interpreters/clojure/TDEPS-150.patch deleted file mode 100644 index 611134e8e3fa..000000000000 --- a/pkgs/development/interpreters/clojure/TDEPS-150.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/clojure -+++ b/clojure -@@ -317,17 +317,17 @@ if "$stale" || "$pom"; then - tools_args+=("--threads" "$threads") - fi - if "$trace"; then - tools_args+=("--trace") - fi - fi - - # If stale, run make-classpath to refresh cached classpath --if [[ "$stale" = true && "$describe" = false ]]; then -+if [[ "$stale" = true && "$describe" = false && -z "$force_cp" ]]; then - if "$verbose"; then - echo "Refreshing classpath" - fi - - "$JAVA_CMD" -classpath "$tools_cp" clojure.main -m clojure.tools.deps.alpha.script.make-classpath2 --config-user "$config_user" --config-project "$config_project" --libs-file "$libs_file" --cp-file "$cp_file" --jvm-file "$jvm_file" --main-file "$main_file" "${tools_args[@]}" - fi - - if "$describe"; then --- -2.25.0 diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index e8c3e7b098ab..91166d9bfd46 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,15 +2,13 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.1.507"; + version = "1.10.1.547"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "1k0jwa3481g3mkalwlb9gkcz9aq9zjpwmzckv823fr2d8djp41cc"; + sha256 = "06lg4z3q0fzxlbmx92g5qb0w3nw83dbwkzh3zjdy9ixrpm7b84i0"; }; - patches = [ ./TDEPS-150.patch ]; - buildInputs = [ makeWrapper ]; installPhase = From 5c35515adf0bc10803cd7eaa88d96c8cec2ddf94 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 18 Jun 2020 15:07:42 +1000 Subject: [PATCH 2050/3452] buildah: 1.14.9 -> 1.15.0 https://github.com/containers/buildah/releases/tag/v1.15.0 --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index d033fe52e6c2..3b1e0aaa00f6 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.14.9"; + version = "1.15.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "1vp59xp374wr7sbx89aikz4rv8fdg0a40v06saryxww9iqyvk8wp"; + sha256 = "0nhqw8s8m819mhb0kpji0if8ji9cmkcb821zab7h65azk0p8qh20"; }; outputs = [ "out" "man" ]; From e4fd4b2a71bca8bf5d682399b238d192dd4ee6b7 Mon Sep 17 00:00:00 2001 From: Yannick Markus Date: Wed, 17 Jun 2020 10:34:09 +0200 Subject: [PATCH 2051/3452] devdocs-desktop: init at 0.7.1 Also added ymarkus to maintainers list. --- maintainers/maintainer-list.nix | 6 +++ .../misc/devdocs-desktop/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 51 insertions(+) create mode 100644 pkgs/applications/misc/devdocs-desktop/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cb3a7ee592b0..47ef2cc1f6ce 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8915,6 +8915,12 @@ githubId = 474343; name = "Xavier Zwirtz"; }; + ymarkus = { + name = "Yannick Markus"; + email = "nixpkgs@ymarkus.dev"; + github = "ymarkus"; + githubId = 62380378; + }; ymeister = { name = "Yuri Meister"; email = "47071325+ymeister@users.noreply.github.com"; diff --git a/pkgs/applications/misc/devdocs-desktop/default.nix b/pkgs/applications/misc/devdocs-desktop/default.nix new file mode 100644 index 000000000000..7c1726961339 --- /dev/null +++ b/pkgs/applications/misc/devdocs-desktop/default.nix @@ -0,0 +1,43 @@ +{ stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: + +let + version = "0.7.1"; + pname = "devdocs-desktop"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/egoist/devdocs-desktop/releases/download/v${version}/DevDocs-${version}.AppImage"; + sha256 = "5bba99a34c90a65eff67aface0b7446cbf43d620a1c195f27e7bb33ab6d3d0c2"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; + +in appimageTools.wrapType2 rec { + inherit name src; + + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + install -m 444 -D ${appimageContents}/devdocs.desktop $out/share/applications/devdocs.desktop + install -m 444 -D ${appimageContents}/devdocs.png $out/share/icons/hicolor/0x0/apps/devdocs.png + substituteInPlace $out/share/applications/devdocs.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with stdenv.lib; { + description = "A full-featured desktop app for DevDocs.io"; + longDescription = '' + DevDocs.io combines multiple API documentations in a fast, organized, and searchable interface. This is an unofficial desktop app for it. + ''; + homepage = "https://github.com/egoist/devdocs-desktop"; + downloadPage = "https://github.com/egoist/devdocs-desktop/releases"; + license = licenses.mit; + maintainers = with maintainers; [ ymarkus ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18c9cf0165bc..c161f34e175d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1656,6 +1656,8 @@ in desync = callPackage ../applications/networking/sync/desync { }; + devdocs-desktop = callPackage ../applications/misc/devdocs-desktop { }; + devmem2 = callPackage ../os-specific/linux/devmem2 { }; dbus-broker = callPackage ../os-specific/linux/dbus-broker { }; From 7449a3274e197601b685dd2c8930e3537f83801e Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 18 Jun 2020 12:48:40 +0200 Subject: [PATCH 2052/3452] prometheus-exporters: expose tests in exporter definitions --- pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/bind-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/collectd-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/cups-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix | 6 ++++-- pkgs/servers/monitoring/prometheus/dovecot-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/json-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/keylight-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/lnd-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/mail-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix | 6 ++++-- pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/nginx-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/node-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/postfix-exporter.nix | 6 ++++-- pkgs/servers/monitoring/prometheus/postgres-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/redis-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/snmp-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/surfboard-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/tor-exporter.nix | 4 +++- pkgs/servers/monitoring/prometheus/varnish-exporter.nix | 6 ++++-- pkgs/servers/monitoring/prometheus/wireguard-exporter.nix | 4 +++- 24 files changed, 76 insertions(+), 28 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix index 0e1cc52c91c5..a766aae38346 100644 --- a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "apcupsd-exporter"; @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "09x8y8pmgfn897hvnk122ry460y12b8a7y5fafri5wn9vxab9r82"; + passthru.tests = { inherit (nixosTests.prometheus-exporters) apcupsd; }; + meta = with stdenv.lib; { description = "Provides a Prometheus exporter for the apcupsd Network Information Server (NIS)"; homepage = "https://github.com/mdlayher/apcupsd_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index d27fd094aa66..3913cbd5f852 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "bind_exporter"; @@ -14,6 +14,8 @@ buildGoPackage rec { sha256 = "1nd6pc1z627w4x55vd42zfhlqxxjmfsa9lyn0g6qq19k4l85v1qm"; }; + passthru.tests = { inherit (nixosTests.prometheus-exporters) bind; }; + meta = with stdenv.lib; { description = "Prometheus exporter for bind9 server"; homepage = "https://github.com/digitalocean/bind_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index b44ebd35e9a7..732c28a73a3d 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "blackbox_exporter"; @@ -17,6 +17,8 @@ buildGoPackage rec { # dns-lookup is performed for the tests doCheck = false; + passthru.tests = { inherit (nixosTests.prometheus-exporters) blackbox; }; + meta = with stdenv.lib; { description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP"; homepage = "https://github.com/prometheus/blackbox_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 95b6c0640344..12f9cd3d3501 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "collectd-exporter"; @@ -14,6 +14,8 @@ buildGoPackage rec { sha256 = "1p0kb7c8g0r0sp5a6xrx8vnwbw14hhwlqzk4n2xx2y8pvnbivajz"; }; + passthru.tests = { inherit (nixosTests.prometheus-exporters) collectd; }; + meta = with stdenv.lib; { description = "Relay server for exporting metrics from collectd to Prometheus"; homepage = "https://github.com/prometheus/collectd_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/cups-exporter.nix b/pkgs/servers/monitoring/prometheus/cups-exporter.nix index 9ba73b3d2104..a02dab88a3a6 100644 --- a/pkgs/servers/monitoring/prometheus/cups-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/cups-exporter.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages, nixosTests }: python3Packages.buildPythonApplication rec { pname = "prometheus-cups-exporter-unstable"; @@ -26,6 +26,8 @@ python3Packages.buildPythonApplication rec { --add-flags "$out/share/cups_exporter.py" ''; + passthru.tests = { inherit (nixosTests.prometheus-exporters) cups; }; + meta = with lib; { description = "A simple prometheus exporter for cups implemented in python"; homepage = "https://github.com/ThoreKr/cups_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index 43c63e24dfcb..018324672676 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "dnsmasq_exporter"; @@ -13,10 +13,12 @@ buildGoModule rec { vendorSha256 = "1dqpa180pbdi2gcmp991d4cry560mx5rm5l9x065s9n9gnd38hvl"; + passthru.tests = { inherit (nixosTests.prometheus-exporters) dnsmasq; }; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A dnsmasq exporter for Prometheus"; license = licenses.asl20; maintainers = with maintainers; [ willibutz globin ma27 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix index 479ff174d114..2d5f58a920be 100644 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "dovecot_exporter"; @@ -15,6 +15,8 @@ buildGoPackage rec { goDeps = ./dovecot-exporter-deps.nix; + passthru.tests = { inherit (nixosTests.prometheus-exporters) dovecot; }; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Prometheus metrics exporter for Dovecot"; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 997b8784a1c5..2f062cbfcfe8 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "fritzbox-exporter"; @@ -16,6 +16,8 @@ buildGoPackage rec { goDeps = ./fritzbox-exporter-deps.nix; + passthru.tests = { inherit (nixosTests.prometheus-exporters) fritzbox; }; + meta = with stdenv.lib; { description = "Prometheus Exporter for FRITZ!Box (TR64 and UPnP)"; homepage = "https://github.com/ndecker/fritzbox_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index c020817edc05..afa610809318 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ buildGoPackage, fetchFromGitHub, fetchpatch, lib }: +{ buildGoPackage, fetchFromGitHub, fetchpatch, lib, nixosTests }: buildGoPackage { pname = "prometheus-json-exporter"; @@ -21,6 +21,8 @@ buildGoPackage { sha256 = "0mc5axhd2bykci41dgswl4r1552d70jsmb17lbih7czhsy6rgmrm"; })]; + passthru.tests = { inherit (nixosTests.prometheus-exporters) json; }; + meta = with lib; { description = "A prometheus exporter which scrapes remote JSON by JSONPath"; homepage = "https://github.com/kawamuray/prometheus-json-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix index e1be2a0bddc7..76215dc27e8a 100644 --- a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "keylight-exporter"; @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "0w065ls8dp687jmps4xdffcarss1wyls14dngr43g58xjw6519gb"; + passthru.tests = { inherit (nixosTests.prometheus-exporters) keylight; }; + meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/keylight_exporter"; description = "Prometheus exporter for Elgato Key Light devices."; diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix index 225e7c575436..5728243b050e 100644 --- a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "lndmon-unstable"; @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "083h2ksnqmcr48958r5pag9a28xvljpc3prip6wn70ifp2wpjpin"; + passthru.tests = { inherit (nixosTests.prometheus-exporters) lnd; }; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Prometheus exporter for lnd (Lightning Network Daemon)"; diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index f845a6ef2567..bb8f8526a319 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles, nixosTests }: buildGoPackage { pname = "mailexporter"; @@ -22,6 +22,8 @@ buildGoPackage { installManPage $src/man/mailexporter.conf.5 ''; + passthru.tests = { inherit (nixosTests.prometheus-exporters) mail; }; + meta = with stdenv.lib; { description = "Export Prometheus-style metrics about mail server functionality"; homepage = "https://github.com/cherti/mailexporter"; diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 0c357a768b55..f9c9b3ff3447 100644 --- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "mikrotik-exporter-unstable"; @@ -13,10 +13,12 @@ buildGoModule rec { vendorSha256 = "0i5x4d3ra0s41knmybbg8gnjxgraxkid6y3gfkjwa65xcbp7hr7q"; + passthru.tests = { inherit (nixosTests.prometheus-exporters) mikrotik; }; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Prometheus MikroTik device(s) exporter"; license = licenses.bsd3; maintainers = with maintainers; [ mmilata ]; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix index f3211280f7d7..d628cf32c572 100644 --- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage, nixosTests }: buildGoPackage rec { pname = "prometheus-nextcloud-exporter"; @@ -17,6 +17,8 @@ buildGoPackage rec { doCheck = true; + passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; }; + meta = with lib; { description = "Prometheus exporter for Nextcloud servers."; homepage = "https://github.com/xperimental/nextcloud-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 70f39418198e..e7c144b31d16 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "nginx_exporter"; @@ -19,6 +19,8 @@ buildGoPackage rec { doCheck = true; + passthru.tests = { inherit (nixosTests.prometheus-exporters) nginx; }; + meta = with stdenv.lib; { description = "NGINX Prometheus Exporter for NGINX and NGINX Plus"; homepage = "https://github.com/nginxinc/nginx-prometheus-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 8d5134437d98..38f054aeb2dd 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "node_exporter"; @@ -23,6 +23,8 @@ buildGoPackage rec { -X ${goPackagePath}/vendor/github.com/prometheus/common/version.Revision=${rev} ''; + passthru.tests = { inherit (nixosTests.prometheus-exporters) node; }; + meta = with stdenv.lib; { description = "Prometheus exporter for machine metrics"; homepage = "https://github.com/prometheus/node_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index b5a933432524..506d334a921b 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -1,5 +1,5 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, systemd, makeWrapper -, withSystemdSupport ? true }: +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests +, systemd, withSystemdSupport ? true }: with stdenv.lib; @@ -47,6 +47,8 @@ buildGoPackage rec { --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" ''; + passthru.tests = { inherit (nixosTests.prometheus-exporters) postfix; }; + meta = { inherit (src.meta) homepage; description = "A Prometheus exporter for Postfix"; diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index e8af00b277b4..81ccaee65938 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "postgres_exporter"; @@ -15,6 +15,8 @@ buildGoPackage rec { doCheck = true; + passthru.tests = { inherit (nixosTests.prometheus-exporters) postgres; }; + meta = with lib; { inherit (src.meta) homepage; description = "A Prometheus exporter for PostgreSQL"; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index ea15fecc8ef0..9082fd81c632 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "redis_exporter"; @@ -22,6 +22,8 @@ buildGoPackage rec { -X main.BuildDate=unknown ''; + passthru.tests = { inherit (nixosTests.prometheus-exporters) redis; }; + meta = with stdenv.lib; { description = "Prometheus exporter for Redis metrics"; inherit (src.meta) homepage; diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index a456cda86e5e..d3b35a8a8f1a 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, net-snmp }: +{ stdenv, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }: buildGoPackage rec { pname = "snmp_exporter"; @@ -17,6 +17,8 @@ buildGoPackage rec { doCheck = true; + passthru.tests = { inherit (nixosTests.prometheus-exporters) snmp; }; + meta = with stdenv.lib; { description = "SNMP Exporter for Prometheus"; homepage = "https://github.com/prometheus/snmp_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 8502b76f708a..d6f4bea15313 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "surfboard_exporter"; @@ -13,6 +13,8 @@ buildGoPackage rec { sha256 = "11qms26648nwlwslnaflinxcr5rnp55s908rm1qpnbz0jnxf5ipw"; }; + passthru.tests = { inherit (nixosTests.prometheus-exporters) surfboard; }; + meta = with stdenv.lib; { description = "Arris Surfboard signal metrics exporter"; homepage = "https://github.com/ipstatic/surfboard_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/pkgs/servers/monitoring/prometheus/tor-exporter.nix index 9fa798846878..bc8022f9feb1 100644 --- a/pkgs/servers/monitoring/prometheus/tor-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/tor-exporter.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages, nixosTests }: python3Packages.buildPythonApplication rec { name = "tor-exporter-${version}"; @@ -27,6 +27,8 @@ python3Packages.buildPythonApplication rec { --add-flags "$out/share/prometheus-tor-exporter.py" ''; + passthru.tests = { inherit (nixosTests.prometheus-exporters) tor; }; + meta = with lib; { description = "Prometheus exporter that exposes metrics from a Tor daemon"; homepage = "https://github.com/atx/prometheus-tor_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index 640730e3ca00..0a9dbfbef886 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, varnish }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, varnish, nixosTests }: buildGoModule rec { pname = "prometheus_varnish_exporter"; @@ -22,10 +22,12 @@ buildGoModule rec { doCheck = true; + passthru.tests = { inherit (nixosTests.prometheus-exporters) varnish; }; + meta = { homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter"; description = "Varnish exporter for Prometheus"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ]; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 240dc6263316..8f927f32e2d6 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, lib, Security }: +{ stdenv, rustPlatform, fetchFromGitHub, lib, Security, nixosTests }: rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; @@ -15,6 +15,8 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.isDarwin Security; + passthru.tests = { inherit (nixosTests.prometheus-exporters) wireguard; }; + meta = with lib; { description = "A Prometheus exporter for WireGuard, written in Rust."; homepage = "https://github.com/MindFlavor/prometheus_wireguard_exporter"; From 6211720e3bfa49c33bad4fa5713a8de1e4327eb3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 18 Jun 2020 20:10:07 +1000 Subject: [PATCH 2053/3452] fuse-overlayfs: 1.0.0 -> 1.1.0 https://github.com/containers/fuse-overlayfs/releases/tag/v1.1.0 --- 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 f21f19eb7251..46f6bb404ae9 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.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "0h1ay2l7zyiqplh8whanw68mcfri79lc03wjjrhqji5ddwznv6fa"; + sha256 = "0dv62kyc8hvwb4gkhyxzwagp87nv0mr1612dz6q835is1vqav134"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 71c0dbd5a4963c1fc24dc3a20628cfc3ac95b033 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 18 Jun 2020 19:13:04 +0800 Subject: [PATCH 2054/3452] cargo-insta: init at 0.16.0 --- .../tools/rust/cargo-insta/cargo-lock.patch | 780 ++++++++++++++++++ .../tools/rust/cargo-insta/default.nix | 27 + .../cargo-insta/ignore-rustfmt-test.patch | 10 + pkgs/top-level/all-packages.nix | 1 + 4 files changed, 818 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-insta/cargo-lock.patch create mode 100644 pkgs/development/tools/rust/cargo-insta/default.nix create mode 100644 pkgs/development/tools/rust/cargo-insta/ignore-rustfmt-test.patch diff --git a/pkgs/development/tools/rust/cargo-insta/cargo-lock.patch b/pkgs/development/tools/rust/cargo-insta/cargo-lock.patch new file mode 100644 index 000000000000..96f7d9ffb660 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-insta/cargo-lock.patch @@ -0,0 +1,780 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -0,0 +1,777 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "addr2line" ++version = "0.12.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a49806b9dadc843c61e7c97e72490ad7f7220ae249012fbda9ad0609457c0543" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler32" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.49" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c" ++dependencies = [ ++ "addr2line", ++ "cfg-if", ++ "libc", ++ "miniz_oxide", ++ "object", ++ "rustc-demangle", ++] ++ ++[[package]] ++name = "base64" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" ++dependencies = [ ++ "byteorder", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "block-buffer" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" ++dependencies = [ ++ "block-padding", ++ "byte-tools", ++ "byteorder", ++ "generic-array", ++] ++ ++[[package]] ++name = "block-padding" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" ++dependencies = [ ++ "byte-tools", ++] ++ ++[[package]] ++name = "bstr" ++version = "0.2.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "31accafdb70df7871592c058eca3985b71104e15ac32f64706022c58867da931" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "byte-tools" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" ++ ++[[package]] ++name = "cargo-insta" ++version = "0.16.0" ++dependencies = [ ++ "clap", ++ "console", ++ "difference", ++ "glob", ++ "insta", ++ "proc-macro2", ++ "serde", ++ "serde_json", ++ "structopt", ++ "syn", ++ "walkdir", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "clap" ++version = "2.33.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "clicolors-control" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" ++dependencies = [ ++ "atty", ++ "lazy_static", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "console" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2586208b33573b7f76ccfbe5adb076394c88deaf81b84d7213969805b0a952a7" ++dependencies = [ ++ "clicolors-control", ++ "encode_unicode", ++ "lazy_static", ++ "libc", ++ "regex", ++ "terminal_size", ++ "termios", ++ "unicode-width", ++ "winapi", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" ++dependencies = [ ++ "autocfg", ++ "cfg-if", ++ "lazy_static", ++] ++ ++[[package]] ++name = "difference" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" ++ ++[[package]] ++name = "digest" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "dtoa" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" ++ ++[[package]] ++name = "encode_unicode" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" ++ ++[[package]] ++name = "fake-simd" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" ++ ++[[package]] ++name = "fnv" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" ++ ++[[package]] ++name = "generic-array" ++version = "0.12.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" ++dependencies = [ ++ "typenum", ++] ++ ++[[package]] ++name = "gimli" ++version = "0.21.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" ++ ++[[package]] ++name = "glob" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" ++ ++[[package]] ++name = "globset" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120" ++dependencies = [ ++ "aho-corasick", ++ "bstr", ++ "fnv", ++ "log", ++ "regex", ++] ++ ++[[package]] ++name = "globwalk" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "178270263374052c40502e9f607134947de75302c1348d1a0e31db67c1691446" ++dependencies = [ ++ "bitflags", ++ "ignore", ++ "walkdir", ++] ++ ++[[package]] ++name = "heck" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" ++dependencies = [ ++ "unicode-segmentation", ++] ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "ignore" ++version = "0.4.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "22dcbf2a4a289528dbef21686354904e1c694ac642610a9bff9e7df730d9ec72" ++dependencies = [ ++ "crossbeam-utils", ++ "globset", ++ "lazy_static", ++ "log", ++ "memchr", ++ "regex", ++ "same-file", ++ "thread_local", ++ "walkdir", ++ "winapi-util", ++] ++ ++[[package]] ++name = "insta" ++version = "0.16.0" ++dependencies = [ ++ "backtrace", ++ "console", ++ "difference", ++ "globwalk", ++ "lazy_static", ++ "pest", ++ "pest_derive", ++ "ron", ++ "serde", ++ "serde_json", ++ "serde_yaml", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" ++ ++[[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.71" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" ++ ++[[package]] ++name = "linked-hash-map" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "maplit" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" ++ ++[[package]] ++name = "memchr" ++version = "2.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" ++dependencies = [ ++ "adler32", ++] ++ ++[[package]] ++name = "object" ++version = "0.20.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" ++ ++[[package]] ++name = "opaque-debug" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" ++ ++[[package]] ++name = "pest" ++version = "2.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" ++dependencies = [ ++ "ucd-trie", ++] ++ ++[[package]] ++name = "pest_derive" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" ++dependencies = [ ++ "pest", ++ "pest_generator", ++] ++ ++[[package]] ++name = "pest_generator" ++version = "2.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" ++dependencies = [ ++ "pest", ++ "pest_meta", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pest_meta" ++version = "2.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" ++dependencies = [ ++ "maplit", ++ "pest", ++ "sha-1", ++] ++ ++[[package]] ++name = "proc-macro-error" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678" ++dependencies = [ ++ "proc-macro-error-attr", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro-error-attr" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "syn-mid", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "regex" ++version = "1.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" ++ ++[[package]] ++name = "ron" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5" ++dependencies = [ ++ "base64", ++ "bitflags", ++ "serde", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" ++ ++[[package]] ++name = "ryu" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++ ++[[package]] ++name = "same-file" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "serde" ++version = "1.0.112" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "736aac72d1eafe8e5962d1d1c3d99b0df526015ba40915cb3c49d042e92ec243" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.112" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bf0343ce212ac0d3d6afd9391ac8e9c9efe06b533c8d33f660f6390cc4093f57" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ec2c5d7e739bc07a3e73381a39d61fdb5f671c60c1df26a130690665803d8226" ++dependencies = [ ++ "itoa", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "serde_yaml" ++version = "0.8.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5" ++dependencies = [ ++ "dtoa", ++ "linked-hash-map", ++ "serde", ++ "yaml-rust", ++] ++ ++[[package]] ++name = "sha-1" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" ++dependencies = [ ++ "block-buffer", ++ "digest", ++ "fake-simd", ++ "opaque-debug", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++ ++[[package]] ++name = "structopt" ++version = "0.3.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c" ++dependencies = [ ++ "clap", ++ "lazy_static", ++ "structopt-derive", ++] ++ ++[[package]] ++name = "structopt-derive" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" ++dependencies = [ ++ "heck", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "syn" ++version = "1.0.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "syn-mid" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "terminal_size" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8038f95fc7a6f351163f4b964af631bd26c9e828f7db085f2a84aca56f70d13b" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "termios" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f0fcee7b24a25675de40d5bb4de6e41b0df07bc9856295e7e2b3a3600c400c2" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" ++dependencies = [ ++ "lazy_static", ++] ++ ++[[package]] ++name = "typenum" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" ++ ++[[package]] ++name = "ucd-trie" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" ++ ++[[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.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" ++ ++[[package]] ++name = "version_check" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" ++ ++[[package]] ++name = "walkdir" ++version = "2.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" ++dependencies = [ ++ "same-file", ++ "winapi", ++ "winapi-util", ++] ++ ++[[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", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[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-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++dependencies = [ ++ "winapi", ++] ++ ++[[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 = "yaml-rust" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d" ++dependencies = [ ++ "linked-hash-map", ++] diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix new file mode 100644 index 000000000000..3b21fbf153cb --- /dev/null +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchFromGitHub, runCommand }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-insta"; + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "mitsuhiko"; + repo = "insta"; + rev = version; + sha256 = "1lcbdzh139lhmpz3pyik8nbgrbfc42z9ydz2hkg2lzjdpfdsz3ag"; + }; + + cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "0qjzbcaznnmb0p0r23s82jjbfs5mhhkacg26lf8fq4vvlkr1hsqf"; + + patches = [ ./ignore-rustfmt-test.patch ]; + + cargoBuildFlags = [ "-p cargo-insta" ]; + + meta = with lib; { + description = "A Cargo subcommand for snapshot testing"; + homepage = "https://github.com/mitsuhiko/insta"; + license = licenses.asl20; + maintainers = with lib.maintainers; [ oxalica ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-insta/ignore-rustfmt-test.patch b/pkgs/development/tools/rust/cargo-insta/ignore-rustfmt-test.patch new file mode 100644 index 000000000000..6c38158d5964 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-insta/ignore-rustfmt-test.patch @@ -0,0 +1,10 @@ +--- a/src/runtime.rs ++++ b/src/runtime.rs +@@ -85,6 +85,7 @@ fn format_rust_expression(value: &str) -> Cow<'_, str> { + } + + #[test] ++#[ignore] + fn test_format_rust_expression() { + use crate::assert_snapshot; + assert_snapshot!(format_rust_expression("vec![1,2,3]"), @"vec![1, 2, 3]"); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b75778322fe..46bb13bdf1d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9225,6 +9225,7 @@ in cargo-inspect = callPackage ../development/tools/rust/cargo-inspect { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security; }; From 2e7e277b893e9368772714d50b8fb0c700becd1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 18 Jun 2020 08:17:12 -0300 Subject: [PATCH 2055/3452] matcha-gtk-theme: 2020-05-24 -> 2020-06-18 --- pkgs/data/themes/matcha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index f0617e56d789..5edc2990c025 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2020-05-24"; + version = "2020-06-18"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "186ypnkyaqjw671ny363xmixw6zdvrgj9xvmsrdgr8i0h3z8qwr8"; + sha256 = "1hgwlzyfxl8yw93r0vsnvi51a4k5bn5qw1axhldy5l928qhmd5x7"; }; buildInputs = [ gdk-pixbuf librsvg ]; From 5af8ad3e6d2e0e2e63534d1a95eb44669e64b3a5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Jun 2020 07:49:48 -0400 Subject: [PATCH 2056/3452] linux: 5.4.46 -> 5.4.47 --- 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 1c5bfad41681..a2fbbbe37349 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.46"; + version = "5.4.47"; # 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 = "13hvnfdcbcb9a21zizq8d90mc8maxz03zmzsj6iqsjd2y7r4y1rh"; + sha256 = "0v4d86yci4lq82nb1fgf0g3j0348v6q6m77czpm4b3cs7lwrs2wp"; }; } // (args.argsOverride or {})) From 0d0b50436cbc7fc2b30b4b01e9b3cc457ba30288 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Jun 2020 07:50:05 -0400 Subject: [PATCH 2057/3452] linux: 5.6.18 -> 5.6.19 --- pkgs/os-specific/linux/kernel/linux-5.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix index bf245442ecef..478cdf71bf44 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6.18"; + version = "5.6.19"; # 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 = "0cpiyzr62sv2yz0mla7skalb04pnr4nlkpi1zfcfzyjf1gjz8h8h"; + sha256 = "1s0yc1138sglbm4vyizl4r7hnc1l7nykdjp4063ad67yayr2ylv2"; }; } // (args.argsOverride or {})) From 4f7e011f874e121a7e1a2059b38f9143cca9fce7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Jun 2020 07:50:12 -0400 Subject: [PATCH 2058/3452] linux: 5.7.2 -> 5.7.3 --- 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 c7f1389f1128..0f04abfec8fd 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.2"; + version = "5.7.3"; # 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 = "02brxm78n0kg4mh48acvjsr7mpvaqd279ycyaixaflid1s1awrb0"; + sha256 = "1sgwdcyn9105lfgg25q41yj30sy9cqfdm8m4dmka8gzllxxyq407"; }; } // (args.argsOverride or {})) From 9de1c659e4c8b2fbf9440daedb7d313fedc66193 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Jun 2020 07:52:03 -0400 Subject: [PATCH 2059/3452] oh-my-zsh: 2020-06-17 -> 2020-06-18 --- 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 6896904ec9a4..37374900a4ec 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-17"; + version = "2020-06-18"; pname = "oh-my-zsh"; - rev = "d47447a5e63715ae6ab6c2f46924dc8766c8e746"; + rev = "5ffc0d036c587741fd25092e7809dad2b00b3677"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1hfinbmwwinvqnv3ldcja8gqh9n6ll6749055vk8icdixa9jwcyl"; + sha256 = "04a9zg3l824wywk0qcm0pc4n4522cqljyix7kh3frc4psqnhh8qr"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From d1966f086021fdbd708da37be775e066d298b522 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Jun 2020 07:53:56 -0400 Subject: [PATCH 2060/3452] jenkins: 2.222.4 -> 2.235.1 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 3631b4494a4d..d9d7b490cf14 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.222.4"; + version = "2.235.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0z64w5rv1x9kpjxcb05if9pk0abl9nlbijh2i3nlja97j0dp55bc"; + sha256 = "0pb7dy95ygvyb25hm6akf40f5gr5wa2njad7ncglrpmz14xfnxb3"; }; buildCommand = '' From 94e7fdf439adb286670ce8b89d0b0e02d55d275f Mon Sep 17 00:00:00 2001 From: Thom Leggett Date: Tue, 16 Jun 2020 17:15:59 +0100 Subject: [PATCH 2061/3452] open-vm-tools: fix build https://github.com/vmware/open-vm-tools/pull/438 Fixes #90544 --- .../virtualization/open-vm-tools/default.nix | 10 +++++++--- .../open-vm-tools/find_gdk_pixbuf_xlib.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 84f74ef6dd03..46d91884fcd3 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, - pkgconfig, glib, gtk3, gtkmm3, iproute, dbus, systemd, which, + pkgconfig, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute, dbus, systemd, which, withX ? true }: stdenv.mkDerivation rec { @@ -21,9 +21,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ] - ++ lib.optionals withX [ gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; + ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; + + patches = [ + ./recognize_nixos.patch + ./find_gdk_pixbuf_xlib.patch #See https://github.com/vmware/open-vm-tools/pull/438 + ]; - patches = [ ./recognize_nixos.patch ]; postPatch = '' # Build bugfix for 10.1.0, stolen from Arch PKGBUILD mkdir -p common-agent/etc/config diff --git a/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch b/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch new file mode 100644 index 000000000000..6606c50e77d9 --- /dev/null +++ b/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch @@ -0,0 +1,12 @@ +diff --git a/lib/appUtil/Makefile.am b/lib/appUtil/Makefile.am +index a0d8e391..899cd4e9 100644 +--- a/lib/appUtil/Makefile.am ++++ b/lib/appUtil/Makefile.am +@@ -21,4 +21,6 @@ libAppUtil_la_SOURCES = + libAppUtil_la_SOURCES += appUtil.c + libAppUtil_la_SOURCES += appUtilX11.c + +-AM_CFLAGS = @GTK_CPPFLAGS@ ++AM_CFLAGS = ++AM_CFLAGS += @GTK_CPPFLAGS@ ++AM_CFLAGS += @GDK_PIXBUF_XLIB2_CPPFLAGS@ From 030fd3ca0cbb8463e5dc1ebd57bb1867f5fbe91c Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 18 Jun 2020 20:49:20 +0800 Subject: [PATCH 2062/3452] cargo-insta: strip unused variable --- pkgs/development/tools/rust/cargo-insta/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index 3b21fbf153cb..e621fa9b9724 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, runCommand }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-insta"; From d5fd2edb1fbd8daec107c4d820b54cdee8777c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 18 Jun 2020 15:42:20 +0200 Subject: [PATCH 2063/3452] libjpeg(-turbo): patch CVE-2020-13790 Fixes #90864 (roundup issue). Release is said to be expected soon, but we can patch now anyway. --- pkgs/development/libraries/libjpeg-turbo/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 72d8b9677499..9bd909d3f6e8 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/a2291b252de1413a13db61b21863ae7aea0946f3.patch"; sha256 = "0nc5vcch5h52gpi07h08zf8br58q8x81q2hv871hrn0dinb53vym"; }) + + (fetchpatch { + name = "cve-2020-13790.patch"; + url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3de15e0c344d.diff"; + sha256 = "0hm5i6qir5w3zxb0xvqdh4jyvbfg7xnd28arhyfsaclfz9wdb0pb"; + }) ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") ./mingw-boolean.patch; From 46db244d2d3e2da47672fdd1239e1ba1f3c4523d Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Thu, 18 Jun 2020 07:10:54 -0700 Subject: [PATCH 2064/3452] go-swagger: init at 0.24.0 (#90682) * go-swagger: init at 0.24.0 * Apply suggestions from code review Co-authored-by: Jon Co-authored-by: Jon --- pkgs/development/tools/go-swagger/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/go-swagger/default.nix diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix new file mode 100644 index 000000000000..e2a0402348a1 --- /dev/null +++ b/pkgs/development/tools/go-swagger/default.nix @@ -0,0 +1,24 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "go-swagger"; + version = "0.24.0"; + + src = fetchFromGitHub { + owner = "go-swagger"; + repo = pname; + rev = "v${version}"; + sha256 = "051av25vnrcpvj9w6mqalwk7byw52m2dlh1m56y30xvm0ybbnayn"; + }; + + vendorSha256 = "020z4izc8i4yhbbr8h2fn8bqbis9q9yfcrjnixd6rsiayw1brh4p"; + + subPackages = [ "cmd/swagger" ]; + + meta = with lib; { + description = "Golang implementation of Swagger 2.0, representation of your RESTful API"; + homepage = "https://github.com/go-swagger/go-swagger"; + license = licenses.asl20; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abf0f03575b2..6ed191d2abb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26294,6 +26294,8 @@ in sqsh = callPackage ../development/tools/sqsh { }; + go-swagger = callPackage ../development/tools/go-swagger { }; + jx = callPackage ../applications/networking/cluster/jx {}; prow = callPackage ../applications/networking/cluster/prow { }; From 33d79f110d999596bd08726d812e752edcdbf8dc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 18 Jun 2020 12:45:19 +0200 Subject: [PATCH 2065/3452] nixos/openldap: fix eval Fixes error: The option value `meta.maintainers' in `nixos/modules/services/databases/openldap.nix' is not of type `list of maintainers'. --- nixos/modules/services/databases/openldap.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 8c2851c37ac2..9b4d9a98b745 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -232,7 +232,7 @@ in }; meta = { - maintainers = lib.maintainers.mic92; + maintainers = [ lib.maintainers.mic92 ]; }; From 51dad859473009630a053b4b0d0d5d76f280af7d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 18 Jun 2020 16:17:56 +0200 Subject: [PATCH 2066/3452] nixos/hamster: fix eval Fixes error: The option value `meta.maintainers' in `nixos/modules/programs/hamster.nix' is not of type `list of maintainers'. --- nixos/modules/programs/hamster.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/hamster.nix b/nixos/modules/programs/hamster.nix index ddf26a22fb53..b2f4a82b260e 100644 --- a/nixos/modules/programs/hamster.nix +++ b/nixos/modules/programs/hamster.nix @@ -3,7 +3,7 @@ with lib; { - meta.maintainers = maintainers.fabianhauser; + meta.maintainers = pkgs.hamster.meta.maintainers; options.programs.hamster.enable = mkEnableOption "Whether to enable hamster time tracking."; From 9538bf50aebdfb235932568f2e7b385e4571fef2 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 18 Jun 2020 16:32:43 +0200 Subject: [PATCH 2067/3452] nixos/buildbot-master: support reporters, migrate away from status Since Buildbot 0.9.0, status targets were deprecated and ignored. There's a very small line on startup explaining that, and status simply isn't reported. Avoid others the same headaches, and do it right in the NixOS module. As there might have been changes in the way reporters are organized, and configuration might need to be migrated remove the old option, and not just provide an alias. --- .../continuous-integration/buildbot/master.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 0185f490b0c2..e1950b91382b 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -25,7 +25,7 @@ let change_source = [ ${concatStringsSep "," cfg.changeSource} ], schedulers = [ ${concatStringsSep "," cfg.schedulers} ], builders = [ ${concatStringsSep "," cfg.builders} ], - status = [ ${concatStringsSep "," cfg.status} ], + services = [ ${concatStringsSep "," cfg.reporters} ], ) for step in [ ${concatStringsSep "," cfg.factorySteps} ]: factory.addStep(step) @@ -119,10 +119,10 @@ in { default = [ "worker.Worker('example-worker', 'pass')" ]; }; - status = mkOption { + reporters = mkOption { default = []; type = types.listOf types.str; - description = "List of status notification endpoints."; + description = "List of reporter objects used to present build status to various users."; }; user = mkOption { @@ -276,6 +276,10 @@ in { imports = [ (mkRenamedOptionModule [ "services" "buildbot-master" "bpPort" ] [ "services" "buildbot-master" "pbPort" ]) + (mkRemovedOptionModule [ "services" "buildbot-master" "status" ] '' + Since Buildbot 0.9.0, status targets are deprecated and ignored. + Review your configuration and migrate to reporters (available at services.buildbot-master.reporters). + '') ]; meta.maintainers = with lib.maintainers; [ nand0p mic92 ]; From f5a57c6c40d69f600fcb4e46d2adaa0affc56f9d Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 21 Apr 2020 13:56:52 +0200 Subject: [PATCH 2068/3452] mailman-web: remove django version checks and override This is nonsense! Postorius and Hyperkitty don't even support 1.11 anymore. --- pkgs/servers/mail/mailman/web.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index f770f2e4489d..53fdf851cfe8 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -1,6 +1,5 @@ { buildPythonPackage, lib, fetchgit, isPy3k , git, makeWrapper, sassc, hyperkitty, postorius, whoosh -, django }: buildPythonPackage rec { @@ -17,8 +16,13 @@ buildPythonPackage rec { # This is just so people installing from pip also get uwsgi # installed, AFAICT. + + # Django is depended on transitively by hyperkitty and postorius, + # and mailman_web has overly restrictive version bounds on it, so + # let's remove it. postPatch = '' sed -i '/^ uwsgi$/d' setup.cfg + sed -i '/^ Django/d' setup.cfg ''; nativeBuildInputs = [ git makeWrapper ]; @@ -36,7 +40,5 @@ buildPythonPackage rec { description = "Django project for Mailman 3 web interface"; license = licenses.gpl3; maintainers = with maintainers; [ peti qyliss ]; - # mailman-web requires django < 2.2 - broken = versionOlder "2.2" django.version; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a0bb8018efe..42cc71cda63e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15830,11 +15830,7 @@ in mailman-rss = callPackage ../development/python-modules/mailman-rss { }; - mailman-web = with (python3.override { - packageOverrides = self: super: { - django = self.django_1_11; - }; - }).pkgs; toPythonApplication mailman-web; + mailman-web = with python3.pkgs; toPythonApplication mailman-web; mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; From b478e0043c53964c99cc9a145c155a673af3c7d8 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 15 Apr 2020 14:02:59 +0200 Subject: [PATCH 2069/3452] nixos/mailman: refactor - Add serve.enable option, which configures uwsgi and nginx to serve the mailman-web application; - Configure services to log to the journal, where possible. Mailman Core does not provide any options for this, but will now log to /var/log/mailman; - Use a unified python environment for all components, with an extraPackages option to allow use of postgres support and similar; - Configure mailman's postfix module such that it can generate the domain and lmtp maps; - Fix formatting for option examples; - Provide a mailman-web user to run the uwsgi service by default - Refactor Hyperkitty's periodic jobs to reduce repetition in the expressions; - Remove service dependencies not related to functionality included in the module, such as httpd -- these should be configured in user config when used; - Move static files root to /var/lib/mailman-web-static by default. This avoids permission issues when a static file web server attempts to access /var/lib/mailman which is private to mailman. The location can still be changed by setting services.mailman.webSettings.STATIC_ROOT; - Remove the webRoot option, which seems to have been included by accident, being an unsuitable directory for serving via HTTP. - Rename mailman-web.service to mailman-web-setup.service, since it doesn't actually serve mailman-web. There is now a mailman-uwsgi.service if serve.enable is set to true. --- nixos/modules/services/mail/mailman.nix | 389 +++++++++++++----------- 1 file changed, 206 insertions(+), 183 deletions(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index f5e78b182933..4167b2ca85f1 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -6,6 +6,11 @@ let cfg = config.services.mailman; + pythonEnv = pkgs.python3.withPackages (ps: + [ps.mailman ps.mailman-web] + ++ lib.optional cfg.hyperkitty.enable ps.mailman-hyperkitty + ++ cfg.extraPythonPackages); + # This deliberately doesn't use recursiveUpdate so users can # override the defaults. settings = { @@ -13,12 +18,28 @@ let SERVER_EMAIL = cfg.siteOwner; ALLOWED_HOSTS = [ "localhost" "127.0.0.1" ] ++ cfg.webHosts; COMPRESS_OFFLINE = true; - STATIC_ROOT = "/var/lib/mailman-web/static"; + STATIC_ROOT = "/var/lib/mailman-web-static"; MEDIA_ROOT = "/var/lib/mailman-web/media"; + LOGGING = { + version = 1; + disable_existing_loggers = true; + handlers.console.class = "logging.StreamHandler"; + loggers.django = { + handlers = [ "console" ]; + level = "INFO"; + }; + }; } // cfg.webSettings; settingsJSON = pkgs.writeText "settings.json" (builtins.toJSON settings); + # TODO: Should this be RFC42-ised so that users can set additional options without modifying the module? + mtaConfig = pkgs.writeText "mailman-postfix.cfg" '' + [postfix] + postmap_command: ${pkgs.postfix}/bin/postmap + transport_file_type: hash + ''; + mailmanCfg = '' [mailman] site_owner: ${cfg.siteOwner} @@ -29,11 +50,14 @@ let var_dir: /var/lib/mailman queue_dir: $var_dir/queue template_dir: $var_dir/templates - log_dir: $var_dir/log + log_dir: /var/log/mailman lock_dir: $var_dir/lock etc_dir: /etc ext_dir: $etc_dir/mailman.d pid_file: /run/mailman/master.pid + + [mta] + configuration: ${mtaConfig} '' + optionalString cfg.hyperkitty.enable '' [archiver.hyperkitty] @@ -84,7 +108,7 @@ in { type = types.package; default = pkgs.mailman; defaultText = "pkgs.mailman"; - example = "pkgs.mailman.override { archivers = []; }"; + example = literalExample "pkgs.mailman.override { archivers = []; }"; description = "Mailman package to use"; }; @@ -98,18 +122,6 @@ in { ''; }; - webRoot = mkOption { - type = types.path; - default = "${pkgs.mailman-web}/${pkgs.python3.sitePackages}"; - defaultText = "\${pkgs.mailman-web}/\${pkgs.python3.sitePackages}"; - description = '' - The web root for the Hyperkity + Postorius apps provided by Mailman. - This variable can be set, of course, but it mainly exists so that site - admins can refer to it in their own hand-written web server - configuration files. - ''; - }; - webHosts = mkOption { type = types.listOf types.str; default = []; @@ -124,7 +136,7 @@ in { webUser = mkOption { type = types.str; - default = config.services.httpd.user; + default = "mailman-web"; description = '' User to run mailman-web as ''; @@ -138,6 +150,16 @@ in { ''; }; + serve = { + enable = mkEnableOption "Automatic nginx and uwsgi setup for mailman-web"; + }; + + extraPythonPackages = mkOption { + description = "Packages to add to the python environment used by mailman and mailman-web"; + type = types.listOf types.package; + default = []; + }; + hyperkitty = { enable = mkEnableOption "the Hyperkitty archiver for Mailman"; @@ -183,7 +205,17 @@ in { (requirePostfixHash [ "config" "local_recipient_maps" ] "postfix_lmtp") ]; - users.users.mailman = { description = "GNU Mailman"; isSystemUser = true; }; + users.users.mailman = { + description = "GNU Mailman"; + isSystemUser = true; + group = "mailman"; + }; + users.users.mailman-web = lib.mkIf (cfg.webUser == "mailman-web") { + description = "GNU Mailman web interface"; + isSystemUser = true; + group = "mailman"; + }; + users.groups.mailman = {}; environment.etc."mailman.cfg".text = mailmanCfg; @@ -205,7 +237,28 @@ in { globals().update(json.load(f)) ''; - environment.systemPackages = [ cfg.package ] ++ (with pkgs; [ mailman-web ]); + services.nginx = mkIf cfg.serve.enable { + enable = mkDefault true; + virtualHosts."${lib.head cfg.webHosts}" = { + serverAliases = cfg.webHosts; + locations = { + "/".extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;"; + "/static/".alias = settings.STATIC_ROOT + "/"; + }; + }; + }; + + environment.systemPackages = [ (pkgs.buildEnv { + name = "mailman-tools"; + # We don't want to pollute the system PATH with a python + # interpreter etc. so let's pick only the stuff we actually + # want from pythonEnv + pathsToLink = ["/bin"]; + paths = [pythonEnv]; + postBuild = '' + find $out/bin/ -mindepth 1 -not -name "mailman*" -delete + ''; + }) ]; services.postfix = { recipientDelimiter = "+"; # bake recipient addresses in mail envelopes via VERP @@ -214,181 +267,151 @@ in { }; }; - systemd.services.mailman = { - description = "GNU Mailman Master Process"; - after = [ "network.target" ]; - restartTriggers = [ config.environment.etc."mailman.cfg".source ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${cfg.package}/bin/mailman start"; - ExecStop = "${cfg.package}/bin/mailman stop"; - User = "mailman"; - Type = "forking"; - RuntimeDirectory = "mailman"; - PIDFile = "/run/mailman/master.pid"; - }; + systemd.sockets.mailman-uwsgi = lib.mkIf cfg.serve.enable { + wantedBy = ["sockets.target"]; + before = ["nginx.service"]; + socketConfig.ListenStream = "/run/mailman-web.socket"; }; - - systemd.services.mailman-settings = { - description = "Generate settings files (including secrets) for Mailman"; - before = [ "mailman.service" "mailman-web.service" "hyperkitty.service" "httpd.service" "uwsgi.service" ]; - requiredBy = [ "mailman.service" "mailman-web.service" "hyperkitty.service" "httpd.service" "uwsgi.service" ]; - path = with pkgs; [ jq ]; - script = '' - mailmanDir=/var/lib/mailman - mailmanWebDir=/var/lib/mailman-web - - mailmanCfg=$mailmanDir/mailman-hyperkitty.cfg - mailmanWebCfg=$mailmanWebDir/settings_local.json - - install -m 0700 -o mailman -g nogroup -d $mailmanDir - install -m 0700 -o ${cfg.webUser} -g nogroup -d $mailmanWebDir - - if [ ! -e $mailmanWebCfg ]; then - hyperkittyApiKey=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64) - secretKey=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64) - - mailmanWebCfgTmp=$(mktemp) - jq -n '.MAILMAN_ARCHIVER_KEY=$archiver_key | .SECRET_KEY=$secret_key' \ - --arg archiver_key "$hyperkittyApiKey" \ - --arg secret_key "$secretKey" \ - >"$mailmanWebCfgTmp" - chown ${cfg.webUser} "$mailmanWebCfgTmp" - mv -n "$mailmanWebCfgTmp" $mailmanWebCfg - fi - - hyperkittyApiKey="$(jq -r .MAILMAN_ARCHIVER_KEY $mailmanWebCfg)" - mailmanCfgTmp=$(mktemp) - sed "s/@API_KEY@/$hyperkittyApiKey/g" ${mailmanHyperkittyCfg} >"$mailmanCfgTmp" - chown mailman "$mailmanCfgTmp" - mv "$mailmanCfgTmp" $mailmanCfg - ''; - serviceConfig = { - Type = "oneshot"; - # RemainAfterExit makes restartIfChanged work for this service, so - # downstream services will get updated automatically when things like - # services.mailman.hyperkitty.baseUrl change. Otherwise users have to - # restart things manually, which is confusing. - RemainAfterExit = "yes"; + systemd.services = { + mailman = { + description = "GNU Mailman Master Process"; + after = [ "network.target" ]; + restartTriggers = [ config.environment.etc."mailman.cfg".source ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pythonEnv}/bin/mailman start"; + ExecStop = "${pythonEnv}/bin/mailman stop"; + User = "mailman"; + Group = "mailman"; + Type = "forking"; + RuntimeDirectory = "mailman"; + LogsDirectory = "mailman"; + PIDFile = "/run/mailman/master.pid"; + }; }; - }; - systemd.services.mailman-web = { - description = "Init Postorius DB"; - before = [ "httpd.service" "uwsgi.service" ]; - requiredBy = [ "httpd.service" "uwsgi.service" ]; - restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; - script = '' - ${pkgs.mailman-web}/bin/mailman-web migrate - rm -rf static - ${pkgs.mailman-web}/bin/mailman-web collectstatic - ${pkgs.mailman-web}/bin/mailman-web compress - ''; - serviceConfig = { - User = cfg.webUser; - Type = "oneshot"; - # Similar to mailman-settings.service, this makes restartTriggers work - # properly for this service. - RemainAfterExit = "yes"; - WorkingDirectory = "/var/lib/mailman-web"; + mailman-settings = { + description = "Generate settings files (including secrets) for Mailman"; + before = [ "mailman.service" "mailman-web-setup.service" "mailman-uwsgi.service" "hyperkitty.service" ]; + requiredBy = [ "mailman.service" "mailman-web-setup.service" "mailman-uwsgi.service" "hyperkitty.service" ]; + path = with pkgs; [ jq ]; + script = '' + mailmanDir=/var/lib/mailman + mailmanWebDir=/var/lib/mailman-web + + mailmanCfg=$mailmanDir/mailman-hyperkitty.cfg + mailmanWebCfg=$mailmanWebDir/settings_local.json + + install -m 0775 -o mailman -g mailman -d /var/lib/mailman-web-static + install -m 0770 -o mailman -g mailman -d $mailmanDir + install -m 0770 -o ${cfg.webUser} -g mailman -d $mailmanWebDir + + if [ ! -e $mailmanWebCfg ]; then + hyperkittyApiKey=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64) + secretKey=$(tr -dc A-Za-z0-9 < /dev/urandom | head -c 64) + + mailmanWebCfgTmp=$(mktemp) + jq -n '.MAILMAN_ARCHIVER_KEY=$archiver_key | .SECRET_KEY=$secret_key' \ + --arg archiver_key "$hyperkittyApiKey" \ + --arg secret_key "$secretKey" \ + >"$mailmanWebCfgTmp" + chown root:mailman "$mailmanWebCfgTmp" + chmod 440 "$mailmanWebCfgTmp" + mv -n "$mailmanWebCfgTmp" "$mailmanWebCfg" + fi + + hyperkittyApiKey="$(jq -r .MAILMAN_ARCHIVER_KEY "$mailmanWebCfg")" + mailmanCfgTmp=$(mktemp) + sed "s/@API_KEY@/$hyperkittyApiKey/g" ${mailmanHyperkittyCfg} >"$mailmanCfgTmp" + chown mailman:mailman "$mailmanCfgTmp" + mv "$mailmanCfgTmp" "$mailmanCfg" + ''; }; - }; - systemd.services.mailman-daily = { - description = "Trigger daily Mailman events"; - startAt = "daily"; - restartTriggers = [ config.environment.etc."mailman.cfg".source ]; - serviceConfig = { - ExecStart = "${cfg.package}/bin/mailman digests --send"; - User = "mailman"; + mailman-web-setup = { + description = "Prepare mailman-web files and database"; + before = [ "uwsgi.service" "mailman-uwsgi.service" ]; + requiredBy = [ "mailman-uwsgi.service" ]; + restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; + script = '' + find "${settings.STATIC_ROOT}/" -mindepth 1 -delete + ${pythonEnv}/bin/mailman-web migrate + ${pythonEnv}/bin/mailman-web collectstatic + ${pythonEnv}/bin/mailman-web compress + ''; + serviceConfig = { + User = cfg.webUser; + Group = "mailman"; + Type = "oneshot"; + WorkingDirectory = "/var/lib/mailman-web"; + }; }; - }; - systemd.services.hyperkitty = { - inherit (cfg.hyperkitty) enable; - description = "GNU Hyperkitty QCluster Process"; - after = [ "network.target" ]; - restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; - wantedBy = [ "mailman.service" "multi-user.target" ]; - serviceConfig = { - ExecStart = "${pkgs.mailman-web}/bin/mailman-web qcluster"; - User = cfg.webUser; - WorkingDirectory = "/var/lib/mailman-web"; + mailman-uwsgi = mkIf cfg.serve.enable (let + uwsgiConfig.uwsgi = { + type = "normal"; + plugins = ["python3"]; + home = pythonEnv; + module = "mailman_web.wsgi"; + }; + uwsgiConfigFile = pkgs.writeText "uwsgi-mailman.json" (builtins.toJSON uwsgiConfig); + in { + wantedBy = ["multi-user.target"]; + requires = ["mailman-uwsgi.socket" "mailman-web-setup.service"]; + restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; + serviceConfig = { + # Since the mailman-web settings.py obstinately creates a logs + # dir in the cwd, change to the (writable) runtime directory before + # starting uwsgi. + ExecStart = "${pkgs.coreutils}/bin/env -C $RUNTIME_DIRECTORY ${pkgs.uwsgi.override { plugins = ["python3"]; }}/bin/uwsgi --json ${uwsgiConfigFile}"; + User = cfg.webUser; + Group = "mailman"; + RuntimeDirectory = "mailman-uwsgi"; + }; + }); + + mailman-daily = { + description = "Trigger daily Mailman events"; + startAt = "daily"; + restartTriggers = [ config.environment.etc."mailman.cfg".source ]; + serviceConfig = { + ExecStart = "${pythonEnv}/bin/mailman digests --send"; + User = "mailman"; + Group = "mailman"; + }; }; - }; - systemd.services.hyperkitty-minutely = { - inherit (cfg.hyperkitty) enable; - description = "Trigger minutely Hyperkitty events"; - startAt = "minutely"; - restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; - serviceConfig = { - ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs minutely"; - User = cfg.webUser; - WorkingDirectory = "/var/lib/mailman-web"; + hyperkitty = lib.mkIf cfg.hyperkitty.enable { + description = "GNU Hyperkitty QCluster Process"; + after = [ "network.target" ]; + restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; + wantedBy = [ "mailman.service" "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pythonEnv}/bin/mailman-web qcluster"; + User = cfg.webUser; + Group = "mailman"; + WorkingDirectory = "/var/lib/mailman-web"; + }; }; - }; - - systemd.services.hyperkitty-quarter-hourly = { - inherit (cfg.hyperkitty) enable; - description = "Trigger quarter-hourly Hyperkitty events"; - startAt = "*:00/15"; - restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; - serviceConfig = { - ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs quarter_hourly"; - User = cfg.webUser; - WorkingDirectory = "/var/lib/mailman-web"; - }; - }; - - systemd.services.hyperkitty-hourly = { - inherit (cfg.hyperkitty) enable; - description = "Trigger hourly Hyperkitty events"; - startAt = "hourly"; - restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; - serviceConfig = { - ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs hourly"; - User = cfg.webUser; - WorkingDirectory = "/var/lib/mailman-web"; - }; - }; - - systemd.services.hyperkitty-daily = { - inherit (cfg.hyperkitty) enable; - description = "Trigger daily Hyperkitty events"; - startAt = "daily"; - restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; - serviceConfig = { - ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs daily"; - User = cfg.webUser; - WorkingDirectory = "/var/lib/mailman-web"; - }; - }; - - systemd.services.hyperkitty-weekly = { - inherit (cfg.hyperkitty) enable; - description = "Trigger weekly Hyperkitty events"; - startAt = "weekly"; - restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; - serviceConfig = { - ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs weekly"; - User = cfg.webUser; - WorkingDirectory = "/var/lib/mailman-web"; - }; - }; - - systemd.services.hyperkitty-yearly = { - inherit (cfg.hyperkitty) enable; - description = "Trigger yearly Hyperkitty events"; - startAt = "yearly"; - restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; - serviceConfig = { - ExecStart = "${pkgs.mailman-web}/bin/mailman-web runjobs yearly"; - User = cfg.webUser; - WorkingDirectory = "/var/lib/mailman-web"; - }; - }; - + } // flip lib.mapAttrs' { + "minutely" = "minutely"; + "quarter_hourly" = "*:00/15"; + "hourly" = "hourly"; + "daily" = "daily"; + "weekly" = "weekly"; + "yearly" = "yearly"; + } (name: startAt: + lib.nameValuePair "hyperkitty-${name}" (lib.mkIf cfg.hyperkitty.enable { + description = "Trigger ${name} Hyperkitty events"; + inherit startAt; + restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; + serviceConfig = { + ExecStart = "${pythonEnv}/bin/mailman-web runjobs minutely"; + User = cfg.webUser; + Group = "mailman"; + WorkingDirectory = "/var/lib/mailman-web"; + }; + })); }; } From 32c556b039c6d262cd2ccedcb4fb92c2c08e89dc Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 27 Apr 2020 18:03:44 +0200 Subject: [PATCH 2070/3452] nixos/mailman: document, add maintainers --- nixos/modules/services/mail/mailman.nix | 5 +++ nixos/modules/services/mail/mailman.xml | 59 +++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 nixos/modules/services/mail/mailman.xml diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 4167b2ca85f1..69ae4263b61c 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -414,4 +414,9 @@ in { })); }; + meta = { + maintainers = with lib.maintainers; [ lheckemann ]; + doc = ./mailman.xml; + }; + } diff --git a/nixos/modules/services/mail/mailman.xml b/nixos/modules/services/mail/mailman.xml new file mode 100644 index 000000000000..cbe50ed0b917 --- /dev/null +++ b/nixos/modules/services/mail/mailman.xml @@ -0,0 +1,59 @@ + + Mailman + + Mailman is free + software for managing electronic mail discussion and e-newsletter + lists. Mailman and its web interface can be configured using the + corresponding NixOS module. Note that this service is best used with + an existing, securely configured Postfix setup, as it does not automatically configure this. + + +
+ Basic usage + + For a basic configuration, the following settings are suggested: + { config, ... }: { + services.postfix = { + enable = true; + relayDomains = ["hash:/var/lib/mailman/data/postfix_domains"]; + sslCert = config.security.acme.certs."lists.example.org".directory + "/full.pem"; + sslKey = config.security.acme.certs."lists.example.org".directory + "/key.pem"; + config = { + transport_maps = ["hash:/var/lib/mailman/data/postfix_lmtp"]; + local_recipient_maps = ["hash:/var/lib/mailman/data/postfix_lmtp"]; + }; + }; + services.mailman = { + enable = true; + serve.enable = true; + hyperkitty.enable = true; + webHosts = ["lists.example.org"]; + siteOwner = "mailman@example.org"; + }; + services.nginx.virtualHosts."lists.example.org".enableACME = true; + networking.firewall.allowedTCPPorts = [ 25 80 443 ]; +} + + + DNS records will also be required: + + AAAA and A records pointing to the host in question, in order for browsers to be able to discover the address of the web server; + An MX record pointing to a domain name at which the host is reachable, in order for other mail servers to be able to deliver emails to the mailing lists it hosts. + + + + After this has been done and appropriate DNS records have been + set up, the Postorius mailing list manager and the Hyperkitty + archive browser will be available at + https://lists.example.org/. Note that this setup is not + sufficient to deliver emails to most email providers nor to + avoid spam -- a number of additional measures for authenticating + incoming and outgoing mails, such as SPF, DMARC and DKIM are + necessary, but outside the scope of the Mailman module. + +
+ From 1b8af3e1ae75df048fbdfb3acf6842f13de3e38f Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 30 Apr 2020 08:18:52 +0200 Subject: [PATCH 2071/3452] nixos/mailman: fix clearing static files --- nixos/modules/services/mail/mailman.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 69ae4263b61c..7f9a7cc072ee 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -334,7 +334,7 @@ in { requiredBy = [ "mailman-uwsgi.service" ]; restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; script = '' - find "${settings.STATIC_ROOT}/" -mindepth 1 -delete + [[ -e "${settings.STATIC_ROOT}" ]] && find "${settings.STATIC_ROOT}/" -mindepth 1 -delete ${pythonEnv}/bin/mailman-web migrate ${pythonEnv}/bin/mailman-web collectstatic ${pythonEnv}/bin/mailman-web compress From 3dbbc786f51eb3f74fc75b1d179b3c447e315ecc Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 22 May 2020 16:52:10 +0200 Subject: [PATCH 2072/3452] nixos/mailman: RFC42-ise --- nixos/modules/services/mail/mailman.nix | 67 ++++++++++++++----------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 7f9a7cc072ee..a604f32b3371 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -13,7 +13,7 @@ let # This deliberately doesn't use recursiveUpdate so users can # override the defaults. - settings = { + webSettings = { DEFAULT_FROM_EMAIL = cfg.siteOwner; SERVER_EMAIL = cfg.siteOwner; ALLOWED_HOSTS = [ "localhost" "127.0.0.1" ] ++ cfg.webHosts; @@ -31,7 +31,7 @@ let }; } // cfg.webSettings; - settingsJSON = pkgs.writeText "settings.json" (builtins.toJSON settings); + webSettingsJSON = pkgs.writeText "settings.json" (builtins.toJSON webSettings); # TODO: Should this be RFC42-ised so that users can set additional options without modifying the module? mtaConfig = pkgs.writeText "mailman-postfix.cfg" '' @@ -40,31 +40,7 @@ let transport_file_type: hash ''; - mailmanCfg = '' - [mailman] - site_owner: ${cfg.siteOwner} - layout: fhs - - [paths.fhs] - bin_dir: ${pkgs.python3Packages.mailman}/bin - var_dir: /var/lib/mailman - queue_dir: $var_dir/queue - template_dir: $var_dir/templates - log_dir: /var/log/mailman - lock_dir: $var_dir/lock - etc_dir: /etc - ext_dir: $etc_dir/mailman.d - pid_file: /run/mailman/master.pid - - [mta] - configuration: ${mtaConfig} - '' + optionalString cfg.hyperkitty.enable '' - - [archiver.hyperkitty] - class: mailman_hyperkitty.Archiver - enable: yes - configuration: /var/lib/mailman/mailman-hyperkitty.cfg - ''; + mailmanCfg = lib.generators.toINI {} cfg.settings; mailmanHyperkittyCfg = pkgs.writeText "mailman-hyperkitty.cfg" '' [general] @@ -160,6 +136,12 @@ in { default = []; }; + settings = mkOption { + description = "Settings for mailman.cfg"; + type = types.attrsOf (types.attrsOf types.str); + default = {}; + }; + hyperkitty = { enable = mkEnableOption "the Hyperkitty archiver for Mailman"; @@ -180,6 +162,31 @@ in { config = mkIf cfg.enable { + services.mailman.settings = { + mailman.site_owner = lib.mkDefault cfg.siteOwner; + mailman.layout = "fhs"; + + "paths.fhs" = { + bin_dir = "${pkgs.python3Packages.mailman}/bin"; + var_dir = "/var/lib/mailman"; + queue_dir = "$var_dir/queue"; + template_dir = "$var_dir/templates"; + log_dir = "/var/log/mailman"; + lock_dir = "$var_dir/lock"; + etc_dir = "/etc"; + ext_dir = "$etc_dir/mailman.d"; + pid_file = "/run/mailman/master.pid"; + }; + + mta.configuration = lib.mkDefault "${mtaConfig}"; + + "archiver.hyperkitty" = lib.mkIf cfg.hyperkitty.enable { + class = "mailman_hyperkitty.Archiver"; + enable = "yes"; + configuration = "/var/lib/mailman/mailman-hyperkitty.cfg"; + }; + }; + assertions = let inherit (config.services) postfix; @@ -230,7 +237,7 @@ in { import json - with open('${settingsJSON}') as f: + with open('${webSettingsJSON}') as f: globals().update(json.load(f)) with open('/var/lib/mailman-web/settings_local.json') as f: @@ -243,7 +250,7 @@ in { serverAliases = cfg.webHosts; locations = { "/".extraConfig = "uwsgi_pass unix:/run/mailman-web.socket;"; - "/static/".alias = settings.STATIC_ROOT + "/"; + "/static/".alias = webSettings.STATIC_ROOT + "/"; }; }; }; @@ -334,7 +341,7 @@ in { requiredBy = [ "mailman-uwsgi.service" ]; restartTriggers = [ config.environment.etc."mailman3/settings.py".source ]; script = '' - [[ -e "${settings.STATIC_ROOT}" ]] && find "${settings.STATIC_ROOT}/" -mindepth 1 -delete + [[ -e "${webSettings.STATIC_ROOT}" ]] && find "${webSettings.STATIC_ROOT}/" -mindepth 1 -delete ${pythonEnv}/bin/mailman-web migrate ${pythonEnv}/bin/mailman-web collectstatic ${pythonEnv}/bin/mailman-web compress From 176bc68a699ad62156c6d727babe07fe0fe1294d Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 22 May 2020 14:12:43 +0200 Subject: [PATCH 2073/3452] mailman: log to journal --- nixos/modules/services/mail/mailman.nix | 6 +++++- pkgs/servers/mail/mailman/default.nix | 16 ++++++++++++++-- pkgs/servers/mail/mailman/log-stderr.patch | 13 +++++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 pkgs/servers/mail/mailman/log-stderr.patch diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index a604f32b3371..3744214ca49f 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -185,7 +185,11 @@ in { enable = "yes"; configuration = "/var/lib/mailman/mailman-hyperkitty.cfg"; }; - }; + } // (let + loggerNames = ["root" "archiver" "bounce" "config" "database" "debug" "error" "fromusenet" "http" "locks" "mischief" "plugins" "runner" "smtp"]; + loggerSectionNames = map (n: "logging.${n}") loggerNames; + in lib.genAttrs loggerSectionNames(name: { handler = "stderr"; }) + ); assertions = let inherit (config.services) postfix; diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 37b4d29eeb16..879fd19adb0a 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, alembic, aiosmtpd, dnspython +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib , requests, zope_configuration, click, falcon, importlib-resources , zope_component, lynx, postfix, authheaders, gunicorn @@ -20,7 +20,19 @@ buildPythonPackage rec { zope_component authheaders gunicorn ]; - patchPhase = '' + patches = [ + (fetchpatch { + url = https://gitlab.com/mailman/mailman/-/commit/4b206e2a5267a0e17f345fd7b2d957122ba57566.patch; + sha256 = "06axmrn74p81wvcki36c7gfj5fp5q15zxz2yl3lrvijic7hbs4n2"; + }) + (fetchpatch { + url = https://gitlab.com/mailman/mailman/-/commit/9613154f3c04fa2383fbf017031ef263c291418d.patch; + sha256 = "0vyw87s857vfxbf7kihwb6w094xyxmxbi1bpdqi3ybjamjycp55r"; + }) + ./log-stderr.patch + ]; + + postPatch = '' substituteInPlace src/mailman/config/postfix.cfg \ --replace /usr/sbin/postmap ${postfix}/bin/postmap substituteInPlace src/mailman/config/schema.cfg \ diff --git a/pkgs/servers/mail/mailman/log-stderr.patch b/pkgs/servers/mail/mailman/log-stderr.patch new file mode 100644 index 000000000000..2edbe1f18313 --- /dev/null +++ b/pkgs/servers/mail/mailman/log-stderr.patch @@ -0,0 +1,13 @@ +diff --git a/src/mailman/core/logging.py b/src/mailman/core/logging.py +index f8f87279f..7ff13b003 100644 +--- a/src/mailman/core/logging.py ++++ b/src/mailman/core/logging.py +@@ -142,6 +142,8 @@ def _init_logger(propagate, sub_name, log, logger_config): + address, facility = _get_syslog_params(logger_config) + handler = logging.handlers.SysLogHandler( + address=address, facility=facility) ++ elif logger_config.handler == 'stderr': ++ handler = logging.StreamHandler(sys.stderr) + else: + path_str = logger_config.path + path_abs = os.path.normpath(os.path.join(config.LOG_DIR, path_str)) From d5cc8fb892da85550375bc533e0db5470dd34396 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 26 May 2020 10:36:01 +0200 Subject: [PATCH 2074/3452] nixos/mailman: fix search index location --- nixos/modules/services/mail/mailman.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index 3744214ca49f..5c61cfbebf6c 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -29,6 +29,10 @@ let level = "INFO"; }; }; + HAYSTACK_CONNECTIONS.default = { + ENGINE = "haystack.backends.whoosh_backend.WhooshEngine"; + PATH = "/var/lib/mailman-web/fulltext-index"; + }; } // cfg.webSettings; webSettingsJSON = pkgs.writeText "settings.json" (builtins.toJSON webSettings); From b713e97c304f3cdb567b62f90fd6c794da01bf47 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 18 Jun 2020 17:45:35 +0200 Subject: [PATCH 2075/3452] tdesktop: 2.1.11 -> 2.1.12 --- .../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 d4493355951f..eacd5ece8b88 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.11"; + version = "2.1.12"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1sd6nrcjg5gpq6ynvwnz8f4jz8flknybx6b0pfxqrqqpzy7wjl5m"; + sha256 = "1b9kgib9dxjcfnw2zdbqd12ikcswkl35nwy9m47x5jvy3glxg6m8"; }; postPatch = '' From 5b3eac040b090f756885bb95733aca0ce98a3c80 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 18 Jun 2020 19:49:27 +0300 Subject: [PATCH 2076/3452] openmw-tes3mp: fix build after #80624 (#91045) --- pkgs/games/openmw/tes3mp.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 59bdc6901078..df332c0e5bf3 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, openmw, fetchFromGitHub, luajit, makeWrapper }: +{ stdenv, cmake, openmw, fetchFromGitHub, luajit, makeWrapper, mygui }: # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy @@ -28,6 +28,17 @@ let rev = "24aae91d9ddad38cdb3b0e0a13af59f142803e94"; sha256 = "1rfmxxr9ircfagdpbdrzl26msdhx1i3g974cblbv69078cradfh3"; }; + # https://github.com/TES3MP/openmw-tes3mp/issues/555 + mygui_ = mygui.overrideAttrs (oldAttrs: rec { + version = "3.2.2"; + + src = fetchFromGitHub { + owner = "MyGUI"; + repo = "mygui"; + rev = "MyGUI${version}"; + sha256 = "1wk7jmwm55rhlqqcyvqsxdmwvl70bysl9azh4kd9n57qlmgk3zmw"; + }; + }); in openmw.overrideAttrs (oldAttrs: rec { version = "2019-11-19"; name = "openmw-tes3mp-${version}"; @@ -41,7 +52,7 @@ in openmw.overrideAttrs (oldAttrs: rec { }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ]; - buildInputs = oldAttrs.buildInputs ++ [ luajit ]; + buildInputs = [ luajit mygui_ ] ++ oldAttrs.buildInputs; cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DBUILD_OPENCS=OFF" @@ -50,7 +61,7 @@ in openmw.overrideAttrs (oldAttrs: rec { "-DRakNet_LIBRARY_DEBUG=${rakNetLibrary}/lib/libRakNetLibStatic.a" ]; - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95175 + # https://github.com/TES3MP/openmw-tes3mp/issues/552 patches = [ ./tes3mp.patch ]; From 9f2d920c35a5e00eae8db302dd16c64075af255d Mon Sep 17 00:00:00 2001 From: Philipp Date: Thu, 18 Jun 2020 19:07:13 +0200 Subject: [PATCH 2077/3452] mudlet: 4.3 -> 4.9.1 --- pkgs/games/mudlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index 75d16586a39f..b73af4515d3c 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -6,14 +6,14 @@ let in stdenv.mkDerivation rec { pname = "mudlet"; - version = "4.3"; + version = "4.9.1"; src = fetchFromGitHub { owner = "Mudlet"; repo = "Mudlet"; rev = "Mudlet-${version}"; fetchSubmodules = true; - sha256 = "0qqdmivfwf9jmv5yx90z1fj99nlhnq762lfw6bcxgv74y4l4b4c0"; + sha256 = "0i022qcmlq4xwl2yh4xd5qdc0ag52605qmqqz6bim0h8f3dp8cx1"; }; nativeBuildInputs = [ cmake wrapQtAppsHook git qttools which ]; From 00e3f026f3b1ef61452432566001842ca439073f Mon Sep 17 00:00:00 2001 From: Flakebi Date: Thu, 18 Jun 2020 21:38:54 +0200 Subject: [PATCH 2078/3452] salt: 3000.3 -> 3001 --- pkgs/tools/admin/salt/default.nix | 7 ++++--- pkgs/tools/admin/salt/fix-libcrypto-loading.patch | 15 +++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index f3c375a99660..3cfd805d4827 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -25,18 +25,19 @@ let in py.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3000.3"; + version = "3001"; src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "19yfjhidx93rl9s03lvrfz7kp0xxigyv4d3zb9792zb9bsc4kjpw"; + sha256 = "0m7immip3r8yffiv7qlcqibszvhlg48qpgcm16skvrn85hdhv9jw"; }; propagatedBuildInputs = with py.pkgs; [ + distro jinja2 markupsafe msgpack - pycrypto + pycryptodomex pyyaml pyzmq requests diff --git a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch index f7560b1fc56d..e011a15b43f9 100644 --- a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch +++ b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch @@ -2,13 +2,12 @@ diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py index f827cc6db8..b728595186 100644 --- a/salt/utils/rsax931.py +++ b/salt/utils/rsax931.py -@@ -47,6 +47,9 @@ def _load_libcrypto(): - lib = lib[0] if len(lib) > 0 else None - if lib: - return cdll.LoadLibrary(lib) -+ else: -+ return cdll.LoadLibrary('@libcrypto@') -+ - raise OSError('Cannot locate OpenSSL libcrypto') +@@ -74,7 +74,7 @@ + """ + Attempt to load libcrypto. + """ +- return cdll.LoadLibrary(_find_libcrypto()) ++ return cdll.LoadLibrary('@libcrypto@') + def _init_libcrypto(): From 69199b0b210343be5273dbb7186ab6d109c096fe Mon Sep 17 00:00:00 2001 From: Raimon Grau Date: Thu, 18 Jun 2020 21:12:13 +0100 Subject: [PATCH 2079/3452] oil: 0.8.pre4 -> 0.8.pre6 --- pkgs/shells/oil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 019a66c77eb7..bce76b4cc825 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.8.pre4"; + version = "0.8.pre6"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "07kj86hrvlz9f1gh3qv4hdaz3qnb4a2qf0dnxhd2r0qilrkjanxh"; + sha256 = "1gbc74in78lbkciz7wzjplrm185wn6fz57n66xmazayivqmpvgfm"; }; postPatch = '' From df3a188b466b812065314694202f55d336681e03 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 18 Jun 2020 12:50:22 -0400 Subject: [PATCH 2080/3452] root5: 5.34.36 -> 5.34.38 Fixes: https://nvd.nist.gov/vuln/detail/CVE-2017-1000203 --- pkgs/applications/science/misc/root/5.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index fd06d721ebd1..58cc8f8f59ef 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 -, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lzma, gsl_1 +, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, lzma, gsl_1, xxHash , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { pname = "root"; - version = "5.34.36"; + version = "5.34.38"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "1kbx1jxc0i5xfghpybk8927a0wamxyayij9c74zlqm0595gqx1pw"; + sha256 = "1ln448lszw4d6jmbdphkr2plwxxlhmjkla48vmmq750xc1lxlfrc"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake pcre python2 zlib libxml2 lzma gsl_1 ] + buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl_1 xxHash ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; @@ -20,12 +20,6 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers_root5.patch - (fetchpatch { - name = "enable_new_gcc.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/enable_new_gcc.patch?h=root5&id=91c50876081a0af36f84ec4f0f9dba869107fa4f"; - sha256 = "1rnp0xlw0yqi7mjs4w145njd79i8kkir1qik7zwicdik9axf8ygm"; - }) - # prevents rootcint from looking in /usr/includes and such ./purify_include_paths_root5.patch From 343f689854200a2e40b9701623cc47af661633d4 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 21 May 2020 12:25:12 +0200 Subject: [PATCH 2081/3452] 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 2082/3452] 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 2083/3452] 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 78453e6ba67a547ce9f0be9d96cd1c27790460d0 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 18 Jun 2020 23:12:18 +0200 Subject: [PATCH 2084/3452] nixos/fontconfig: Move deprecated ultimate removals to relevant module This was a mistake in https://github.com/NixOS/nixpkgs/pull/61570, this does not belong to prometheus --- nixos/modules/config/fonts/fontconfig.nix | 9 ++++++++- .../modules/services/monitoring/prometheus/exporters.nix | 9 --------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 6ac64b0ec9c6..ac2a024eaa89 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -278,7 +278,14 @@ in (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") - ]; + ] ++ lib.forEach [ "enable" "substitutions" "preset" ] + (opt: lib.mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] '' + The fonts.fontconfig.ultimate module and configuration is obsolete. + The repository has since been archived and activity has ceased. + https://github.com/bohoomil/fontconfig-ultimate/issues/171. + No action should be needed for font configuration, as the fonts.fontconfig + module is already used by default. + ''); options = { diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index f9ad1457fc85..c584fcc89454 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -168,15 +168,6 @@ in (opt: lib.mkRemovedOptionModule [ "services" "prometheus" "${opt}" ] '' The prometheus exporters are now configured using `services.prometheus.exporters'. See the 18.03 release notes for more information. - '' )) - - ++ (lib.forEach [ "enable" "substitutions" "preset" ] - (opt: lib.mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] '' - The fonts.fontconfig.ultimate module and configuration is obsolete. - The repository has since been archived and activity has ceased. - https://github.com/bohoomil/fontconfig-ultimate/issues/171. - No action should be needed for font configuration, as the fonts.fontconfig - module is already used by default. '' )); options.services.prometheus.exporters = mkOption { From a31103196e6c572412524db7b4bbfec7ee025e9a Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 18 Jun 2020 23:41:04 +0200 Subject: [PATCH 2085/3452] monero: 0.15.0.1 -> 0.16.0.0 --- pkgs/applications/blockchains/monero/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index d1abd3956570..ed6ff8b7284e 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , cmake, pkgconfig -, boost, miniupnpc, openssl, unbound, cppzmq +, boost, miniupnpc, openssl, unbound , zeromq, pcsclite, readline, libsodium, hidapi , pythonProtobuf, randomx, rapidjson, libusb-compat-0_1 , CoreData, IOKit, PCSC @@ -10,13 +10,13 @@ assert stdenv.isDarwin -> IOKit != null; stdenv.mkDerivation rec { pname = "monero"; - version = "0.15.0.1"; + version = "0.16.0.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0sypa235lf2bbib4b71xpaw39h9304slgsvnsz8wmy9fq1zx009m"; + sha256 = "0x74h5z0nxxxip97ibc854pqmrgd8r4d6w62m424f66i8gbzfskh"; fetchSubmodules = true; }; @@ -24,13 +24,14 @@ stdenv.mkDerivation rec { buildInputs = [ boost miniupnpc openssl unbound - cppzmq zeromq pcsclite readline + zeromq pcsclite readline libsodium hidapi randomx rapidjson pythonProtobuf libusb-compat-0_1 ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" + "-DUSE_DEVICE_TREZOR=ON" "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" ] ++ stdenv.lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a0bb8018efe..ca2189b3d466 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23468,6 +23468,7 @@ in monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; + boost = boost17x; pythonProtobuf = python3Packages.protobuf.override { protobuf = protobuf3_10; }; }; From 7c041738c8c12cf1823682073e5cde8f14e8505c Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 18 Jun 2020 23:41:46 +0200 Subject: [PATCH 2086/3452] monero-gui: 0.15.0.4 -> 0.16.0.0 --- .../blockchains/monero-gui/default.nix | 14 +++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index cfd3998ee368..a135d0b3a004 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -4,7 +4,7 @@ , qtmultimedia, qtxmlpatterns , qtquickcontrols, qtquickcontrols2 , monero, unbound, readline, boost, libunwind -, libsodium, pcsclite, zeromq, cppzmq +, libsodium, pcsclite, zeromq, libgcrypt, libgpgerror , hidapi, libusb-compat-0_1, protobuf, randomx }: @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.15.0.4"; + version = "0.16.0.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "12m5fgnxkr11q2arx1m5ccpxqm5ljcvm6l547dwqn297zs5jim4z"; + sha256 = "06vdrsj5y9k0zn32hspyxc7sw1kkyrvi3chzkdbnxk9jvyj8k4ld"; }; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { qtbase qtdeclarative qtgraphicaleffects qtmultimedia qtquickcontrols qtquickcontrols2 qtxmlpatterns - monero unbound readline + monero unbound readline libgcrypt libgpgerror boost libunwind libsodium pcsclite zeromq - cppzmq hidapi libusb-compat-0_1 protobuf randomx + hidapi libusb-compat-0_1 protobuf randomx ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ]; @@ -52,6 +52,10 @@ stdenv.mkDerivation rec { preBuild = '' sed -i s#/opt/monero-wallet-gui##g Makefile make -C src/zxcvbn-c + + # use nixpkgs monero sources + rmdir monero + ln -s "${monero.src}" monero ''; desktopItem = makeDesktopItem { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca2189b3d466..ff5a273f2f31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23473,7 +23473,7 @@ in }; monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { - boost = boost16x; + boost = boost17x; protobuf = protobuf3_10; }; From 1c9e02b9116836f1f070e64b5fbf1a089e812af3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 19 Jun 2020 00:02:51 +0200 Subject: [PATCH 2087/3452] nixos/systemd: allow str in systemd.services..path Turns out, #75510 was too restrictive. We also need to allow str here, as some modules set this to "/run/wrappers" to bring `/run/wrappers/bin` into $PATH of a unit. --- nixos/modules/system/boot/systemd-unit-options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 62398f27d088..c6dbb96951ae 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -233,7 +233,7 @@ in rec { path = mkOption { default = []; - type = with types; listOf package; + type = with types; listOf (oneOf [ package str ]); apply = ps: "${makeBinPath ps}:${makeSearchPathOutput "bin" "sbin" ps}"; description = '' Packages added to the service's PATH From 04570e620dea83aaac9e539eccfbde81400bf3cc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 19 Jun 2020 00:10:15 +0200 Subject: [PATCH 2088/3452] 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 508a1322200c92db25423e4dd10a8649691a2b83 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 19 Jun 2020 00:18:40 +0200 Subject: [PATCH 2089/3452] =?UTF-8?q?rpm-ostree:=202020.1=20=E2=86=92=2020?= =?UTF-8?q?20.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/coreos/rpm-ostree/releases/tag/v2020.2 --- pkgs/tools/misc/rpm-ostree/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 41e59162905a..e04d37ba3c6b 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -32,7 +32,7 @@ , python , json_c , zchunk -, libmodulemd_1 +, libmodulemd , utillinux , sqlite , cppunit @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2020.1"; + version = "2020.2"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1xgfppq4fqqvg3cs327bckjpiz6rrn3bbbhg3q5p4j2bzsq89xiz"; + sha256 = "nuEBEVFqr9J+Nf98GZkvNNYOtpMUjKzYrzCc1T2cR3A="; }; nativeBuildInputs = [ @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { # required by vendored libdnf json_c zchunk - libmodulemd_1 + libmodulemd utillinux # for smartcols.pc sqlite cppunit From 6f22db6df12ccf0c04e7245f817f9d94404bbb34 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 19 Jun 2020 00:24:08 +0200 Subject: [PATCH 2090/3452] libmodulemd_1: drop rpm-ostree now uses 2.0 --- pkgs/development/libraries/libmodulemd/1.nix | 21 -------------- .../libmodulemd/dont-check-docs.patch | 29 ------------------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 51 deletions(-) delete mode 100644 pkgs/development/libraries/libmodulemd/1.nix delete mode 100644 pkgs/development/libraries/libmodulemd/dont-check-docs.patch diff --git a/pkgs/development/libraries/libmodulemd/1.nix b/pkgs/development/libraries/libmodulemd/1.nix deleted file mode 100644 index 174296375e08..000000000000 --- a/pkgs/development/libraries/libmodulemd/1.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ libmodulemd, fetchurl }: - -libmodulemd.overrideAttrs(old: rec { - name = "libmodulemd-${version}"; - version = "1.8.15"; - - # Removes py output since there's no overrides here - outputs = [ "out" "devdoc" ]; - - patches = [ - # Checks for glib docs in glib's prefix - # but they're installed to another - ./dont-check-docs.patch - ]; - - src = fetchurl { - url = "https://github.com/fedora-modularity/libmodulemd/releases/download/${name}/modulemd-${version}.tar.xz"; - sha256 = "0gz8p3qzji3cx0r57sy3gn4dhigg4k7pcxj3lmjcjn13vxh5rm7z"; - }; - -}) diff --git a/pkgs/development/libraries/libmodulemd/dont-check-docs.patch b/pkgs/development/libraries/libmodulemd/dont-check-docs.patch deleted file mode 100644 index 38ad5683692b..000000000000 --- a/pkgs/development/libraries/libmodulemd/dont-check-docs.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/meson.build b/meson.build -index 155c9e7..9125372 100644 ---- a/meson.build -+++ b/meson.build -@@ -60,15 +60,15 @@ sh = find_program('sh') - sed = find_program('sed') - test = find_program('test') - --ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) --if ret.returncode() != 0 -- error('Missing documentation for GLib.') --endif -- --ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')]) --if ret.returncode() != 0 -- error('Missing documentation for GObject.') --endif -+# ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) -+# if ret.returncode() != 0 -+# error('Missing documentation for GLib.') -+# endif -+ -+# ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')]) -+# if ret.returncode() != 0 -+# error('Missing documentation for GObject.') -+# endif - - python_name = get_option('python_name') - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f240b65393aa..894ee71ae50a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13587,7 +13587,6 @@ in libvdpau = callPackage ../development/libraries/libvdpau { }; libmodulemd = callPackage ../development/libraries/libmodulemd { }; - libmodulemd_1 = callPackage ../development/libraries/libmodulemd/1.nix { }; libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { }; From 9e05e7ce38f687c90379d401418758376933cbdd Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 19 Jun 2020 00:31:45 +0200 Subject: [PATCH 2091/3452] mutt: 1.14.3 -> 1.14.4 --- 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 30b3194d590b..b88e70a168fa 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.3"; + version = "1.14.4"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0wd4cv1c9hqymvml979g607nh3xxmlyx1ifc4r4qf39v6grnsmdi"; + sha256 = "1hykkq3m7kqic5r7vzg45xaww7415fv5i2d03slzykqb47w5d3na"; }; patches = optional smimeSupport (fetchpatch { From a9a0e6458b96ac21e03cb4e987cecbe7bffcd440 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Mon, 8 Jun 2020 21:04:44 +0200 Subject: [PATCH 2092/3452] asio: 1.12 -> 1.16 1.16 will now build on Darwin, properly mark it as such. Signed-off-by: Sirio Balmelli Co-authored-by: Dmitry Kalinkin --- pkgs/development/libraries/asio/1.12.nix | 6 ------ pkgs/development/libraries/asio/default.nix | 6 ++++++ pkgs/development/libraries/asio/generic.nix | 2 +- pkgs/top-level/all-packages.nix | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 pkgs/development/libraries/asio/1.12.nix create mode 100644 pkgs/development/libraries/asio/default.nix diff --git a/pkgs/development/libraries/asio/1.12.nix b/pkgs/development/libraries/asio/1.12.nix deleted file mode 100644 index 94fe4c703670..000000000000 --- a/pkgs/development/libraries/asio/1.12.nix +++ /dev/null @@ -1,6 +0,0 @@ -{callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.12.1"; - sha256 = "0nln45662kg799ykvqx5m9z9qcsmadmgg6r5najryls7x16in2d9"; -}) diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix new file mode 100644 index 000000000000..9c89b27d371f --- /dev/null +++ b/pkgs/development/libraries/asio/default.nix @@ -0,0 +1,6 @@ +{callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "1.16.1"; + sha256 = "1333ca6lnsdck4fsgjpbqf4lagxsnbg9970wxlsrinmwvdvdnwg2"; +}) diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix index f1ea8a084187..d83a48e61b8a 100644 --- a/pkgs/development/libraries/asio/generic.nix +++ b/pkgs/development/libraries/asio/generic.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { homepage = "http://asio.sourceforge.net/"; description = "Cross-platform C++ library for network and low-level I/O programming"; license = licenses.boost; - broken = stdenv.isDarwin; # test when updating to >=1.12.1 + broken = stdenv.isDarwin && stdenv.lib.versionOlder version "1.16.1"; platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a0bb8018efe..8283f15c998d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11285,9 +11285,8 @@ in assimp = callPackage ../development/libraries/assimp { }; - asio = asio_1_12; asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { }; - asio_1_12 = callPackage ../development/libraries/asio/1.12.nix { }; + asio = callPackage ../development/libraries/asio/default.nix { }; aspell = callPackage ../development/libraries/aspell { }; From 1d4dc149dfabecfcf660d0c8bf4e40544849331b Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Thu, 18 Jun 2020 19:49:00 -0400 Subject: [PATCH 2093/3452] nixos/systemd-boot: fix incorrect string formatting Currently, this always writes "default nixos-generation-%d.conf" without replacing the "%d" in the string. Python .format() is not equivalent to "%" --- .../system/boot/loader/systemd-boot/systemd-boot-builder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index d8baed65c6df..97e824fe629c 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -47,9 +47,9 @@ def write_loader_conf(profile, generation): if "@timeout@" != "": f.write("timeout @timeout@\n") if profile: - f.write("default nixos-%s-generation-%d.conf\n".format(profile, generation)) + f.write("default nixos-%s-generation-%d.conf\n" % (profile, generation)) else: - f.write("default nixos-generation-%d.conf\n".format(generation)) + f.write("default nixos-generation-%d.conf\n" % (generation)) if not @editor@: f.write("editor 0\n"); f.write("console-mode @consoleMode@\n"); From 460c0d608f40f54776bb401c601ff96b9ec426d0 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Sun, 14 Jun 2020 20:04:41 -0700 Subject: [PATCH 2094/3452] nixos-install: error out if $mountPoint has bad permissions The nix store more-or-less requires o+rx on all parent directories. This is primarily because nix runs builders in a uid/gid mapped user-namespace, and those builders have to be able to operate on the nix store. This check is especially helpful because nix does not produce a helpful error on its own (rather, creating directories and such works, it's not until 'mount --bind' that it gets an EACCES). Helps users who run into this opaque error, such as in #67465. Possibly fixes that issue if bad permissions were the only cause. --- nixos/modules/installer/tools/nixos-install.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 1bccbbfaf245..0b62bca8367e 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -71,6 +71,17 @@ if ! test -e "$mountPoint"; then exit 1 fi +# Verify permissions are okay-enough +checkPath="$(realpath "$mountPoint")" +while [[ "$checkPath" != "/" ]]; do + mode="$(stat -c '%a' "$checkPath")" + if [[ "${mode: -1}" -lt "5" ]]; then + echo "path $checkPath should have permissions 755, but had permissions $mode. Consider running 'chmod o+rx $checkPath'." + exit 1 + fi + checkPath="$(dirname "$checkPath")" +done + # Get the path of the NixOS configuration file. if [[ -z $NIXOS_CONFIG ]]; then NIXOS_CONFIG=$mountPoint/etc/nixos/configuration.nix From be22631154c9b92400472713092fb8b3cc722efb Mon Sep 17 00:00:00 2001 From: Paul Myjavec Date: Fri, 19 Jun 2020 14:30:34 +0900 Subject: [PATCH 2095/3452] circleci-cli: 0.1.7971 -> 0.1.8302 (#91013) --- pkgs/development/tools/misc/circleci-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 8c87e1642df3..5b641a3ec5c0 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.7971"; + version = "0.1.8302"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "0nrmdql3h9jnfgmp8898c9v07f5h5r9dvabaqhk98r6a77g3rr98"; + sha256 = "1rq1x6893n4siljn2jizrnz8b8qlic1y087gikh5p5140zpcbhnx"; }; vendorSha256 = "0y35ps2pw9z7gi4z50byd1py87bf2jdvj7l7w2gxpppmhi83myc9"; @@ -34,4 +34,4 @@ buildGoModule rec { license = licenses.mit; homepage = "https://circleci.com/"; }; -} \ No newline at end of file +} From cc1a97d7724ed8169fb9e0dcb2cff80d6c39a5cb Mon Sep 17 00:00:00 2001 From: Julien Dehos Date: Fri, 19 Jun 2020 08:42:04 +0200 Subject: [PATCH 2096/3452] curlcpp: remove myself from maintainers --- pkgs/development/libraries/curlcpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index 9f2710f42a46..ead4d1b76bd6 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Object oriented C++ wrapper for CURL"; platforms = platforms.unix; license = licenses.mit; - maintainers = with maintainers; [ juliendehos rszibele ]; + maintainers = with maintainers; [ rszibele ]; }; } From 9e887cf268e07521eb8d2bbbaa0fa08fac146c3f Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Thu, 18 Jun 2020 20:03:39 +0200 Subject: [PATCH 2097/3452] fedora-coreos-config-transpiler: init at 0.6.0 Fedora CoreOS Config Transpiler (FCCT) is to Fedora CoreOS what Container Linux Config Transpiler (CT) was to CoreOS Container Linux. --- .../default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/tools/fedora-coreos-config-transpiler/default.nix diff --git a/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix b/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix new file mode 100644 index 000000000000..44e9571aa2b0 --- /dev/null +++ b/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchFromGitHub, buildGoPackage }: + +with lib; + +buildGoPackage rec { + pname = "fcct"; + version = "0.6.0"; + + goPackagePath = "github.com/coreos/fcct"; + + src = fetchFromGitHub { + owner = "coreos"; + repo = "fcct"; + rev = "v${version}"; + sha256 = "18hmnip1s0smp58q500p8dfbrmi4i3nsyq22ri5cs53wbvz3ih1l"; + }; + + buildFlagsArray = '' + -ldflags=-X ${goPackagePath}/internal/version.Raw=v${version} + ''; + + postInstall = '' + mv $out/bin/{internal,fcct} + ''; + + meta = { + description = "Translates Fedora CoreOS configs into Ignition configs"; + license = licenses.asl20; + homepage = "https://github.com/coreos/fcct"; + maintainers = with maintainers; [ elijahcaine ruuda ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a0bb8018efe..c6cf356b7caf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -882,6 +882,8 @@ in container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; + fedora-coreos-config-transpiler = callPackage ../development/tools/fedora-coreos-config-transpiler { }; + ccextractor = callPackage ../applications/video/ccextractor { }; cconv = callPackage ../tools/text/cconv { }; From 05c559cbc9b8f63ab4286c1b3a83b00ccbfeec90 Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Fri, 19 Jun 2020 08:57:40 +0200 Subject: [PATCH 2098/3452] fedora-coreos-config-transpiler: use buildGoModule --- .../fedora-coreos-config-transpiler/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix b/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix index 44e9571aa2b0..787ca7957914 100644 --- a/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix +++ b/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix @@ -1,13 +1,11 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: with lib; -buildGoPackage rec { +buildGoModule rec { pname = "fcct"; version = "0.6.0"; - goPackagePath = "github.com/coreos/fcct"; - src = fetchFromGitHub { owner = "coreos"; repo = "fcct"; @@ -15,8 +13,13 @@ buildGoPackage rec { sha256 = "18hmnip1s0smp58q500p8dfbrmi4i3nsyq22ri5cs53wbvz3ih1l"; }; + deleteVendor = true; + vendorSha256 = "0qqkaskmyxgwv9qg3y5lckqf6nchn3bxp69fyqdbvki65p445608"; + + subPackages = [ "internal" ]; + buildFlagsArray = '' - -ldflags=-X ${goPackagePath}/internal/version.Raw=v${version} + -ldflags=-X github.com/coreos/fcct/internal/version.Raw=v${version} ''; postInstall = '' From e3bacebbd006f045843f45bc8f4857a2e82cf23c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 19 Jun 2020 09:47:36 +0200 Subject: [PATCH 2099/3452] python2.pkgs.markdown: keep at 3.1.1 for Python 2 --- .../python-modules/markdown/3_1.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 ++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/markdown/3_1.nix diff --git a/pkgs/development/python-modules/markdown/3_1.nix b/pkgs/development/python-modules/markdown/3_1.nix new file mode 100644 index 000000000000..b07d36e22c71 --- /dev/null +++ b/pkgs/development/python-modules/markdown/3_1.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, nose +, pyyaml +, pythonOlder +, importlib-metadata +, isPy3k +}: + +buildPythonPackage rec { + pname = "Markdown"; + version = "3.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"; + }; + + propagatedBuildInputs = [ + setuptools + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ nose pyyaml ]; + + meta = { + description = "A Python implementation of John Gruber's Markdown with Extension support"; + homepage = "https://github.com/Python-Markdown/markdown"; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a09610a19220..a1c03bc204ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4504,7 +4504,10 @@ in { mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; - markdown = callPackage ../development/python-modules/markdown { }; + markdown = if isPy3k then + callPackage ../development/python-modules/markdown { } + else + callPackage ../development/python-modules/markdown/3_1.nix { }; markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {}; From a1b8192dbf9e12d5aa086606d0393f8a14142f38 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 12 Jun 2020 09:45:22 +0200 Subject: [PATCH 2100/3452] =?UTF-8?q?ocamlPackages.piqi:=200.6.14=20?= =?UTF-8?q?=E2=86=92=200.6.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/piqi/default.nix | 17 ++++++++++------- pkgs/top-level/ocaml-packages.nix | 4 +--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix index c492035f4f95..f3c489723b2f 100644 --- a/pkgs/development/ocaml-modules/piqi/default.nix +++ b/pkgs/development/ocaml-modules/piqi/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, ocaml, findlib, which, ulex, easy-format, ocaml_optcomp, xmlm, base64 }: +{ stdenv, fetchFromGitHub, ocaml, findlib, which, sedlex_2, easy-format, xmlm, base64 }: stdenv.mkDerivation rec { - version = "0.6.14"; + version = "0.6.15"; pname = "piqi"; + name = "ocaml${ocaml.version}-${pname}-${version}"; - src = fetchurl { - url = "https://github.com/alavrik/piqi/archive/v${version}.tar.gz"; - sha256 = "1ssccnwqzfyf7syfq2fv4zyhwayxwd75rhq9y28mvq1w6qbww4l7"; + src = fetchFromGitHub { + owner = "alavrik"; + repo = pname; + rev = "v${version}"; + sha256 = "0v04hs85xv6d4ysqxyv1dik34dx49yab9shpi4x7iv19qlzl7csb"; }; - buildInputs = [ ocaml findlib which ocaml_optcomp ]; - propagatedBuildInputs = [ulex xmlm easy-format base64]; + buildInputs = [ ocaml findlib which ]; + propagatedBuildInputs = [ sedlex_2 xmlm easy-format base64 ]; patches = [ ./no-ocamlpath-override.patch ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4be489c76ebb..5ee24287dd67 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -712,9 +712,7 @@ let phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { }; - piqi = callPackage ../development/ocaml-modules/piqi { - base64 = base64_2; - }; + piqi = callPackage ../development/ocaml-modules/piqi { }; piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; From caf47063b4b5d82a61753ea437f97e5642eedd03 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 18 Jun 2020 17:29:21 +0200 Subject: [PATCH 2101/3452] dockerTools: test that tar keeps nix binary symlinks intact --- nixos/tests/docker-tools.nix | 14 ++++++++++++++ pkgs/build-support/docker/examples.nix | 22 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 2375d15b3813..c48e5b079762 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -42,6 +42,20 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker rmi ${examples.nix.imageName}", ) + with subtest("The nix binary symlinks are intact"): + docker.succeed( + "docker load --input='${examples.nix}'", + "docker run --rm ${examples.nix.imageName} ${pkgs.bash}/bin/bash -c 'test nix == $(readlink ${pkgs.nix}/bin/nix-daemon)'", + "docker rmi ${examples.nix.imageName}", + ) + + with subtest("The nix binary symlinks are intact when the image is layered"): + docker.succeed( + "docker load --input='${examples.nixLayered}'", + "docker run --rm ${examples.nixLayered.imageName} ${pkgs.bash}/bin/bash -c 'test nix == $(readlink ${pkgs.nix}/bin/nix-daemon)'", + "docker rmi ${examples.nixLayered.imageName}", + ) + with subtest("The pullImage tool works"): docker.succeed( "docker load --input='${examples.nixFromDockerHub}'", diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index d533e3abd03b..b040d830b31c 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -121,6 +121,7 @@ rec { # the image env variable NIX_PAGER. pkgs.coreutils pkgs.nix + pkgs.bash ]; config = { Env = [ @@ -313,4 +314,25 @@ rec { ) ]; }; + + nixLayered = pkgs.dockerTools.buildLayeredImageWithNixDb { + name = "nix-layered"; + tag = "latest"; + contents = [ + # nix-store uses cat program to display results as specified by + # the image env variable NIX_PAGER. + pkgs.coreutils + pkgs.nix + pkgs.bash + ]; + config = { + Env = [ + "NIX_PAGER=cat" + # A user is required by nix + # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478 + "USER=nobody" + ]; + }; + }; + } From 2dd94af18650aee1b53c9509832068b60c1b1225 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 19 Jun 2020 09:02:17 +0200 Subject: [PATCH 2102/3452] dockerTools: keep symlinks to nix intact --- pkgs/build-support/docker/store-path-to-layer.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh index 7437da51cc4a..3a1fcd0c27a1 100755 --- a/pkgs/build-support/docker/store-path-to-layer.sh +++ b/pkgs/build-support/docker/store-path-to-layer.sh @@ -16,7 +16,11 @@ mkdir -p "$layerPath" # when there are other things being added to the # nix store, tar could fail, saying, # "tar: /nix/store: file changed as we read it" -mkdir -p nix/store +# +# In addition, we use `__Nix__` instead of `nix` to avoid renaming +# relative symlink destinations like +# /nix/store/...-nix-2.3.4/bin/nix-daemon -> nix +mkdir -p __Nix__/store # Then we change into the /nix/store in order to # avoid a similar "file changed as we read it" error @@ -35,8 +39,8 @@ tarhash=$( --hard-dereference --sort=name \ --mtime="@$SOURCE_DATE_EPOCH" \ --owner=0 --group=0 \ - --transform 's,^nix$,/\0,' \ - --transform 's,^nix/store$,/\0,' \ + --transform 's,^__Nix__$,/nix,' \ + --transform 's,^__Nix__/store$,/nix/store,' \ --transform 's,^[^/],/nix/store/\0,rS' | tee "$layerPath/layer.tar" | tarsum From 343594f2bdad7dedb58f95d76bd60eadf8a3d18a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 19 Jun 2020 09:13:00 +0100 Subject: [PATCH 2103/3452] python3.pkgs.python-engineio: 3.10.0 -> 3.13.0 fixes python-socketio --- pkgs/development/python-modules/python-engineio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index cb3fe1a9f38d..1c48cfa6c66b 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "3.10.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "1495r55177c38wq88pb28l50dfd4213iyxwq1k5rmsgp66vww09s"; + sha256 = "1fgfrgcvjg3fyza5lhl1l9cfq073xrwwhh3xs178csrjz4s8s378"; }; propagatedBuildInputs = [ From ab2c7a29e70a60b9d59595b376b945ea8b2e4feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 19 Jun 2020 09:06:37 +0100 Subject: [PATCH 2104/3452] eyeD3: fix dependencies --- .../python-modules/eyed3/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 11aeca8127bd..321c26542d11 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -1,15 +1,14 @@ { stdenv , buildPythonPackage , fetchPypi -, pythonAtLeast , pythonOlder -, paver , python , isPyPy , six -, pathlib -, python_magic , lib +, filetype +, deprecation +, dataclasses }: buildPythonPackage rec { @@ -22,18 +21,13 @@ buildPythonPackage rec { sha256 = "faf5806197f2093e82c2830d41f2378f07b3a9da07a16fafb14fc6fbdebac50a"; }; - # https://github.com/nicfit/eyeD3/pull/284 - postPatch = lib.optionalString (pythonAtLeast "3.4") '' - sed -ie '/pathlib/d' requirements/requirements.yml - ''; - - buildInputs = [ paver ]; - # requires special test data: # https://github.com/nicfit/eyeD3/blob/103198e265e3279384f35304e8218be6717c2976/Makefile#L97 doCheck = false; - propagatedBuildInputs = [ six python_magic ] ++ lib.optional (pythonOlder "3.4") pathlib; + propagatedBuildInputs = [ + six filetype deprecation + ] ++ lib.optional (pythonOlder "3.7") dataclasses; postInstall = '' for prog in "$out/bin/"*; do @@ -55,5 +49,4 @@ buildPythonPackage rec { and v2.3/v2.4. ''; }; - } From fcbd2e68355bf28ca9c0ae69af7e75fde1ae8ae7 Mon Sep 17 00:00:00 2001 From: Sebastien Bariteau Date: Fri, 19 Jun 2020 04:19:34 -0400 Subject: [PATCH 2105/3452] tellico: init at 3.3.0 * tellico: init at 3.3.0 * fix pversion vs version --- pkgs/applications/misc/tellico/default.nix | 67 ++++++++++++++++++++++ pkgs/applications/misc/tellico/hex.patch | 15 +++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 84 insertions(+) create mode 100644 pkgs/applications/misc/tellico/default.nix create mode 100644 pkgs/applications/misc/tellico/hex.patch diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix new file mode 100644 index 000000000000..401f1f1d7188 --- /dev/null +++ b/pkgs/applications/misc/tellico/default.nix @@ -0,0 +1,67 @@ +{ lib +, fetchurl +, mkDerivation +, kdeApplications +, kinit +, kdelibs4support +, solid +, kxmlgui +, karchive +, kfilemetadata +, khtml +, knewstuff +, libksane +, cmake +, exempi +, extra-cmake-modules +, libcdio +, poppler +, makeWrapper +, kdoctools +}: + +mkDerivation rec { + name = "tellico"; + version = "3.3.0"; + + src = fetchurl { + url = "https://tellico-project.org/files/tellico-${lib.versions.majorMinor version}.tar.xz"; + sha256 = "1digkpvzrsbv5znf1cgzs6zkmysfz6lzs12n12mrrpgkcdxc426y"; + }; + + patches = [ + ./hex.patch + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + kdoctools + makeWrapper + ]; + + buildInputs = [ + kdelibs4support + solid + kxmlgui + karchive + kfilemetadata + khtml + knewstuff + libksane + cmake + exempi + extra-cmake-modules + libcdio + kdeApplications.libkcddb + poppler + ]; + + meta = { + description = "Collection management software, free and simple"; + homepage = "https://tellico-project.org/"; + maintainers = with lib.maintainers; [ numkem ]; + license = with lib.licenses; [ gpl2 gpl3 ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/misc/tellico/hex.patch b/pkgs/applications/misc/tellico/hex.patch new file mode 100644 index 000000000000..999c502287e9 --- /dev/null +++ b/pkgs/applications/misc/tellico/hex.patch @@ -0,0 +1,15 @@ +index 7ea81c7..0c19767 100644 +--- a/src/utils/iso5426converter.cpp ++++ b/src/utils/iso5426converter.cpp +@@ -1211,7 +1211,11 @@ QChar Iso5426Converter::getCombiningChar(uint c) { + return 0x1EF1; // SMALL LETTER U WITH HORN AND DOT BELOW + + default: ++#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) ++ myDebug() << "no match for" << hex << c; ++#else + myDebug() << "no match for" << Qt::hex << c; ++#endif + return QChar(); + } + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44143befa2b8..6edc098c36ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26300,6 +26300,8 @@ in prow = callPackage ../applications/networking/cluster/prow { }; + tellico = libsForQt5.callPackage ../applications/misc/tellico { }; + termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; inherit (callPackage ../applications/networking/cluster/terraform { }) From 612ef3438aff907113780374babb69a1bcfa08c6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 19 Jun 2020 10:37:27 +0200 Subject: [PATCH 2106/3452] python3.pkgs.soco: fix build --- pkgs/development/python-modules/soco/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 0af09cc01ce7..b56e43e13219 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -1,4 +1,5 @@ { lib, buildPythonPackage, fetchPypi, xmltodict, requests +, toml # Test dependencies , pytest, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx @@ -14,13 +15,7 @@ buildPythonPackage rec { sha256 = "0dgca286vhrabm4r4jj545k895z6w2c70ars06vrjhf9cpgg7qck"; }; - postPatch = '' - # https://github.com/SoCo/SoCo/pull/670 - substituteInPlace requirements-dev.txt \ - --replace "pytest-cov>=2.4.0,<2.6" "pytest-cov>=2.4.0" - ''; - - propagatedBuildInputs = [ xmltodict requests ]; + propagatedBuildInputs = [ xmltodict requests toml ]; checkInputs = [ pytest pytestcov coveralls pylint flake8 graphviz mock sphinx sphinx_rtd_theme From 97571118254adb18c692d11cbfd20a69abb66e8a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 15:15:15 +0000 Subject: [PATCH 2107/3452] cmake: 3.17.2 -> 3.17.3 --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 17362702e322..a9a3fd71a6bb 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.17.2"; + version = "3.17.3"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "199srp8yfai51pcbpmfyc4s8vzrmh2dm91bp582hj2l29x634xzw"; + sha256 = "0h4c3nwk7wmzcmmlwyb16zmjqr44l4k591m2y9p9zp3m498hvmhb"; }; patches = [ From 0d60bd97b009962c521a72e7f014174c8d2c48fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 22:01:48 +0000 Subject: [PATCH 2108/3452] file: 5.38 -> 5.39 --- pkgs/tools/misc/file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 71e547d84331..730234998ed4 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "file"; - version = "5.38"; + version = "5.39"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${pname}-${version}.tar.gz" "https://distfiles.macports.org/file/${pname}-${version}.tar.gz" ]; - sha256 = "0d7s376b4xqymnrsjxi3nsv3f5v89pzfspzml2pcajdk5by2yg2r"; + sha256 = "1lgs2w2sgamzf27kz5h7pajz7v62554q21fbs11n4mfrfrm2hpgh"; }; nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; From c81696a5d2d67af249c43ee7d858ec7d6cdcf800 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 08:49:10 +0000 Subject: [PATCH 2109/3452] alsa-topology-conf: 1.2.2 -> 1.2.3 --- pkgs/os-specific/linux/alsa-topology-conf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-topology-conf/default.nix b/pkgs/os-specific/linux/alsa-topology-conf/default.nix index f73bbbdba357..54340d017ade 100644 --- a/pkgs/os-specific/linux/alsa-topology-conf/default.nix +++ b/pkgs/os-specific/linux/alsa-topology-conf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-topology-conf-${version}"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "09cls485ckdjsp4azhv3nw7chyg3r7zrqgald6yp70f7cysxcwml"; + sha256 = "1zwxc9zhfcmyffjjbibzpdvf4kx7wv9g2zl6xz7y0d6srfr9jgw3"; }; dontBuild = true; From fb4625e88a6875d142430f976ec3939f0e7e727c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 08:31:12 +0000 Subject: [PATCH 2110/3452] alsaLib: 1.2.2 -> 1.2.3 --- pkgs/os-specific/linux/alsa-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 335ae204833d..3c5427340baf 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }: stdenv.mkDerivation rec { - name = "alsa-lib-1.2.2"; + name = "alsa-lib-1.2.3"; src = fetchurl { url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "1v5kb8jyvrpkvvq7dq8hfbmcj68lml97i4s0prxpfx2mh3c57s6q"; + sha256 = "13k7dx1g749z74rz71hs5j8z0pqdjgx7l69pn0vsy7jizhi0kw02"; }; patches = [ From 4dbf90217c6843152c42d7d3bc9a4b26bb4d5b66 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 12:16:35 +0000 Subject: [PATCH 2111/3452] alsa-ucm-conf: 1.2.2 -> 1.2.3 --- pkgs/os-specific/linux/alsa-ucm-conf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-ucm-conf/default.nix index 685ba3e2c3e5..2a9f28c855a5 100644 --- a/pkgs/os-specific/linux/alsa-ucm-conf/default.nix +++ b/pkgs/os-specific/linux/alsa-ucm-conf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-ucm-conf-${version}"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "0364fgzdm2qrsqvgqri25gzscbma7yqlv31wz8b1z9c5phlxkgvy"; + sha256 = "000db5yla7dljidjbbwbiaxvc1a7wh1zpw694gipaymj9fh4vhhv"; }; dontBuild = true; From f79c05b113bc5b78fe60d2bd217d06ea87329ce5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 23:03:53 +0000 Subject: [PATCH 2112/3452] openblas: 0.3.9 -> 0.3.10 --- pkgs/development/libraries/science/math/openblas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 318922d7f25d..89d88bdf564a 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -99,12 +99,12 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.9"; + version = "0.3.10"; src = fetchFromGitHub { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "0nq51j45shb32n6086xff3x374kx5qhr2cwjzvppx4s2z0ahflal"; + sha256 = "174id98ga82bhz2v7sy9yj6pqy0h0088p3mkdikip69p9rh3d17b"; }; inherit blas64; From 49d376b65cfb37bb6419c488baa415389205e872 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 22 May 2020 06:17:05 +0000 Subject: [PATCH 2113/3452] libksba: 1.3.5 -> 1.4.0 --- pkgs/development/libraries/libksba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 2f0da5edf4e1..d627bf81cba2 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,11 +1,11 @@ { buildPackages, stdenv, fetchurl, gettext, libgpgerror }: stdenv.mkDerivation rec { - name = "libksba-1.3.5"; + name = "libksba-1.4.0"; src = fetchurl { url = "mirror://gnupg/libksba/${name}.tar.bz2"; - sha256 = "0h53q4sns1jz1pkmhcz5wp9qrfn9f5g9i3vjv6dafwzzlvblyi21"; + sha256 = "1dj1razn35srkgadx3i30yr0q037cr0dn54m6a54vxgh3zlsirmz"; }; outputs = [ "out" "dev" "info" ]; From dc906cbe92099cf55b5687abe175ebc1b32f4110 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 07:55:41 +0000 Subject: [PATCH 2114/3452] bison: 3.6.2 -> 3.6.3 --- pkgs/development/tools/parsing/bison/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index 5302f7ca6441..0b6476998bf1 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "16h8panwpljwdq902v9x7inpnks51fn0kqlbyqfjvpilv6md73p2"; + sha256 = "0qry9ar16dpg9nzrq7jh3fqh4ah2xvcf6v00fc81z08yjd1ljk2b"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; From d1790983906b8434c29800dddd4f2aa4b9d03c58 Mon Sep 17 00:00:00 2001 From: Gaelan Steele Date: Thu, 14 May 2020 14:12:06 -0700 Subject: [PATCH 2115/3452] libgcrypt: always pass build and host to configure When building for aarch32 on aarch64 with extraPlatforms, libgcrypt fails to build because it tries to guess the host platform from uname, which returns the wrong result in this case. We fix this by always telling libgcrpyt what platform to build for. --- pkgs/development/libraries/libgcrypt/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index a3d515c50472..49aaec66c29b 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-asm"; + # Necessary to generate correct assembly when compiling for aarch32 on + # aarch64 + configurePlatforms = [ "host" "build" ]; + # Make sure libraries are correct for .pc and .la files # Also make sure includes are fixed for callers who don't use libgpgcrypt-config postFixup = '' From 9c650efbb0b8f143c4d8140f78cfac81c7e0051a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 19 Jun 2020 11:20:35 +0200 Subject: [PATCH 2116/3452] python2.pkgs.natsort: disable --- pkgs/development/python-modules/natsort/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 805f5dc5de47..fc80f30aadc8 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -29,6 +29,9 @@ buildPythonPackage rec { sha256 = "a633464dc3a22b305df0f27abcb3e83515898aa1fd0ed2f9726c3571a27258cf"; }; + # Does not support Python 2 + disabled = !isPy3k; + # testing based on project's tox.ini # natsort_keygen has pytest mock issues checkPhase = '' From e3209fae77495cdbcb07378a8e68f1a2edc28eaa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 19 Jun 2020 11:21:42 +0200 Subject: [PATCH 2117/3452] python2.pkgs.natsort: fix eval --- pkgs/development/python-modules/natsort/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index fc80f30aadc8..bfe486e1a54a 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -8,6 +8,7 @@ , hypothesis , glibcLocales , pathlib ? null +, isPy3k }: buildPythonPackage rec { From 407897c65a1010ddacab8df5d531ed0db0c3cb1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 19 Jun 2020 10:46:05 +0100 Subject: [PATCH 2118/3452] python3.pkgs.astral: add missing freezegun --- pkgs/development/python-modules/astral/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 13c9932a1283..6c4afec6352e 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytz, requests, pytest, freezegun }: buildPythonPackage rec { pname = "astral"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "e41d9967d5c48be421346552f0f4dedad43ff39a83574f5ff2ad32b6627b6fbe"; }; - propagatedBuildInputs = [ pytz requests ]; + propagatedBuildInputs = [ pytz requests freezegun ]; checkInputs = [ pytest ]; checkPhase = '' From 25b91c2059b04268e70c5d73aac661f85bef48f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 19 Jun 2020 10:52:03 +0100 Subject: [PATCH 2119/3452] python3.pkgs.asynctest: disable tests on python3.8 --- pkgs/development/python-modules/asynctest/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix index d08f4137ba45..d36328d7225b 100644 --- a/pkgs/development/python-modules/asynctest/default.nix +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -17,6 +17,9 @@ buildPythonPackage rec { --replace "test_events_watched_outside_test_are_ignored" "xtest_events_watched_outside_test_are_ignored" ''; + # https://github.com/Martiusweb/asynctest/issues/132 + doCheck = pythonOlder "3.8"; + checkPhase = '' ${python.interpreter} -m unittest test ''; From df65cd2ef978970d8f7b57792d65649c185ee98f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 19 Jun 2020 10:52:29 +0100 Subject: [PATCH 2120/3452] python3.pkgs.hass-nabucasa: fix build --- .../python-modules/hass-nabucasa/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index e13cae339601..2826056abcbd 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -1,28 +1,40 @@ { lib, buildPythonPackage, fetchFromGitHub, fetchpatch , acme, aiohttp, snitun, attrs, pycognito, warrant -, pytest-aiohttp, asynctest, pytest }: +, pytest-aiohttp, asynctest, atomicwrites, pytest, pythonOlder }: buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.32.2"; + version = "0.34.6"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "1hfi5q222kgbgrj5yvr4lbhca49hcs6sc2yhxc4pjxqsc12bv1f1"; + sha256 = "1lkqwj58qr0vn7zf5mhrhaz973ahj9wjp4mgzvyja1gcdh6amv34"; }; - # upstreamed in https://github.com/NabuCasa/hass-nabucasa/pull/119 postPatch = '' - sed -i 's/"acme.*/"acme>=0.40.0,<2.0"/' setup.py - cat setup.py + sed -i 's/"acme.*"/"acme"/' setup.py ''; - propagatedBuildInputs = [ acme aiohttp snitun attrs warrant pycognito ]; + patches = [ + # relax pytz dependency + (fetchpatch { + url = "https://github.com/NabuCasa/hass-nabucasa/commit/419e80feddc36c68384c032feda0057515b53eaa.patch"; + sha256 = "14dgwci8615cwcf27hg7b42s7da50xhyjys3yx446q7ipk8zw4x6"; + }) + ]; + + propagatedBuildInputs = [ + acme aiohttp atomicwrites snitun attrs warrant pycognito + ]; checkInputs = [ pytest pytest-aiohttp asynctest ]; + # Asynctest's mocking is broken with python3.8 + # https://github.com/Martiusweb/asynctest/issues/132 + doCheck = pythonOlder "3.8"; + checkPhase = '' pytest tests/ ''; From 8ce5334899c49ca30cbf42c66b758c2560fce666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 19 Jun 2020 11:06:02 +0100 Subject: [PATCH 2121/3452] python3.pkgs.pycognito: 0.1.2 -> 0.1.3 --- pkgs/development/python-modules/pycognito/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index afc607baa405..8101b76b62cf 100644 --- a/pkgs/development/python-modules/pycognito/default.nix +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pycognito"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "pvizeli"; repo = "pycognito"; rev = version; - sha256 = "01zns522awm5yp5cbk1y7k7px534i5akiivip709i1naph3hvnfk"; + sha256 = "0wy6d274xda7v6dazv10h2vwig2avfyz8mh2lpd1a5k7i06r335r"; }; postPatch = '' From 81fb54a8c147ccc7f7f37b9bcb2d19279e519b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 19 Jun 2020 11:16:50 +0100 Subject: [PATCH 2122/3452] python3.pkgs.janus: fix build --- pkgs/development/python-modules/janus/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/janus/default.nix b/pkgs/development/python-modules/janus/default.nix index 6fe188fbf849..1999a625e4b8 100644 --- a/pkgs/development/python-modules/janus/default.nix +++ b/pkgs/development/python-modules/janus/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pythonOlder }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, pytest-asyncio }: buildPythonPackage rec { pname = "janus"; @@ -11,7 +11,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - checkInputs = [ pytest ]; + checkInputs = [ pytest-asyncio pytestCheckHook ]; + + # also fails upstream: https://github.com/aio-libs/janus/pull/258 + disabledTests = [ "test_format" ]; meta = with lib; { description = "Mixed sync-async queue"; From 5293575e859bb56d5a7317f316b4fca2ee62d821 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 13 Jun 2020 10:34:34 +0200 Subject: [PATCH 2123/3452] coqPackages.mathcomp: enable 1.11.0 for Coq 8.12 --- pkgs/development/coq-modules/mathcomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index d4d5f924f52f..8cf502a1943b 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -76,8 +76,8 @@ let }; # versions of coq compatible with released mathcomp versions coq-versions = { - "1.11.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; - "1.11+beta1" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; + "1.11.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; + "1.11+beta1" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; "1.10.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; "1.9.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" ]; "1.8.0" = flip elem [ "8.7" "8.8" "8.9" ]; From a8bb61222f26289456efd2c8be074d45ecf76f92 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 13 Jun 2020 10:16:00 +0200 Subject: [PATCH 2124/3452] =?UTF-8?q?coq=5F8=5F12:=20init=20at=208.12+?= =?UTF-8?q?=CE=B21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/coq/default.nix | 1 + pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/coq-packages.nix | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 39e7cbe7f3cc..a10b34e0a609 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -35,6 +35,7 @@ let "8.11.0" = "1rfdic6mp7acx2zfwz7ziqk12g95bl9nyj68z4n20a5bcjv2pxpn"; "8.11.1" = "0qriy9dy36dajsv5qmli8gd6v55mah02ya334nw49ky19v7518m0"; "8.11.2" = "0f77ccyxdgbf1nrj5fa8qvrk1cyfy06fv8gj9kzfvlcgn0cf48sa"; + "8.12+beta1" = "0jbm8am9j926s0h4fi0cjl95l37l6p7i03spcryyrd4sg5xrddr7"; }.${version}; coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6edc098c36ff..c0a2c0b49e41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25053,6 +25053,7 @@ in coqPackages_8_9 coq_8_9 coqPackages_8_10 coq_8_10 coqPackages_8_11 coq_8_11 + coqPackages_8_12 coq_8_12 coqPackages coq ; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index dedef12e38ba..c1015aa939f4 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -118,6 +118,9 @@ in rec { coq_8_11 = callPackage ../applications/science/logic/coq { version = "8.11.2"; }; + coq_8_12 = callPackage ../applications/science/logic/coq { + version = "8.12+beta1"; + }; coqPackages_8_5 = mkCoqPackages coq_8_5; coqPackages_8_6 = mkCoqPackages coq_8_6; @@ -126,6 +129,7 @@ in rec { coqPackages_8_9 = mkCoqPackages coq_8_9; coqPackages_8_10 = mkCoqPackages coq_8_10; coqPackages_8_11 = mkCoqPackages coq_8_11; + coqPackages_8_12 = mkCoqPackages coq_8_12; coqPackages = recurseIntoAttrs (lib.mapDerivationAttrset lib.dontDistribute coqPackages_8_9 ); From 09e64cf96baf7577effa343dcf12f33066235fbf Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 19 Jun 2020 12:36:08 +0200 Subject: [PATCH 2125/3452] hashcat: 5.1.0 -> 6.0.0 (#91063) --- pkgs/tools/security/hashcat/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index c1fd84b64527..2456f9ca18f2 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -1,12 +1,18 @@ -{ stdenv, fetchurl, makeWrapper, opencl-headers, ocl-icd, xxHash }: +{ stdenv +, fetchurl +, makeWrapper +, opencl-headers +, ocl-icd +, xxHash +}: stdenv.mkDerivation rec { pname = "hashcat"; - version = "5.1.0"; + version = "6.0.0"; src = fetchurl { url = "https://hashcat.net/files/hashcat-${version}.tar.gz"; - sha256 = "0f73y4cg8c7a6q7x34qvpfi4g3lw6j9bnn0a13g43aqyiskflfr8"; + sha256 = "118jxk4xh55m1vhaz5h2j2385mp4p397m16g9hi4x2k0b8m0zrz8"; }; nativeBuildInputs = [ makeWrapper ]; From 5a345d60d37dd81fceb6153e615da78548f6bcac Mon Sep 17 00:00:00 2001 From: Sebastien Bariteau Date: Fri, 19 Jun 2020 07:00:04 -0400 Subject: [PATCH 2126/3452] the-way: init at 0.3.2 * the-way: init at 0.3.2 --- pkgs/development/tools/the-way/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/the-way/default.nix diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix new file mode 100644 index 000000000000..99b0e4cd1897 --- /dev/null +++ b/pkgs/development/tools/the-way/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "the-way"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "out-of-cheese-error"; + repo = pname; + rev = "v${version}"; + sha256 = "02aa4iwwi89r6sj1q5sj74n2cy1rj94yfh39cp97zlx4lam9pj6b"; + }; + + cargoSha256 = "09d9gaa83djfkfdx3m4d3kkq550q8y67wb292mrj4xb0kcfrhnpq"; + checkFlags = "--test-threads=1"; + + meta = with stdenv.lib; { + description = "Terminal code snippets manager"; + homepage = "https://github.com/out-of-cheese-error/the-way"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ numkem ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81da6b353308..27bca9d5dd6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3147,6 +3147,8 @@ in teamocil = callPackage ../tools/misc/teamocil { }; + the-way = callPackage ../development/tools/the-way { }; + tsm-client = callPackage ../tools/backup/tsm-client { jdk8 = null; }; tsm-client-withGui = callPackage ../tools/backup/tsm-client { }; From 6580c59352f8c2cffcd64c5a78f5f3d0d920648f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Thu, 18 Jun 2020 14:27:37 +0200 Subject: [PATCH 2127/3452] librespot: init at 0.1.1 --- pkgs/applications/audio/librespot/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++ 2 files changed, 55 insertions(+) create mode 100644 pkgs/applications/audio/librespot/default.nix diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix new file mode 100644 index 000000000000..468cf57cdcfe --- /dev/null +++ b/pkgs/applications/audio/librespot/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl +, withRodio ? true +, withALSA ? true, alsaLib ? null +, withPulseAudio ? false, libpulseaudio ? null +, withPortAudio ? false, portaudio ? null +}: + +rustPlatform.buildRustPackage rec { + pname = "librespot"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "librespot-org"; + repo = "librespot"; + rev = "v${version}"; + sha256 = "1sdbjv8w2mfpv82rx5iy4s532l1767vmlrg9d8khnvh8vrm2lshy"; + }; + + cargoSha256 = "0zi50imjvalwl6pxl35qrmbg74j5xdfaws8v69am4g9agbfjvlms"; + + cargoBuildFlags = with stdenv.lib; [ + "--no-default-features" + "--features" + (concatStringsSep "," (filter (x: x != "") [ + (optionalString withRodio "rodio-backend") + (optionalString withALSA "alsa-backend") + (optionalString withPulseAudio "pulseaudio-backend") + (optionalString withPortAudio "portaudio-backend") + + ])) + ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ] + ++ stdenv.lib.optional withALSA alsaLib + ++ stdenv.lib.optional withPulseAudio libpulseaudio + ++ stdenv.lib.optional withPortAudio portaudio; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Open Source Spotify client library and playback daemon"; + homepage = "https://github.com/librespot-org/librespot"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ bennofs ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27bca9d5dd6d..07089fc3aab4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19931,6 +19931,12 @@ in libquvi = callPackage ../applications/video/quvi/library.nix { }; + librespot = callPackage ../applications/audio/librespot { + withALSA = stdenv.isLinux; + withPulseAudio = config.pulseaudio or stdenv.isLinux; + withPortAudio = stdenv.isDarwin; + }; + linssid = libsForQt5.callPackage ../applications/networking/linssid { }; lollypop = callPackage ../applications/audio/lollypop { }; From 41bd44e05ddd8ff9fac48fd23875645b94da8904 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 19 Jun 2020 08:06:54 -0400 Subject: [PATCH 2128/3452] linux: 5.7.3 -> 5.7.4 --- 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 0f04abfec8fd..c299cc098722 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.3"; + version = "5.7.4"; # 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 = "1sgwdcyn9105lfgg25q41yj30sy9cqfdm8m4dmka8gzllxxyq407"; + sha256 = "06mm0bmjw54aypfhhbm9aaz5bmgymvygfak587iwv901635gb95w"; }; } // (args.argsOverride or {})) From 46dd569cd103fc78329170216e5b55d83e60b2a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 19 Jun 2020 14:36:16 +0200 Subject: [PATCH 2129/3452] python.pkgs.wcwidth: add setuptools --- pkgs/development/python-modules/wcwidth/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index b93ca1dbb4d0..75f65377b46f 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -1,6 +1,7 @@ { lib, fetchPypi, buildPythonPackage, pytestCheckHook , isPy3k , backports_functools_lru_cache +, setuptools }: buildPythonPackage rec { @@ -14,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - propagatedBuildInputs = lib.optionals (!isPy3k) [ + propagatedBuildInputs = [ setuptools ] ++ lib.optionals (!isPy3k) [ backports_functools_lru_cache ]; From cc37d7edd785e70a3a13db5268bd1439afbc1ab2 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Thu, 18 Jun 2020 16:02:47 +0200 Subject: [PATCH 2130/3452] nixos/acme: execute a single lego command Stop trying to execute `lego renew` if that is not necessary. Fix #86184. --- nixos/modules/security/acme.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 776ef07d716c..92fb85b99afc 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -302,6 +302,11 @@ in lpath = "acme/${cert}"; apath = "/var/lib/${lpath}"; spath = "/var/lib/acme/.lego/${cert}"; + keyName = builtins.replaceStrings ["*"] ["_"] data.domain; + requestedDomains = pipe ([ data.domain ] ++ (attrNames data.extraDomains)) [ + (domains: sort builtins.lessThan domains) + (domains: concatStringsSep "," domains) + ]; fileMode = if data.allowKeysForGroup then "640" else "600"; globalOpts = [ "-d" data.domain "--email" data.email "--path" "." "--key-type" data.keyType ] ++ optionals (cfg.acceptTerms) [ "--accept-tos" ] @@ -316,6 +321,7 @@ in certOpts ++ data.extraLegoRenewFlags); acmeService = { description = "Renew ACME Certificate for ${cert}"; + path = with pkgs; [ openssl ]; after = [ "network.target" "network-online.target" ]; wants = [ "network-online.target" ]; wantedBy = mkIf (!config.boot.isContainer) [ "multi-user.target" ]; @@ -332,11 +338,18 @@ in ExecStart = pkgs.writeScript "acme-start" '' #!${pkgs.runtimeShell} -e test -L ${spath}/accounts -o -d ${spath}/accounts || ln -s ../accounts ${spath}/accounts - ${pkgs.lego}/bin/lego ${renewOpts} || ${pkgs.lego}/bin/lego ${runOpts} + LEGO_ARGS=(${runOpts}) + if [ -e ${spath}/certificates/${keyName}.crt ]; then + REQUESTED_DOMAINS="${requestedDomains}" + EXISTING_DOMAINS="$(openssl x509 -in ${spath}/certificates/${keyName}.crt -noout -ext subjectAltName | tail -n1 | sed -e 's/ *DNS://g')" + if [ "''${REQUESTED_DOMAINS}" == "''${EXISTING_DOMAINS}" ]; then + LEGO_ARGS=(${renewOpts}) + fi + fi + ${pkgs.lego}/bin/lego ''${LEGO_ARGS[@]} ''; ExecStartPost = let - keyName = builtins.replaceStrings ["*"] ["_"] data.domain; script = pkgs.writeScript "acme-post-start" '' #!${pkgs.runtimeShell} -e cd ${apath} From 6b9c728ef90f24c9a03b759274246cbff0caf71c Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Fri, 19 Jun 2020 09:01:44 -0400 Subject: [PATCH 2131/3452] coredns: 1.6.9 -> 1.7.0 --- pkgs/servers/dns/coredns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 598f5bedc2bf..47b6c61dd39a 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "coredns"; - version = "1.6.9"; + version = "1.7.0"; goPackagePath = "github.com/coredns/coredns"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "18c02ss0sxxg8lkhdmyaac2x5alfxsizf6jqhck8bqkf6hiyv5hc"; + sha256 = "1wayfr26gwgdl0sfrvskb4hkxfmxfy7idbrpw3z4r05fkr2886xj"; }; - vendorSha256 = "0ykhqsz4a7bkkxcg7w23jl3qs36law1f8l1b5r3i26qlamibqxl7"; + vendorSha256 = "17znl3vkg73hnrfl697rw201nsd5sijgalnbkljk1b4m0a01zik1"; meta = with stdenv.lib; { homepage = "https://coredns.io"; From b7a9229b8fc778e27c62a36b71c1924961ebb3d7 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Thu, 18 Jun 2020 14:17:16 +0200 Subject: [PATCH 2132/3452] 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 b307674e0296f5178a9075f8835c2acd6826193d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Fri, 19 Jun 2020 16:40:38 +0200 Subject: [PATCH 2133/3452] gildas: 20200201_a -> 20200601_b (#91096) --- pkgs/applications/science/astronomy/gildas/default.nix | 6 +++--- pkgs/applications/science/astronomy/gildas/wrapper.patch | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 38d8e23a811b..74eea15e8303 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "feb20a"; - version = "20200201_a"; + srcVersion = "jun20b"; + version = "20200601_b"; pname = "gildas"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "05f34kpi3pfgf4dsyka7mkcln26yzb2mixnnc306krq0isjm7m26"; + sha256 = "190na9p9kaif4hviraksig6hsq35i1q3nlrm50l00kpj2n8knisk"; }; nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ]; diff --git a/pkgs/applications/science/astronomy/gildas/wrapper.patch b/pkgs/applications/science/astronomy/gildas/wrapper.patch index 2e470a1e9cdc..3843937bf1bc 100644 --- a/pkgs/applications/science/astronomy/gildas/wrapper.patch +++ b/pkgs/applications/science/astronomy/gildas/wrapper.patch @@ -1,12 +1,13 @@ diff --new-file -r -u gildas-src-feb17d.orig/admin/wrapper.sh gildas-src-feb17d/admin/wrapper.sh --- gildas-src-feb17d.orig/admin/wrapper.sh 1970-01-01 01:00:00.000000000 +0100 +++ gildas-src-feb17d/admin/wrapper.sh 2017-05-18 21:00:01.660778782 +0200 -@@ -0,0 +1,15 @@ +@@ -0,0 +1,16 @@ +#!/bin/sh -e + +export GAG_ROOT_DIR="%%OUT%%" +export GAG_PATH="${GAG_ROOT_DIR}/etc" +export GAG_EXEC_SYSTEM="libexec" ++export GAG_GAG="${HOME}/.gag" +export PYTHONHOME="%%PYTHONHOME%%" +if [ -z "\$PYTHONPATH" ]; then + PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python" From b62df8ab46788688ac30448d9f66e80df0acba47 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Thu, 18 Jun 2020 14:18:39 +0200 Subject: [PATCH 2134/3452] 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 2135/3452] 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 674b9141818fdb4104938ddf6fc18a3fdb00af37 Mon Sep 17 00:00:00 2001 From: Philipp Riegger Date: Fri, 19 Jun 2020 13:37:56 +0200 Subject: [PATCH 2136/3452] prometheus: 2.18.1 -> 2.19.1 --- pkgs/servers/monitoring/prometheus/default.nix | 4 ++-- pkgs/servers/monitoring/prometheus/webui-package.json | 2 +- pkgs/servers/monitoring/prometheus/webui-yarndeps.nix | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index c0b161954b26..0a91677011ab 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,13 +1,13 @@ { lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }: let - version = "2.18.1"; + version = "2.19.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "0ixgjp3j9dkdb0vv5n83h8w48xgi70m83im660z97y7mflr5s2cf"; + sha256 = "1isv66dnn61mm76r577qqafsn6w5msb0a6i9dykg4z7crcpsnq70"; }; webui = mkYarnPackage { diff --git a/pkgs/servers/monitoring/prometheus/webui-package.json b/pkgs/servers/monitoring/prometheus/webui-package.json index 64ac8689bbdf..09ebefa01102 100644 --- a/pkgs/servers/monitoring/prometheus/webui-package.json +++ b/pkgs/servers/monitoring/prometheus/webui-package.json @@ -24,7 +24,7 @@ "fuzzy": "^0.1.3", "i": "^0.3.6", "jest-fetch-mock": "^2.1.2", - "jquery": "^3.3.1", + "jquery": "^3.5", "jquery.flot.tooltip": "^0.9.0", "jsdom": "^15.2.0", "moment": "^2.24.0", diff --git a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix index 5eed837c910a..7e9843dc98b0 100644 --- a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -6634,11 +6634,11 @@ }; } { - name = "jquery___jquery_3.4.1.tgz"; + name = "jquery___jquery_3.5.1.tgz"; path = fetchurl { - name = "jquery___jquery_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz"; - sha1 = "714f1f8d9dde4bdfa55764ba37ef214630d80ef2"; + name = "jquery___jquery_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz"; + sha1 = "d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"; }; } { From f37b4d24d8872e82564c7b8f0ef5bc90476604d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 04:22:54 +0000 Subject: [PATCH 2137/3452] teleport: 4.1.0 -> 4.2.10 --- pkgs/servers/teleport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 1e1c0f938dbe..bfd00a08e6ff 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -3,14 +3,14 @@ buildGoPackage rec { pname = "teleport"; - version = "4.1.0"; + version = "4.2.10"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "1yj4z9lzvwvv566d8c4351xj23vmw8zh9scx87dlf0qzqxri91wk"; + sha256 = "0y6qih4m8snzfj8ddbcfqx0cz4ric0i5vgz0rgqp6wpi2arwysnn"; }; goPackagePath = "github.com/gravitational/teleport"; From 8745c7da4b4f4599690aa69014c5e56f9af8a783 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 17 Jun 2020 14:38:28 -0700 Subject: [PATCH 2138/3452] openrgb: init at 0.2 --- pkgs/applications/misc/openrgb/default.nix | 36 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/misc/openrgb/default.nix diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix new file mode 100644 index 000000000000..77f6513b0ca2 --- /dev/null +++ b/pkgs/applications/misc/openrgb/default.nix @@ -0,0 +1,36 @@ +{ mkDerivation, lib, fetchFromGitHub, qmake, libusb1, hidapi }: + +mkDerivation rec { + pname = "openrgb"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "CalcProgrammer1"; + repo = "OpenRGB"; + rev = "release_${version}"; + sha256 = "0b1mkp4ca4gdzk020kp6dkd3i9a13h4ikrn3417zscsvv5y9kv0s"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ libusb1 hidapi ]; + + installPhase = '' + mkdir -p $out/bin + cp OpenRGB $out/bin + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/OpenRGB --help > /dev/null + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Open source RGB lighting control"; + homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB"; + maintainers = with maintainers; [ jonringer ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07089fc3aab4..c4a2e72fe4fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5696,6 +5696,8 @@ in openresolv = callPackage ../tools/networking/openresolv { }; + openrgb = libsForQt5.callPackage ../applications/misc/openrgb { }; + opensc = callPackage ../tools/security/opensc { inherit (darwin.apple_sdk.frameworks) Carbon PCSC; }; From a7d1e4004408cf23012de521328058072e11969f Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Sat, 20 Jun 2020 00:33:06 +0900 Subject: [PATCH 2139/3452] gauche: fix path to cert file (#90708) --- pkgs/development/interpreters/gauche/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index 26a30ef2cd3c..58653fae8908 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "--with-iconv=${libiconv}" "--with-dbm=gdbm" "--with-zlib=${zlib}" - "--with-ca-bundle=$NIX_SSL_CERT_FILE" + "--with-ca-bundle=${cacert}/etc/ssl/certs/ca-bundle.crt" # TODO: Enable slib # Current slib in nixpkgs is specialized to Guile # "--with-slib=${slibGuile}/lib/slib" From ba600f39d85dd606ef32b1ddf41529db252b6cba Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Fri, 19 Jun 2020 12:30:58 +0200 Subject: [PATCH 2140/3452] unicode: 2.6 -> 2.7 upstream: - add East Asian width - hack to consider regular expressions ending with `$' - do not flush stdout - better upper/lowercase from internal python db packaging: - include manual page - update to unicode-13 --- pkgs/tools/misc/unicode/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix index c4ae9cc5e36d..b83dd17d0bc1 100644 --- a/pkgs/tools/misc/unicode/default.nix +++ b/pkgs/tools/misc/unicode/default.nix @@ -1,26 +1,32 @@ -{ stdenv, fetchFromGitHub, fetchurl, python3Packages }: +{ stdenv, fetchFromGitHub, fetchurl, python3Packages, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "unicode"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "garabik"; repo = "unicode"; rev = "v${version}"; - sha256 = "17hh4nwl5njsh7lnff583j2axn6rfvfbiqwp72n7vcsgkiszw4kg"; + sha256 = "15d9yvarxsiy0whx1mxzsjnnkrjdm3ga4qv2yy398mk0jh763q9v"; }; ucdtxt = fetchurl { - url = "http://www.unicode.org/Public/11.0.0/ucd/UnicodeData.txt"; - sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; + url = "https://www.unicode.org/Public/13.0.0/ucd/UnicodeData.txt"; + sha256 = "1fz8fcd23lxyl97ay8h42zvkcgcg8l81b2dm05nklkddr2zzpgxx"; }; + nativeBuildInputs = [ installShellFiles ]; + postFixup = '' substituteInPlace "$out/bin/.unicode-wrapped" \ --replace "/usr/share/unicode/UnicodeData.txt" "$ucdtxt" ''; + postInstall = '' + installManPage paracode.1 unicode.1 + ''; + meta = with stdenv.lib; { description = "Display unicode character properties"; homepage = "https://github.com/garabik/unicode"; From 3b9a8f54260e20f8eb794aa70fb83d627450c666 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 8 Jun 2020 16:59:31 +0300 Subject: [PATCH 2141/3452] neomutt: Make it not reference .dev outputs. --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index ad7b4debd3f2..b821c830a97a 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -60,6 +60,9 @@ stdenv.mkDerivation rec { "--sasl" "--with-homespool=mailbox" "--with-mailpath=" + # To make it not reference .dev outputs. See: + # https://github.com/neomutt/neomutt/pull/2367 + "--disable-include-path-in-cflags" # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail "ac_cv_path_SENDMAIL=sendmail" "--zlib" From b8f65212ec43b7671447b3dd83d365d134224a81 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 8 Jun 2020 17:01:42 +0300 Subject: [PATCH 2142/3452] neomutt: make manual.txt not empty Without elinks / w3m / lynx in the nativeBuildInputs, there are these errors in the build: LC_ALL=C w3m -dump -O UTF8 docs/manual.html > docs/manual.txt || \ LC_ALL=C lynx -dump -nolist -with_backspaces \ -display_charset=us-ascii docs/manual.html > docs/manual.txt || \ LC_ALL=C elinks -dump -no-numbering -no-references \ docs/manual.html | sed -e 's,\\001, ,g' > docs/manual.txt /nix/store/xfbmj7sl2ikicym9x3yq7cms5qx1w39k-bash-4.4-p23/bin/bash: w3m: command not found /nix/store/xfbmj7sl2ikicym9x3yq7cms5qx1w39k-bash-4.4-p23/bin/bash: line 1: lynx: command not found /nix/store/xfbmj7sl2ikicym9x3yq7cms5qx1w39k-bash-4.4-p23/bin/bash: line 3: elinks: command not found --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index b821c830a97a..0aa41e77e224 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl -, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell, sqlite, zlib +, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, elinks, mailcap, runtimeShell, sqlite, zlib , glibcLocales }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib + docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib elinks ]; enableParallelBuilding = true; From b58227a4c07e6e39dd8e191b8a8cd6c8ef28ff49 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 8 Jun 2020 17:46:28 +0300 Subject: [PATCH 2143/3452] neomutt: Remove old fixes for failing tests Includes both rfc2047 tests workarounds and locale workarounds. Fixes #86896. See https://github.com/neomutt/neomutt/pull/2314 . --- .../networking/mailreaders/neomutt/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 0aa41e77e224..340d4cb3939f 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -42,12 +42,6 @@ stdenv.mkDerivation rec { # and use a far more comprehensive list than the one shipped with neomutt substituteInPlace sendlib.c \ --replace /etc/mime.types ${mailcap}/etc/mime.types - - # The string conversion tests all fail with the first version of neomutt - # that has tests (20180223) as well as 20180716 so we disable them for now. - # I don't know if that is related to the tests or our build environment. - # Try again with a later release. - sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c ''; configureFlags = [ @@ -89,10 +83,8 @@ stdenv.mkDerivation rec { (cd test-files && ./setup.sh) export NEOMUTT_TEST_DIR=$(pwd)/test-files - export LC_ALL="en_US.UTF-8" ''; - checkInputs = [ glibcLocales ]; checkTarget = "test"; postCheck = "unset NEOMUTT_TEST_DIR"; From 605d7e1fe0adce6a24527f54aff529fb23b706a1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 19 Jun 2020 12:18:57 +0200 Subject: [PATCH 2144/3452] gollum: Update the dependencies (security, CVE-2020-8184) This updates rack to 2.2.3 for CVE-2020-8184 [0]. [0]: https://groups.google.com/g/rubyonrails-security/c/OWtmozPH9Ak --- pkgs/applications/misc/gollum/Gemfile.lock | 24 ++++++------ pkgs/applications/misc/gollum/gemset.nix | 44 +++++++++++----------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 4759cdcf5737..e7f905f3fe10 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - backports (3.17.0) + backports (3.17.2) concurrent-ruby (1.1.6) crass (1.0.6) execjs (2.7.0) - ffi (1.12.2) - gemojione (4.3.2) + ffi (1.13.1) + gemojione (4.3.3) json github-markup (3.0.4) gollum (5.0.1) @@ -25,28 +25,28 @@ GEM therubyrhino (~> 2.1.0) uglifier (~> 3.2) useragent (~> 0.16.2) - gollum-lib (5.0.3) + gollum-lib (5.0.4) gemojione (~> 4.1) github-markup (~> 3.0) - gollum-rugged_adapter (~> 0.99.4, >= 0.99.4) + gollum-rugged_adapter (~> 1.0) loofah (~> 2.3) nokogiri (~> 1.8) octicons (~> 8.5) rouge (~> 3.1) twitter-text (= 1.14.7) - gollum-rugged_adapter (0.99.4) + gollum-rugged_adapter (1.0) mime-types (>= 1.15) rugged (~> 0.99) json (2.3.0) kramdown (2.1.0) kramdown-parser-gfm (1.0.1) kramdown (~> 2.0) - loofah (2.5.0) + loofah (2.6.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.1009) + mime-types-data (3.2020.0512) mini_portile2 (2.4.0) multi_json (1.14.1) mustache (0.99.8) @@ -56,14 +56,14 @@ GEM mini_portile2 (~> 2.4.0) octicons (8.5.0) nokogiri (>= 1.6.3.1) - rack (2.2.2) + rack (2.2.3) rack-protection (2.0.8.1) rack - rb-fsevent (0.10.3) + rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.4) - rouge (3.17.0) + rouge (3.20.0) rss (0.2.9) rexml ruby2_keywords (0.0.2) @@ -88,7 +88,7 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-helpers (1.2.3) + sprockets-helpers (1.3.0) sprockets (>= 2.2) therubyrhino (2.1.2) therubyrhino_jar (>= 1.7.4, < 1.7.9) diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 3febcea2f9a6..c4df68960573 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13ywgyyxzlgks7nb17gwqjmdqjjmhc8si3iliv8jhf51lb3s865v"; + sha256 = "0rg58rd3hgk8wz4fbapn3szwgymk1q9lv4ywg37bkbcflsbi70iy"; type = "gem"; }; - version = "3.17.0"; + version = "3.17.2"; }; concurrent-ruby = { groups = ["default"]; @@ -44,10 +44,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; gemojione = { dependencies = ["json"]; @@ -55,10 +55,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "097mrsahv1h67kjrk1cpiqc1cbrfgvlp2rqwmzdzxrq0kx50461w"; + sha256 = "0fwd523pgr72w3w6jwpz9i6sggvz52d7831a1s4y3lv8m50j6ima"; type = "gem"; }; - version = "4.3.2"; + version = "4.3.3"; }; github-markup = { groups = ["default"]; @@ -87,10 +87,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r59fyf7i4rlp6wj9ilnqd9pmgpkafv0yl4jmrxa6hr2p4cmnf1g"; + sha256 = "0pr3djmawqpmifyadw1vfzdkq720dsaqih1wf8k2vksw0lr9la74"; type = "gem"; }; - version = "5.0.3"; + version = "5.0.4"; }; gollum-rugged_adapter = { dependencies = ["mime-types" "rugged"]; @@ -98,10 +98,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0016yfac3b3sy34k9wrqg422mjm8cpd1jd1m4gdn4x2d4jxhxkzq"; + sha256 = "0ln12976vm1ks74yyrssdx576b1z0hs8r82fivr366knv5hlcrdm"; type = "gem"; }; - version = "0.99.4"; + version = "1.0"; }; json = { groups = ["default"]; @@ -140,10 +140,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040"; + sha256 = "1s9hq8bpn6g5vqr3nzyirn3agn7x8agan6151zvq5vmkf6rvmyb2"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -161,10 +161,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18x61fc36951vw7f74gq8cyybdpxvyg5d0azvqhrs82ddw3v16xh"; + sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; type = "gem"; }; - version = "3.2019.1009"; + version = "3.2020.0512"; }; mini_portile2 = { groups = ["default"]; @@ -234,10 +234,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10mp9s48ssnw004aksq90gvhdvwczh8j6q82q2kqiqq92jd1zxbp"; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; type = "gem"; }; - version = "2.2.2"; + version = "2.2.3"; }; rack-protection = { dependencies = ["rack"]; @@ -255,10 +255,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; + sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87"; type = "gem"; }; - version = "0.10.3"; + version = "0.10.4"; }; rb-inotify = { dependencies = ["ffi"]; @@ -286,10 +286,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xl7k5paf66p57sphm4nfa4k86yf93lhdzzr0cv0l4divq12g2pr"; + sha256 = "1r5npy9a95qh5v74lw7ir3nhaq4xrzyhfdixd7c5xy295i92nnic"; type = "gem"; }; - version = "3.17.0"; + version = "3.20.0"; }; rss = { dependencies = ["rexml"]; @@ -383,10 +383,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hy67dwz76n5db00d9n3qy59ici96c2g25c9xpmp2nh8ilvha338"; + sha256 = "14iq8v16l31bfq7pikfmgcv5x6pkc5lbdmwwg6zlzcy1bibcliar"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.0"; }; therubyrhino = { dependencies = ["therubyrhino_jar"]; From 36572ae925fe1c2688140157e9acc9af3160bfdb Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Fri, 19 Jun 2020 09:05:09 -0700 Subject: [PATCH 2145/3452] nodePackages.nestjs/cli: init at 7.4.0 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 2863 +++++++++-------- 2 files changed, 1490 insertions(+), 1374 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index f26c7885dfb6..d106b8e2efa6 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -3,6 +3,7 @@ , "@antora/cli" , "@antora/site-generator-default" , "@bitwarden/cli" +, "@nestjs/cli" , "@vue/cli" , "@webassemblyjs/cli" , "@webassemblyjs/repl" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 964328388ca7..594225a07abc 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -22,31 +22,58 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.901.8" = { + "@angular-devkit/architect-0.901.9" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.901.8"; + version = "0.901.9"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.8.tgz"; - sha512 = "tK9ZQlubH6n+q+c2J9Wvfcxg3RFuRiTfJriNoodo6GHvtF2KLdPY67w3Gen0Sp172A5Q8Y927NseddNI8RZ/0A=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.9.tgz"; + sha512 = "Xokyh7bv4qICHpb5Xui1jPTi6ZZvzR5tbTIxT0DFWqw16TEkFgkNubQsW6mFSR3g3CXdySMfOwWExfa/rE1ggA=="; }; }; - "@angular-devkit/core-9.1.8" = { + "@angular-devkit/core-9.1.7" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "9.1.8"; + version = "9.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.8.tgz"; - sha512 = "4k1pZwje2oh5c/ULg7pnCBzTstx3l3uF7O5tQq/KXomDDsam97IhLm6cKUqQpaoyC1NUsBV6xJARJ0PyUP5TPQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.7.tgz"; + sha512 = "guvolu9Cl+qYMTtedLZD9wCqustJjdqzJ2psD2C1Sr1LrX9T0mprmDldR/YnhsitThveJEb6sM/0EvqWxoSvKw=="; }; }; - "@angular-devkit/schematics-9.1.8" = { + "@angular-devkit/core-9.1.9" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "9.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.9.tgz"; + sha512 = "SWgBh4an/Vezjw2BZ5S+bKvuK5lH6gOtR8d5YjN9vxpJSZ0GimrGjfnLlWOkwWAsU8jfn4JzofECUHwX/7EW6Q=="; + }; + }; + "@angular-devkit/schematics-9.1.7" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "9.1.8"; + version = "9.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.8.tgz"; - sha512 = "/8L5J4X6SkcFMRmrSQHvJWOPilrMWTNlv1lD+1z06D3xGJEktVxXM3gCUXhDrbMvpoi+lYtR2Fuia0E6zvyjCQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.7.tgz"; + sha512 = "oeHPJePBcPp/bd94jHQeFUnft93PGF5iJiKV9szxqS8WWC5OMZ5eK7icRY0PwvLyfenspAZxdZcNaqJqPMul5A=="; + }; + }; + "@angular-devkit/schematics-9.1.9" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "9.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.9.tgz"; + sha512 = "aKuMmS3wshOTl9+01jiB50ml09fRN1WfOOtoNqwvKTEi87DrT6Mn3l0eVQo8PJK/bIq/FBmPgsIl2nsETiBSxg=="; + }; + }; + "@angular-devkit/schematics-cli-0.901.9" = { + name = "_at_angular-devkit_slash_schematics-cli"; + packageName = "@angular-devkit/schematics-cli"; + version = "0.901.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.901.9.tgz"; + sha512 = "mkbN30u7/GvFOIOjj20w5OWi+vEOc/mdnpSrm3AxXvmha4AG56VL6uzF/kKHw9vyhfv8wLMt11OK/iSms9hSWw=="; }; }; "@antora/asciidoc-loader-2.3.3" = { @@ -679,6 +706,15 @@ let sha512 = "b3pWVncLBYoPP60UOTc7NMlbtsHQ6ITim78KQejNHK6WJ2mzV5kCcg4mIWpasAfJEgwVTibwo2e+FU7UEIKQUg=="; }; }; + "@babel/plugin-syntax-import-meta-7.10.1" = { + name = "_at_babel_slash_plugin-syntax-import-meta"; + packageName = "@babel/plugin-syntax-import-meta"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.1.tgz"; + sha512 = "ypC4jwfIVF72og0dgvEcFRdOM2V9Qm1tu7RGmdZOlhsccyK0wisXmMObGuWEOd5jQ+K9wcIgSNftCpk2vkjUfQ=="; + }; + }; "@babel/plugin-syntax-json-strings-7.8.3" = { name = "_at_babel_slash_plugin-syntax-json-strings"; packageName = "@babel/plugin-syntax-json-strings"; @@ -1453,40 +1489,40 @@ let sha512 = "Ec3T4Zuo63LwG+RfK2ryz8ChPfncBf8fiSJ1xr68FtLDVznDNulvlNKFbfREE5koWejwsnJrjLCv6IX5IbhExg=="; }; }; - "@graphql-tools/load-6.0.9" = { + "@graphql-tools/load-6.0.10" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "6.0.9"; + version = "6.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.0.9.tgz"; - sha512 = "JDlLbkLlxjFF/of+HF3c+UnoK2AEgqeVS5xH6re60Khp2DiBvWOivACvPx4VxF49NLnvu1BYsGxxH0BGPbAA3A=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.0.10.tgz"; + sha512 = "/Q07DuSvhRTu7iYr+iZDXuXLjQJ/0uZEadjC4uKthD4gX6x4bvV49GLdqka+J1zq02C5U5mAOdDT7+lHIrEBFg=="; }; }; - "@graphql-tools/merge-6.0.9" = { + "@graphql-tools/merge-6.0.10" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.0.9"; + version = "6.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.0.9.tgz"; - sha512 = "aOYgziSQnlubdaCFuPS5MNu9hmhMMfl65xvkZN1k5L/kP6rGN6SyjfeUEEzveOFgIYJbYxQEoxySD9gBAm8PiQ=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.0.10.tgz"; + sha512 = "fnz9h5vdA8LXc9TvmhnRXykwFZWZ4FdBeo4g3R1KqcQCp65ByCMcBuCJtYf4VxPrcgTLGlWtVOHrItCi0kdioA=="; }; }; - "@graphql-tools/schema-6.0.9" = { + "@graphql-tools/schema-6.0.10" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "6.0.9"; + version = "6.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.0.9.tgz"; - sha512 = "lemY+UeZRVmMYPvszCKvPfaR+R0dR2FgqjhESzlNWBbLhHuCewilTzYuQ+A+o8hQxdtPGIHfNPGf6A0ZZ70jWw=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.0.10.tgz"; + sha512 = "g8iy36dgf/Cpyz7bHSE2axkE8PdM5VYdS2tntmytLvPaN3Krb8IxBpZBJhmiICwyAAkruQE7OjDfYr8vP8jY4A=="; }; }; - "@graphql-tools/utils-6.0.9" = { + "@graphql-tools/utils-6.0.10" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "6.0.9"; + version = "6.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.0.9.tgz"; - sha512 = "WtX+t64SCN9VejKA/gdtm2sHPOX8D1G1tAyrrKH7hnh6RaCmQwYkhs/f6tBnTTYOIBy7yVYNoXzqiv/tmOkAOQ=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.0.10.tgz"; + sha512 = "1s3vBnYUIDLBGEaV1VF3lv1Xq54lT8Oz7tNNypv7K7cv3auKX7idRtjP8RM6hKpGod46JNZgu3NNOshMUEyEyA=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -2254,6 +2290,15 @@ let sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg=="; }; }; + "@nestjs/schematics-7.0.1" = { + name = "_at_nestjs_slash_schematics"; + packageName = "@nestjs/schematics"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.0.1.tgz"; + sha512 = "MOnJPqKPpuwBHDdw96gHoshd/QEYrUlLPF92xQFXm6uIOo1EGISg8OOSoji2isEtp2gHpO+bL8p/h4oPG10Fqw=="; + }; + }; "@node-red/editor-api-1.0.6" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; @@ -2596,13 +2641,13 @@ let sha512 = "+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA=="; }; }; - "@octokit/request-error-2.0.1" = { + "@octokit/request-error-2.0.2" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.1.tgz"; - sha512 = "5lqBDJ9/TOehK82VvomQ6zFiZjPeSom8fLkFVLuYL3sKiIb5RB8iN/lenLkY7oBmyQcGP7FBMGiIZTO8jufaRQ=="; + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.2.tgz"; + sha512 = "2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw=="; }; }; "@octokit/rest-16.43.1" = { @@ -2623,22 +2668,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-4.1.10" = { + "@octokit/types-5.0.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "4.1.10"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-4.1.10.tgz"; - sha512 = "/wbFy1cUIE5eICcg0wTKGXMlKSbaAxEr00qaBXzscLXpqhcwgXeS6P8O0pkysBhRfyjkKjJaYrvR1ExMO5eOXQ=="; - }; - }; - "@octokit/types-5.0.0" = { - name = "_at_octokit_slash_types"; - packageName = "@octokit/types"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-5.0.0.tgz"; - sha512 = "3LVS+MbeqwSd5G4KS8123cZz+hWomsiGeMnQ/QJIBFDwL/YHX8kkr0FZXrgWEMO7Fgi2/VOrhbiFnk9sZ+s4qA=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-5.0.1.tgz"; + sha512 = "GorvORVwp244fGKEt3cgt/P+M0MGy4xEDbckw+K5ojEezxyMDgCaYPKVct+/eWQfZXOT7uq0xRpmrl/+hliabA=="; }; }; "@parcel/fs-1.11.0" = { @@ -2830,31 +2866,40 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-9.1.8" = { + "@schematics/angular-9.1.9" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "9.1.8"; + version = "9.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.8.tgz"; - sha512 = "fjyAP9m4aF51OVdksRXCOF8BTyt96PqFmKK9G0kuwOzgfx2gPZNOO3wOZH6xFAMZ09y86VGzasZxZNeDdyN4sQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.9.tgz"; + sha512 = "c8YGZ6pDfr8IDD1qaOjlEBAkEz14KFSxDj0hCWs0xIM0py513tu5sW8+ziYxGG4bgqpsgVR/KAxuY78iBfUVag=="; }; }; - "@schematics/update-0.901.8" = { + "@schematics/schematics-0.901.9" = { + name = "_at_schematics_slash_schematics"; + packageName = "@schematics/schematics"; + version = "0.901.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.901.9.tgz"; + sha512 = "Nca8Ig/mFFnhLmosbdWysX4N2HiwVOzA4gQj2TZnMCJ98Cftdebs388LstjsJwGtJyvAa2v4yoaPaUMIGVgQ9w=="; + }; + }; + "@schematics/update-0.901.9" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.901.8"; + version = "0.901.9"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.8.tgz"; - sha512 = "v1tEYX6yM5vuwXW7AG7OZ4OtjqRwTo3kd69LVJyOdF/d9HlqaAFU301RuEsAPwOrPqZEQdTwklH1fNJnqgpB/w=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.9.tgz"; + sha512 = "VChX0VO/oyfCF3y+HjMTU2qN3vGgJYxEI1V+Q9aAlwl95t3GAufuaFY1CNW3YV4XkYIjD88e3yWl8d5yO4qf4w=="; }; }; - "@serverless/cli-1.4.0" = { + "@serverless/cli-1.5.1" = { name = "_at_serverless_slash_cli"; packageName = "@serverless/cli"; - version = "1.4.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.4.0.tgz"; - sha512 = "YqlCiYmRFeGksw6XJaXbigIDlktc7OfRuVpyPB7IZgkCJ9mUlBmvyWdwqJEQdkUz0xPTGsd4Jd/XSrwyiw1Brg=="; + url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.5.1.tgz"; + sha512 = "YUVPGutE8VEbIPCb6aHfePec5kKA1iaiMyLb8snXWYDLy/EWW1Dkff/DiLgeNEy6jqV4n+9lng92re+tMi+U6g=="; }; }; "@serverless/component-metrics-1.0.8" = { @@ -2866,13 +2911,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.30.14" = { + "@serverless/components-2.30.20" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.30.14"; + version = "2.30.20"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.14.tgz"; - sha512 = "sWCuALO55BhdJAPJSN4KgifRJUCkr44FE/Bhw6hpz+3vK49mfnjDF6iHdNi6wNx85BRRgXGz1z/015epwqRtnA=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.20.tgz"; + sha512 = "2g9eLSXgKa0gOt3zu/z7zuI7Ghf1bfWJqLtG5tHVEIv73+l484pD9HoW9zJz3hpeIAXpcSPzkjUk9bug/o6fgw=="; }; }; "@serverless/core-1.1.2" = { @@ -2947,13 +2992,22 @@ let sha512 = "hcMiX523rkp6kHeKnM1x6/dXEY+d1UFSr901yVKeeCgpFy4u33UI9vlKaPweAZCF6Ahzqywf01IsFTuBVadCrQ=="; }; }; - "@serverless/utils-china-0.1.14" = { + "@serverless/utils-1.1.0" = { + name = "_at_serverless_slash_utils"; + packageName = "@serverless/utils"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/utils/-/utils-1.1.0.tgz"; + sha512 = "MZBLphb8Dz9/mGclFQ53INznSFHZAwS2z4H8RZb6UPCqcRhW0SRrdLwLmn9JIqLWH4Zn95LbNsAjmzJ4Dl3CPQ=="; + }; + }; + "@serverless/utils-china-0.1.15" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.14"; + version = "0.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.14.tgz"; - sha512 = "M1/bvs/ZhqPfj1yqdsyxu4yIWtCXHd+a5Av/ZXef1deTn1zJHO+ZJdOtvFzWHb0Sr7sX4p2ZHD/vGj0Rve/Pzg=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.15.tgz"; + sha512 = "f7yPv3fJ2UNfo+w/O+Pt/vlHyCqzR8OAIbPnUi9wJD7AnK+95KK6tEEhDRSE/E+qpa5AbUN3cAJ00ih1HrGYAw=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -3019,13 +3073,13 @@ let sha512 = "XMc2SCFH4RBSncZgoPb+BBlNq0NYpEpCzptKi69qyMpBy0VsRqIQqddedaazMCU1xEpXTytq6KMYpzUafZzp5Q=="; }; }; - "@snyk/cli-interface-2.6.0" = { + "@snyk/cli-interface-2.8.0" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.6.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.6.0.tgz"; - sha512 = "jtk0gf80v4mFyDqaQNokD8GOPMTXpIUL35ewg6jtmuZw41xt56WF9kqCjiiViSRRRYA0RK+RuiVfmJA5pxvMUQ=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.8.0.tgz"; + sha512 = "St/G39iJG1zQK15L24kcVYM2gmFc/ylBCcBqU2DMZKJKwOPccKLUO6s+dWIUXMccQ+DFS6TuHPvuAKQNi9C4Yg=="; }; }; "@snyk/cocoapods-lockfile-parser-3.4.0" = { @@ -3064,6 +3118,15 @@ let sha512 = "SePWsDyD7qrLxFifIieEl4GqyOODfOnP0hmUweTG5YcMroAV5nARGAUcjxREGzbXMcUpPfZhAaqFjYgzUDH8dQ=="; }; }; + "@snyk/dep-graph-1.19.0" = { + name = "_at_snyk_slash_dep-graph"; + packageName = "@snyk/dep-graph"; + version = "1.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.0.tgz"; + sha512 = "/0phOICMk4hkX2KtZgi+4KNd5G9oYDIlxQDQk+ui2xl4gonPvK6Q5MFzHP7Xet1YY/XoU33ox41i+IO48qZ+zQ=="; + }; + }; "@snyk/gemfile-1.2.0" = { name = "_at_snyk_slash_gemfile"; packageName = "@snyk/gemfile"; @@ -3415,6 +3478,15 @@ let sha512 = "jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ=="; }; }; + "@types/anymatch-1.3.1" = { + name = "_at_types_slash_anymatch"; + packageName = "@types/anymatch"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz"; + sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; + }; + }; "@types/babel-types-7.0.7" = { name = "_at_types_slash_babel-types"; packageName = "@types/babel-types"; @@ -3712,6 +3784,15 @@ let sha512 = "7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ=="; }; }; + "@types/json5-0.0.29" = { + name = "_at_types_slash_json5"; + packageName = "@types/json5"; + version = "0.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"; + sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; + }; + }; "@types/keygrip-1.0.2" = { name = "_at_types_slash_keygrip"; packageName = "@types/keygrip"; @@ -3937,6 +4018,15 @@ let sha512 = "7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="; }; }; + "@types/source-list-map-0.1.2" = { + name = "_at_types_slash_source-list-map"; + packageName = "@types/source-list-map"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz"; + sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; + }; + }; "@types/superagent-3.8.2" = { name = "_at_types_slash_superagent"; packageName = "@types/superagent"; @@ -3946,6 +4036,24 @@ let sha512 = "kdU8ydio1weSvhIIh9rptZ6MdMiR2NQGFnlnZ5qQ7OiQS1ej79zK4GaJ9qX3naSTpOA7iWqwUnZCQpd7SpD1NA=="; }; }; + "@types/tapable-1.0.6" = { + name = "_at_types_slash_tapable"; + packageName = "@types/tapable"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz"; + sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA=="; + }; + }; + "@types/uglify-js-3.9.2" = { + name = "_at_types_slash_uglify-js"; + packageName = "@types/uglify-js"; + version = "3.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.2.tgz"; + sha512 = "d6dIfpPbF+8B7WiCi2ELY7m0w1joD8cRW4ms88Emdb2w062NeEpbNCeWwVCgzLRpVG+5e74VFSg4rgJ2xXjEiQ=="; + }; + }; "@types/unist-2.0.3" = { name = "_at_types_slash_unist"; packageName = "@types/unist"; @@ -3982,6 +4090,24 @@ let sha512 = "b0Gyir7sPBCqiKLygAhn/AYVfzWD+SMPkWltBrIuPEyTOxSU1wVApWY/FcxYO2EWTRacoubTl4+gvZf86RkecA=="; }; }; + "@types/webpack-4.41.17" = { + name = "_at_types_slash_webpack"; + packageName = "@types/webpack"; + version = "4.41.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.17.tgz"; + sha512 = "6FfeCidTSHozwKI67gIVQQ5Mp0g4X96c2IXxX75hYEQJwST/i6NyZexP//zzMOBb+wG9jJ7oO8fk9yObP2HWAw=="; + }; + }; + "@types/webpack-sources-1.4.0" = { + name = "_at_types_slash_webpack-sources"; + packageName = "@types/webpack-sources"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.0.tgz"; + sha512 = "c88dKrpSle9BtTqR6ifdaxu1Lvjsl3C5OsfvuUbUwdXymshv1TkufUAXBajCCUM/f/TmnkZC/Esb03MinzSiXQ=="; + }; + }; "@types/ws-7.2.5" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -4036,13 +4162,13 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@typescript-eslint/eslint-plugin-3.2.0" = { + "@typescript-eslint/eslint-plugin-3.3.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.2.0.tgz"; - sha512 = "t9RTk/GyYilIXt6BmZurhBzuMT9kLKw3fQoJtK9ayv0tXTlznXEAnx07sCLXdkN3/tZDep1s1CEV95CWuARYWA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.3.0.tgz"; + sha512 = "Ybx/wU75Tazz6nU2d7nN6ll0B98odoiYLXwcuwS5WSttGzK46t0n7TPRQ4ozwcTv82UY6TQoIvI+sJfTzqK9dQ=="; }; }; "@typescript-eslint/experimental-utils-1.13.0" = { @@ -4054,13 +4180,13 @@ let sha512 = "zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg=="; }; }; - "@typescript-eslint/experimental-utils-3.2.0" = { + "@typescript-eslint/experimental-utils-3.3.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.2.0.tgz"; - sha512 = "UbJBsk+xO9dIFKtj16+m42EvUvsjZbbgQ2O5xSTSfVT1Z3yGkL90DVu0Hd3029FZ5/uBgl+F3Vo8FAcEcqc6aQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.3.0.tgz"; + sha512 = "d4pGIAbu/tYsrPrdHCQ5xfadJGvlkUxbeBB56nO/VGmEDi/sKmfa5fGty5t5veL1OyJBrUmSiRn1R1qfVDydrg=="; }; }; "@typescript-eslint/parser-1.13.0" = { @@ -4072,13 +4198,13 @@ let sha512 = "ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ=="; }; }; - "@typescript-eslint/parser-3.2.0" = { + "@typescript-eslint/parser-3.3.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.2.0.tgz"; - sha512 = "Vhu+wwdevDLVDjK1lIcoD6ZbuOa93fzqszkaO3iCnmrScmKwyW/AGkzc2UvfE5TCoCXqq7Jyt6SOXjsIlpqF4A=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.3.0.tgz"; + sha512 = "a7S0Sqn/+RpOOWTcaLw6RD4obsharzxmgMfdK24l364VxuBODXjuJM7ImCkSXEN7oz52aiZbXSbc76+2EsE91w=="; }; }; "@typescript-eslint/typescript-estree-1.13.0" = { @@ -4099,13 +4225,13 @@ let sha512 = "OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg=="; }; }; - "@typescript-eslint/typescript-estree-3.2.0" = { + "@typescript-eslint/typescript-estree-3.3.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.2.0.tgz"; - sha512 = "uh+Y2QO7dxNrdLw7mVnjUqkwO/InxEqwN0wF+Za6eo3coxls9aH9kQ/5rSvW2GcNanebRTmsT5w1/92lAOb1bA=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.3.0.tgz"; + sha512 = "3SqxylENltEvJsjjMSDCUx/edZNSC7wAqifUU1Ywp//0OWEZwMZJfecJud9XxJ/40rAKEbJMKBOQzeOjrLJFzQ=="; }; }; "@vue/cli-shared-utils-4.4.4" = { @@ -4702,15 +4828,6 @@ let sha1 = "9a8eac8ff79866f3f9b4bb1443ca778f1598aeda"; }; }; - "accepts-1.2.13" = { - name = "accepts"; - packageName = "accepts"; - version = "1.2.13"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz"; - sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; - }; - }; "accepts-1.3.7" = { name = "accepts"; packageName = "accepts"; @@ -4864,13 +4981,13 @@ let sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="; }; }; - "acorn-walk-7.1.1" = { + "acorn-walk-7.2.0" = { name = "acorn-walk"; packageName = "acorn-walk"; - version = "7.1.1"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz"; - sha512 = "wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ=="; + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz"; + sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; }; }; "adbkit-2.11.1" = { @@ -5035,13 +5152,13 @@ let sha512 = "e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ=="; }; }; - "agentkeepalive-4.1.2" = { + "agentkeepalive-4.1.3" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.2.tgz"; - sha512 = "waNHE7tQBBn+2qXucI8HY0o2Y0OBPWldWOWsZwY71JcCm4SvrPnWdceFfB5NIXSqE8Ewq6VR/Qt5b1i69P6KCQ=="; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.3.tgz"; + sha512 = "wn8fw19xKZwdGPO47jivonaHRTd+nGOMP1z11sgGeQzDy2xd5FG0R67dIMcKHDE2cJ5y+YXV30XVGUBPRSY7Hg=="; }; }; "aggregate-error-3.0.1" = { @@ -5161,13 +5278,13 @@ let sha1 = "617997fc5f60576894c435f940d819e135b80762"; }; }; - "ajv-keywords-3.4.1" = { + "ajv-keywords-3.5.0" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; - sha512 = "RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.0.tgz"; + sha512 = "eyoaac3btgU8eJlvh01En8OCKzRqlLe2G5jDsCr3RiE2uLGMEEB1aaGwVVpwR8M95956tGH6R+9edC++OvzaVw=="; }; }; "ajv-merge-patch-4.1.0" = { @@ -5701,13 +5818,13 @@ let sha512 = "h++/jQAY7GA+4TBM+7ezvctFmmGNLrAPf51KsagZj+NkT9qvxp585rdsuatynVbSl59toPK2EuVmc6ilmQHf+g=="; }; }; - "apollo-engine-reporting-2.0.1" = { + "apollo-engine-reporting-2.2.0" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "2.0.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-2.0.1.tgz"; - sha512 = "3OYYk7DqNuJ5xKYnyLy5O2n506jYSryim8WqzBTn9MRphRamwPFjHYQm+akPA60AubXrWnYa6A8euMAiQU0ttA=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-2.2.0.tgz"; + sha512 = "FmfWTpyEATO392QHcot3PNMrxNhEJ4Kq+QiYY263vN/OBLZQ5zpkFY25iB6gVuiJoz3NUkByhxq5f/XjarJVvA=="; }; }; "apollo-engine-reporting-protobuf-0.5.1" = { @@ -5827,13 +5944,13 @@ let sha512 = "L7LHZ3k9Ao5OSf2WStvQhxdsNVplRQi7kCAPfqf9Z3GBEnQ2uaL0EgO0hSmtVHfXTbk5CTRziMT1Pe87bXrFIw=="; }; }; - "apollo-server-core-2.14.4" = { + "apollo-server-core-2.15.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.14.4"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.14.4.tgz"; - sha512 = "aAfsvbJ2YrqAXDBgcBQocOmQJ5DkeOnEYQ6ADdkkDNU68V5yBRkAHLTOzPfbUlGHVrnOH8PT1FIVWwu5mBgkVA=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.15.0.tgz"; + sha512 = "PwNm/G5IXReev7E0ZaRAekQ7pN9BTuXH8c2QVgfMGMno3XiN5Dj+1DXYQthpwNJch0y5zhhLcb/JbClijgSEsA=="; }; }; "apollo-server-env-2.4.4" = { @@ -5854,13 +5971,13 @@ let sha512 = "7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg=="; }; }; - "apollo-server-express-2.14.4" = { + "apollo-server-express-2.15.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.14.4"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.14.4.tgz"; - sha512 = "g0ml0NGmghvJhTiXMR0HqDD8eTz77zdgzDG2XoqNoRehtVIsZq8fmKTagVt9cUKCKKiBPUF+4tqAGD9lnprUdw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.15.0.tgz"; + sha512 = "ECptVIrOVW2cmMWvqtpkZfyZrQL8yTSgbVvP4M8qcPV/3XxDJa6444zy7vxqN7lyYl8IJAsg/IwC0vodoXe//A=="; }; }; "apollo-server-plugin-base-0.9.0" = { @@ -6637,13 +6754,13 @@ let sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; }; }; - "asn1.js-5.3.0" = { + "asn1.js-5.4.1" = { name = "asn1.js"; packageName = "asn1.js"; - version = "5.3.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.3.0.tgz"; - sha512 = "WHnQJFcOrIWT1RLOkFFBQkFVvyt9BPOOrH+Dp152Zk4R993rSzXUGPmkybIcUFhHE2d/iHH+nCaOWVCDbO8fgA=="; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz"; + sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="; }; }; "assert-1.5.0" = { @@ -7096,13 +7213,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.696.0" = { + "aws-sdk-2.700.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.696.0"; + version = "2.700.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.696.0.tgz"; - sha512 = "LpEZf0ozwVOARKiqXzJ5njXt9eQswRDCwLNK+iTeADGv1up5g7pwU23itOrSLeer3FHV6iueEr+CxEpjQhrEQw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.700.0.tgz"; + sha512 = "faBkr/D3IavfL2mwst4/thiKsHkN8YCwU9927Mkiushbe7n4UXxlcNf7LnVxFyjr3WIf4KfziSw4bajRAiAjYA=="; }; }; "aws-sign2-0.6.0" = { @@ -7510,13 +7627,13 @@ let sha1 = "be241ca81404030678b748717322b89d0c8fe280"; }; }; - "babel-preset-current-node-syntax-0.1.2" = { + "babel-preset-current-node-syntax-0.1.3" = { name = "babel-preset-current-node-syntax"; packageName = "babel-preset-current-node-syntax"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz"; - sha512 = "u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw=="; + url = "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz"; + sha512 = "uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ=="; }; }; "babel-preset-jest-25.5.0" = { @@ -7906,15 +8023,6 @@ let sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; }; }; - "better-curry-1.6.0" = { - name = "better-curry"; - packageName = "better-curry"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/better-curry/-/better-curry-1.6.0.tgz"; - sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869"; - }; - }; "bezier-js-2.6.1" = { name = "bezier-js"; packageName = "bezier-js"; @@ -8023,15 +8131,6 @@ let sha512 = "nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg=="; }; }; - "binaryheap-0.0.3" = { - name = "binaryheap"; - packageName = "binaryheap"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz"; - sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6"; - }; - }; "bindings-1.2.1" = { name = "bindings"; packageName = "bindings"; @@ -8284,15 +8383,6 @@ let sha1 = "2f7b4ec80216328a9fddebdf69c8d4942feff7d8"; }; }; - "bluebird-2.9.9" = { - name = "bluebird"; - packageName = "bluebird"; - version = "2.9.9"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; - sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3"; - }; - }; "bluebird-3.4.7" = { name = "bluebird"; packageName = "bluebird"; @@ -8437,15 +8527,6 @@ let sha1 = "b4a0a5a839a406454af0fe05a8b91a7a766a54e2"; }; }; - "bottleneck-1.5.3" = { - name = "bottleneck"; - packageName = "bottleneck"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz"; - sha1 = "55fa64920d9670087d44150404525d59f9511c20"; - }; - }; "boundary-1.0.1" = { name = "boundary"; packageName = "boundary"; @@ -8977,15 +9058,6 @@ let sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; - "buffercursor-0.0.12" = { - name = "buffercursor"; - packageName = "buffercursor"; - version = "0.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz"; - sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; - }; - }; "buffers-0.1.1" = { name = "buffers"; packageName = "buffers"; @@ -9517,13 +9589,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001081" = { + "caniuse-lite-1.0.30001084" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001081"; + version = "1.0.30001084"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001081.tgz"; - sha512 = "iZdh3lu09jsUtLE6Bp8NAbJskco4Y3UDtkR3GTCJGsbMowBU5IWDFF79sV2ws7lSqTzWyKazxam2thasHymENQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001084.tgz"; + sha512 = "ftdc5oGmhEbLUuMZ/Qp3mOpzfZLCxPYKcvGv6v2dJJ+8EdqcvZRbAGOiLmkM/PV1QGta/uwBs8/nCl6sokDW6w=="; }; }; "capture-exit-2.0.0" = { @@ -11083,15 +11155,6 @@ let sha1 = "a58d0df042c186fcf822a8e8015f5450d2d79a8b"; }; }; - "combined-stream-0.0.7" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - }; "combined-stream-1.0.6" = { name = "combined-stream"; packageName = "combined-stream"; @@ -11731,15 +11794,6 @@ let sha1 = "6874f1e935fca99d048caeaaad9a0aeb020bcce0"; }; }; - "content-disposition-0.5.0" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; - sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; - }; - }; "content-disposition-0.5.2" = { name = "content-disposition"; packageName = "content-disposition"; @@ -11957,15 +12011,6 @@ let sha1 = "90eb469ddce905c866de687efc43131d8801f9d0"; }; }; - "cookie-0.1.2" = { - name = "cookie"; - packageName = "cookie"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; - sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; - }; - }; "cookie-0.3.1" = { name = "cookie"; packageName = "cookie"; @@ -12011,15 +12056,6 @@ let sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb"; }; }; - "cookie-signature-1.0.5" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; - sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9"; - }; - }; "cookie-signature-1.0.6" = { name = "cookie-signature"; packageName = "cookie-signature"; @@ -12029,15 +12065,6 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "cookiejar-2.0.1" = { - name = "cookiejar"; - packageName = "cookiejar"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; - sha1 = "3d12752f6adf68a892f332433492bd5812bb668f"; - }; - }; "cookiejar-2.0.6" = { name = "cookiejar"; packageName = "cookiejar"; @@ -12308,15 +12335,6 @@ let sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454"; }; }; - "crc-3.2.1" = { - name = "crc"; - packageName = "crc"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; - sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; - }; - }; "crc-3.8.0" = { name = "crc"; packageName = "crc"; @@ -13325,24 +13343,6 @@ let sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; }; }; - "debug-1.0.5" = { - name = "debug"; - packageName = "debug"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-1.0.5.tgz"; - sha1 = "f7241217430f99dec4c2b473eab92228e874c2ac"; - }; - }; - "debug-2.1.3" = { - name = "debug"; - packageName = "debug"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; - sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e"; - }; - }; "debug-2.2.0" = { name = "debug"; packageName = "debug"; @@ -13910,15 +13910,6 @@ let sha512 = "Lwaf3zVFDMBop1yDuFZ19F9WyGcZcGacsbdlZtWjQmM50tOcMntm1njF/Nb/Vjij3KaSvCF+sEYGKrrjObu2NA=="; }; }; - "delayed-stream-0.0.5" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -14072,15 +14063,6 @@ let sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA=="; }; }; - "destroy-1.0.3" = { - name = "destroy"; - packageName = "destroy"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; - sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; - }; - }; "destroy-1.0.4" = { name = "destroy"; packageName = "destroy"; @@ -15296,13 +15278,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.469" = { + "electron-to-chromium-1.3.478" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.469"; + version = "1.3.478"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.469.tgz"; - sha512 = "O9JM6ZsFhS0uy0S2Y3G8EoNfqio3srdxCuwuJh8tKgQKa6rf7je/xQ3TIoiEaEtpf2/qFFLAGt/xB4MjuUZqRw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.478.tgz"; + sha512 = "pt9GUDD52uEO9ZXWcG4UuW/HwE8T+a8iFP7K2qqWrHB5wUxbbvCIXGBVpQDDQwSR766Nn4AkmLYxOUNd4Ji5Dw=="; }; }; "elegant-spinner-1.0.1" = { @@ -15332,13 +15314,13 @@ let sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; }; }; - "elliptic-6.5.2" = { + "elliptic-6.5.3" = { name = "elliptic"; packageName = "elliptic"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz"; - sha512 = "f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw=="; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz"; + sha512 = "IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw=="; }; }; "email-validator-2.0.4" = { @@ -15423,15 +15405,6 @@ let sha512 = "5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw=="; }; }; - "emojis-list-2.1.0" = { - name = "emojis-list"; - packageName = "emojis-list"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz"; - sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; - }; - }; "emojis-list-3.0.0" = { name = "emojis-list"; packageName = "emojis-list"; @@ -15630,22 +15603,13 @@ let sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359"; }; }; - "enhanced-resolve-4.1.0" = { + "enhanced-resolve-4.2.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz"; - sha512 = "F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng=="; - }; - }; - "enhanced-resolve-4.1.1" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz"; - sha512 = "98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.2.0.tgz"; + sha512 = "S7eiFb/erugyd1rLb6mQ3Vuq+EXHv5cpCkNqqIkYkBgN2QdFnyCZzFBleqwGEx4lgNGYij81BWnCrFNK7vxvjQ=="; }; }; "ensure-posix-path-1.1.1" = { @@ -15819,13 +15783,13 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.17.5" = { + "es-abstract-1.17.6" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.5"; + version = "1.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz"; - sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz"; + sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="; }; }; "es-array-method-boxes-properly-1.0.0" = { @@ -15873,15 +15837,6 @@ let sha1 = "aba8d9e1943a895ac96837a62a39b3f55ecd94ab"; }; }; - "es5class-2.3.1" = { - name = "es5class"; - packageName = "es5class"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es5class/-/es5class-2.3.1.tgz"; - sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66"; - }; - }; "es6-error-4.1.1" = { name = "es6-error"; packageName = "es6-error"; @@ -16035,15 +15990,6 @@ let sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; }; }; - "escape-html-1.0.1" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; - sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; - }; - }; "escape-html-1.0.3" = { name = "escape-html"; packageName = "escape-html"; @@ -16251,13 +16197,13 @@ let sha512 = "fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q=="; }; }; - "eslint-utils-2.0.0" = { + "eslint-utils-2.1.0" = { name = "eslint-utils"; packageName = "eslint-utils"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz"; - sha512 = "0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA=="; + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; }; "eslint-visitor-keys-1.1.0" = { @@ -16503,15 +16449,6 @@ let sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; }; }; - "etag-1.5.1" = { - name = "etag"; - packageName = "etag"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; - sha1 = "54c50de04ee42695562925ac566588291be7e9ea"; - }; - }; "etag-1.8.1" = { name = "etag"; packageName = "etag"; @@ -16602,15 +16539,6 @@ let sha1 = "b4c540012d0fe1498420f3d8946008db6393c37a"; }; }; - "event-stream-3.2.2" = { - name = "event-stream"; - packageName = "event-stream"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz"; - sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d"; - }; - }; "event-stream-3.3.4" = { name = "event-stream"; packageName = "event-stream"; @@ -16647,15 +16575,6 @@ let sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab"; }; }; - "eventemitter3-0.1.6" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz"; - sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; - }; - }; "eventemitter3-1.2.0" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -16962,15 +16881,6 @@ let sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86"; }; }; - "express-4.11.2" = { - name = "express"; - packageName = "express"; - version = "4.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.11.2.tgz"; - sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148"; - }; - }; "express-4.17.1" = { name = "express"; packageName = "express"; @@ -17016,13 +16926,13 @@ let sha512 = "UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q=="; }; }; - "express-urlrewrite-1.2.0" = { + "express-urlrewrite-1.3.0" = { name = "express-urlrewrite"; packageName = "express-urlrewrite"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-1.2.0.tgz"; - sha1 = "8e667b7761ff1c7ffdb0efa05d64035387c823eb"; + url = "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-1.3.0.tgz"; + sha512 = "xy3WZqA9EIfb51FkL1R0EqW91Z8lMi9ohp/WrNxKukvQulybqvh7+OsGiw9JOD51NrGsSuWi2hqOv7GW+DGz1w=="; }; }; "express-validator-2.21.0" = { @@ -17070,15 +16980,6 @@ let sha512 = "yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ=="; }; }; - "extend-1.2.1" = { - name = "extend"; - packageName = "extend"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; - sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; - }; - }; "extend-3.0.0" = { name = "extend"; packageName = "extend"; @@ -17349,13 +17250,13 @@ let sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; - "fast-glob-3.2.2" = { + "fast-glob-3.2.4" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz"; - sha512 = "UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz"; + sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ=="; }; }; "fast-json-parse-1.0.3" = { @@ -17430,13 +17331,13 @@ let sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; }; }; - "fast-text-encoding-1.0.2" = { + "fast-text-encoding-1.0.3" = { name = "fast-text-encoding"; packageName = "fast-text-encoding"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.2.tgz"; - sha512 = "5rQdinSsycpzvAoHga2EDn+LRX1d5xLFsuNG0Kg61JrAT/tASXcLL0nf/33v+sAxlQcfYmWbTURa1mmAf55jGw=="; + url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz"; + sha512 = "dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig=="; }; }; "fast-url-parser-1.1.3" = { @@ -17799,15 +17700,6 @@ let sha512 = "yDEp513p7+iLdFHWBVdZFnRiOYwg8ZqmpaAiZCMjzqsbo7tCS4Qm4ulXOht337NGzkukKa9u3W4wqQ9tQPm3Ug=="; }; }; - "finalhandler-0.3.3" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz"; - sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426"; - }; - }; "finalhandler-1.1.2" = { name = "finalhandler"; packageName = "finalhandler"; @@ -18186,13 +18078,13 @@ let sha1 = "ae049a714386bb83e342657a82924b70364a90d6"; }; }; - "flumedb-2.1.4" = { + "flumedb-2.1.8" = { name = "flumedb"; packageName = "flumedb"; - version = "2.1.4"; + version = "2.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/flumedb/-/flumedb-2.1.4.tgz"; - sha512 = "jqbUXWsIPxHFmDOTN5/I5khgHzGtEl8cSL3kC13CC/FudT57tfzg+jvCWeXtSty15X1w6QD86lw8RW7cERuqsg=="; + url = "https://registry.npmjs.org/flumedb/-/flumedb-2.1.8.tgz"; + sha512 = "MtBCZFjj9GuqOQP8Ld87FbXm8ztQyLkLeuiHuB5+aACFuVn1kunnCis75R03ujFZTqCFmkBwFz7E016b3DB0zA=="; }; }; "flumelog-offset-3.4.4" = { @@ -18222,13 +18114,13 @@ let sha512 = "Nl0gJOgrDGpJGZDkP6gvo6s1Q9WmRynbHUvI/JY3eQ81YgzUUa2FKLlfu6OHV5ho5NeXP+00F+0K1yBVaEgJOQ=="; }; }; - "flumeview-level-4.0.3" = { + "flumeview-level-4.0.4" = { name = "flumeview-level"; packageName = "flumeview-level"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-4.0.3.tgz"; - sha512 = "lmSiImD7vNJ9pC9hB2j9hgx5WhleUZM5n69e2qUTGU4LCyvCbVuzn85pKfqdrKEAMuVjbb+jEPEErPJFNRj0SQ=="; + url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-4.0.4.tgz"; + sha512 = "8C/o/oZU73ot1LMbxCyKeZJ0D3L5AGdxzIF5H2QtmznMSoZHVG1gT2IDjkOtesenVPlLQKnL95ewMKbE7cXWEw=="; }; }; "flumeview-links-1.0.1" = { @@ -18240,13 +18132,13 @@ let sha512 = "X7enLH2Ijoav3xA+EPoahf5e1RjMoRaHWQcG/RyHvpXbV/qlhEgH2zwIi8kg+Ezt90KTtnGxVygcSZ7RGpdkng=="; }; }; - "flumeview-query-7.2.2" = { + "flumeview-query-8.0.0" = { name = "flumeview-query"; packageName = "flumeview-query"; - version = "7.2.2"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-query/-/flumeview-query-7.2.2.tgz"; - sha512 = "zDwy3WIbF5pKhwyK0wVtGdedU+1Xh2Dnrg06fJ0dIkAcQs8+u+CaoSBcnyp80i6XmzfzGCRkN0Fdve2b6f5XAA=="; + url = "https://registry.npmjs.org/flumeview-query/-/flumeview-query-8.0.0.tgz"; + sha512 = "uPTT5I26ePMc6Xhjebu1aiaHAd7P3EqyE9SZB6B9ZIvXtMXhFYNk7iO1yzh1ZXp3aYzdYmrI9k8mSz9urZ9gNQ=="; }; }; "flumeview-reduce-1.3.17" = { @@ -18276,13 +18168,13 @@ let sha1 = "5214d7537a4d06a4a301c0cc262feb84188002e7"; }; }; - "follow-redirects-1.11.0" = { + "follow-redirects-1.12.1" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.11.0"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz"; - sha512 = "KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.12.1.tgz"; + sha512 = "tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg=="; }; }; "follow-redirects-1.5.10" = { @@ -18393,13 +18285,13 @@ let sha512 = "F3E8C9CTPK+uRGdVTMBHGo7mHX+KRtClLzkegR6ux1yy+ByxOziumpTzxajzfhICHfYdnGWY4Bokl8dirYsDeA=="; }; }; - "form-data-0.1.3" = { - name = "form-data"; - packageName = "form-data"; - version = "0.1.3"; + "fork-ts-checker-webpack-plugin-5.0.1" = { + name = "fork-ts-checker-webpack-plugin"; + packageName = "fork-ts-checker-webpack-plugin"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; - sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.0.1.tgz"; + sha512 = "bys+hPwlPckrSCzNkg0BSUTsCRZWS6qIRiwk+8AjKitLWTqokda0QVImCx/Vm9cL/OGZZUnrFXazsVc99nijKQ=="; }; }; "form-data-1.0.0-rc3" = { @@ -18483,15 +18375,6 @@ let sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30"; }; }; - "formidable-1.0.14" = { - name = "formidable"; - packageName = "formidable"; - version = "1.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; - sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; - }; - }; "formidable-1.0.17" = { name = "formidable"; packageName = "formidable"; @@ -18519,13 +18402,13 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "fp-ts-2.6.5" = { + "fp-ts-2.6.6" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.6.5"; + version = "2.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.6.5.tgz"; - sha512 = "lQNzOMJj98b623+UZLQ+tnN/8qtNXz/vRoR9k7L/9OlUIyYH3qVzSUVZBDXYsAd7nOWzzdQALCX1ZqcF70altQ=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.6.6.tgz"; + sha512 = "zYfhPNb2fwpkrJ5RpgEMsrvMv8r9x+guJptnaEBF295YtoVr3+jbGDXZqSqPcfEWas5Trj3FpbDkzmXbx0YYzQ=="; }; }; "fraction.js-4.0.12" = { @@ -18573,15 +18456,6 @@ let sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7"; }; }; - "fresh-0.2.4" = { - name = "fresh"; - packageName = "fresh"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; - sha1 = "3582499206c9723714190edd74b4604feb4a614c"; - }; - }; "fresh-0.5.2" = { name = "fresh"; packageName = "fresh"; @@ -18780,6 +18654,15 @@ let sha1 = "0b7815fc3201c6a69e14db98ce098c16935259eb"; }; }; + "fs-monkey-1.0.1" = { + name = "fs-monkey"; + packageName = "fs-monkey"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.1.tgz"; + sha512 = "fcSa+wyTqZa46iWweI7/ZiUfegOZl0SG8+dltIwFXo7+zYU9J9kpS3NB6pZcSlJdhvIwp81Adx2XhZorncxiaA=="; + }; + }; "fs-write-stream-atomic-1.0.10" = { name = "fs-write-stream-atomic"; packageName = "fs-write-stream-atomic"; @@ -20986,15 +20869,6 @@ let sha1 = "7f529cb676884032b0756750556ce77123bec406"; }; }; - "hiredis-0.4.1" = { - name = "hiredis"; - packageName = "hiredis"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hiredis/-/hiredis-0.4.1.tgz"; - sha1 = "aab4dcfd0fc4cbdb219d268005f2335a3c639e8f"; - }; - }; "historic-readline-1.0.8" = { name = "historic-readline"; packageName = "historic-readline"; @@ -22229,6 +22103,15 @@ let sha512 = "5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg=="; }; }; + "inquirer-7.2.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-7.2.0.tgz"; + sha512 = "E0c4rPwr9ByePfNlTIB8z51kK1s2n6jrHuJeEHENl/sbq2G/S1auvibgEwNR4uSyiU+PiYHqSwsgGiXjG8p5ZQ=="; + }; + }; "inquirer-autocomplete-prompt-1.0.2" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; @@ -22373,15 +22256,6 @@ let sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; }; }; - "interpret-1.2.0" = { - name = "interpret"; - packageName = "interpret"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz"; - sha512 = "mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="; - }; - }; "interpret-1.4.0" = { name = "interpret"; packageName = "interpret"; @@ -22508,15 +22382,6 @@ let sha1 = "27a9ca37f148d2102b0ef191ccbf2c51a8f025c6"; }; }; - "ipaddr.js-1.0.5" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz"; - sha1 = "5fa78cf301b825c78abc3042d812723049ea23c7"; - }; - }; "ipaddr.js-1.4.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; @@ -24281,13 +24146,13 @@ let sha512 = "FHs9cS0phsXFXI1waqK/kY9TnyiWmQp65NFu/vMZky1Tef4zIYD3D5qZcBhBkXhAbIFA+fPfmMUUgGKBQWtKlQ=="; }; }; - "js-base64-2.5.2" = { + "js-base64-2.6.0" = { name = "js-base64"; packageName = "js-base64"; - version = "2.5.2"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz"; - sha512 = "Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-2.6.0.tgz"; + sha512 = "jmCv6u76N7XtpXoF+aS5tNUQLRAJe1DgN9JXO5csoCkEIAPPLwWy93OQo/RoydkD6vyTf1oKKgto8SH7LM+Ong=="; }; }; "js-beautify-1.11.0" = { @@ -24578,15 +24443,6 @@ let sha512 = "0vOQd9eLNBL18EGl5yYaO44GhixmImes2wiYn9Z3sag3QnehWrYWlB9AFtMxCL2Bj3fyxgDYkxGFEU/chlYssw=="; }; }; - "json-rpc2-0.8.1" = { - name = "json-rpc2"; - packageName = "json-rpc2"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-rpc2/-/json-rpc2-0.8.1.tgz"; - sha1 = "efe8c9834605b556c488d1ed7bcf24ee381eeeb2"; - }; - }; "json-schema-0.2.2" = { name = "json-schema"; packageName = "json-schema"; @@ -24830,15 +24686,6 @@ let sha1 = "330542ad3f0a654665b778f3eb2d9a9fa507ac64"; }; }; - "jsonparse-0.0.6" = { - name = "jsonparse"; - packageName = "jsonparse"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.6.tgz"; - sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e"; - }; - }; "jsonparse-1.3.1" = { name = "jsonparse"; packageName = "jsonparse"; @@ -24956,13 +24803,13 @@ let sha512 = "EJ9k766htB1ZWnsV5ZMDkKLgA+201r/ouFF8R2OigVjVdcm2rurcBrrdXaeqBJbqnUVMko512PYmlncBKE1Huw=="; }; }; - "jszip-3.4.0" = { + "jszip-3.5.0" = { name = "jszip"; packageName = "jszip"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.4.0.tgz"; - sha512 = "gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.5.0.tgz"; + sha512 = "WRtu7TPCmYePR1nazfrtuF216cIVon/3GWOvHS9QR5bIwSbnxtdpma6un3jyGGNhHsKCSzn5Ypk+EkDRvTGiFA=="; }; }; "junk-3.1.0" = { @@ -26046,15 +25893,6 @@ let sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="; }; }; - "loader-utils-1.2.3" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz"; - sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA=="; - }; - }; "loader-utils-1.4.0" = { name = "loader-utils"; packageName = "loader-utils"; @@ -26145,15 +25983,6 @@ let sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; }; }; - "lodash-3.1.0" = { - name = "lodash"; - packageName = "lodash"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz"; - sha1 = "d41b8b33530cb3be088853208ad30092d2c27961"; - }; - }; "lodash-3.10.1" = { name = "lodash"; packageName = "lodash"; @@ -28449,6 +28278,15 @@ let sha512 = "e0WfJAMm8Gv1mP5fEq/Blzy6Lt1VbLg7gNnZmZak7nhrBTibs+c6nQ4SKs/ZyJYHS1mFgDJeopsLAv7Ow0FMFg=="; }; }; + "memfs-3.2.0" = { + name = "memfs"; + packageName = "memfs"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memfs/-/memfs-3.2.0.tgz"; + sha512 = "f/xxz2TpdKv6uDn6GtHee8ivFyxwxmPuXatBb1FBwxYNuVpbM3k/Y1Z+vC0mH/dIXXrukYfe3qe5J32Dfjg93A=="; + }; + }; "memoizee-0.4.14" = { name = "memoizee"; packageName = "memoizee"; @@ -28602,15 +28440,6 @@ let sha512 = "VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="; }; }; - "merge-descriptors-0.0.2" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; - sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; - }; - }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -28710,15 +28539,6 @@ let sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f"; }; }; - "methods-1.0.1" = { - name = "methods"; - packageName = "methods"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; - sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; - }; - }; "methods-1.1.2" = { name = "methods"; packageName = "methods"; @@ -28854,15 +28674,6 @@ let sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="; }; }; - "mime-db-1.12.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; - sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; - }; - }; "mime-db-1.33.0" = { name = "mime-db"; packageName = "mime-db"; @@ -28890,15 +28701,6 @@ let sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; - "mime-types-2.0.14" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; - sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; - }; - }; "mime-types-2.1.18" = { name = "mime-types"; packageName = "mime-types"; @@ -29466,6 +29268,15 @@ let sha512 = "oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw=="; }; }; + "moment-2.27.0" = { + name = "moment"; + packageName = "moment"; + version = "2.27.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz"; + sha512 = "al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="; + }; + }; "moment-2.7.0" = { name = "moment"; packageName = "moment"; @@ -29583,15 +29394,6 @@ let sha512 = "eaF9rO2uFrIYEHomJxziuKTDkbWW5psLBaIGCazQSKqYsTaB3n4SpvJ1PexKaDBiPnMLPIFWBIiTYT3IfEJfww=="; }; }; - "ms-0.7.0" = { - name = "ms"; - packageName = "ms"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; - sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; - }; - }; "ms-0.7.1" = { name = "ms"; packageName = "ms"; @@ -30141,55 +29943,6 @@ let sha512 = "A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg=="; }; }; - "native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" = { - name = "native-dns-cache"; - packageName = "native-dns-cache"; - version = "0.0.2"; - src = fetchgit { - url = "https://github.com/okTurtles/native-dns-cache.git"; - rev = "8714196bb9223cc9a4064a4fddf9e82ec50b7d4d"; - sha256 = "3f06b2577afc3c1e428533baae3c51bad44a2e1e02fca147a1303943c214f841"; - }; - }; - "native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" = { - name = "native-dns"; - packageName = "native-dns"; - version = "0.6.1"; - src = fetchgit { - url = "https://github.com/okTurtles/node-dns.git"; - rev = "08433ec98f517eed3c6d5e47bdf62603539cd402"; - sha256 = "a7342bfd4e952490a8a25a68efcb1d16ecc2391f1044109ebeace89ad284f7a2"; - }; - }; - "native-dns-packet-0.1.1" = { - name = "native-dns-packet"; - packageName = "native-dns-packet"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz"; - sha1 = "97da90570b8438a00194701ce24d011fd3cc109a"; - }; - }; - "native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#307e77a47ebba57a5ae9118a284e916e5ebb305a" = { - name = "native-dns-packet"; - packageName = "native-dns-packet"; - version = "0.0.3"; - src = fetchgit { - url = "https://github.com/okTurtles/native-dns-packet.git"; - rev = "307e77a47ebba57a5ae9118a284e916e5ebb305a"; - sha256 = "f8aaa7bb3b2a652e52bfe5c13a6531c71d690f621ef4d86d0787838708a50358"; - }; - }; - "native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" = { - name = "native-dns-packet"; - packageName = "native-dns-packet"; - version = "0.0.4"; - src = fetchgit { - url = "https://github.com/okTurtles/native-dns-packet.git"; - rev = "8bf2714c318cfe7d31bca2006385882ccbf503e4"; - sha256 = "1f39a4bd88978a0b51d45c32c777fb7f75b12e220cf7d206aa5a12d1e4e80f9d"; - }; - }; "native-promise-only-0.8.1" = { name = "native-promise-only"; packageName = "native-promise-only"; @@ -30262,15 +30015,6 @@ let sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661"; }; }; - "nconf-0.7.1" = { - name = "nconf"; - packageName = "nconf"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz"; - sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b"; - }; - }; "ncp-0.4.2" = { name = "ncp"; packageName = "ncp"; @@ -30325,13 +30069,13 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "nearley-2.19.3" = { + "nearley-2.19.4" = { name = "nearley"; packageName = "nearley"; - version = "2.19.3"; + version = "2.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.19.3.tgz"; - sha512 = "FpAy1PmTsUpOtgxr23g4jRNvJHYzZEW2PixXeSzksLR/ykPfwKhAodc2+9wQhY+JneWLcvkDw6q7FJIsIdF/aQ=="; + url = "https://registry.npmjs.org/nearley/-/nearley-2.19.4.tgz"; + sha512 = "oqj3m4oqwKsN77pETa9IPvxHHHLW68KrDc2KYoWMUOhDlrNUo7finubwffQMBRnwNCOXc4kRxCZO0Rvx4L6Zrw=="; }; }; "neat-csv-2.1.0" = { @@ -31813,6 +31557,15 @@ let sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; }; }; + "object-inspect-1.8.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz"; + sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; + }; + }; "object-is-1.1.2" = { name = "object-is"; packageName = "object-is"; @@ -31993,6 +31746,15 @@ let sha1 = "cb236106341536f0dac4815e06708221cad7fb5e"; }; }; + "obz-1.0.2" = { + name = "obz"; + packageName = "obz"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/obz/-/obz-1.0.2.tgz"; + sha512 = "c+EtVwT2IpXz5we2mR40aPLJ1s0eNOsxYeaYbaHhmsY6kWKo3IRkpwpBU5ck0aHfqfKUUEiKabC6rzsrG/hSHw=="; + }; + }; "octokit-pagination-methods-1.1.0" = { name = "octokit-pagination-methods"; packageName = "octokit-pagination-methods"; @@ -33712,15 +33474,6 @@ let sha1 = "473e6a3a292a9d13fbae3edccee72d3baba8c619"; }; }; - "path-to-regexp-0.1.3" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; - sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb"; - }; - }; "path-to-regexp-0.1.7" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -34919,13 +34672,13 @@ let sha512 = "AkKN+pf4fSEihjapLEEj8n85YIw/tN6BQqkhzbDc0RvEZGdkpJBGMUYx66AAMcPG2KzmPQS7Cm16an4HVBRRMA=="; }; }; - "precinct-6.2.0" = { + "precinct-6.3.1" = { name = "precinct"; packageName = "precinct"; - version = "6.2.0"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/precinct/-/precinct-6.2.0.tgz"; - sha512 = "BCAmnOxZzobF3H1/h/gq70pEyvX/BVLWCrzi8beFD22dqu5Z14qOghNUsI24Wg8oaTsGFcIjOGtFX5L9ttmjVg=="; + url = "https://registry.npmjs.org/precinct/-/precinct-6.3.1.tgz"; + sha512 = "JAwyLCgTylWminoD7V0VJwMElWmwrVSR6r9HaPWCoswkB4iFzX7aNtO7VBfAVPy+NhmjKb8IF8UmlWJXzUkOIQ=="; }; }; "precond-0.2.3" = { @@ -35441,15 +35194,6 @@ let sha1 = "159fb06193d32003f4b3691dd2ec1a634aa80d1d"; }; }; - "properties-1.2.1" = { - name = "properties"; - packageName = "properties"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/properties/-/properties-1.2.1.tgz"; - sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; - }; - }; "property-information-5.5.0" = { name = "property-information"; packageName = "property-information"; @@ -35513,15 +35257,6 @@ let sha512 = "WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg=="; }; }; - "proxy-addr-1.0.10" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz"; - sha1 = "0d40a82f801fc355567d2ecb65efe3f077f121c5"; - }; - }; "proxy-addr-1.1.5" = { name = "proxy-addr"; packageName = "proxy-addr"; @@ -35603,13 +35338,13 @@ let sha512 = "qau0czUSB0fzSlBOQt0bo+I2v6R+xiQdj78e1BR/Qjfl5OHWJ/urXi8+ilw1eHe+5hSeDI1wrwVTgDp2wst4oA=="; }; }; - "ps-list-7.1.0" = { + "ps-list-7.2.0" = { name = "ps-list"; packageName = "ps-list"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ps-list/-/ps-list-7.1.0.tgz"; - sha512 = "3hBSPXo4bsVX295Jr4TFgqEmQoI93SZDShX6kK3uHh6PlVhvZt4evi/9uqU43VBLjV6xDGueW35gjn1QNjgxug=="; + url = "https://registry.npmjs.org/ps-list/-/ps-list-7.2.0.tgz"; + sha512 = "v4Bl6I3f2kJfr5o80ShABNHAokIgY+wFDTQfE+X3zWYgSGQOCBeYptLZUpoOALBqO5EawmDN/tjTldJesd0ujQ=="; }; }; "ps-tree-0.0.3" = { @@ -35774,6 +35509,15 @@ let sha1 = "7017a984c3b834de77bac38c10b776f22dfc1843"; }; }; + "pull-abortable-4.1.1" = { + name = "pull-abortable"; + packageName = "pull-abortable"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.1.1.tgz"; + sha1 = "b3ad5aefb4116b25916d26db89393ac98d0dcea1"; + }; + }; "pull-block-filter-1.0.0" = { name = "pull-block-filter"; packageName = "pull-block-filter"; @@ -36440,15 +36184,6 @@ let sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; }; }; - "qs-1.2.0" = { - name = "qs"; - packageName = "qs"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-1.2.0.tgz"; - sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee"; - }; - }; "qs-2.3.3" = { name = "qs"; packageName = "qs"; @@ -36791,15 +36526,6 @@ let sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b"; }; }; - "range-parser-1.0.3" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; - sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; - }; - }; "range-parser-1.2.0" = { name = "range-parser"; packageName = "range-parser"; @@ -37367,15 +37093,6 @@ let sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; }; }; - "redis-0.12.1" = { - name = "redis"; - packageName = "redis"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"; - sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e"; - }; - }; "reduce-component-1.0.1" = { name = "reduce-component"; packageName = "reduce-component"; @@ -38582,13 +38299,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.16.0" = { + "rollup-2.17.1" = { name = "rollup"; packageName = "rollup"; - version = "2.16.0"; + version = "2.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.16.0.tgz"; - sha512 = "95NglykUQAhl+mTFZqVvGUWDoGHV4/XanOZBbR7LOwTKODde5yFNHfVDZEnERBMuQViDuYaxOlFW87i1GQMihA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.17.1.tgz"; + sha512 = "lVrtCXJ+08Eapa0SfApLmRNWNWm2FsYFnLPIJZJvZz2uI2Gv+dfPyu1zgF7KKF/HYFJDvjxbdCbI8lUVMnG7Sg=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -39005,13 +38722,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-formatter-0.4.8" = { + "sass-formatter-0.4.9" = { name = "sass-formatter"; packageName = "sass-formatter"; - version = "0.4.8"; + version = "0.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.8.tgz"; - sha512 = "jGBx8Q0GPXU3SJIWLP9pcBqxZM6Nv6LKL1xQZ8503mqKWYDeEAmYBCP5duImTGMSl5KUqcmljfT+T1amPs2j9A=="; + url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.9.tgz"; + sha512 = "cLhpDfJA7H/2RNui7lt7Ndz/LqPYKY7TulCYJWSC2UJW3CuMs76Zr8pusN0zxbd9Rgb5uBiSBMMLlfN2OhftUg=="; }; }; "sass-lookup-3.0.0" = { @@ -39437,15 +39154,6 @@ let sha1 = "be70d8d1be01de61821af13780b50345a4f71abd"; }; }; - "send-0.11.1" = { - name = "send"; - packageName = "send"; - version = "0.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.11.1.tgz"; - sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5"; - }; - }; "send-0.17.1" = { name = "send"; packageName = "send"; @@ -39572,15 +39280,6 @@ let sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; - "serve-static-1.8.1" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz"; - sha1 = "08fabd39999f050fc311443f46d5888a77ecfc7c"; - }; - }; "server-destroy-1.0.1" = { name = "server-destroy"; packageName = "server-destroy"; @@ -39590,13 +39289,13 @@ let sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; }; }; - "service-runner-2.7.7" = { + "service-runner-2.7.8" = { name = "service-runner"; packageName = "service-runner"; - version = "2.7.7"; + version = "2.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.7.7.tgz"; - sha512 = "/fxWWDXThY+Jm6UEWY+DNqW41ahjrYYGLsUiMqqY2+lYJ1JtcwC5tzWD19MlwJESlUjCDYH8l7v/g+9MuASXAQ=="; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.7.8.tgz"; + sha512 = "YZBOj9wRzWEiBgIfrvq7OFVf9wr0u/llyeIsZjrd6tyrjJz2ywB9DiGpWb7/+MVswi970bgAw6+OUCq+9luyuw=="; }; }; "set-blocking-1.0.0" = { @@ -40382,13 +40081,13 @@ let sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg=="; }; }; - "snyk-docker-plugin-3.12.0" = { + "snyk-docker-plugin-3.12.3" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "3.12.0"; + version = "3.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.12.0.tgz"; - sha512 = "Nv8ez1bykJFtM1OEkNPh6dRg11xHQg4ybTW8A6OC9IaLrWxkH/wrUfmRqhDnrJyzcDhF10CnyQX7KdUnsA7PwA=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.12.3.tgz"; + sha512 = "Ysv7ZDvXFt6K11f1m6wJaqYS3yM7c8YhzOIPoEmrYZW+4tL+Al5DiyKaAQBudbfYEA7xa6S6qGqE3QRitHZ5nQ=="; }; }; "snyk-go-parser-1.4.1" = { @@ -40409,13 +40108,13 @@ let sha512 = "r/uaM3gk/RF7m/VGYswxlnA6I+kMgK3eVPsPyf7400BhqF8noh8K7v10CEg67mHA4JM0l7dZASqejr/5kKw9ZQ=="; }; }; - "snyk-gradle-plugin-3.4.0" = { + "snyk-gradle-plugin-3.5.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.4.0.tgz"; - sha512 = "J/yABmPJstHir++eFw65amm0Y0C7b9WH+tW4Tm90Lo3dj+p/9JDMuVimzHXpkwmkIZI2RPd58igs5XdSDFh6Aw=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.5.0.tgz"; + sha512 = "zOHr3802bDKCcSAFfoEvt/wGSaOSGRm6yQjikdo1RTz7jTeQnSMJxCFYTOhfpu9Tka4d5q0TsdI/2VLFAvPKhA=="; }; }; "snyk-module-1.9.1" = { @@ -40445,13 +40144,13 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.17.0" = { + "snyk-mvn-plugin-2.17.1" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.17.0"; + version = "2.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.17.0.tgz"; - sha512 = "Yl/d7CPJ0LRgHL5dciz/MbjnmsnwAEHA3uBE7Rr5bxZRJ1/ssot9e2OC9ORLJztK86Dggd9ReFocrzD5CWT5PA=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.17.1.tgz"; + sha512 = "U7ZKrKVnUW2gcyYIzvc0w9nRYh4NXv+wShTIcs++ARCAJOG9A4nxh+ZRmINQ7Sy7EB2qLIRwN4Ssr17+y2mhuA=="; }; }; "snyk-nodejs-lockfile-parser-1.22.0" = { @@ -40643,15 +40342,6 @@ let sha512 = "11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A=="; }; }; - "socket.io-stream-0.9.1" = { - name = "socket.io-stream"; - packageName = "socket.io-stream"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-stream/-/socket.io-stream-0.9.1.tgz"; - sha1 = "421258316288b83ac693b0d43efd09d6d43aba97"; - }; - }; "sockjs-0.3.20" = { name = "sockjs"; packageName = "sockjs"; @@ -41606,22 +41296,22 @@ let sha1 = "dfd30cd50eecd8546bd4aa7f06e7c8f501c08118"; }; }; - "ssb-query-2.4.4" = { + "ssb-query-2.4.5" = { name = "ssb-query"; packageName = "ssb-query"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.4.4.tgz"; - sha512 = "t81fskbvFzeXausdJ/TDGjqh8iyClhJy8B9JLgOAmt6D67IFDlkUPgVYF2ITqP4NIkqsLAj/jgX1KV32ntxaNg=="; + url = "https://registry.npmjs.org/ssb-query/-/ssb-query-2.4.5.tgz"; + sha512 = "/QX6+DJkghqq1ZTbgYpOvaI+gx2O7ee1TRUM9yiOlVjh1XAQBevcBj0zO+W3TsNllX86urqBrySd/AEfFfUpIw=="; }; }; - "ssb-ref-2.13.9" = { + "ssb-ref-2.14.0" = { name = "ssb-ref"; packageName = "ssb-ref"; - version = "2.13.9"; + version = "2.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.13.9.tgz"; - sha512 = "TfatNqLvoP+eW/pMIbCmNcaoDq4R2k8jCtWkwDKx4AtluN/LwtyP931d5Mh+2gmzA04W7kxkr6f5ENGgdadMYg=="; + url = "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.14.0.tgz"; + sha512 = "RQfeGpgiRBuJePyG/1wRp2KrPXS9Ue0z/HU/svlECto+EVcQ77tFz9s/KYWKBt2Z7cem03uBrQ2GF/n2Ed+4Ig=="; }; }; "ssb-replicate-1.3.2" = { @@ -41822,13 +41512,13 @@ let sha512 = "d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ=="; }; }; - "static-eval-2.0.5" = { + "static-eval-2.1.0" = { name = "static-eval"; packageName = "static-eval"; - version = "2.0.5"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/static-eval/-/static-eval-2.0.5.tgz"; - sha512 = "nNbV6LbGtMBgv7e9LFkt5JV8RVlRsyJrphfAt9tOtBBW/SfnzZDf2KnS72an8e434A+9e/BmJuTxeGPvrAK7KA=="; + url = "https://registry.npmjs.org/static-eval/-/static-eval-2.1.0.tgz"; + sha512 = "agtxZ/kWSsCkI5E4QifRwsaPs0P0JmZV6dkLz6ILYfFYQGn+5plctanRN+IC8dJRiFkyXHrwEE3W9Wmx67uDbw=="; }; }; "static-extend-0.1.2" = { @@ -42218,15 +41908,6 @@ let sha1 = "eabe0956da7a8291c6de7486f7b35e58d031cd55"; }; }; - "string-2.0.1" = { - name = "string"; - packageName = "string"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string/-/string-2.0.1.tgz"; - sha1 = "ef1473b3e11cb8158671856556959b9aff5fd759"; - }; - }; "string-3.3.3" = { name = "string"; packageName = "string"; @@ -42371,24 +42052,6 @@ let sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; }; }; - "string.prototype.trimleft-2.1.2" = { - name = "string.prototype.trimleft"; - packageName = "string.prototype.trimleft"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; - sha512 = "gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw=="; - }; - }; - "string.prototype.trimright-2.1.2" = { - name = "string.prototype.trimright"; - packageName = "string.prototype.trimright"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; - sha512 = "ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg=="; - }; - }; "string.prototype.trimstart-1.0.1" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; @@ -42767,13 +42430,13 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; - "strtok3-6.0.2" = { + "strtok3-6.0.3" = { name = "strtok3"; packageName = "strtok3"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.2.tgz"; - sha512 = "8/LNTW+SFsfUXbo0P/zNz5FqMVaKCZSZ3/aycaPw7l9RiNutj0XSLI9AcyJcLR+iIL/2FrpUHZxHfAzN7xisAA=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.3.tgz"; + sha512 = "/3RaYN9rW5WEYNHSvn081CgL4HziT027hfi5tsksbPfeWxi3BSLb8tolZDzpYU3I78/0ZqRiFpMDAqN2t4YShA=="; }; }; "structured-source-3.0.2" = { @@ -42929,13 +42592,13 @@ let sha512 = "XiyPqLdiHJ3CMphADCJg/JVQYcj3JfO8NomlLubSdGYgppfzE+g/7Fyusza/Kr7lC919BdwbfIqFxK8VO7+l4w=="; }; }; - "suf-regex-0.0.21" = { + "suf-regex-0.0.22" = { name = "suf-regex"; packageName = "suf-regex"; - version = "0.0.21"; + version = "0.0.22"; src = fetchurl { - url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.21.tgz"; - sha512 = "JCQopezrH6Ypm5YTpfDKCAnxwtMTVMnx/SCk5+RL51j2hO0AbShX6hWdeyJn0PG01gSvoyMqgAhSKjtRHaZZNA=="; + url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.22.tgz"; + sha512 = "6pArSj93hCItDrV+FC8tkf18M5p1tqWjf3T9b/LSYv/V9MeaN3JUqFPU/JMcBkUl2ny7BzTk+bJW4IGzORThNQ=="; }; }; "sugarss-1.0.1" = { @@ -42956,15 +42619,6 @@ let sha512 = "WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ=="; }; }; - "superagent-0.21.0" = { - name = "superagent"; - packageName = "superagent"; - version = "0.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz"; - sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87"; - }; - }; "superagent-1.8.5" = { name = "superagent"; packageName = "superagent"; @@ -43713,13 +43367,13 @@ let sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="; }; }; - "terminal-kit-1.35.3" = { + "terminal-kit-1.35.7" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.35.3"; + version = "1.35.7"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.35.3.tgz"; - sha512 = "6YIpTh/q9qMPAmCYNyNhQ8cC5sxsu2PG/+r5T61jEnXoK3W+LTskG3EmcxUNK4Qo17qT9oWqNbRzXwQTnR1xpw=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.35.7.tgz"; + sha512 = "VrDIbdOb7eXjYoNd9UAm4Q2xKpQcbdi8DbQnCardR4EtcxbptonvVrnBrWKuQUKvV7IvfUgZhekT+kYzbQ3C+Q=="; }; }; "terser-3.17.0" = { @@ -43731,13 +43385,13 @@ let sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ=="; }; }; - "terser-4.7.0" = { + "terser-4.8.0" = { name = "terser"; packageName = "terser"; - version = "4.7.0"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz"; - sha512 = "Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw=="; + url = "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz"; + sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; "terser-webpack-plugin-1.4.4" = { @@ -43830,13 +43484,13 @@ let sha1 = "72f792dd9d31705a91ae19ebfcf8b3f968c81da2"; }; }; - "thenify-3.3.0" = { + "thenify-3.3.1" = { name = "thenify"; packageName = "thenify"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz"; - sha1 = "e69e38a1babe969b0108207978b9f62b88604839"; + url = "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz"; + sha512 = "RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="; }; }; "thenify-all-1.6.0" = { @@ -44856,6 +44510,24 @@ let sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg=="; }; }; + "tsconfig-paths-3.9.0" = { + name = "tsconfig-paths"; + packageName = "tsconfig-paths"; + version = "3.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; + sha512 = "dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw=="; + }; + }; + "tsconfig-paths-webpack-plugin-3.2.0" = { + name = "tsconfig-paths-webpack-plugin"; + packageName = "tsconfig-paths-webpack-plugin"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.2.0.tgz"; + sha512 = "S/gOOPOkV8rIL4LurZ1vUdYCVgo15iX9ZMJ6wx6w2OgcpT/G4wMyHB6WM+xheSqGMrWKuxFul+aXpCju3wmj/g=="; + }; + }; "tslib-1.11.1" = { name = "tslib"; packageName = "tslib"; @@ -45180,15 +44852,6 @@ let sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; }; }; - "type-is-1.5.7" = { - name = "type-is"; - packageName = "type-is"; - version = "1.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz"; - sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90"; - }; - }; "type-is-1.6.18" = { name = "type-is"; packageName = "type-is"; @@ -46620,15 +46283,6 @@ let sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; }; }; - "utils-merge-1.0.0" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; - sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; - }; - }; "utils-merge-1.0.1" = { name = "utils-merge"; packageName = "utils-merge"; @@ -46728,15 +46382,6 @@ let sha512 = "CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="; }; }; - "v8-compile-cache-2.0.3" = { - name = "v8-compile-cache"; - packageName = "v8-compile-cache"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz"; - sha512 = "CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w=="; - }; - }; "v8-compile-cache-2.1.1" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; @@ -46899,15 +46544,6 @@ let sha1 = "d826b89f7490732fabc0c0ed693ed475dcb29ebf"; }; }; - "vary-1.0.1" = { - name = "vary"; - packageName = "vary"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; - sha1 = "99e4981566a286118dfb2b817357df7993376d10"; - }; - }; "vary-1.1.2" = { name = "vary"; packageName = "vary"; @@ -46971,13 +46607,13 @@ let sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; }; - "verda-1.0.4" = { + "verda-1.1.0" = { name = "verda"; packageName = "verda"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.0.4.tgz"; - sha512 = "tiM4qEEhTnPJCdPw6z6bMqPfGQXYjyc8744j0/Qu5ItankFFUN5VRKuY8oweoKsR0ADMQwOdGUTzaPbEYMHAFg=="; + url = "https://registry.npmjs.org/verda/-/verda-1.1.0.tgz"; + sha512 = "6f3bwfXNkjDivAsPFIfCXtCstEh08Q15C6aGnF9wRNfaYhJCXuHRLh39V3b+vjCvvLOeFZ/MeBDZVx81f6dktg=="; }; }; "verror-1.1.0" = { @@ -47313,13 +46949,13 @@ let sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; }; - "vsce-1.76.1" = { + "vsce-1.77.0" = { name = "vsce"; packageName = "vsce"; - version = "1.76.1"; + version = "1.77.0"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.76.1.tgz"; - sha512 = "WNx6JzRywxAOuhVpjmrsI0eHMK0mCA0YKD8u++7sprmhwCHsoQIBpSf0vp6kVMHBmafknr1Z6K7IC5jIjsNL9Q=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.77.0.tgz"; + sha512 = "8vOTCI3jGmOm0JJFu/BMAbqxpaSuka4S3hV9E6K5aWBUsDM1SGFExkIxHblnsI8sls43xP61DHorYT+K0F+GFA=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -47916,13 +47552,13 @@ let sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; }; - "webpack-cli-3.3.11" = { + "webpack-cli-3.3.12" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.3.11"; + version = "3.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz"; - sha512 = "dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz"; + sha512 = "NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag=="; }; }; "webpack-core-0.6.9" = { @@ -47952,6 +47588,15 @@ let sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; }; }; + "webpack-node-externals-1.7.2" = { + name = "webpack-node-externals"; + packageName = "webpack-node-externals"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.7.2.tgz"; + sha512 = "ajerHZ+BJKeCLviLUUmnyd5B4RavLF76uv3cs6KNuO8W+HuQaEs0y0L7o40NQxdPy5w0pcv8Ew7yPUAQG0UdCg=="; + }; + }; "webpack-sources-1.4.3" = { name = "webpack-sources"; packageName = "webpack-sources"; @@ -49231,15 +48876,6 @@ let sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw=="; }; }; - "yargs-13.2.4" = { - name = "yargs"; - packageName = "yargs"; - version = "13.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz"; - sha512 = "HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg=="; - }; - }; "yargs-13.3.2" = { name = "yargs"; packageName = "yargs"; @@ -49651,17 +49287,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "9.1.8"; + version = "9.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.8.tgz"; - sha512 = "yfF7glPo3Xm7fTJVln1bFZVXqHu8wkIGZRZGb6lsJa+QH4ePxHgn+dNYXho0MYpGUnhY7xOBW4MJzjS7E+1y5Q=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.9.tgz"; + sha512 = "k8C0OY3oHoixd3buCgF8+VFe8YZGSGiprnbVMEF2WJHUUw87lPCu/d7dbID3AtVwdKdAB275rAt6IZEIzXInbw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.901.8" - sources."@angular-devkit/core-9.1.8" - sources."@angular-devkit/schematics-9.1.8" - sources."@schematics/angular-9.1.8" - sources."@schematics/update-0.901.8" + sources."@angular-devkit/architect-0.901.9" + sources."@angular-devkit/core-9.1.9" + sources."@angular-devkit/schematics-9.1.9" + sources."@schematics/angular-9.1.9" + sources."@schematics/update-0.901.9" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" @@ -49723,7 +49359,7 @@ in sources."encoding-0.1.12" sources."end-of-stream-1.4.4" sources."err-code-1.1.2" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -49848,7 +49484,7 @@ in ]; }) sources."oauth-sign-0.9.0" - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.1.0" @@ -49933,8 +49569,6 @@ in sources."stream-shift-1.0.1" sources."string-width-4.2.0" sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" (sources."string_decoder-1.1.1" // { dependencies = [ @@ -50500,6 +50134,724 @@ in bypassCache = true; reconstructLock = true; }; + "@nestjs/cli" = nodeEnv.buildNodePackage { + name = "_at_nestjs_slash_cli"; + packageName = "@nestjs/cli"; + version = "7.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.4.0.tgz"; + sha512 = "SMA9k8DWGeMXUhIJAtitG+l2a9IIH0mnsJX5kGhnI890G4yn3d1mFbUCA9rJ9qKc8MpSOEeSDsHzTykr1kUG1w=="; + }; + dependencies = [ + sources."@angular-devkit/core-9.1.9" + (sources."@angular-devkit/schematics-9.1.9" // { + dependencies = [ + sources."ora-4.0.3" + ]; + }) + (sources."@angular-devkit/schematics-cli-0.901.9" // { + dependencies = [ + sources."inquirer-7.1.0" + ]; + }) + sources."@babel/code-frame-7.10.1" + sources."@babel/helper-validator-identifier-7.10.1" + (sources."@babel/highlight-7.10.1" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + (sources."@nestjs/schematics-7.0.1" // { + dependencies = [ + sources."@angular-devkit/core-9.1.7" + sources."@angular-devkit/schematics-9.1.7" + sources."ora-4.0.3" + ]; + }) + sources."@schematics/schematics-0.901.9" + sources."@types/anymatch-1.3.1" + sources."@types/color-name-1.1.1" + sources."@types/json5-0.0.29" + sources."@types/node-14.0.13" + sources."@types/parse-json-4.0.0" + sources."@types/source-list-map-0.1.2" + sources."@types/tapable-1.0.6" + (sources."@types/uglify-js-3.9.2" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."@types/webpack-4.41.17" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."@types/webpack-sources-1.4.0" + sources."@webassemblyjs/ast-1.9.0" + sources."@webassemblyjs/floating-point-hex-parser-1.9.0" + sources."@webassemblyjs/helper-api-error-1.9.0" + sources."@webassemblyjs/helper-buffer-1.9.0" + sources."@webassemblyjs/helper-code-frame-1.9.0" + sources."@webassemblyjs/helper-fsm-1.9.0" + sources."@webassemblyjs/helper-module-context-1.9.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" + sources."@webassemblyjs/helper-wasm-section-1.9.0" + sources."@webassemblyjs/ieee754-1.9.0" + sources."@webassemblyjs/leb128-1.9.0" + sources."@webassemblyjs/utf8-1.9.0" + sources."@webassemblyjs/wasm-edit-1.9.0" + sources."@webassemblyjs/wasm-gen-1.9.0" + sources."@webassemblyjs/wasm-opt-1.9.0" + sources."@webassemblyjs/wasm-parser-1.9.0" + sources."@webassemblyjs/wast-parser-1.9.0" + sources."@webassemblyjs/wast-printer-1.9.0" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.2" + sources."acorn-6.4.1" + sources."ajv-6.12.0" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.5.0" + sources."ansi-escapes-4.3.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-3.2.1" + sources."anymatch-3.1.1" + sources."aproba-1.2.0" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + (sources."asn1.js-4.10.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + (sources."assert-1.5.0" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) + sources."assign-symbols-1.0.0" + sources."async-each-1.0.3" + sources."at-least-node-1.0.0" + sources."atob-2.1.2" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."base64-js-1.3.1" + sources."big.js-5.2.2" + sources."binary-extensions-2.0.0" + sources."bindings-1.5.0" + sources."bluebird-3.7.2" + sources."bn.js-5.1.2" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."brorand-1.1.0" + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.2" + (sources."browserify-rsa-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + (sources."browserify-sign-4.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + ]; + }) + sources."browserify-zlib-0.2.0" + sources."buffer-4.9.2" + sources."buffer-from-1.1.1" + sources."buffer-xor-1.0.3" + sources."builtin-status-codes-3.0.0" + (sources."cacache-12.0.4" // { + dependencies = [ + sources."rimraf-2.7.1" + ]; + }) + sources."cache-base-1.0.1" + sources."callsites-3.1.0" + (sources."chalk-3.0.0" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.1.0" + ]; + }) + sources."chardet-0.7.0" + sources."chokidar-3.4.0" + sources."chownr-1.1.4" + sources."chrome-trace-event-1.0.2" + sources."cipher-base-1.0.4" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.3.0" + (sources."cli-table3-0.5.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."cli-width-2.2.1" + sources."clone-1.0.4" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."colors-1.4.0" + sources."commander-4.1.1" + sources."commondir-1.0.1" + sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."console-browserify-1.2.0" + sources."constants-browserify-1.0.0" + (sources."copy-concurrently-1.0.5" // { + dependencies = [ + sources."rimraf-2.7.1" + ]; + }) + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + sources."cosmiconfig-6.0.0" + (sources."create-ecdh-4.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."cross-spawn-6.0.5" + sources."crypto-browserify-3.12.0" + sources."cyclist-1.0.1" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."deepmerge-4.2.2" + sources."defaults-1.0.3" + sources."define-property-2.0.2" + sources."des.js-1.0.1" + (sources."diffie-hellman-5.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."domain-browser-1.2.0" + sources."duplexify-3.7.1" + (sources."elliptic-6.5.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."emoji-regex-8.0.0" + sources."emojis-list-3.0.0" + sources."end-of-stream-1.4.4" + sources."enhanced-resolve-4.2.0" + sources."errno-0.1.7" + sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" + sources."eslint-scope-4.0.3" + sources."esrecurse-4.2.1" + sources."estraverse-4.3.0" + sources."events-3.1.0" + sources."evp_bytestokey-1.0.3" + sources."execa-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-3.1.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."figgy-pudding-3.5.2" + sources."figures-3.2.0" + sources."file-uri-to-path-1.0.0" + sources."fill-range-7.0.1" + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."flush-write-stream-1.1.1" + sources."for-in-1.0.2" + (sources."fork-ts-checker-webpack-plugin-5.0.1" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."fragment-cache-0.2.1" + sources."from2-2.3.0" + sources."fs-extra-9.0.0" + sources."fs-monkey-1.0.1" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fsevents-2.1.3" + sources."get-stream-4.1.0" + sources."get-value-2.0.6" + sources."glob-7.1.6" + sources."glob-parent-5.1.1" + sources."graceful-fs-4.2.4" + sources."has-flag-3.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + ]; + }) + sources."hash.js-1.1.7" + sources."hmac-drbg-1.0.1" + sources."https-browserify-1.0.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.1.13" + sources."iferr-0.1.5" + sources."import-fresh-3.2.1" + sources."imurmurhash-0.1.4" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."inquirer-7.2.0" + sources."interpret-1.4.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-arrayish-0.2.1" + sources."is-binary-path-2.1.0" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-interactive-1.0.0" + sources."is-number-7.0.0" + sources."is-plain-object-2.0.4" + sources."is-stream-1.1.0" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."js-tokens-4.0.0" + sources."json-parse-better-errors-1.0.2" + sources."json-schema-traverse-0.4.1" + sources."json5-1.0.1" + sources."jsonfile-6.0.1" + sources."kind-of-6.0.3" + sources."lines-and-columns-1.1.6" + sources."loader-runner-2.4.0" + sources."loader-utils-1.4.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.15" + sources."lodash.toarray-4.4.0" + (sources."log-symbols-3.0.0" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."lru-cache-5.1.1" + sources."macos-release-2.3.0" + sources."magic-string-0.25.7" + sources."make-dir-2.1.0" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."md5.js-1.3.5" + sources."memfs-3.2.0" + sources."memory-fs-0.5.0" + (sources."micromatch-3.1.10" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-range-2.1.1" + ]; + }) + (sources."miller-rabin-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."mimic-fn-2.1.0" + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mississippi-3.0.0" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + (sources."move-concurrently-1.0.1" // { + dependencies = [ + sources."rimraf-2.7.1" + ]; + }) + sources."ms-2.0.0" + sources."mute-stream-0.0.8" + sources."nan-2.14.1" + sources."nanomatch-1.2.13" + sources."neo-async-2.6.1" + sources."nice-try-1.0.5" + sources."node-emoji-1.10.0" + (sources."node-libs-browser-2.2.1" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."normalize-path-3.0.0" + sources."npm-run-path-2.0.2" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."onetime-5.1.0" + sources."ora-4.0.4" + sources."os-browserify-0.3.0" + sources."os-name-3.1.0" + sources."os-tmpdir-1.0.2" + sources."p-finally-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."pako-1.0.11" + sources."parallel-transform-1.2.0" + sources."parent-module-1.0.1" + sources."parse-asn1-5.1.5" + sources."parse-json-5.0.0" + sources."pascalcase-0.1.1" + sources."path-browserify-0.0.1" + sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-parse-1.0.6" + sources."path-type-4.0.0" + sources."pbkdf2-3.1.1" + sources."picomatch-2.2.2" + sources."pify-4.0.1" + sources."pkg-dir-3.0.0" + sources."posix-character-classes-0.1.1" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."promise-inflight-1.0.1" + sources."prr-1.0.1" + (sources."public-encrypt-4.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."punycode-2.1.1" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."randombytes-2.1.0" + sources."randomfill-1.0.4" + sources."readable-stream-2.3.7" + sources."readdirp-3.4.0" + sources."rechoir-0.6.2" + sources."regex-not-1.0.2" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."resolve-1.17.0" + sources."resolve-from-4.0.0" + sources."resolve-url-0.2.1" + sources."restore-cursor-3.1.0" + sources."ret-0.1.15" + sources."rimraf-3.0.2" + sources."ripemd160-2.0.2" + sources."run-async-2.4.1" + sources."run-queue-1.0.3" + sources."rxjs-6.5.4" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."schema-utils-1.0.0" + sources."semver-5.7.1" + sources."serialize-javascript-3.1.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setimmediate-1.0.5" + sources."sha.js-2.4.11" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."shelljs-0.8.4" + sources."signal-exit-3.0.3" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."source-map-0.5.7" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-list-map-2.0.1" + sources."source-map-0.7.3" + sources."source-map-resolve-0.5.3" + (sources."source-map-support-0.5.19" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."source-map-url-0.4.0" + sources."sourcemap-codec-1.4.8" + sources."split-string-3.1.0" + sources."ssri-6.0.1" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."stream-browserify-2.0.2" + sources."stream-each-1.2.3" + sources."stream-http-2.8.3" + sources."stream-shift-1.0.1" + sources."string-width-4.2.0" + sources."string_decoder-1.1.1" + sources."strip-ansi-6.0.0" + sources."strip-bom-3.0.0" + sources."strip-eof-1.0.0" + sources."supports-color-5.5.0" + sources."symbol-observable-1.2.0" + sources."tapable-1.1.3" + (sources."terser-4.8.0" // { + dependencies = [ + sources."commander-2.20.3" + sources."source-map-0.6.1" + ]; + }) + (sources."terser-webpack-plugin-1.4.4" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."through-2.3.8" + sources."through2-2.0.5" + sources."timers-browserify-2.0.11" + sources."tmp-0.0.33" + sources."to-arraybuffer-1.0.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + sources."tree-kill-1.2.2" + sources."tsconfig-paths-3.9.0" + (sources."tsconfig-paths-webpack-plugin-3.2.0" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."tslib-1.13.0" + sources."tty-browserify-0.0.0" + sources."type-fest-0.11.0" + sources."typedarray-0.0.6" + sources."typescript-3.9.5" + sources."union-value-1.0.1" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + sources."universalify-1.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."upath-1.2.0" + sources."uri-js-4.2.2" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."use-3.1.1" + (sources."util-0.11.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."util-deprecate-1.0.2" + sources."vm-browserify-1.1.2" + sources."watchpack-1.7.2" + (sources."watchpack-chokidar2-2.0.0" // { + dependencies = [ + sources."anymatch-2.0.0" + sources."binary-extensions-1.13.1" + sources."braces-2.3.2" + sources."chokidar-2.1.8" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."fsevents-1.2.13" + sources."glob-parent-3.1.0" + sources."is-binary-path-1.0.1" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."normalize-path-2.1.1" + sources."readdirp-2.2.1" + sources."to-regex-range-2.1.1" + ]; + }) + sources."wcwidth-1.0.1" + (sources."webpack-4.43.0" // { + dependencies = [ + sources."memory-fs-0.4.1" + ]; + }) + sources."webpack-node-externals-1.7.2" + (sources."webpack-sources-1.4.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."which-1.3.1" + sources."windows-release-3.3.1" + sources."worker-farm-1.7.0" + sources."wrappy-1.0.2" + sources."xtend-4.0.2" + sources."y18n-4.0.0" + sources."yallist-3.1.1" + sources."yaml-1.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Nest - modern, fast, powerful node.js web framework (@cli)"; + homepage = "https://github.com/nestjs/nest-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; @@ -50728,7 +51080,7 @@ in sources."apollo-codegen-swift-0.37.3" sources."apollo-codegen-typescript-0.37.3" sources."apollo-datasource-0.7.1" - (sources."apollo-engine-reporting-2.0.1" // { + (sources."apollo-engine-reporting-2.2.0" // { dependencies = [ sources."uuid-8.1.0" ]; @@ -50746,10 +51098,10 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.20" sources."apollo-server-caching-0.5.1" - sources."apollo-server-core-2.14.4" + sources."apollo-server-core-2.15.0" sources."apollo-server-env-2.4.4" sources."apollo-server-errors-2.4.1" - sources."apollo-server-express-2.14.4" + sources."apollo-server-express-2.15.0" sources."apollo-server-plugin-base-0.9.0" sources."apollo-server-types-0.5.0" sources."apollo-tracing-0.11.0" @@ -51054,7 +51406,7 @@ in sources."env-ci-3.2.2" sources."envinfo-7.5.1" sources."error-ex-1.3.2" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -51253,7 +51605,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-7.1.0" // { + (sources."inquirer-7.2.0" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."ansi-styles-4.2.1" @@ -51501,7 +51853,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-path-0.11.4" sources."object-treeify-1.1.25" @@ -51761,8 +52113,6 @@ in ]; }) sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" (sources."string_decoder-1.1.1" // { dependencies = [ @@ -52650,7 +53000,7 @@ in sources."JSONStream-1.3.5" sources."acorn-7.3.1" sources."acorn-node-1.8.2" - sources."acorn-walk-7.1.1" + sources."acorn-walk-7.2.0" (sources."asn1.js-4.10.1" // { dependencies = [ sources."bn.js-4.11.9" @@ -52720,7 +53070,7 @@ in }) sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - (sources."elliptic-6.5.2" // { + (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -53541,14 +53891,14 @@ in sources."concat-map-0.0.1" sources."date-format-2.1.0" sources."debounce-1.2.0" - sources."debug-3.2.6" + sources."debug-4.2.0" sources."deep-extend-0.6.0" sources."event-lite-0.1.2" sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" sources."flatted-2.0.2" - sources."follow-redirects-1.11.0" - sources."fp-ts-2.6.5" + sources."follow-redirects-1.12.1" + sources."fp-ts-2.6.6" sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" @@ -53570,11 +53920,7 @@ in ]; }) sources."lodash-4.17.15" - (sources."log4js-5.3.0" // { - dependencies = [ - sources."debug-4.2.0" - ]; - }) + sources."log4js-5.3.0" (sources."metals-languageclient-0.2.2" // { dependencies = [ sources."mkdirp-1.0.4" @@ -53608,11 +53954,7 @@ in sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."shell-quote-1.7.2" - (sources."streamroller-2.2.4" // { - dependencies = [ - sources."debug-4.2.0" - ]; - }) + sources."streamroller-2.2.4" sources."strip-json-comments-2.0.1" sources."tar-4.4.13" sources."tslib-1.13.0" @@ -53671,13 +54013,13 @@ in sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" sources."@types/json-schema-7.0.5" - sources."@typescript-eslint/experimental-utils-3.2.0" - sources."@typescript-eslint/parser-3.2.0" - sources."@typescript-eslint/typescript-estree-3.2.0" + sources."@typescript-eslint/experimental-utils-3.3.0" + sources."@typescript-eslint/parser-3.3.0" + sources."@typescript-eslint/typescript-estree-3.3.0" sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" sources."ajv-6.12.2" - sources."ajv-keywords-3.4.1" + sources."ajv-keywords-3.5.0" (sources."ansi-align-2.0.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -53736,7 +54078,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001081" + sources."caniuse-lite-1.0.30001084" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -53832,7 +54174,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.469" + sources."electron-to-chromium-1.3.478" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -53845,7 +54187,7 @@ in ]; }) sources."eslint-scope-5.1.0" - sources."eslint-utils-2.0.0" + sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.2.0" sources."espree-6.2.1" sources."esprima-4.0.1" @@ -54010,7 +54352,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-7.1.0" // { + (sources."inquirer-7.2.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-3.0.0" @@ -54078,7 +54420,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - sources."js-base64-2.5.2" + sources."js-base64-2.6.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."json-parse-better-errors-1.0.2" @@ -54662,10 +55004,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.3.tgz"; - sha512 = "VgL/6zKfm+ASlpNnCl7xY8CYMqycbK3ZEmn0ApVa+CITTkSLOBVFW5B9n53djq5HpPr9QxvGORbxYMQ0INo3kg=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.4.tgz"; + sha512 = "3ApE/UFqUBLW0bhS2dTLp2tBkbGtEByCDrS9Orz1Aaz22QD7mXoeo/ihbByo8HvLp+QOevYrrWbN5dQZ2OJB9A=="; }; buildInputs = globalBuildInputs; meta = { @@ -54812,7 +55154,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001081" + sources."caniuse-lite-1.0.30001084" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -54871,7 +55213,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.469" + sources."electron-to-chromium-1.3.478" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -55658,7 +56000,7 @@ in sources."array-union-2.1.0" sources."braces-3.0.2" sources."dir-glob-3.0.1" - sources."fast-glob-3.2.2" + sources."fast-glob-3.2.4" sources."fill-range-7.0.1" sources."globby-10.0.2" sources."ignore-5.1.8" @@ -55854,7 +56196,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-7.1.0" // { + (sources."inquirer-7.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" @@ -56169,7 +56511,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-formatter-0.4.8" + sources."sass-formatter-0.4.9" sources."sax-1.2.4" sources."semver-5.7.1" sources."semver-diff-2.1.0" @@ -56295,7 +56637,7 @@ in sources."stylus-supremacy-2.14.5" sources."suf-cli-0.1.1" sources."suf-node-1.1.1" - sources."suf-regex-0.0.21" + sources."suf-regex-0.0.22" sources."supports-color-5.5.0" sources."symbol-0.2.3" (sources."table-5.4.6" // { @@ -56645,14 +56987,13 @@ in sources."colorspace-1.1.2" sources."commander-4.1.1" sources."core-util-is-1.0.2" - sources."debug-3.2.6" sources."diagnostics-1.1.1" sources."enabled-1.0.2" sources."env-variable-0.0.6" sources."eventemitter3-4.0.4" sources."fast-safe-stringify-2.0.7" sources."fecha-2.3.3" - sources."follow-redirects-1.11.0" + sources."follow-redirects-1.12.1" sources."http-proxy-1.18.1" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" @@ -58678,151 +59019,6 @@ in bypassCache = true; reconstructLock = true; }; - dnschain = nodeEnv.buildNodePackage { - name = "dnschain"; - packageName = "dnschain"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dnschain/-/dnschain-0.5.3.tgz"; - sha1 = "9b21d9ac5e203295f372ac37df470e9f0854c470"; - }; - dependencies = [ - sources."accepts-1.2.13" - sources."assert-plus-1.0.0" - sources."async-0.9.2" - sources."better-curry-1.6.0" - sources."binaryheap-0.0.3" - sources."bindings-1.5.0" - sources."bluebird-2.9.9" - sources."bottleneck-1.5.3" - sources."buffercursor-0.0.12" - sources."colors-0.6.2" - sources."combined-stream-0.0.7" - sources."component-emitter-1.1.2" - sources."content-disposition-0.5.0" - sources."cookie-0.1.2" - sources."cookie-signature-1.0.5" - sources."cookiejar-2.0.1" - sources."core-util-is-1.0.2" - sources."crc-3.2.1" - sources."cycle-1.0.3" - sources."debug-2.1.3" - sources."delayed-stream-0.0.5" - sources."depd-1.0.1" - sources."destroy-1.0.3" - sources."duplexer-0.1.1" - sources."ee-first-1.1.0" - sources."es5class-2.3.1" - sources."escape-html-1.0.1" - sources."etag-1.5.1" - sources."event-stream-3.2.2" - sources."eventemitter3-0.1.6" - sources."express-4.11.2" - sources."extend-1.2.1" - sources."extsprintf-1.4.0" - sources."eyes-0.1.8" - sources."faye-websocket-0.11.3" - sources."file-uri-to-path-1.0.0" - sources."finalhandler-0.3.3" - sources."form-data-0.1.3" - sources."formidable-1.0.14" - sources."forwarded-0.1.2" - sources."fresh-0.2.4" - sources."from-0.1.7" - sources."hiredis-0.4.1" - sources."http-parser-js-0.5.2" - sources."inherits-2.0.4" - sources."ini-1.3.5" - sources."ipaddr.js-1.0.5" - sources."isarray-0.0.1" - (sources."json-rpc2-0.8.1" // { - dependencies = [ - sources."debug-1.0.5" - sources."lodash-2.4.2" - sources."ms-2.0.0" - ]; - }) - sources."jsonparse-0.0.6" - sources."lodash-3.1.0" - sources."map-stream-0.1.0" - sources."media-typer-0.3.0" - sources."merge-descriptors-0.0.2" - sources."methods-1.1.2" - sources."mime-1.2.11" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" - sources."minimist-0.0.10" - sources."ms-0.7.0" - sources."nan-2.14.1" - (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // { - dependencies = [ - sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" - ]; - }) - (sources."native-dns-cache-git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" // { - dependencies = [ - sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#307e77a47ebba57a5ae9118a284e916e5ebb305a" - ]; - }) - sources."native-dns-packet-0.1.1" - sources."nconf-0.7.1" - sources."negotiator-0.5.3" - sources."on-finished-2.2.1" - sources."optimist-0.6.1" - sources."parseurl-1.3.3" - sources."path-to-regexp-0.1.3" - sources."pause-stream-0.0.11" - sources."pkginfo-0.3.1" - sources."properties-1.2.1" - sources."proxy-addr-1.0.10" - sources."qs-2.3.3" - sources."range-parser-1.0.3" - sources."readable-stream-1.0.27-1" - sources."redis-0.12.1" - sources."reduce-component-1.0.1" - sources."safe-buffer-5.2.1" - sources."send-0.11.1" - sources."serve-static-1.8.1" - sources."split-0.3.3" - sources."stack-trace-0.0.10" - sources."stream-combiner-0.0.4" - sources."string-2.0.1" - sources."string_decoder-0.10.31" - (sources."superagent-0.21.0" // { - dependencies = [ - sources."methods-1.0.1" - sources."qs-1.2.0" - ]; - }) - sources."through-2.3.8" - (sources."type-is-1.5.7" // { - dependencies = [ - sources."mime-db-1.12.0" - sources."mime-types-2.0.14" - ]; - }) - sources."utils-merge-1.0.0" - sources."vary-1.0.1" - sources."verror-1.10.0" - sources."websocket-driver-0.7.4" - sources."websocket-extensions-0.1.4" - (sources."winston-0.8.0" // { - dependencies = [ - sources."async-0.2.10" - ]; - }) - sources."wordwrap-0.0.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; - homepage = https://github.com/okTurtles/dnschain; - license = "MPL-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; @@ -58866,10 +59062,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.29.1"; + version = "6.31.4"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.29.1.tgz"; - sha512 = "p/4ZAjzx0C6wVPnqHBqFZXwa2HI40mg3pchl3kW8utLg3G0ILA5H1ypXB62S1uyPuuNXgq3GdiEj8C12aa15nQ=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.31.4.tgz"; + sha512 = "hEndfeU/OBabQMVqexOU/1vwYM5gYu5U0FyEe17WgQdcOMQMcVHQIVEwm73BD9eB6fPPZt/7cQdaqm7fOSHzdA=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -58878,11 +59074,12 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.696.0" + sources."aws-sdk-2.700.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" + sources."big.js-5.2.2" sources."buffer-4.9.2" sources."buffer-queue-1.0.0" sources."bytes-3.1.0" @@ -58890,7 +59087,6 @@ in sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."decimal.js-10.2.0" sources."delay-4.3.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" @@ -59430,7 +59626,7 @@ in sources."emoji-regex-8.0.0" sources."escape-string-regexp-1.0.5" sources."eslint-scope-5.1.0" - sources."eslint-utils-2.0.0" + sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.2.0" sources."espree-7.1.0" sources."esprima-4.0.1" @@ -59462,7 +59658,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-7.1.0" // { + (sources."inquirer-7.2.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-3.0.0" @@ -59608,7 +59804,7 @@ in sources."escape-string-regexp-1.0.5" sources."eslint-7.2.0" sources."eslint-scope-5.1.0" - sources."eslint-utils-2.0.0" + sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.2.0" sources."espree-7.1.0" sources."esprima-4.0.1" @@ -59640,7 +59836,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-7.1.0" // { + (sources."inquirer-7.2.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-3.0.0" @@ -59973,7 +60169,7 @@ in sources."find-up-4.1.0" (sources."fkill-7.0.1" // { dependencies = [ - sources."ps-list-7.1.0" + sources."ps-list-7.2.0" ]; }) sources."get-stream-5.1.0" @@ -59983,7 +60179,7 @@ in sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" sources."indent-string-4.0.0" - sources."inquirer-7.1.0" + sources."inquirer-7.2.0" (sources."inquirer-autocomplete-prompt-1.0.2" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -60205,7 +60401,7 @@ in sources."define-property-2.0.2" sources."defined-0.0.0" sources."director-1.2.7" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" (sources."event-stream-0.5.3" // { dependencies = [ @@ -60342,7 +60538,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -60446,8 +60642,6 @@ in }) sources."string-width-1.0.2" sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -60592,7 +60786,7 @@ in sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."moment-2.26.0" + sources."moment-2.27.0" sources."moo-0.5.1" sources."ms-2.1.2" sources."multicb-1.2.2" @@ -60601,7 +60795,7 @@ in sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.0" sources."nan-2.14.1" - sources."nearley-2.19.3" + sources."nearley-2.19.4" sources."node-gyp-build-4.2.2" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" @@ -60704,7 +60898,7 @@ in }) sources."ssb-msgs-5.2.0" sources."ssb-pull-requests-1.0.0" - sources."ssb-ref-2.13.9" + sources."ssb-ref-2.14.0" (sources."stream-to-pull-stream-1.7.3" // { dependencies = [ sources."looper-3.0.0" @@ -60749,10 +60943,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "3.2.4"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.4.tgz"; - sha512 = "rf0NbwZobW2Kwwomf41Ooas7rm7yg1z68fyKgrKaUs/VaaNtwIYMp/J11iQxcFu5p6i73huCytzmmo/8v4usDA=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.6.tgz"; + sha512 = "Mzb3SGlcrFSwVu4R8Y2sGxK+d7VP6CRC6rw3S4mOPbxfW3qNrOLYEPDJM7h1GNUjOL22JQHx1qsn8sRODqAygQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.1" @@ -60788,6 +60982,7 @@ in sources."arrify-1.0.1" (sources."boxen-4.2.0" // { dependencies = [ + sources."chalk-3.0.0" sources."type-fest-0.8.1" ]; }) @@ -60798,7 +60993,7 @@ in }) sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."chardet-0.7.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.0" @@ -60858,7 +61053,11 @@ in sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."ini-1.3.5" - sources."inquirer-7.1.0" + (sources."inquirer-7.2.0" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) (sources."inquirer-autocomplete-prompt-1.0.2" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -60930,7 +61129,11 @@ in sources."npm-run-path-4.0.1" sources."once-1.4.0" sources."onetime-5.1.0" - sources."ora-4.0.4" + (sources."ora-4.0.4" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" @@ -60995,7 +61198,11 @@ in sources."type-fest-0.11.0" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" - sources."update-notifier-4.1.0" + (sources."update-notifier-4.1.0" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) sources."uri-js-4.2.2" sources."url-parse-lax-3.0.0" sources."validate-npm-package-license-3.0.4" @@ -61069,10 +61276,10 @@ in sources."tslib-1.11.2" ]; }) - sources."@graphql-tools/load-6.0.9" - sources."@graphql-tools/merge-6.0.9" - sources."@graphql-tools/schema-6.0.9" - sources."@graphql-tools/utils-6.0.9" + sources."@graphql-tools/load-6.0.10" + sources."@graphql-tools/merge-6.0.10" + sources."@graphql-tools/schema-6.0.10" + sources."@graphql-tools/utils-6.0.10" sources."@kwsites/exec-p-0.4.0" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -61196,7 +61403,7 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-get-iterator-1.1.0" sources."es-to-primitive-1.2.1" sources."es6-promise-3.3.1" @@ -61212,7 +61419,7 @@ in sources."extract-files-8.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-1.1.0" - sources."fast-glob-3.2.2" + sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fastq-1.8.0" @@ -61383,7 +61590,7 @@ in sources."oas-schema-walker-1.1.4" sources."oas-validator-3.4.0" sources."oauth-sign-0.9.0" - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object.assign-4.1.0" @@ -61483,8 +61690,6 @@ in sources."string-env-interpolation-1.0.1" sources."string-width-4.2.0" sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" sources."strip-ansi-6.0.0" sources."strip-eof-1.0.0" @@ -62897,7 +63102,7 @@ in sources."debug-3.2.6" sources."ecstatic-3.3.2" sources."eventemitter3-4.0.4" - sources."follow-redirects-1.11.0" + sources."follow-redirects-1.12.1" sources."he-1.2.0" sources."http-proxy-1.18.1" sources."lodash-4.17.15" @@ -63011,7 +63216,7 @@ in sources."minimist-1.2.5" ]; }) - sources."moment-2.26.0" + sources."moment-2.27.0" sources."mv-2.1.1" sources."nan-2.14.1" sources."ncp-2.0.0" @@ -63258,7 +63463,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-7.1.0" // { + (sources."inquirer-7.2.0" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."cli-cursor-3.1.0" @@ -63495,7 +63700,7 @@ in sources."camelcase-4.1.0" sources."caryll-shapeops-0.3.1" sources."caseless-0.12.0" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."child-process-promise-2.2.1" sources."cli-cursor-3.1.0" sources."clipper-lib-1.0.0" @@ -63782,7 +63987,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" - (sources."verda-1.0.4" // { + (sources."verda-1.1.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."camelcase-5.3.1" @@ -63946,7 +64151,7 @@ in sources."string-template-0.2.1" sources."supports-color-5.5.0" sources."symbol-observable-1.0.1" - sources."thenify-3.3.0" + sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."thriftrw-3.12.0" sources."type-detect-4.0.8" @@ -64120,7 +64325,7 @@ in sources."cwise-compiler-1.1.3" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."debug-3.2.6" + sources."debug-2.6.9" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" @@ -64164,7 +64369,6 @@ in sources."esutils-2.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ - sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" (sources."is-accessor-descriptor-0.1.6" // { @@ -64179,7 +64383,6 @@ in }) sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" - sources."ms-2.0.0" ]; }) sources."expand-template-2.0.3" @@ -64214,7 +64417,7 @@ in sources."fs-extra-4.0.3" ]; }) - sources."follow-redirects-1.11.0" + sources."follow-redirects-1.12.1" sources."font-awesome-filetypes-2.1.0" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" @@ -64417,8 +64620,8 @@ in }) sources."mkdirp-0.5.5" sources."mkdirp-classic-0.5.3" - sources."moment-2.26.0" - sources."ms-2.1.2" + sources."moment-2.27.0" + sources."ms-2.0.0" (sources."multiparty-4.2.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -64433,7 +64636,12 @@ in sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" - sources."needle-2.5.0" + (sources."needle-2.5.0" // { + dependencies = [ + sources."debug-3.2.6" + sources."ms-2.1.2" + ]; + }) sources."nextgen-events-1.3.0" sources."nice-try-1.0.5" sources."no-case-2.3.2" @@ -64581,7 +64789,6 @@ in }) (sources."snapdragon-0.8.2" // { dependencies = [ - sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" (sources."is-accessor-descriptor-0.1.6" // { @@ -64596,7 +64803,6 @@ in }) sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" - sources."ms-2.0.0" sources."source-map-0.5.7" ]; }) @@ -64685,7 +64891,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.35.3" + sources."terminal-kit-1.35.7" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -65131,7 +65337,7 @@ in sources."escape-html-1.0.3" sources."etag-1.8.1" sources."express-4.17.1" - (sources."express-urlrewrite-1.2.0" // { + (sources."express-urlrewrite-1.3.0" // { dependencies = [ sources."path-to-regexp-1.8.0" ]; @@ -65424,12 +65630,7 @@ in sources."finalhandler-1.1.2" sources."find-up-4.1.0" sources."flatted-2.0.2" - (sources."follow-redirects-1.11.0" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.2" - ]; - }) + sources."follow-redirects-1.12.1" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" @@ -65777,7 +65978,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.26.0" + sources."moment-2.27.0" sources."mute-stream-0.0.8" (sources."nconf-0.10.0" // { dependencies = [ @@ -66039,11 +66240,7 @@ in }) (sources."@octokit/request-5.4.5" // { dependencies = [ - (sources."@octokit/request-error-2.0.1" // { - dependencies = [ - sources."@octokit/types-4.1.10" - ]; - }) + sources."@octokit/request-error-2.0.2" sources."is-plain-object-3.0.0" sources."isobject-4.0.0" sources."universal-user-agent-5.0.0" @@ -66055,7 +66252,7 @@ in ]; }) sources."@octokit/rest-16.43.1" - sources."@octokit/types-5.0.0" + sources."@octokit/types-5.0.1" sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" @@ -66253,7 +66450,7 @@ in sources."envinfo-7.5.1" sources."err-code-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -66627,7 +66824,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" @@ -66826,8 +67023,6 @@ in ]; }) sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" (sources."string_decoder-1.1.1" // { dependencies = [ @@ -66844,7 +67039,7 @@ in sources."temp-dir-1.0.0" sources."temp-write-3.4.0" sources."text-extensions-1.9.0" - sources."thenify-3.3.0" + sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."through-2.3.8" sources."through2-2.0.5" @@ -67944,6 +68139,7 @@ in sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.10.1" sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-import-meta-7.10.1" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.1" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" @@ -68051,10 +68247,10 @@ in sources."ace.improved-0.2.1" sources."acorn-7.3.1" sources."acorn-node-1.8.2" - sources."acorn-walk-7.1.1" + sources."acorn-walk-7.2.0" sources."ajv-6.12.2" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.4.1" + sources."ajv-keywords-3.5.0" sources."amdefine-1.0.1" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -68128,7 +68324,7 @@ in sources."babel-plugin-transform-remove-undefined-0.5.0" sources."babel-plugin-transform-simplify-comparison-operators-6.9.4" sources."babel-plugin-transform-undefined-to-void-6.9.4" - sources."babel-preset-current-node-syntax-0.1.2" + sources."babel-preset-current-node-syntax-0.1.3" sources."babel-preset-jest-25.5.0" sources."babel-preset-minify-0.5.1" (sources."babel-runtime-6.26.0" // { @@ -68203,7 +68399,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001081" + sources."caniuse-lite-1.0.30001084" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -68325,8 +68521,8 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.469" - (sources."elliptic-6.5.2" // { + sources."electron-to-chromium-1.3.478" + (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -68334,7 +68530,7 @@ in sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-4.1.1" // { + (sources."enhanced-resolve-4.2.0" // { dependencies = [ sources."memory-fs-0.5.0" ]; @@ -68484,9 +68680,8 @@ in sources."ini-1.3.5" sources."inline-source-map-0.6.2" sources."insert-module-globals-7.2.0" - sources."interpret-1.2.0" + sources."interpret-1.4.0" sources."invariant-2.2.4" - sources."invert-kv-2.0.0" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" @@ -68548,7 +68743,6 @@ in sources."jszip-2.6.1" sources."kind-of-6.0.3" sources."labeled-stream-splicer-2.0.2" - sources."lcid-2.0.0" sources."leven-3.1.0" sources."levenary-1.1.1" sources."lines-and-columns-1.1.6" @@ -68570,11 +68764,9 @@ in ]; }) sources."makeerror-1.0.11" - sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."md5.js-1.3.5" - sources."mem-4.3.0" sources."memory-fs-0.4.1" sources."merge-stream-2.0.0" (sources."micromatch-4.0.2" // { @@ -68592,7 +68784,6 @@ in }) sources."mime-db-1.44.0" sources."mime-types-2.1.27" - sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -68657,10 +68848,7 @@ in sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-browserify-0.3.0" - sources."os-locale-3.1.0" - sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-2.1.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" @@ -68899,7 +69087,7 @@ in sources."readable-stream-3.6.0" ]; }) - (sources."terser-4.7.0" // { + (sources."terser-4.8.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -68967,7 +69155,7 @@ in }) sources."util-deprecate-1.0.2" sources."uuid-3.4.0" - sources."v8-compile-cache-2.0.3" + sources."v8-compile-cache-2.1.1" sources."validate-npm-package-license-3.0.4" sources."verror-1.10.0" sources."vinyl-2.2.0" @@ -68996,17 +69184,13 @@ in sources."schema-utils-1.0.0" ]; }) - (sources."webpack-cli-3.3.11" // { + (sources."webpack-cli-3.3.12" // { dependencies = [ (sources."chalk-2.4.2" // { dependencies = [ sources."supports-color-5.5.0" ]; }) - sources."emojis-list-2.1.0" - sources."enhanced-resolve-4.1.0" - sources."json5-1.0.1" - sources."loader-utils-1.2.3" sources."supports-color-6.1.0" ]; }) @@ -69036,7 +69220,7 @@ in sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yallist-3.1.1" - (sources."yargs-13.2.4" // { + (sources."yargs-13.3.2" // { dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" @@ -69989,7 +70173,7 @@ in sources."define-properties-1.1.3" sources."diff-4.0.2" sources."emoji-regex-7.0.3" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-array-method-boxes-properly-1.0.0" sources."es-get-iterator-1.1.0" sources."es-to-primitive-1.2.1" @@ -70036,7 +70220,7 @@ in sources."minimatch-3.0.4" sources."ms-2.1.2" sources."normalize-path-3.0.0" - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."once-1.4.0" @@ -70055,8 +70239,6 @@ in sources."sprintf-js-1.0.3" sources."string-width-2.1.1" sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" sources."strip-ansi-4.0.0" sources."strip-json-comments-3.0.1" @@ -71056,7 +71238,7 @@ in }) sources."minizlib-1.3.3" sources."mkdirp-0.5.5" - sources."moment-2.26.0" + sources."moment-2.27.0" sources."moment-timezone-0.5.31" (sources."mqtt-2.18.8" // { dependencies = [ @@ -71641,7 +71823,7 @@ in sources."@types/color-name-1.1.1" sources."abbrev-1.1.1" sources."agent-base-6.0.0" - sources."agentkeepalive-4.1.2" + sources."agentkeepalive-4.1.3" sources."aggregate-error-3.0.1" sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { @@ -72434,7 +72616,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001081" + sources."caniuse-lite-1.0.30001084" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -72575,8 +72757,8 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.469" - (sources."elliptic-6.5.2" // { + sources."electron-to-chromium-1.3.478" + (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -72586,9 +72768,9 @@ in sources."entities-1.1.2" sources."envinfo-7.5.1" sources."error-ex-1.3.2" - (sources."es-abstract-1.17.5" // { + (sources."es-abstract-1.17.6" // { dependencies = [ - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" ]; }) sources."es-to-primitive-1.2.1" @@ -72682,7 +72864,7 @@ in (sources."htmlnano-0.2.5" // { dependencies = [ sources."posthtml-0.12.3" - sources."terser-4.7.0" + sources."terser-4.8.0" ]; }) (sources."htmlparser2-3.10.1" // { @@ -73065,7 +73247,7 @@ in sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."stable-0.1.8" - (sources."static-eval-2.0.5" // { + (sources."static-eval-2.1.0" // { dependencies = [ sources."escodegen-1.14.2" sources."esprima-4.0.1" @@ -73084,8 +73266,6 @@ in ]; }) sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" @@ -73367,7 +73547,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."moment-2.26.0" + sources."moment-2.27.0" sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" @@ -73433,7 +73613,7 @@ in ]; }) sources."serve-static-1.14.1" - (sources."service-runner-2.7.7" // { + (sources."service-runner-2.7.8" // { dependencies = [ sources."semver-7.3.2" sources."yargs-14.2.3" @@ -73572,7 +73752,7 @@ in sources."dns-txt-2.0.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."external-editor-2.2.0" @@ -73662,7 +73842,7 @@ in sources."number-is-nan-1.0.1" sources."numeral-2.0.6" sources."object-assign-4.1.1" - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object.assign-4.1.0" @@ -73752,8 +73932,6 @@ in sources."stream-buffers-2.2.0" sources."string-width-1.0.2" sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" sources."string2compact-1.3.0" sources."string_decoder-1.1.1" @@ -74182,10 +74360,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.1.8"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.1.8.tgz"; - sha512 = "DsyoyFo60MByj8rZEFH6a/ZKz0NQbg5tdKCIgjMlvA2kyNKt0d+XW2eaYjqw6ILGuy2k857yRPZfgJgV0Xgpjg=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.2.2.tgz"; + sha512 = "8SumQnJM4qMSZa17Z8Tj4q/z3Lsa2+ETIf0EK4rtGi+Xrw8Y7zFKpimVWX6imQs9XSNANabs8h+thpb+n0PPDA=="; }; buildInputs = globalBuildInputs; meta = { @@ -74235,7 +74413,7 @@ in sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."fast-glob-3.2.2" + sources."fast-glob-3.2.4" sources."fastq-1.8.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -74363,10 +74541,10 @@ in pscid = nodeEnv.buildNodePackage { name = "pscid"; packageName = "pscid"; - version = "2.9.2"; + version = "2.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/pscid/-/pscid-2.9.2.tgz"; - sha512 = "xK6xfd8AhzJIddcpwveQjFEH+7ODr4gVM84rsvXwP6/167quMbt4VB2pcMf051gew1iwFgK90L301CcW+UD7Cg=="; + url = "https://registry.npmjs.org/pscid/-/pscid-2.9.3.tgz"; + sha512 = "6N4chHbL38Km4kTrC7a9UJ4fpPsFV6BDwO3yZetdExN7agC+YGYLpVhLflFUlsZJ9VnUT9UToitwC/DqGnGSjA=="; }; dependencies = [ sources."balanced-match-1.0.0" @@ -74409,7 +74587,7 @@ in sources."JSONStream-1.3.5" sources."acorn-7.3.1" sources."acorn-node-1.8.2" - sources."acorn-walk-7.1.1" + sources."acorn-walk-7.2.0" (sources."asn1.js-4.10.1" // { dependencies = [ sources."bn.js-4.11.9" @@ -74498,7 +74676,7 @@ in }) sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - (sources."elliptic-6.5.2" // { + (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -74708,7 +74886,7 @@ in sources."cycle-1.0.3" sources."deep-equal-2.0.3" sources."define-properties-1.1.3" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-get-iterator-1.1.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" @@ -74744,7 +74922,7 @@ in sources."mkdirp-0.5.5" sources."mute-stream-0.0.8" sources."ncp-0.4.2" - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object.assign-4.1.0" @@ -74760,8 +74938,6 @@ in sources."side-channel-1.0.2" sources."stack-trace-0.0.10" sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" @@ -74861,10 +75037,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.16.0"; + version = "2.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.16.0.tgz"; - sha512 = "95NglykUQAhl+mTFZqVvGUWDoGHV4/XanOZBbR7LOwTKODde5yFNHfVDZEnERBMuQViDuYaxOlFW87i1GQMihA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.17.1.tgz"; + sha512 = "lVrtCXJ+08Eapa0SfApLmRNWNWm2FsYFnLPIJZJvZz2uI2Gv+dfPyu1zgF7KKF/HYFJDvjxbdCbI8lUVMnG7Sg=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -74906,14 +75082,14 @@ in sources."@types/node-fetch-2.5.7" sources."@types/resolve-0.0.8" sources."@types/vscode-1.45.0" - (sources."@typescript-eslint/eslint-plugin-3.2.0" // { + (sources."@typescript-eslint/eslint-plugin-3.3.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/experimental-utils-3.2.0" - sources."@typescript-eslint/parser-3.2.0" - (sources."@typescript-eslint/typescript-estree-3.2.0" // { + sources."@typescript-eslint/experimental-utils-3.3.0" + sources."@typescript-eslint/parser-3.3.0" + (sources."@typescript-eslint/typescript-estree-3.3.0" // { dependencies = [ sources."semver-7.3.2" ]; @@ -74999,7 +75175,7 @@ in }) sources."emoji-regex-8.0.0" sources."entities-1.1.2" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -75010,7 +75186,7 @@ in ]; }) sources."eslint-scope-5.1.0" - sources."eslint-utils-2.0.0" + sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.2.0" sources."espree-7.1.0" sources."esprima-4.0.1" @@ -75067,7 +75243,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-7.1.0" // { + (sources."inquirer-7.2.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-3.0.0" @@ -75145,7 +75321,7 @@ in sources."node-fetch-2.6.0" sources."normalize-path-3.0.0" sources."nth-check-1.0.2" - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.1.0" @@ -75186,7 +75362,7 @@ in sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."rollup-2.16.0" + sources."rollup-2.17.1" sources."run-async-2.4.1" (sources."rxjs-6.5.5" // { dependencies = [ @@ -75210,8 +75386,6 @@ in sources."sprintf-js-1.0.3" sources."string-width-4.2.0" sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" @@ -75248,7 +75422,7 @@ in sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.1.1" - (sources."vsce-1.76.1" // { + (sources."vsce-1.77.0" // { dependencies = [ sources."chalk-2.4.2" sources."semver-5.7.1" @@ -75564,10 +75738,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.72.0"; + version = "1.73.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.72.0.tgz"; - sha512 = "+ylbI53V3axZsOVaN4CxHERQAwtJ03B5r3IZfTy1//ZnM8uLlhMPu1jXkKaQ+Drolk6+VtgZwx+zzjzyKSzt6Q=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.73.1.tgz"; + sha512 = "8cBSUS8uGzI9/mYJqWfLsx/byIfUlpZS2gXpUP5yXu6rRuBpLAsg1V02rzjK+48t+3Sv5+qZCk1XRGbzoUTVGg=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -75586,9 +75760,9 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" - sources."@serverless/cli-1.4.0" + sources."@serverless/cli-1.5.1" sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-2.30.14" // { + (sources."@serverless/components-2.30.20" // { dependencies = [ sources."globby-10.0.2" sources."semver-7.3.2" @@ -75617,7 +75791,8 @@ in ]; }) sources."@serverless/template-1.1.3" - sources."@serverless/utils-china-0.1.14" + sources."@serverless/utils-1.1.0" + sources."@serverless/utils-china-0.1.15" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" (sources."@tencent-sdk/capi-0.2.15-alpha.0" // { @@ -75693,7 +75868,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.696.0" // { + (sources."aws-sdk-2.700.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -75764,7 +75939,7 @@ in ]; }) sources."chokidar-3.4.0" - sources."ci-info-2.0.0" + sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -75939,7 +76114,7 @@ in ]; }) sources."engine.io-parser-2.2.0" - sources."enhanced-resolve-4.1.1" + sources."enhanced-resolve-4.2.0" sources."env-variable-0.0.6" sources."errno-0.1.7" sources."es5-ext-0.10.53" @@ -76006,7 +76181,7 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.2" + sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" @@ -76156,11 +76331,7 @@ in sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" - (sources."is-ci-1.2.1" // { - dependencies = [ - sources."ci-info-1.6.0" - ]; - }) + sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-1.1.0" @@ -76219,7 +76390,7 @@ in sources."jsonata-1.8.3" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" - (sources."jszip-3.4.0" // { + (sources."jszip-3.5.0" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" @@ -76304,7 +76475,7 @@ in sources."mkdirp-0.5.5" sources."module-definition-3.3.0" sources."module-lookup-amd-6.2.0" - sources."moment-2.26.0" + sources."moment-2.27.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" sources."nanoid-2.1.11" @@ -76393,7 +76564,11 @@ in ]; }) sources."postcss-values-parser-1.5.0" - sources."precinct-6.2.0" + (sources."precinct-6.3.1" // { + dependencies = [ + sources."commander-2.20.3" + ]; + }) sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" sources."prettyoutput-1.2.0" @@ -76505,12 +76680,6 @@ in sources."ms-2.0.0" ]; }) - (sources."socket.io-stream-0.9.1" // { - dependencies = [ - sources."debug-2.2.0" - sources."ms-0.7.1" - ]; - }) sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" sources."source-map-0.6.1" @@ -77314,14 +77483,22 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.339.2"; + version = "1.346.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.339.2.tgz"; - sha512 = "BpXMOZX/jj/4fHOq2gfSlAPE9+DNe/WEqNCbQ68uy1U9NA1tucGJf3B376NofsgXCYIrJ0tw5Mjf1yfq7F4Vxw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.346.0.tgz"; + sha512 = "uwJDC0CRefppngm1J1M+Sja5CVfdmzLYkxGYp3ZYXrzvd912pgzrdYm8ciUL5a8x1/C+2L0iZ09W68daSuObhA=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" - sources."@snyk/cli-interface-2.6.0" + (sources."@snyk/cli-interface-2.8.0" // { + dependencies = [ + (sources."@snyk/dep-graph-1.19.0" // { + dependencies = [ + sources."tslib-2.0.0" + ]; + }) + ]; + }) (sources."@snyk/cocoapods-lockfile-parser-3.4.0" // { dependencies = [ sources."@snyk/dep-graph-1.18.4" @@ -77337,11 +77514,7 @@ in sources."@snyk/gemfile-1.2.0" sources."@snyk/graphlib-2.1.9-patch" sources."@snyk/inquirer-6.2.2-patch" - (sources."@snyk/java-call-graph-builder-1.10.0" // { - dependencies = [ - sources."debug-4.2.0" - ]; - }) + sources."@snyk/java-call-graph-builder-1.10.0" sources."@snyk/lodash-4.17.15-patch" (sources."@snyk/rpm-parser-2.0.0" // { dependencies = [ @@ -77454,7 +77627,7 @@ in }) sources."crypto-random-string-2.0.0" sources."data-uri-to-buffer-1.2.0" - sources."debug-3.2.6" + sources."debug-4.2.0" sources."decamelize-1.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" @@ -77469,7 +77642,6 @@ in sources."diff-4.0.2" (sources."docker-modem-2.1.3" // { dependencies = [ - sources."debug-4.2.0" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" sources."string_decoder-1.3.0" @@ -77528,7 +77700,11 @@ in sources."ms-2.0.0" ]; }) - sources."https-proxy-agent-3.0.1" + (sources."https-proxy-agent-3.0.1" // { + dependencies = [ + sources."debug-3.2.6" + ]; + }) sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" sources."immediate-3.0.6" @@ -77557,7 +77733,7 @@ in sources."isexe-2.0.0" sources."js-yaml-3.14.0" sources."json-buffer-3.0.0" - (sources."jszip-3.4.0" // { + (sources."jszip-3.5.0" // { dependencies = [ sources."pako-1.0.11" ]; @@ -77573,6 +77749,7 @@ in sources."lodash.clonedeep-4.5.0" sources."lodash.flatten-4.4.0" sources."lodash.get-4.4.2" + sources."lodash.isequal-4.5.0" sources."lodash.set-4.3.2" sources."lowercase-keys-1.0.1" sources."lru-cache-5.1.1" @@ -77585,7 +77762,11 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.7" sources."nconf-0.10.0" - sources."needle-2.5.0" + (sources."needle-2.5.0" // { + dependencies = [ + sources."debug-3.2.6" + ]; + }) sources."netmask-1.0.6" sources."nice-try-1.0.5" sources."normalize-url-4.5.0" @@ -77602,11 +77783,7 @@ in sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" sources."p-map-2.1.0" - (sources."pac-proxy-agent-3.0.1" // { - dependencies = [ - sources."debug-4.2.0" - ]; - }) + sources."pac-proxy-agent-3.0.1" sources."pac-resolver-3.0.0" sources."package-json-6.5.0" sources."pako-0.2.9" @@ -77618,11 +77795,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-7.3.1" - (sources."proxy-agent-3.1.1" // { - dependencies = [ - sources."debug-4.2.0" - ]; - }) + sources."proxy-agent-3.1.1" sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" sources."pump-3.0.0" @@ -77659,35 +77832,20 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" - (sources."snyk-config-3.1.0" // { - dependencies = [ - sources."debug-4.2.0" - ]; - }) - (sources."snyk-docker-plugin-3.12.0" // { - dependencies = [ - sources."debug-4.2.0" - ]; - }) + sources."snyk-config-3.1.0" + sources."snyk-docker-plugin-3.12.3" sources."snyk-go-parser-1.4.1" (sources."snyk-go-plugin-1.14.2" // { dependencies = [ - sources."debug-4.2.0" sources."tmp-0.1.0" ]; }) - (sources."snyk-gradle-plugin-3.4.0" // { + (sources."snyk-gradle-plugin-3.5.0" // { dependencies = [ - (sources."@snyk/cli-interface-2.3.2" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) sources."ansi-styles-4.2.1" sources."chalk-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."debug-4.2.0" sources."has-flag-4.0.0" sources."rimraf-3.0.2" sources."supports-color-7.1.0" @@ -77695,15 +77853,10 @@ in sources."tslib-2.0.0" ]; }) - (sources."snyk-module-3.1.0" // { - dependencies = [ - sources."debug-4.2.0" - ]; - }) - (sources."snyk-mvn-plugin-2.17.0" // { + sources."snyk-module-3.1.0" + (sources."snyk-mvn-plugin-2.17.1" // { dependencies = [ sources."@snyk/cli-interface-2.5.0" - sources."debug-4.2.0" sources."tmp-0.1.0" sources."tslib-1.11.1" ]; @@ -77711,7 +77864,6 @@ in sources."snyk-nodejs-lockfile-parser-1.22.0" (sources."snyk-nuget-plugin-1.18.1" // { dependencies = [ - sources."debug-4.2.0" sources."jszip-3.3.0" sources."pako-1.0.11" ]; @@ -77726,7 +77878,6 @@ in (sources."snyk-policy-1.14.1" // { dependencies = [ sources."@types/node-6.14.10" - sources."debug-4.2.0" sources."hosted-git-info-2.8.8" (sources."snyk-module-2.1.0" // { dependencies = [ @@ -77736,10 +77887,15 @@ in ]; }) sources."snyk-python-plugin-1.17.1" - sources."snyk-resolve-1.0.1" + (sources."snyk-resolve-1.0.1" // { + dependencies = [ + sources."debug-3.2.6" + ]; + }) (sources."snyk-resolve-deps-4.4.0" // { dependencies = [ sources."@types/node-6.14.10" + sources."debug-3.2.6" sources."hosted-git-info-2.8.8" sources."lru-cache-4.1.5" sources."semver-5.7.1" @@ -77749,13 +77905,13 @@ in }) (sources."snyk-sbt-plugin-2.11.0" // { dependencies = [ - sources."debug-4.2.0" sources."tmp-0.1.0" ]; }) sources."snyk-tree-1.0.0" (sources."snyk-try-require-1.3.1" // { dependencies = [ + sources."debug-3.2.6" sources."lru-cache-4.1.5" sources."yallist-2.1.2" ]; @@ -78279,7 +78435,7 @@ in }) sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.7" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" (sources."es-get-iterator-1.1.0" // { dependencies = [ sources."isarray-2.0.5" @@ -78307,14 +78463,18 @@ in sources."level-codec-6.2.0" ]; }) - sources."flumedb-2.1.4" + (sources."flumedb-2.1.8" // { + dependencies = [ + sources."pull-abortable-4.1.1" + ]; + }) sources."flumelog-offset-3.4.4" (sources."flumeview-hashtable-1.1.1" // { dependencies = [ sources."atomic-file-1.1.5" ]; }) - (sources."flumeview-level-4.0.3" // { + (sources."flumeview-level-4.0.4" // { dependencies = [ sources."abstract-leveldown-6.2.3" sources."level-6.0.1" @@ -78330,9 +78490,8 @@ in sources."map-filter-reduce-3.2.2" ]; }) - (sources."flumeview-query-7.2.2" // { + (sources."flumeview-query-8.0.0" // { dependencies = [ - sources."flumeview-level-3.0.14" sources."map-filter-reduce-3.2.2" ]; }) @@ -78540,7 +78699,7 @@ in }) sources."napi-macros-2.0.0" sources."ncp-2.0.0" - sources."nearley-2.19.3" + sources."nearley-2.19.4" sources."nice-try-1.0.5" sources."node-gyp-build-4.2.2" sources."non-private-ip-1.4.4" @@ -78561,7 +78720,7 @@ in }) ]; }) - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-is-1.1.2" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { @@ -78579,6 +78738,7 @@ in sources."observ-0.2.0" sources."observ-debounce-1.1.1" sources."obv-0.0.1" + sources."obz-1.0.2" sources."on-change-network-0.0.2" sources."on-wakeup-1.0.1" sources."once-1.4.0" @@ -78845,8 +79005,8 @@ in }) sources."ssb-plugins-1.0.4" sources."ssb-private1-1.0.1" - sources."ssb-query-2.4.4" - sources."ssb-ref-2.13.9" + sources."ssb-query-2.4.5" + sources."ssb-ref-2.14.0" sources."ssb-replicate-1.3.2" sources."ssb-unix-socket-1.0.0" sources."ssb-validate-4.1.0" @@ -78878,8 +79038,6 @@ in sources."string-width-1.0.2" sources."string.prototype.trim-1.2.1" sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.1.1" sources."stringify-entities-1.3.2" @@ -78890,6 +79048,7 @@ in dependencies = [ sources."glob-7.1.6" sources."is-regex-1.0.5" + sources."object-inspect-1.7.0" ]; }) sources."text-table-0.2.0" @@ -79052,7 +79211,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.696.0" // { + (sources."aws-sdk-2.700.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -79237,11 +79396,7 @@ in sources."fd-slicer-1.1.0" sources."finalhandler-1.1.2" sources."find-up-3.0.0" - (sources."follow-redirects-1.11.0" // { - dependencies = [ - sources."debug-3.2.6" - ]; - }) + sources."follow-redirects-1.12.1" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."formidable-1.2.2" @@ -79325,7 +79480,7 @@ in sources."isstream-0.1.2" sources."jmespath-0.15.0" sources."jpeg-turbo-0.4.0" - sources."js-base64-2.5.2" + sources."js-base64-2.6.0" sources."js-stringify-1.0.2" sources."js-yaml-3.2.7" sources."jsbn-0.1.1" @@ -79417,7 +79572,7 @@ in sources."minimist-1.2.5" sources."minitouch-prebuilt-1.2.0" sources."mkdirp-0.5.5" - sources."moment-2.26.0" + sources."moment-2.27.0" sources."ms-2.1.2" sources."multer-1.4.2" sources."mustache-2.3.2" @@ -79858,7 +80013,7 @@ in sources."domelementtype-1.3.1" sources."domutils-1.7.0" sources."entities-2.0.3" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -79875,7 +80030,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."nth-check-1.0.2" - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.1.0" @@ -79886,8 +80041,6 @@ in sources."sprintf-js-1.0.3" sources."stable-0.1.8" sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" sources."supports-color-5.5.0" sources."unquote-1.1.1" @@ -80600,7 +80753,7 @@ in sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."module-alias-2.2.2" - sources."moment-2.26.0" + sources."moment-2.27.0" sources."ms-2.1.2" sources."node-fetch-2.6.0" sources."oauth-sign-0.9.0" @@ -80761,7 +80914,7 @@ in sources."define-properties-1.1.3" sources."diff-4.0.2" sources."error-ex-1.3.2" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -80821,7 +80974,7 @@ in sources."ms-2.1.2" sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object.assign-4.1.0" @@ -80880,8 +81033,6 @@ in }) sources."string.prototype.padstart-3.1.0" sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.1.1" (sources."strip-ansi-6.0.0" // { @@ -80970,7 +81121,7 @@ in }; dependencies = [ sources."define-properties-1.1.3" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" @@ -80980,13 +81131,11 @@ in sources."is-regex-1.1.0" sources."is-symbol-1.0.3" sources."match-index-1.0.3" - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."regexp.prototype.flags-1.3.0" sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" ]; buildInputs = globalBuildInputs; @@ -81449,7 +81598,7 @@ in sources."buffer-from-1.1.1" sources."concat-stream-2.0.0" sources."define-properties-1.1.3" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" @@ -81460,7 +81609,7 @@ in sources."is-regex-1.1.0" sources."is-symbol-1.0.3" sources."object-assign-4.1.1" - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."object.values-1.1.1" @@ -81468,8 +81617,6 @@ in sources."safe-buffer-5.2.1" sources."sentence-splitter-3.2.0" sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.3.0" sources."structured-source-3.0.2" @@ -81504,7 +81651,7 @@ in sources."define-properties-1.1.3" sources."emoji-regex-6.5.1" sources."end-with-1.0.2" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" @@ -81513,12 +81660,10 @@ in sources."is-date-object-1.0.2" sources."is-regex-1.1.0" sources."is-symbol-1.0.3" - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" ]; buildInputs = globalBuildInputs; @@ -81602,7 +81747,7 @@ in dependencies = [ sources."array-includes-3.1.1" sources."define-properties-1.1.3" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" @@ -81613,12 +81758,10 @@ in sources."is-regex-1.1.0" sources."is-string-1.0.5" sources."is-symbol-1.0.3" - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" ]; buildInputs = globalBuildInputs; @@ -81710,7 +81853,7 @@ in sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.4" - sources."asn1.js-5.3.0" + sources."asn1.js-5.4.1" sources."assert-plus-1.0.0" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" @@ -81819,7 +81962,7 @@ in sources."extsprintf-1.4.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."fast-text-encoding-1.0.2" + sources."fast-text-encoding-1.0.3" sources."file-type-14.1.3" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.1.0" @@ -82054,7 +82197,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - (sources."strtok3-6.0.2" // { + (sources."strtok3-6.0.3" // { dependencies = [ sources."debug-4.2.0" sources."ms-2.1.2" @@ -82211,7 +82354,7 @@ in sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-0.0.10" - sources."moment-2.26.0" + sources."moment-2.27.0" (sources."node-appc-0.2.49" // { dependencies = [ sources."temp-0.8.4" @@ -82343,7 +82486,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.26.0" + sources."moment-2.27.0" sources."mooremachine-2.3.0" sources."mute-stream-0.0.8" sources."mv-2.1.1" @@ -84532,7 +84675,7 @@ in sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."es5-ext-0.10.53" sources."es6-error-4.1.1" @@ -84932,7 +85075,7 @@ in sources."minimist-1.2.5" sources."mixin-deep-1.3.2" sources."mkdirp-1.0.3" - sources."moment-2.26.0" + sources."moment-2.27.0" sources."ms-2.0.0" sources."multimatch-4.0.0" sources."mute-stream-0.0.7" @@ -84982,7 +85125,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -85219,8 +85362,6 @@ in ]; }) sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.3.0" sources."strip-ansi-3.0.1" @@ -85248,7 +85389,7 @@ in }) sources."term-size-2.2.0" sources."text-table-0.2.0" - sources."thenify-3.3.0" + sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."through-2.3.8" sources."tmp-0.1.0" @@ -85398,7 +85539,7 @@ in sources."acorn-6.4.1" sources."ajv-6.12.2" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.4.1" + sources."ajv-keywords-3.5.0" sources."anymatch-3.1.1" sources."aproba-1.2.0" sources."arr-diff-4.0.0" @@ -85518,14 +85659,14 @@ in }) sources."domain-browser-1.2.0" sources."duplexify-3.7.1" - (sources."elliptic-6.5.2" // { + (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" ]; }) sources."emojis-list-3.0.0" sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-4.1.1" // { + (sources."enhanced-resolve-4.2.0" // { dependencies = [ sources."memory-fs-0.5.0" ]; @@ -85806,7 +85947,7 @@ in sources."stream-shift-1.0.1" sources."string_decoder-1.1.1" sources."tapable-1.1.3" - (sources."terser-4.7.0" // { + (sources."terser-4.8.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -85896,10 +86037,10 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.3.11"; + version = "3.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz"; - sha512 = "dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz"; + sha512 = "NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag=="; }; dependencies = [ sources."ansi-regex-4.1.0" @@ -85959,12 +86100,10 @@ in sources."define-property-2.0.2" sources."detect-file-1.0.0" sources."emoji-regex-7.0.3" - sources."emojis-list-2.1.0" - sources."end-of-stream-1.4.4" - sources."enhanced-resolve-4.1.0" + sources."emojis-list-3.0.0" + sources."enhanced-resolve-4.2.0" sources."errno-0.1.7" sources."escape-string-regexp-1.0.5" - sources."execa-1.0.0" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -86005,7 +86144,6 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."get-caller-file-2.0.5" - sources."get-stream-4.1.0" sources."get-value-2.0.6" (sources."global-modules-2.0.0" // { dependencies = [ @@ -86025,8 +86163,7 @@ in sources."import-local-2.0.0" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."interpret-1.2.0" - sources."invert-kv-2.0.0" + sources."interpret-1.4.0" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" sources."is-data-descriptor-1.0.0" @@ -86041,23 +86178,18 @@ in ]; }) sources."is-plain-object-2.0.4" - sources."is-stream-1.1.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."json5-1.0.1" sources."kind-of-6.0.3" - sources."lcid-2.0.0" - sources."loader-utils-1.2.3" + sources."loader-utils-1.4.0" sources."locate-path-3.0.0" - sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."mem-4.3.0" - sources."memory-fs-0.4.1" + sources."memory-fs-0.5.0" sources."micromatch-3.1.10" - sources."mimic-fn-2.1.0" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -86067,7 +86199,6 @@ in sources."ms-2.0.0" sources."nanomatch-1.2.13" sources."nice-try-1.0.5" - sources."npm-run-path-2.0.2" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -86083,11 +86214,6 @@ in }) sources."object-visit-1.0.1" sources."object.pick-1.3.0" - sources."once-1.4.0" - sources."os-locale-3.1.0" - sources."p-defer-1.0.0" - sources."p-finally-1.0.0" - sources."p-is-promise-2.1.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" @@ -86099,7 +86225,6 @@ in sources."posix-character-classes-0.1.1" sources."process-nextick-args-2.0.1" sources."prr-1.0.1" - sources."pump-3.0.0" sources."readable-stream-2.3.7" sources."regex-not-1.0.2" sources."repeat-element-1.1.3" @@ -86126,7 +86251,6 @@ in }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -86179,7 +86303,6 @@ in sources."string-width-3.1.0" sources."string_decoder-1.1.1" sources."strip-ansi-5.2.0" - sources."strip-eof-1.0.0" sources."supports-color-6.1.0" sources."tapable-1.1.3" (sources."to-object-path-0.3.0" // { @@ -86203,13 +86326,12 @@ in sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."v8-compile-cache-2.0.3" + sources."v8-compile-cache-2.1.1" sources."which-1.3.1" sources."which-module-2.0.0" sources."wrap-ansi-5.1.0" - sources."wrappy-1.0.2" sources."y18n-4.0.0" - sources."yargs-13.2.4" + sources."yargs-13.3.2" sources."yargs-parser-13.1.2" ]; buildInputs = globalBuildInputs; @@ -86237,7 +86359,7 @@ in sources."accepts-1.3.7" sources."ajv-6.12.2" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.4.1" + sources."ajv-keywords-3.5.0" sources."ansi-colors-3.2.4" sources."ansi-html-0.0.7" sources."ansi-regex-2.1.1" @@ -86361,7 +86483,7 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."errno-0.1.7" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -86419,12 +86541,7 @@ in ]; }) sources."find-up-3.0.0" - (sources."follow-redirects-1.11.0" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.2" - ]; - }) + sources."follow-redirects-1.12.1" sources."for-in-1.0.2" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" @@ -86551,7 +86668,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -86732,8 +86849,6 @@ in ]; }) sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" (sources."string_decoder-1.1.1" // { dependencies = [ @@ -86832,7 +86947,7 @@ in sources."@types/json-schema-7.0.5" sources."aggregate-error-3.0.1" sources."ajv-6.12.2" - sources."ajv-keywords-3.4.1" + sources."ajv-keywords-3.5.0" sources."array-union-2.1.0" sources."balanced-match-1.0.0" sources."big.js-5.2.2" @@ -86846,7 +86961,7 @@ in sources."dir-glob-3.0.1" sources."emojis-list-3.0.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.2" + sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.8.0" sources."fill-range-7.0.1" @@ -87093,7 +87208,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-classic-0.5.3" - sources."moment-2.26.0" + sources."moment-2.27.0" sources."mp4-box-encoding-1.4.1" sources."mp4-stream-3.1.0" sources."ms-2.0.0" @@ -87803,7 +87918,7 @@ in ]; }) sources."mkdirp-0.5.5" - sources."moment-2.26.0" + sources."moment-2.27.0" sources."ms-2.0.0" (sources."multimatch-4.0.0" // { dependencies = [ @@ -88209,7 +88324,7 @@ in sources."figures-3.2.0" sources."get-stream-5.1.0" sources."has-flag-4.0.0" - (sources."inquirer-7.1.0" // { + (sources."inquirer-7.2.0" // { dependencies = [ sources."chalk-3.0.0" sources."strip-ansi-6.0.0" From be2947a87a4afcc48ec8d85b1a2909ffd2d7412e Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Fri, 19 Jun 2020 12:07:49 -0400 Subject: [PATCH 2146/3452] maintainers: add mdlayher GPG key Signed-off-by: Matt Layher --- maintainers/maintainer-list.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 47ef2cc1f6ce..04993dc1f374 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5008,6 +5008,10 @@ github = "mdlayher"; githubId = 1926905; name = "Matt Layher"; + keys = [{ + longkeyid = "rsa2048/0x77BFE531397EDE94"; + fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; + }]; }; meditans = { email = "meditans@gmail.com"; From ff51213cbc245369a0164347d6ae40b7e41a5963 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 17 Jun 2020 12:33:56 +0200 Subject: [PATCH 2147/3452] reuse: 0.11.0 -> 0.11.1 https://github.com/fsfe/reuse-tool/releases/tag/v0.11.1 --- pkgs/tools/package-management/reuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index b51f0d061a9f..01a1bf4a9336 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { pname = "reuse"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; rev = "v${version}"; - sha256 = "08dzvrv28ylbq1bm16lakwzyqq530fcbrl71k33zyb84mvgszy97"; + sha256 = "0wkk107s0bpvbknapns0qdzf8csrzc2j6gliy6pa8z208fcfzyy3"; }; propagatedBuildInputs = [ From 0dbc4721b53d74ff985765c47638907729c116a4 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 19 Jun 2020 19:53:34 +0300 Subject: [PATCH 2148/3452] 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 499d18849f334ba5ded1ccffc9345c7d3d0a3c40 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 19 Jun 2020 19:19:08 +0200 Subject: [PATCH 2149/3452] neomutt: 20200501 -> 20200619 https://github.com/neomutt/neomutt/releases/tag/20200619 --- .../networking/mailreaders/neomutt/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 340d4cb3939f..a03f559af8a4 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "20200501"; + version = "20200619"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "1xrs2bagrcg489zp7g39l3rrpgz8n1ji9cbr21wrnasfbhqcsmnx"; + sha256 = "0dhdpd0wdk5bam0q7cvjy4f451ai0mapmyrar7r7m5dnn6lcwvfv"; }; buildInputs = [ @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { --replace /etc/mime.types ${mailcap}/etc/mime.types ''; + preBuild = '' + export HOME=$(mktemp -d) + ''; + configureFlags = [ "--enable-autocrypt" "--gpgme" @@ -77,9 +81,10 @@ stdenv.mkDerivation rec { cp -r ${fetchFromGitHub { owner = "neomutt"; repo = "neomutt-test-files"; - rev = "1ee274e9ae1330fb901eb7b8275b3079d7869222"; - sha256 = "0dhilz4rr7616jh8jcvh50a3rr09in43nsv72mm6f3vfklcqincp"; + rev = "8629adab700a75c54e8e28bf05ad092503a98f75"; + sha256 = "1ci04nqkab9mh60zzm66sd6mhsr6lya8wp92njpbvafc86vvwdlr"; }} $(pwd)/test-files + chmod -R +w test-files (cd test-files && ./setup.sh) export NEOMUTT_TEST_DIR=$(pwd)/test-files From 221fdca03ed0df1d8a37adcb007a9a1b8b44dfc8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 19 Jun 2020 19:42:09 +0200 Subject: [PATCH 2150/3452] diffoscope: 147 -> 148 https://diffoscope.org/news/diffoscope-148-released/ --- pkgs/tools/misc/diffoscope/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 5e5550e0b41d..cf5275fcfe49 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, runCommand, makeWrapper, python3Packages, docutils, help2man +{ lib, stdenv, fetchurl, runCommand, makeWrapper, python3Packages, docutils, help2man , abootimg, acl, apktool, binutils-unwrapped, build-tools, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, openssh, openssl, pdftk, pgpdump, poppler_utils, qemu, R @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "147"; + version = "148"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "1pichn3l10401cqk08zrys2ya9b6cjznk7ra28awnmvlg6l1cypj"; + sha256 = "1fx3wq5bv12pjcpkd7lvis0vg50apzwvxa5jvcs2dv1r8385wchz"; }; outputs = [ "out" "man" ]; @@ -28,12 +28,6 @@ python3Packages.buildPythonApplication rec { patches = [ ./ignore_links.patch ./skip-failing-test.patch - - # Fix for CBFS comparator - (fetchpatch { - url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/39ec527371c469d61e4afc04b3ee6ae3563f7b4c.patch"; - sha256 = "1mzdcbxg3ad5ynpf79phvif5hzckmhf7vzd82l1sffhlqxh0v4h3"; - }) ]; postPatch = '' From d07ba3e96281ef7713eb1f91b0ba8bc7b3886b8d Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Fri, 19 Jun 2020 20:07:55 +0200 Subject: [PATCH 2151/3452] 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 2152/3452] 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 75d7d42b5cfb9a2575a8a8f2e70d6b0c86c67653 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Fri, 19 Jun 2020 11:25:36 -0700 Subject: [PATCH 2153/3452] blackbox-exporter: 0.16.0 -> 0.17.0 --- pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index b44ebd35e9a7..d7f7f5e4be01 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "blackbox_exporter"; - version = "0.16.0"; + version = "0.17.0"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "1zbf3ljasv0r91rrmk3mj5nhimaf7xg3aih1ldz27rh5yww7gyzg"; + sha256 = "00ganz6wfwyb9avkp2fr4bwpzvfiffsmpgndl8zp80bk7m1b3mnz"; }; # dns-lookup is performed for the tests From 6570e4a03f1d32d306479aaefd26521a8df4871f Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Fri, 19 Jun 2020 11:26:13 -0700 Subject: [PATCH 2154/3452] blackbox-exporters: add Frostman to maintainers --- pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index d7f7f5e4be01..9b38bca390cb 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -21,7 +21,7 @@ buildGoPackage rec { description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP"; homepage = "https://github.com/prometheus/blackbox_exporter"; license = licenses.asl20; - maintainers = with maintainers; [ globin fpletz willibutz ]; + maintainers = with maintainers; [ globin fpletz willibutz Frostman ]; platforms = platforms.unix; }; } From 5383d2d32c249a611f4648d5ac008d1f01097101 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Thu, 18 Jun 2020 18:49:27 -0400 Subject: [PATCH 2155/3452] eclipses: 2020-03 -> 2020-06 PR #91113 --- pkgs/applications/editors/eclipse/default.nix | 20 +++++++++---------- pkgs/applications/editors/eclipse/plugins.nix | 11 +++++----- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 66bdfb15c69b..49fb00706b76 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -8,15 +8,15 @@ assert stdenv ? glibc; -# http://download.eclipse.org/eclipse/downloads/ is the main place to +# https://download.eclipse.org/eclipse/downloads/ is the main place to # find the downloads needed for new versions let platform_major = "4"; - platform_minor = "15"; + platform_minor = "16"; year = "2020"; - month = "03"; - timestamp = "${year}${month}050155"; + month = "06"; + timestamp = "${year}${month}040540"; gtk = gtk3; in rec { @@ -33,8 +33,8 @@ in rec { description = "Eclipse IDE for C/C++ Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-incubation-linux-gtk-x86_64.tar.gz"; - sha512 = "2wy4a3p347fajr9zsfz1zlvz6jpy3vficdry27m5fs0azfmxmy2cfns5hh18sin4xqq3jvqppfqxh41rzcpcmiq12zhc6cz42brqgxw"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; + sha512 = "0vfxzsvfv9zmd0ckrdpziijzskh13g8kgk8ibkwmhmqmj14a3visk6yvn5q2s0knkswl1zy9arinw0mxvqh72dfj63vwc01vhp06lyr"; }; }; @@ -46,7 +46,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "0qccsclay9000sqrymm8hkg70a4jcvd70vymw1kkxsklcs7dnrhch55an98gbzf9r0jgd1ap62a4hyxlnm6hdqqniwcgdza0i4nwwgj"; + sha512 = "29nr1x3fgdw5ygrppfma6yi1iaqvad24jyb58sag735z1nz4ymajcwakg52mlv3s19d4w8cxpskh1r459mwz7j769qplymspqifvlkd"; }; }; @@ -58,7 +58,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "01rv5x7qqm0a2p30828z2snms3nb2kjx9si63sr5rdkdgr3vbh6xq8n8fn757dqazmpz9zskmwxxmbxnwycfllhgb8msb77pcy3fpg7"; + sha512 = "2pm4xam0jn9x34k1hr5rn67fpvc6snlkpcfn4bzdcf2xjv9f3dr2039mkcrhri5nv2bj6fkbai6aga6fmmrb3na33b7ir7sqlqqn61b"; }; }; @@ -83,7 +83,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "33ra8qslwz73240xzjvr751lpl94drlcf425a7kxngq1qla2cda7gxr71bxlr9fm2hrqq0h097ihmg0ix9hv2dmwnc76gp4hwwrlk41"; + sha512 = "195c07yabmi2a42qxfmpbv6ychpj15bbpgyp40s1pcdb3p875vcqjinq9dqy2sixzwjhfdrggpvwihav87rkih9arzmk2s4cm31mjqd"; }; }; @@ -95,7 +95,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "0ffa1q19z31j8i552mp9zg4v0p4iv002cvlzh49ia8hi0hgk75pbkp6vxlr75jz0as03n71f0ww8xbflji31qgwfmy6rs1rzqihfff9"; + sha512 = "3n8jllgxarrxgz16n7zb4bgaqxk0m9frcxrgdxvy25ar2iw8js4q4ir3cc20y4ri3ii74rf3jy6n4ndhm57miwqh4p2wqzhfjlinirb"; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index fab7317868a9..4edb7a7ebc4f 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -254,12 +254,13 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; - version = "9.11.0"; + # find current version at https://www.eclipse.org/cdt/downloads.php + version = "9.11.1"; src = fetchzip { stripRoot = false; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.11/${name}/${name}.zip"; - sha256 = "1730w6rbv649nzfalfd10p2ph0z9rbrrcflga0n1dpmg181xh9lk"; + sha256 = "00cpaal6jm9xb4nbkljrf381r3lf1rb1p06vrbn4l0lxnbckb9df"; }; meta = with stdenv.lib; { @@ -474,12 +475,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.15"; + version = "4.16"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202003050155/org.eclipse.jdt-${version}.zip"; - sha256 = "1dm4qgfb6rm7w0dk8br071c7wy0ybp7zrwvr3i02c2bxzy2psz7q"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202006040540/org.eclipse.jdt-${version}.zip"; + sha256 = "0g349hg2nv1y628daxf84396wpf33z52wxv0gawlgrirbbizaznd"; }; meta = with stdenv.lib; { From ad13beeebc09d7e9987e5a6b7c7d4619170a9f75 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 19 Jun 2020 15:15:33 -0400 Subject: [PATCH 2156/3452] 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 2157/3452] 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 2158/3452] 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 2159/3452] 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 2160/3452] 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 619f370777e88b8ea038e9f7389f2fd2b9e31661 Mon Sep 17 00:00:00 2001 From: David Wood Date: Sun, 14 Jun 2020 16:43:03 +0100 Subject: [PATCH 2161/3452] mdcat: 0.18.2 -> 0.19.0 --- pkgs/tools/text/mdcat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 314a2acf5757..66d1105770b5 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.18.2"; + version = "0.19.0"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - sha256 = "0rbfx7951ascgd16jx0d9vcr46ca1v040dc0kfcdfisr6s9ifygw"; + hash = "sha256-/ZhhDiiUc+swXr3IuuQD4YqIIdgh8PeRWm/ko9Lc0rM="; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "1j70l8g49qm4dbcb15ww1prasqhyf9ygprf65fg9p39jcs6j5gcv"; + cargoSha256 = "sha256-SGX94XY7e38xySvTO+CDTUBDTfYybPy12iWFoFc2Nto="; checkInputs = [ ansi2html ]; checkPhase = '' From 7395b11cd4c2a16fa060e8b419113ca872d36c78 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 19 Jun 2020 21:32:59 +0200 Subject: [PATCH 2162/3452] jhead: 3.03 -> 3.04 --- pkgs/tools/graphics/jhead/default.nix | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index 9f5ffcad8fd6..19a0e26d9ccf 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -2,34 +2,27 @@ stdenv.mkDerivation rec { pname = "jhead"; - version = "3.03"; + version = "3.04"; src = fetchurl { url = "http://www.sentex.net/~mwandel/jhead/${pname}-${version}.tar.gz"; - sha256 = "1hn0yqcicq3qa20h1g313l1a671r8mccpb9gz0w1056r500lw6c2"; + sha256 = "1j831bqw1qpkbchdriwcy3sgzvbagaj45wlc124fs9bc9z7vp2gg"; }; patches = [ (fetchpatch { - name = "CVE-2019-1010301.patch"; - url = "https://sources.debian.org/data/main/j/jhead/1:3.03-3/debian/patches/36_CVE-2019-1010301"; - sha256 = "1vvrg50z5y7sjhfi973wh1q1v79sqp7hk5d4z0dlnx3fqgkjrx7q"; - }) - (fetchpatch { - name = "CVE-2019-1010302.patch"; - url = "https://sources.debian.org/data/main/j/jhead/1:3.03-3/debian/patches/37_CVE-2019-1010302"; - sha256 = "1h11mpsi7hpwbi8kpnkjwn6zpqf88f132h0rsg8sggcs3vva2x8y"; + url = "https://sources.debian.org/data/main/j/jhead/1:3.04-2/debian/patches/01_gpsinfo.c"; + sha256 = "0r8hdbfrdxip4dwz5wqsv47a29j33cx7w5zx4jdhp5l1ihg003lz"; }) ]; buildInputs = [ libjpeg ]; - patchPhase = '' - substituteInPlace makefile \ - --replace /usr/local/bin $out/bin + makeFlags = [ "CPPFLAGS=" "CFLAGS=-O3" "LDFLAGS=" ]; + patchPhase = '' + sed -i '/dpkg-buildflags/d' makefile substituteInPlace jhead.c \ - --replace "\" Compiled: \"__DATE__" "" \ --replace "jpegtran -trim" "${libjpeg.bin}/bin/jpegtran -trim" ''; From 66f9a85177ea4fc9699a2ac778ca988f3046851b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Jun 2020 10:54:06 +0200 Subject: [PATCH 2163/3452] LTS Haskell 16.1 --- .../configuration-hackage2nix.yaml | 600 +++++++++++------- 1 file changed, 381 insertions(+), 219 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 4f4b85b3315c..8f316bb654d6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -74,7 +74,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 15.15 + # LTS Haskell 16.1 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -90,6 +90,7 @@ default-package-overrides: - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.2.0.0 + - aeson-combinators ==0.0.2.1 - aeson-compat ==0.3.9 - aeson-default ==0.9.1.0 - aeson-diff ==1.1.0.9 @@ -99,11 +100,12 @@ default-package-overrides: - aeson-picker ==0.1.0.5 - aeson-pretty ==0.8.8 - aeson-qq ==0.8.3 - - aeson-schemas ==1.0.3 + - aeson-schemas ==1.2.0 - aeson-utils ==0.3.0.2 - aeson-yak ==0.1.1.3 - aeson-yaml ==1.0.6.0 - al ==0.1.4.2 + - alarmclock ==0.7.0.4 - alerts ==0.1.2.0 - alex ==3.2.5 - alg ==0.2.13.1 @@ -206,18 +208,19 @@ default-package-overrides: - amazonka-waf ==1.6.1 - amazonka-workspaces ==1.6.1 - amazonka-xray ==1.6.1 - - amqp ==0.19.1 + - amqp ==0.20.0 + - amqp-utils ==0.4.4.0 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.10.3 - ansi-wl-pprint ==0.6.9 - - antiope-core ==7.4.5 - - antiope-dynamodb ==7.4.5 - - antiope-messages ==7.4.5 - - antiope-s3 ==7.4.5 - - antiope-sns ==7.4.5 - - antiope-sqs ==7.4.5 + - antiope-core ==7.5.1 + - antiope-dynamodb ==7.5.1 + - antiope-messages ==7.5.1 + - antiope-s3 ==7.5.1 + - antiope-sns ==7.5.1 + - antiope-sqs ==7.5.1 - ANum ==0.2.0.2 - - apecs ==0.9.1 + - apecs ==0.9.2 - apecs-gloss ==0.2.4 - apecs-physics ==0.4.4 - api-field-json-th ==0.1.0.2 @@ -227,13 +230,18 @@ default-package-overrides: - approximate ==0.3.2 - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.1 - - arbor-postgres ==0.0.5 - arithmoi ==0.10.0.0 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 + - ascii ==1.0.0.2 + - ascii-case ==1.0.0.2 + - ascii-char ==1.0.0.2 - asciidiagram ==1.3.3.3 + - ascii-group ==1.0.0.2 + - ascii-predicates ==1.0.0.2 - ascii-progress ==0.3.3.0 - - asif ==6.0.4 + - ascii-superset ==1.0.0.2 + - ascii-th ==1.0.0.2 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 - asn1-types ==0.3.4 @@ -252,40 +260,47 @@ default-package-overrides: - attoparsec-base64 ==0.0.0 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 - - attoparsec-ip ==0.0.5 - attoparsec-iso8601 ==1.0.1.0 - attoparsec-path ==0.0.0.1 - - attoparsec-uri ==0.0.7 - audacity ==0.0.2 - - aur ==6.2.0.1 + - aur ==7.0.3 + - aura ==3.1.4 - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - - autoexporter ==1.1.16 + - autoexporter ==1.1.17 - auto-update ==0.1.6 - avers ==0.0.17.1 - - avro ==0.4.7.0 + - avro ==0.5.2.0 - aws-cloudfront-signed-cookies ==0.2.0.6 + - bank-holidays-england ==0.2.0.4 + - base16 ==0.2.1.0 - base16-bytestring ==0.1.1.6 + - base16-lens ==0.1.2.0 + - base32 ==0.1.1.2 + - base32-lens ==0.1.0.0 - base32string ==0.9.1 - base58string ==0.10.0 - - base64 ==0.4.1 + - base64 ==0.4.2 - base64-bytestring ==1.0.0.3 - base64-bytestring-type ==1.0.1 - - base64-lens ==0.2.0 + - base64-lens ==0.3.0 - base64-string ==0.2 - base-compat ==0.11.1 - base-compat-batteries ==0.11.1 - basement ==0.0.11 + - base-noprelude ==4.13.0.0 - base-orphans ==0.8.2 - base-prelude ==1.3 - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 - - bazel-runfiles ==0.7.0.1 + - bazel-runfiles ==0.12 - bbdb ==0.8 - bcrypt ==0.0.11 - bech32 ==1.0.2 + - bech32-th ==1.0.2 - bench ==1.0.12 + - benchpress ==0.2.2.14 - between ==0.11.0.0 - bibtex ==0.1.0.6 - bifunctors ==5.5.7 @@ -298,11 +313,11 @@ default-package-overrides: - binary-ieee754 ==0.1.0.0 - binary-list ==1.1.1.2 - binary-orphans ==1.0.1 - - binary-parser ==0.5.5 + - binary-parser ==0.5.6 - binary-parsers ==0.2.4.0 - binary-search ==1.0.0.3 - binary-shared ==0.8.3 - - binary-tagged ==0.2 + - binary-tagged ==0.3 - bindings-DSL ==1.0.25 - bindings-GLFW ==3.3.2.0 - bindings-libzip ==1.0.1 @@ -342,43 +357,44 @@ default-package-overrides: - boxes ==0.1.5 - brick ==0.52.1 - brittany ==0.12.1.1 + - broadcast-chan ==0.2.1.1 - bsb-http-chunked ==0.0.0.4 - bson ==0.4.0.1 - btrfs ==0.2.0.0 - buffer-builder ==0.2.4.7 - buffer-pipe ==0.0 - bugsnag-hs ==0.1.0.3 - - butcher ==1.3.3.1 + - butcher ==1.3.3.2 - bv ==0.5 - bv-little ==1.1.1 - byteable ==0.1.1 - - bytebuild ==0.3.4.0 + - byte-count-reader ==0.10.0.1 - bytedump ==1.0 - byte-order ==0.1.2.0 - byteorder ==1.0.4 - bytes ==0.17 - byteset ==0.1.1.0 - - byteslice ==0.2.2.0 - - bytesmith ==0.3.6.0 - bytestring-builder ==0.10.8.2.0 - bytestring-conversion ==0.3.1 - bytestring-lexing ==0.5.0.2 + - bytestring-mmap ==0.2.2 - bytestring-strict-builder ==0.4.5.3 - bytestring-to-vector ==0.3.0.1 - bytestring-tree-builder ==0.2.7.3 - bz2 ==1.0.0.1 - bzlib-conduit ==0.3.0.2 - c2hs ==0.28.6 + - cabal-appimage ==0.3.0.0 + - cabal-debian ==5.0.2 - cabal-doctest ==1.0.8 - - cabal-flatpak ==0.1 - - cabal-plan ==0.6.2.0 - - cabal-rpm ==2.0.4 + - cabal-rpm ==2.0.5.1 - cache ==0.1.3.0 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 - call-stack ==0.2.0 - can-i-haz ==0.3.1.0 - ca-province-codes ==1.0.0.0 + - cardano-coin-selection ==1.0.1 - carray ==0.1.6.8 - casa-client ==0.0.1 - casa-types ==0.0.1 @@ -401,15 +417,20 @@ default-package-overrides: - cfenv ==0.1.0.0 - chan ==0.0.4.1 - ChannelT ==0.0.0.7 + - character-cases ==0.1.0.4 - charset ==0.3.7.1 - charsetdetect-ae ==1.1.0.4 - Chart ==1.9.3 - Chart-diagrams ==1.9.3 - chaselev-deque ==0.5.0.5 - ChasingBottoms ==1.3.1.8 + - cheapskate ==0.1.1.2 + - cheapskate-highlight ==0.1.0.0 + - cheapskate-lucid ==0.1.0.0 - checkers ==0.5.5 - checksum ==0.0 - chimera ==0.3.1.0 + - chiphunk ==0.1.2.1 - choice ==0.2.2 - chronologique ==0.3.1.1 - chronos ==1.1.1 @@ -420,6 +441,9 @@ default-package-overrides: - cipher-des ==0.0.6 - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 + - clash-ghc ==1.2.2 + - clash-lib ==1.2.2 + - clash-prelude ==1.2.2 - classy-prelude ==1.5.0 - classy-prelude-conduit ==1.5.0 - classy-prelude-yesod ==1.5.0 @@ -429,8 +453,6 @@ default-package-overrides: - Clipboard ==2.3.2.0 - clock ==0.8 - clock-extras ==0.1.0.2 - - clr-host ==0.2.1.0 - - clr-marshal ==0.2.0.0 - clumpiness ==0.17.0.2 - ClustalParser ==1.3.0 - cmark ==0.6 @@ -442,13 +464,14 @@ default-package-overrides: - code-page ==0.2 - coercible-utils ==0.1.0 - co-log ==0.4.0.1 + - co-log-concurrent ==0.5.0.0 - co-log-core ==0.2.1.1 - co-log-polysemy ==0.0.1.2 - Color ==0.1.4 - colorful-monoids ==0.2.1.2 - colorize-haskell ==1.0.1 - colour ==2.3.5 - - colourista ==0.0.0.0 + - colourista ==0.1.0.0 - combinatorial ==0.1.0.1 - comfort-array ==0.4 - comfort-graph ==0.0.3.1 @@ -462,10 +485,11 @@ default-package-overrides: - composition ==1.0.2.1 - composition-extra ==2.0.0 - concise ==0.1.0.1 - - concurrency ==1.8.1.0 + - concurrency ==1.11.0.0 - concurrent-extra ==0.7.0.12 - - concurrent-output ==1.10.11 + - concurrent-output ==1.10.12 - concurrent-split ==0.0.1.1 + - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - conduit ==1.3.2 - conduit-algorithms ==0.0.11.0 @@ -474,20 +498,21 @@ default-package-overrides: - conduit-extra ==1.3.5 - conduit-parse ==0.2.1.0 - conduit-zstd ==0.0.2.0 - - conferer ==0.2.0.0 - - conferer-hspec ==0.2.0.0 - - conferer-provider-json ==0.2.0.0 - - conferer-warp ==0.2.0.0 + - conferer ==0.4.1.0 + - conferer-hspec ==0.4.0.0 + - conferer-source-json ==0.4.0.0 + - conferer-warp ==0.4.0.0 + - ConfigFile ==1.1.4 - config-ini ==0.2.4.0 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 + - configurator-pg ==0.2.3 - connection ==0.3.1 - connection-pool ==0.2.2 - console-style ==0.0.2.1 - constraint ==0.1.4.0 - - constraints ==0.11.2 + - constraints ==0.12 - constraint-tuples ==0.1.2 - - contiguous ==0.5 - contravariant ==1.5.2 - contravariant-extras ==0.3.5.1 - control-bool ==0.2.1 @@ -509,9 +534,10 @@ default-package-overrides: - credential-store ==0.1.2 - criterion ==1.5.6.2 - criterion-measurement ==0.1.2.0 - - cron ==0.6.2 + - cron ==0.7.0 - crypto-api ==0.13.3 - crypto-cipher-types ==0.0.9 + - cryptocompare ==0.1.1 - crypto-enigma ==0.1.1.6 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 @@ -529,6 +555,7 @@ default-package-overrides: - crypto-random-api ==0.2.0 - crypt-sha512 ==0 - csp ==1.4.0 + - css-syntax ==0.1.0.0 - css-text ==0.1.3.0 - csv ==0.1.2 - csv-conduit ==0.7.1.0 @@ -545,15 +572,18 @@ default-package-overrides: - cursor-fuzzy-time ==0.0.0.0 - cursor-gen ==0.3.0.0 - cutter ==0.0 - - cyclotomic ==1.0.1 - - czipwith ==1.0.1.2 + - cyclotomic ==1.1.1 + - czipwith ==1.0.1.3 + - d10 ==0.2.1.6 - data-accessor ==0.2.3 - data-accessor-mtl ==0.2.0.4 - data-accessor-transformers ==0.2.1.7 + - data-ascii ==1.0.0.2 - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.1 - data-checked ==0.3 - data-clist ==0.1.2.3 + - data-compat ==0.1.0.2 - data-default ==0.7.1.1 - data-default-class ==0.1.2.0 - data-default-instances-containers ==0.0.1 @@ -564,11 +594,14 @@ default-package-overrides: - data-dword ==0.3.2 - data-endian ==0.1.1 - data-fix ==0.2.1 + - data-forest ==0.1.0.8 - data-has ==0.3.0.0 - data-interval ==2.0.1 - data-inttrie ==0.1.4 - data-lens-light ==0.1.2.2 - data-memocombinators ==0.5.1 + - data-msgpack ==0.0.13 + - data-msgpack-types ==0.0.3 - data-or ==1.0.0.5 - data-ordlist ==0.4.7.0 - data-ref ==0.0.2 @@ -578,25 +611,32 @@ default-package-overrides: - data-tree-print ==0.1.0.2 - dataurl ==0.1.0.0 - DAV ==1.3.4 + - DBFunctor ==0.1.1.1 - dbus ==1.2.15.1 + - dbus-hslogger ==0.1.0.1 + - debian ==4.0.2 - debian-build ==0.10.2.0 - debug-trace-var ==0.2.0 - dec ==0.0.3 - Decimal ==0.5.1 - - declarative ==0.5.2 + - declarative ==0.5.3 - deepseq-generics ==0.2.0.0 + - deepseq-instances ==0.1.0.1 - deferred-folds ==0.9.10.1 - - dejafu ==2.1.0.3 + - dejafu ==2.3.0.0 - dense-linear-algebra ==0.1.0.0 + - depq ==0.4.1.0 - deque ==0.4.3 - deriveJsonNoPrefix ==0.1.0.1 - - deriving-compat ==0.5.8 - - derulo ==1.0.8 + - deriving-aeson ==0.2.6 + - deriving-compat ==0.5.9 + - derulo ==1.0.9 - detour-via-sci ==1.0.0 - - dhall ==1.30.0 - - dhall-bash ==1.0.28 - - dhall-json ==1.6.2 - - dhall-yaml ==1.0.2 + - dhall ==1.32.0 + - dhall-bash ==1.0.30 + - dhall-json ==1.6.4 + - dhall-lsp-server ==1.0.7 + - dhall-yaml ==1.1.0 - diagrams ==1.4 - diagrams-contrib ==1.4.4 - diagrams-core ==1.4.2 @@ -605,6 +645,7 @@ default-package-overrides: - diagrams-rasterific ==1.4.2 - diagrams-solve ==0.1.2 - diagrams-svg ==1.4.3 + - dialogflow-fulfillment ==0.1.1.3 - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 - Diff ==0.4.0 @@ -624,8 +665,8 @@ default-package-overrides: - dlist-nonempty ==0.1.1 - dns ==4.0.1 - dockerfile ==0.2.0 - - doclayout ==0.2.0.1 - - doctemplates ==0.8 + - doclayout ==0.3 + - doctemplates ==0.8.2 - doctest ==0.16.3 - doctest-discover ==0.2.0.0 - doctest-driver-gen ==0.3.0.2 @@ -636,17 +677,19 @@ default-package-overrides: - dotgen ==0.4.2 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 + - download ==0.3.2.7 - drinkery ==0.4 - dsp ==0.2.5 - dual ==0.1.1.1 - dual-tree ==0.2.2.1 - dublincore-xml-conduit ==0.1.0.2 - - dunai ==0.6.0 + - dunai ==0.7.0 - duration ==0.1.0.0 - dvorak ==0.1.0.0 - dynamic-state ==0.3.1 - dyre ==0.8.12 - eap ==0.9.0.2 + - earcut ==0.1.0.2 - Earley ==0.13.0.1 - easy-file ==0.2.2 - Ebnf2ps ==1.0.15 @@ -656,15 +699,21 @@ default-package-overrides: - edit-distance ==0.2.2.1 - edit-distance-vector ==1.0.0.4 - editor-open ==0.6.0.0 - - egison ==3.10.3 + - egison ==4.0.3 + - egison-pattern-src ==0.2.1.0 + - egison-pattern-src-th-mode ==0.2.1.0 - either ==5.0.1.1 - either-both ==0.1.1.1 - either-unwrap ==1.1 + - ekg ==0.4.0.15 + - ekg-core ==0.1.1.7 + - ekg-json ==0.1.0.6 + - ekg-statsd ==0.2.5.0 - elerea ==2.9.0 - elf ==0.30 - eliminators ==0.6 - elm2nix ==0.2 - - elm-bridge ==0.5.2 + - elm-bridge ==0.6.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - emacs-module ==0.1.1 @@ -687,10 +736,15 @@ default-package-overrides: - errors-ext ==0.4.2 - ersatz ==0.4.8 - esqueleto ==3.3.3.0 + - essence-of-live-coding ==0.1.0.3 + - essence-of-live-coding-gloss ==0.1.0.3 + - essence-of-live-coding-pulse ==0.1.0.3 + - essence-of-live-coding-quickcheck ==0.1.0.3 - etc ==0.4.1.0 - eventful-core ==0.2.0 - eventful-test-helpers ==0.2.0 - event-list ==0.1.2 + - eventstore ==1.4.1 - every ==0.0.1 - exact-combinatorics ==0.2.0.9 - exact-pi ==0.5.0.1 @@ -708,17 +762,17 @@ default-package-overrides: - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - - extra ==1.6.21 + - extra ==1.7.3 - extractable-singleton ==0.0.1 - extrapolate ==0.4.2 - fail ==4.9.0.0 - failable ==1.2.4.0 - - fakedata ==0.5.0 + - fakedata ==0.6.1 - farmhash ==0.1.0.5 - fast-digits ==0.3.0.0 - fast-logger ==3.0.1 - fast-math ==1.0.2 - - fb ==2.0.0 + - fb ==2.1.1 - feature-flags ==0.1.0.1 - fedora-dists ==1.1.2 - fedora-haskell-tools ==0.9 @@ -727,10 +781,11 @@ default-package-overrides: - fft ==0.1.8.6 - fgl ==5.7.0.2 - filecache ==0.4.1 - - file-embed ==0.0.12.0 + - file-embed ==0.0.11.2 - file-embed-lzma ==0 - filelock ==0.1.1.4 - filemanip ==0.3.6.3 + - file-modules ==0.1.2.4 - file-path-th ==0.1.0.0 - filepattern ==0.1.2 - fileplow ==0.1.0.0 @@ -739,20 +794,21 @@ default-package-overrides: - FindBin ==0.0.5 - fingertree ==0.1.4.2 - finite-typelits ==0.1.4.2 - - first-class-families ==0.7.0.0 + - first-class-families ==0.8.0.0 - first-class-patterns ==0.3.2.5 - fitspec ==0.4.8 - fixed ==0.3 - fixed-length ==0.2.2 - fixed-vector ==1.2.0.0 - - fixed-vector-hetero ==0.5.0.0 + - fixed-vector-hetero ==0.6.0.0 - flac ==0.2.0 - flac-picture ==0.1.2 - flags-applicative ==0.1.0.2 + - flat ==0.4.4 - flat-mcmc ==1.5.1 - FloatingHex ==0.4 - floatshow ==0.2.4 - - flow ==1.0.20 + - flow ==1.0.21 - flush-queue ==1.0.0 - fmlist ==0.9.3 - fmt ==0.6.1.2 @@ -775,10 +831,10 @@ default-package-overrides: - formatting ==6.3.7 - foundation ==0.0.25 - free ==5.1.3 - - free-categories ==0.1.0.0 + - free-categories ==0.2.0.0 - freenect ==1.2.1 - freer-simple ==1.2.1.1 - - freetype2 ==0.1.2 + - freetype2 ==0.2.0 - free-vl ==0.1.4 - friendly-time ==0.4.1 - from-sum ==0.2.3.0 @@ -789,6 +845,7 @@ default-package-overrides: - function-builder ==0.3.0.1 - functor-classes-compat ==1 - fused-effects ==1.0.2.0 + - fusion-plugin ==0.2.1 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.0 @@ -801,19 +858,21 @@ default-package-overrides: - general-games ==1.1.1 - generic-arbitrary ==0.1.0 - generic-constraints ==1.1.1.1 - - generic-data ==0.7.0.0 + - generic-data ==0.8.3.0 - generic-deriving ==1.13.1 - - generic-lens ==1.2.0.1 - - generic-monoid ==0.1.0.0 + - generic-lens ==2.0.0.0 + - generic-lens-core ==2.0.0.0 + - generic-monoid ==0.1.0.1 + - generic-optics ==2.0.0.0 - GenericPretty ==1.2.2 - generic-random ==1.3.0.1 - generics-sop ==0.5.1.0 - generics-sop-lens ==0.2.0.1 - - genvalidity ==0.10.0.2 + - genvalidity ==0.11.0.0 - genvalidity-aeson ==0.3.0.0 - - genvalidity-bytestring ==0.5.0.1 + - genvalidity-bytestring ==0.6.0.0 - genvalidity-containers ==0.8.0.2 - - genvalidity-criterion ==0.0.0.0 + - genvalidity-criterion ==0.2.0.0 - genvalidity-hspec ==0.7.0.4 - genvalidity-hspec-aeson ==0.3.1.1 - genvalidity-hspec-binary ==0.2.0.4 @@ -821,8 +880,8 @@ default-package-overrides: - genvalidity-hspec-hashable ==0.2.0.5 - genvalidity-hspec-optics ==0.1.1.2 - genvalidity-hspec-persistent ==0.0.0.1 - - genvalidity-mergeful ==0.1.0.0 - - genvalidity-mergeless ==0.1.0.0 + - genvalidity-mergeful ==0.2.0.0 + - genvalidity-mergeless ==0.2.0.0 - genvalidity-path ==0.3.0.4 - genvalidity-property ==0.5.0.1 - genvalidity-scientific ==0.2.1.1 @@ -834,27 +893,33 @@ default-package-overrides: - genvalidity-vector ==0.3.0.1 - geojson ==4.0.2 - getopt-generics ==0.13.0.4 + - ghc-byteorder ==4.11.0.0.10 + - ghc-check ==0.5.0.1 - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 + - ghc-events ==0.13.0 - ghc-exactprint ==0.6.2 - - ghcid ==0.8.6 + - ghcid ==0.8.7 - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - - ghc-lib ==8.8.3.20200412.1 - - ghc-lib-parser ==8.8.3.20200412.1 - - ghc-lib-parser-ex ==8.8.5.8 + - ghc-lib ==8.10.1.20200523 + - ghc-lib-parser ==8.10.1.20200523 + - ghc-lib-parser-ex ==8.10.0.14 + - ghc-parser ==0.2.2.0 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.7 - - ghc-source-gen ==0.3.0.0 - - ghc-syntax-highlighter ==0.0.5.0 + - ghc-source-gen ==0.4.0.0 + - ghc-syntax-highlighter ==0.0.6.0 - ghc-tcplugins-extra ==0.4 - - ghc-typelits-extra ==0.3.3 + - ghc-typelits-extra ==0.4 - ghc-typelits-knownnat ==0.7.2 - ghc-typelits-natnormalise ==0.7.2 - ghc-typelits-presburger ==0.3.0.0 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.21 - gi-cairo ==1.0.23 + - gi-cairo-connector ==0.0.1 + - gi-cairo-render ==0.0.1 - gi-dbusmenu ==0.4.7 - gi-dbusmenugtk3 ==0.4.8 - gi-gdk ==3.0.22 @@ -866,6 +931,7 @@ default-package-overrides: - gi-graphene ==1.0.1 - gi-gtk ==3.0.33 - gi-gtk-hs ==0.3.8.1 + - ginger ==0.10.0.5 - gingersnap ==0.3.1.0 - gi-pango ==1.0.22 - giphy-api ==0.7.0.0 @@ -894,21 +960,29 @@ default-package-overrides: - graphviz ==2999.20.0.4 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - - greskell ==1.0.1.0 - - greskell-core ==0.1.3.3 + - greskell ==1.1.0.2 + - greskell-core ==0.1.3.4 - greskell-websocket ==0.1.2.3 - groom ==0.1.2.1 - group-by-date ==0.1.0.3 - groups ==0.4.1.0 + - gtk-sni-tray ==0.1.6.0 + - gtk-strut ==0.1.3.0 - guarded-allocation ==0.0.1 - hackage-db ==2.1.0 - hackage-security ==0.6.0.1 - haddock-library ==1.8.0 + - hadolint ==1.18.0 + - hadoop-streaming ==0.2.0.3 + - hakyll ==4.13.3.0 - half ==0.3 - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 + - hapistrano ==0.4.1.0 + - happstack-server ==7.6.1 - happy ==1.19.12 - HasBigDecimal ==0.1.1 + - hasbolt ==0.1.4.3 - hashable ==1.3.0.0 - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 @@ -918,35 +992,38 @@ default-package-overrides: - haskell-gi ==0.23.1 - haskell-gi-base ==0.23.0 - haskell-gi-overloading ==1.0 + - haskell-igraph ==0.8.0 - haskell-import-graph ==1.0.4 - haskell-lexer ==1.1 - - haskell-lsp ==0.20.0.1 - - haskell-lsp-types ==0.20.0.0 + - haskell-lsp ==0.22.0.0 + - haskell-lsp-types ==0.22.0.0 - haskell-names ==0.9.9 - haskell-src ==1.0.3.1 - - haskell-src-exts ==1.22.0 + - haskell-src-exts ==1.23.1 - haskell-src-exts-util ==0.2.5 - haskell-src-meta ==0.8.5 - haskey-btree ==0.3.0.1 - - haskoin-core ==0.10.1 - - haskoin-node ==0.9.21 + - haskoin-core ==0.13.4 + - haskoin-node ==0.13.0 - hasql ==1.4.3 - hasql-optparse-applicative ==0.3.0.5 - hasql-pool ==0.5.2 - hasql-transaction ==1.0.0.1 - hasty-hamiltonian ==1.3.3 + - HaTeX ==3.22.2.0 - HaXml ==1.25.5 - haxr ==3000.11.4 + - HCodecs ==0.5.2 - hdaemonize ==0.5.6 - HDBC ==2.4.0.3 - HDBC-session ==0.1.2.0 - - headroom ==0.1.3.0 + - headroom ==0.2.2.1 - heap ==1.0.4 - heaps ==0.3.6.1 - - heart-core ==0.1.1 - hebrew-time ==0.1.2 - hedgehog ==1.0.2 - hedgehog-corpus ==0.2.0 + - hedgehog-fakedata ==0.0.1.1 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - hedis ==0.12.13 @@ -960,7 +1037,7 @@ default-package-overrides: - hformat ==0.3.3.1 - hfsevents ==0.1.6 - hidapi ==0.1.5 - - hie-bios ==0.4.0 + - hie-bios ==0.5.0 - hi-file-parser ==0.1.0.0 - higher-leveldb ==0.5.0.2 - highlighting-kate ==0.6.4 @@ -968,7 +1045,8 @@ default-package-overrides: - hinotify ==0.4 - hint ==0.9.0.3 - hjsmin ==0.2.0.4 - - hkgr ==0.2.5.2 + - hkd-default ==1.1.0.0 + - hkgr ==0.2.6 - hlibcpuid ==0.2.0 - hlibgit2 ==0.18.0.16 - hmatrix ==0.20.0.0 @@ -978,7 +1056,9 @@ default-package-overrides: - hmatrix-vector-sized ==0.1.3.0 - hmpfr ==0.4.4 - hnock ==0.4.0 - - hoauth2 ==1.11.0 + - hoauth2 ==1.14.0 + - hOpenPGP ==2.9.4 + - hopenpgp-tools ==0.23.1 - hopfli ==0.2.2.1 - hosc ==0.17 - hostname ==1.0 @@ -986,12 +1066,14 @@ default-package-overrides: - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.9 - - hpack ==0.33.1 - - hpc-codecov ==0.1.0.0 + - hpack ==0.34.2 + - hpack-dhall ==0.5.2 + - hpc-codecov ==0.2.0.0 + - hpc-lcov ==1.0.0 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 - hruby ==0.3.8 - - hs-bibutils ==6.8.0.0 + - hs-bibutils ==6.10.0.0 - hsc2hs ==0.68.7 - hscolour ==1.24.4 - hsdns ==1.8 @@ -1006,6 +1088,7 @@ default-package-overrides: - hslogger ==1.3.1.0 - hslua ==1.0.3.2 - hslua-aeson ==1.0.2 + - hslua-module-doclayout ==0.1.0 - hslua-module-system ==0.2.1 - hslua-module-text ==0.2.1 - HsOpenSSL ==0.11.4.18 @@ -1021,13 +1104,16 @@ default-package-overrides: - hspec-expectations-pretty-diff ==0.7.2.5 - hspec-golden ==0.1.0.1 - hspec-golden-aeson ==0.7.0.0 + - hspec-hedgehog ==0.0.1.2 - hspec-leancheck ==0.0.4 - hspec-megaparsec ==2.1.0 - hspec-meta ==2.6.0 - hspec-need-env ==0.1.0.4 - hspec-parsec ==0 - hspec-smallcheck ==0.5.2 + - hspec-tables ==0.0.1 - hspec-wai ==0.10.1 + - hspec-wai-json ==0.10.1 - hs-php-session ==0.0.9.3 - hsshellscript ==3.4.5 - HStringTemplate ==0.8.7 @@ -1053,7 +1139,7 @@ default-package-overrides: - http-conduit ==2.3.7.3 - http-date ==0.0.8 - http-directory ==0.1.8 - - http-download ==0.1.0.1 + - http-download ==0.2.0.0 - httpd-shed ==0.4.1.1 - http-link-header ==1.0.3.1 - http-media ==0.8.0.0 @@ -1065,37 +1151,26 @@ default-package-overrides: - HUnit-approx ==1.1.1.1 - hunit-dejafu ==2.0.0.3 - hvect ==0.4.0.0 - - hvega ==0.5.0.0 - - hw-balancedparens ==0.3.1.0 + - hvega ==0.9.1.0 + - hw-balancedparens ==0.4.1.0 - hw-bits ==0.7.2.1 - hw-conduit ==0.2.1.0 - hw-conduit-merges ==0.2.1.0 - hw-diagnostics ==0.0.1.0 - - hw-dsv ==0.4.1.0 - hweblib ==0.6.3 - - hw-eliasfano ==0.1.2.0 - hw-excess ==0.2.3.0 - hw-fingertree ==0.1.2.0 - hw-fingertree-strict ==0.1.2.0 - hw-hedgehog ==0.1.1.0 - hw-hspec-hedgehog ==0.1.1.0 - hw-int ==0.0.2.0 - - hw-ip ==2.4.2.0 - - hw-json ==1.3.2.0 - hw-json-simd ==0.1.1.0 - - hw-json-simple-cursor ==0.1.1.0 - - hw-json-standard-cursor ==0.2.3.1 - hw-mquery ==0.2.1.0 - - hw-packed-vector ==0.2.1.0 - hw-parser ==0.1.1.0 - hw-prim ==0.6.3.0 - - hw-rankselect ==0.13.4.0 - - hw-rankselect-base ==0.3.4.0 - - hw-simd ==0.1.2.0 + - hw-rankselect-base ==0.3.4.1 - hw-streams ==0.0.1.0 - hw-string-parse ==0.0.0.4 - - hw-succinct ==0.1.0.1 - - hw-xml ==0.5.1.0 - hxt ==9.3.1.18 - hxt-charproperties ==9.4.0.0 - hxt-css ==0.1.0.3 @@ -1108,29 +1183,34 @@ default-package-overrides: - hybrid-vectors ==0.2.2 - hyperloglog ==0.4.3 - hyphenation ==0.8 + - hyraxAbif ==0.2.3.21 - iconv ==0.4.1.3 - identicon ==0.2.2 - ieee754 ==0.8.0 - if ==0.1.0.0 - iff ==0.0.6 + - ihaskell ==0.10.1.1 - ihs ==0.1.0.3 - ilist ==0.4.0.1 - imagesize-conduit ==1.1 - Imlib ==0.1.2 - immortal ==0.3 + - immortal-queue ==0.1.0.1 - include-file ==0.1.0.4 - incremental-parser ==0.4.0.2 - indents ==0.5.0.1 - indexed ==0.1.3 + - indexed-containers ==0.1.0.2 - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1 - infer-license ==0.2.0 - inflections ==0.4.0.5 - - influxdb ==1.7.1.5 + - influxdb ==1.7.1.6 - ini ==0.4.1 - inj ==1.0 - inline-c ==0.9.1.0 - inline-c-cpp ==0.4.0.2 + - inliterate ==0.1.0 - insert-ordered-containers ==0.2.3.1 - inspection-testing ==0.4.2.4 - instance-control ==0.1.2.0 @@ -1139,15 +1219,17 @@ default-package-overrides: - integer-roots ==1.0 - integration ==0.2.1 - intern ==0.9.2 - - interpolate ==0.2.0 + - interpolate ==0.2.1 + - interpolatedstring-perl6 ==1.0.2 - interpolation ==0.1.1.1 - interpolator ==1.0.0 - - IntervalMap ==0.6.1.1 + - IntervalMap ==0.6.1.2 - intervals ==0.9.1 - - intro ==0.6.0.1 + - intro ==0.7.0.0 - intset-imperative ==0.1.0.0 - invariant ==0.5.3 - invertible ==0.2.0.5 + - invertible-grammar ==0.1.2 - io-machine ==0.2.0.0 - io-manager ==0.1.0.2 - io-memoize ==1.1.1.0 @@ -1155,7 +1237,6 @@ default-package-overrides: - io-storage ==0.3 - io-streams ==1.5.1.0 - io-streams-haproxy ==1.0.1.0 - - ip ==1.7.2 - ip6addr ==1.0.1 - iproute ==1.7.9 - IPv6Addr ==1.1.4 @@ -1165,25 +1246,29 @@ default-package-overrides: - irc-client ==1.1.1.1 - irc-conduit ==0.3.0.4 - irc-ctcp ==0.1.3.0 + - isbn ==1.0.0.0 - islink ==0.1.0.0 - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - iterable ==3.0 + - it-has ==0.2.0.0 + - ixset-typed ==0.5 - ix-shapable ==0.1.0 - jack ==0.7.1.4 - - jira-wiki-markup ==1.0.0 + - jira-wiki-markup ==1.1.4 - jose ==0.8.3 - jose-jwt ==0.8.0 - js-dgtable ==0.5.2 - js-flot ==0.8.3 - js-jquery ==3.3.1 - json-alt ==1.0.0 - - json-feed ==1.0.10 + - json-feed ==1.0.11 - jsonpath ==0.2.0.0 - - json-rpc ==1.0.1 + - json-rpc ==1.0.2 - json-rpc-generic ==0.2.1.5 - JuicyPixels ==3.3.5 + - JuicyPixels-blurhash ==0.1.0.3 - JuicyPixels-extra ==0.4.1 - JuicyPixels-scale-dct ==0.1.2 - junit-xml ==0.1.0.1 @@ -1202,15 +1287,18 @@ default-package-overrides: - kind-generics-th ==0.2.2.0 - kmeans ==0.1.3 - koofr-client ==1.0.0.3 + - krank ==0.2.1 - kubernetes-webhook-haskell ==0.2.0.2 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==1.0.12 + - lackey ==1.0.13 - LambdaHack ==0.9.5.0 - lame ==0.2.0 - - language-avro ==0.1.2.0 + - language-avro ==0.1.3.1 + - language-bash ==0.9.2 - language-c ==0.8.3 - language-c-quote ==0.12.2.1 + - language-docker ==9.1.1 - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - language-javascript ==0.7.1.0 @@ -1249,30 +1337,35 @@ default-package-overrides: - libmpd ==0.9.1.0 - libyaml ==0.1.2 - LibZip ==1.0.1 + - life-sync ==1.1.1.0 - lifted-async ==0.10.0.6 - lifted-base ==0.2.3.12 - lift-generics ==0.1.3 - - linear ==1.20.9 + - line ==4.0.1 + - linear ==1.21 - linenoise ==0.3.1 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 - - ListLike ==4.6.3 + - ListLike ==4.7 + - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - - list-singleton ==1.0.0.3 + - list-singleton ==1.0.0.4 - list-t ==1.0.4 - ListTree ==0.2.3 + - little-logger ==0.1.0 + - little-rio ==0.1.1 - llvm-hs ==9.0.1 - llvm-hs-pure ==9.0.0 - lmdb ==0.2.5 - load-env ==0.2.1.0 + - loc ==0.1.3.8 - loch-th ==0.2.2 - lockfree-queue ==0.2.3.1 - log-base ==0.8.0.1 - log-domain ==0.13 - logfloat ==0.13.3.3 - logging ==3.0.5 - - logging-effect ==1.3.9 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - logict ==0.7.0.2 @@ -1280,13 +1373,14 @@ default-package-overrides: - loopbreaker ==0.1.1.1 - lrucache ==1.2.0.1 - lrucaching ==0.3.3 - - lsp-test ==0.10.2.0 + - lsp-test ==0.10.3.0 - lucid ==2.9.12 - lucid-extras ==0.2.2 - lukko ==0.1.1.2 - lzma ==0.0.0.3 - lzma-conduit ==1.2.1 - machines ==0.7 + - magic ==1.1 - mainland-pretty ==0.7.0.1 - main-tester ==0.2.0.1 - makefile ==1.1.0.0 @@ -1294,20 +1388,22 @@ default-package-overrides: - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.4.5.0 + - massiv ==0.5.2.0 - massiv-io ==0.2.1.0 - - massiv-test ==0.1.2 + - massiv-test ==0.1.3 - mathexpr ==0.3.0.0 + - math-extras ==0.1.1.0 - math-functions ==0.3.4.0 - matplotlib ==0.7.5 - matrices ==0.5.0 - matrix ==0.3.6.1 - matrix-market-attoparsec ==0.1.1.3 - - matrix-static ==0.2.1 + - matrix-static ==0.3 - maximal-cliques ==0.1.1 - mbox ==0.3.4 - mbox-utility ==0.0.3.1 - mcmc-types ==1.0.3 + - medea ==1.1.2 - median-stream ==0.7.0.0 - megaparsec ==8.0.0 - megaparsec-tests ==8.0.0 @@ -1315,8 +1411,8 @@ default-package-overrides: - memory ==0.15.0 - MemoTrie ==0.6.10 - mercury-api ==0.1.0.2 - - mergeful ==0.1.0.0 - - mergeless ==0.2.0.2 + - mergeful ==0.2.0.0 + - mergeless ==0.3.0.0 - mersenne-random-pure64 ==0.2.2.0 - messagepack ==0.5.4 - metrics ==0.4.1.1 @@ -1333,17 +1429,18 @@ default-package-overrides: - microstache ==1.0.1.1 - midair ==0.2.0.1 - midi ==0.2.2.2 - - mighty-metropolis ==1.2.0 + - mighty-metropolis ==2.0.0 - mime-mail ==0.5.0 - mime-mail-ses ==0.4.1 - mime-types ==0.1.0.9 - - mini-egison ==0.1.6 + - mini-egison ==1.0.0 - minimal-configuration ==0.1.4 - minimorph ==0.2.2.0 - minio-hs ==1.5.2 - miniutter ==0.5.1.0 + - min-max-pqueue ==0.1.0.1 - mintty ==0.1.2 - - miso ==1.4.0.0 + - miso ==1.6.0.0 - missing-foreign ==0.1.1 - MissingH ==1.4.3.0 - mixed-types-num ==0.4.0.1 @@ -1357,8 +1454,10 @@ default-package-overrides: - mnist-idx ==0.1.2.8 - mockery ==0.3.5 - mod ==0.1.1.0 + - model ==0.5 - modern-uri ==0.3.2.0 - modular ==0.1.0.8 + - monad-bayes ==0.1.1.0 - monad-control ==1.0.2.3 - monad-control-aligned ==0.0.1.1 - monad-coroutine ==0.9.0.4 @@ -1370,6 +1469,7 @@ default-package-overrides: - monad-logger-prefix ==0.1.11 - monad-loops ==0.4.3 - monad-memo ==0.5.1 + - monad-metrics ==0.2.1.4 - monad-par ==0.3.5 - monad-parallel ==0.7.2.3 - monad-par-extras ==0.3.3 @@ -1392,20 +1492,25 @@ default-package-overrides: - mono-traversable-instances ==0.1.0.0 - mono-traversable-keys ==0.1.0 - more-containers ==0.2.2.0 - - morpheus-graphql ==0.10.0 + - morpheus-graphql ==0.12.0 + - morpheus-graphql-core ==0.12.0 - mountpoints ==1.0.2 + - mpi-hs ==0.7.1.2 + - mpi-hs-binary ==0.1.1.0 + - mpi-hs-cereal ==0.1.0.0 - mtl-compat ==0.2.2 - mtl-prelude ==2.0.3.1 - multiarg ==0.30.0.10 + - multi-containers ==0.1.1 - multimap ==1.2.1 - multiset ==0.3.4.3 - - multistate ==0.8.0.2 - - murmur3 ==1.0.3 + - multistate ==0.8.0.3 + - murmur3 ==1.0.4 - murmur-hash ==0.1.0.9 - MusicBrainz ==0.4.1 - mustache ==2.3.1 - mutable-containers ==0.3.4 - - mwc-probability ==2.2.0 + - mwc-probability ==2.3.0 - mwc-random ==0.14.0.0 - mx-state-codes ==1.0.0.0 - mysql ==0.1.7 @@ -1416,7 +1521,6 @@ default-package-overrides: - nano-erl ==0.1.0.1 - nanospec ==0.2.2 - nats ==1.1.2 - - natural-arithmetic ==0.1.2.0 - natural-induction ==0.2.0.0 - natural-sort ==0.1.2 - natural-transformation ==0.4 @@ -1437,6 +1541,8 @@ default-package-overrides: - network-conduit-tls ==1.3.2 - network-info ==0.2.0.10 - network-ip ==0.3.0.3 + - network-messagepack-rpc ==0.1.2.0 + - network-messagepack-rpc-websocket ==0.1.1.1 - network-simple ==0.4.5 - network-simple-tls ==0.4 - network-transport ==0.5.4 @@ -1447,7 +1553,6 @@ default-package-overrides: - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-paths ==1.0.1 - - NoHoed ==0.1.1 - nonce ==1.0.7 - nondeterminism ==1.4 - non-empty ==0.3.2 @@ -1459,7 +1564,7 @@ default-package-overrides: - not-gloss ==0.7.7.0 - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - - nqe ==0.6.1 + - nqe ==0.6.3 - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 @@ -1472,7 +1577,7 @@ default-package-overrides: - ObjectName ==1.1.0.1 - o-clock ==1.1.0 - odbc ==0.2.2 - - oeis2 ==1.0.3 + - oeis2 ==1.0.4 - ofx ==0.4.4.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.3 @@ -1491,7 +1596,10 @@ default-package-overrides: - openpgp-asciiarmor ==0.1.2 - opensource ==0.1.1.0 - openssl-streams ==1.2.2.0 - - opentelemetry ==0.0.0.2 + - opentelemetry ==0.4.2 + - opentelemetry-extra ==0.4.2 + - opentelemetry-lightstep ==0.4.2 + - opentelemetry-wai ==0.4.2 - operational ==0.2.3.5 - operational-class ==0.3.0.0 - optics ==0.2 @@ -1506,16 +1614,16 @@ default-package-overrides: - optparse-simple ==0.1.1.2 - optparse-text ==0.1.1.0 - ordered-containers ==0.2.2 - - ormolu ==0.0.3.1 + - ormolu ==0.1.0.0 - overhang ==1.0.0 - - packcheck ==0.4.2 + - packcheck ==0.5.1 - pager ==0.1.1.0 - pagination ==0.2.1 - pagure-cli ==0.2 - - pandoc ==2.9.1.1 - - pandoc-citeproc ==0.16.4.1 + - pandoc ==2.9.2.1 + - pandoc-citeproc ==0.17 - pandoc-csv2table ==1.0.8 - - pandoc-plot ==0.2.2.0 + - pandoc-plot ==0.6.1.0 - pandoc-pyplot ==2.3.0.1 - pandoc-types ==1.20 - pantry ==0.4.0.1 @@ -1533,12 +1641,14 @@ default-package-overrides: - parsers ==0.12.10 - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - - password ==1.0.0.0 - - password-instances ==1.0.0.0 - - path ==0.7.1 + - partial-semigroup ==0.5.1.8 + - password ==2.0.1.1 + - password-instances ==2.0.0.1 + - path ==0.7.0 - path-extra ==0.2.0 - path-io ==1.6.0 - path-pieces ==0.2.1 + - path-text-utf8 ==0.0.1.6 - pathtype ==0.8.1 - pathwalk ==0.3.1.2 - pattern-arrows ==0.0.2 @@ -1553,7 +1663,7 @@ default-package-overrides: - perfect-hash-generator ==0.2.0.6 - perfect-vector-shuffle ==0.1.1.1 - persist ==0.1.1.5 - - persistable-record ==0.6.0.4 + - persistable-record ==0.6.0.5 - persistable-types-HDBC-pg ==0.0.3.5 - persistent ==2.10.5.2 - persistent-mysql ==2.10.2.3 @@ -1589,17 +1699,18 @@ default-package-overrides: - pipes-wai ==3.2.0 - pkcs10 ==0.2.0.0 - placeholders ==0.1 + - plaid ==0.1.0.4 - planb-token-introspection ==0.1.4.0 - plotlyhs ==0.2.1 - pointed ==5.0.1 - pointedlist ==0.6.1 - pointless-fun ==1.1.0.6 - poll ==0.0.0.1 - - poly ==0.3.3.0 + - poly ==0.4.0.0 - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.13 - - polysemy ==1.2.3.0 + - polysemy ==1.3.0.0 - pooled-io ==0.0.2.2 - port-utils ==0.2.1.0 - posix-paths ==0.2.1.6 @@ -1609,9 +1720,10 @@ default-package-overrides: - postgresql-libpq ==0.9.4.2 - postgresql-orm ==0.5.1 - postgresql-simple ==0.6.2 + - postgrest ==7.0.0 - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - - pqueue ==1.4.1.2 + - pqueue ==1.4.1.3 - prefix-units ==0.2.0 - prelude-compat ==0.0.0.2 - prelude-safeenum ==0.1.1.2 @@ -1626,16 +1738,14 @@ default-package-overrides: - prettyprinter-convert-ansi-wl-pprint ==1.1 - pretty-relative-time ==0.2.0.0 - pretty-show ==1.10 - - pretty-simple ==3.2.2.0 + - pretty-simple ==3.2.3.0 - pretty-sop ==0.2.0.3 + - pretty-terminal ==0.1.0.0 - pretty-types ==0.3.0.1 - primes ==0.2.1.0 - primitive ==0.7.0.1 - primitive-addr ==0.1.0.2 - - primitive-extras ==0.8 - - primitive-offset ==0.2.0.0 - primitive-unaligned ==0.1.1.1 - - primitive-unlifted ==0.1.3.0 - print-console-colors ==0.1.0.0 - process-extras ==0.7.4 - product-isomorphic ==0.0.3.3 @@ -1648,25 +1758,28 @@ default-package-overrides: - promises ==0.3 - prompt ==0.1.1.2 - prospect ==0.1.0.0 + - proto3-wire ==1.1.0 + - protobuf ==0.2.1.3 - protobuf-simple ==0.1.1.0 - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.1.0.1 - - proto-lens ==0.6.0.0 - - proto-lens-arbitrary ==0.1.2.8 - - proto-lens-optparse ==0.1.1.6 - - proto-lens-protobuf-types ==0.6.0.0 - - proto-lens-protoc ==0.6.0.0 - - proto-lens-runtime ==0.6.0.0 - - proto-lens-setup ==0.4.0.3 + - proto-lens ==0.7.0.0 + - proto-lens-arbitrary ==0.1.2.9 + - proto-lens-optparse ==0.1.1.7 + - proto-lens-protobuf-types ==0.7.0.0 + - proto-lens-protoc ==0.7.0.0 + - proto-lens-runtime ==0.7.0.0 + - proto-lens-setup ==0.4.0.4 - protolude ==0.2.4 - proxied ==0.3.1 - psqueues ==0.2.7.2 - - publicsuffix ==0.20191003 + - publicsuffix ==0.20200526 - pulse-simple ==0.1.14 - pureMD5 ==2.1.3 - - purescript-bridge ==0.13.0.0 + - purescript-bridge ==0.14.0.0 - pushbullet-types ==0.4.1.0 - pusher-http-haskell ==1.5.1.13 + - pvar ==0.2.0.0 - PyF ==0.9.0.1 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 @@ -1679,16 +1792,17 @@ default-package-overrides: - quickcheck-assertions ==0.3.0 - quickcheck-classes ==0.6.4.0 - quickcheck-classes-base ==0.6.0.0 - - quickcheck-instances ==0.3.22 + - quickcheck-instances ==0.3.23 - quickcheck-io ==0.2.0 - quickcheck-simple ==0.1.1.1 - quickcheck-special ==0.1.0.6 - quickcheck-text ==0.1.2.1 - quickcheck-transformer ==0.3.1 - quickcheck-unicode ==1.0.1.0 + - quiet ==0.2 - radius ==0.6.1.0 - rainbow ==0.34.2.2 - - rainbox ==0.24.4.0 + - rainbox ==0.26.0.0 - ral ==0.1 - ramus ==0.1.2 - rando ==0.0.0.4 @@ -1704,8 +1818,8 @@ default-package-overrides: - Rasterific ==0.7.5.2 - rasterific-svg ==0.3.3.2 - ratel ==1.0.12 + - rate-limit ==1.4.2 - ratel-wai ==1.1.3 - - rattle ==0.1 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 @@ -1716,8 +1830,9 @@ default-package-overrides: - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 + - reanimate ==0.3.3.0 - reanimate-svg ==0.9.8.0 - - rebase ==1.4.1 + - rebase ==1.6.1 - record-dot-preprocessor ==0.2.5 - record-hasfield ==1.0 - records-sop ==0.1.0.3 @@ -1726,6 +1841,10 @@ default-package-overrides: - refact ==0.3.0.2 - ref-fd ==0.4.0.2 - reflection ==2.1.6 + - reform ==0.2.7.4 + - reform-blaze ==0.2.4.3 + - reform-hamlet ==0.0.5.3 + - reform-happstack ==0.2.5.3 - RefSerialize ==0.4.0 - regex ==1.1.0.0 - regex-applicative ==0.3.3.1 @@ -1741,34 +1860,36 @@ default-package-overrides: - registry ==0.1.7.1 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - - relational-query ==0.12.2.2 + - relational-query ==0.12.2.3 - relational-query-HDBC ==0.7.2.0 - relational-record ==0.2.2.0 - relational-schemas ==0.1.8.0 - - relude ==0.6.0.0 + - relude ==0.7.0.0 - renderable ==0.2.0.1 - - replace-attoparsec ==1.2.2.0 - - replace-megaparsec ==1.2.1.0 + - replace-attoparsec ==1.4.0.0 + - replace-megaparsec ==1.4.1.0 - repline ==0.2.2.0 - - req ==3.1.0 + - req ==3.2.0 - req-conduit ==1.0.0 - - rerebase ==1.4.1 + - rerebase ==1.6.1 - resolv ==0.1.2.0 - resource-pool ==0.2.3.2 - - resourcet ==1.2.4 + - resourcet ==1.2.4.1 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - retry ==0.8.1.2 - rev-state ==0.1.2 - - rfc1751 ==0.1.2 + - rfc1751 ==0.1.3 - rfc5051 ==0.1.0.4 + - rhine ==0.6.0 + - rhine-gloss ==0.6.0.1 - rigel-viz ==0.2.0.0 - - rio ==0.1.15.1 + - rio ==0.1.17.0 - rio-orphans ==0.1.1.0 - rio-prettyprint ==0.1.0.0 - roc-id ==0.1.0.0 - rocksdb-haskell ==1.0.1 - - rocksdb-query ==0.3.1 + - rocksdb-query ==0.3.2 - roles ==0.2.0.0 - rope-utf16-splay ==0.3.1.0 - rosezipper ==0.2 @@ -1776,7 +1897,6 @@ default-package-overrides: - rpmbuild-order ==0.3 - RSA ==2.4.1 - runmemo ==1.0.0.1 - - run-st ==0.1.1.0 - safe ==0.3.19 - safecopy ==0.10.3 - safe-decimal ==0.2.0.0 @@ -1790,7 +1910,7 @@ default-package-overrides: - salak ==0.3.6 - salak-yaml ==0.3.5.3 - saltine ==0.1.1.0 - - salve ==1.0.9 + - salve ==1.0.10 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.4 @@ -1810,11 +1930,11 @@ default-package-overrides: - sdl2-mixer ==1.1.0 - sdl2-ttf ==2.1.1 - search-algorithms ==0.3.1 - - secp256k1-haskell ==0.1.8 + - secp256k1-haskell ==0.2.5 - securemem ==0.1.10 - selda ==0.5.1.0 - selda-json ==0.1.1.0 - - selective ==0.3 + - selective ==0.4.1 - semialign ==1.1 - semialign-indexed ==1.1 - semialign-optics ==1.1 @@ -1832,6 +1952,7 @@ default-package-overrides: - serialise ==0.2.3.0 - servant ==0.16.2 - servant-auth ==0.3.2.0 + - servant-auth-docs ==0.2.10.0 - servant-auth-server ==0.4.5.1 - servant-auth-swagger ==0.2.10.0 - servant-blaze ==0.9 @@ -1842,7 +1963,9 @@ default-package-overrides: - servant-client-core ==0.16 - servant-conduit ==0.15 - servant-docs ==0.11.4 + - servant-docs-simple ==0.2.0.1 - servant-elm ==0.7.2 + - servant-errors ==0.1.6.0 - servant-foreign ==0.15 - servant-js ==0.9.4.1 - servant-JuicyPixels ==0.3.0.5 @@ -1850,35 +1973,37 @@ default-package-overrides: - servant-machines ==0.15 - servant-mock ==0.8.5 - servant-pipes ==0.15.1 - - servant-purescript ==0.9.0.4 + - servant-purescript ==0.10.0.0 - servant-rawm ==0.3.2.0 - servant-server ==0.16.2 - - servant-static-th ==0.2.2.1 - - servant-subscriber ==0.6.0.3 + - servant-static-th ==0.2.3.0 + - servant-subscriber ==0.7.0.0 - servant-swagger ==1.1.7.1 - servant-swagger-ui ==0.3.4.3.23.11 - servant-swagger-ui-core ==0.3.3 - servant-swagger-ui-redoc ==0.3.3.1.22.3 - servant-websockets ==2.0.0 - servant-yaml ==0.1.0.1 - - serverless-haskell ==0.10.5 + - serverless-haskell ==0.11.3 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - ses-html ==0.4.0.0 - set-cover ==0.1.1 - setenv ==0.1.1.3 - setlocale ==1.0.0.9 + - sexp-grammar ==2.1.0 - SHA ==1.6.4.4 + - shake-plus ==0.1.6.0 - shakespeare ==2.0.24 - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 - shellmet ==0.0.3.1 - shelltestrunner ==1.9 - - shell-utility ==0.0 + - shell-utility ==0.1 - shelly ==1.9.0 - should-not-typecheck ==2.1.0 - - show-combinators ==0.1.1.0 + - show-combinators ==0.2.0.0 - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5.1 @@ -1890,9 +2015,9 @@ default-package-overrides: - simple-reflect ==0.3.3 - simple-sendfile ==0.2.30 - simplest-sqlite ==0.1.0.2 - - simple-templates ==0.9.0.0 - - simple-vec3 ==0.6 - - simplistic-generics ==0.1.0.0 + - simple-templates ==1.0.0 + - simple-vec3 ==0.6.0.1 + - simplistic-generics ==2.0.0 - since ==0.0.0 - singleton-bool ==0.1.5 - singleton-nats ==0.4.5 @@ -1903,12 +2028,17 @@ default-package-overrides: - size-based ==0.1.2.0 - sized ==0.4.0.0 - skein ==1.0.9.4 + - skews ==0.1.0.3 - skip-var ==0.1.1.0 - skylighting ==0.8.4 - skylighting-core ==0.8.4 + - slack-api ==0.12 - slist ==0.1.1.0 - - small-bytearray-builder ==0.3.4.0 - - smallcheck ==1.1.5 + - smallcheck ==1.1.7 + - smash ==0.1.1.0 + - smash-aeson ==0.1.0.0 + - smash-lens ==0.1.0.0 + - smash-microlens ==0.1.0.0 - smoothie ==0.4.2.11 - snap-blaze ==0.2.1.5 - snap-core ==1.0.4.1 @@ -1939,38 +2069,43 @@ default-package-overrides: - sqlcli ==0.2.2.0 - sqlcli-odbc ==0.2.0.1 - sql-words ==0.1.6.4 + - squeather ==0.4.0.0 - srcloc ==0.5.1.2 - stache ==2.1.1 + - stackcollapse-ghc ==0.0.1 - stack-templatizer ==0.1.0.2 - starter ==0.3.0 - stateref ==0.3 - statestack ==0.3 - StateVar ==1.2 + - static-text ==0.2.0.6 - statistics ==0.15.2.0 + - status-notifier-item ==0.3.0.5 - stb-image-redux ==0.2.1.3 - step-function ==0.2 - stm-chans ==3.0.0.4 - stm-conduit ==4.0.1 - - stm-containers ==1.1.0.4 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - - stm-hamt ==1.2.0.4 - stm-split ==0.0.2.1 - stopwatch ==0.1.0.6 - storable-complex ==0.2.3.0 - storable-record ==0.0.5 - storable-tuple ==0.0.3.3 - storablevector ==0.2.13 - - stratosphere ==0.49.0 + - stratosphere ==0.53.0 - streaming ==0.2.3.0 - streaming-bytestring ==0.1.6 - streaming-commons ==0.2.1.2 - streamly ==0.7.2 + - streamly-bytestring ==0.1.2 - streams ==3.3 - strict ==0.3.2 - strict-base-types ==0.6.1 - strict-concurrency ==0.2.4.3 - strict-list ==0.1.5 + - strict-tuple ==0.1.3 + - strict-tuple-lens ==0.1.0.1 - stringbuilder ==0.5.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 @@ -1984,8 +2119,11 @@ default-package-overrides: - stripe-signature ==1.0.0.4 - strive ==5.0.12 - structs ==0.1.3 + - structured ==0.1 - structured-cli ==2.5.2.0 - - stylish-haskell ==0.10.0.0 + - stylish-haskell ==0.11.0.0 + - summoner ==2.0.1.1 + - summoner-tui ==2.0.1.1 - sum-type-boilerplate ==0.1.1 - sundown ==0.6 - superbuffer ==0.3.1.1 @@ -1994,16 +2132,18 @@ default-package-overrides: - svg-tree ==0.6.2.4 - swagger ==0.3.0 - swagger2 ==2.5 + - swish ==0.10.0.3 - syb ==0.7.1 - symbol ==0.2.4 - symengine ==0.1.2.0 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - - systemd ==2.2.0 + - systemd ==2.3.0 - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - system-info ==0.5.1 - tabular ==0.2.2.7 + - taffybar ==3.2.2 - tagchup ==0.4.1.1 - tagged ==0.8.6 - tagged-binary ==0.2.0.1 @@ -2031,7 +2171,7 @@ default-package-overrides: - tasty-program ==1.0.5 - tasty-quickcheck ==0.10.1.1 - tasty-rerun ==1.1.17 - - tasty-silver ==3.1.13 + - tasty-silver ==3.1.15 - tasty-smallcheck ==0.8.1 - tasty-th ==0.1.7 - tasty-wai ==0.1.1.0 @@ -2075,30 +2215,35 @@ default-package-overrides: - tfp ==1.0.1.1 - tf-random ==0.5 - th-abstraction ==0.3.2.0 + - th-bang-compat ==0.0.1.0 + - th-constraint-compat ==0.0.1.0 - th-data-compat ==0.1.0.0 - th-desugar ==1.10 - - these ==1.0.1 + - th-env ==0.1.0.2 + - these ==1.1 - these-lens ==1 - these-optics ==1 - th-expand-syns ==0.4.6.0 - th-extras ==0.0.0.4 - th-lift ==0.8.1 - - th-lift-instances ==0.1.16 + - th-lift-instances ==0.1.17 + - th-nowq ==0.1.0.5 - th-orphans ==0.13.10 - th-printf ==0.7 - thread-hierarchy ==0.3.0.1 - thread-local-storage ==0.2 - threads ==0.5.1.6 - thread-supervisor ==0.1.0.0 - - threepenny-gui ==0.8.3.2 + - threepenny-gui ==0.9.0.0 - th-reify-compat ==0.0.1.5 - th-reify-many ==0.1.9 - throttle-io-stream ==0.2.0.1 + - through-text ==0.1.0.0 - throwable-exceptions ==0.1.0.9 - th-strict-compat ==0.1.0.1 - th-test-utils ==1.0.2 - thyme ==0.3.5.5 - - tidal ==1.4.9 + - tidal ==1.5.2 - tile ==0.3.0.0 - time-compat ==1.9.3 - timeit ==2.0 @@ -2109,7 +2254,8 @@ default-package-overrides: - time-manager ==0.0.0 - time-parsers ==0.1.2.1 - timerep ==2.0.0.2 - - timezone-olson ==0.1.9 + - time-units ==1.0.0 + - timezone-olson ==0.2.0 - timezone-series ==0.1.9 - tinylog ==0.15.0 - titlecase ==1.0.1 @@ -2120,7 +2266,7 @@ default-package-overrides: - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - tmp-postgres ==1.34.1.0 - - tomland ==1.2.1.0 + - tomland ==1.3.0.0 - tonalude ==0.1.1.0 - topograph ==1.0.0.1 - torsor ==0.1 @@ -2168,12 +2314,15 @@ default-package-overrides: - tzdata ==0.1.20190911.0 - ua-parser ==0.7.5.1 - uglymemo ==0.1.0.1 + - ulid ==0.3.0.0 - unagi-chan ==0.4.1.3 - unbounded-delays ==0.1.1.0 - unboxed-ref ==0.4.0.0 - unboxing-vector ==0.1.1.0 - uncertain ==0.3.1.0 - unconstrained ==0.1.0.2 + - unexceptionalio ==0.5.1 + - unexceptionalio-trans ==0.5.1 - unicode ==0.0.1.1 - unicode-show ==0.1.0.4 - unicode-transforms ==0.3.6 @@ -2204,13 +2353,13 @@ default-package-overrides: - unordered-containers ==0.2.10.0 - unordered-intmap ==0.1.1 - unsafe ==0.0 - - urbit-hob ==0.3.2 + - urbit-hob ==0.3.3 - uri-bytestring ==0.3.2.2 - - uri-bytestring-aeson ==0.1.0.7 + - uri-bytestring-aeson ==0.1.0.8 - uri-encode ==1.5.0.5 - url ==2.1.3 - - urlpath ==9.0.1 - users ==0.5.0.0 + - utf8-conversions ==0.1.0.4 - utf8-light ==0.4.2 - utf8-string ==1.0.1.1 - util ==0.1.17.1 @@ -2218,7 +2367,8 @@ default-package-overrides: - uuid ==1.3.13 - uuid-types ==1.0.3 - validation ==1.1 - - validity ==0.9.0.3 + - validation-selective ==0.1.0.0 + - validity ==0.11.0.0 - validity-aeson ==0.2.0.4 - validity-bytestring ==0.4.1.1 - validity-containers ==0.5.0.3 @@ -2246,14 +2396,14 @@ default-package-overrides: - vector-space ==0.16 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.7 - - verbosity ==0.3.0.0 + - verbosity ==0.4.0.0 - versions ==3.5.4 - vformat ==0.14.1.0 - vformat-aeson ==0.1.0.1 - vformat-time ==0.1.0.0 - ViennaRNAParser ==1.3.3 - void ==0.7.3 - - vty ==5.26 + - vty ==5.28.2 - wai ==3.2.2.1 - wai-app-static ==3.1.7.1 - wai-conduit ==3.0.0.4 @@ -2264,6 +2414,7 @@ default-package-overrides: - wai-handler-launch ==3.0.3.1 - wai-logger ==2.3.6 - wai-middleware-caching ==0.1.0.2 + - wai-middleware-clacks ==0.1.0.1 - wai-middleware-static ==0.8.3 - wai-session ==0.3.3 - wai-slack-middleware ==0.2.0 @@ -2288,7 +2439,10 @@ default-package-overrides: - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 + - witherable-class ==0 + - within ==0.1.1.0 - with-location ==0.1.0 + - with-utf8 ==1.0.2.1 - witness ==0.4 - wizards ==1.0.3 - wl-pprint-annotated ==0.1.0.1 @@ -2304,7 +2458,8 @@ default-package-overrides: - writer-cps-exceptions ==0.1.0.1 - writer-cps-mtl ==0.1.1.6 - writer-cps-transformers ==0.5.6.1 - - wuss ==1.1.16 + - wss-client ==0.3.0.0 + - wuss ==1.1.17 - X11 ==1.9.1 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 @@ -2314,8 +2469,9 @@ default-package-overrides: - x509-validation ==1.6.11 - Xauth ==0.1 - xdg-basedir ==0.2.2 + - xdg-desktop-entry ==0.1.1.1 - xdg-userdirs ==0.1.0.2 - - xeno ==0.3.5.2 + - xeno ==0.4.1 - xls ==0.1.3 - xlsx ==0.8.0 - xlsx-tabular ==0.2.2.1 @@ -2325,13 +2481,14 @@ default-package-overrides: - xml-conduit-writer ==0.1.1.2 - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0.1 + - xml-helpers ==1.0.0 - xml-html-qq ==0.1.0.1 - xml-indexed-cursor ==0.1.1.0 - xml-lens ==0.2 - xml-picklers ==0.3.6 - xml-to-json ==2.0.1 - xml-to-json-fast ==2.0.0 - - xml-types ==0.3.6 + - xml-types ==0.3.7 - xmonad ==0.15 - xmonad-contrib ==0.16 - xmonad-extras ==0.15.2 @@ -2339,18 +2496,23 @@ default-package-overrides: - xturtle ==0.2.0.0 - xxhash-ffi ==0.2.0.0 - yaml ==0.11.4.0 + - yamlparse-applicative ==0.1.0.1 - yesod ==1.6.0.1 - yesod-auth ==1.6.10 + - yesod-auth-fb ==1.10.1 - yesod-auth-hashdb ==1.7.1.2 - yesod-bin ==1.6.0.4 - yesod-core ==1.6.18 + - yesod-fb ==0.6.1 - yesod-form ==1.6.7 + - yesod-form-bootstrap4 ==3.0.0 - yesod-gitrev ==0.2.1 - yesod-newsfeed ==1.7.0.0 - yesod-persistent ==1.6.0.4 + - yesod-recaptcha2 ==1.0.0 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0.1 - - yesod-test ==1.6.9 + - yesod-test ==1.6.9.1 - yesod-websockets ==0.3.0.2 - yes-precure5-command ==5.5.3 - yi-rope ==0.11 @@ -2363,7 +2525,7 @@ default-package-overrides: - zeromq4-haskell ==0.8.0 - zeromq4-patterns ==0.3.1.0 - zim-parser ==0.2.1.0 - - zip ==1.3.2 + - zip ==1.5.0 - zip-archive ==0.4.1 - zippers ==0.3 - zip-stream ==0.2.0.1 From 2b797bcd0831de17431278314240b0a60f14a838 Mon Sep 17 00:00:00 2001 From: Poscat Date: Wed, 10 Jun 2020 00:18:40 +0800 Subject: [PATCH 2164/3452] haskellPackages.ginger: unbreak --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 8f316bb654d6..abc7d989570f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5268,7 +5268,6 @@ broken-packages: - gi-wnck - giak - Gifcurry - - ginger - ginsu - gipeda - GiST From 644730bf024b34cf0370067fa8ae887b3ec0fddd Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Fri, 12 Jun 2020 21:11:52 +0200 Subject: [PATCH 2165/3452] haskellPackages.nix-narinfo: unbreak --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index abc7d989570f..4a99b7f9e40e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -7992,7 +7992,6 @@ broken-packages: - nix-deploy - nix-eval - nix-freeze-tree - - nix-narinfo - nix-tools - nixfromnpm - nixpkgs-update From 0d4be9841967c76486859702d1c5ecde616cd0d7 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Fri, 12 Jun 2020 21:12:11 +0200 Subject: [PATCH 2166/3452] haskellPackages.zre: unbreak --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 4a99b7f9e40e..1bc834995c98 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -11114,7 +11114,6 @@ broken-packages: - zoom-cache-pcm - zoom-cache-sndfile - zoom-refs - - zre - zsh-battery - zsyntax - ztail From 30dca72e74e6da2fdf96b8835f6dc66b11e0798d Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Fri, 12 Jun 2020 21:13:14 +0200 Subject: [PATCH 2167/3452] haskellPackages: add me as maintainer for my packages and nix-derivation which I care about. --- .../haskell-modules/configuration-hackage2nix.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1bc834995c98..0f8b77235795 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2674,6 +2674,15 @@ package-maintainers: - hlint - releaser - taskwarrior + sorki: + - cayene-lpp + - data-stm32 + - gcodehs + - nix-derivation + - nix-narinfo + - ttn + - ttn-client + - zre unsupported-platforms: alsa-mixer: [ x86_64-darwin ] From 1cfe7187bb9e90b2b445d34d33e2f205c13c1d5d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Jun 2020 21:31:02 +0200 Subject: [PATCH 2168/3452] hackage2nix: update the set of broken packages to fix evaluation --- .../development/haskell-modules/configuration-hackage2nix.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 0f8b77235795..e2a183cf5b99 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4922,6 +4922,7 @@ broken-packages: - fingertree-tf - finitary - finitary-derive + - finitary-optics - FiniteMap - firefly-example - first-and-last @@ -8546,6 +8547,7 @@ broken-packages: - postgres-embedded - postgres-tmp - postgres-websockets + - postgresql-libpq-notify - postgresql-lo-stream - postgresql-named - postgresql-query @@ -10223,7 +10225,6 @@ broken-packages: - tldr - tls-extra - tlynx - - tmp-postgres - tn - to-haskell - to-string-class From 4ae36e1c3e08128e53c0449430528f4d983b101a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Jun 2020 21:35:30 +0200 Subject: [PATCH 2169/3452] hackage2nix.yaml: un-break maintained packages Ping @sorki to please fix gcodehs and ttn-client. --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e2a183cf5b99..1c9e1c139fcb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5148,7 +5148,6 @@ broken-packages: - gas - gbu - gc-monitoring-wai - - gcodehs - gconf - gdax - gdiff-ig @@ -10336,7 +10335,6 @@ broken-packages: - tsvsql - tsweb - ttask - - ttn-client - tttool - tubes - tuntap From 90656c850ea1e176e8ae2450d284452691e0fdf7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Jun 2020 21:38:42 +0200 Subject: [PATCH 2170/3452] hackage2nix: gitit is still broken, I'm afraid Related to https://github.com/NixOS/nixpkgs/pull/89795. --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1c9e1c139fcb..6f66cdcc8c14 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5307,6 +5307,7 @@ broken-packages: - github-webhooks - githud - gitignore + - gitit - gitlab-api - gitlib - gitlib-cmdline From 6efcae2c493fd3e2b675582dfc878ab8b4933f96 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Jun 2020 21:56:01 +0200 Subject: [PATCH 2171/3452] hackage2nix: gcodehs and ttn-client can't be build because of broken dependencies --- .../haskell-modules/configuration-hackage2nix.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 6f66cdcc8c14..093a363a0800 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2677,11 +2677,11 @@ package-maintainers: sorki: - cayene-lpp - data-stm32 - - gcodehs + # - gcodehs - nix-derivation - nix-narinfo - ttn - - ttn-client + # - ttn-client - zre unsupported-platforms: @@ -5148,6 +5148,7 @@ broken-packages: - gas - gbu - gc-monitoring-wai + - gcodehs - gconf - gdax - gdiff-ig @@ -10336,6 +10337,7 @@ broken-packages: - tsvsql - tsweb - ttask + - ttn-client - tttool - tubes - tuntap From a2a5aa26349667be58dbf73520d2e78c9ea15a55 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 3 Jun 2020 17:17:04 +0200 Subject: [PATCH 2172/3452] 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 50aa1c3e15873812c730fb0345ad0c30c0ede776 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 6 Jun 2020 02:30:29 +0200 Subject: [PATCH 2173/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-1-g7994714 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/4b1f24a49f6de990f7c202d710320b44b1738bf6. --- .../haskell-modules/hackage-packages.nix | 6332 ++++++----------- 1 file changed, 2325 insertions(+), 4007 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 429f6815f281..f312b0e69f0d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -819,16 +819,6 @@ self: { libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base directory filepath process ]; executableToolDepends = [ emacs ]; - postInstall = '' - files=("$data/share/ghc-"*"/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) - for f in "''${files[@]}" ; do - $out/bin/agda $f - done - for f in "''${files[@]}" ; do - $out/bin/agda -c --no-main $f - done - $out/bin/agda-mode compile - ''; description = "A dependently typed functional programming language and proof assistant"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -1528,7 +1518,7 @@ self: { base colour diagrams-cairo diagrams-lib directory either-unwrap filepath parsec ParsecTools StockholmAlignment SVGFonts text vector ]; - description = "Libary for Hidden Markov Models in HMMER3 format."; + description = "Libary for Hidden Markov Models in HMMER3 format"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -2511,7 +2501,7 @@ self: { version = "0.3.1.0"; sha256 = "0dlb761kj33v9p53fw44gg4r7j8kcl4jxvvgi7rz0pv8v7nh6255"; libraryHaskellDepends = [ base ]; - description = "Definition of a CSP core-language."; + description = "Definition of a CSP core-language"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -2912,7 +2902,7 @@ self: { version = "0.3"; sha256 = "10m7l701p3a2w0kxi2b93g2ii6s4s71zyjypqk3mi79siv8yilif"; libraryHaskellDepends = [ base mtl ]; - description = "A monad for complex manipulation of a stream."; + description = "A monad for complex manipulation of a stream"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -3622,7 +3612,7 @@ self: { version = "0.1"; sha256 = "027dv53jrfk46dmiidnnrrdvhyin60i862znp414213w72yjrbhh"; libraryHaskellDepends = [ base template-haskell ]; - description = "Practical typed lazy contracts."; + description = "Practical typed lazy contracts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -5604,7 +5594,7 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers haskell98 ]; - description = "A set of computational morphology tools for Swedish diachronic lexicons."; + description = "A set of computational morphology tools for Swedish diachronic lexicons"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -5639,6 +5629,17 @@ self: { broken = true; }) {}; + "FSM" = callPackage + ({ mkDerivation, base, containers, matrix, vector }: + mkDerivation { + pname = "FSM"; + version = "1.0.0"; + sha256 = "0gsrfzk5g499r7xdhsaag53207bd015jwcrl2f9izmpa6gli5las"; + libraryHaskellDepends = [ base containers matrix vector ]; + description = "Basic concepts of finite state machines"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "FTGL" = callPackage ({ mkDerivation, base, ftgl }: mkDerivation { @@ -6376,7 +6377,7 @@ self: { base beam-core beam-migrate beam-postgres bytestring conduit Frames generics-sop hspec hspec-core QuickCheck text vinyl ]; - description = "A library for accessing Postgres tables as in-memory data structures."; + description = "A library for accessing Postgres tables as in-memory data structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -6698,10 +6699,12 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.10.3"; - sha256 = "09zcb0ijm20nmynqsl585nhn1qaldkp3c8v3y28gn2cj606m8cqr"; + version = "0.10.4"; + sha256 = "12bn7519icm7z5j5bqdhplf5gby5c9la57v48p9izs08ll9q9id3"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - array base bytestring containers directory filepath hpp JuicyPixels + array base bytestring containers directory filepath JuicyPixels linear OpenGL OpenGLRaw transformers vector ]; libraryToolDepends = [ hpp ]; @@ -8814,17 +8817,22 @@ self: { "HPDF" = callPackage ({ mkDerivation, array, base, base64-bytestring, binary, bytestring - , containers, errors, HTF, mtl, random, vector, zlib + , containers, errors, filepath, HTF, hyphenation, mtl, network-uri + , parsec, random, text, vector, zlib }: mkDerivation { pname = "HPDF"; - version = "1.4.10"; - sha256 = "1m072rc03yx5y4djmvj87kn6n23d9378v3ipl8lj3vzfjgfzsayy"; - revision = "1"; - editedCabalFile = "1djn0a9rk3qrbz31bxj115r65p28fi3wzcrkrnjvzibl3450pq30"; + version = "1.5.0"; + sha256 = "0bwj0haxw9a061xzn5zh2qc5d958n0g9izbnn0w08dazfjyl8v46"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ array base base64-bytestring binary bytestring containers errors - mtl random vector zlib + filepath hyphenation mtl network-uri parsec random text vector zlib + ]; + executableHaskellDepends = [ + base filepath network-uri random text vector ]; testHaskellDepends = [ base HTF ]; description = "Generation of PDF documents"; @@ -9136,7 +9144,7 @@ self: { base bytestring DebugTraceHelpers directory filepath HSH HStringTemplateHelpers MissingH mtl regex-pcre unix ]; - description = "Convenience functions that use HSH, instances for HSH."; + description = "Convenience functions that use HSH, instances for HSH"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -11272,8 +11280,8 @@ self: { }: mkDerivation { pname = "IntervalMap"; - version = "0.6.1.1"; - sha256 = "0vdlvxvhf7vjyv0mfn6jaj2i2gclqv8419ck32s2jxfcmki5m5g8"; + version = "0.6.1.2"; + sha256 = "03smzhwk1zf5na544b0azp49j4gvafqsih9ggwf6yng38yhixwld"; libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base Cabal containers deepseq QuickCheck ]; benchmarkHaskellDepends = [ @@ -12585,29 +12593,6 @@ self: { }) {}; "ListLike" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string - , vector - }: - mkDerivation { - pname = "ListLike"; - version = "4.6.3"; - sha256 = "10vn7gslx4zzjq547cwpzdfb4c5w3nsfis6qr03dr9c4fdzj61lx"; - revision = "1"; - editedCabalFile = "1xi5mlk6jm73fdxsjcp41ffr3ygwwykcjf20c122k7hgpkzg1lms"; - libraryHaskellDepends = [ - array base bytestring containers deepseq dlist fmlist text - utf8-string vector - ]; - testHaskellDepends = [ - array base bytestring containers dlist fmlist HUnit QuickCheck - random text utf8-string vector - ]; - description = "Generalized support for list-like structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ListLike_4_7" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string , vector @@ -12626,7 +12611,6 @@ self: { ]; description = "Generalized support for list-like structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ListT" = callPackage @@ -14013,20 +13997,20 @@ self: { }) {}; "NaCl" = callPackage - ({ mkDerivation, base, bytestring, gdp, hedgehog, HUnit, libsodium + ({ mkDerivation, base, bytestring, hedgehog, HUnit, libsodium , memory, safe-exceptions, tasty, tasty-discover, tasty-hedgehog , tasty-hunit }: mkDerivation { pname = "NaCl"; - version = "0.0.2.0"; - sha256 = "0qmca7kgbg25xfdv6dd5793gr1dkwdivqqvd5b6rgq58ypzs8y4v"; + version = "0.0.3.1"; + sha256 = "1ff793w4dc34nmd9s9pxdz6nrpqz9wv6bx5j0kxgmjvwzjx9i5ql"; libraryHaskellDepends = [ - base bytestring gdp libsodium memory safe-exceptions + base bytestring libsodium memory safe-exceptions ]; testHaskellDepends = [ - base bytestring hedgehog HUnit libsodium tasty tasty-hedgehog - tasty-hunit + base bytestring hedgehog HUnit libsodium memory safe-exceptions + tasty tasty-hedgehog tasty-hunit ]; testToolDepends = [ tasty-discover ]; description = "Easy-and-safe-to-use high-level Haskell bindings to NaCl"; @@ -19267,7 +19251,7 @@ self: { version = "0.1.4"; sha256 = "0rpjd93lsqg3dqfjndm9l1nzyrbfs5nnvc61lmbmbhg0bcy0jms8"; libraryHaskellDepends = [ base template-haskell ]; - description = "TH implementation of effects."; + description = "TH implementation of effects"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -19501,8 +19485,8 @@ self: { }: mkDerivation { pname = "TeX-my-math"; - version = "0.201.2.0"; - sha256 = "1dg06lqh2x9smq6hbcn2gyh2qll9z7v4gbd1ipvf2isdwxc201vk"; + version = "0.202.0.0"; + sha256 = "0aiw7ag87kcwz47hasr0k79b9dvm0waf3j2qf5p7l2lld438chsb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23806,7 +23790,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson_1_5_1_0" = callPackage + "aeson_1_5_2_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat , base-compat-batteries, base-orphans, base16-bytestring , bytestring, containers, deepseq, Diff, directory, dlist, filepath @@ -23818,8 +23802,8 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.5.1.0"; - sha256 = "0xz27czzvd1ywzv4wkc7gj8pg8jynbkqrybgdg6j0ms5sappc6d0"; + version = "1.5.2.0"; + sha256 = "0awk3dss79mmcxpy147mijnd9icvlnm77bq248ibbbzx9y99hdfd"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers deepseq dlist ghc-prim hashable primitive scientific tagged @@ -24506,30 +24490,6 @@ self: { }) {}; "aeson-schemas" = callPackage - ({ mkDerivation, aeson, base, bytestring, first-class-families - , megaparsec, raw-strings-qq, tasty, tasty-golden, template-haskell - , text, th-test-utils, unordered-containers - }: - mkDerivation { - pname = "aeson-schemas"; - version = "1.0.3"; - sha256 = "0fmhqibw6mw9shxh94riqq465njbgjsv539xb6sx7qpkhcck2csi"; - revision = "3"; - editedCabalFile = "01vp89mjl7jl80mdl9hqmiz3vs7fjl5mf1p64d3g352xqak3mr7d"; - libraryHaskellDepends = [ - aeson base bytestring first-class-families megaparsec - template-haskell text unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring first-class-families megaparsec - raw-strings-qq tasty tasty-golden template-haskell text - th-test-utils unordered-containers - ]; - description = "Easily consume JSON data on-demand with type-safety"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-schemas_1_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, first-class-families , megaparsec, QuickCheck, raw-strings-qq, tasty, tasty-golden , tasty-hunit, tasty-quickcheck, template-haskell, text @@ -24550,7 +24510,6 @@ self: { ]; description = "Easily consume JSON data on-demand with type-safety"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-serialize" = callPackage @@ -25685,6 +25644,8 @@ self: { pname = "algebraic-classes"; version = "0.9.4"; sha256 = "06q0vzixc5dz98ia5ii862ryd9nlfinnmly2l5br8rixsbnks82s"; + revision = "1"; + editedCabalFile = "0w3845hl7cppdk3zvhmz0zic7sbcklfircx97wf9dhh40q3qdcmi"; libraryHaskellDepends = [ base syb template-haskell ]; description = "Conversions between algebraic classes and F-algebras"; license = stdenv.lib.licenses.bsd3; @@ -28812,33 +28773,6 @@ self: { }) {}; "amqp" = callPackage - ({ mkDerivation, base, binary, bytestring, clock, connection - , containers, data-binary-ieee754, hspec, hspec-expectations - , monad-control, network, network-uri, split, stm, text, vector - , xml - }: - mkDerivation { - pname = "amqp"; - version = "0.19.1"; - sha256 = "1802gngl74niszw355caf6x41ayfvyg2hpbckgshp7rlhfqdjabj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring clock connection containers - data-binary-ieee754 monad-control network network-uri split stm - text vector - ]; - executableHaskellDepends = [ base containers xml ]; - testHaskellDepends = [ - base binary bytestring clock connection containers - data-binary-ieee754 hspec hspec-expectations network network-uri - split stm text vector - ]; - description = "Client library for AMQP servers (currently only RabbitMQ)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "amqp_0_20_0" = callPackage ({ mkDerivation, base, binary, bytestring, clock, connection , containers, data-binary-ieee754, hspec, hspec-expectations , monad-control, network, network-uri, split, stm, text, vector @@ -28863,7 +28797,6 @@ self: { ]; description = "Client library for AMQP servers (currently only RabbitMQ)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amqp-conduit" = callPackage @@ -29674,32 +29607,6 @@ self: { }) {}; "antiope-core" = callPackage - ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base - , bytestring, exceptions, generic-lens, hedgehog, hspec - , hspec-discover, http-client, http-types, hw-hspec-hedgehog, lens - , mtl, resourcet, scientific, text, transformers, unliftio-core - }: - mkDerivation { - pname = "antiope-core"; - version = "7.4.5"; - sha256 = "1hrjq5vr5r12hfin3qb5q5mh1psldi2x9k4hg0yrx112kffvp45c"; - libraryHaskellDepends = [ - aeson amazonka amazonka-core base bytestring exceptions - generic-lens http-client http-types lens mtl resourcet text - transformers unliftio-core - ]; - testHaskellDepends = [ - aeson aeson-lens amazonka amazonka-core base bytestring exceptions - generic-lens hedgehog hspec http-client http-types - hw-hspec-hedgehog lens mtl resourcet scientific text transformers - unliftio-core - ]; - testToolDepends = [ hspec-discover ]; - description = "Please see the README on Github at "; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-core_7_5_1" = callPackage ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base , bytestring, exceptions, generic-lens, hedgehog, hspec , hspec-discover, http-client, http-types, hw-hspec-hedgehog, lens @@ -29723,34 +29630,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antiope-dynamodb" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb - , antiope-core, base, generic-lens, hspec-discover, lens, text - , unliftio-core, unordered-containers - }: - mkDerivation { - pname = "antiope-dynamodb"; - version = "7.4.5"; - sha256 = "0zv5r76vg31ybfjl56kli25knrv52z7cv25wzgk8sm6vywn1axif"; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-dynamodb antiope-core base - generic-lens lens text unliftio-core unordered-containers - ]; - testHaskellDepends = [ - amazonka amazonka-core amazonka-dynamodb antiope-core base - generic-lens lens text unliftio-core unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Please see the README on Github at "; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "antiope-dynamodb_7_5_1" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, hspec-discover, lens, text , unliftio-core, unordered-containers @@ -29794,30 +29676,6 @@ self: { }) {}; "antiope-messages" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring - , generic-lens, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog - , lens, lens-aeson, monad-loops, network-uri, scientific, text - , unliftio-core - }: - mkDerivation { - pname = "antiope-messages"; - version = "7.4.5"; - sha256 = "07dim004vfaq3646z616pvhsxqqp1w8nl3dxm15hw79cw43ib6q6"; - libraryHaskellDepends = [ - aeson amazonka amazonka-core base bytestring generic-lens lens - lens-aeson monad-loops network-uri text unliftio-core - ]; - testHaskellDepends = [ - aeson amazonka amazonka-core base bytestring generic-lens hedgehog - hspec hw-hspec-hedgehog lens lens-aeson monad-loops network-uri - scientific text unliftio-core - ]; - testToolDepends = [ hspec-discover ]; - description = "Please see the README on Github at "; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-messages_7_5_1" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring , generic-lens, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog , lens, lens-aeson, monad-loops, network-uri, scientific, text @@ -29839,7 +29697,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antiope-optparse-applicative" = callPackage @@ -29864,34 +29721,6 @@ self: { }) {}; "antiope-s3" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 - , antiope-core, antiope-messages, attoparsec, base, bytestring - , conduit, conduit-extra, deepseq, dlist, exceptions, generic-lens - , hedgehog, hspec, hspec-discover, http-types, hw-hspec-hedgehog - , lens, mtl, network-uri, resourcet, text, time, unliftio-core - }: - mkDerivation { - pname = "antiope-s3"; - version = "7.4.5"; - sha256 = "16ras7xk3diaqnqr0dcbwlg4bl51x7kjqwq64l33zxa42bf9wica"; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 antiope-core - antiope-messages attoparsec base bytestring conduit conduit-extra - deepseq dlist exceptions generic-lens http-types lens mtl - network-uri resourcet text time unliftio-core - ]; - testHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec - base bytestring conduit conduit-extra exceptions generic-lens - hedgehog hspec http-types hw-hspec-hedgehog lens mtl network-uri - resourcet text time unliftio-core - ]; - testToolDepends = [ hspec-discover ]; - description = "Please see the README on Github at "; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-s3_7_5_1" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , antiope-core, antiope-messages, attoparsec, base, bytestring , conduit, conduit-extra, deepseq, dlist, exceptions, generic-lens @@ -29917,7 +29746,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antiope-shell" = callPackage @@ -29950,29 +29778,6 @@ self: { }) {}; "antiope-sns" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base - , bytestring, generic-lens, hedgehog, hspec, hspec-discover - , hw-hspec-hedgehog, lens, text, time, unliftio-core - }: - mkDerivation { - pname = "antiope-sns"; - version = "7.4.5"; - sha256 = "0f3g8hr8i0p5hkr8zvwvmcng5i4ryjw34wj319mrggxayy9kcf69"; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-sns base bytestring - generic-lens lens text time unliftio-core - ]; - testHaskellDepends = [ - aeson amazonka amazonka-core amazonka-sns base bytestring - generic-lens hedgehog hspec hw-hspec-hedgehog lens text time - unliftio-core - ]; - testToolDepends = [ hspec-discover ]; - description = "Please see the README on Github at "; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-sns_7_5_1" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base , bytestring, generic-lens, hedgehog, hspec, hspec-discover , hw-hspec-hedgehog, lens, text, time, unliftio-core @@ -29993,36 +29798,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antiope-sqs" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base - , bytestring, conduit, generic-lens, hedgehog, hspec - , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, monad-loops - , mtl, network-uri, split, text, time, unliftio-core - , unordered-containers - }: - mkDerivation { - pname = "antiope-sqs"; - version = "7.4.5"; - sha256 = "1q2sq4is1dzqfwq85r9xybw30mgydb6a3ir3xm4mcffv8vs4h3fw"; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-sqs base bytestring conduit - generic-lens lens lens-aeson monad-loops mtl network-uri split text - unliftio-core unordered-containers - ]; - testHaskellDepends = [ - aeson amazonka amazonka-core amazonka-sqs base bytestring conduit - generic-lens hedgehog hspec hw-hspec-hedgehog lens lens-aeson - monad-loops mtl network-uri text time unliftio-core - ]; - testToolDepends = [ hspec-discover ]; - description = "Please see the README on Github at "; - license = stdenv.lib.licenses.mit; - }) {}; - - "antiope-sqs_7_5_1" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base , bytestring, conduit, generic-lens, hedgehog, hspec , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, monad-loops @@ -30046,7 +29824,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antiope-swf" = callPackage @@ -30289,15 +30066,15 @@ self: { }) {}; "apecs" = callPackage - ({ mkDerivation, array, base, containers, criterion, linear, mtl - , QuickCheck, template-haskell, vector + ({ mkDerivation, array, base, containers, criterion, exceptions + , linear, mtl, QuickCheck, template-haskell, vector }: mkDerivation { pname = "apecs"; - version = "0.9.1"; - sha256 = "1hf4ksv5s5z7842wz2zdmfix3s4xd34j6lcx94qja2h2vvh4c46a"; + version = "0.9.2"; + sha256 = "1ca9wpp60jslj63q77v55qql46f20jknfqsz7cjmqns41ml5g3q8"; libraryHaskellDepends = [ - array base containers mtl template-haskell vector + array base containers exceptions mtl template-haskell vector ]; testHaskellDepends = [ base containers linear QuickCheck vector ]; benchmarkHaskellDepends = [ base criterion linear ]; @@ -31801,16 +31578,17 @@ self: { "arduino-copilot" = callPackage ({ mkDerivation, base, containers, copilot, copilot-c99 , copilot-language, directory, filepath, mtl, optparse-applicative - , unix + , process, temporary }: mkDerivation { pname = "arduino-copilot"; - version = "1.5.1"; - sha256 = "0j7j2npipgd6jrlm9gn76ia3xbpnbiicn125ii673qzfgfzmgwrh"; + version = "1.5.2"; + sha256 = "04qy06aws4qwg5slakj12jkwvfcrg960spj0g1c42lfb582ybrm6"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory - filepath mtl optparse-applicative unix + filepath mtl optparse-applicative temporary ]; + testHaskellDepends = [ base directory process temporary ]; description = "Arduino programming in haskell using the Copilot stream DSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -34652,26 +34430,6 @@ self: { }) {}; "aur" = callPackage - ({ mkDerivation, aeson, base, http-client, http-client-tls, servant - , servant-client, tasty, tasty-hunit, text - }: - mkDerivation { - pname = "aur"; - version = "6.2.0.1"; - sha256 = "00h5v3b4is5jc11x85cjzq25lsqrlhidibsyn847bl0cpn9292d2"; - libraryHaskellDepends = [ - aeson base http-client servant servant-client text - ]; - testHaskellDepends = [ - base http-client http-client-tls tasty tasty-hunit - ]; - description = "Access metadata from the Arch Linux User Repository"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "aur_7_0_3" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, http-types, tasty, tasty-hunit, text }: @@ -34719,8 +34477,8 @@ self: { }: mkDerivation { pname = "aura"; - version = "3.1.1"; - sha256 = "18svkf64riag6jp8l1anc3pmkdykzhi83wwzqvw6v84ha7y3kr12"; + version = "3.1.4"; + sha256 = "0zb83kq207d4gcmlq61972rkjr598zxxk1svs8x25q1i9f92km0z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34891,20 +34649,6 @@ self: { }) {}; "autoexporter" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "autoexporter"; - version = "1.1.16"; - sha256 = "1cr3fdj57p959dgsilnsl5m8ifih6jzxmkpkvgx6hiqxkxkxlzvg"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ base Cabal directory filepath ]; - description = "Automatically re-export modules"; - license = stdenv.lib.licenses.mit; - }) {}; - - "autoexporter_1_1_17" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; @@ -34916,7 +34660,6 @@ self: { executableHaskellDepends = [ base ]; description = "Automatically re-export modules"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "autom" = callPackage @@ -35268,42 +35011,6 @@ self: { }) {}; "avro" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors - , binary, bytestring, containers, data-binary-ieee754, deepseq - , directory, doctest, doctest-discover, extra, fail, gauge - , HasBigDecimal, hashable, hspec, hspec-discover, lens, lens-aeson - , mtl, QuickCheck, random, raw-strings-qq, scientific, semigroups - , tagged, template-haskell, text, tf-random, time, transformers - , unordered-containers, uuid, vector, zlib - }: - mkDerivation { - pname = "avro"; - version = "0.4.7.0"; - sha256 = "14s2d2slnk5d1mjava003a61gn5cczx5m7wg4h48nzh8w70y1a9q"; - libraryHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary bytestring - containers data-binary-ieee754 deepseq fail HasBigDecimal hashable - mtl scientific semigroups tagged template-haskell text tf-random - time unordered-containers uuid vector zlib - ]; - testHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary bytestring - containers directory doctest doctest-discover extra fail - HasBigDecimal hashable hspec lens lens-aeson mtl QuickCheck - raw-strings-qq scientific semigroups tagged template-haskell text - tf-random time transformers unordered-containers uuid vector zlib - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ - aeson base bytestring containers gauge hashable mtl random - raw-strings-qq template-haskell text transformers - unordered-containers vector - ]; - description = "Avro serialization support for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "avro_0_5_2_0" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors , binary, bytestring, containers, data-binary-ieee754, deepseq , directory, doctest, doctest-discover, extra, fail, gauge @@ -35338,7 +35045,6 @@ self: { ]; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "avro-piper" = callPackage @@ -35846,8 +35552,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "2.0.6"; - sha256 = "0czswk0a8ivvq31wc322imxhvhsnzkj6cygny7y3avvnclmrzm0h"; + version = "3.0.0"; + sha256 = "0gvp65w33pak29min2bym0gnhf9c8ciasv1c15xkvrr7cdgsdwhg"; libraryHaskellDepends = [ aeson base bytestring case-insensitive http-client http-types path path-io safe-exceptions-checked template-haskell text @@ -35858,6 +35564,29 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "aws-lambda-haskell-runtime-wai" = callPackage + ({ mkDerivation, aeson, aws-lambda-haskell-runtime, base, binary + , bytestring, case-insensitive, http-types, iproute, network, text + , unordered-containers, vault, wai + }: + mkDerivation { + pname = "aws-lambda-haskell-runtime-wai"; + version = "1.0.0"; + sha256 = "03mqaxx726hm4pz18l37cg818jhq0fpfhfn20jfk497cm90clpzp"; + libraryHaskellDepends = [ + aeson aws-lambda-haskell-runtime base binary bytestring + case-insensitive http-types iproute network text + unordered-containers vault wai + ]; + testHaskellDepends = [ + aeson aws-lambda-haskell-runtime base binary bytestring + case-insensitive http-types iproute network text + unordered-containers vault wai + ]; + description = "Run wai applications on AWS Lambda"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aws-lambda-runtime" = callPackage ({ mkDerivation, aeson, async, base, base-compat, bytestring , containers, deepseq, filepath, http-client, http-media @@ -37179,6 +36908,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-prelude_1_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "base-prelude"; + version = "1.4"; + sha256 = "0nn5v2y9kl7i3n21250m7cvn55lvkmzj22wx6q4kaag5ycwwczrs"; + libraryHaskellDepends = [ base ]; + description = "The most complete prelude formed solely from the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-unicode-symbols" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -37401,29 +37142,6 @@ self: { }) {}; "base64" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, deepseq - , gauge, memory, random-bytestring, tasty, tasty-hunit, text - }: - mkDerivation { - pname = "base64"; - version = "0.4.1"; - sha256 = "06mwamlqdz90k7nh3x4w0j0mjkbhkns11hvj9zd8d1yw6wy3l4hd"; - revision = "1"; - editedCabalFile = "1jvx3wpnfwzxfz5w3bqglqcv539fkk7wivl8ylm126pqh7sjdp5f"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ - base base64-bytestring bytestring random-bytestring tasty - tasty-hunit text - ]; - benchmarkHaskellDepends = [ - base base64-bytestring bytestring deepseq gauge memory - random-bytestring text - ]; - description = "Fast RFC 4648-compliant Base64 encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "base64_0_4_2" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, criterion , deepseq, ghc-byteorder, memory, QuickCheck, quickcheck-instances , random-bytestring, tasty, tasty-hunit, tasty-quickcheck, text @@ -37449,7 +37167,6 @@ self: { ]; description = "A modern RFC 4648-compliant Base64 library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base64-bytes" = callPackage @@ -37564,23 +37281,6 @@ self: { }) {}; "base64-lens" = callPackage - ({ mkDerivation, base, base64, bytestring, Cabal, cabal-doctest - , doctest, lens, text - }: - mkDerivation { - pname = "base64-lens"; - version = "0.2.0"; - sha256 = "0d4lri7wpaxx7hgd7slxj5jl2qkgfairzsga4vajl05g49amyk80"; - revision = "1"; - editedCabalFile = "07x38p4zcv05y94gjn5j3j1ydv06vi17fbjnz4ckcgc3ay0dzbzf"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base base64 bytestring lens text ]; - testHaskellDepends = [ base doctest lens ]; - description = "Optics for the Base64 library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "base64-lens_0_3_0" = callPackage ({ mkDerivation, base, base64, bytestring, Cabal, cabal-doctest , doctest, lens, text }: @@ -37593,7 +37293,6 @@ self: { testHaskellDepends = [ base doctest lens ]; description = "Optics for the Base64 library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base64-string" = callPackage @@ -38043,20 +37742,6 @@ self: { }) {}; "bazel-runfiles" = callPackage - ({ mkDerivation, base, directory, filepath }: - mkDerivation { - pname = "bazel-runfiles"; - version = "0.7.0.1"; - sha256 = "000awjykargiirnmb3nfqp8dk1p87f5aqx2d07nxrrgflxs7y8ad"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base filepath ]; - description = "Locate Bazel runfiles location"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "bazel-runfiles_0_12" = callPackage ({ mkDerivation, base, directory, filepath, transformers }: mkDerivation { pname = "bazel-runfiles"; @@ -38068,7 +37753,6 @@ self: { executableHaskellDepends = [ base filepath ]; description = "Locate Bazel runfiles location"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bbdb" = callPackage @@ -38839,7 +38523,7 @@ self: { ghc-paths haskeline haskell-src-exts language-python monads-tf parseargs process transformers ]; - description = "An implementation of Python 3."; + description = "An implementation of Python 3"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -39704,21 +39388,18 @@ self: { }) {}; "binary-parser" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, mtl + ({ mkDerivation, base, bytestring, mtl, QuickCheck , quickcheck-instances, rerebase, tasty, tasty-hunit , tasty-quickcheck, text, transformers }: mkDerivation { pname = "binary-parser"; - version = "0.5.5"; - sha256 = "1cs3zrhgnng2h84xnnvqcy6yrdm0xay1494dsa612y590s773aqx"; - revision = "3"; - editedCabalFile = "14n41yazmks2qw0v4krxcqw3ac0wdy2z53d0qz0rdjcd94fpghjf"; - libraryHaskellDepends = [ - base base-prelude bytestring mtl text transformers - ]; + version = "0.5.6"; + sha256 = "0s91289qh3xwbjm0zbnjj550asg1l801h5arx35j4msxrbwgcx3g"; + libraryHaskellDepends = [ base bytestring mtl text transformers ]; testHaskellDepends = [ - quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck ]; description = "A highly-efficient but limited parser API specialised for bytestrings"; license = stdenv.lib.licenses.mit; @@ -39888,41 +39569,6 @@ self: { }) {}; "binary-tagged" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors - , binary, binary-instances, bytestring, containers, criterion - , cryptohash-sha1, deepseq, generics-sop, hashable, nats - , quickcheck-instances, scientific, semigroups, SHA, tagged, tasty - , tasty-hunit, tasty-quickcheck, text, time, unordered-containers - , vector - }: - mkDerivation { - pname = "binary-tagged"; - version = "0.2"; - sha256 = "1pgb2p0kdh9vkmgn509c2v3h9dnhl9vyq2gyisfqvn27g2422c0j"; - revision = "1"; - editedCabalFile = "0chv885zl8m7c6281sz8kfr2p7hgcl7xj0yjajjyr9whwfnylfj0"; - libraryHaskellDepends = [ - aeson array base base16-bytestring binary bytestring containers - cryptohash-sha1 generics-sop hashable scientific tagged text time - unordered-containers vector - ]; - testHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary - binary-instances bytestring containers generics-sop hashable - quickcheck-instances scientific tagged tasty tasty-hunit - tasty-quickcheck text time unordered-containers vector - ]; - benchmarkHaskellDepends = [ - aeson array base base16-bytestring binary binary-instances - bytestring containers criterion deepseq generics-sop hashable nats - scientific semigroups SHA tagged text time unordered-containers - vector - ]; - description = "Tagged binary serialisation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "binary-tagged_0_3" = callPackage ({ mkDerivation, array, base, base16-bytestring, binary , binary-instances, bytestring, containers, criterion, deepseq , QuickCheck, quickcheck-instances, singleton-bool, structured @@ -39948,7 +39594,6 @@ self: { ]; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-tree" = callPackage @@ -40786,7 +40431,7 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ sipc ]; executableHaskellDepends = [ base ]; - description = "Low level bindings to SIPC."; + description = "Low level bindings to SIPC"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -41215,6 +40860,27 @@ self: { broken = true; }) {}; + "bip32" = callPackage + ({ mkDerivation, base, base16-bytestring, base58-bytestring, binary + , bitcoin-hash, bytestring, hedgehog, secp256k1-haskell, tasty + , tasty-hedgehog, tasty-hunit + }: + mkDerivation { + pname = "bip32"; + version = "0.1.2"; + sha256 = "10nzbiildpa8k0xp9dh7sc0pr8ipwbidc2y826pmhafpy07qvqdi"; + libraryHaskellDepends = [ + base base58-bytestring binary bitcoin-hash bytestring + secp256k1-haskell + ]; + testHaskellDepends = [ + base base16-bytestring base58-bytestring binary bytestring hedgehog + tasty tasty-hedgehog tasty-hunit + ]; + description = "BIP-0032: Hierarchical Deterministic Wallets for Bitcoin and other cryptocurrencies"; + license = stdenv.lib.licenses.asl20; + }) {}; + "birch-beer" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, colour , containers, deepseq, diagrams, diagrams-cairo, diagrams-graphviz @@ -41510,6 +41176,20 @@ self: { broken = true; }) {}; + "bitcoin-hash" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, memory, tasty + , tasty-hunit, time + }: + mkDerivation { + pname = "bitcoin-hash"; + version = "0.1"; + sha256 = "10xg9n1r505p4jh8mz43v48h1b3dck2mki27lkn9d8bh19jzk20k"; + libraryHaskellDepends = [ base bytestring cryptonite memory ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit time ]; + description = "Bitcoin hash primitives"; + license = stdenv.lib.licenses.asl20; + }) {}; + "bitcoin-hs" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, HTTP, json, mtl, network @@ -42392,6 +42072,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blanks_0_4_1" = callPackage + ({ mkDerivation, adjunctions, base, containers, deepseq + , distributive, megaparsec, mtl, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "blanks"; + version = "0.4.1"; + sha256 = "0qi2phi7vdq9i6cr8yab8qn4i0f2rxni0dcs063yi0glk1hy1ccx"; + libraryHaskellDepends = [ + adjunctions base containers deepseq distributive mtl + ]; + testHaskellDepends = [ + adjunctions base containers deepseq distributive megaparsec mtl + tasty tasty-hunit text + ]; + description = "Fill-in-the-blanks - A library factoring out substitution from ASTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blas" = callPackage ({ mkDerivation, base, ieee, QuickCheck, storable-complex }: mkDerivation { @@ -45804,8 +45504,8 @@ self: { }: mkDerivation { pname = "butcher"; - version = "1.3.3.1"; - sha256 = "0nqn057b5g8p6nj9xpbg52swiwzncirgfmzp3l1z5d8yn641zp1n"; + version = "1.3.3.2"; + sha256 = "06qgqjc8h7dd786wkcwrxpl6bsd66jzywwcnhm52q0cb9678w3qx"; libraryHaskellDepends = [ base bifunctors containers deque extra free microlens microlens-th mtl multistate pretty transformers unsafe void @@ -46019,33 +45719,6 @@ self: { }) {}; "bytebuild" = callPackage - ({ mkDerivation, base, byteslice, bytestring, gauge - , natural-arithmetic, primitive, primitive-offset - , primitive-unlifted, QuickCheck, quickcheck-classes, run-st, tasty - , tasty-hunit, tasty-quickcheck, text, text-short, vector - , wide-word - }: - mkDerivation { - pname = "bytebuild"; - version = "0.3.4.0"; - sha256 = "00kda7qz92vfqldq2ksxx8qf1v4kl0wm2w2fxg6m2nkpqfzlv026"; - libraryHaskellDepends = [ - base byteslice bytestring natural-arithmetic primitive - primitive-offset primitive-unlifted run-st text-short wide-word - ]; - testHaskellDepends = [ - base byteslice bytestring natural-arithmetic primitive - primitive-unlifted QuickCheck quickcheck-classes tasty tasty-hunit - tasty-quickcheck text vector wide-word - ]; - benchmarkHaskellDepends = [ - base byteslice gauge natural-arithmetic primitive text-short - ]; - description = "Serialize to a small byte arrays"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bytebuild_0_3_5_0" = callPackage ({ mkDerivation, base, byteslice, bytestring, gauge , integer-logarithms, natural-arithmetic, primitive , primitive-offset, primitive-unlifted, QuickCheck @@ -46073,7 +45746,6 @@ self: { ]; description = "Serialize to a small byte arrays"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytedump" = callPackage @@ -46179,27 +45851,6 @@ self: { }) {}; "byteslice" = callPackage - ({ mkDerivation, base, bytestring, gauge, primitive, primitive-addr - , primitive-unlifted, quickcheck-classes, run-st, tasty - , tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "byteslice"; - version = "0.2.2.0"; - sha256 = "0ml3igz9rgrbwvpb883f6sz2j73isxf58iskfpisjgsx8lmgdl4c"; - libraryHaskellDepends = [ - base primitive primitive-addr primitive-unlifted run-st - ]; - testHaskellDepends = [ - base bytestring primitive quickcheck-classes tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base gauge primitive ]; - description = "Slicing managed and unmanaged memory"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "byteslice_0_2_3_0" = callPackage ({ mkDerivation, base, bytestring, gauge, primitive, primitive-addr , primitive-unlifted, quickcheck-classes, run-st, tasty , tasty-hunit, tasty-quickcheck, tuples, vector @@ -46219,7 +45870,6 @@ self: { benchmarkHaskellDepends = [ base gauge primitive ]; description = "Slicing managed and unmanaged memory"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytesmith" = callPackage @@ -46829,10 +46479,8 @@ self: { ({ mkDerivation, base, bytestring, bzip2 }: mkDerivation { pname = "bzlib"; - version = "0.5.0.5"; - sha256 = "0zh130vw719a8d11q5qzc3ilzgv8cqyc2a7r1a131cv1fjnd1rwy"; - revision = "1"; - editedCabalFile = "1d4ra5prh2q9h8inpwvrsmkmg1ndisdj47jv06iijpj6xdp5bapl"; + version = "0.5.1.0"; + sha256 = "1n599xwyxghf52kam30k1l2qh8cg91h55c2bgchnqyj103hb7nfy"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ bzip2 ]; description = "Compression and decompression in the bzip2 format"; @@ -47062,8 +46710,6 @@ self: { testHaskellDepends = [ base here hspec logging monad-logger text ]; description = "Convert C API header files to .hsc and .hsc.helper.c files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ca" = callPackage @@ -47446,30 +47092,6 @@ self: { }) {}; "cabal-flatpak" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cabal-plan - , containers, cryptohash-sha256, http-client, http-client-tls - , http-types, optparse-applicative, pathtype, shell-utility, tar - , text, utility-ht, zlib - }: - mkDerivation { - pname = "cabal-flatpak"; - version = "0.1"; - sha256 = "0f42sfqf0n7yizvvn6mvb9fbfrqzyanm10v9lk895jg6cryxy20j"; - revision = "1"; - editedCabalFile = "05q1bpjvkq7g6q5fx1p44h562i9m6vqffy43arc26zpfgssm59z2"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson aeson-pretty base bytestring cabal-plan containers - cryptohash-sha256 http-client http-client-tls http-types - optparse-applicative pathtype shell-utility tar text utility-ht - zlib - ]; - description = "Generate a FlatPak manifest from a Cabal package description"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cabal-flatpak_0_1_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cabal-plan , containers, cryptohash-sha256, http-client, http-client-tls , http-types, optparse-applicative, pathtype, shell-utility, tar @@ -47491,7 +47113,6 @@ self: { ]; description = "Generate a FlatPak manifest from a Cabal package description"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-fmt" = callPackage @@ -47853,35 +47474,6 @@ self: { }) {}; "cabal-plan" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, base-compat - , base16-bytestring, bytestring, containers, directory, filepath - , mtl, optics-core, optparse-applicative, parsec, process - , semialign, singleton-bool, text, these, topograph, transformers - , vector - }: - mkDerivation { - pname = "cabal-plan"; - version = "0.6.2.0"; - sha256 = "0gwbyyj4xih9barg2c589v6z82s0gx98airs6icivg301khg9fzg"; - revision = "1"; - editedCabalFile = "0fi1zrq7fdcckqqs32ygj9ngsx0zlqqrnrlz6zirmhif1idcc55k"; - configureFlags = [ "-fexe" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring containers directory - filepath text - ]; - executableHaskellDepends = [ - ansi-terminal async base base-compat bytestring containers - directory mtl optics-core optparse-applicative parsec process - semialign singleton-bool text these topograph transformers vector - ]; - description = "Library and utility for processing cabal's plan.json file"; - license = stdenv.lib.licenses.gpl2Plus; - }) {}; - - "cabal-plan_0_7_0_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, base-compat , base16-bytestring, bytestring, containers, directory, filepath , mtl, optics-core, optparse-applicative, parsec, process @@ -47908,7 +47500,6 @@ self: { ]; description = "Library and utility for processing cabal's plan.json file"; license = stdenv.lib.licenses.gpl2Plus; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-progdeps" = callPackage @@ -47951,8 +47542,8 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "2.0.4"; - sha256 = "0p2g0cci4ylbpkv3r1pfi6pc2iyxghqi8rjrmxz0jxs4x28hb23v"; + version = "2.0.5.1"; + sha256 = "1rpgl7msqr0v3rd11qyp05hv2crgmr59wk4jryx610f6mp7y5rrb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -48237,8 +47828,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.15.3"; - sha256 = "1l4jhl842g5jmwhmi1gqljkxa8ia80xbk2vmlhg6hlw1nkl9wfrz"; + version = "2.15.5"; + sha256 = "1afqk9svs3zy69w3xa1gvsacn25vpxf2rffw2rvhs3wvsasxpb6c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48271,8 +47862,8 @@ self: { }: mkDerivation { pname = "cabal2spec"; - version = "2.6"; - sha256 = "173qiqpzcvihdv0jd0z15wgxzars0kybcyhxprmypk232c9pa48v"; + version = "2.6.1"; + sha256 = "19azvrg20rsk95nfvwlamlz007ihpkra1wgvqpjkdimwr5q7837h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -48884,8 +48475,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.11.2"; - sha256 = "0ahixakv3nfvgjf3ziqw14a134cvhlzybpxqqqz8zc8pi3sgvwmf"; + version = "0.1.14.6"; + sha256 = "0xz4pc0z9v1x59391jdnc3ragfhip67y784bmgkfifi6gjp9jdl7"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers data-default-class data-flags deepseq deque df1 di-polysemy @@ -48896,7 +48487,7 @@ self: { text-show time typerep-map unagi-chan unordered-containers vector websockets wreq-patchable wuss ]; - description = "A library for writing discord bots"; + description = "A library for writing discord bots in haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -50797,6 +50388,7 @@ self: { testHaskellDepends = [ base base16-bytestring hspec ]; description = "Cayenne Low Power Payload"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ sorki ]; }) {}; "cayley-client" = callPackage @@ -51662,7 +51254,7 @@ self: { array base binary bytestring Codec-Image-DevIL containers data-reify directory GLUT OpenGLRaw process time ]; - description = "Combinators for building and processing 2D images."; + description = "Combinators for building and processing 2D images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -51675,7 +51267,7 @@ self: { version = "0.1"; sha256 = "1gvnp176j8gd0s6wzq10zpiqkn3wma99pwn3f78wgxm9rh588gh2"; libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ]; - description = "OpenGL based viewer for chalkboard rendered images."; + description = "OpenGL based viewer for chalkboard rendered images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -51785,6 +51377,25 @@ self: { }) {}; "character-cases" = callPackage + ({ mkDerivation, base, containers, doctest, Glob, here, megaparsec + , prettyprinter, template-haskell + }: + mkDerivation { + pname = "character-cases"; + version = "0.1.0.4"; + sha256 = "0097d5p1q2l76jb1qm8zsqm7d3qfcr35v2ip0v52i1ri57b03iya"; + libraryHaskellDepends = [ + base containers here megaparsec prettyprinter template-haskell + ]; + testHaskellDepends = [ + base containers doctest Glob here megaparsec prettyprinter + template-haskell + ]; + description = "Exposes subspecies types of Char. And naming cases."; + license = stdenv.lib.licenses.mit; + }) {}; + + "character-cases_0_1_0_6" = callPackage ({ mkDerivation, base, containers, doctest, Glob, megaparsec , prettyprinter, template-haskell }: @@ -51801,6 +51412,7 @@ self: { ]; description = "Exposes subspecies types of Char. And naming cases."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "charade" = callPackage @@ -52231,6 +51843,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "checkers_0_5_6" = callPackage + ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: + mkDerivation { + pname = "checkers"; + version = "0.5.6"; + sha256 = "1b82dz295h37pi6bnkr4r18gkvavrwvsig15955i8hh1rcn2msaz"; + libraryHaskellDepends = [ + array base QuickCheck random semigroupoids + ]; + description = "Check properties on standard classes and data structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "checkmate" = callPackage ({ mkDerivation, base, bytestring, containers, diff-parse , directory, file-embed, filepath, github, hlint, hspec @@ -53740,8 +53366,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "1.2.1"; - sha256 = "0bczw02kgpiczagnv2aq2yjj0g2619gl8dzwpzsvfz5r1p8kp6f3"; + version = "1.2.2"; + sha256 = "0nx7rgwhviqkzkly6ay3dcyphqmqqxg3mzb1v3r08icfg2yasmsf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53762,16 +53388,17 @@ self: { , bytestring, clash-prelude, concurrent-supply, containers , data-binary-ieee754, data-default, deepseq, directory, dlist , errors, exceptions, extra, filepath, ghc, ghc-boot-th - , ghc-typelits-knownnat, hashable, haskell-src-meta, hint - , integer-gmp, interpolate, lens, mtl, ordered-containers, parsers - , prettyprinter, primitive, process, reducers, tasty, tasty-hunit - , template-haskell, temporary, text, text-show, time, transformers - , trifecta, unordered-containers, vector, vector-binary-instances + , ghc-typelits-knownnat, hashable, haskell-src-exts + , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl + , ordered-containers, parsers, prettyprinter, primitive, process + , reducers, tasty, tasty-hunit, template-haskell, temporary + , terminal-size, text, text-show, time, transformers, trifecta + , unordered-containers, vector, vector-binary-instances }: mkDerivation { pname = "clash-lib"; - version = "1.2.1"; - sha256 = "1l6xibxbkfz91wkl55548wv48gba6n4pmbymb1fbhs43nx3hssil"; + version = "1.2.2"; + sha256 = "0igqm964cb1x0kvh5hyvabxcn9mjfcnzzlfxqy996z2lzgz044xn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal attoparsec base binary bytestring clash-prelude @@ -53779,12 +53406,14 @@ self: { deepseq directory dlist errors exceptions extra filepath ghc ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate lens mtl ordered-containers parsers prettyprinter primitive process - reducers template-haskell temporary text text-show time - transformers trifecta unordered-containers vector + reducers template-haskell temporary terminal-size text text-show + time transformers trifecta unordered-containers vector vector-binary-instances ]; testHaskellDepends = [ - base clash-prelude ghc ghc-typelits-knownnat lens tasty tasty-hunit + base clash-prelude concurrent-supply containers data-default + deepseq ghc ghc-typelits-knownnat haskell-src-exts lens tasty + tasty-hunit template-haskell text transformers unordered-containers ]; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; @@ -53812,24 +53441,25 @@ self: { , data-binary-ieee754, data-default-class, deepseq, doctest , ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat , ghc-typelits-natnormalise, half, hashable, hint, integer-gmp - , lens, QuickCheck, quickcheck-classes-base, recursion-schemes - , reflection, singletons, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, text-show, th-abstraction, th-lift - , th-orphans, time, transformers, type-errors, vector + , interpolate, lens, QuickCheck, quickcheck-classes-base + , recursion-schemes, reflection, singletons, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-show + , th-abstraction, th-lift, th-orphans, time, transformers + , type-errors, uniplate, vector }: mkDerivation { pname = "clash-prelude"; - version = "1.2.1"; - sha256 = "18smrj545fvry8wj0hvawwcwc9yf1h1nsyyl337yh7xnxq9bycsy"; + version = "1.2.2"; + sha256 = "0b7s9rbxh6z7liifzr8d0sqs2hdrz75hzg27lgncdl53v8bicpkw"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base bifunctors binary bytestring constraints containers data-binary-ieee754 data-default-class deepseq ghc-prim ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise - half hashable integer-gmp lens QuickCheck recursion-schemes - reflection singletons template-haskell text text-show - th-abstraction th-lift th-orphans time transformers type-errors - vector + half hashable integer-gmp interpolate lens QuickCheck + recursion-schemes reflection singletons template-haskell text + text-show th-abstraction th-lift th-orphans time transformers + type-errors uniplate vector ]; testHaskellDepends = [ base doctest ghc-typelits-knownnat hint quickcheck-classes-base @@ -56638,6 +56268,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "colorful-monoids_0_2_1_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "colorful-monoids"; + version = "0.2.1.3"; + sha256 = "0yan2vxjdcal7zdh12m5yblcl9d1wcgjr09d3g64p09wdh82y6rq"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Styled console text output using ANSI escape sequences"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "colorize-haskell" = callPackage ({ mkDerivation, ansi-terminal, base, haskell-lexer }: mkDerivation { @@ -56789,17 +56432,6 @@ self: { }) {}; "colourista" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, text }: - mkDerivation { - pname = "colourista"; - version = "0.0.0.0"; - sha256 = "15nzcy3q8iivghprzsvy5l6c98ir085v6nhyymwy2ar0fnhx4hdi"; - libraryHaskellDepends = [ ansi-terminal base bytestring text ]; - description = "Convenient interface for printing colourful messages"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "colourista_0_1_0_0" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, text }: mkDerivation { pname = "colourista"; @@ -56808,7 +56440,6 @@ self: { libraryHaskellDepends = [ ansi-terminal base bytestring text ]; description = "Convenient interface for printing colourful messages"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "coltrane" = callPackage @@ -57227,15 +56858,20 @@ self: { }) {}; "commander-cli" = callPackage - ({ mkDerivation, base, mtl, text, unordered-containers }: + ({ mkDerivation, base, bytestring, directory, mtl, process, text + , unordered-containers + }: mkDerivation { pname = "commander-cli"; - version = "0.1.0.0"; - sha256 = "1ix0pjcq7khpc9b7f9j44akgfdlcssqhqmflsgvqyw5m8bg4qkrd"; + version = "0.5.0.0"; + sha256 = "0brs8irdshp1mhrp5xmj608c7n80nlkxz2kp3dc7b69wzs0k40k7"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base mtl text unordered-containers ]; - executableHaskellDepends = [ base mtl text ]; + libraryHaskellDepends = [ + base bytestring mtl text unordered-containers + ]; + executableHaskellDepends = [ base directory mtl process text ]; + testHaskellDepends = [ base text unordered-containers ]; description = "A command line argument/option parser library built around a monadic metaphor"; license = stdenv.lib.licenses.mit; }) {}; @@ -58523,22 +58159,6 @@ self: { }) {}; "concurrency" = callPackage - ({ mkDerivation, array, atomic-primops, base, exceptions - , monad-control, mtl, stm, transformers - }: - mkDerivation { - pname = "concurrency"; - version = "1.8.1.0"; - sha256 = "0nw5i85lzh03ppcprzpvrlp3bmdam1z50bp7ddq9mp2ycyjbvrp5"; - libraryHaskellDepends = [ - array atomic-primops base exceptions monad-control mtl stm - transformers - ]; - description = "Typeclasses, functions, and data types for concurrency and STM"; - license = stdenv.lib.licenses.mit; - }) {}; - - "concurrency_1_11_0_0" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: @@ -58552,7 +58172,6 @@ self: { ]; description = "Typeclasses, functions, and data types for concurrency and STM"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrency-benchmarks" = callPackage @@ -58716,8 +58335,8 @@ self: { }: mkDerivation { pname = "concurrent-output"; - version = "1.10.11"; - sha256 = "1d1aaqg5814k59b0iws3fh06p3g2siaj922gkhs75qgncj0my2p3"; + version = "1.10.12"; + sha256 = "081wpag1d5znr0ynrjvkc14xl816m88vz9hgfm3g3sp6ak7s3y47"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions process stm terminal-size text transformers unix @@ -59541,24 +59160,6 @@ self: { }) {}; "conferer" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , hspec, text - }: - mkDerivation { - pname = "conferer"; - version = "0.2.0.0"; - sha256 = "0r666jc016pcpsflxh9lvkxv6fmhnb7agn96gixy8fq3hbksri1v"; - libraryHaskellDepends = [ - base bytestring containers directory text - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory hspec text - ]; - description = "Configuration management library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "conferer_0_4_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , hspec, text }: @@ -59574,7 +59175,6 @@ self: { ]; description = "Configuration management library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conferer-hedis" = callPackage @@ -59592,18 +59192,6 @@ self: { }) {}; "conferer-hspec" = callPackage - ({ mkDerivation, base, conferer, hspec, hspec-core, text }: - mkDerivation { - pname = "conferer-hspec"; - version = "0.2.0.0"; - sha256 = "1gqll6ag2bgf05z1jsh5z5m8srz5zq6j9c29zbrdbk2smpp5qgz8"; - libraryHaskellDepends = [ base conferer hspec-core text ]; - testHaskellDepends = [ base conferer hspec hspec-core text ]; - description = "conferer's FromConfig instances for hspec Config"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "conferer-hspec_0_4_0_0" = callPackage ({ mkDerivation, base, conferer, hspec, hspec-core, text }: mkDerivation { pname = "conferer-hspec"; @@ -59613,7 +59201,6 @@ self: { testHaskellDepends = [ base conferer hspec hspec-core text ]; description = "conferer's FromConfig instances for hspec Config"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conferer-provider-dhall" = callPackage @@ -59639,26 +59226,6 @@ self: { }) {}; "conferer-provider-json" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer - , directory, hspec, text, unordered-containers, vector - }: - mkDerivation { - pname = "conferer-provider-json"; - version = "0.2.0.0"; - sha256 = "1lb1933r852jm8rf8fn7srhsrggibdissrsnwq7ffbk5l64kcd2v"; - libraryHaskellDepends = [ - aeson base bytestring conferer directory text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson aeson-qq base bytestring conferer directory hspec text - unordered-containers vector - ]; - description = "conferer's provider for reading json files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "conferer-provider-json_0_3_0_0" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer , directory, hspec, text, unordered-containers, vector }: @@ -59676,7 +59243,6 @@ self: { ]; description = "conferer's provider for reading json files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conferer-provider-yaml" = callPackage @@ -59777,21 +59343,6 @@ self: { }) {}; "conferer-warp" = callPackage - ({ mkDerivation, base, conferer, hspec, http-types, text, wai, warp - }: - mkDerivation { - pname = "conferer-warp"; - version = "0.2.0.0"; - sha256 = "1ajymzh3jz0ffkaviacl4qdm7n7i8lswkk158vhrhqabpyqpxy6r"; - libraryHaskellDepends = [ base conferer http-types text wai warp ]; - testHaskellDepends = [ - base conferer hspec http-types text wai warp - ]; - description = "conferer's FromConfig instances for warp settings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "conferer-warp_0_4_0_0" = callPackage ({ mkDerivation, base, conferer, hspec, http-types, text, wai, warp }: mkDerivation { @@ -59804,7 +59355,6 @@ self: { ]; description = "conferer's FromConfig instances for warp settings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "confetti" = callPackage @@ -60394,7 +59944,7 @@ self: { version = "0.1.0.1"; sha256 = "16s8y035f30gyla620diwnsqi8lbmmfyxjpj4dlq24d45k5wfnsd"; libraryHaskellDepends = [ attoparsec base bytestring vector ]; - description = "Parse ByteStrings of a prescribed length."; + description = "Parse ByteStrings of a prescribed length"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -60495,7 +60045,7 @@ self: { base containers criterion deepseq nat-sized-numbers QuickCheck smallcheck transformers vector ]; - description = "Typeclasses and instances for monads with constraints."; + description = "Typeclasses and instances for monads with constraints"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -60587,25 +60137,6 @@ self: { }) {}; "constraints" = callPackage - ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec - , hspec-discover, mtl, semigroups, transformers - , transformers-compat, type-equality - }: - mkDerivation { - pname = "constraints"; - version = "0.11.2"; - sha256 = "10mnhg7p5gk4i3bzldl07qkrihnvmfkgsp32w7p9i7x8cmj5akjq"; - libraryHaskellDepends = [ - base binary deepseq ghc-prim hashable mtl semigroups transformers - transformers-compat type-equality - ]; - testHaskellDepends = [ base hspec ]; - testToolDepends = [ hspec-discover ]; - description = "Constraint manipulation"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "constraints_0_12" = callPackage ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec , hspec-discover, mtl, semigroups, transformers , transformers-compat, type-equality @@ -60622,7 +60153,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Constraint manipulation"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constraints-deriving" = callPackage @@ -63515,28 +63045,6 @@ self: { }) {}; "cron" = callPackage - ({ mkDerivation, attoparsec, base, criterion, data-default-class - , hedgehog, mtl, mtl-compat, old-locale, semigroups, tasty - , tasty-hedgehog, tasty-hunit, text, time, transformers-compat - }: - mkDerivation { - pname = "cron"; - version = "0.6.2"; - sha256 = "14g4vndj5i1gjg6nbd6h04rzajijflwxzkgnjalsjjfd6fmrny5h"; - libraryHaskellDepends = [ - attoparsec base data-default-class mtl mtl-compat old-locale - semigroups text time - ]; - testHaskellDepends = [ - attoparsec base hedgehog semigroups tasty tasty-hedgehog - tasty-hunit text time transformers-compat - ]; - benchmarkHaskellDepends = [ attoparsec base criterion text time ]; - description = "Cron datatypes and Attoparsec parser"; - license = stdenv.lib.licenses.mit; - }) {}; - - "cron_0_7_0" = callPackage ({ mkDerivation, attoparsec, base, criterion, data-default-class , hedgehog, mtl, mtl-compat, old-locale, semigroups, tasty , tasty-hedgehog, tasty-hunit, text, time, transformers-compat @@ -63556,7 +63064,6 @@ self: { benchmarkHaskellDepends = [ attoparsec base criterion text time ]; description = "Cron datatypes and Attoparsec parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cron-compat" = callPackage @@ -63782,7 +63289,7 @@ self: { ansi-terminal base containers optparse-applicative split text ]; testHaskellDepends = [ base HUnit QuickCheck ]; - description = "An Enigma machine simulator with display."; + description = "An Enigma machine simulator with display"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -63985,18 +63492,20 @@ self: { }) {}; "crypto-sodium" = callPackage - ({ mkDerivation, base, bytestring, gdp, HUnit, libsodium, memory - , NaCl, safe-exceptions, tasty, tasty-discover, tasty-hunit + ({ mkDerivation, base, base16-bytestring, bytestring, cereal + , hedgehog, HUnit, libsodium, memory, NaCl, safe-exceptions, tasty + , tasty-discover, tasty-hedgehog, tasty-hunit }: mkDerivation { pname = "crypto-sodium"; - version = "0.0.2.0"; - sha256 = "12sfmxfd5ci3iybl2cv4mil461ga81gv7hywmbrk4d3vjs3lfil8"; + version = "0.0.3.1"; + sha256 = "1hjwxbxszhg9z83i6p141avalwi9rjh4v014vh1dcj69dqb7q00h"; libraryHaskellDepends = [ - base bytestring gdp libsodium memory NaCl safe-exceptions + base bytestring cereal libsodium memory NaCl safe-exceptions ]; testHaskellDepends = [ - base bytestring HUnit libsodium memory tasty tasty-hunit + base base16-bytestring bytestring hedgehog HUnit libsodium memory + safe-exceptions tasty tasty-hedgehog tasty-hunit ]; testToolDepends = [ tasty-discover ]; description = "Easy-and-safe-to-use high-level cryptography based on Sodium"; @@ -64772,7 +64281,7 @@ self: { attoparsec attoparsec-enumerator base bytestring containers directory enumerator safe transformers unix-compat ]; - description = "A flexible, fast, enumerator-based CSV parser library for Haskell."; + description = "A flexible, fast, enumerator-based CSV parser library for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -65053,8 +64562,8 @@ self: { pname = "cuda"; version = "0.10.1.0"; sha256 = "10lyyc652ic3m4r5agszpv2r99y9fnsdwahb5pd4qiga770v45vp"; - revision = "1"; - editedCabalFile = "0y08nr4p6rad1393l0373s4ivq2zvgm8xv0axh5bi6n95j2khkqz"; + revision = "2"; + editedCabalFile = "1nw135pd2ab3mmyq3xmkxynzfb54qr7a8xssq5ivrk83yzvs87im"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -65653,24 +65162,6 @@ self: { }) {}; "cyclotomic" = callPackage - ({ mkDerivation, arithmoi, base, containers, HUnit, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , test-framework-smallcheck - }: - mkDerivation { - pname = "cyclotomic"; - version = "1.0.1"; - sha256 = "0d2jnpgal88j05jk62p3xwfkarigclgw2hy77ph0lii360wijljh"; - libraryHaskellDepends = [ arithmoi base containers ]; - testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-smallcheck - ]; - description = "A subfield of the complex numbers for exact calculation"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "cyclotomic_1_1_1" = callPackage ({ mkDerivation, arithmoi, base, containers, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 , test-framework-smallcheck @@ -65686,7 +65177,6 @@ self: { ]; description = "A subfield of the complex numbers for exact calculation"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cypher" = callPackage @@ -65714,8 +65204,8 @@ self: { ({ mkDerivation, base, template-haskell, transformers }: mkDerivation { pname = "czipwith"; - version = "1.0.1.2"; - sha256 = "17zf2blgjp47dahjcprkpymg9kb1ll6386pkr109gjr78f261gs1"; + version = "1.0.1.3"; + sha256 = "11v61zmjfdvfi6r0vy9fsj7j4g8hpq42pjhkzqjcksvlwm08bi1d"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base transformers ]; description = "CZipWith class and deriving via TH"; @@ -67181,7 +66671,7 @@ self: { version = "0.0.2"; sha256 = "1xn6qnir5dss23y8d71dsy78sdk7hczwprxir8v6la15c43rf9p2"; libraryHaskellDepends = [ base containers data-fix transformers ]; - description = "Common subexpression elimination for the fixploint types."; + description = "Common subexpression elimination for the fixploint types"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -67907,6 +67397,7 @@ self: { ]; description = "ARM SVD and CubeMX XML parser and pretty printer for STM32 family"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ sorki ]; }) {}; "data-store" = callPackage @@ -68990,7 +68481,7 @@ self: { libraryHaskellDepends = [ base containers deepseq parsec transformers wl-pprint ]; - description = "Disciplined Disciple Compiler common utilities."; + description = "Disciplined Disciple Compiler common utilities"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -69641,27 +69132,6 @@ self: { }) {}; "declarative" = callPackage - ({ mkDerivation, base, hasty-hamiltonian, kan-extensions, lens - , mcmc-types, mighty-metropolis, mwc-probability, pipes, primitive - , speedy-slice, transformers - }: - mkDerivation { - pname = "declarative"; - version = "0.5.2"; - sha256 = "014spawd3wgasrlfaz0zcz0qf1cnhr9nxm71lzcxjgi8n1gcza0y"; - libraryHaskellDepends = [ - base hasty-hamiltonian kan-extensions lens mcmc-types - mighty-metropolis mwc-probability pipes primitive speedy-slice - transformers - ]; - testHaskellDepends = [ base mwc-probability ]; - description = "DIY Markov Chains"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "declarative_0_5_3" = callPackage ({ mkDerivation, base, hasty-hamiltonian, kan-extensions, lens , mcmc-types, mighty-metropolis, mwc-probability, pipes, primitive , speedy-slice, transformers @@ -70076,22 +69546,6 @@ self: { }) {}; "dejafu" = callPackage - ({ mkDerivation, base, concurrency, containers, contravariant - , deepseq, exceptions, leancheck, profunctors, random, transformers - }: - mkDerivation { - pname = "dejafu"; - version = "2.1.0.3"; - sha256 = "0b1akgq9pqrgwyj3smna7d4j6wvi7rm98q2d6ag01p06lcflypkg"; - libraryHaskellDepends = [ - base concurrency containers contravariant deepseq exceptions - leancheck profunctors random transformers - ]; - description = "A library for unit-testing concurrent programs"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dejafu_2_3_0_0" = callPackage ({ mkDerivation, base, concurrency, containers, contravariant , deepseq, exceptions, leancheck, profunctors, random, transformers }: @@ -70105,7 +69559,6 @@ self: { ]; description = "A library for unit-testing concurrent programs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deka" = callPackage @@ -70865,19 +70318,19 @@ self: { ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged , template-haskell, th-abstraction, transformers - , transformers-compat + , transformers-compat, void }: mkDerivation { pname = "deriving-compat"; - version = "0.5.8"; - sha256 = "1dznwypw0w935z30zi9pf9k4mr5yfl6jfp43nv9vx3f6zy5gip9r"; + version = "0.5.9"; + sha256 = "1i0sc77h2902b0xc722v87iwdnwayn1y5mpiy700nclmfrrw2jy4"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell th-abstraction transformers transformers-compat ]; testHaskellDepends = [ base base-compat base-orphans hspec QuickCheck tagged - template-haskell transformers transformers-compat + template-haskell transformers transformers-compat void ]; testToolDepends = [ hspec-discover ]; description = "Backports of GHC deriving extensions"; @@ -70909,21 +70362,6 @@ self: { }) {}; "derulo" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "derulo"; - version = "1.0.8"; - sha256 = "1qmmhnvzn3dip5y757wmwjj51ah5i5db82ni85xl2ckk1k765v9c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - description = "Parse and render JSON simply"; - license = stdenv.lib.licenses.mit; - }) {}; - - "derulo_1_0_9" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { pname = "derulo"; @@ -70936,7 +70374,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Parse and render JSON simply"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "describe" = callPackage @@ -71404,36 +70841,36 @@ self: { , base, bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, cryptonite, data-fix, deepseq, Diff, directory , doctest, dotgen, either, exceptions, filepath, foldl, gauge - , generic-random, hashable, haskeline, http-client, http-client-tls - , http-types, lens-family-core, megaparsec, memory, mockery, mtl - , network-uri, optparse-applicative, parser-combinators, parsers - , pretty-simple, prettyprinter, prettyprinter-ansi-terminal - , profunctors, QuickCheck, quickcheck-instances, repline - , scientific, semigroups, serialise, special-values, spoon, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , template-haskell, text, th-lift-instances, transformers - , transformers-compat, turtle, unordered-containers, uri-encode - , vector + , generic-random, half, hashable, haskeline, http-client + , http-client-tls, http-types, lens-family-core, megaparsec, memory + , mockery, mtl, network-uri, optparse-applicative + , parser-combinators, parsers, pretty-simple, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck + , quickcheck-instances, repline, scientific, semigroups, serialise + , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-manipulate + , th-lift-instances, transformers, transformers-compat, turtle + , unordered-containers, uri-encode, vector }: mkDerivation { pname = "dhall"; - version = "1.30.0"; - sha256 = "10aagimwa5ycrq15240ff2g7r0n995waa33vaz0h51nqvncrbgpj"; - revision = "1"; - editedCabalFile = "1pazhb3h1rabb80wxh29k5yfp915zqp1gmhcv4mx7ibzv9zw7miq"; + version = "1.32.0"; + sha256 = "1imj0bh5365pdizvjbw2wqz0g9hakigf1zm4fr6379qdchxpp90p"; + revision = "4"; + editedCabalFile = "17mq04cla4367gb14g8jlzywgg5m3dbz02xxqm6ynyf9k8dnnr2x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal atomic-write base bytestring case-insensitive cborg cborg-json containers contravariant cryptonite data-fix deepseq Diff directory dotgen either exceptions - filepath hashable haskeline http-client http-client-tls http-types - lens-family-core megaparsec memory mtl network-uri + filepath half hashable haskeline http-client http-client-tls + http-types lens-family-core megaparsec memory mtl network-uri optparse-applicative parser-combinators parsers pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors repline - scientific serialise template-haskell text th-lift-instances - transformers transformers-compat unordered-containers uri-encode - vector + scientific serialise template-haskell text text-manipulate + th-lift-instances transformers transformers-compat + unordered-containers uri-encode vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -71441,8 +70878,9 @@ self: { either filepath foldl generic-random lens-family-core megaparsec mockery prettyprinter QuickCheck quickcheck-instances scientific semigroups serialise special-values spoon tasty - tasty-expected-failure tasty-hunit tasty-quickcheck text - transformers turtle unordered-containers vector + tasty-expected-failure tasty-hunit tasty-quickcheck + template-haskell text transformers turtle unordered-containers + vector ]; benchmarkHaskellDepends = [ base bytestring containers directory gauge serialise text @@ -71451,7 +70889,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_32_0" = callPackage + "dhall_1_33_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, cryptonite, data-fix, deepseq, Diff, directory @@ -71469,10 +70907,8 @@ self: { }: mkDerivation { pname = "dhall"; - version = "1.32.0"; - sha256 = "1imj0bh5365pdizvjbw2wqz0g9hakigf1zm4fr6379qdchxpp90p"; - revision = "3"; - editedCabalFile = "0gy7fqkj775f8ig92wd7bacl48pgjb2gkkdic0rqr57wjrn801nr"; + version = "1.33.0"; + sha256 = "0njkn3kkzj14aa3qixcqpj0gdzkidlx6z92pkam84scs4ghs98k1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71511,8 +70947,10 @@ self: { }: mkDerivation { pname = "dhall-bash"; - version = "1.0.28"; - sha256 = "0bvq4x9swnbc37vw08dw2vaj2phm9kyb94jv3vbfmwl1s6yw83zj"; + version = "1.0.30"; + sha256 = "1r2xr8c8kzmrxrb8m6f9dzjn81sqxzx97w0406kwrx9vzfj7ci1q"; + revision = "1"; + editedCabalFile = "0x7lkh86sr08qm53ycmka1vpxn7y60l01dm6hh70rhzn435ilvj1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71526,14 +70964,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_30" = callPackage + "dhall-bash_1_0_31" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.30"; - sha256 = "1r2xr8c8kzmrxrb8m6f9dzjn81sqxzx97w0406kwrx9vzfj7ci1q"; + version = "1.0.31"; + sha256 = "10xp159bzbwnzapixrndg7sb0v5bg7li1nkr48akh6h4icpvnfsp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71610,10 +71048,10 @@ self: { }: mkDerivation { pname = "dhall-json"; - version = "1.6.2"; - sha256 = "044hq25h872rjlcp24fzf0nslxg4a6hmq8ylcljzk003lmq0c2xz"; - revision = "1"; - editedCabalFile = "0zljipb4nq0xmdfhqq7vr9c3966mpkd812g4z6xz7ngzrqn41s40"; + version = "1.6.4"; + sha256 = "0vr6a02frfk5bh0qj0m4qlc5pp08m29gxp8ixqihrqakkna6409z"; + revision = "3"; + editedCabalFile = "09yifah6mfy8k1qi5d2fibw62hjnxfcr7fx3wvyf4n16nq1mhshx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71632,19 +71070,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_6_4" = callPackage + "dhall-json_1_7_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal , base, bytestring, containers, dhall, exceptions, filepath , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , scientific, tasty, tasty-hunit, text, unordered-containers - , vector + , scientific, tasty, tasty-hunit, tasty-silver, text + , unordered-containers, vector }: mkDerivation { pname = "dhall-json"; - version = "1.6.4"; - sha256 = "0vr6a02frfk5bh0qj0m4qlc5pp08m29gxp8ixqihrqakkna6409z"; - revision = "3"; - editedCabalFile = "09yifah6mfy8k1qi5d2fibw62hjnxfcr7fx3wvyf4n16nq1mhshx"; + version = "1.7.0"; + sha256 = "1nk2dibdnzm5wmvlsf82n8hc0zab1chqw339pp9q5n2gavj8kvsi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71657,7 +71093,7 @@ self: { optparse-applicative prettyprinter prettyprinter-ansi-terminal text ]; testHaskellDepends = [ - aeson base bytestring dhall tasty tasty-hunit text + aeson base bytestring dhall tasty tasty-hunit tasty-silver text ]; description = "Convert between Dhall and JSON or YAML"; license = stdenv.lib.licenses.bsd3; @@ -71695,8 +71131,8 @@ self: { pname = "dhall-lsp-server"; version = "1.0.7"; sha256 = "08nyai9y7s8facdjyfxc1z8dp8qd150y5554vxpvfr98xxj5kf41"; - revision = "2"; - editedCabalFile = "19agialwna7mmhljg5w8mmgn9wp59100cpmwa30jy62yfjkpr7x4"; + revision = "3"; + editedCabalFile = "1iyad38szy9c6zpfkx37r7d9gl3zzjmiqvnkwfldp48cyr5x2hj9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71714,14 +71150,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dhall-lsp-server_1_0_8" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , data-default, dhall, dhall-json, directory, doctest, filepath + , haskell-lsp, haskell-lsp-types, hslogger, lens, lens-family-core + , lsp-test, megaparsec, mtl, network-uri, optparse-applicative + , prettyprinter, QuickCheck, rope-utf16-splay, tasty, tasty-hspec + , text, transformers, unordered-containers, uri-encode + }: + mkDerivation { + pname = "dhall-lsp-server"; + version = "1.0.8"; + sha256 = "1ig90w8iwyq5qwx5rd9zrd0mvrfksn6x1qh0hqxqvjdxrxk9lqnk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers data-default dhall + dhall-json directory filepath haskell-lsp hslogger lens + lens-family-core megaparsec mtl network-uri prettyprinter + rope-utf16-splay text transformers unordered-containers uri-encode + ]; + executableHaskellDepends = [ base optparse-applicative ]; + testHaskellDepends = [ + base directory doctest filepath haskell-lsp-types lsp-test + QuickCheck tasty tasty-hspec text + ]; + description = "Language Server Protocol (LSP) server for Dhall"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-nix" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix , lens-family-core, neat-interpolation, optparse-generic, text }: mkDerivation { pname = "dhall-nix"; - version = "1.1.14"; - sha256 = "1sm7n8539y9944jlc6xk6qx0xssjwz0jjv1505swgi5qcrhdwsij"; + version = "1.1.15"; + sha256 = "0ynbl5nrsql9y0nh7kiyvf9h0z61d2d5v1iga8vidaqvdkih383h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71794,8 +71260,10 @@ self: { }: mkDerivation { pname = "dhall-yaml"; - version = "1.0.2"; - sha256 = "1fdid65wpxngbfdyisxij8m60x9i6mlq6ll6blf5jq4362ahhf3r"; + version = "1.1.0"; + sha256 = "06lwzis9jjfis6rv4r9gd0iq1da5ymcd6jl8x3rbcimg87k9r4bj"; + revision = "2"; + editedCabalFile = "1vflfl8j0fjvf5a8mz90d71myii4s2k98186gidxv0dkll8dix9a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71816,7 +71284,7 @@ self: { broken = true; }) {}; - "dhall-yaml_1_1_0" = callPackage + "dhall-yaml_1_2_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall , dhall-json, exceptions, HsYAML, HsYAML-aeson , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal @@ -71824,10 +71292,8 @@ self: { }: mkDerivation { pname = "dhall-yaml"; - version = "1.1.0"; - sha256 = "06lwzis9jjfis6rv4r9gd0iq1da5ymcd6jl8x3rbcimg87k9r4bj"; - revision = "2"; - editedCabalFile = "1vflfl8j0fjvf5a8mz90d71myii4s2k98186gidxv0dkll8dix9a"; + version = "1.2.0"; + sha256 = "0jvz8xjj2f0g8pxaspgvg7rzhfyccz1rgvp4l3c9zjri3wirxpwp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72343,22 +71809,24 @@ self: { "diagrams-pandoc" = callPackage ({ mkDerivation, base, diagrams-builder, diagrams-cairo - , diagrams-lib, directory, filepath, linear, optparse-applicative - , pandoc-types + , diagrams-core, diagrams-lib, diagrams-svg, directory, filepath + , hashable, linear, optparse-applicative, pandoc-types, svg-builder + , text }: mkDerivation { pname = "diagrams-pandoc"; - version = "0.3"; - sha256 = "045592d6xhb7x6kq9r4nvxnayxs25sz3mqph4braym2llhx5khvv"; + version = "0.3.1"; + sha256 = "1c23xwagsxb6r7lfsrrh8s959aqiacazqxic4s8cg5q6l9vdn9xm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base diagrams-builder diagrams-cairo diagrams-lib directory - filepath linear pandoc-types + base diagrams-builder diagrams-cairo diagrams-core diagrams-lib + diagrams-svg directory filepath hashable linear pandoc-types + svg-builder text ]; executableHaskellDepends = [ base diagrams-builder diagrams-cairo diagrams-lib directory - filepath linear optparse-applicative pandoc-types + filepath linear optparse-applicative pandoc-types text ]; description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_"; license = stdenv.lib.licenses.bsd3; @@ -72909,8 +72377,8 @@ self: { }: mkDerivation { pname = "differential"; - version = "0.1.2.0"; - sha256 = "1mw70yrxi72q55h5xvyds7qp5az7j1qc3xix6ahck17dv5w8fpyl"; + version = "0.1.2.1"; + sha256 = "164s372c7pfqnzhvrhxmic0csx3lgwqi06zz5w8zfvkw76md8qh3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75452,8 +74920,8 @@ self: { }: mkDerivation { pname = "dobutokO4"; - version = "0.1.1.0"; - sha256 = "1q6180z8f0sdrpapvvwzl48g2000ga46m22qj6hbxsiry1hpgmm0"; + version = "0.5.0.0"; + sha256 = "1l11ym6y7gx58cbirr5lanzzin0pybc2gswwwbhnhiqfrj2ybsr9"; libraryHaskellDepends = [ base directory dobutokO2 mmsyn3 mmsyn7l process vector vector-doublezip @@ -75655,24 +75123,6 @@ self: { }) {}; "doclayout" = callPackage - ({ mkDerivation, base, criterion, mtl, safe, tasty, tasty-golden - , tasty-hunit, text - }: - mkDerivation { - pname = "doclayout"; - version = "0.2.0.1"; - sha256 = "0f6zfb0f4m71irc8wknkdk6xylgncsahhl7ga7rzpr4pxy3bnqak"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base mtl safe text ]; - testHaskellDepends = [ - base mtl tasty tasty-golden tasty-hunit text - ]; - benchmarkHaskellDepends = [ base criterion mtl text ]; - description = "A prettyprinting library for laying out text documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "doclayout_0_3" = callPackage ({ mkDerivation, base, criterion, mtl, safe, tasty, tasty-golden , tasty-hunit, text }: @@ -75688,7 +75138,6 @@ self: { benchmarkHaskellDepends = [ base criterion mtl text ]; description = "A prettyprinting library for laying out text documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "docopt" = callPackage @@ -75746,7 +75195,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "doctemplates" = callPackage + "doctemplates_0_8" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific , tasty, tasty-golden, tasty-hunit, temporary, text @@ -75770,9 +75219,10 @@ self: { ]; description = "Pandoc-style document templates"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "doctemplates_0_8_2" = callPackage + "doctemplates" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific , tasty, tasty-golden, tasty-hunit, temporary, text @@ -75796,7 +75246,6 @@ self: { ]; description = "Pandoc-style document templates"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest" = callPackage @@ -76348,6 +75797,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dotgen_0_4_3" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "dotgen"; + version = "0.4.3"; + sha256 = "1jcn5m9342jrdq7jln2v9msf9978ngrx0pq9rrjh8izhvbvph76s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers ]; + description = "A simple interface for building .dot graph files."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dotnet-timespan" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -77504,21 +76967,6 @@ self: { }) {}; "dunai" = callPackage - ({ mkDerivation, base, MonadRandom, simple-affine-space - , transformers, transformers-base - }: - mkDerivation { - pname = "dunai"; - version = "0.6.0"; - sha256 = "00ww23294xq8jh9mlg3rd0yz33vl09vdd176hja3l0yskd8cpbxn"; - libraryHaskellDepends = [ - base MonadRandom simple-affine-space transformers transformers-base - ]; - description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dunai_0_7_0" = callPackage ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty , tasty-hunit, transformers, transformers-base }: @@ -77532,7 +76980,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit transformers ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dunai-core" = callPackage @@ -77969,7 +77416,7 @@ self: { version = "0.1.1.0"; sha256 = "1agk7q556yf6v776568apvc4dgvxiqfshina12f69ky8afvjr6qz"; libraryHaskellDepends = [ base containers template-haskell unix ]; - description = "Automatically derive dynamic linking methods from a data type."; + description = "Automatically derive dynamic linking methods from a data type"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -77996,7 +77443,7 @@ self: { version = "0.1.0.5"; sha256 = "0hsy9mgnl2yf94kqxy69wgmr5hjqxpp55qvij3f53sxxywjrxdi2"; libraryHaskellDepends = [ base primitive vector ]; - description = "A wrapper around MVector that enables pushing, popping and extending."; + description = "A wrapper around MVector that enables pushing, popping and extending"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -79147,43 +78594,6 @@ self: { }) {}; "egison" = callPackage - ({ mkDerivation, array, base, containers, criterion, deepseq - , directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline - , HUnit, megaparsec, mtl, optparse-applicative, parsec - , parser-combinators, prettyprinter, process, random, regex-tdfa - , split, test-framework, test-framework-hunit, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "egison"; - version = "3.10.3"; - sha256 = "01j0jgdaq002g8jb8i2chf571zksmjvd6z17jrf7fvn4981lcgqi"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base containers directory ghc ghc-paths hashable haskeline - megaparsec mtl optparse-applicative parsec parser-combinators - prettyprinter process random regex-tdfa split text transformers - unordered-containers vector - ]; - executableHaskellDepends = [ - array base containers directory filepath ghc ghc-paths haskeline - mtl optparse-applicative parsec prettyprinter process split text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - base filepath Glob HUnit mtl test-framework test-framework-hunit - transformers - ]; - benchmarkHaskellDepends = [ - base criterion deepseq mtl transformers - ]; - description = "Programming language with non-linear pattern-matching against non-free data"; - license = stdenv.lib.licenses.mit; - }) {}; - - "egison_4_0_1" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq , directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline , HUnit, megaparsec, mini-egison, mtl, optparse-applicative, parsec @@ -79193,8 +78603,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "4.0.1"; - sha256 = "10riz5mczra3ahzgyhv6dbkrz3z93cqa9vg9lpcq8s35yf0scizw"; + version = "4.0.3"; + sha256 = "0wav3cbp8yxkx9ajhcfqws9y1xhs36gw01spwi7x7s4l6x7fkqlm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -79218,7 +78628,6 @@ self: { ]; description = "Programming language with non-linear pattern-matching against non-free data"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "egison-pattern-src" = callPackage @@ -79306,8 +78715,8 @@ self: { }: mkDerivation { pname = "egison-tutorial"; - version = "4.0.0"; - sha256 = "0kma4i6qhjwcr9dhlgl63gd8f676agigbv1qii7p6fvq3hj38ddg"; + version = "4.0.1"; + sha256 = "1g5vhf04b7r2g5kx0f5z9cci0nv55qbnjkvm81cg5yjh41bhffwn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -79749,8 +79158,8 @@ self: { }: mkDerivation { pname = "ekg-statsd"; - version = "0.2.4.1"; - sha256 = "1kxrbbxi4ah7ds0pfvbblh4gaij7mn5nn7dylxq7pjsjrgiwl9mj"; + version = "0.2.5.0"; + sha256 = "02sgssxk8q9clz0pw7k7dbgxryvkhq46b9mf0nqkvw8r81j4gy92"; libraryHaskellDepends = [ base bytestring ekg-core network text time unordered-containers ]; @@ -79962,22 +79371,6 @@ self: { }) {}; "elm-bridge" = callPackage - ({ mkDerivation, aeson, base, containers, hspec, QuickCheck - , template-haskell, text - }: - mkDerivation { - pname = "elm-bridge"; - version = "0.5.2"; - sha256 = "1ls4c4lrjbmms1kcaz88nnxn3ih3wbx51adjggbvyvfj52bc5cvp"; - libraryHaskellDepends = [ aeson base template-haskell ]; - testHaskellDepends = [ - aeson base containers hspec QuickCheck text - ]; - description = "Derive Elm types and Json code from Haskell types, using aeson's options"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "elm-bridge_0_6_1" = callPackage ({ mkDerivation, aeson, base, containers, hspec, QuickCheck , template-haskell, text }: @@ -79991,7 +79384,6 @@ self: { ]; description = "Derive Elm types and Json code from Haskell types, using aeson's options"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-build-lib" = callPackage @@ -81480,6 +80872,17 @@ self: { broken = true; }) {}; + "enummaps" = callPackage + ({ mkDerivation, base, containers, deepseq }: + mkDerivation { + pname = "enummaps"; + version = "0.6.2.1.3"; + sha256 = "0ki60a2lg1hdbcrd10ldfja0ayrwlxg2hvbip9llqaj0lkw01r6r"; + libraryHaskellDepends = [ base containers deepseq ]; + description = "Enum wrappers for IntMap and IntSet"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "enummapset" = callPackage ({ mkDerivation, array, base, containers, deepseq, ghc-prim, HUnit , QuickCheck, semigroups, test-framework, test-framework-hunit @@ -83660,15 +83063,15 @@ self: { "exact-real" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, checkers, criterion - , doctest, groups, integer-gmp, memoize, QuickCheck, random, tasty + , doctest, groups, integer-gmp, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, tasty-th }: mkDerivation { pname = "exact-real"; - version = "0.12.3"; - sha256 = "1mn5bqx0r1la573bd5g2q0c6cqd68l2rhzyx1ya7fjvp081q1gbh"; + version = "0.12.4"; + sha256 = "09i0pi141cmqc09mxgsmdk7n3a0rcmjc7w2j4a0ckf0i41vb9yni"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base integer-gmp memoize random ]; + libraryHaskellDepends = [ base integer-gmp random ]; testHaskellDepends = [ base checkers doctest groups QuickCheck random tasty tasty-hunit tasty-quickcheck tasty-th @@ -83992,8 +83395,8 @@ self: { }: mkDerivation { pname = "exhaustive"; - version = "1.1.8"; - sha256 = "1nnylpjrrb6smmgl3d481wpkxpdw26yfa3jlw98p3xgm8k907486"; + version = "1.1.9"; + sha256 = "1mpqw30fwv6h5vwkbd5xzc5dn24l0185jzsrx71rmic9nx043xc6"; libraryHaskellDepends = [ base generics-sop template-haskell transformers ]; @@ -84041,6 +83444,22 @@ self: { broken = true; }) {inherit (pkgs) exif;}; + "exigo-schema" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, persistent + , persistent-template, template-haskell, text, th-lift-instances + }: + mkDerivation { + pname = "exigo-schema"; + version = "0.1.0.0"; + sha256 = "1ivpms6vm022jbc859l2vjibvzl6sa8kindkz165c0fk1ii433ph"; + libraryHaskellDepends = [ + aeson base binary bytestring persistent persistent-template + template-haskell text th-lift-instances + ]; + description = "database schema for exigo marking/assessment tools"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "exinst" = callPackage ({ mkDerivation, base, binary, bytestring, constraints, deepseq , hashable, profunctors, QuickCheck, singletons, tasty, tasty-hunit @@ -84962,24 +84381,6 @@ self: { }) {}; "extra" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, quickcheck-instances, semigroups, time, unix - }: - mkDerivation { - pname = "extra"; - version = "1.6.21"; - sha256 = "1gjx98w4w61g043k6rzc8i34cbxpcigi8lb6i7pp1vwp8w8jm5vl"; - libraryHaskellDepends = [ - base clock directory filepath process semigroups time unix - ]; - testHaskellDepends = [ - base directory filepath QuickCheck quickcheck-instances unix - ]; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extra_1_7_3" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, quickcheck-instances, time, unix }: @@ -84995,7 +84396,6 @@ self: { ]; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extract-dependencies" = callPackage @@ -85441,8 +84841,8 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "0.5.0"; - sha256 = "0xbdbxbj3phrzhg5ifp0s479sjrkm6p3pvvia2i4j1fmq313d9k7"; + version = "0.6.1"; + sha256 = "0qqc0hq7lg1s5fpflmnalcsy0043vqd8iiblwa6lvm45h7af8ii2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath hashable @@ -85463,30 +84863,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fakedata_0_6_1" = callPackage + "fakedata_0_7_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, gauge, hashable, hspec, hspec-discover - , random, template-haskell, text, time, unordered-containers - , vector, yaml + , random, string-random, template-haskell, text, time + , unordered-containers, vector, yaml }: mkDerivation { pname = "fakedata"; - version = "0.6.1"; - sha256 = "0qqc0hq7lg1s5fpflmnalcsy0043vqd8iiblwa6lvm45h7af8ii2"; + version = "0.7.0"; + sha256 = "0vzc2jyhan1igc7ffvch0zzsdnsyn5l857a5kr0zbsmri76sb59c"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath hashable - random template-haskell text time unordered-containers vector yaml + random string-random template-haskell text time + unordered-containers vector yaml ]; testHaskellDepends = [ base bytestring containers directory exceptions filepath hashable - hspec hspec-discover random template-haskell text time - unordered-containers vector yaml + hspec hspec-discover random string-random template-haskell text + time unordered-containers vector yaml ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath - gauge hashable random template-haskell text time + gauge hashable random string-random template-haskell text time unordered-containers vector yaml ]; description = "Library for producing fake data"; @@ -85721,8 +85122,8 @@ self: { }: mkDerivation { pname = "fast-downward"; - version = "0.2.0.0"; - sha256 = "0a2ax0z326mf02p5wyp1d8knxj6afn92n9bqxav2qhkc2v5kijhw"; + version = "0.2.1.0"; + sha256 = "1gz1grd2f10pvmmk3klxhnwqg6mrdmgg23r5mblb4dflzpshffk1"; libraryHaskellDepends = [ base containers mtl process temporary text transformers ]; @@ -86224,32 +85625,6 @@ self: { }) {}; "fb" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit - , conduit-extra, containers, cryptonite, data-default, hspec - , http-client, http-conduit, http-types, HUnit, memory - , monad-logger, QuickCheck, resourcet, text, time, transformers - , transformers-base, unliftio, unliftio-core, unordered-containers - }: - mkDerivation { - pname = "fb"; - version = "2.0.0"; - sha256 = "0z56cibxp5f616vamj4jm76g2n33w22zz8pc9hhs33lm5m0nlncw"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit conduit-extra cryptonite - data-default http-client http-conduit http-types memory - monad-logger resourcet text time transformers transformers-base - unliftio unliftio-core unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring conduit containers data-default hspec - http-conduit HUnit QuickCheck resourcet text time transformers - unliftio - ]; - description = "Bindings to Facebook's API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fb_2_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit , conduit-extra, containers, cryptonite, data-default, hspec , http-client, http-conduit, http-types, HUnit, memory @@ -86273,7 +85648,6 @@ self: { ]; description = "Bindings to Facebook's API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fb-persistent" = callPackage @@ -87568,6 +86942,22 @@ self: { }) {}; "file-embed" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , template-haskell + }: + mkDerivation { + pname = "file-embed"; + version = "0.0.11.2"; + sha256 = "0bgysf6z13cmr5lsrhzrkv33sw9x1lkfnga3la2mcakh1aa3ijm4"; + libraryHaskellDepends = [ + base bytestring directory filepath template-haskell + ]; + testHaskellDepends = [ base filepath ]; + description = "Use Template Haskell to embed file contents directly"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "file-embed_0_0_12_0" = callPackage ({ mkDerivation, base, bytestring, directory, filepath , template-haskell }: @@ -87581,6 +86971,7 @@ self: { testHaskellDepends = [ base filepath ]; description = "Use Template Haskell to embed file contents directly"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "file-embed-lzma" = callPackage @@ -88267,6 +87658,26 @@ self: { broken = true; }) {}; + "finitary-optics" = callPackage + ({ mkDerivation, base, finitary, finite-typelits, hedgehog, hspec + , hspec-hedgehog, optics-core + }: + mkDerivation { + pname = "finitary-optics"; + version = "1.0.0.0"; + sha256 = "0is930yhcd1iqgbxn42ldzbh408inpsprw9psvnx61j6qm6p4cd7"; + libraryHaskellDepends = [ + base finitary finite-typelits optics-core + ]; + testHaskellDepends = [ + base hedgehog hspec hspec-hedgehog optics-core + ]; + description = "Prisms and Isos between finitary types"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "finite-field" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, primes , QuickCheck, singletons, tasty, tasty-hunit, tasty-quickcheck @@ -88396,18 +87807,6 @@ self: { }) {}; "first-class-families" = callPackage - ({ mkDerivation, base, doctest, Glob }: - mkDerivation { - pname = "first-class-families"; - version = "0.7.0.0"; - sha256 = "0dvlmfhnbbrr3yxq4idpipvlxda21qvayx6gk93f66jzcl5726my"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; - description = "First class type families"; - license = stdenv.lib.licenses.mit; - }) {}; - - "first-class-families_0_8_0_0" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "first-class-families"; @@ -88419,7 +87818,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "First class type families"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "first-class-instances" = callPackage @@ -88806,17 +88204,6 @@ self: { }) {}; "fixed-vector-hetero" = callPackage - ({ mkDerivation, base, deepseq, fixed-vector, primitive }: - mkDerivation { - pname = "fixed-vector-hetero"; - version = "0.5.0.0"; - sha256 = "1446xsj030xr7zry2pqq0yxv4f0j46jmpisfmp357jb0n9l5kwm3"; - libraryHaskellDepends = [ base deepseq fixed-vector primitive ]; - description = "Generic heterogeneous vectors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fixed-vector-hetero_0_6_0_0" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest , fixed-vector, primitive }: @@ -88831,7 +88218,6 @@ self: { testHaskellDepends = [ base doctest fixed-vector ]; description = "Library for working with product types generically"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-width" = callPackage @@ -89111,8 +88497,8 @@ self: { }: mkDerivation { pname = "flaccuraterip"; - version = "0.3.8"; - sha256 = "0ixk5vbnpnh3j262k5igvnglm4brypsv3b839xc51hlc29q7v9qs"; + version = "0.3.9"; + sha256 = "18nziy9x83x34nkfz3bzy1nmj7fxzcpxrkzp9gmb1lvgy9igrric"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -89514,6 +88900,17 @@ self: { broken = true; }) {}; + "float128" = callPackage + ({ mkDerivation, base, integer-gmp }: + mkDerivation { + pname = "float128"; + version = "0.1"; + sha256 = "0f4nrj5qy6j6d9ll22zjkbgvw2rx0x2w7nllhl929zdbmhxrjk73"; + libraryHaskellDepends = [ base integer-gmp ]; + description = "FFI bindings for C _Float128"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "floating-bits" = callPackage ({ mkDerivation, base, criterion }: mkDerivation { @@ -89548,8 +88945,8 @@ self: { pname = "flock"; version = "0.3.1.8"; sha256 = "1g1gf7qnlqkl57h28nzxnbzj7v2h73czffp5y7s7jm9vbihcwd4n"; - revision = "5"; - editedCabalFile = "19jqvzacd1639r8c8vs2fdng188mjg8i76x0fghda71d7a2jgp97"; + revision = "6"; + editedCabalFile = "04cz4avwglnjgmsbkaadlfrzaadcfkcqzrbc4x9nbzi695zs8k21"; libraryHaskellDepends = [ base lifted-base monad-control transformers unix ]; @@ -89596,18 +88993,6 @@ self: { }) {}; "flow" = callPackage - ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: - mkDerivation { - pname = "flow"; - version = "1.0.20"; - sha256 = "1pxb87rmw1ryls8k4g82wy1gg6wxw5n4s4nyn248gnam1xgls9li"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - description = "Write more understandable Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "flow_1_0_21" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { pname = "flow"; @@ -89617,7 +89002,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Write more understandable Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flow-er" = callPackage @@ -89635,17 +89019,18 @@ self: { }) {}; "flow2dot" = callPackage - ({ mkDerivation, base, containers, mtl, parsec, QuickCheck - , utf8-string + ({ mkDerivation, base, containers, dotgen, mtl, parsec, QuickCheck }: mkDerivation { pname = "flow2dot"; - version = "0.9.0.3"; - sha256 = "1pf60wpwsvxxgqkz3zh2qlcyz9pyd8axi41y5y6pn77n9x8p2613"; + version = "0.9.2"; + sha256 = "07bnyzcaf5jlhkrsqw6y880z9x5p6y8kh2nfwz4xds9cgk61r18j"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - base containers mtl parsec QuickCheck utf8-string + libraryHaskellDepends = [ base containers dotgen mtl parsec ]; + executableHaskellDepends = [ base containers dotgen mtl parsec ]; + testHaskellDepends = [ + base containers dotgen mtl parsec QuickCheck ]; description = "Library and binary to generate sequence/flow diagrams from plain text source"; license = stdenv.lib.licenses.bsd3; @@ -90338,6 +89723,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "foldl_1_4_7" = callPackage + ({ mkDerivation, base, bytestring, comonad, containers + , contravariant, criterion, doctest, hashable, mwc-random + , primitive, profunctors, semigroupoids, semigroups, text + , transformers, unordered-containers, vector, vector-builder + }: + mkDerivation { + pname = "foldl"; + version = "1.4.7"; + sha256 = "0pvdfzap9bv9v2n72gxy1xd1idyyz87h836bh09m84i8baasblxb"; + libraryHaskellDepends = [ + base bytestring comonad containers contravariant hashable + mwc-random primitive profunctors semigroupoids semigroups text + transformers unordered-containers vector vector-builder + ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Composable, streaming, and efficient left folds"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foldl-exceptions" = callPackage ({ mkDerivation, base, doctest, foldl, safe-exceptions }: mkDerivation { @@ -91684,17 +91091,6 @@ self: { }) {}; "free-categories" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "free-categories"; - version = "0.1.0.0"; - sha256 = "0lzal6vbh1zjcag4dwmhnsv4j66n00gkl0cmf0pssdjwwywxgpwx"; - libraryHaskellDepends = [ base ]; - description = "free categories"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "free-categories_0_2_0_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "free-categories"; @@ -91703,7 +91099,6 @@ self: { libraryHaskellDepends = [ base ]; description = "free categories"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-category" = callPackage @@ -92275,19 +91670,6 @@ self: { }) {}; "freetype2" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "freetype2"; - version = "0.1.2"; - sha256 = "00p3zb5iip9ggkapw4jkmpypnl8s7l6q9mrl66q07schi0lq0zji"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - description = "Haskell binding for FreeType 2 library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "freetype2_0_2_0" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "freetype2"; @@ -92299,7 +91681,6 @@ self: { testHaskellDepends = [ base template-haskell ]; description = "Haskell bindings for FreeType 2 library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "french-cards" = callPackage @@ -92911,8 +92292,8 @@ self: { }: mkDerivation { pname = "ftp-client"; - version = "0.5.1.3"; - sha256 = "1alk8l8i5izdy5rk5qnig4wn0wd08pgnaixqq874mxwxhpak4c3f"; + version = "0.5.1.4"; + sha256 = "0c2xn2q24imrfgsx4zxzi24ciwkrly6n47lc5k5406j5b4znn5lf"; libraryHaskellDepends = [ attoparsec base bytestring connection containers exceptions network transformers @@ -93687,6 +93068,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fused-effects_1_0_2_2" = callPackage + ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn + , inspection-testing, markdown-unlit, tasty, tasty-hedgehog + , tasty-hunit, transformers + }: + mkDerivation { + pname = "fused-effects"; + version = "1.0.2.2"; + sha256 = "1n9nal5kz2gpi58jc7xspj100ibn582f8vgndc9ra84fbp380yy2"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ + base containers hedgehog hedgehog-fn inspection-testing tasty + tasty-hedgehog tasty-hunit transformers + ]; + testToolDepends = [ markdown-unlit ]; + benchmarkHaskellDepends = [ base gauge ]; + description = "A fast, flexible, fused effect system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fused-effects-exceptions" = callPackage ({ mkDerivation, base, fused-effects, markdown-unlit, tasty , tasty-hunit, transformers @@ -94623,27 +94025,30 @@ self: { }) {}; "gcodehs" = callPackage - ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, containers, double-conversion, mtl + ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bytestring + , containers, double-conversion, hspec, hspec-discover , optparse-applicative, pipes, pipes-attoparsec, pipes-bytestring - , pipes-parse, pipes-safe, pipes-text, text, vty + , pipes-parse, pipes-safe, template-haskell, text, transformers }: mkDerivation { pname = "gcodehs"; - version = "0.1.1.0"; - sha256 = "1vlq8r4gf43bxly20l3aimg9p81rf64g35bngmvbkx7l218yvcjn"; + version = "0.1.2.0"; + sha256 = "09200kd2li6rlb7anvda5j2yj3ykr4lbm6a8yd887zz7j2j0hgyd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint array attoparsec base bytestring containers - double-conversion mtl pipes pipes-attoparsec pipes-bytestring text - vty + ansi-wl-pprint attoparsec base bytestring containers + double-conversion pipes pipes-attoparsec pipes-bytestring + pipes-parse pipes-safe template-haskell text transformers ]; executableHaskellDepends = [ - attoparsec base bytestring double-conversion optparse-applicative - pipes pipes-attoparsec pipes-bytestring pipes-parse pipes-safe - pipes-text text + attoparsec base bytestring containers double-conversion + optparse-applicative pipes pipes-safe text transformers ]; + testHaskellDepends = [ + ansi-wl-pprint attoparsec base bytestring hspec hspec-discover text + ]; + testToolDepends = [ hspec-discover ]; description = "GCode processor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -95299,26 +94704,6 @@ self: { }) {}; "generic-data" = callPackage - ({ mkDerivation, base, base-orphans, contravariant, criterion - , deepseq, generic-lens, one-liner, show-combinators, tasty - , tasty-hunit - }: - mkDerivation { - pname = "generic-data"; - version = "0.7.0.0"; - sha256 = "156d8zx425bpghp903260x1fdgnvwkyd7483mdjdg5l54ff9via8"; - libraryHaskellDepends = [ - base base-orphans contravariant show-combinators - ]; - testHaskellDepends = [ - base generic-lens one-liner tasty tasty-hunit - ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; - description = "Deriving instances with GHC.Generics and related utilities"; - license = stdenv.lib.licenses.mit; - }) {}; - - "generic-data_0_8_3_0" = callPackage ({ mkDerivation, base, base-orphans, contravariant, criterion , deepseq, doctest, generic-lens, ghc-boot-th, Glob, one-liner , QuickCheck, show-combinators, tasty, tasty-hunit @@ -95337,7 +94722,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Deriving instances with GHC.Generics and related utilities"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-data-surgery" = callPackage @@ -95424,25 +94808,6 @@ self: { }) {}; "generic-lens" = callPackage - ({ mkDerivation, base, criterion, deepseq, doctest, HUnit - , inspection-testing, lens, profunctors, QuickCheck, tagged, text - }: - mkDerivation { - pname = "generic-lens"; - version = "1.2.0.1"; - sha256 = "0dl7xrrrrbcsz6m69liiz6r8jaa7yi1h8ppgxj94r2zi7pjmwvwf"; - libraryHaskellDepends = [ base profunctors tagged text ]; - testHaskellDepends = [ - base doctest HUnit inspection-testing lens profunctors - ]; - benchmarkHaskellDepends = [ - base criterion deepseq lens QuickCheck - ]; - description = "Generically derive traversals, lenses and prisms"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "generic-lens_2_0_0_0" = callPackage ({ mkDerivation, base, doctest, generic-lens-core, HUnit , inspection-testing, lens, profunctors, text }: @@ -95458,7 +94823,6 @@ self: { ]; description = "Generically derive traversals, lenses and prisms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-lens-core" = callPackage @@ -95539,10 +94903,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "generic-monoid"; - version = "0.1.0.0"; - sha256 = "0jzhmy6vi38p3cnlvi4hw59zga239y67nszzl7zscx263wsk7q0w"; - revision = "2"; - editedCabalFile = "1izxgvh4x0vpbq0k41qihz2cj0cbbvzgf57niqa9zylp7baagy2s"; + version = "0.1.0.1"; + sha256 = "1pradfv1i2z73f3vxx78ahmfsdszcgi44kn29aww2hdgf2np5l6g"; libraryHaskellDepends = [ base ]; description = "Derive monoid instances for product types"; license = stdenv.lib.licenses.bsd3; @@ -96051,20 +95413,6 @@ self: { }) {}; "genvalidity" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random - , validity - }: - mkDerivation { - pname = "genvalidity"; - version = "0.10.0.2"; - sha256 = "1k6pba9zal7385838b9w9ybhk5742jwfy8bqa921zi08mv7vgqlp"; - libraryHaskellDepends = [ base QuickCheck random validity ]; - testHaskellDepends = [ base hspec hspec-core QuickCheck ]; - description = "Testing utilities for the validity library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity_0_11_0_0" = callPackage ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random , validity }: @@ -96076,7 +95424,6 @@ self: { testHaskellDepends = [ base hspec hspec-core QuickCheck ]; description = "Testing utilities for the validity library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-aeson" = callPackage @@ -96102,26 +95449,6 @@ self: { }) {}; "genvalidity-bytestring" = callPackage - ({ mkDerivation, base, bytestring, deepseq, genvalidity - , genvalidity-hspec, hspec, QuickCheck, validity - , validity-bytestring - }: - mkDerivation { - pname = "genvalidity-bytestring"; - version = "0.5.0.1"; - sha256 = "00ps3aq4dz1id3k50kwqbkng7ygs8yb8fmz7yv9s4byrf5gh7kpq"; - libraryHaskellDepends = [ - base bytestring genvalidity QuickCheck validity validity-bytestring - ]; - testHaskellDepends = [ - base bytestring deepseq genvalidity genvalidity-hspec hspec - QuickCheck validity - ]; - description = "GenValidity support for ByteString"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-bytestring_0_6_0_0" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, genvalidity , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck , random, validity, validity-bytestring @@ -96144,7 +95471,6 @@ self: { ]; description = "GenValidity support for ByteString"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-containers" = callPackage @@ -96170,24 +95496,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "genvalidity-criterion" = callPackage - ({ mkDerivation, base, criterion, deepseq, genvalidity, QuickCheck + "genvalidity-containers_0_9_0_0" = callPackage + ({ mkDerivation, base, containers, criterion, genvalidity + , genvalidity-criterion, genvalidity-hspec, genvalidity-property + , hspec, QuickCheck, validity, validity-containers }: mkDerivation { - pname = "genvalidity-criterion"; - version = "0.0.0.0"; - sha256 = "0fd2079vh0pz3qkii9x7vwslix2mkx5h41ci0bblqxdhvsvbfp9r"; + pname = "genvalidity-containers"; + version = "0.9.0.0"; + sha256 = "0g9drk60pf78j7qqh01a1yjqz93rv5irwhgi27qjda6siii5r3bk"; libraryHaskellDepends = [ - base criterion deepseq genvalidity QuickCheck + base containers genvalidity QuickCheck validity validity-containers + ]; + testHaskellDepends = [ + base containers genvalidity genvalidity-hspec genvalidity-property + hspec QuickCheck validity validity-containers ]; benchmarkHaskellDepends = [ - base criterion genvalidity QuickCheck + base containers criterion genvalidity genvalidity-criterion + QuickCheck ]; - description = "Criterion benchmarks for generators"; + description = "GenValidity support for containers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "genvalidity-criterion_0_2_0_0" = callPackage + "genvalidity-criterion" = callPackage ({ mkDerivation, base, criterion, deepseq, genvalidity, QuickCheck }: mkDerivation { @@ -96202,7 +95536,6 @@ self: { ]; description = "Criterion benchmarks for generators"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec" = callPackage @@ -96346,30 +95679,6 @@ self: { }) {}; "genvalidity-mergeful" = callPackage - ({ mkDerivation, base, containers, genvalidity - , genvalidity-containers, genvalidity-hspec - , genvalidity-hspec-aeson, genvalidity-time, genvalidity-uuid - , hspec, mergeful, mtl, pretty-show, QuickCheck, random, time, uuid - }: - mkDerivation { - pname = "genvalidity-mergeful"; - version = "0.1.0.0"; - sha256 = "04vk1jrn69i61l445y3nyw8pklfgbfcja30ghjvcrxxdf9nlmciy"; - libraryHaskellDepends = [ - base containers genvalidity genvalidity-containers genvalidity-time - mergeful QuickCheck - ]; - testHaskellDepends = [ - base containers genvalidity-hspec genvalidity-hspec-aeson - genvalidity-uuid hspec mergeful mtl pretty-show QuickCheck random - time uuid - ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "genvalidity-mergeful_0_2_0_0" = callPackage ({ mkDerivation, base, containers, criterion, genvalidity , genvalidity-containers, genvalidity-criterion, genvalidity-hspec , genvalidity-hspec-aeson, genvalidity-time, genvalidity-uuid @@ -96397,32 +95706,6 @@ self: { }) {}; "genvalidity-mergeless" = callPackage - ({ mkDerivation, base, containers, criterion, genvalidity - , genvalidity-containers, genvalidity-criterion, genvalidity-hspec - , genvalidity-hspec-aeson, genvalidity-time, genvalidity-uuid - , hspec, mergeless, mtl, pretty-show, QuickCheck, random, time - , uuid - }: - mkDerivation { - pname = "genvalidity-mergeless"; - version = "0.1.0.0"; - sha256 = "0bhpbfydh78ia759y9c8hbf6j656g4b6v8j9pjg8chnbx9dzgn1m"; - libraryHaskellDepends = [ - base containers genvalidity genvalidity-containers genvalidity-time - mergeless QuickCheck - ]; - testHaskellDepends = [ - base containers genvalidity-hspec genvalidity-hspec-aeson - genvalidity-uuid hspec mergeless mtl pretty-show QuickCheck random - time uuid - ]; - benchmarkHaskellDepends = [ - base criterion genvalidity-criterion mergeless - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-mergeless_0_2_0_0" = callPackage ({ mkDerivation, base, containers, criterion, genvalidity , genvalidity-containers, genvalidity-criterion, genvalidity-hspec , genvalidity-hspec-aeson, genvalidity-time, genvalidity-uuid @@ -96446,7 +95729,6 @@ self: { base criterion genvalidity-criterion mergeless ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-path" = callPackage @@ -97122,20 +96404,38 @@ self: { "ghc-check" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc - , ghc-paths, process, template-haskell, transformers + , ghc-paths, process, safe-exceptions, template-haskell + , transformers }: mkDerivation { pname = "ghc-check"; - version = "0.4.0.0"; - sha256 = "06d5z2cqfb55qh3y95hjk4l2kxfwck46aiy2bpxmzs6gnp9kqg94"; + version = "0.5.0.1"; + sha256 = "08z7jgp2gdf1ki69w34i87g5bhrcv2laqsjma5ki97l62bgsr808"; libraryHaskellDepends = [ base containers directory filepath ghc ghc-paths process - template-haskell transformers + safe-exceptions template-haskell transformers ]; description = "detect mismatches between compile-time and run-time versions of the ghc api"; license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-clippy-plugin" = callPackage + ({ mkDerivation, base, dhall, ghc, text, text-icu + , text-regex-replace + }: + mkDerivation { + pname = "ghc-clippy-plugin"; + version = "0.0.0.1"; + sha256 = "03d49d02bpic43d83a7zrj25wsnxr3868xhh77x7a8qnd25gy5m6"; + revision = "1"; + editedCabalFile = "17qdn7fj2kib8dx8nwbhsjzg2h8p5az4yv284df6hsrm099lza8g"; + libraryHaskellDepends = [ + base dhall ghc text text-icu text-regex-replace + ]; + description = "Override GHC error messages to the user's liking"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghc-compact_0_1_0_0" = callPackage ({ mkDerivation, base, bytestring, ghc-prim }: mkDerivation { @@ -97385,15 +96685,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-exactprint_0_6_3" = callPackage + "ghc-exactprint_0_6_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, Diff, directory , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl , silently, syb }: mkDerivation { pname = "ghc-exactprint"; - version = "0.6.3"; - sha256 = "0da4gkirill2rpxr9gl4cbcwpp4a16z9bdgyv5nkdps3msh93214"; + version = "0.6.3.1"; + sha256 = "16rfmiyzp4s40vw75wpavfd28a6nanjv4abpjgy5zv13ayymx0rd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97540,25 +96840,6 @@ self: { }) {}; "ghc-lib" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy - , hpc, pretty, process, time, transformers, unix - }: - mkDerivation { - pname = "ghc-lib"; - version = "8.8.3.20200412.1"; - sha256 = "07xfj3p8w5964jv5py19p2pbcpbjcbwzpd4b46d43j80abzavgxg"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory filepath - ghc-lib-parser ghc-prim hpc pretty process time transformers unix - ]; - libraryToolDepends = [ alex happy ]; - description = "The GHC API, decoupled from GHC versions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-lib_8_10_1_20200523" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy , hpc, pretty, process, time, transformers, unix @@ -97575,29 +96856,9 @@ self: { libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-lib-parser" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty - , process, time, transformers, unix - }: - mkDerivation { - pname = "ghc-lib-parser"; - version = "8.8.3.20200412.1"; - sha256 = "1bfyi3haq6qz9x5dbnjvf7m7wqrxqmv3i4kdivlh2v416d56apqd"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory filepath - ghc-prim hpc pretty process time transformers unix - ]; - libraryToolDepends = [ alex happy ]; - description = "The GHC API, decoupled from GHC versions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-lib-parser_8_10_1_20200523" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty , process, time, transformers, unix @@ -97614,36 +96875,16 @@ self: { libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-lib-parser-ex" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, extra - , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit - , uniplate - }: - mkDerivation { - pname = "ghc-lib-parser-ex"; - version = "8.8.5.8"; - sha256 = "1mw1ym5bn39z7lqmxnhhkfqb0kbxddabkafw025wgs54knsghvmk"; - libraryHaskellDepends = [ - base bytestring containers extra ghc ghc-boot ghc-boot-th uniplate - ]; - testHaskellDepends = [ - base directory extra filepath ghc ghc-boot-th tasty tasty-hunit - ]; - description = "Algorithms on GHC parse trees"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-lib-parser-ex_8_10_0_13" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.10.0.13"; - sha256 = "1prcmcmwf3ib35b5m9ff7d0yrk7xarwqzam6nvkmfa1g1lp3xnjz"; + version = "8.10.0.14"; + sha256 = "0p78j7pai6fl6dy7bwdd7w5b2khmc9njr2ankasixpn1a0mcfkf9"; libraryHaskellDepends = [ base bytestring containers ghc-lib-parser uniplate ]; @@ -97652,7 +96893,6 @@ self: { ]; description = "Algorithms on GHC parse trees"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-make" = callPackage @@ -98002,22 +97242,6 @@ self: { }) {}; "ghc-source-gen" = callPackage - ({ mkDerivation, base, ghc, ghc-paths, QuickCheck, tasty - , tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "ghc-source-gen"; - version = "0.3.0.0"; - sha256 = "1r9mnwwbpc1bzjcbs5q58wrjnwjrsbcvmcv1khswchcfim12lqqk"; - libraryHaskellDepends = [ base ghc ]; - testHaskellDepends = [ - base ghc ghc-paths QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "Constructs Haskell syntax trees for the GHC API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-source-gen_0_4_0_0" = callPackage ({ mkDerivation, base, ghc, ghc-paths, QuickCheck, tasty , tasty-hunit, tasty-quickcheck }: @@ -98031,7 +97255,6 @@ self: { ]; description = "Constructs Haskell syntax trees for the GHC API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-srcspan-plugin" = callPackage @@ -98074,23 +97297,6 @@ self: { }) {}; "ghc-syntax-highlighter" = callPackage - ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text - }: - mkDerivation { - pname = "ghc-syntax-highlighter"; - version = "0.0.5.0"; - sha256 = "09h911wqja56b9j9dwjqv7dlim9rm50vra1bkp8zhnlw9fa2s127"; - revision = "3"; - editedCabalFile = "0m41chf24mn78wxp1is38yg6nhkggwjw4r1avzfr2cvmcl0xz0xb"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base ghc-lib-parser text ]; - testHaskellDepends = [ base hspec text ]; - testToolDepends = [ hspec-discover ]; - description = "Syntax highlighter for Haskell using lexer of GHC itself"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-syntax-highlighter_0_0_6_0" = callPackage ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text }: mkDerivation { @@ -98103,7 +97309,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Syntax highlighter for Haskell using lexer of GHC itself"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-tags-core" = callPackage @@ -98218,8 +97423,8 @@ self: { ({ mkDerivation, base, bytestring, criterion, text }: mkDerivation { pname = "ghc-trace-events"; - version = "0.1.0.1"; - sha256 = "1krr97njpcxw161fgkm899h1ckwhgivprqyv85hhbbr4d5cg6yby"; + version = "0.1.2.1"; + sha256 = "0isxvysjk8z9ya8kbjkbp95wf7b4ixk0bjjy831aqyl6kbrnps84"; libraryHaskellDepends = [ base bytestring text ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; @@ -98227,29 +97432,6 @@ self: { }) {}; "ghc-typelits-extra" = callPackage - ({ mkDerivation, base, containers, ghc, ghc-prim - , ghc-tcplugins-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit - , transformers - }: - mkDerivation { - pname = "ghc-typelits-extra"; - version = "0.3.3"; - sha256 = "0gdnp7pp3v5742qs9vkg2bh1sws9bcc11z4119fdapflglqq22mc"; - libraryHaskellDepends = [ - base containers ghc ghc-prim ghc-tcplugins-extra - ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp - transformers - ]; - testHaskellDepends = [ - base ghc-typelits-knownnat ghc-typelits-natnormalise tasty - tasty-hunit - ]; - description = "Additional type-level operations on GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-extra_0_4" = callPackage ({ mkDerivation, base, containers, ghc, ghc-prim , ghc-tcplugins-extra, ghc-typelits-knownnat , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit @@ -98270,7 +97452,6 @@ self: { ]; description = "Additional type-level operations on GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-knownnat" = callPackage @@ -98552,8 +97733,8 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.8.6"; - sha256 = "00zyf8m3jj72ax7sj0c4j0yivrvj72vqfwra7hzgywf8fc2qxfv1"; + version = "0.8.7"; + sha256 = "0yqc1pkfajnr56gnh43sbj50r7c3r41b2jfz07ivgl6phi4frjbq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100065,8 +99246,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.10.0.4"; - sha256 = "0d3wzk10cjwjywf055909ajcxccnhzqqkbq57dn63hqs9ij510gg"; + version = "0.10.0.5"; + sha256 = "187118g5fs97msdab4jmhrwy28hhi81ihyc1v6rfb535bsnm70sw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -100086,8 +99267,6 @@ self: { ]; description = "An implementation of the Jinja2 template language in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gingersnap" = callPackage @@ -100341,7 +99520,7 @@ self: { inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; inherit (pkgs) which;}; - "git-annex_8_20200522" = callPackage + "git-annex_8_20200617" = callPackage ({ mkDerivation, aeson, async, attoparsec, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive , clientsession, concurrent-output, conduit, connection, containers @@ -100364,8 +99543,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20200522"; - sha256 = "1v71k5k9mcj1nq4pb8apx99rgw2rmckr6yshhvjl1dr6j70d67x8"; + version = "8.20200617"; + sha256 = "1vgpqbscvxm03ibxy6cjnp9vd1wpsr3gkajp4z3m9nnkmjz5r4q4"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -100374,9 +99553,9 @@ self: { isLibrary = false; isExecutable = true; setupHaskellDepends = [ - base bytestring Cabal data-default directory exceptions filepath - filepath-bytestring hslogger IfElse process split transformers - unix-compat utf8-string + async base bytestring Cabal data-default directory exceptions + filepath filepath-bytestring hslogger IfElse process split + transformers unix-compat utf8-string ]; executableHaskellDepends = [ aeson async attoparsec aws base blaze-builder bloomfilter byteable @@ -102273,6 +101452,24 @@ self: { broken = true; }) {}; + "glpk-headers" = callPackage + ({ mkDerivation, base, derive-storable, glpk, tasty, tasty-discover + , tasty-hunit + }: + mkDerivation { + pname = "glpk-headers"; + version = "0.4.0"; + sha256 = "1xljpxgcp5lxrxgx718fqqg3xrjc7rfzj5zxi1f1z8cdsg00cvmc"; + libraryHaskellDepends = [ base derive-storable ]; + testHaskellDepends = [ + base derive-storable tasty tasty-discover tasty-hunit + ]; + testSystemDepends = [ glpk ]; + testToolDepends = [ tasty-discover ]; + description = "Low-level Haskell bindings to GLPK"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) glpk;}; + "glpk-hs" = callPackage ({ mkDerivation, array, base, containers, deepseq, gasp, glpk, mtl }: @@ -106773,7 +105970,7 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; - description = "GRASP implementation for the AMMM project."; + description = "GRASP implementation for the AMMM project"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -106989,8 +106186,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "1.0.1.0"; - sha256 = "0gknzbaldmziy7lj23g3l8q3ymxdr5vbis109j6r7zbjap1jy0in"; + version = "1.1.0.2"; + sha256 = "0q8grqi9pslpwnh2a8frcvfw0gq71asm6m9748v97h4xqry116jg"; libraryHaskellDepends = [ aeson base exceptions greskell-core hashable semigroups text transformers unordered-containers vector @@ -107003,28 +106200,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "greskell_1_1_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover - , exceptions, greskell-core, hashable, hint, hspec, semigroups - , text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "greskell"; - version = "1.1.0.1"; - sha256 = "0p9cbkbqmyn79bcg2b83nrl72ga40f17wdzq6s91llxc3s9lvjzk"; - libraryHaskellDepends = [ - aeson base exceptions greskell-core hashable semigroups text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring doctest doctest-discover greskell-core hint - hspec text unordered-containers - ]; - description = "Haskell binding for Gremlin graph query language"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "greskell-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , doctest-discover, hashable, hspec, QuickCheck, scientific @@ -107032,8 +106207,8 @@ self: { }: mkDerivation { pname = "greskell-core"; - version = "0.1.3.3"; - sha256 = "01dknsgns7r25yq62yggv0js356kvd4flkkr9p3ccmmh540vls00"; + version = "0.1.3.4"; + sha256 = "03w4glzlavj57mak1nn7qxafr937z9afwdaaaj5i8spjpr2vz4hr"; libraryHaskellDepends = [ aeson base containers hashable scientific semigroups text unordered-containers uuid vector @@ -107936,8 +107111,8 @@ self: { }: mkDerivation { pname = "gtk-helpers"; - version = "0.0.9.1"; - sha256 = "06clzm1lz0n9z8h8pnggdx710msnwmwcf8kzvp5crdbdi9v7y0di"; + version = "0.1.0"; + sha256 = "1h3ddvs28cnr65la0y21plp4bvf2217i5yi2z4wcixjgr0g5lxjv"; libraryHaskellDepends = [ array base gio glib gtk mtl process template-haskell ]; @@ -108270,6 +107445,21 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; + "gtk3-helpers" = callPackage + ({ mkDerivation, array, base, gio, glib, gtk3, mtl, process + , template-haskell + }: + mkDerivation { + pname = "gtk3-helpers"; + version = "0.1.0"; + sha256 = "174sd1qxim74ixmssihbcka372s22f05xpc50wdi0h1nd8mzpk1r"; + libraryHaskellDepends = [ + array base gio glib gtk3 mtl process template-haskell + ]; + description = "A collection of auxiliary operations and widgets related to Gtk"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gtk3-mac-integration" = callPackage ({ mkDerivation, array, base, Cabal, containers, glib , gtk-mac-integration-gtk3, gtk2hs-buildtools, gtk3, mtl @@ -109799,6 +108989,8 @@ self: { pname = "hackage-security"; version = "0.6.0.1"; sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli"; + revision = "1"; + editedCabalFile = "0cq9apkfhvxgsmvqbi452aqpsdz1mpvhaw7paafh9kc3jhic5270"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -110895,8 +110087,8 @@ self: { }: mkDerivation { pname = "hakyll-agda"; - version = "0.1.11"; - sha256 = "19zgpwmip8fcl9sai6ykhrsp4vkzpjnapkyccbg904qa1xwmlf8k"; + version = "0.1.12"; + sha256 = "0fa2pw3zaqrxr2in3bb63w7wmch7345lmn84z25s80z0if9qv2x3"; libraryHaskellDepends = [ Agda base containers directory filepath hakyll mtl pandoc text transformers xhtml @@ -111060,7 +110252,7 @@ self: { libraryHaskellDepends = [ base containers data-default filepath hakyll ]; - description = "Allow Hakyll to create hierarchical menues from directories."; + description = "Allow Hakyll to create hierarchical menues from directories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -111914,6 +111106,37 @@ self: { broken = true; }) {pfq = null;}; + "hanspell" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, directory, hspec + , html-entities, http-client, http-client-tls, http-types + , QuickCheck, regex-compat-tdfa, split, text, transformers, unix + , utf8-string + }: + mkDerivation { + pname = "hanspell"; + version = "0.2.2.0"; + sha256 = "06351wg5y9840nj1ysraa78bixk25vjn64g6fnj3d0zs2qyxd6ca"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring directory html-entities http-client + http-client-tls http-types regex-compat-tdfa split text + transformers unix utf8-string + ]; + executableHaskellDepends = [ + aeson async base bytestring directory html-entities http-client + http-client-tls http-types regex-compat-tdfa split text + transformers unix utf8-string + ]; + testHaskellDepends = [ + aeson async base bytestring directory hspec html-entities + http-client http-client-tls http-types QuickCheck regex-compat-tdfa + split text transformers unix utf8-string + ]; + description = "Korean spell checker"; + license = stdenv.lib.licenses.mit; + }) {}; + "haphviz" = callPackage ({ mkDerivation, base, checkers, hspec, mtl, QuickCheck , quickcheck-text, text @@ -112466,7 +111689,7 @@ self: { base containers happstack-data happstack-util mtl syb syb-with-class template-haskell ]; - description = "Efficient relational queries on Haskell sets."; + description = "Efficient relational queries on Haskell sets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -114140,10 +113363,8 @@ self: { }: mkDerivation { pname = "haskell-ci"; - version = "0.10.1"; - sha256 = "12163dy550vzd64ylhibh0s8a19mcyk9rsxv8vjshp4hac4qqiy8"; - revision = "1"; - editedCabalFile = "1wi10wwkkzf81nya8p9pybsnbxpixxafdfqwf1x6wz1260ga62jh"; + version = "0.10.2"; + sha256 = "07yqgwacz1qll2nvwdq1w4n35yca1k569i947s310pb22asbd5w2"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -114665,35 +113886,6 @@ self: { }) {}; "haskell-lsp" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hashable - , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl - , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay - , sorted-list, stm, temporary, text, time, unordered-containers - }: - mkDerivation { - pname = "haskell-lsp"; - version = "0.20.0.1"; - sha256 = "1yy9j61hlar4y8p58q8a0i3c6qmv5h9f53kk48jsvfa59c3dz92b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async attoparsec base bytestring containers data-default - directory filepath hashable haskell-lsp-types hslogger lens mtl - network-uri rope-utf16-splay sorted-list stm temporary text time - unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable hspec lens network-uri QuickCheck quickcheck-instances - rope-utf16-splay sorted-list stm text unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = stdenv.lib.licenses.mit; - }) {}; - - "haskell-lsp_0_22_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl @@ -114720,7 +113912,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-lsp-client" = callPackage @@ -114746,23 +113937,6 @@ self: { }) {}; "haskell-lsp-types" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, deepseq - , filepath, hashable, lens, network-uri, scientific, text - , unordered-containers - }: - mkDerivation { - pname = "haskell-lsp-types"; - version = "0.20.0.0"; - sha256 = "09p0d4vibrm06kj8i1yq9zhnkxl87yg5085l1sy9m20z8j988waq"; - libraryHaskellDepends = [ - aeson base bytestring data-default deepseq filepath hashable lens - network-uri scientific text unordered-containers - ]; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = stdenv.lib.licenses.mit; - }) {}; - - "haskell-lsp-types_0_22_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, data-default , deepseq, filepath, hashable, lens, network-uri, scientific, text , unordered-containers @@ -114777,7 +113951,6 @@ self: { ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-menu" = callPackage @@ -115268,26 +114441,6 @@ self: { }) {}; "haskell-src-exts" = callPackage - ({ mkDerivation, array, base, containers, directory, filepath - , ghc-prim, happy, mtl, pretty, pretty-show, smallcheck, tasty - , tasty-golden, tasty-smallcheck - }: - mkDerivation { - pname = "haskell-src-exts"; - version = "1.22.0"; - sha256 = "1wc3w1kkrlagbbbgqflqx4xwqk36wsng7r3wyjflvlas4sf3xmg0"; - libraryHaskellDepends = [ array base ghc-prim pretty ]; - libraryToolDepends = [ happy ]; - testHaskellDepends = [ - base containers directory filepath mtl pretty-show smallcheck tasty - tasty-golden tasty-smallcheck - ]; - doCheck = false; - description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-src-exts_1_23_1" = callPackage ({ mkDerivation, array, base, containers, directory, filepath , ghc-prim, happy, mtl, pretty, pretty-show, smallcheck, tasty , tasty-golden, tasty-smallcheck @@ -115305,7 +114458,6 @@ self: { doCheck = false; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-exts-observe" = callPackage @@ -116284,7 +115436,7 @@ self: { version = "1.0.0"; sha256 = "0j1aqix21pqcsw7skl897pd1ir6hg836g4zb2h5338h4gih6blx0"; libraryHaskellDepends = [ base haskelldb hsql mtl old-time ]; - description = "HaskellDB support for HSQL."; + description = "HaskellDB support for HSQL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -116772,26 +115924,27 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.10.1"; - sha256 = "0gfszpi453736lv7amfmknf9sfpxh071lvxfgaxyi3bshr2kibhz"; + version = "0.13.4"; + sha256 = "0bxn1jfb2s308gpdiwwnvar606qc3fqnvf6k0hdz2x43pqkc15lb"; libraryHaskellDepends = [ + aeson array base base16-bytestring bytestring cereal conduit + containers cryptonite deepseq entropy hashable memory mtl murmur3 + network safe scientific secp256k1-haskell split string-conversions + text time transformers unordered-containers vector + ]; + testHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit containers cryptonite deepseq entropy hashable hspec HUnit memory mtl murmur3 network QuickCheck safe scientific secp256k1-haskell split string-conversions text time transformers unordered-containers vector ]; - testHaskellDepends = [ - aeson base bytestring cereal containers deepseq hspec HUnit mtl - QuickCheck safe split string-conversions text unordered-containers - vector - ]; testToolDepends = [ hspec-discover ]; description = "Bitcoin & Bitcoin Cash library for Haskell"; license = stdenv.lib.licenses.publicDomain; }) {}; - "haskoin-core_0_13_6" = callPackage + "haskoin-core_0_14_1" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring , cereal, conduit, containers, cryptonite, deepseq, entropy , hashable, hspec, hspec-discover, HUnit, memory, mtl, murmur3 @@ -116801,12 +115954,12 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.13.6"; - sha256 = "1xj88wcvsjxhhf7ynxhqsdjc2rc2mcvqwsw6r7ykz6xzap2h9jwz"; + version = "0.14.1"; + sha256 = "0ii32r1c72jvsgrcx0hhqckvbmsq27kzvs9akdlzrhm65jir6fc6"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit - containers cryptonite deepseq entropy hashable memory mtl murmur3 - network QuickCheck safe scientific secp256k1-haskell split + containers cryptonite deepseq entropy hashable hspec memory mtl + murmur3 network QuickCheck safe scientific secp256k1-haskell split string-conversions text time transformers unordered-containers vector ]; @@ -116819,7 +115972,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "Bitcoin & Bitcoin Cash library for Haskell"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -116848,38 +116001,6 @@ self: { }) {}; "haskoin-node" = callPackage - ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra - , containers, data-default, hashable, haskoin-core, hspec - , hspec-discover, HUnit, monad-logger, mtl, network, nqe, random - , resourcet, rocksdb-haskell, rocksdb-query, safe - , string-conversions, text, time, transformers, unliftio - , unordered-containers - }: - mkDerivation { - pname = "haskoin-node"; - version = "0.9.21"; - sha256 = "1yhrxw1j4ynrn7bp1lpnbi13d32pdzg8waf96gx3r6shybb9nx4k"; - libraryHaskellDepends = [ - base bytestring cereal conduit conduit-extra containers - data-default hashable haskoin-core monad-logger mtl network nqe - random resourcet rocksdb-haskell rocksdb-query string-conversions - text time transformers unliftio unordered-containers - ]; - testHaskellDepends = [ - base bytestring cereal conduit conduit-extra containers - data-default hashable haskoin-core hspec HUnit monad-logger mtl - network nqe random resourcet rocksdb-haskell rocksdb-query safe - string-conversions text time transformers unliftio - unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "haskoin-node_0_13_0" = callPackage ({ mkDerivation, base, base64, bytestring, cereal, conduit , conduit-extra, containers, data-default, hashable, haskoin-core , hspec, hspec-discover, HUnit, monad-logger, mtl, network, nqe @@ -116911,6 +116032,38 @@ self: { broken = true; }) {}; + "haskoin-node_0_14_1" = callPackage + ({ mkDerivation, base, base64, bytestring, cereal, conduit + , conduit-extra, containers, data-default, hashable, haskoin-core + , hspec, hspec-discover, HUnit, monad-logger, mtl, network, nqe + , random, resourcet, rocksdb-haskell, rocksdb-query, safe + , string-conversions, text, time, transformers, unliftio + , unordered-containers + }: + mkDerivation { + pname = "haskoin-node"; + version = "0.14.1"; + sha256 = "110yhfxzwsca7c29zmg4dd1wkb2ylpkmcrzrg3fq1a03q6jsc22s"; + libraryHaskellDepends = [ + base bytestring cereal conduit conduit-extra containers + data-default hashable haskoin-core monad-logger mtl network nqe + random resourcet rocksdb-haskell rocksdb-query string-conversions + text time transformers unliftio unordered-containers + ]; + testHaskellDepends = [ + base base64 bytestring cereal conduit conduit-extra containers + data-default hashable haskoin-core hspec HUnit monad-logger mtl + network nqe random resourcet rocksdb-haskell rocksdb-query safe + string-conversions text time transformers unliftio + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "P2P library for Bitcoin and Bitcoin Cash"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "haskoin-protocol" = callPackage ({ mkDerivation, base, binary, bytestring, haskoin-crypto , haskoin-util, HUnit, QuickCheck, test-framework @@ -116958,69 +116111,72 @@ self: { }) {}; "haskoin-store" = callPackage - ({ mkDerivation, aeson, base, base64, bytestring, cereal, conduit - , containers, data-default, deepseq, filepath, hashable - , haskoin-core, haskoin-node, haskoin-store-data, hedis, hspec - , hspec-discover, http-types, monad-logger, mtl, network, nqe - , optparse-applicative, QuickCheck, random, rocksdb-haskell + ({ mkDerivation, aeson, aeson-pretty, base, base64, bytestring + , cereal, conduit, containers, data-default, deepseq, filepath + , hashable, haskoin-core, haskoin-node, haskoin-store-data, hedis + , hspec, hspec-discover, http-types, monad-logger, mtl, network + , nqe, optparse-applicative, QuickCheck, random, rocksdb-haskell , rocksdb-query, scotty, string-conversions, text, time , transformers, unliftio, unordered-containers, wai, warp }: mkDerivation { pname = "haskoin-store"; - version = "0.30.1"; - sha256 = "0g1zx2wwg42rjyymz4hz0cw663k5fprln705ncyn9mkyhxdr4j56"; + version = "0.32.1"; + sha256 = "1b79z6jngz1rwaah41fndp37isrydzgmjv0vc92hqrsl7j4xm0zl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring cereal conduit containers data-default - deepseq hashable haskoin-core haskoin-node haskoin-store-data hedis - http-types monad-logger mtl network nqe random rocksdb-haskell - rocksdb-query scotty string-conversions text time transformers - unliftio unordered-containers wai warp + aeson aeson-pretty base bytestring cereal conduit containers + data-default deepseq hashable haskoin-core haskoin-node + haskoin-store-data hedis http-types monad-logger mtl network nqe + random rocksdb-haskell rocksdb-query scotty string-conversions text + time transformers unliftio unordered-containers wai warp ]; executableHaskellDepends = [ - aeson base bytestring cereal conduit containers data-default - deepseq filepath hashable haskoin-core haskoin-node + aeson aeson-pretty base bytestring cereal conduit containers + data-default deepseq filepath hashable haskoin-core haskoin-node haskoin-store-data monad-logger mtl nqe optparse-applicative random string-conversions text time transformers unliftio unordered-containers ]; testHaskellDepends = [ - aeson base base64 bytestring cereal conduit containers data-default - deepseq hashable haskoin-core haskoin-node haskoin-store-data hedis - hspec http-types monad-logger mtl network nqe QuickCheck random - rocksdb-haskell rocksdb-query scotty string-conversions text time - transformers unliftio unordered-containers wai warp + aeson aeson-pretty base base64 bytestring cereal conduit containers + data-default deepseq hashable haskoin-core haskoin-node + haskoin-store-data hedis hspec http-types monad-logger mtl network + nqe QuickCheck random rocksdb-haskell rocksdb-query scotty + string-conversions text time transformers unliftio + unordered-containers wai warp ]; testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; "haskoin-store-data" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers - , deepseq, hashable, haskoin-core, hspec, hspec-discover, network - , QuickCheck, scotty, string-conversions, text + , data-default, deepseq, hashable, haskoin-core, hspec + , hspec-discover, http-client, http-types, lens, mtl, network + , QuickCheck, scotty, string-conversions, text, wreq }: mkDerivation { pname = "haskoin-store-data"; - version = "0.30.1"; - sha256 = "0an2nddirp1rdqagziahcq2zvbazydzyh06yqly3h1g1bbkwn44g"; + version = "0.32.1"; + sha256 = "0rl97p0627ycwkp32kwbih4gdm2ci8dl5q0mpxf8583b7i6fxjzr"; libraryHaskellDepends = [ - aeson base bytestring cereal containers deepseq hashable - haskoin-core network scotty string-conversions text + aeson base bytestring cereal containers data-default deepseq + hashable haskoin-core http-client http-types lens mtl network + scotty string-conversions text wreq ]; testHaskellDepends = [ - aeson base bytestring cereal containers deepseq hashable - haskoin-core hspec network QuickCheck scotty string-conversions - text + aeson base bytestring cereal containers data-default deepseq + hashable haskoin-core hspec http-client http-types lens mtl network + QuickCheck scotty string-conversions text wreq ]; testToolDepends = [ hspec-discover ]; description = "Data for Haskoin Store"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.mit; }) {}; "haskoin-util" = callPackage @@ -117576,18 +116732,16 @@ self: { "haskus-binary" = callPackage ({ mkDerivation, base, bytestring, cereal, criterion, directory , doctest, filepath, ghc-prim, haskus-utils, haskus-utils-data - , haskus-utils-types, megaparsec, mtl, primitive, QuickCheck, tasty + , haskus-utils-types, megaparsec, mtl, QuickCheck, tasty , tasty-quickcheck, template-haskell, transformers }: mkDerivation { pname = "haskus-binary"; - version = "1.4"; - sha256 = "0riqgfy9ai1vb7555l1w9rfcp10ylg7sbk46ph1f2y00pjbxsmv3"; - revision = "1"; - editedCabalFile = "1b1dxsrl6iq97dbjsw90jpy6s37dik245w4jgaj2pgqsw1w1vz5h"; + version = "1.5"; + sha256 = "1dvsfkbmca4lr586iaj8yad8csxmimaffwwfqijczafzikysh1ah"; libraryHaskellDepends = [ base bytestring cereal directory filepath ghc-prim haskus-utils - haskus-utils-data haskus-utils-types megaparsec mtl primitive + haskus-utils-data haskus-utils-types megaparsec mtl template-haskell transformers ]; testHaskellDepends = [ @@ -117647,16 +116801,16 @@ self: { }) {}; "haskus-utils-compat" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath - , haskus-binary, haskus-utils-data, template-haskell + ({ mkDerivation, base, bytestring, directory, filepath, formatting + , haskus-binary, haskus-utils-data, template-haskell, text }: mkDerivation { pname = "haskus-utils-compat"; - version = "1.0"; - sha256 = "0mgklzs26xhq06gij4cn9iz69z028apmrhafd8cqar3kg75lisyx"; + version = "1.1"; + sha256 = "1348wa4hi2nzyvh3x82hrll2lcq98jpmibm9gi771k67qsfza4bj"; libraryHaskellDepends = [ - base bytestring directory filepath haskus-binary haskus-utils-data - template-haskell + base bytestring directory filepath formatting haskus-binary + haskus-utils-data template-haskell text ]; description = "Compatibility modules with other external packages (ByteString, etc.)"; license = stdenv.lib.licenses.bsd3; @@ -117665,18 +116819,16 @@ self: { }) {}; "haskus-utils-data" = callPackage - ({ mkDerivation, base, containers, doctest, extra, ghc-prim + ({ mkDerivation, base, containers, doctest, ghc-prim , haskus-utils-types, mtl, recursion-schemes, transformers }: mkDerivation { pname = "haskus-utils-data"; - version = "1.2"; - sha256 = "0dn07zj9v5yl0mpcnblk2y17x30wg8fag4hv9mfp3kn003217f89"; - revision = "1"; - editedCabalFile = "0pgaf358jjkpi928rgxs5ly4v8vl7lxrsdrq0gflxfc47ni2mxj8"; + version = "1.3"; + sha256 = "0373bb3aqbrw6prn323vy47qq9mfnvmm1lbd9ql1dxgb9px338qn"; libraryHaskellDepends = [ - base containers extra ghc-prim haskus-utils-types mtl - recursion-schemes transformers + base containers ghc-prim haskus-utils-types mtl recursion-schemes + transformers ]; testHaskellDepends = [ base doctest ]; description = "Haskus data utility modules"; @@ -117889,6 +117041,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_1_4_4" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , criterion, dlist, hashable, hashtables, loch-th, mtl + , placeholders, postgresql-binary, postgresql-libpq, profunctors + , QuickCheck, quickcheck-instances, rebase, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text, text-builder, transformers + , vector + }: + mkDerivation { + pname = "hasql"; + version = "1.4.4"; + sha256 = "09rsbd6f28nzpmibcx1mqsycz7pl7wga30d6728d6k55670mlhlb"; + libraryHaskellDepends = [ + attoparsec base base-prelude bytestring bytestring-strict-builder + contravariant contravariant-extras dlist hashable hashtables + loch-th mtl placeholders postgresql-binary postgresql-libpq + profunctors text text-builder transformers vector + ]; + testHaskellDepends = [ + bug QuickCheck quickcheck-instances rebase rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + description = "An efficient PostgreSQL driver with a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -118076,8 +117257,6 @@ self: { testHaskellDepends = [ base bytestring hasql hspec QuickCheck ]; description = "LISTEN/NOTIFY support for Hasql"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hasql-optparse-applicative" = callPackage @@ -118162,6 +117341,42 @@ self: { broken = true; }) {}; + "hasql-queue" = callPackage + ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring + , cryptohash-sha1, exceptions, hasql, here, hspec, hspec-core + , hspec-expectations-lifted, monad-control, postgresql-libpq + , postgresql-libpq-notify, random, resource-pool, split, stm, text + , time, tmp-postgres, transformers + }: + mkDerivation { + pname = "hasql-queue"; + version = "1.0.1.1"; + sha256 = "0ng1abkhlf8kd8916vpmm0z5m1czvsfnxq4lqsny15qh8bq1pkjl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring exceptions hasql here monad-control + postgresql-libpq postgresql-libpq-notify random stm text time + transformers + ]; + executableHaskellDepends = [ + aeson async base base64-bytestring bytestring cryptohash-sha1 + exceptions hasql here monad-control postgresql-libpq + postgresql-libpq-notify random resource-pool stm text time + tmp-postgres transformers + ]; + testHaskellDepends = [ + aeson async base base64-bytestring bytestring cryptohash-sha1 + exceptions hasql here hspec hspec-core hspec-expectations-lifted + monad-control postgresql-libpq postgresql-libpq-notify random + resource-pool split stm text time tmp-postgres transformers + ]; + description = "A PostgreSQL backed queue"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hasql-simple" = callPackage ({ mkDerivation, aeson, base, bytestring, contravariant, hasql , text, time, unordered-containers, vector @@ -118489,6 +117704,29 @@ self: { broken = true; }) {}; + "hatexmpp3" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , datetime, gtk3, hslogger, monad-loops, mtl, Network-NineP + , pontarius-xmpp, pontarius-xmpp-extras, stm, string-class, text + , time, tls, transformers, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "hatexmpp3"; + version = "0"; + sha256 = "0j5428x0yq07x27lgd48fcyc8zix9a0vv8725ch8gr4v9znhwrwc"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers data-default datetime gtk3 hslogger + monad-loops mtl Network-NineP pontarius-xmpp pontarius-xmpp-extras + stm string-class text time tls transformers vector xml-conduit + xml-types + ]; + description = "XMPP client with 9P and (optionally) GTK interfaces"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hath" = callPackage ({ mkDerivation, base, cmdargs, process, split, tasty, tasty-hunit , tasty-quickcheck @@ -119397,7 +118635,7 @@ self: { executableHaskellDepends = [ base directory HaskellForMaths QuickCheck text ]; - description = "Virtual Rubik's cube of arbitrary size."; + description = "Virtual Rubik's cube of arbitrary size"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -119942,30 +119180,6 @@ self: { }) {}; "headroom" = callPackage - ({ mkDerivation, aeson, base, doctest, either, file-embed, hspec - , lens, mustache, optparse-applicative, pcre-heavy, pcre-light, rio - , template-haskell, text, time, validation, yaml - }: - mkDerivation { - pname = "headroom"; - version = "0.1.3.0"; - sha256 = "0c680vr2kjlx9l9zh6v22jjfgxrwxh9icg1psjxrjfl9zi9kqfb9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base either file-embed lens mustache optparse-applicative - pcre-heavy pcre-light rio template-haskell text time validation - yaml - ]; - executableHaskellDepends = [ base optparse-applicative rio ]; - testHaskellDepends = [ - aeson base doctest hspec optparse-applicative rio - ]; - description = "License Header Manager"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "headroom_0_2_2_1" = callPackage ({ mkDerivation, aeson, base, doctest, either, file-embed, hspec , mustache, optparse-applicative, pcre-light, QuickCheck, rio, time , yaml @@ -119987,7 +119201,6 @@ self: { ]; description = "License Header Manager"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heap" = callPackage @@ -120046,26 +119259,6 @@ self: { }) {}; "heart-core" = callPackage - ({ mkDerivation, aeson, aeson-casing, base, containers, exceptions - , filepath, hashable, lens, list-t, mtl, newtype-generics, text - , unliftio, unliftio-core, unordered-containers - }: - mkDerivation { - pname = "heart-core"; - version = "0.1.1"; - sha256 = "1r4137ws74dqk1bva06xv2gs18m4jkg52243yz5dwp65g6h5pb60"; - libraryHaskellDepends = [ - aeson aeson-casing base containers exceptions filepath hashable - lens list-t mtl newtype-generics text unliftio unliftio-core - unordered-containers - ]; - description = "An opinionated library prelude in the UnliftIO style"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "heart-core_0_3_2" = callPackage ({ mkDerivation, aeson, aeson-casing, base, containers, deepseq , exceptions, filepath, hashable, lens, list-t, mtl , newtype-generics, text, unliftio, unliftio-core @@ -120413,6 +119606,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedgehog-fakedata_0_0_1_2" = callPackage + ({ mkDerivation, base, containers, fakedata, hedgehog, random }: + mkDerivation { + pname = "hedgehog-fakedata"; + version = "0.0.1.2"; + sha256 = "1fzvpicpmm39wiyj3phsdigsq3fh8lax9yjq7a28dhy6qiclp3y0"; + libraryHaskellDepends = [ base fakedata hedgehog random ]; + testHaskellDepends = [ base containers fakedata hedgehog ]; + description = "Use 'fakedata' with 'hedgehog'"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedgehog-fn" = callPackage ({ mkDerivation, base, contravariant, hedgehog, transformers }: mkDerivation { @@ -120682,6 +119888,8 @@ self: { pname = "hedn"; version = "0.3.0.1"; sha256 = "02pwwxdgw3kkqwckap9mf015bbd27mgblfz7k4y63v0gppw6fqm7"; + revision = "1"; + editedCabalFile = "0nbkc1hj0b5q2c3mcz6v2drq8mrh06aryq7gy8cnhhiqzwflk1fh"; libraryHaskellDepends = [ base containers deepseq deriving-compat megaparsec parser-combinators prettyprinter scientific template-haskell text @@ -121254,6 +120462,116 @@ self: { broken = true; }) {}; + "hercules-ci-agent" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring + , bdw-gc, binary, binary-conduit, boost, bytestring, cachix + , cachix-api, conduit, conduit-extra, containers, directory, dlist + , exceptions, filepath, hercules-ci-api-agent, hercules-ci-api-core + , hostname, hspec, http-client, http-client-tls, http-conduit + , inline-c, inline-c-cpp, katip, lens, lens-aeson, lifted-async + , lifted-base, monad-control, mtl, network, network-uri, nix + , optparse-applicative, process, protolude, safe-exceptions + , servant, servant-auth-client, servant-client, servant-client-core + , stm, temporary, text, time, tomland, transformers + , transformers-base, unbounded-delays, unix, unliftio + , unliftio-core, unordered-containers, uuid, vector, websockets + , wuss + }: + mkDerivation { + pname = "hercules-ci-agent"; + version = "0.7.2"; + sha256 = "0yzrn08xl1mgr8614vmwn4j7n2rw7bajabn589sdqp83s0fc7bgi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base binary binary-conduit bytestring cachix conduit + containers dlist exceptions hercules-ci-api-agent inline-c + inline-c-cpp katip lifted-async lifted-base monad-control mtl + network-uri optparse-applicative process protolude safe-exceptions + stm text time transformers-base unbounded-delays unliftio + unliftio-core uuid websockets wuss + ]; + librarySystemDepends = [ boost ]; + libraryPkgconfigDepends = [ bdw-gc nix ]; + executableHaskellDepends = [ + aeson async attoparsec base base64-bytestring binary binary-conduit + bytestring cachix cachix-api conduit conduit-extra containers + directory dlist exceptions filepath hercules-ci-api-agent + hercules-ci-api-core hostname http-client http-client-tls + http-conduit inline-c inline-c-cpp katip lens lens-aeson + lifted-async lifted-base monad-control mtl network network-uri + optparse-applicative process protolude safe-exceptions servant + servant-auth-client servant-client servant-client-core stm + temporary text time tomland transformers transformers-base unix + unliftio unliftio-core unordered-containers uuid vector websockets + wuss + ]; + executableSystemDepends = [ boost ]; + executablePkgconfigDepends = [ bdw-gc nix ]; + testHaskellDepends = [ + aeson async attoparsec base binary binary-conduit bytestring + conduit containers exceptions filepath hercules-ci-api-agent + hercules-ci-api-core hspec katip lifted-async lifted-base + monad-control optparse-applicative process protolude + safe-exceptions text transformers-base unliftio-core + ]; + doHaddock = false; + description = "Runs Continuous Integration tasks on your machines"; + license = stdenv.lib.licenses.asl20; + }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;}; + + "hercules-ci-api-agent" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring-type, bytestring + , containers, cookie, exceptions, hashable, hercules-ci-api-core + , hspec, http-api-data, http-media, lens, lens-aeson, memory + , network-uri, profunctors, QuickCheck, servant, servant-auth + , servant-auth-swagger, servant-swagger, servant-swagger-ui-core + , string-conv, swagger2, text, time, uuid, vector + }: + mkDerivation { + pname = "hercules-ci-api-agent"; + version = "0.2.1.0"; + sha256 = "1ir15sssrldsp7d70p9m541ihlas3mxfr48hl67s2fkd3w2s46ah"; + libraryHaskellDepends = [ + aeson base base64-bytestring-type bytestring containers cookie + exceptions hashable hercules-ci-api-core http-api-data http-media + lens lens-aeson memory servant servant-auth servant-auth-swagger + servant-swagger servant-swagger-ui-core string-conv swagger2 text + time uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring containers cookie exceptions hashable hspec + http-api-data http-media lens memory network-uri profunctors + QuickCheck servant servant-auth servant-auth-swagger + servant-swagger servant-swagger-ui-core string-conv swagger2 text + time uuid + ]; + description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "hercules-ci-api-core" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, cookie + , exceptions, hashable, http-api-data, http-media, katip, lens + , lifted-base, memory, monad-control, safe-exceptions, servant + , servant-auth, servant-auth-swagger, servant-swagger + , servant-swagger-ui-core, string-conv, swagger2, text, time, uuid + }: + mkDerivation { + pname = "hercules-ci-api-core"; + version = "0.1.1.0"; + sha256 = "19qxbarnl65gqg52ysl12nggyc64860chdcl0vm3i3fny4vsqbcq"; + libraryHaskellDepends = [ + aeson base bytestring containers cookie exceptions hashable + http-api-data http-media katip lens lifted-base memory + monad-control safe-exceptions servant servant-auth + servant-auth-swagger servant-swagger servant-swagger-ui-core + string-conv swagger2 text time uuid + ]; + description = "Types and convenience modules use across Hercules CI API packages"; + license = stdenv.lib.licenses.asl20; + }) {}; + "here" = callPackage ({ mkDerivation, base, haskell-src-meta, mtl, parsec , template-haskell @@ -121897,10 +121215,8 @@ self: { }: mkDerivation { pname = "hexpat-lens"; - version = "0.1.8"; - sha256 = "05c5pjxxsivcbppbl2n8dwyv6zh7azc3l998s2rhgjja55cpfmg0"; - revision = "1"; - editedCabalFile = "0z7cqm5alscaspaiz5pgwlcn6njhggyizqb1v5ay4sbac7v8nqlx"; + version = "0.1.9"; + sha256 = "0vy96jq415rp6njkvnp4in07j052m68yfr1n1mdcbfd3j5a0dw39"; libraryHaskellDepends = [ base bytestring deepseq hexpat hexpat-tagsoup lens ]; @@ -122993,36 +122309,6 @@ self: { }) {}; "hie-bios" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , conduit, conduit-extra, containers, cryptohash-sha1, deepseq - , directory, extra, file-embed, filepath, ghc, hslogger, process - , tasty, tasty-hunit, temporary, text, time, transformers - , unix-compat, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "hie-bios"; - version = "0.4.0"; - sha256 = "1pa8wjj6sml39371f355z46304jzzwpcr62q0qzrpqq8w9017241"; - revision = "1"; - editedCabalFile = "12m0hy4lirnr02h0nh2a85cfm8jv7jgqh24fdn29jkc28gpspm72"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring conduit conduit-extra - containers cryptohash-sha1 deepseq directory extra file-embed - filepath ghc hslogger process temporary text time transformers - unix-compat unordered-containers vector yaml - ]; - executableHaskellDepends = [ base directory filepath ghc ]; - testHaskellDepends = [ - base directory extra filepath ghc tasty tasty-hunit text - unordered-containers yaml - ]; - description = "Set up a GHC API session"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hie-bios_0_5_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, conduit-extra, containers, cryptohash-sha1, deepseq , directory, extra, file-embed, filepath, ghc, hslogger, process @@ -123048,7 +122334,6 @@ self: { ]; description = "Set up a GHC API session"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hie-core" = callPackage @@ -124578,6 +123863,18 @@ self: { license = "(BSD-2-Clause OR Apache-2.0)"; }) {}; + "hkd-default" = callPackage + ({ mkDerivation, aeson, base }: + mkDerivation { + pname = "hkd-default"; + version = "1.1.0.0"; + sha256 = "1ff8sfd68a06s7kfc85ww6w5wm7m0f70vd2bi0lbkj0r14rsn7vg"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ aeson base ]; + description = "Apply default value for optional field of HKD"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hkd-delta" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -124617,17 +123914,19 @@ self: { }) {}; "hkgr" = callPackage - ({ mkDerivation, base, directory, filepath, simple-cabal - , simple-cmd, simple-cmd-args + ({ mkDerivation, base, directory, extra, filepath, simple-cabal + , simple-cmd, simple-cmd-args, xdg-basedir }: mkDerivation { pname = "hkgr"; - version = "0.2.5.2"; - sha256 = "0n7xxm216jzsvm2si276a0x342iwn0jyfcaq5hfs5l92na456kg2"; + version = "0.2.6"; + sha256 = "0wjq88cg84jiy3mqwhsamd6q57y76fqpyq27yq5jb30w3wrp4wdv"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ - base directory filepath simple-cabal simple-cmd simple-cmd-args + base directory extra filepath simple-cabal simple-cmd + simple-cmd-args xdg-basedir ]; description = "Simple Hackage release workflow for package maintainers"; license = stdenv.lib.licenses.gpl3; @@ -124748,8 +124047,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.17.1.1"; - sha256 = "17c7g4xnwkbi77drqc6w96bp2lw0b86yg1qmm0gsdnli2m93baz4"; + version = "1.18"; + sha256 = "0rz2pbzsl8y9vwp09njiw8qazdbpxvhkaayiyxzwjbk5zw0vnvw6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124776,7 +124075,7 @@ self: { temporary terminfo text time timeit transformers unordered-containers utf8-string utility-ht wizards ]; - description = "Command-line interface for the hledger accounting tool"; + description = "Command-line interface for the hledger accounting system"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -124901,8 +124200,8 @@ self: { }: mkDerivation { pname = "hledger-interest"; - version = "1.5.4"; - sha256 = "0n3pjd86j43dprpsy1k9x72v8g46dhy3f9244hvwhigyx72ijm6h"; + version = "1.5.5"; + sha256 = "1rsi0mpdgi0g7m07y8bd3gpw5jc8saxw15ab7yhxif4m7dfwjgmg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124934,7 +124233,7 @@ self: { }) {}; "hledger-lib" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , base-compat-batteries, blaze-markup, bytestring, call-stack , cassava, cassava-megaparsec, cmdargs, containers, data-default , Decimal, deepseq, directory, doctest, extra, fgl, file-embed @@ -124945,27 +124244,27 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.17.1"; - sha256 = "19vny2l2l45dk0fkpi2lzpzaj7jks2r0zjv8dkpcxlyk8bvqi92c"; + version = "1.18"; + sha256 = "021zk938001s02zg3aq6b0frj69a62zpkbh6x42c1qycdpkagiq7"; libraryHaskellDepends = [ - aeson ansi-terminal array base base-compat-batteries blaze-markup - bytestring call-stack cassava cassava-megaparsec cmdargs containers - data-default Decimal deepseq directory extra fgl file-embed - filepath Glob hashtables megaparsec mtl old-time parsec + aeson aeson-pretty ansi-terminal array base base-compat-batteries + blaze-markup bytestring call-stack cassava cassava-megaparsec + cmdargs containers data-default Decimal deepseq directory extra fgl + file-embed filepath Glob hashtables megaparsec mtl old-time parsec parser-combinators pretty-show regex-tdfa safe split tabular tasty tasty-hunit template-haskell text time timeit transformers uglymemo utf8-string ]; testHaskellDepends = [ - aeson ansi-terminal array base base-compat-batteries blaze-markup - bytestring call-stack cassava cassava-megaparsec cmdargs containers - data-default Decimal deepseq directory doctest extra fgl file-embed - filepath Glob hashtables megaparsec mtl old-time parsec - parser-combinators pretty-show regex-tdfa safe split tabular tasty - tasty-hunit template-haskell text time timeit transformers uglymemo - utf8-string + aeson aeson-pretty ansi-terminal array base base-compat-batteries + blaze-markup bytestring call-stack cassava cassava-megaparsec + cmdargs containers data-default Decimal deepseq directory doctest + extra fgl file-embed filepath Glob hashtables megaparsec mtl + old-time parsec parser-combinators pretty-show regex-tdfa safe + split tabular tasty tasty-hunit template-haskell text time timeit + transformers uglymemo utf8-string ]; - description = "Core data types, parsers and functionality for the hledger accounting tools"; + description = "A reusable library providing the core functionality of hledger"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -125022,8 +124321,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.17.1.1"; - sha256 = "0cwjjcy4r6dy1w4svmi7jk1yrp654qr8ic33ipg24dh7bl6lqzps"; + version = "1.18"; + sha256 = "10qrikwx4riixylz5qiml7mdrbx2gnfgmwggax1l910l58g8czci"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -125033,7 +124332,7 @@ self: { process safe split text text-zipper time transformers unix vector vty ]; - description = "Terminal user interface for the hledger accounting tool"; + description = "Curses-style terminal interface for the hledger accounting system"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -125064,13 +124363,14 @@ self: { , hjsmin, hledger, hledger-lib, http-client, http-conduit , http-types, megaparsec, mtl, network, semigroups, shakespeare , template-haskell, text, time, transformers, unix-compat - , utf8-string, wai, wai-cors, wai-extra, wai-handler-launch, warp - , yaml, yesod, yesod-core, yesod-form, yesod-static + , unordered-containers, utf8-string, wai, wai-cors, wai-extra + , wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form + , yesod-static }: mkDerivation { pname = "hledger-web"; - version = "1.17.1"; - sha256 = "0zcb7a8xchsb093sw9aq30n45rns9v0xknwvigds3ka8yb383krl"; + version = "1.18"; + sha256 = "07gcb1kxlkjb37x645xravad1jzcsdcyz403zgdcnxdar21x9iw9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125079,11 +124379,12 @@ self: { Decimal directory extra filepath hjsmin hledger hledger-lib http-client http-conduit http-types megaparsec mtl network semigroups shakespeare template-haskell text time transformers - unix-compat utf8-string wai wai-cors wai-extra wai-handler-launch - warp yaml yesod yesod-core yesod-form yesod-static + unix-compat unordered-containers utf8-string wai wai-cors wai-extra + wai-handler-launch warp yaml yesod yesod-core yesod-form + yesod-static ]; executableHaskellDepends = [ base ]; - description = "Web interface for the hledger accounting tool"; + description = "Web-based user interface for the hledger accounting system"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -125165,8 +124466,8 @@ self: { ({ mkDerivation, base, Cabal, directory, hspec, libsass }: mkDerivation { pname = "hlibsass"; - version = "0.1.9.0"; - sha256 = "14rcg48hlbpz4vjk7ydhf58wgnbgsa61q6s7h0n80ak8ih63jdcx"; + version = "0.1.10.1"; + sha256 = "0gfbw6d48dqhc6gm9qwxfn4w6j3zs2xgf7c0kwxmgn4464y93dwy"; configureFlags = [ "-fexternallibsass" ]; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; @@ -125185,8 +124486,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.1.4"; - sha256 = "1wshn0vncvf6xc52dfr4s2b3j5h990ibnfx5qpk2hx1absp35qdv"; + version = "3.1.5"; + sha256 = "0mhcch11bph481ph0v2ymp4vxd37phxqm9393bn48i09rx0xbklq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -125972,21 +125273,19 @@ self: { "hmt" = callPackage ({ mkDerivation, aeson, array, base, bytestring, colour, containers - , data-ordlist, directory, fgl, filepath, lazy-csv, logict - , modular-arithmetic, multiset-comb, parsec, permutation, primes - , random, safe, split, text + , data-ordlist, directory, fgl, filepath, hsc3, lazy-csv, logict + , multiset-comb, parsec, permutation, primes, process, random, safe + , split, text, time }: mkDerivation { pname = "hmt"; - version = "0.16"; - sha256 = "1s6fjyphq57wh15vryj6y493ikaqa3g14x6hj9lg2h6wf6g8042h"; - revision = "1"; - editedCabalFile = "0ng1z7s5alciw1r3r0ch8bakabqlind29pssrih09rbnqbqwbmcj"; + version = "0.18"; + sha256 = "14c54z5zcg84nvq80yv3j3n6l7nha1l772vg3nsfsgy6fg430xdb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson array base bytestring colour containers data-ordlist - directory fgl filepath lazy-csv logict modular-arithmetic - multiset-comb parsec permutation primes random safe split text + directory fgl filepath hsc3 lazy-csv logict multiset-comb parsec + permutation primes process random safe split text time ]; description = "Haskell Music Theory"; license = "GPL"; @@ -126067,62 +125366,48 @@ self: { "hnix" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary , bytestring, comonad, containers, contravariant, criterion - , cryptohash-md5, cryptohash-sha1, cryptohash-sha256 - , cryptohash-sha512, data-fix, deepseq, deriving-compat, Diff - , directory, exceptions, filepath, free, generic-random, Glob - , hashable, hashing, haskeline, hedgehog, hnix-store-core - , http-client, http-client-tls, http-types, interpolate - , lens-family, lens-family-core, lens-family-th, logict, megaparsec - , monad-control, monadlist, mtl, optparse-applicative - , parser-combinators, pretty-show, prettyprinter, process, ref-tf - , regex-tdfa, repline, scientific, semialign, semialign-indexed - , semigroups, serialise, some, split, syb, tasty, tasty-hedgehog - , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, text - , these, time, transformers, transformers-base, unix - , unordered-containers, vector, xml + , data-fix, deepseq, deriving-compat, Diff, directory, exceptions + , filepath, free, generic-random, Glob, hashable, hashing, hedgehog + , hnix-store-core, http-client, http-client-tls, http-types + , interpolate, lens-family, lens-family-core, lens-family-th + , logict, megaparsec, monad-control, monadlist, mtl + , optparse-applicative, parser-combinators, pretty-show + , prettyprinter, process, ref-tf, regex-tdfa, scientific, semialign + , semialign-indexed, semigroups, serialise, some, split, syb, tasty + , tasty-hedgehog, tasty-hunit, tasty-quickcheck, tasty-th + , template-haskell, text, these, time, transformers + , transformers-base, unix, unordered-containers, vector, xml }: mkDerivation { pname = "hnix"; - version = "0.8.0"; - sha256 = "14ihkzf6garpv9yg34y9mvshwwah9isdq7gy788ffszv306vivhm"; + version = "0.9.0"; + sha256 = "17lj5gaqigkrxchdzkhwxab613zzahgh5d8jpqa9jiz7037wgv2w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring comonad - containers contravariant cryptohash-md5 cryptohash-sha1 - cryptohash-sha256 cryptohash-sha512 data-fix deepseq - deriving-compat directory exceptions filepath free hashable hashing - haskeline hnix-store-core http-client http-client-tls http-types - interpolate lens-family lens-family-core lens-family-th logict - megaparsec monad-control monadlist mtl optparse-applicative - parser-combinators pretty-show prettyprinter process ref-tf - regex-tdfa scientific semialign semialign-indexed semigroups - serialise some split syb template-haskell text these time - transformers transformers-base unix unordered-containers vector xml - ]; - executableHaskellDepends = [ - aeson base base16-bytestring bytestring comonad containers - cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 - data-fix deepseq exceptions filepath free hashing haskeline mtl - optparse-applicative pretty-show prettyprinter ref-tf repline - serialise template-haskell text time transformers - unordered-containers + containers contravariant data-fix deepseq deriving-compat directory + exceptions filepath free hashable hashing hnix-store-core + http-client http-client-tls http-types interpolate lens-family + lens-family-core lens-family-th logict megaparsec monad-control + monadlist mtl optparse-applicative parser-combinators pretty-show + prettyprinter process ref-tf regex-tdfa scientific semialign + semialign-indexed semigroups serialise some split syb + template-haskell text these time transformers transformers-base + unix unordered-containers vector xml ]; testHaskellDepends = [ - base base16-bytestring bytestring containers cryptohash-md5 - cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 data-fix - deepseq Diff directory exceptions filepath generic-random Glob - hashing hedgehog interpolate megaparsec mtl optparse-applicative - pretty-show prettyprinter process serialise split tasty - tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th - template-haskell text time transformers unix unordered-containers + base base16-bytestring bytestring containers data-fix deepseq Diff + directory exceptions filepath generic-random Glob hedgehog + interpolate megaparsec mtl optparse-applicative pretty-show + prettyprinter process serialise split tasty tasty-hedgehog + tasty-hunit tasty-quickcheck tasty-th template-haskell text time + transformers unix unordered-containers ]; benchmarkHaskellDepends = [ - base base16-bytestring bytestring containers criterion - cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 - data-fix deepseq exceptions filepath hashing mtl - optparse-applicative serialise template-haskell text time - transformers unordered-containers + base base16-bytestring bytestring containers criterion data-fix + deepseq exceptions filepath mtl optparse-applicative serialise + template-haskell text time transformers unordered-containers ]; description = "Haskell implementation of the Nix language"; license = stdenv.lib.licenses.bsd3; @@ -126305,26 +125590,6 @@ self: { }) {}; "hoauth2" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, exceptions - , http-conduit, http-types, microlens, text, unordered-containers - , uri-bytestring, uri-bytestring-aeson - }: - mkDerivation { - pname = "hoauth2"; - version = "1.11.0"; - sha256 = "0pf558n93gqksfgsjlvwcly2lq86adkcbqjqsq4p73kwwzs6dka8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base binary bytestring exceptions http-conduit http-types - microlens text unordered-containers uri-bytestring - uri-bytestring-aeson - ]; - description = "Haskell OAuth2 authentication client"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hoauth2_1_14_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, exceptions , http-conduit, http-types, microlens, text, unordered-containers , uri-bytestring, uri-bytestring-aeson @@ -126342,7 +125607,6 @@ self: { ]; description = "Haskell OAuth2 authentication client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hob" = callPackage @@ -126847,16 +126111,17 @@ self: { }) {}; "homotuple" = callPackage - ({ mkDerivation, base, OneTuple, Only, single-tuple }: + ({ mkDerivation, base, Cabal, directory, OneTuple, Only + , single-tuple + }: mkDerivation { pname = "homotuple"; - version = "0.1.1.0"; - sha256 = "02ihvyl6hdc879j3mx5ybbkd0iycqxjjmwd3z7dzshf9d5jmw67v"; + version = "0.1.2.1"; + sha256 = "1jhw6mby17wz0jiqxjj59qfvcy9dgd8gm5z0ak3qzr1xrd652fa8"; + setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base OneTuple Only single-tuple ]; description = "Homotuple, all whose elements are the same type"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "homplexity" = callPackage @@ -127697,6 +126962,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "hosc_0_18_1" = callPackage + ({ mkDerivation, base, binary, blaze-builder, bytestring + , data-binary-ieee754, network, time, transformers + }: + mkDerivation { + pname = "hosc"; + version = "0.18.1"; + sha256 = "0ygyvwzsvqv4pihzdm6i3kzkr01nh3qpk9g9f9ap6243yx7003vj"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary blaze-builder bytestring data-binary-ieee754 network + time transformers + ]; + description = "Haskell Open Sound Control"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hosc-json" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , hosc, json, text, transformers, unordered-containers, utf8-string @@ -128019,44 +127302,6 @@ self: { }) {}; "hpack" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal - , containers, cryptonite, deepseq, directory, filepath, Glob, hspec - , hspec-discover, http-client, http-client-tls, http-types, HUnit - , infer-license, interpolate, mockery, pretty, QuickCheck - , scientific, template-haskell, temporary, text, transformers - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "hpack"; - version = "0.33.1"; - sha256 = "1asbiw1vajhfjjadrlpcqdl43gqfqa9r44l9d1c2lgiys4fqpdmk"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bifunctors bytestring Cabal containers cryptonite - deepseq directory filepath Glob http-client http-client-tls - http-types infer-license pretty scientific text transformers - unordered-containers vector yaml - ]; - executableHaskellDepends = [ - aeson base bifunctors bytestring Cabal containers cryptonite - deepseq directory filepath Glob http-client http-client-tls - http-types infer-license pretty scientific text transformers - unordered-containers vector yaml - ]; - testHaskellDepends = [ - aeson base bifunctors bytestring Cabal containers cryptonite - deepseq directory filepath Glob hspec http-client http-client-tls - http-types HUnit infer-license interpolate mockery pretty - QuickCheck scientific template-haskell temporary text transformers - unordered-containers vector yaml - ]; - testToolDepends = [ hspec-discover ]; - description = "A modern format for Haskell packages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hpack_0_34_2" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec , hspec-discover, http-client, http-client-tls, http-types, HUnit @@ -128092,7 +127337,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A modern format for Haskell packages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpack-convert" = callPackage @@ -128380,27 +127624,6 @@ self: { }) {}; "hpc-codecov" = callPackage - ({ mkDerivation, array, base, bytestring, directory, filepath, hpc - , tar, tasty, tasty-hunit - }: - mkDerivation { - pname = "hpc-codecov"; - version = "0.1.0.0"; - sha256 = "1kr245qsdq60lvg1y9krpd19z9svwi2w9843b39hbv9fxzs7zcia"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring directory filepath hpc - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base directory filepath tar tasty tasty-hunit - ]; - description = "Generate codecov report from hpc data"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hpc-codecov_0_2_0_0" = callPackage ({ mkDerivation, array, base, bytestring, directory, filepath, hpc , tar, tasty, tasty-hunit }: @@ -128419,7 +127642,6 @@ self: { ]; description = "Generate codecov report from hpc data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpc-coveralls" = callPackage @@ -128475,6 +127697,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hpc-lcov_1_0_1" = callPackage + ({ mkDerivation, aeson, base, containers, hpc, optparse-applicative + , path, path-io, process, tasty, tasty-discover, tasty-golden + , tasty-hunit, text, unordered-containers, yaml + }: + mkDerivation { + pname = "hpc-lcov"; + version = "1.0.1"; + sha256 = "01ws5y2vavgm7151dcabw3jwny1prrnzn5b04q76m5gc6a36wivl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers hpc ]; + executableHaskellDepends = [ + aeson base containers hpc optparse-applicative path path-io process + text unordered-containers yaml + ]; + testHaskellDepends = [ + base containers hpc tasty tasty-discover tasty-golden tasty-hunit + ]; + testToolDepends = [ tasty-discover ]; + description = "Convert HPC output into LCOV format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpc-strobe" = callPackage ({ mkDerivation, base, filepath, hpc }: mkDerivation { @@ -129216,17 +128463,6 @@ self: { }) {GeoIP = null;}; "hs-bibutils" = callPackage - ({ mkDerivation, base, syb }: - mkDerivation { - pname = "hs-bibutils"; - version = "6.8.0.0"; - sha256 = "0syhh413qmajv56gaqz7p3b2yb6f0x9cx8zgds6fa3yzcqw7zasc"; - libraryHaskellDepends = [ base syb ]; - description = "Haskell bindings to bibutils, the bibliography conversion utilities"; - license = "GPL"; - }) {}; - - "hs-bibutils_6_10_0_0" = callPackage ({ mkDerivation, base, syb }: mkDerivation { pname = "hs-bibutils"; @@ -129235,7 +128471,6 @@ self: { libraryHaskellDepends = [ base syb ]; description = "Haskell bindings to bibutils, the bibliography conversion utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-blake2" = callPackage @@ -130449,8 +129684,8 @@ self: { }: mkDerivation { pname = "hsc3"; - version = "0.17"; - sha256 = "1k7gm0qk96rm7rphmmwlqh99kn5v79g8szyyhb9cqg3rfv6as1ld"; + version = "0.18"; + sha256 = "1j6jdgvvk3pxyky63khszv0cim4b7wbffpcpa098ii98fib0r47i"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers data-ordlist directory @@ -131259,8 +130494,8 @@ self: { }: mkDerivation { pname = "hsendxmpp"; - version = "0.1.2.1"; - sha256 = "0affpvnpwy1cih932427i343n9fvc4qnnjy5drkz683q1rdajhvd"; + version = "0.1.2.2"; + sha256 = "1zw26rp206w5wq3qb2y35wjis2a3qvyip7k35f3ls4y530gw39bq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -133154,7 +132389,7 @@ self: { sha256 = "0lz9zjy1xgjjbabbi2hcrvsnfid6c78y2cb2703qjwr93xy54f1f"; libraryHaskellDepends = [ base hsql old-time ]; librarySystemDepends = [ unixODBC ]; - description = "A Haskell Interface to ODBC."; + description = "A Haskell Interface to ODBC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -133168,7 +132403,7 @@ self: { sha256 = "0yj0jalpapjvpxmc79yd6bn93ax13pp87dipbg2c9mxf3p38jc9z"; libraryHaskellDepends = [ base hsql old-time ]; librarySystemDepends = [ postgresql ]; - description = "A Haskell Interface to PostgreSQL via the PQ library."; + description = "A Haskell Interface to PostgreSQL via the PQ library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -134669,7 +133904,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_7_0" = callPackage + "http-client_0_7_1" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , case-insensitive, containers, cookie, deepseq, directory , exceptions, filepath, ghc-prim, hspec, http-types, memory @@ -134678,8 +133913,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.7.0"; - sha256 = "1lghzrq3ls8gg64vsz4pc9rppggp4n3s3zcalzz63yvqrjfb767i"; + version = "0.7.1"; + sha256 = "0qjdjpxwqbnxfgqny0iylv11ng2swmdz57bwzy3mif5hfamvr6p0"; libraryHaskellDepends = [ array base blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath ghc-prim http-types memory @@ -134838,15 +134073,15 @@ self: { "http-client-restricted" = callPackage ({ mkDerivation, base, connection, data-default, http-client - , http-client-tls, network, utf8-string + , http-client-tls, network, network-bsd, utf8-string }: mkDerivation { pname = "http-client-restricted"; - version = "0.0.2"; - sha256 = "0i9x74r2lnwfbggd3dyccsivlrprglr3i21hc6a9vh868fbhmahn"; + version = "0.0.3"; + sha256 = "1xn84430haz2r9ikkxbi6awgpi0ybc7d7gp1plqhxq43ws626sam"; libraryHaskellDepends = [ base connection data-default http-client http-client-tls network - utf8-string + network-bsd utf8-string ]; description = "restricting the servers that http-client will use"; license = stdenv.lib.licenses.mit; @@ -135094,32 +134329,6 @@ self: { }) {}; "http-download" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, conduit - , conduit-extra, cryptonite, cryptonite-conduit, directory - , exceptions, filepath, hspec, hspec-discover, http-client - , http-conduit, http-types, memory, path, path-io, retry, rio - , rio-prettyprint - }: - mkDerivation { - pname = "http-download"; - version = "0.1.0.1"; - sha256 = "1f1haybqflprm3gwnxsyi6pyz7k4b5qyiq4wqq81wb7nsrr4h943"; - libraryHaskellDepends = [ - base base64-bytestring bytestring conduit conduit-extra cryptonite - cryptonite-conduit directory exceptions filepath http-client - http-conduit http-types memory path path-io retry rio - rio-prettyprint - ]; - testHaskellDepends = [ - base cryptonite hspec hspec-discover http-client path path-io retry - rio rio-prettyprint - ]; - testToolDepends = [ hspec-discover ]; - description = "Verified downloads with retries"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-download_0_2_0_0" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, conduit , conduit-extra, cryptonite, cryptonite-conduit, directory , exceptions, filepath, hspec, hspec-discover, http-client @@ -135143,7 +134352,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Verified downloads with retries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-encodings" = callPackage @@ -136428,7 +135636,7 @@ self: { executableHaskellDepends = [ array base bytestring containers kangaroo ]; - description = "Extract function names from Windows DLLs."; + description = "Extract function names from Windows DLLs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -136608,27 +135816,27 @@ self: { }: mkDerivation { pname = "hvega"; - version = "0.5.0.0"; - sha256 = "0h587i2wxwdmp24yxw7ggg1ak68mppbjwgjrdfhzzqlwdr69y9k0"; + version = "0.9.1.0"; + sha256 = "0gy7f6amg5mvr1lc7s98ld445h4s0j8xjilpdq6c6yy5kgd5hdyp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base text unordered-containers ]; testHaskellDepends = [ aeson aeson-pretty base bytestring containers filepath tasty - tasty-golden text + tasty-golden text unordered-containers ]; description = "Create Vega-Lite visualizations (version 4) in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; - "hvega_0_9_1_0" = callPackage + "hvega_0_10_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , filepath, tasty, tasty-golden, text, unordered-containers }: mkDerivation { pname = "hvega"; - version = "0.9.1.0"; - sha256 = "0gy7f6amg5mvr1lc7s98ld445h4s0j8xjilpdq6c6yy5kgd5hdyp"; + version = "0.10.0.0"; + sha256 = "0jp9sfmyvscxn415z3mv5i2kjrwwabwy4v4qc709qkrfgzd9mmwn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base text unordered-containers ]; @@ -136701,33 +135909,6 @@ self: { }) {}; "hw-balancedparens" = callPackage - ({ mkDerivation, base, criterion, deepseq, doctest - , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits - , hw-excess, hw-fingertree, hw-hspec-hedgehog, hw-prim - , hw-rankselect-base, transformers, vector - }: - mkDerivation { - pname = "hw-balancedparens"; - version = "0.3.1.0"; - sha256 = "1nr3p3qcd72i4av71vf9kxv483mdg13c10dnpynabxfh7vx49vc9"; - libraryHaskellDepends = [ - base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim - hw-rankselect-base vector - ]; - testHaskellDepends = [ - base doctest doctest-discover hedgehog hspec hw-bits - hw-hspec-hedgehog hw-prim hw-rankselect-base transformers vector - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ - base criterion hedgehog hw-bits hw-prim vector - ]; - doHaddock = false; - description = "Balanced parentheses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-balancedparens_0_4_1_0" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, directory , doctest, doctest-discover, generic-lens, hedgehog, hspec , hspec-discover, hw-bits, hw-excess, hw-fingertree @@ -136761,7 +135942,6 @@ self: { doHaddock = false; description = "Balanced parentheses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-bits" = callPackage @@ -137135,10 +136315,8 @@ self: { }: mkDerivation { pname = "hw-json"; - version = "1.3.2.0"; - sha256 = "00pdd813phgfi9g9xs6r7iw03iifwmlzfb0b424q1cq6d9z37v2f"; - revision = "2"; - editedCabalFile = "1lg2l399fnx7vg2bxf6chcwpl9q3pblzrmwzzijxczvyfrsy5m41"; + version = "1.3.2.1"; + sha256 = "11lf4nxnkk8l25a44g1pkr9j1w03l69gqjgli5yfj6k68lzml7bf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137154,15 +136332,17 @@ self: { optparse-applicative text unordered-containers vector ]; testHaskellDepends = [ - aeson attoparsec base bytestring doctest doctest-discover hedgehog - hspec hw-balancedparens hw-bits hw-hspec-hedgehog - hw-json-simple-cursor hw-json-standard-cursor hw-prim hw-rankselect - hw-rankselect-base scientific text transformers vector + aeson attoparsec base bytestring dlist doctest doctest-discover + hedgehog hspec hw-balancedparens hw-bits hw-hspec-hedgehog + hw-json-simple-cursor hw-json-standard-cursor hw-mquery hw-prim + hw-rankselect hw-rankselect-base scientific text transformers + vector ]; testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base bytestring criterion directory hw-json-standard-cursor mmap ]; + doHaddock = false; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -137551,8 +136731,8 @@ self: { }: mkDerivation { pname = "hw-rankselect-base"; - version = "0.3.4.0"; - sha256 = "0rfk06fwmvpw2s7m397xm2s0831ad743325pv6yrd7019jcbiayl"; + version = "0.3.4.1"; + sha256 = "1s0lqwq0rjmjca6lshfnxqi0c7bzlyflhm45xw1xa9pvqci8439h"; libraryHaskellDepends = [ base bits-extra bitvec hw-bits hw-int hw-prim hw-string-parse vector @@ -138146,7 +137326,7 @@ self: { base containers directory filepath haskell98 HTTP HUnit hxt network parsec process ]; - description = "A collection of tools for processing XML with Haskell (Filter variant)."; + description = "A collection of tools for processing XML with Haskell (Filter variant)"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -140147,8 +139327,8 @@ self: { ({ mkDerivation, aeson, base, hvega, ihaskell, text }: mkDerivation { pname = "ihaskell-hvega"; - version = "0.3.0.0"; - sha256 = "1sa65ambh6494lhfgyawn883zfnlvqrd969xzx83w1dk904425gi"; + version = "0.3.1.0"; + sha256 = "1zfk58f10r8mkj9wwi4mgqm6hyf2x6zkrxm7rdi8yfvfya38m7fy"; libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; license = stdenv.lib.licenses.bsd3; @@ -140343,7 +139523,7 @@ self: { libraryToolDepends = [ alex ]; executableHaskellDepends = [ array base containers html xhtml ]; executableToolDepends = [ alex ]; - description = "A fast syntax highlighting library built with alex."; + description = "A fast syntax highlighting library built with alex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -140358,7 +139538,7 @@ self: { revision = "1"; editedCabalFile = "1wl2sv2g7iwxldk582h1z6a2b3ks4wzk8rx8bflcxwlh6s4kq0s7"; libraryHaskellDepends = [ base bytestring ]; - description = "Determine the type of an image by reading the first bytes."; + description = "Determine the type of an image by reading the first bytes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -141504,6 +140684,30 @@ self: { broken = true; }) {}; + "indigo" = callPackage + ({ mkDerivation, base, constraints, containers, fmt, hedgehog + , hspec-expectations, HUnit, lorentz, morley, morley-prelude + , reflection, singletons, tasty, tasty-discover, tasty-hedgehog + , tasty-hunit-compat, template-haskell, vinyl + }: + mkDerivation { + pname = "indigo"; + version = "0.1.0.0"; + sha256 = "03bspqbw8iz25d58xvy18qzk7wrm5k48k6bvnnslkikqy2bnkcr1"; + libraryHaskellDepends = [ + base constraints containers lorentz morley morley-prelude + reflection singletons template-haskell vinyl + ]; + testHaskellDepends = [ + base containers fmt hedgehog hspec-expectations HUnit lorentz + morley morley-prelude singletons tasty tasty-hedgehog + tasty-hunit-compat + ]; + testToolDepends = [ tasty-discover ]; + description = "Convenient imperative eDSL over Lorentz"; + license = stdenv.lib.licenses.mit; + }) {}; + "inf-interval" = callPackage ({ mkDerivation, array, base, deepseq, QuickCheck, text, vector }: mkDerivation { @@ -141512,7 +140716,7 @@ self: { sha256 = "08fjmza05wlj11mvdjwfcp3fn6k5zi1hsld84805clipd55sbp0r"; libraryHaskellDepends = [ array base deepseq vector ]; testHaskellDepends = [ array base deepseq QuickCheck text vector ]; - description = "Non-contiguous interval data types with potentially infinite ranges."; + description = "Non-contiguous interval data types with potentially infinite ranges"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -141682,8 +140886,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.7.1.5"; - sha256 = "1i3qwh8l938f453nf7mbhlhg6xyaxsh8vys13zlz7p26q7knf65g"; + version = "1.7.1.6"; + sha256 = "1psx9v95fhlapizhh7jdz4cvynwv9jiqn09z0843lhc74jqf65in"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -141700,7 +140904,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "influxdb_1_7_1_6" = callPackage + "influxdb_1_8_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, lens, network, optional-args, raw-strings-qq @@ -141709,8 +140913,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.7.1.6"; - sha256 = "1psx9v95fhlapizhh7jdz4cvynwv9jiqn09z0843lhc74jqf65in"; + version = "1.8.0"; + sha256 = "02hpav4j9shrx4gbfdf2mdfx53x5q24s8qr3yvi7ia4ssbr0bcfd"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -141720,8 +140924,8 @@ self: { unordered-containers vector ]; testHaskellDepends = [ - base containers doctest raw-strings-qq tasty tasty-hunit - template-haskell time + base containers doctest lens raw-strings-qq tasty tasty-hunit + template-haskell time vector ]; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; @@ -142577,6 +141781,22 @@ self: { broken = true; }) {intel_aes = null;}; + "interact" = callPackage + ({ mkDerivation, base, bytestring, hspec, main-tester, mtl + , silently + }: + mkDerivation { + pname = "interact"; + version = "0.1.0.0"; + sha256 = "100qvyh4148g1hc6lw1pf7bzr16aas3jqc3xm8gbj7mmm1i1ycnp"; + libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ + base bytestring hspec main-tester mtl silently + ]; + description = "instantly create REPL from any function"; + license = stdenv.lib.licenses.mit; + }) {}; + "interactive-plot" = callPackage ({ mkDerivation, base, containers, data-default-class, microlens , microlens-th, MonadRandom, mtl, transformers, vty @@ -142797,23 +142017,6 @@ self: { }) {}; "interpolate" = callPackage - ({ mkDerivation, base, base-compat, bytestring, haskell-src-meta - , hspec, QuickCheck, quickcheck-instances, template-haskell, text - }: - mkDerivation { - pname = "interpolate"; - version = "0.2.0"; - sha256 = "1gkaj98yz363v38fv78sqby236mp8yqwqcilx7kr2b9z0w3204bf"; - libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; - testHaskellDepends = [ - base base-compat bytestring haskell-src-meta hspec QuickCheck - quickcheck-instances template-haskell text - ]; - description = "String interpolation done right"; - license = stdenv.lib.licenses.mit; - }) {}; - - "interpolate_0_2_1" = callPackage ({ mkDerivation, base, base-compat, bytestring, haskell-src-meta , hspec, QuickCheck, quickcheck-instances, template-haskell, text }: @@ -142828,7 +142031,6 @@ self: { ]; description = "String interpolation done right"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interpolatedstring-perl6" = callPackage @@ -143070,30 +142272,6 @@ self: { }) {}; "intro" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, dlist - , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers - , unordered-containers, writer-cps-mtl - }: - mkDerivation { - pname = "intro"; - version = "0.6.0.1"; - sha256 = "1kka6dnlyqppjx9ykk3zixfyslr8cf4ja6sa2hgq6h69mmsicp67"; - revision = "2"; - editedCabalFile = "12jmy4lp9yrix6hm6cx3kmgprpmlwdyxqckyx53h01iygfpbx3w5"; - libraryHaskellDepends = [ - base bytestring containers deepseq dlist extra hashable mtl safe - text transformers unordered-containers writer-cps-mtl - ]; - testHaskellDepends = [ - base bytestring containers deepseq dlist extra hashable lens mtl - QuickCheck safe text transformers unordered-containers - writer-cps-mtl - ]; - description = "Safe and minimal prelude"; - license = stdenv.lib.licenses.mit; - }) {}; - - "intro_0_7_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, dlist , extra, hashable, lens, mtl, optics, QuickCheck, safe, text , transformers, unordered-containers, writer-cps-mtl @@ -143113,6 +142291,28 @@ self: { ]; description = "Safe and minimal prelude"; license = stdenv.lib.licenses.mit; + }) {}; + + "intro_0_8_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, extra, hashable + , lens, mtl, optics, QuickCheck, safe, text, transformers + , unordered-containers, writer-cps-mtl + }: + mkDerivation { + pname = "intro"; + version = "0.8.0.0"; + sha256 = "1vmhmpcikxlmad2c55bdlsa7j1x30irjb7dp69qii650qslh2rf3"; + libraryHaskellDepends = [ + base bytestring containers extra hashable mtl safe text + transformers unordered-containers writer-cps-mtl + ]; + testHaskellDepends = [ + base bytestring containers extra hashable lens mtl optics + QuickCheck safe text transformers unordered-containers + writer-cps-mtl + ]; + description = "Safe and minimal prelude"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -143752,8 +142952,8 @@ self: { }: mkDerivation { pname = "ipfs"; - version = "1.0.2"; - sha256 = "0mrr67bz283qqz0d70j9gz191l4pi554j3hmcf7pscg87b84rdv5"; + version = "1.0.3"; + sha256 = "0m39ixc5xkk1r0k7d5hfszr2hp66i9xdab3y4iqcqxl45nf9q2f2"; libraryHaskellDepends = [ aeson base bytestring envy flow Glob ip lens monad-logger regex-compat rio servant-client servant-server swagger2 text vector @@ -145998,8 +145198,8 @@ self: { ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: mkDerivation { pname = "jira-wiki-markup"; - version = "1.0.0"; - sha256 = "1sl2jjcsqg61si33mxjwpf8zdn56kbbgcwqqqzbgifx2qbv4wmf8"; + version = "1.1.4"; + sha256 = "0riwi6i0vvmfffprzd4gklxjivjv1x7cmb2vx43x6n8yfrd75yzv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec text ]; @@ -146009,12 +145209,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "jira-wiki-markup_1_3_0" = callPackage + "jira-wiki-markup_1_3_1" = callPackage ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: mkDerivation { pname = "jira-wiki-markup"; - version = "1.3.0"; - sha256 = "01jv2xrp0xkx00fdxglik85mnbnkhgxfyya6kvkm4fgifj111h4s"; + version = "1.3.1"; + sha256 = "1870yrg8npjn8g5aq61a73ffn2jij9zp281111j53pzlgk0nh20q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec text ]; @@ -146960,22 +146160,6 @@ self: { }) {}; "json-feed" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, hspec - , mime-types, network-uri, tagsoup, text, time - }: - mkDerivation { - pname = "json-feed"; - version = "1.0.10"; - sha256 = "09hgpy0xc431ifs59y91glwf9c57yjc8jwwin94w4z3xk8v2qg2v"; - libraryHaskellDepends = [ - aeson base bytestring mime-types network-uri tagsoup text time - ]; - testHaskellDepends = [ base bytestring filepath hspec ]; - description = "JSON Feed"; - license = stdenv.lib.licenses.mit; - }) {}; - - "json-feed_1_0_11" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, hspec , mime-types, network-uri, tagsoup, text, time }: @@ -146989,7 +146173,6 @@ self: { testHaskellDepends = [ base bytestring filepath hspec ]; description = "JSON Feed"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-fu" = callPackage @@ -147168,8 +146351,8 @@ self: { }: mkDerivation { pname = "json-rpc"; - version = "1.0.1"; - sha256 = "1gghpzaz2p1ib5jgkr0hn0fpzdkkzx9ywc65q3np9n6x6zb2878h"; + version = "1.0.2"; + sha256 = "113mclv3dz31chlx5a1py8b1b91jn9lafh8nzpwkf41xv7b757mz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147188,7 +146371,39 @@ self: { vector ]; description = "Fully-featured JSON-RPC 2.0 library"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.mit; + }) {}; + + "json-rpc_1_0_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit + , conduit-extra, deepseq, hashable, hspec, monad-logger, mtl + , QuickCheck, stm-conduit, text, time, unliftio + , unordered-containers, vector + }: + mkDerivation { + pname = "json-rpc"; + version = "1.0.3"; + sha256 = "0168hk5sqrxily51m0vlwvarmz59h79520y1ivbf6g38hxm8m60g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit conduit-extra deepseq + hashable monad-logger mtl QuickCheck stm-conduit text time unliftio + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring conduit conduit-extra monad-logger mtl + QuickCheck stm-conduit text time unliftio unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base bytestring conduit conduit-extra hspec monad-logger mtl + QuickCheck stm-conduit text time unliftio unordered-containers + vector + ]; + description = "Fully-featured JSON-RPC 2.0 library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-rpc-client" = callPackage @@ -147489,7 +146704,7 @@ self: { base blaze-builder bytestring containers json2-types mtl old-locale parsec pretty time utf8-string ]; - description = "Library provides support for JSON."; + description = "Library provides support for JSON"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -150784,18 +149999,6 @@ self: { }) {}; "lackey" = callPackage - ({ mkDerivation, base, hspec, servant, servant-foreign, text }: - mkDerivation { - pname = "lackey"; - version = "1.0.12"; - sha256 = "0fc6g9bydh27yv4j45f7g49rq5gdxb1x175q5w9yni5xam5z7hl2"; - libraryHaskellDepends = [ base servant servant-foreign text ]; - testHaskellDepends = [ base hspec servant servant-foreign text ]; - description = "Generate Ruby clients from Servant APIs"; - license = stdenv.lib.licenses.mit; - }) {}; - - "lackey_1_0_13" = callPackage ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; @@ -150805,7 +150008,6 @@ self: { testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lacroix" = callPackage @@ -151751,14 +150953,20 @@ self: { }) {}; "language-asn1" = callPackage - ({ mkDerivation, base, parsec, syb }: + ({ mkDerivation, base, HUnit, parsec, syb, test-framework + , test-framework-hunit + }: mkDerivation { pname = "language-asn1"; - version = "0.5"; - sha256 = "14aiqk1l1d3bh7dcml4a85xg81583h3r30h5splw0lvcxmbggzp3"; + version = "0.6"; + sha256 = "0crhyk69kp14w8917mnfsp8hiilsyw84xyz4ysdw70i78wvb530a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec syb ]; + executableHaskellDepends = [ base parsec syb ]; + testHaskellDepends = [ + base HUnit parsec syb test-framework test-framework-hunit + ]; description = "Parsing of ASN1 definitions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -151790,24 +150998,6 @@ self: { }) {}; "language-avro" = callPackage - ({ mkDerivation, avro, base, containers, directory, filepath, hspec - , hspec-megaparsec, megaparsec, text, vector - }: - mkDerivation { - pname = "language-avro"; - version = "0.1.2.0"; - sha256 = "0cpkkp4v5sqrf6khkhmdvklmhcjc4c4rcfprd5c854vf1zq06hhl"; - libraryHaskellDepends = [ - avro base containers directory filepath megaparsec text vector - ]; - testHaskellDepends = [ - avro base hspec hspec-megaparsec megaparsec text vector - ]; - description = "Language definition and parser for AVRO files"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "language-avro_0_1_3_1" = callPackage ({ mkDerivation, avro, base, containers, directory, filepath, hspec , hspec-megaparsec, megaparsec, text, vector }: @@ -151823,7 +151013,6 @@ self: { ]; description = "Language definition and parser for AVRO files"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-bash" = callPackage @@ -152161,7 +151350,7 @@ self: { libraryHaskellDepends = [ base containers language-ecmascript parsec uniplate ]; - description = "JavaScript static analysis library."; + description = "JavaScript static analysis library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -152181,7 +151370,7 @@ self: { hashable lens mtl parsec pretty text unordered-containers ]; libraryToolDepends = [ alex ]; - description = "Parser and pretty printer for the Eiffel language."; + description = "Parser and pretty printer for the Eiffel language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -152215,7 +151404,7 @@ self: { sha256 = "16kzdvhxpmfiia68c4y36fv1sjymy7sblba4iz77qqnwfqz3zka4"; libraryHaskellDepends = [ array base haskell-src parsec syb ]; libraryToolDepends = [ alex happy ]; - description = "Fortran lexer and parser, language support, and extensions."; + description = "Fortran lexer and parser, language support, and extensions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -152742,7 +151931,7 @@ self: { array base containers monads-tf pretty transformers utf8-string ]; libraryToolDepends = [ alex happy ]; - description = "Parsing and pretty printing of Python code."; + description = "Parsing and pretty printing of Python code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -152759,7 +151948,7 @@ self: { executableHaskellDepends = [ base haskell98 language-python xhtml ]; - description = "Generate coloured XHTML for Python code."; + description = "Generate coloured XHTML for Python code"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -153921,8 +153110,8 @@ self: { }: mkDerivation { pname = "ldap-client"; - version = "0.4.0"; - sha256 = "1n15yab8mg12f80rq47ansdxmxj4n6symx11ihy2m4bjn7yq31mk"; + version = "0.4.1"; + sha256 = "0m253jicjn8rqdrkcqd75bcrdg7bdq313crx2b54yv5s3mz6cxi2"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring connection containers fail network semigroups stm text @@ -154256,8 +153445,8 @@ self: { }: mkDerivation { pname = "leb128-cereal"; - version = "1.0"; - sha256 = "1qjxcvcgdf4l1wzps7410yv3i5mi3ax17mq2f9wgbfbnm33329i7"; + version = "1.1"; + sha256 = "08jmd5v36p2vwlx3rw22h762jp7arq06fsmdipff72bvs2cn0fld"; libraryHaskellDepends = [ base bytestring cereal ]; testHaskellDepends = [ base bytestring tasty tasty-hunit tasty-quickcheck @@ -156754,8 +155943,8 @@ self: { }: mkDerivation { pname = "lightstep-haskell"; - version = "0.10.2"; - sha256 = "0lxpmlh50vwdy1rzkln8fh9a4y5xwbmaamf3f6yfrg8djaiqa7xq"; + version = "0.10.3"; + sha256 = "0jzhqbm74hzk18pf3n9zswcvxi8wmn06zvvssaxzi9lwm2lk7xrr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157044,36 +156233,6 @@ self: { }) {}; "linear" = callPackage - ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes - , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq - , distributive, doctest, ghc-prim, hashable, HUnit, lens - , reflection, semigroupoids, semigroups, simple-reflect, tagged - , template-haskell, test-framework, test-framework-hunit - , transformers, transformers-compat, unordered-containers, vector - , void - }: - mkDerivation { - pname = "linear"; - version = "1.20.9"; - sha256 = "0h7yqigq593n7wsl7nz6a5f137wznm7y679wsii0ph0zsc4v5af5"; - revision = "1"; - editedCabalFile = "13ff7xvw25fpsikcvf0nly2ca614wzv10qyg4sh378p5r8rvfgka"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - adjunctions base base-orphans binary bytes cereal containers - deepseq distributive ghc-prim hashable lens reflection - semigroupoids semigroups tagged template-haskell transformers - transformers-compat unordered-containers vector void - ]; - testHaskellDepends = [ - base binary bytestring deepseq doctest HUnit lens reflection - simple-reflect test-framework test-framework-hunit vector - ]; - description = "Linear Algebra"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "linear_1_21" = callPackage ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq , distributive, doctest, ghc-prim, hashable, HUnit, lens, random @@ -157101,7 +156260,6 @@ self: { ]; description = "Linear Algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linear-accelerate" = callPackage @@ -158206,17 +157364,6 @@ self: { }) {}; "list-singleton" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "list-singleton"; - version = "1.0.0.3"; - sha256 = "1k6kygngf88a8cxy9fvh0snhg4bhd3z7x6l1zsis4wjn0fpfzvrc"; - libraryHaskellDepends = [ base ]; - description = "Easily and clearly create lists with only one element in them"; - license = stdenv.lib.licenses.isc; - }) {}; - - "list-singleton_1_0_0_4" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "list-singleton"; @@ -158225,7 +157372,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Easily and clearly create lists with only one element in them"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-t" = callPackage @@ -158386,8 +157532,8 @@ self: { }: mkDerivation { pname = "list-tuple"; - version = "0.1.2.0"; - sha256 = "1v9nsnsgwg17zwzr5kd44wbjqzp1cl6qwz2xwnwrpx8qampckcpw"; + version = "0.1.3.0"; + sha256 = "1qd5pr7i9xsym09ly6am3a0id3cwbb8w4xphbsjkv3wrlfv9z9v0"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base OneTuple Only single-tuple ]; testHaskellDepends = [ @@ -158437,8 +157583,8 @@ self: { }: mkDerivation { pname = "list-zipper"; - version = "0.0.9"; - sha256 = "1926a02k9z97arbr622w1j13h8kik6ba148glpnmnm5kyr8d5xk4"; + version = "0.0.10"; + sha256 = "0vnylv1w7lkvlh7kmaz06gbq7fiz6dm44rl2s9r2nrnfslm4bjr3"; libraryHaskellDepends = [ base comonad deriving-compat lens mtl semigroupoids semigroups transformers @@ -159044,7 +158190,7 @@ self: { base directory filepath llvm-hs llvm-hs-pure mtl tasty tasty-golden tasty-hspec tasty-hunit text transformers ]; - description = "A pretty printer for LLVM IR."; + description = "A pretty printer for LLVM IR"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -159399,7 +158545,7 @@ self: { libraryHaskellDepends = [ base combinatorial-problems containers erf random ]; - description = "Generalised local search within Haskell, for applications in combinatorial optimisation."; + description = "Generalised local search within Haskell, for applications in combinatorial optimisation"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -159941,8 +159087,8 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.3.9"; - sha256 = "18g0yw5k0xcpiz3chag61smjc9fi4iy99sv9sqhq8f2v61p355dr"; + version = "1.3.10"; + sha256 = "0d03ma5sq0aqkb42jy0531d4vkn1ci0gcs8vj3xd6ac4hwr0qcwm"; libraryHaskellDepends = [ async base exceptions free monad-control mtl prettyprinter semigroups stm stm-delay text time transformers transformers-base @@ -160461,10 +159607,8 @@ self: { ({ mkDerivation, base, integer-gmp }: mkDerivation { pname = "long-double"; - version = "0.1"; - sha256 = "072yfv1kv83k8qc9apks2czr9p6znk46bbbjmsdbcpzyb8byh64j"; - revision = "2"; - editedCabalFile = "03x83ycib19k2lmd3spwq2zmylfl5ihammb406fxxqqbyv4jw1mg"; + version = "0.1.1"; + sha256 = "0byrpngsh1a8w9n5nbw9lfmj4nmh33avzfh883zw9ya10pfa7x3g"; libraryHaskellDepends = [ base integer-gmp ]; description = "FFI bindings for C long double"; license = stdenv.lib.licenses.bsd3; @@ -160675,39 +159819,37 @@ self: { }) {}; "lorentz" = callPackage - ({ mkDerivation, aeson-pretty, base-noprelude, bimap, bytestring - , constraints, containers, data-default, filepath - , first-class-families, fmt, formatting, ghc-prim, HUnit - , interpolate, lens, morley, morley-prelude, mtl, named - , optparse-applicative, pretty-terminal, QuickCheck, singletons - , spoon, tasty, tasty-discover, tasty-hunit-compat - , tasty-quickcheck, template-haskell, text, tezos-bake-monitor-lib + ({ mkDerivation, aeson-pretty, base, bimap, bytestring, constraints + , containers, data-default, filepath, first-class-families, fmt + , formatting, ghc-prim, hedgehog, HUnit, interpolate, lens, morley + , morley-prelude, mtl, named, optparse-applicative, pretty-terminal + , QuickCheck, singletons, spoon, tasty, tasty-discover + , tasty-hedgehog, tasty-hunit-compat, template-haskell, text , type-spec, unordered-containers, vinyl }: mkDerivation { pname = "lorentz"; - version = "0.3.0"; - sha256 = "1kjaif19rbmni4nsa8xczbp7q0lbfspbv9w0nhc24l7jjfmhrcd2"; + version = "0.4.0"; + sha256 = "1wihk6vmcnc7bcy3xayffdivkqfjjcb8zg3bdkqhnnfvccmwyckg"; libraryHaskellDepends = [ - aeson-pretty base-noprelude bimap bytestring constraints containers - data-default first-class-families fmt formatting ghc-prim HUnit - interpolate lens morley morley-prelude mtl named + aeson-pretty base bimap bytestring constraints containers + data-default first-class-families fmt formatting ghc-prim hedgehog + HUnit interpolate lens morley morley-prelude mtl named optparse-applicative pretty-terminal QuickCheck singletons - template-haskell text tezos-bake-monitor-lib unordered-containers - vinyl + template-haskell text unordered-containers vinyl ]; testHaskellDepends = [ - base-noprelude bimap bytestring constraints containers data-default - filepath first-class-families fmt formatting HUnit morley - morley-prelude QuickCheck singletons spoon tasty tasty-hunit-compat - tasty-quickcheck text type-spec unordered-containers vinyl + base bimap bytestring constraints containers filepath + first-class-families fmt formatting hedgehog HUnit morley + morley-prelude singletons spoon tasty tasty-hedgehog + tasty-hunit-compat text type-spec unordered-containers vinyl ]; testToolDepends = [ tasty-discover ]; description = "EDSL for the Michelson Language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {tezos-bake-monitor-lib = null;}; + }) {}; "loris" = callPackage ({ mkDerivation, base, c2hs, loris, vector }: @@ -160943,8 +160085,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.10.2.0"; - sha256 = "1khqdgc90k9ya58nxsb6dggyyjdp5q9m4bgxmkg15l6qh6mw9zqp"; + version = "0.10.3.0"; + sha256 = "1gj6f99k3kd0flh2nbpj5wnhi1ql5rlijw0vf4l53zwxy203r7k8"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -160959,7 +160101,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lsp-test_0_11_0_1" = callPackage + "lsp-test_0_11_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl @@ -160968,10 +160110,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.11.0.1"; - sha256 = "0s2sabykaaklw32z6j9z1m7l22ayc736sih39fhlq83iwgpv1917"; - revision = "1"; - editedCabalFile = "08lqzsw41vps1z8zihhsja95h5k73g5gpf689x2ryxn6ch13052v"; + version = "0.11.0.2"; + sha256 = "0sl2n38q9xa3hr8psjrwlw2mq63vanjdyn5vry6mp87l8vba9s8f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163985,31 +163125,6 @@ self: { }) {}; "massiv" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-doctest - , data-default-class, deepseq, doctest, exceptions - , mersenne-random-pure64, primitive, QuickCheck, random, scheduler - , splitmix, template-haskell, unliftio-core, vector - }: - mkDerivation { - pname = "massiv"; - version = "0.4.5.0"; - sha256 = "06mllyp2wax1gbwafxa7sbda96mp4zhfsc3mbcpymxrap2i2c6w1"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq exceptions primitive - scheduler unliftio-core vector - ]; - testHaskellDepends = [ - base doctest mersenne-random-pure64 QuickCheck random splitmix - template-haskell - ]; - description = "Massiv (Массив) is an Array Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "massiv_0_5_2_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest , data-default-class, deepseq, doctest, exceptions , mersenne-random-pure64, primitive, QuickCheck, random, scheduler @@ -164080,29 +163195,6 @@ self: { }) {}; "massiv-test" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default - , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec - , massiv, primitive, QuickCheck, scheduler, unliftio, vector - }: - mkDerivation { - pname = "massiv-test"; - version = "0.1.2"; - sha256 = "13sp8xw7rbwqgafn3f5f971l9i80cm09fan27cgpx8r8nmyrmhp2"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq exceptions hspec massiv - primitive QuickCheck scheduler unliftio vector - ]; - testHaskellDepends = [ - base bytestring containers data-default deepseq genvalidity-hspec - hspec massiv QuickCheck scheduler vector - ]; - description = "Library that contains generators, properties and tests for Massiv Array Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "massiv-test_0_1_3" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec , massiv, mwc-random, primitive, QuickCheck, scheduler, unliftio @@ -164311,6 +163403,61 @@ self: { broken = true; }) {}; + "math-programming" = callPackage + ({ mkDerivation, base, containers, mtl, tasty, tasty-discover + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "math-programming"; + version = "0.3.0"; + sha256 = "1dvkg1z1q97lq37v40z92r3rbir2g1x5d3g6nx131cjm034rm5ha"; + libraryHaskellDepends = [ base containers mtl text ]; + testHaskellDepends = [ + base containers mtl tasty tasty-discover tasty-hunit + tasty-quickcheck text + ]; + testToolDepends = [ tasty-discover ]; + description = "A library for formulating and solving math programs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "math-programming-glpk" = callPackage + ({ mkDerivation, base, containers, glpk, glpk-headers + , math-programming, math-programming-tests, mtl, tasty + , tasty-discover, tasty-hunit, text + }: + mkDerivation { + pname = "math-programming-glpk"; + version = "0.3.0"; + sha256 = "0cc0888fkhfkj73yfdgpzvvrmkm9z3i1rl4phx13mc3b00qdna56"; + libraryHaskellDepends = [ + base containers glpk-headers math-programming mtl text + ]; + testHaskellDepends = [ + base containers glpk-headers math-programming + math-programming-tests mtl tasty tasty-discover tasty-hunit text + ]; + testSystemDepends = [ glpk ]; + testToolDepends = [ tasty-discover ]; + description = "A GLPK backend to the math-programming library"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) glpk;}; + + "math-programming-tests" = callPackage + ({ mkDerivation, base, math-programming, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "math-programming-tests"; + version = "0.3.0"; + sha256 = "15ly6fhcl6p5frbdyavjighqyagi2zby3lzla1s0nn9vsqx6iwgk"; + libraryHaskellDepends = [ + base math-programming tasty tasty-hunit tasty-quickcheck text + ]; + description = "Utility functions for testing implementations of the math-programming library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mathblog" = callPackage ({ mkDerivation, base, bytestring, ConfigFile, containers , data-default, deepseq, directory, either, filepath, fsnotify @@ -164586,25 +163733,6 @@ self: { }) {}; "matrix-static" = callPackage - ({ mkDerivation, base, deepseq, ghc-typelits-natnormalise, matrix - , tasty, tasty-hunit, vector - }: - mkDerivation { - pname = "matrix-static"; - version = "0.2.1"; - sha256 = "1jq6f3as18q0z9z8nxf3jsa6fgci9nsp4m4qbr13429m6rl11x1n"; - libraryHaskellDepends = [ - base deepseq ghc-typelits-natnormalise matrix vector - ]; - testHaskellDepends = [ - base deepseq ghc-typelits-natnormalise matrix tasty tasty-hunit - vector - ]; - description = "Type-safe matrix operations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "matrix-static_0_3" = callPackage ({ mkDerivation, base, deepseq, ghc-typelits-natnormalise, matrix , tasty, tasty-hunit, vector }: @@ -164621,7 +163749,6 @@ self: { ]; description = "Type-safe matrix operations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "matsuri" = callPackage @@ -164651,7 +163778,7 @@ self: { , config-ini, connection, containers, data-clist, directory , filepath, gitrev, hashable, Hclip, mattermost-api , mattermost-api-qc, microlens-platform, mtl, network-uri, process - , quickcheck-text, random, semigroups, skylighting-core, stm + , quickcheck-text, random, semigroups, skylighting-core, split, stm , stm-delay, strict, string-conversions, tasty, tasty-hunit , tasty-quickcheck, temporary, text, text-zipper, time , timezone-olson, timezone-series, transformers, Unique, unix @@ -164660,8 +163787,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.8.0"; - sha256 = "05fkhizjj5vvrsz7db8s7ig36ym02n6mndwaay0md8s7fghjwfiw"; + version = "50200.9.0"; + sha256 = "1ky022msmh1ashhw8kwxwj4lcswa6xin2537q4bx8miii07cfvaw"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -164670,8 +163797,8 @@ self: { bytestring cheapskate config-ini connection containers data-clist directory filepath gitrev hashable Hclip mattermost-api microlens-platform mtl network-uri process random semigroups - skylighting-core stm stm-delay strict temporary text text-zipper - time timezone-olson timezone-series transformers unix + skylighting-core split stm stm-delay strict temporary text + text-zipper time timezone-olson timezone-series transformers unix unordered-containers utf8-string uuid vector vty word-wrap xdg-basedir ]; @@ -164699,8 +163826,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "50200.5.0"; - sha256 = "0hfwc85qhz1klwr4baabcrv6n7imfj3xz809dddy2hdfav0y9qgg"; + version = "50200.6.0"; + sha256 = "0p03r9hss1xrg4a542l2pyacm49ahkkqkr3afcwgdyb0m65ra620"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164724,8 +163851,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.5.0"; - sha256 = "0gzjzfzfipvpk61zilxw9a1xsgm10lrsl26rvr4h4gjw6mws7bg8"; + version = "50200.6.0"; + sha256 = "11j1bli553n59j54qn9ka1a5d37jk1ijgbwaa3001gmxhj526r62"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -165526,6 +164653,17 @@ self: { broken = true; }) {}; + "megalisp" = callPackage + ({ mkDerivation, base, megaparsec, mtl, text }: + mkDerivation { + pname = "megalisp"; + version = "0.0.1"; + sha256 = "158j4wc9j8vpi3k095nfsimjavfmrxgzil3d4a3yqphpk96fz9ci"; + libraryHaskellDepends = [ base megaparsec mtl text ]; + description = "lisp parser using mega-parsec"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "megaparsec_7_0_5" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, mtl, parser-combinators, scientific, text @@ -166136,21 +165274,6 @@ self: { }) {}; "mergeful" = callPackage - ({ mkDerivation, aeson, base, containers, mtl, text, time, validity - , validity-containers, validity-time - }: - mkDerivation { - pname = "mergeful"; - version = "0.1.0.0"; - sha256 = "1cw3mrbza5fqrh4qg4bjzw4dv23vwb0aglh0dcwzmzsl23hnvhad"; - libraryHaskellDepends = [ - aeson base containers mtl text time validity validity-containers - validity-time - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "mergeful_0_2_0_0" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, mtl, text, time , validity, validity-containers, validity-time }: @@ -166163,7 +165286,6 @@ self: { validity-containers validity-time ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mergeful-persistent" = callPackage @@ -166193,20 +165315,6 @@ self: { }) {genvalidity-persistent = null; validity-persistent = null;}; "mergeless" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, mtl, validity - , validity-containers - }: - mkDerivation { - pname = "mergeless"; - version = "0.2.0.2"; - sha256 = "0rrqligrrswmyy1gg6ji2q28rb30y1y97sa2bfxd9rgvbx8fgr2g"; - libraryHaskellDepends = [ - aeson base containers deepseq mtl validity validity-containers - ]; - license = stdenv.lib.licenses.mit; - }) {}; - - "mergeless_0_3_0_0" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, mtl, validity , validity-containers }: @@ -166218,7 +165326,6 @@ self: { aeson base containers deepseq mtl validity validity-containers ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mergeless-persistent" = callPackage @@ -166469,7 +165576,7 @@ self: { version = "0.0.8"; sha256 = "0rdw0laqx9kypfwzqb4ir18r07sjxgm4pwfs82bjpwq0gf58nzas"; libraryHaskellDepends = [ arrows base random Stream ]; - description = "Generalised local search within Haskell, for applications in combinatorial optimisation."; + description = "Generalised local search within Haskell, for applications in combinatorial optimisation"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -167342,25 +166449,6 @@ self: { }) {}; "mighty-metropolis" = callPackage - ({ mkDerivation, base, containers, kan-extensions, mcmc-types - , mwc-probability, pipes, primitive, transformers - }: - mkDerivation { - pname = "mighty-metropolis"; - version = "1.2.0"; - sha256 = "1h3ik18vnya6sm0x1s6hxxx5hky0wm2pqm2g3hllcj02cm5hng4d"; - libraryHaskellDepends = [ - base kan-extensions mcmc-types mwc-probability pipes primitive - transformers - ]; - testHaskellDepends = [ base containers mwc-probability ]; - description = "The Metropolis algorithm"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "mighty-metropolis_2_0_0" = callPackage ({ mkDerivation, base, containers, foldl, hspec, kan-extensions , mcmc-types, mwc-probability, mwc-random, pipes, primitive , transformers @@ -167646,26 +166734,6 @@ self: { }) {}; "mini-egison" = callPackage - ({ mkDerivation, base, containers, haskell-src-meta, hspec, primes - , regex-compat, sort, split, template-haskell - }: - mkDerivation { - pname = "mini-egison"; - version = "0.1.6"; - sha256 = "08348nw7xnni81iwcah43x5hi0hyqz286g3zpmkhja8if99l59lj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers haskell-src-meta regex-compat split - template-haskell - ]; - executableHaskellDepends = [ base sort ]; - testHaskellDepends = [ base hspec primes ]; - description = "Template Haskell Implementation of Egison Pattern Matching"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mini-egison_1_0_0" = callPackage ({ mkDerivation, base, egison-pattern-src , egison-pattern-src-th-mode, haskell-src-exts, haskell-src-meta , hspec, mtl, primes, recursion-schemes, sort, template-haskell @@ -167684,7 +166752,6 @@ self: { testHaskellDepends = [ base hspec primes ]; description = "Template Haskell Implementation of Egison Pattern Matching"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "miniball" = callPackage @@ -167821,6 +166888,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "minimorph_0_3_0_0" = callPackage + ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit + , text + }: + mkDerivation { + pname = "minimorph"; + version = "0.3.0.0"; + sha256 = "1jq2yrvhknnbc4b44nk2k6ynivn6s2j43w8bq1vi8gix7k4sazf4"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + description = "English spelling functions with an emphasis on simplicity"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "minimung" = callPackage ({ mkDerivation, base, GLUT, haskell98, unix }: mkDerivation { @@ -167984,7 +167068,7 @@ self: { base containers directory filepath monads-tf parsec pretty transformers xhtml ]; - description = "an interpreter for an operational semantics for the STG machine."; + description = "an interpreter for an operational semantics for the STG machine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -168021,6 +167105,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "miniutter_0_5_1_1" = callPackage + ({ mkDerivation, base, binary, containers, HUnit, minimorph + , test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "miniutter"; + version = "0.5.1.1"; + sha256 = "126gwbii4j8j778h7c8vwapn6dya8phbjja37pys4kly0p877mp4"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base binary containers minimorph text ]; + testHaskellDepends = [ + base containers HUnit test-framework test-framework-hunit text + ]; + description = "Simple English clause creation from arbitrary words"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "minizinc-process" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , hashable, process-extras, stringsearch, text @@ -168255,8 +167357,8 @@ self: { }: mkDerivation { pname = "miso"; - version = "1.4.0.0"; - sha256 = "067z49ial3dwkbcza54aivdh8r4yx54zmpyxmd6mpyqlv96dv8gc"; + version = "1.6.0.0"; + sha256 = "1mzsih2hga62sf33m4cwf1v0107p2ydc32wq7n3hsapzx69sm2j3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168267,26 +167369,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "miso_1_5_2_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, http-api-data - , http-types, lucid, network-uri, servant, servant-lucid, text - , transformers, vector - }: - mkDerivation { - pname = "miso"; - version = "1.5.2.0"; - sha256 = "0lj0phl6zw7rqr60z06n0dmi6svsxky7krd4i88mfz0ypcvq582v"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers http-api-data http-types lucid - network-uri servant servant-lucid text transformers vector - ]; - description = "A tasty Haskell front-end framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "miso-action-logger" = callPackage ({ mkDerivation, aeson, base, ghcjs-base, miso }: mkDerivation { @@ -170850,7 +169932,7 @@ self: { revision = "1"; editedCabalFile = "11v5zdsb9mp1rxvgcrxcr2xnc610xi16krwa9r4i5d6njmphfbdp"; libraryHaskellDepends = [ base ]; - description = "Haskell98 partial maps and filters over MonadPlus."; + description = "Haskell98 partial maps and filters over MonadPlus"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -171588,59 +170670,59 @@ self: { }) {morfeusz = null;}; "morley" = callPackage - ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base-noprelude + ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base , base16-bytestring, base58-bytestring, binary, bytestring - , constraints, containers, cryptonite, data-default, directory - , filepath, first-class-families, fmt, formatting, gauge, ghc-prim - , gitrev, hex-text, hspec, hspec-expectations, HUnit, interpolate - , lens, megaparsec, memory, morley-prelude, mtl, named - , optparse-applicative, parser-combinators, pretty-simple - , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances - , show-type, singletons, syb, tasty, tasty-ant-xml, tasty-discover - , tasty-hspec, tasty-hunit-compat, tasty-quickcheck - , template-haskell, text, tezos-bake-monitor-lib, th-lift - , th-lift-instances, time, timerep, transformers-compat - , unordered-containers, vector, vinyl, wl-pprint-text + , constraints, containers, criterion, cryptonite, data-default + , directory, filepath, first-class-families, fmt, formatting, gauge + , ghc-prim, gitrev, hedgehog, hex-text, hspec, hspec-expectations + , HUnit, interpolate, lens, megaparsec, memory, morley-prelude, mtl + , named, o-clock, optparse-applicative, parser-combinators + , pretty-simple, QuickCheck, quickcheck-arbitrary-adt + , quickcheck-instances, semigroups, show-type, singletons + , statistics, syb, tasty, tasty-ant-xml, tasty-discover + , tasty-hedgehog, tasty-hspec, tasty-hunit-compat, tasty-quickcheck + , template-haskell, text, th-lift, th-lift-instances, time, timerep + , transformers-compat, unordered-containers, vector, vinyl + , wl-pprint-text }: mkDerivation { pname = "morley"; - version = "1.3.0"; - sha256 = "1h0p9g2radwnpmq7ay5q2gd0xqaw1f1c51mzdv9xqpnbg2zp2w5b"; + version = "1.4.0"; + sha256 = "0696bp3851plhwm9x0bq4i1j6ygkqi1m91r0m73cn2svl8b5mnmw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-casing aeson-pretty base-noprelude base16-bytestring + aeson aeson-casing aeson-pretty base base16-bytestring base58-bytestring binary bytestring constraints containers - cryptonite data-default first-class-families fmt formatting - ghc-prim gitrev hex-text hspec hspec-expectations HUnit interpolate - lens megaparsec memory morley-prelude mtl named - optparse-applicative parser-combinators QuickCheck - quickcheck-arbitrary-adt quickcheck-instances show-type singletons - syb tasty tasty-ant-xml tasty-hunit-compat tasty-quickcheck - template-haskell text tezos-bake-monitor-lib th-lift - th-lift-instances time timerep transformers-compat - unordered-containers vector vinyl wl-pprint-text + criterion cryptonite data-default first-class-families fmt + formatting ghc-prim gitrev hedgehog hex-text hspec + hspec-expectations HUnit interpolate lens megaparsec memory + morley-prelude mtl named o-clock optparse-applicative + parser-combinators QuickCheck quickcheck-arbitrary-adt + quickcheck-instances semigroups show-type singletons statistics syb + tasty tasty-ant-xml tasty-hedgehog tasty-hunit-compat + tasty-quickcheck template-haskell text th-lift th-lift-instances + time timerep transformers-compat unordered-containers vector vinyl + wl-pprint-text ]; executableHaskellDepends = [ - base-noprelude fmt morley-prelude named optparse-applicative - pretty-simple + base fmt morley-prelude named optparse-applicative pretty-simple ]; testHaskellDepends = [ - aeson base-noprelude bytestring containers data-default directory - filepath fmt formatting hex-text hspec hspec-expectations HUnit - lens megaparsec morley-prelude QuickCheck quickcheck-arbitrary-adt - quickcheck-instances singletons syb tasty tasty-hspec - tasty-hunit-compat tasty-quickcheck text unordered-containers + aeson base bytestring containers data-default directory filepath + fmt formatting hedgehog hex-text hspec hspec-expectations HUnit + lens megaparsec morley-prelude singletons syb tasty tasty-hedgehog + tasty-hspec tasty-hunit-compat text unordered-containers ]; testToolDepends = [ tasty-discover ]; benchmarkHaskellDepends = [ - base-noprelude containers gauge megaparsec morley-prelude + base containers gauge megaparsec morley-prelude ]; description = "Developer tools for the Michelson Language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {tezos-bake-monitor-lib = null;}; + }) {}; "morley-prelude" = callPackage ({ mkDerivation, base-noprelude, universum }: @@ -171673,31 +170755,6 @@ self: { }) {}; "morpheus-graphql" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, megaparsec - , mtl, scientific, tasty, tasty-hunit, template-haskell, text - , th-lift-instances, transformers, unordered-containers, uuid - , vector, websockets - }: - mkDerivation { - pname = "morpheus-graphql"; - version = "0.10.0"; - sha256 = "1aan9afsljd83dm8zj3qg5hna80cp3iqzqrlhy0znr2xg9dlswg1"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring containers megaparsec mtl scientific - template-haskell text th-lift-instances transformers - unordered-containers uuid vector websockets - ]; - testHaskellDepends = [ - aeson base bytestring containers megaparsec mtl scientific tasty - tasty-hunit template-haskell text th-lift-instances transformers - unordered-containers uuid vector websockets - ]; - description = "Morpheus GraphQL"; - license = stdenv.lib.licenses.mit; - }) {}; - - "morpheus-graphql_0_12_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, megaparsec , morpheus-graphql-core, mtl, scientific, tasty, tasty-hunit , template-haskell, text, transformers, unliftio-core @@ -171720,7 +170777,6 @@ self: { ]; description = "Morpheus GraphQL"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "morpheus-graphql-cli" = callPackage @@ -173478,8 +172534,8 @@ self: { }: mkDerivation { pname = "multibase"; - version = "0.1.0.0"; - sha256 = "1gvbqq4kd94n7dmcbjb3k24z0qrv13qmi8lhs3yxwch3y13qv60m"; + version = "0.1.1"; + sha256 = "08r3imyvgi6ahgfqpjcxfr3xg4zj2cvw4g2lzqs04ncipzrw5rnf"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base16-bytestring base32-z-bytestring base58-bytestring @@ -173965,8 +173021,8 @@ self: { }: mkDerivation { pname = "multistate"; - version = "0.8.0.2"; - sha256 = "0hypksjacpjgpkgvjn76fd5rgdz7hi6ri36ihdy0bdhpi83jnhn5"; + version = "0.8.0.3"; + sha256 = "0sbrm28rjw4qgpn8p0974ljkgi30d4akbngjm58kf96x9zp7ln8g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174114,15 +173170,17 @@ self: { }: mkDerivation { pname = "murmur3"; - version = "1.0.3"; - sha256 = "0ahzspjgiy8p594x0v45bsvf0k9z94nnvvfcpi8lyq5fwvh82b0h"; + version = "1.0.4"; + sha256 = "022sadxhnywbzx8crwkgky7kndxwpaddc89nq3ya4a4ikq3qvbhm"; + revision = "1"; + editedCabalFile = "130ign0n566nsrzfp4ipb2sy5hq1ymxdlmqb80zbpdc0rdkqh0x0"; libraryHaskellDepends = [ base bytestring cereal ]; testHaskellDepends = [ base base16-bytestring bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.mit; }) {}; "murmurhash3" = callPackage @@ -174470,8 +173528,8 @@ self: { }: mkDerivation { pname = "musicw"; - version = "0.3.2"; - sha256 = "1r4fp9bda4hn8alv5w95m0a1qp513zkq9a90fjipw1m6lr21xacw"; + version = "0.3.5"; + sha256 = "1fkkx6gsfcb138vr7f685wg0wbqhr2sk9h4vqiv8r254hkwzl91h"; libraryHaskellDepends = [ array base bytestring containers data-default file-embed ghcjs-base ghcjs-dom ghcjs-prim json monad-loops mtl safe text time @@ -174754,21 +173812,6 @@ self: { }) {}; "mwc-probability" = callPackage - ({ mkDerivation, base, containers, mwc-random, primitive - , transformers - }: - mkDerivation { - pname = "mwc-probability"; - version = "2.2.0"; - sha256 = "11zfchdsipfik1vrrx53d8h1j6b8lzrndwnnyvcnz1dqlz0dgqdz"; - libraryHaskellDepends = [ - base containers mwc-random primitive transformers - ]; - description = "Sampling function-based probability distributions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mwc-probability_2_3_0" = callPackage ({ mkDerivation, base, containers, mwc-random, primitive , transformers }: @@ -174781,7 +173824,6 @@ self: { ]; description = "Sampling function-based probability distributions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mwc-probability-transition" = callPackage @@ -176813,8 +175855,8 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.4.3.2"; - sha256 = "0bmbb9417gf9v4pih55vyvw7z9cy9dpphppmbzb0vdiiz0si8ppi"; + version = "0.4.3.3"; + sha256 = "12yaxvf1qagby5zjyf620qsxxf4a7y0jljvqdr92i49p2jkm8xrm"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger regex-applicative @@ -176837,8 +175879,8 @@ self: { }: mkDerivation { pname = "net-spider-cli"; - version = "0.2.0.2"; - sha256 = "0s4p0w5dwxny2wqh33hzpbw1lyvn6b3lvmxl9mybkdvxjc8gaw2v"; + version = "0.2.0.3"; + sha256 = "1zs579xrp52q9573ckcr69yf6n2cjh17g2p1xpw1gncaa0rljng4"; libraryHaskellDepends = [ aeson base greskell-core hashable net-spider optparse-applicative text @@ -176858,8 +175900,8 @@ self: { }: mkDerivation { pname = "net-spider-pangraph"; - version = "0.2.0.1"; - sha256 = "0n19hlyzb2r9kkkw1ivaify0msjv4iq69rv14cdak8x50dmvn4wq"; + version = "0.2.0.2"; + sha256 = "1i7prpj85mbmwqdhfi8q2lxk89a2vv3n4r886sq2nygka0pw0azc"; libraryHaskellDepends = [ base bytestring greskell net-spider pangraph text time ]; @@ -176942,10 +175984,8 @@ self: { ({ mkDerivation, base, bindings-DSL, libsodium }: mkDerivation { pname = "netcode-io"; - version = "0.0.1"; - sha256 = "1xm8fxihjzlbl8zzixmqw3kgq2rsf57c321y5sl2w5i3y8jkxa1n"; - revision = "1"; - editedCabalFile = "1xwrhh4nwlkjr03qj3cd655df9gn6ys4hn80k35hc3z3hyi7lzqf"; + version = "0.0.2"; + sha256 = "0n66y9cxvljhsz4izbqlrxns5yv32lh6dnqs4ngr1bk5ms9wjps4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bindings-DSL ]; @@ -177265,7 +176305,7 @@ self: { libraryHaskellDepends = [ base containers directory filepath mtl nettle-openflow unix ]; - description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs."; + description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -177283,7 +176323,7 @@ self: { array base bimap binary binary-strict bytestring containers HList mtl network parsec syb ]; - description = "OpenFlow protocol messages, binary formats, and servers."; + description = "OpenFlow protocol messages, binary formats, and servers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -179248,7 +178288,7 @@ self: { revision = "1"; editedCabalFile = "08hgvqbb13n2scs4shqjdyzm7kblgllndk0429pdiwdx21k5391q"; libraryHaskellDepends = [ base bytestring http-conduit xml ]; - description = "Haskell interface to the nist random beacon."; + description = "Haskell interface to the nist random beacon"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -179362,6 +178402,7 @@ self: { benchmarkHaskellDepends = [ attoparsec base criterion text ]; description = "Parse and render *.drv files"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ sorki ]; }) {}; "nix-diff" = callPackage @@ -179446,8 +178487,7 @@ self: { ]; description = "Parse and render .narinfo files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ sorki ]; }) {}; "nix-paths" = callPackage @@ -180350,7 +179390,7 @@ self: { version = "0.1.1"; sha256 = "1mm1j0l3h8qxpk0bis4g1f6zp5407rkq2z5ldyr036frbvfwqaj5"; libraryHaskellDepends = [ base ]; - description = "Useful utility functions that only depend on base."; + description = "Useful utility functions that only depend on base"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -180602,8 +179642,8 @@ self: { }: mkDerivation { pname = "nqe"; - version = "0.6.1"; - sha256 = "1l0dydhcqmgf6bamy29sgry8sjirvw3khzjkhpjlb12zl2y75xxd"; + version = "0.6.3"; + sha256 = "0wg9cfzgj36dj77m521pqcliqd43i3j6i1bvqgvb8npmzqijag7q"; libraryHaskellDepends = [ base conduit containers hashable mtl stm unique unliftio ]; @@ -180612,7 +179652,7 @@ self: { stm-conduit text unliftio ]; description = "Concurrency library in the style of Erlang/OTP"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.mit; }) {}; "nsis" = callPackage @@ -182150,8 +181190,8 @@ self: { }: mkDerivation { pname = "oeis2"; - version = "1.0.3"; - sha256 = "04dbly6ggadmy1bi10x9bbsa6dvynb5g1m5hdrlzv3mpyfahxvwp"; + version = "1.0.4"; + sha256 = "1parmfwdxrmvzz81dy8mb9ry4bbp1bvsqsr593zld7hnfx6cvlh9"; libraryHaskellDepends = [ aeson base containers http-conduit lens lens-aeson text vector ]; @@ -183094,8 +182134,8 @@ self: { }: mkDerivation { pname = "openapi3-code-generator"; - version = "0.1.0.4"; - sha256 = "1bfqw6fpvprwg7132ccxy2hksjbh5s9zcv18blc4q855hc4zzbp5"; + version = "0.1.0.6"; + sha256 = "1nf7m27m5l56ms45lldbbqcwz3rcdw5jr3kk7si280h3153yhayc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183584,27 +182624,6 @@ self: { }) {}; "opentelemetry" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring, clock - , exceptions, hashable, random, tasty, tasty-discover, tasty-hunit - , tasty-quickcheck, text, unordered-containers - }: - mkDerivation { - pname = "opentelemetry"; - version = "0.0.0.2"; - sha256 = "15x7swbr18xks8a9xf1hjwibgqxsjigcyrahbnk72p1n1gxkarjr"; - libraryHaskellDepends = [ - attoparsec base bytestring clock exceptions hashable random text - unordered-containers - ]; - testHaskellDepends = [ - async base bytestring tasty tasty-discover tasty-hunit - tasty-quickcheck - ]; - testToolDepends = [ tasty-discover ]; - license = stdenv.lib.licenses.asl20; - }) {}; - - "opentelemetry_0_4_2" = callPackage ({ mkDerivation, base, bytestring, exceptions }: mkDerivation { pname = "opentelemetry"; @@ -183612,7 +182631,6 @@ self: { sha256 = "12myg932dpf6zz38ahf9dmx449dkp9kf9pi79j8bdlz4v2fl3jzj"; libraryHaskellDepends = [ base bytestring exceptions ]; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentelemetry-extra" = callPackage @@ -184556,6 +183574,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-generic_1_4_0" = callPackage + ({ mkDerivation, base, bytestring, Only, optparse-applicative + , semigroups, system-filepath, text, time, transformers, void + }: + mkDerivation { + pname = "optparse-generic"; + version = "1.4.0"; + sha256 = "1wbakc4lk0pyxij9pg95v4hi4k4l7jd4iai0ya6ncmy5bj21fyvd"; + libraryHaskellDepends = [ + base bytestring Only optparse-applicative semigroups + system-filepath text time transformers void + ]; + description = "Auto-generate a command-line parser for your datatype"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optparse-helper" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -185061,35 +184096,6 @@ self: { }) {}; "ormolu" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, exceptions - , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl - , optparse-applicative, path, path-io, syb, text - }: - mkDerivation { - pname = "ormolu"; - version = "0.0.3.1"; - sha256 = "0pvnswbxi09fddnn012sha3fbmm30yzlzh2x1asw9ahjk3a3bdlg"; - revision = "1"; - editedCabalFile = "1prm2lip6w9fg8gaywdnxqcf2bcikcmnb2gi46nma3dfniipzbnq"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers dlist exceptions ghc-lib-parser mtl syb - text - ]; - executableHaskellDepends = [ - base ghc-lib-parser gitrev optparse-applicative text - ]; - testHaskellDepends = [ - base containers filepath hspec path path-io text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ormolu_0_1_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, exceptions , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl , optparse-applicative, path, path-io, syb, text @@ -185114,7 +184120,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "os-release" = callPackage @@ -185536,19 +184541,6 @@ self: { }) {}; "packcheck" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "packcheck"; - version = "0.4.2"; - sha256 = "0za6ravq945g9gdm6sbxqklnkg56saap0kjg5ra42dabd1ma4iys"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - benchmarkHaskellDepends = [ base ]; - description = "Universal build and CI testing for Haskell packages"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "packcheck_0_5_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "packcheck"; @@ -185559,7 +184551,6 @@ self: { benchmarkHaskellDepends = [ base ]; description = "Universal build and CI testing for Haskell packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "packdeps" = callPackage @@ -185627,7 +184618,7 @@ self: { base binary criterion deepseq mtl unordered-containers vector vector-binary-instances ]; - description = "Generation and traversal of highly compressed directed acyclic word graphs."; + description = "Generation and traversal of highly compressed directed acyclic word graphs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -186049,60 +185040,6 @@ self: { }) {}; "pandoc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , case-insensitive, cmark-gfm, containers, criterion, data-default - , deepseq, Diff, directory, doclayout, doctemplates, emojis - , exceptions, executable-path, filepath, Glob, haddock-library - , hslua, hslua-module-system, hslua-module-text, HsYAML, HTTP - , http-client, http-client-tls, http-types, ipynb, jira-wiki-markup - , JuicyPixels, mtl, network, network-uri, pandoc-types, parsec - , process, QuickCheck, random, safe, scientific, SHA, skylighting - , skylighting-core, split, syb, tagsoup, tasty, tasty-golden - , tasty-hunit, tasty-lua, tasty-quickcheck, temporary, texmath - , text, text-conversions, time, unicode-transforms, unix - , unordered-containers, vector, weigh, xml, zip-archive, zlib - }: - mkDerivation { - pname = "pandoc"; - version = "2.9.1.1"; - sha256 = "0vc1ld57nv27gwq4mq0wdal8k2wxvsc0f3m2jwq9nkq7wbpwa8cx"; - configureFlags = [ "-fhttps" "-f-trypandoc" ]; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring binary - blaze-html blaze-markup bytestring case-insensitive cmark-gfm - containers data-default deepseq directory doclayout doctemplates - emojis exceptions filepath Glob haddock-library hslua - hslua-module-system hslua-module-text HsYAML HTTP http-client - http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mtl - network network-uri pandoc-types parsec process random safe - scientific SHA skylighting skylighting-core split syb tagsoup - temporary texmath text text-conversions time unicode-transforms - unix unordered-containers vector xml zip-archive zlib - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base base64-bytestring bytestring containers Diff directory - doctemplates executable-path filepath Glob hslua mtl pandoc-types - process QuickCheck tasty tasty-golden tasty-hunit tasty-lua - tasty-quickcheck temporary text time xml zip-archive - ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion mtl text time weigh - ]; - postInstall = '' - mkdir -p $out/share/man/man1 - mv "man/"*.1 $out/share/man/man1/ - ''; - description = "Conversion between markup formats"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "pandoc_2_9_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base-compat , base-noprelude, base64-bytestring, binary, blaze-html , blaze-markup, bytestring, case-insensitive, cmark-gfm, containers @@ -186156,46 +185093,10 @@ self: { ''; description = "Conversion between markup formats"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "pandoc-citeproc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , Cabal, containers, data-default, directory, filepath, hs-bibutils - , HsYAML, HsYAML-aeson, libyaml, mtl, network, old-locale, pandoc - , pandoc-types, parsec, process, rfc5051, safe, setenv, split, syb - , tagsoup, temporary, text, time, unordered-containers, vector - , xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.16.4.1"; - sha256 = "1jbd6g82sn3546kimm0p6n7spfqr3b4dssjkr5v679jwb5w6hwmx"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils HsYAML HsYAML-aeson mtl network old-locale pandoc - pandoc-types parsec rfc5051 setenv split syb tagsoup text time - unordered-containers vector xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath libyaml - pandoc pandoc-types safe syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath mtl pandoc - pandoc-types process temporary text yaml - ]; - doCheck = false; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-citeproc_0_17" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils , HsYAML, HsYAML-aeson, libyaml, mtl, network, old-locale, pandoc @@ -186228,7 +185129,6 @@ self: { doCheck = false; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-citeproc-preamble" = callPackage @@ -186519,39 +185419,6 @@ self: { }) {}; "pandoc-plot" = callPackage - ({ mkDerivation, base, containers, data-default-class, deepseq - , directory, filepath, hashable, hspec, hspec-expectations, mtl - , open-browser, optparse-applicative, pandoc, pandoc-types - , parallel-io, shakespeare, tasty, tasty-hspec, tasty-hunit - , template-haskell, temporary, text, turtle, typed-process, yaml - }: - mkDerivation { - pname = "pandoc-plot"; - version = "0.2.2.0"; - sha256 = "15xs3rrqc7hygmmiylfykdqhqsr7giqdhw3hmmnff8s8k708qv33"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers data-default-class directory filepath hashable mtl - pandoc pandoc-types parallel-io shakespeare temporary text turtle - typed-process yaml - ]; - executableHaskellDepends = [ - base data-default-class deepseq directory filepath open-browser - optparse-applicative pandoc pandoc-types template-haskell temporary - text - ]; - testHaskellDepends = [ - base data-default-class directory filepath hspec hspec-expectations - mtl pandoc-types tasty tasty-hspec tasty-hunit temporary text - ]; - description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "pandoc-plot_0_5_0_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, criterion , data-default-class, deepseq, directory, filepath, githash , hashable, hspec, hspec-expectations, mtl, open-browser @@ -186561,8 +185428,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "0.5.0.0"; - sha256 = "1wgk3q46am59if4b5s6pkabllsyy4xv47zs5h1lywdij3g4r4898"; + version = "0.6.1.0"; + sha256 = "0jyhb1ab6h990r159a3gdw0cbxxvjrjsd35yyca5bd5rqxzlvnay"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186576,8 +185443,43 @@ self: { text ]; testHaskellDepends = [ - base data-default-class directory filepath hspec hspec-expectations - mtl pandoc-types tasty tasty-hspec tasty-hunit temporary text + base containers data-default-class directory filepath hspec + hspec-expectations mtl pandoc-types tasty tasty-hspec tasty-hunit + temporary text + ]; + benchmarkHaskellDepends = [ + base criterion pandoc-types template-haskell text + ]; + description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "pandoc-plot_0_7_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, directory + , filepath, githash, hashable, hspec, hspec-expectations + , lifted-async, mtl, open-browser, optparse-applicative, pandoc + , pandoc-types, shakespeare, tasty, tasty-hspec, tasty-hunit + , template-haskell, text, typed-process, yaml + }: + mkDerivation { + pname = "pandoc-plot"; + version = "0.7.1.0"; + sha256 = "1pknimxwfprg6cqw9gh20ixzsh7lxs1a2jnmzahgnx203zyavd0w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory filepath hashable lifted-async + mtl pandoc pandoc-types shakespeare text typed-process yaml + ]; + executableHaskellDepends = [ + base directory filepath githash open-browser optparse-applicative + pandoc pandoc-types template-haskell text + ]; + testHaskellDepends = [ + base containers directory filepath hspec hspec-expectations + pandoc-types tasty tasty-hspec tasty-hunit text ]; benchmarkHaskellDepends = [ base criterion pandoc-types template-haskell text @@ -186730,8 +185632,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.2.8"; - sha256 = "0p556y2a54zmmdr6gnlkjb8xjcyibcr8vvlk3krwqc4zkr6rwv0s"; + version = "0.2.9"; + sha256 = "0gl5h4krn2aigxfqppa4fr8vir2s5xrh8s363frh82fgdxblhjgc"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -187868,6 +186770,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "paripari_0_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, parser-combinators, random + , tasty, tasty-hunit, text + }: + mkDerivation { + pname = "paripari"; + version = "0.7.0.0"; + sha256 = "0c5vgnzgmqcrcsaw1l5fy0lh20ns22ych8ydkq7yzb8wr3y4nvr5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring parser-combinators text + ]; + executableHaskellDepends = [ + base bytestring parser-combinators text + ]; + testHaskellDepends = [ + base bytestring parser-combinators random tasty tasty-hunit text + ]; + description = "Parser combinators with fast-path and slower fallback for error reporting"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "parport" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -188676,23 +187602,6 @@ self: { }) {}; "password" = callPackage - ({ mkDerivation, base, bytestring, doctest, QuickCheck - , quickcheck-instances, scrypt, tasty, tasty-quickcheck, text - }: - mkDerivation { - pname = "password"; - version = "1.0.0.0"; - sha256 = "08igga8jd7g0lnakmn8lq7ssyqwkknp0lbnlhbq4qwin9n8pzl0c"; - libraryHaskellDepends = [ base scrypt text ]; - testHaskellDepends = [ - base bytestring doctest QuickCheck quickcheck-instances scrypt - tasty tasty-quickcheck text - ]; - description = "plain-text password and hashed password datatypes and functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "password_2_0_1_1" = callPackage ({ mkDerivation, base, base-compat, base64, bytestring, Cabal , cabal-doctest, cryptonite, doctest, memory, QuickCheck , quickcheck-instances, scrypt, tasty, tasty-quickcheck @@ -188713,28 +187622,9 @@ self: { ]; description = "Hashing and checking of passwords"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "password-instances" = callPackage - ({ mkDerivation, aeson, base, doctest, http-api-data, password - , persistent, QuickCheck, quickcheck-instances - }: - mkDerivation { - pname = "password-instances"; - version = "1.0.0.0"; - sha256 = "0i87ij207i4zvmgji457dimhpmy8hs7ddwpqr86riyscdvzvml91"; - libraryHaskellDepends = [ - aeson base http-api-data password persistent - ]; - testHaskellDepends = [ - base doctest QuickCheck quickcheck-instances - ]; - description = "typeclass instances for password package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "password-instances_2_0_0_1" = callPackage ({ mkDerivation, aeson, base, base-compat, Cabal, cabal-doctest , doctest, http-api-data, password, persistent, QuickCheck , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck @@ -188755,7 +187645,6 @@ self: { ]; description = "typeclass instances for password package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "passwords" = callPackage @@ -188935,15 +187824,17 @@ self: { }: mkDerivation { pname = "path"; - version = "0.7.1"; - sha256 = "1z2gj4108827lb03f7cdqhijjgqjvv9glzrzfv96cxkwgi6y38jx"; + version = "0.7.0"; + sha256 = "1dl7yjmkcdm3wlbj1s5qvkl31apl3dnwz5jc8h3hdq0w722x4a5k"; + revision = "1"; + editedCabalFile = "0ph5qs50lm8ac58v8df0mmivqfilb1wz14568q06aws6gwj9qqpi"; libraryHaskellDepends = [ aeson base deepseq exceptions filepath hashable template-haskell text ]; testHaskellDepends = [ aeson base bytestring filepath genvalidity genvalidity-hspec - genvalidity-property hspec mtl QuickCheck template-haskell validity + genvalidity-property hspec mtl QuickCheck validity ]; description = "Support for well-typed paths"; license = stdenv.lib.licenses.bsd3; @@ -188972,6 +187863,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "path-extensions" = callPackage + ({ mkDerivation, base, exceptions, path }: + mkDerivation { + pname = "path-extensions"; + version = "0.0.1.0"; + sha256 = "0pkcvk9c74pjhhkikhi42nazhvff0zxz4ihm1x5p8flckyih7yyn"; + libraryHaskellDepends = [ base exceptions path ]; + description = "Enumeration of common filetype extensions for use with the path library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "path-extra" = callPackage ({ mkDerivation, attoparsec, base, path, QuickCheck , quickcheck-instances, tasty, tasty-quickcheck, text @@ -188997,8 +187899,8 @@ self: { pname = "path-io"; version = "1.6.0"; sha256 = "0hcdxxwkhdhm59p6x74k1fsgsrqfa100c83cslm1h9ln0anj1r3k"; - revision = "1"; - editedCabalFile = "1kwrkpmwmar8nwaar02m3kfy24vl3kzm0m3iq0d4ryd84a6a0dax"; + revision = "2"; + editedCabalFile = "1x52j77g075k79c7fma0khhbcpja88wylgllnky6q7nccwazm2c2"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -189091,8 +187993,8 @@ self: { pname = "paths"; version = "0.2.0.0"; sha256 = "18pzjlnmx7w79riig7qzyhw13jla92lals9lwayl23qr02ndna4v"; - revision = "2"; - editedCabalFile = "0r5nm9qqqa4nkz6aymhh62lfmmkjip25a4lk441a108i1ngkjl5m"; + revision = "3"; + editedCabalFile = "15h5fqql4jj950lm5yddpxczcbslckq9sg2ygdgqlmahjw8mwnnf"; libraryHaskellDepends = [ base bytestring deepseq directory filepath template-haskell text time @@ -189239,6 +188141,22 @@ self: { broken = true; }) {}; + "pava" = callPackage + ({ mkDerivation, base, criterion, hspec, hspec-discover, mwc-random + , vector + }: + mkDerivation { + pname = "pava"; + version = "0.1.0.0"; + sha256 = "0pi8pgfha113064fxl9vmd72drxxlj6zld4fqrf3y2qwhyikka5v"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base hspec hspec-discover vector ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion mwc-random vector ]; + description = "Greatest convex majorants and least concave minorants"; + license = stdenv.lib.licenses.gpl3Plus; + }) {}; + "paymill" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -189830,15 +188748,20 @@ self: { }) {}; "pdftotext" = callPackage - ({ mkDerivation, base, bytestring, hspec, hspec-discover - , poppler-cpp, text + ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, hspec + , hspec-discover, optparse-applicative, poppler-cpp, range, text }: mkDerivation { pname = "pdftotext"; - version = "0.0.1.0"; - sha256 = "1agxbrcpsw8s0qsv6i0vxvzvskzn5abd42l7ab2na75v9fs8p4l8"; + version = "0.1.0.0"; + sha256 = "01zdcggm5p52j7bwimfhk5x5mjnbpz4iz8g5jq3lnnc3ddd0ab6y"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring text ]; libraryPkgconfigDepends = [ poppler-cpp ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint base optparse-applicative range text + ]; testHaskellDepends = [ base hspec text ]; testToolDepends = [ hspec-discover ]; description = "Extracts text from PDF using poppler"; @@ -190599,6 +189522,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persist-state" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc-prim, QuickCheck + , test-framework, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "persist-state"; + version = "0.1.1.6"; + sha256 = "0qj7g3df1hf07k65wwvwv0amsv0wnggcca4qm0gsa4qgq9ww8qii"; + libraryHaskellDepends = [ + base bytestring containers ghc-prim text + ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 text + ]; + description = "Minimal serialization library with focus on performance"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "persist2er" = callPackage ({ mkDerivation, base, optparse-applicative, persistent, text }: mkDerivation { @@ -190617,24 +189559,6 @@ self: { }) {}; "persistable-record" = callPackage - ({ mkDerivation, array, base, containers, dlist, names-th - , product-isomorphic, quickcheck-simple, template-haskell - , th-data-compat, transformers - }: - mkDerivation { - pname = "persistable-record"; - version = "0.6.0.4"; - sha256 = "1ygqllybclw9mm0n05vh635wbz6qlsl2yhas3fxr3xhwsrrvwfkd"; - libraryHaskellDepends = [ - array base containers dlist names-th product-isomorphic - template-haskell th-data-compat transformers - ]; - testHaskellDepends = [ base quickcheck-simple ]; - description = "Binding between SQL database values and haskell records"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "persistable-record_0_6_0_5" = callPackage ({ mkDerivation, array, base, containers, dlist, names-th , product-isomorphic, quickcheck-simple, template-haskell , th-bang-compat, th-constraint-compat, th-data-compat @@ -190652,7 +189576,6 @@ self: { testHaskellDepends = [ base quickcheck-simple ]; description = "Binding between SQL database values and haskell records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistable-types-HDBC-pg" = callPackage @@ -191158,7 +190081,7 @@ self: { version = "0.3.0.0"; sha256 = "05h7wlw82ljjic50qhzlldhidz344id1fpf0yaxrhqvx7wkgyi2m"; libraryHaskellDepends = [ base time yesod ]; - description = "A library for rate limiting activities with a persistent backend."; + description = "A library for rate limiting activities with a persistent backend"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -192592,20 +191515,24 @@ self: { }) {}; "pine" = callPackage - ({ mkDerivation, base, containers, sdl2, sdl2-image, stm, text }: + ({ mkDerivation, base, containers, linear, mtl, sdl2, sdl2-image + , stm, text + }: mkDerivation { pname = "pine"; - version = "0.1.0.2"; - sha256 = "0896l27g1cmrvkq2b1bdy7sfr6z0jg2pk1mvhwr1n3f0gwgiy36i"; + version = "0.1.0.3"; + sha256 = "08m5d4wvqbkw9db0v79yrhqv9pcncl6x6zpix1861lqbw613i4iw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers sdl2 sdl2-image stm text + base containers linear mtl sdl2 sdl2-image stm text ]; executableHaskellDepends = [ - base containers sdl2 sdl2-image stm text + base containers linear mtl sdl2 sdl2-image stm text + ]; + testHaskellDepends = [ + base containers linear mtl sdl2 sdl2-image stm text ]; - testHaskellDepends = [ base containers sdl2 sdl2-image stm text ]; description = "Functional 2D Game Framework"; license = stdenv.lib.licenses.zlib; hydraPlatforms = stdenv.lib.platforms.none; @@ -193333,8 +192260,8 @@ self: { pname = "pipes-group"; version = "1.0.12"; sha256 = "1issfj3syi6lfbcdn3bhlbnlh86s92ldsb04c4ac69xipsgyhwqk"; - revision = "2"; - editedCabalFile = "1y7fh0vc6iknyxizp5hrgkkjzp2hl3ygjyxgsq6b9kh74h2hbbrp"; + revision = "3"; + editedCabalFile = "1mqqwv9w65c59lv97k9185rw8dvfcm4bk5n4z18hhgsrcjyr76n9"; libraryHaskellDepends = [ base free pipes pipes-parse transformers ]; @@ -195377,29 +194304,6 @@ self: { }) {}; "poly" = callPackage - ({ mkDerivation, base, deepseq, gauge, primitive, QuickCheck - , quickcheck-classes, semirings, tasty, tasty-quickcheck, vector - , vector-algorithms - }: - mkDerivation { - pname = "poly"; - version = "0.3.3.0"; - sha256 = "1hj77nzyfipsycy77h8ccsx4iyy47ljjv0j8ckihxhaq36g0fpan"; - revision = "1"; - editedCabalFile = "0iv4363iq22hkwrkgsijgv8ykvj26q895rsbzrrzkydblf4psra9"; - libraryHaskellDepends = [ - base deepseq primitive semirings vector vector-algorithms - ]; - testHaskellDepends = [ - base QuickCheck quickcheck-classes semirings tasty tasty-quickcheck - vector - ]; - benchmarkHaskellDepends = [ base deepseq gauge semirings vector ]; - description = "Polynomials"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "poly_0_4_0_0" = callPackage ({ mkDerivation, base, deepseq, gauge, mod, primitive, QuickCheck , quickcheck-classes, semirings, tasty, tasty-quickcheck, vector , vector-algorithms @@ -195418,7 +194322,6 @@ self: { benchmarkHaskellDepends = [ base deepseq gauge semirings vector ]; description = "Polynomials"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "poly-arity" = callPackage @@ -195584,42 +194487,6 @@ self: { }) {}; "polysemy" = callPackage - ({ mkDerivation, async, base, Cabal, cabal-doctest, containers - , criterion, doctest, first-class-families, free, freer-simple - , hspec, hspec-discover, inspection-testing, loopbreaker, mtl, stm - , syb, template-haskell, th-abstraction, transformers, type-errors - , type-errors-pretty, unagi-chan - }: - mkDerivation { - pname = "polysemy"; - version = "1.2.3.0"; - sha256 = "0vb0k3kmzsjw45p220nw780wlax1r7mv56j06vkzqclkf8s5jky3"; - revision = "2"; - editedCabalFile = "0dzmkna6jb2im9kdslp90z6ynk2qzzg2j495i3y933ywdavvci93"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - async base containers first-class-families loopbreaker mtl stm syb - template-haskell th-abstraction transformers type-errors - type-errors-pretty unagi-chan - ]; - testHaskellDepends = [ - async base containers doctest first-class-families hspec - inspection-testing loopbreaker mtl stm syb template-haskell - th-abstraction transformers type-errors type-errors-pretty - unagi-chan - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - async base containers criterion first-class-families free - freer-simple loopbreaker mtl stm syb template-haskell - th-abstraction transformers type-errors type-errors-pretty - unagi-chan - ]; - description = "Higher-order, low-boilerplate, zero-cost free monads"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "polysemy_1_3_0_0" = callPackage ({ mkDerivation, async, base, Cabal, cabal-doctest, containers , criterion, doctest, first-class-families, free, freer-simple , hspec, hspec-discover, inspection-testing, mtl, QuickCheck, stm @@ -195630,8 +194497,8 @@ self: { pname = "polysemy"; version = "1.3.0.0"; sha256 = "0p5g1n5b0dfkadqpqf2ka25dblimwqhxwx5ax0mxwixb0jwd0pvb"; - revision = "1"; - editedCabalFile = "02fkrfdn7pwslc9yffgx3fis8ag36m3dhigw67ns1s16gsf5a7dz"; + revision = "2"; + editedCabalFile = "1dn5897ggd6rf5ffl6k52x4ghncgv2ls14nppayw9l9zi1mfjxps"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl QuickCheck stm syb @@ -195652,7 +194519,6 @@ self: { ]; description = "Higher-order, low-boilerplate, zero-cost free monads"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polysemy-RandomFu" = callPackage @@ -195701,6 +194567,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "polysemy-webserver" = callPackage + ({ mkDerivation, base, bytestring, hspec, http-conduit, http-types + , polysemy, polysemy-plugin, wai, warp + }: + mkDerivation { + pname = "polysemy-webserver"; + version = "0.1.0.0"; + sha256 = "1rlmx5l3n87gy3dwf3fl6jpckn2gn70v7avdw52jaqjdlip0f6bb"; + libraryHaskellDepends = [ + base bytestring http-types polysemy polysemy-plugin wai warp + ]; + testHaskellDepends = [ + base bytestring hspec http-conduit http-types polysemy + polysemy-plugin wai warp + ]; + description = "Start web servers from within a Polysemy effect stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "polysemy-zoo" = callPackage ({ mkDerivation, async, base, compact, constraints, containers , contravariant, exceptions, ghc-prim, hspec, hspec-discover, mtl @@ -195968,8 +194853,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp-extras"; - version = "0.1.0.3"; - sha256 = "055ir657g8rcxd419h5fjpk30ifb4r7639gxpsnjy3930x0azcb4"; + version = "0.1.0.4"; + sha256 = "1mf65mdkykn0s0mqix82m9psj2vrz9rc7i8gzfdv1iarlxzz5qab"; libraryHaskellDepends = [ base data-default pontarius-xmpp text time xml-types ]; @@ -196094,8 +194979,8 @@ self: { }: mkDerivation { pname = "popkey"; - version = "0.1.0.0"; - sha256 = "1fx7qsc5kl3iq013kgdjhz0crzh7kiffqq1aj14fxlhjyp8k8v6m"; + version = "0.1.0.1"; + sha256 = "1nlbd54q7npxm9hk4f289md6rch0sqnl236iimwsrwllpq6rbxbz"; libraryHaskellDepends = [ base bitvec bytestring containers hw-bits hw-prim hw-rankselect hw-rankselect-base store text vector @@ -196720,35 +195605,35 @@ self: { }) {}; "postgres-websockets" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , containers, contravariant, either, envparse, hasql - , hasql-notifications, hasql-pool, hspec, hspec-wai, hspec-wai-json - , http-types, jose, lens, postgresql-libpq, protolude, retry, stm - , stm-containers, stringsearch, text, time, transformers - , unordered-containers, wai, wai-app-static, wai-extra - , wai-websockets, warp, websockets + ({ mkDerivation, aeson, alarmclock, auto-update, base + , base64-bytestring, bytestring, contravariant, either, envparse + , hasql, hasql-notifications, hasql-pool, hspec, hspec-wai + , hspec-wai-json, http-types, jose, lens, postgresql-libpq + , protolude, retry, stm, stm-containers, stringsearch, text, time + , transformers, unordered-containers, wai, wai-app-static + , wai-extra, wai-websockets, warp, websockets }: mkDerivation { pname = "postgres-websockets"; - version = "0.6.1.1"; - sha256 = "18lsn8c4nd4rw3df9g5w684f7ggrxq9a3calj1ipqz1nf50mwbqx"; + version = "0.7.0.0"; + sha256 = "0kjwj81ccn29iflx3sszb8sjap9zvi22sm1dm4vg7qv33n0jgfmp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring contravariant either hasql + aeson alarmclock base bytestring contravariant either hasql hasql-notifications hasql-pool http-types jose lens postgresql-libpq protolude retry stm stm-containers stringsearch text time unordered-containers wai wai-websockets websockets ]; executableHaskellDepends = [ - base base64-bytestring bytestring envparse hasql hasql-pool - http-types protolude text time transformers wai wai-app-static - wai-extra warp + auto-update base base64-bytestring bytestring envparse hasql + hasql-pool http-types protolude text time transformers wai + wai-app-static wai-extra warp ]; testHaskellDepends = [ - aeson base containers hasql hasql-notifications hasql-pool hspec - hspec-wai hspec-wai-json http-types protolude stm - unordered-containers wai-extra + aeson base hasql hasql-notifications hasql-pool hspec hspec-wai + hspec-wai-json http-types protolude stm time unordered-containers + wai-extra ]; description = "Middleware to map LISTEN/NOTIFY messages to Websockets"; license = stdenv.lib.licenses.bsd3; @@ -196785,6 +195670,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-binary_0_12_3" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, bytestring-strict-builder, containers, conversion + , conversion-bytestring, conversion-text, criterion, json-ast + , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck + , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.12.3"; + sha256 = "0z31d7bw7m43195maqw5pba3l2l98nnkck0gzaghk05id0p7rlmd"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring + bytestring-strict-builder containers loch-th network-ip + placeholders scientific text time transformers unordered-containers + uuid vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + loch-th network-ip placeholders postgresql-libpq QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-common" = callPackage ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: mkDerivation { @@ -196901,6 +195816,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) postgresql;}; + "postgresql-libpq-notify" = callPackage + ({ mkDerivation, async, base, hspec, postgres-options + , postgresql-libpq, stm, text, tmp-postgres + }: + mkDerivation { + pname = "postgresql-libpq-notify"; + version = "0.2.0.0"; + sha256 = "06k63ix0d836w4x7q49m003wrxpbnnlvhmvbvk8mn9752xv55vkc"; + libraryHaskellDepends = [ base postgresql-libpq stm ]; + testHaskellDepends = [ + async base hspec postgres-options postgresql-libpq text + tmp-postgres + ]; + description = "Minimal dependency PostgreSQL notifications library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "postgresql-lo-stream" = callPackage ({ mkDerivation, base, bytestring, io-streams, lifted-base , monad-loops, mtl, postgresql-simple @@ -196963,23 +195895,40 @@ self: { license = "GPL"; }) {}; + "postgresql-placeholder-converter" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, hspec + , hspec-discover, mtl, utf8-string + }: + mkDerivation { + pname = "postgresql-placeholder-converter"; + version = "0.1.0.0"; + sha256 = "1dprqv0r00nrx6m0byqfzpb91h5kz3nxd0w0m21150l68sj2d8ys"; + libraryHaskellDepends = [ + attoparsec base bytestring mtl utf8-string + ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Converter for question mark style and dollar sign style of PostgreSQL SQL"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "postgresql-pure" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring - , cassava, clock, containers, convertible, cryptohash-md5 - , data-default-class, deepseq, doctest, double-conversion, HDBC - , HDBC-postgresql, HDBC-session, homotuple, hourglass, hspec - , hspec-core, HUnit, list-tuple, memory, mtl, network, old-time - , Only, optparse-applicative, persistable-record, postgres-wire + , Cabal, cassava, clock, containers, convertible, cryptohash-md5 + , data-default-class, deepseq, directory, doctest + , double-conversion, HDBC, HDBC-postgresql, HDBC-session, homotuple + , hourglass, hspec, hspec-core, HUnit, list-tuple, memory, mtl + , network, old-time, Only, optparse-applicative, persistable-record , postgresql-binary, postgresql-libpq, postgresql-simple - , postgresql-typed, pretty-hex, QuickCheck, random-shuffle - , relational-query, relational-query-HDBC, relational-record - , safe-exceptions, scientific, single-tuple, text, time - , utf8-string, vector + , pretty-hex, QuickCheck, random-shuffle, relational-query + , relational-query-HDBC, relational-record, safe-exceptions + , scientific, single-tuple, text, time, utf8-string, vector }: mkDerivation { pname = "postgresql-pure"; - version = "0.1.2.0"; - sha256 = "1dsjciaryxqizhg33axlcvj7i0h9xi4hz956kijqvmy0lb0bjscf"; + version = "0.1.3.0"; + sha256 = "1p6v7imz61svz03nh114qxl5fks6aibs78sgmi3my8zjdfb34ddk"; + setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring containers convertible cryptohash-md5 data-default-class double-conversion HDBC homotuple @@ -196999,16 +195948,14 @@ self: { attoparsec base base16-bytestring bytestring cassava clock containers convertible cryptohash-md5 data-default-class deepseq double-conversion HDBC homotuple hourglass list-tuple memory mtl - network Only optparse-applicative postgres-wire postgresql-binary - postgresql-libpq postgresql-simple postgresql-typed pretty-hex - random-shuffle safe-exceptions scientific single-tuple text time - utf8-string vector + network Only optparse-applicative postgresql-binary + postgresql-libpq postgresql-simple pretty-hex random-shuffle + safe-exceptions scientific single-tuple text time utf8-string + vector ]; description = "pure Haskell PostgreSQL driver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {postgres-wire = null;}; + }) {}; "postgresql-query" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring @@ -197379,8 +196326,8 @@ self: { }: mkDerivation { pname = "postgrest"; - version = "7.0.1"; - sha256 = "1cn69dinfv3y8ymsa364b9b0ly3dg80and902gamymb9v89jpsgf"; + version = "7.0.0"; + sha256 = "03iya4w39qp25ms8m58mw6pvlriw80h6rdg1cb7az7353m2ndzys"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197409,6 +196356,55 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgrest_7_0_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async + , auto-update, base, base64-bytestring, bytestring + , case-insensitive, cassava, configurator-pg, containers + , contravariant, contravariant-extras, cookie, directory, either + , gitrev, hasql, hasql-pool, hasql-transaction, heredoc, hspec + , hspec-wai, hspec-wai-json, HTTP, http-types + , insert-ordered-containers, interpolatedstring-perl6, jose, lens + , lens-aeson, monad-control, network, network-uri + , optparse-applicative, parsec, process, protolude, Ranged-sets + , regex-tdfa, retry, scientific, swagger2, text, time + , transformers-base, unix, unordered-containers, vector, wai + , wai-cors, wai-extra, wai-middleware-static, warp + }: + mkDerivation { + pname = "postgrest"; + version = "7.0.1"; + sha256 = "1cn69dinfv3y8ymsa364b9b0ly3dg80and902gamymb9v89jpsgf"; + revision = "1"; + editedCabalFile = "0s8zzv6vjs4mp6m6l6ahfpfrx551zzp3nh13qk5qxk992x3jxb8b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base base64-bytestring bytestring + case-insensitive cassava configurator-pg containers contravariant + contravariant-extras cookie either gitrev hasql hasql-pool + hasql-transaction heredoc HTTP http-types insert-ordered-containers + interpolatedstring-perl6 jose lens lens-aeson network-uri + optparse-applicative parsec protolude Ranged-sets regex-tdfa + scientific swagger2 text time unordered-containers vector wai + wai-cors wai-extra wai-middleware-static + ]; + executableHaskellDepends = [ + auto-update base base64-bytestring bytestring directory either + hasql hasql-pool hasql-transaction network protolude retry text + time unix wai warp + ]; + testHaskellDepends = [ + aeson aeson-qq async auto-update base base64-bytestring bytestring + case-insensitive cassava containers contravariant hasql hasql-pool + hasql-transaction heredoc hspec hspec-wai hspec-wai-json http-types + lens lens-aeson monad-control process protolude regex-tdfa text + time transformers-base wai wai-extra + ]; + description = "REST API for any Postgres database"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgrest-ws" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base64-bytestring , bytestring, configurator, containers, contravariant, either @@ -197860,10 +196856,8 @@ self: { ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "pqueue"; - version = "1.4.1.2"; - sha256 = "1v4zhv2sc1zsw91hvnarkjhayx2dnf7ccxz6rrhsqpcs0szaranj"; - revision = "1"; - editedCabalFile = "1la186z2np3nv06p0485xwg342gyjp7a2ikg73qs7mbg086352zs"; + version = "1.4.1.3"; + sha256 = "1sz7hlnfd86hbwrgqxczmsjsl1ki0ryi9dgzscxlsgjkdgcdia2p"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck ]; description = "Reliable, persistent, fast priority queues"; @@ -198449,8 +197443,8 @@ self: { }: mkDerivation { pname = "preql"; - version = "0.2"; - sha256 = "062px686v2rlpc2bplva900vk35k7hdvxrpjj9dfkj02knqmjxi7"; + version = "0.3"; + sha256 = "03zdkxlkvqyccvi682w0inxl70fvzi4l56kicp9qrb661jaqvy9q"; libraryHaskellDepends = [ aeson array base binary-parser bytestring bytestring-strict-builder contravariant free mtl postgresql-binary postgresql-libpq @@ -198752,30 +197746,6 @@ self: { }) {}; "pretty-simple" = callPackage - ({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest - , containers, criterion, doctest, Glob, mtl, QuickCheck - , template-haskell, text, transformers - }: - mkDerivation { - pname = "pretty-simple"; - version = "3.2.2.0"; - sha256 = "092vv0dvyab0vjchhw6cvc3x3wp7qb04q6n6ibjvpg472x3hnl3z"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ansi-terminal base containers mtl text transformers - ]; - testHaskellDepends = [ - base doctest Glob QuickCheck template-haskell - ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "pretty printer for data types with a 'Show' instance"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; - }) {}; - - "pretty-simple_3_2_3_0" = callPackage ({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest , containers, criterion, doctest, Glob, mtl, QuickCheck , template-haskell, text, transformers @@ -198796,7 +197766,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "pretty printer for data types with a 'Show' instance"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; }) {}; @@ -198980,10 +197949,10 @@ self: { ({ mkDerivation, base, graphviz, prettyprinter, text }: mkDerivation { pname = "prettyprinter-graphviz"; - version = "0.1.1.1"; - sha256 = "1cpzqvy9w8ims5hqhv5v18r0dgj3708gprdrjxbja13nfsb6bsg9"; + version = "1.0.0.2"; + sha256 = "1bbbnhdigh31hbsh2abmr65bk3q927cdbm8j2qsvy4472ksylzpl"; libraryHaskellDepends = [ base graphviz prettyprinter text ]; - description = "a prettyprinter backend for graphviz"; + description = "A prettyprinter backend for graphviz"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -199712,16 +198681,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_9_0" = callPackage + "process_1_6_10_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.9.0"; - sha256 = "1shxwl392swdqffxdg2940y3yiml24iww9cy2pk89pv8r89x7yzy"; - revision = "2"; - editedCabalFile = "17m1xsxbg7fmmp0x7yj5y50xdf69cvs5v79609nhxm59zsbffb9p"; + version = "1.6.10.0"; + sha256 = "01c50qhrsvymbifa3lzyq6g4hmj6jl3awjp1jmbhdkmfdfaq3v16"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -199882,7 +198849,7 @@ self: { semigroups tasty tasty-hunit text transformers transformers-compat void ]; - description = "Streaming interface to system processes."; + description = "Streaming interface to system processes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -199920,7 +198887,7 @@ self: { base data-default GLUT hsnoise NumInstances OpenGL random time transformers utf8-string vector-space ]; - description = "Computer graphics for kids and artists with Processing implemented in Haskell."; + description = "Computer graphics for kids and artists with Processing implemented in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -200669,8 +199636,8 @@ self: { }: mkDerivation { pname = "prometheus-proc"; - version = "0.1.2.0"; - sha256 = "0lia1r6bjh0m55s7nrfhn76v58yai8brlpi0q193wh0ypsg71j9l"; + version = "0.1.3.0"; + sha256 = "0pljmmas8wsigwd3m2ddjzn9mbsgsh0hbf1kz7301w8g5hnjfx03"; libraryHaskellDepends = [ base directory filepath prometheus-client regex-applicative text unix unix-memory @@ -201008,27 +199975,6 @@ self: { }) {}; "proto-lens" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim - , lens-family, parsec, pretty, primitive, profunctors, QuickCheck - , tagged, tasty, tasty-quickcheck, text, transformers, vector - }: - mkDerivation { - pname = "proto-lens"; - version = "0.6.0.0"; - sha256 = "0k2j5b8dxvjx2gxjw5r7pc7r0qiihc2a5j2y3q0hmqljn423zcx6"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim lens-family parsec - pretty primitive profunctors tagged text transformers vector - ]; - testHaskellDepends = [ - base bytestring QuickCheck tasty tasty-quickcheck vector - ]; - description = "A lens-based implementation of protocol buffers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens_0_7_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , lens-family, parsec, pretty, primitive, profunctors, QuickCheck , tagged, tasty, tasty-quickcheck, text, transformers, vector @@ -201047,25 +199993,9 @@ self: { ]; description = "A lens-based implementation of protocol buffers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-arbitrary" = callPackage - ({ mkDerivation, base, bytestring, containers, lens-family - , proto-lens, QuickCheck, text - }: - mkDerivation { - pname = "proto-lens-arbitrary"; - version = "0.1.2.8"; - sha256 = "0jms2wldjnv455gc3mf232500nidh9vh8g07fw7sdc4m2clch043"; - libraryHaskellDepends = [ - base bytestring containers lens-family proto-lens QuickCheck text - ]; - description = "Arbitrary instances for proto-lens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens-arbitrary_0_1_2_9" = callPackage ({ mkDerivation, base, bytestring, containers, lens-family , proto-lens, QuickCheck, text }: @@ -201078,7 +200008,6 @@ self: { ]; description = "Arbitrary instances for proto-lens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-combinators" = callPackage @@ -201139,19 +200068,6 @@ self: { }) {}; "proto-lens-optparse" = callPackage - ({ mkDerivation, base, optparse-applicative, proto-lens, text }: - mkDerivation { - pname = "proto-lens-optparse"; - version = "0.1.1.6"; - sha256 = "105vrzx5qbcby3g1l7fd3alwlsaf0prjnhmy4i4cv9qrkg6qn34q"; - libraryHaskellDepends = [ - base optparse-applicative proto-lens text - ]; - description = "Adapting proto-lens to optparse-applicative ReadMs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens-optparse_0_1_1_7" = callPackage ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; @@ -201162,28 +200078,9 @@ self: { ]; description = "Adapting proto-lens to optparse-applicative ReadMs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-protobuf-types" = callPackage - ({ mkDerivation, base, Cabal, lens-family, proto-lens - , proto-lens-protoc, proto-lens-runtime, proto-lens-setup, protobuf - , text - }: - mkDerivation { - pname = "proto-lens-protobuf-types"; - version = "0.6.0.0"; - sha256 = "1mnd8v9wryv59qrc44r5xkibndr5jpa8b7lb1k7hnk5261dffmc7"; - setupHaskellDepends = [ base Cabal proto-lens-setup ]; - libraryHaskellDepends = [ - base lens-family proto-lens proto-lens-runtime text - ]; - libraryToolDepends = [ proto-lens-protoc protobuf ]; - description = "Basic protocol buffer message types"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) protobuf;}; - - "proto-lens-protobuf-types_0_7_0_0" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens , proto-lens-protoc, proto-lens-runtime, proto-lens-setup, protobuf , text @@ -201199,31 +200096,9 @@ self: { libraryToolDepends = [ proto-lens-protoc protobuf ]; description = "Basic protocol buffer message types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) protobuf;}; "proto-lens-protoc" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath, ghc - , ghc-paths, ghc-source-gen, lens-family, pretty, proto-lens - , proto-lens-runtime, protobuf, text - }: - mkDerivation { - pname = "proto-lens-protoc"; - version = "0.6.0.0"; - sha256 = "1gi7k48rpmzh3awgdki4b2cg2plh8n8fv397iv6h1ly8jh5p8imr"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base filepath ]; - libraryToolDepends = [ protobuf ]; - executableHaskellDepends = [ - base bytestring containers filepath ghc ghc-paths ghc-source-gen - lens-family pretty proto-lens proto-lens-runtime text - ]; - description = "Protocol buffer compiler for the proto-lens library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) protobuf;}; - - "proto-lens-protoc_0_7_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, ghc , ghc-paths, ghc-source-gen, lens-family, pretty, proto-lens , proto-lens-runtime, protobuf, text @@ -201242,26 +200117,9 @@ self: { ]; description = "Protocol buffer compiler for the proto-lens library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) protobuf;}; "proto-lens-runtime" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, filepath - , lens-family, proto-lens, text, vector - }: - mkDerivation { - pname = "proto-lens-runtime"; - version = "0.6.0.0"; - sha256 = "0wxfa4q88i1d4zqv9nybw6hrh5lw84vmkzy5iqw2hzwjym0p3wcn"; - libraryHaskellDepends = [ - base bytestring containers deepseq filepath lens-family proto-lens - text vector - ]; - doHaddock = false; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens-runtime_0_7_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, filepath , lens-family, proto-lens, text, vector }: @@ -201275,26 +200133,9 @@ self: { ]; doHaddock = false; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-setup" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, deepseq - , directory, filepath, process, proto-lens-protoc, temporary, text - }: - mkDerivation { - pname = "proto-lens-setup"; - version = "0.4.0.3"; - sha256 = "1di6nxx94d01rpclmcfc0gzf8x4qp61haw40mr2i9djxwczvrqbd"; - libraryHaskellDepends = [ - base bytestring Cabal containers deepseq directory filepath process - proto-lens-protoc temporary text - ]; - description = "Cabal support for codegen with proto-lens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens-setup_0_4_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, deepseq , directory, filepath, process, proto-lens-protoc, temporary, text }: @@ -201308,7 +200149,6 @@ self: { ]; description = "Cabal support for codegen with proto-lens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto3-suite" = callPackage @@ -201928,23 +200768,6 @@ self: { }) {}; "publicsuffix" = callPackage - ({ mkDerivation, base, criterion, filepath, hspec, random - , template-haskell - }: - mkDerivation { - pname = "publicsuffix"; - version = "0.20191003"; - sha256 = "1birj2k23v93w89mcrn522mqyfipv3smrdhag6k6pgsi628gihx7"; - revision = "1"; - editedCabalFile = "1diqb9knkhlryyygzs959zwd5d60wdkbmlza76cmsizkqq4vzhds"; - libraryHaskellDepends = [ base filepath template-haskell ]; - testHaskellDepends = [ base hspec ]; - benchmarkHaskellDepends = [ base criterion random ]; - description = "The publicsuffix list exposed as proper Haskell types"; - license = stdenv.lib.licenses.mit; - }) {}; - - "publicsuffix_0_20200526" = callPackage ({ mkDerivation, base, criterion, filepath, hspec, random , template-haskell }: @@ -201957,7 +200780,6 @@ self: { benchmarkHaskellDepends = [ base criterion random ]; description = "The publicsuffix list exposed as proper Haskell types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "publicsuffixlist" = callPackage @@ -202556,26 +201378,6 @@ self: { }) {}; "purescript-bridge" = callPackage - ({ mkDerivation, base, containers, directory, filepath - , generic-deriving, hspec, hspec-expectations-pretty-diff, lens - , mtl, text, transformers - }: - mkDerivation { - pname = "purescript-bridge"; - version = "0.13.0.0"; - sha256 = "0jai0vrfw997w7gjs168bk8n2xjw30hnhd82pch5n58w1sy6n6ib"; - libraryHaskellDepends = [ - base containers directory filepath generic-deriving lens mtl text - transformers - ]; - testHaskellDepends = [ - base containers hspec hspec-expectations-pretty-diff text - ]; - description = "Generate PureScript data types from Haskell data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "purescript-bridge_0_14_0_0" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, hspec, hspec-expectations-pretty-diff, lens , mtl, text, transformers @@ -202593,7 +201395,6 @@ self: { ]; description = "Generate PureScript data types from Haskell data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "purescript-bundle-fast" = callPackage @@ -204151,33 +202952,6 @@ self: { }) {}; "quickcheck-instances" = callPackage - ({ mkDerivation, array, base, base-compat, bytestring - , case-insensitive, containers, hashable, old-time, QuickCheck - , scientific, splitmix, tagged, text, time, time-compat - , transformers, transformers-compat, unordered-containers - , uuid-types, vector - }: - mkDerivation { - pname = "quickcheck-instances"; - version = "0.3.22"; - sha256 = "14asr9r7da3w7p4hjj51w2yb002nz8x0np8hdz9z4yjvi60vyrax"; - revision = "4"; - editedCabalFile = "0wx4jcmiv6f3iwc92wf4l2j9025bv4997rn2ycl08ld585m1xlgv"; - libraryHaskellDepends = [ - array base base-compat bytestring case-insensitive containers - hashable old-time QuickCheck scientific splitmix tagged text time - time-compat transformers transformers-compat unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - base containers QuickCheck tagged uuid-types - ]; - benchmarkHaskellDepends = [ base bytestring QuickCheck ]; - description = "Common quickcheck instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-instances_0_3_23" = callPackage ({ mkDerivation, array, base, base-compat, bytestring , case-insensitive, containers, hashable, old-time, QuickCheck , scientific, splitmix, tagged, text, these, time, time-compat @@ -204202,7 +202976,6 @@ self: { benchmarkHaskellDepends = [ base bytestring QuickCheck ]; description = "Common quickcheck instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-io" = callPackage @@ -205448,25 +204221,6 @@ self: { }) {}; "rainbox" = callPackage - ({ mkDerivation, base, bytestring, containers, lens, QuickCheck - , rainbow, tasty, tasty-quickcheck, text - }: - mkDerivation { - pname = "rainbox"; - version = "0.24.4.0"; - sha256 = "13532qzpvlq976049bdfyqzhb4g843ij3b7w654xqb2ng9q4inwz"; - libraryHaskellDepends = [ - base bytestring containers lens rainbow text - ]; - testHaskellDepends = [ - base bytestring containers lens QuickCheck rainbow tasty - tasty-quickcheck text - ]; - description = "Two-dimensional box pretty printing, with colors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rainbox_0_26_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, lens, QuickCheck , rainbow, tasty, tasty-quickcheck, text }: @@ -205483,7 +204237,6 @@ self: { ]; description = "Two-dimensional box pretty printing, with colors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rake" = callPackage @@ -205643,7 +204396,7 @@ self: { sha256 = "14fnk2q702qm0mh30r9kznbh4ikpv4fsd5mrnwphm5d06vmq6hq9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell98 ]; - description = "'$' in reverse."; + description = "'$' in reverse"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -206658,28 +205411,6 @@ self: { }) {}; "rattle" = callPackage - ({ mkDerivation, base, bytestring, cryptohash-sha256, deepseq - , directory, extra, filepath, filepattern, hashable, shake, time - , transformers, unordered-containers - }: - mkDerivation { - pname = "rattle"; - version = "0.1"; - sha256 = "10ra58lqhi9pn92rgyv6lkz7036kbq9gr6ly5w1lqdayla10fqhr"; - revision = "2"; - editedCabalFile = "0h37mx0iv53jdmsqla40fsnnmkzld6a2r0468ylbhgi2arrda0w9"; - libraryHaskellDepends = [ - base bytestring cryptohash-sha256 deepseq directory extra filepath - hashable shake time transformers unordered-containers - ]; - testHaskellDepends = [ base directory extra filepattern shake ]; - description = "Forward build system, with caching and speculation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "rattle_0_2" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, cmdargs , cryptohash-sha256, deepseq, directory, extra, filepath , filepattern, hashable, heaps, js-dgtable, js-flot, js-jquery @@ -206722,8 +205453,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "9.1.3"; - sha256 = "01schszjdy1dvmbr3ml1fxncm7a3bvjvfnvhwc6r8lwfmz4vm3hc"; + version = "9.1.4"; + sha256 = "189nyd8zbylmc2r65m4vag1h47d6gzcrvp6k81yhlci8bqcddncp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207061,8 +205792,8 @@ self: { }: mkDerivation { pname = "rdf4h"; - version = "4.0.0"; - sha256 = "10436ff2pp3jxjkfaqg71d1hrn7xq6dpp5xd6gbkf22a1hq4g93b"; + version = "4.0.1"; + sha256 = "1nnkgl8xsh7xp6wsfd295qxh3yay6v7isxkh0xx18sdpm7lwdydq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207905,28 +206636,6 @@ self: { }) {}; "rebase" = callPackage - ({ mkDerivation, base, base-prelude, bifunctors, bytestring - , comonad, containers, contravariant, contravariant-extras, deepseq - , dlist, either, fail, hashable, mtl, profunctors, scientific - , selective, semigroupoids, semigroups, stm, text, time - , transformers, unordered-containers, uuid, vector, void - }: - mkDerivation { - pname = "rebase"; - version = "1.4.1"; - sha256 = "13fvhsxkzrghl6d2isjsxjkfkbkpnfgbdb20lc1z7izqjkvjj8rc"; - libraryHaskellDepends = [ - base base-prelude bifunctors bytestring comonad containers - contravariant contravariant-extras deepseq dlist either fail - hashable mtl profunctors scientific selective semigroupoids - semigroups stm text time transformers unordered-containers uuid - vector void - ]; - description = "A more progressive alternative to the \"base\" package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rebase_1_6_1" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, contravariant-extras, deepseq, dlist, either , hashable, mtl, profunctors, scientific, selective, semigroupoids @@ -207945,7 +206654,6 @@ self: { ]; description = "A more progressive alternative to the \"base\" package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rebindable" = callPackage @@ -209173,8 +207881,8 @@ self: { }: mkDerivation { pname = "reflex-ghci"; - version = "0.1.4.0"; - sha256 = "16kd9slfm6kczgcmh4n42gyxpyykz6s6hafkgsh66lcd7a1d85s8"; + version = "0.1.4.1"; + sha256 = "0505glpxc6yf7nwkgz9l2m8diqm39sal7vg9h1g8f8i3x6ab1rw3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210689,28 +209397,6 @@ self: { }) {}; "relational-query" = callPackage - ({ mkDerivation, array, base, bytestring, containers, dlist - , names-th, persistable-record, product-isomorphic - , quickcheck-simple, sql-words, template-haskell, text - , th-reify-compat, time, time-locale-compat, transformers - }: - mkDerivation { - pname = "relational-query"; - version = "0.12.2.2"; - sha256 = "0768cw6c5chzdcwshjjniysik5d1yj7zvhwncqnn0wgy4gp6kzjv"; - libraryHaskellDepends = [ - array base bytestring containers dlist names-th persistable-record - product-isomorphic sql-words template-haskell text th-reify-compat - time time-locale-compat transformers - ]; - testHaskellDepends = [ - base containers product-isomorphic quickcheck-simple transformers - ]; - description = "Typeful, Modular, Relational, algebraic query engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-query_0_12_2_3" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, product-isomorphic , quickcheck-simple, sql-words, template-haskell, text @@ -210732,7 +209418,6 @@ self: { ]; description = "Typeful, Modular, Relational, algebraic query engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-query-HDBC" = callPackage @@ -210912,29 +209597,6 @@ self: { }) {}; "relude" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, doctest - , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, QuickCheck, stm - , text, transformers, unordered-containers - }: - mkDerivation { - pname = "relude"; - version = "0.6.0.0"; - sha256 = "0idf1r6hv9aksvis08z5bmnzc03k713609zcpy33655qwyl28fic"; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-prim hashable mtl stm text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bytestring doctest Glob hedgehog QuickCheck text - ]; - benchmarkHaskellDepends = [ - base containers gauge unordered-containers - ]; - description = "Custom prelude from Kowainik"; - license = stdenv.lib.licenses.mit; - }) {}; - - "relude_0_7_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, text , transformers, unordered-containers @@ -210953,7 +209615,6 @@ self: { benchmarkHaskellDepends = [ base gauge unordered-containers ]; description = "Safe, performant, user-friendly and lightweight Haskell Standard Library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "remark" = callPackage @@ -211570,23 +210231,23 @@ self: { }: mkDerivation { pname = "replace-attoparsec"; - version = "1.2.2.0"; - sha256 = "1byrd62j7aafjn959xciam6s17zjvrisfi6q4y6ndvla77rg09cm"; + version = "1.4.0.0"; + sha256 = "1w0dlwfipli94g3fbqh118pmwgyzgrcwp32s60sk7a78cbr5mic4"; libraryHaskellDepends = [ attoparsec base bytestring text ]; testHaskellDepends = [ attoparsec base bytestring Cabal parsers text ]; - description = "Find, replace, and edit text patterns with Attoparsec parsers (instead of regex)"; + description = "Find, replace, and split string patterns with Attoparsec parsers (instead of regex)"; license = stdenv.lib.licenses.bsd2; }) {}; - "replace-attoparsec_1_4_0_0" = callPackage + "replace-attoparsec_1_4_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, parsers, text }: mkDerivation { pname = "replace-attoparsec"; - version = "1.4.0.0"; - sha256 = "1w0dlwfipli94g3fbqh118pmwgyzgrcwp32s60sk7a78cbr5mic4"; + version = "1.4.1.0"; + sha256 = "0g913l7vvxz65pfl6cyni8827wri5iyj4jszvyrxzav58z4ybi20"; libraryHaskellDepends = [ attoparsec base bytestring text ]; testHaskellDepends = [ attoparsec base bytestring Cabal parsers text @@ -211597,18 +210258,6 @@ self: { }) {}; "replace-megaparsec" = callPackage - ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }: - mkDerivation { - pname = "replace-megaparsec"; - version = "1.2.1.0"; - sha256 = "1k00a6xqdk8fgcja0v0flydk3afrpdrn4cf1csin7waqkl2kwvrb"; - libraryHaskellDepends = [ base bytestring megaparsec text ]; - testHaskellDepends = [ base bytestring Cabal megaparsec text ]; - description = "Find, replace, and edit text patterns with Megaparsec parsers"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "replace-megaparsec_1_4_1_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }: mkDerivation { pname = "replace-megaparsec"; @@ -211618,6 +210267,22 @@ self: { testHaskellDepends = [ base bytestring Cabal megaparsec text ]; description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)"; license = stdenv.lib.licenses.bsd2; + }) {}; + + "replace-megaparsec_1_4_2_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, megaparsec + , parser-combinators, text + }: + mkDerivation { + pname = "replace-megaparsec"; + version = "1.4.2.0"; + sha256 = "0d3p138aqyp1f9bhq85vgzw67vis3cqlp6k90hlfiyq14ry5ck6f"; + libraryHaskellDepends = [ + base bytestring megaparsec parser-combinators text + ]; + testHaskellDepends = [ base bytestring Cabal megaparsec text ]; + description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)"; + license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -211851,25 +210516,24 @@ self: { , bytestring, case-insensitive, connection, hspec, hspec-core , hspec-discover, http-api-data, http-client, http-client-tls , http-types, modern-uri, monad-control, mtl, QuickCheck, retry - , text, time, transformers, transformers-base, unordered-containers + , template-haskell, text, time, transformers, transformers-base + , unordered-containers }: mkDerivation { pname = "req"; - version = "3.1.0"; - sha256 = "0j53bbhyhjy2q91lnvpwldjsck57p72y5l815c9mi0gzihchyksb"; - revision = "2"; - editedCabalFile = "008s2zd1hxfxw9vpvk0ax6fg4q0rshn13f9kgngfvg6diicgsn5h"; + version = "3.2.0"; + sha256 = "1r6fkhn99v6vil8khd23pdai3j6wgn724cy00q5x20fn3jz88ksw"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring case-insensitive connection http-api-data http-client - http-client-tls http-types modern-uri monad-control mtl retry text - time transformers transformers-base + http-client-tls http-types modern-uri monad-control mtl retry + template-haskell text time transformers transformers-base ]; testHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive hspec hspec-core http-client http-types modern-uri monad-control mtl - QuickCheck retry text time unordered-containers + QuickCheck retry template-haskell text time unordered-containers ]; testToolDepends = [ hspec-discover ]; doCheck = false; @@ -211877,7 +210541,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "req_3_2_0" = callPackage + "req_3_3_0" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, hspec, hspec-core , hspec-discover, http-api-data, http-client, http-client-tls @@ -211887,8 +210551,8 @@ self: { }: mkDerivation { pname = "req"; - version = "3.2.0"; - sha256 = "1r6fkhn99v6vil8khd23pdai3j6wgn724cy00q5x20fn3jz88ksw"; + version = "3.3.0"; + sha256 = "1y6zw6j3sk2p3ch636w787zs36i8v3p94gdvbfqgjd16k3hlnaxc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -212064,17 +210728,6 @@ self: { }) {}; "rerebase" = callPackage - ({ mkDerivation, rebase }: - mkDerivation { - pname = "rerebase"; - version = "1.4.1"; - sha256 = "19a3pwi801kfaflnag9n7zzxapcjfpqpykr6rq8b6axhyqj3vxim"; - libraryHaskellDepends = [ rebase ]; - description = "Reexports from \"base\" with a bunch of other standard libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rerebase_1_6_1" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; @@ -212083,7 +210736,6 @@ self: { libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reroute" = callPackage @@ -212383,8 +211035,8 @@ self: { }: mkDerivation { pname = "resourcet"; - version = "1.2.4"; - sha256 = "017v0r9qk4d7dd04dc03ghghyk1d4qj82gligyzg5fdz2rkg8i8x"; + version = "1.2.4.1"; + sha256 = "0h67w4x5k4ykyks3ppwfc49n6qgwl3bzzpfcg02l6rmwqqc2zq12"; libraryHaskellDepends = [ base containers exceptions mtl primitive transformers unliftio-core ]; @@ -213228,14 +211880,14 @@ self: { }: mkDerivation { pname = "rfc1751"; - version = "0.1.2"; - sha256 = "1jls5g6lch4mdspbyzx1kgysa21i2cid68qpvk9z7ggz4lbfhid3"; + version = "0.1.3"; + sha256 = "1f68rss3y64g2s7dmzb635986vf682gb1yvv4x720b29gh65dahk"; libraryHaskellDepends = [ base bytestring cereal vector ]; testHaskellDepends = [ base bytestring cereal hspec QuickCheck vector ]; description = "RFC-1751 library for Haskell"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.mit; }) {}; "rfc3339" = callPackage @@ -213719,31 +212371,6 @@ self: { }) {}; "rio" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, hashable, hspec, microlens, mtl, primitive - , process, QuickCheck, text, time, typed-process, unix, unliftio - , unliftio-core, unordered-containers, vector - }: - mkDerivation { - pname = "rio"; - version = "0.1.15.1"; - sha256 = "05mkxjwy9vp6ldzj5wci1frd2chvbg3l4vw1q8bpjdsj8svr2g5i"; - libraryHaskellDepends = [ - base bytestring containers deepseq directory exceptions filepath - hashable microlens mtl primitive process text time typed-process - unix unliftio unliftio-core unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory exceptions filepath - hashable hspec microlens mtl primitive process QuickCheck text time - typed-process unix unliftio unliftio-core unordered-containers - vector - ]; - description = "A standard library for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rio_0_1_16_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, hashable, hspec, microlens, microlens-mtl , mtl, primitive, process, QuickCheck, text, time, typed-process @@ -213751,8 +212378,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.16.0"; - sha256 = "0s8hfx1zkakv7hbhks133dcb6c2yg0chpv4wmbrl24wp9yd5fy1s"; + version = "0.1.17.0"; + sha256 = "0zs7s67fk1g1hckxk2iii2ad2hhsl9l1j3dkcdb7imzdha13q9rd"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens microlens-mtl mtl primitive process text time @@ -213767,7 +212394,6 @@ self: { ]; description = "A standard library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rio-orphans" = callPackage @@ -214367,8 +212993,8 @@ self: { }: mkDerivation { pname = "rocksdb-query"; - version = "0.3.1"; - sha256 = "072l4f5xb5prsbs7d7j12mwxy0rlrsnqf6w7g09xmq7n3mz0sv0f"; + version = "0.3.2"; + sha256 = "07bp96sfcj34f4vgi3bynxykrad672hlg9d8rsxc0xxai8iamzrm"; libraryHaskellDepends = [ base bytestring cereal conduit resourcet rocksdb-haskell unliftio ]; @@ -214376,7 +213002,7 @@ self: { base cereal data-default hspec rocksdb-haskell unliftio ]; description = "RocksDB database querying library for Haskell"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -214592,8 +213218,8 @@ self: { }: mkDerivation { pname = "ron"; - version = "0.10"; - sha256 = "1qw1kyrd3z5fag4a9w2nibcc3m68cr75jplp2pvwvkcmbl23alar"; + version = "0.11"; + sha256 = "1sdgjxz609m1ddcby29g5sd9bmh20wav3q4ab4bmsfl5ar2yq53i"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring containers hashable integer-gmp mtl scientific template-haskell text time @@ -216679,18 +215305,6 @@ self: { }) {inherit (pkgs) libsodium;}; "salve" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "salve"; - version = "1.0.9"; - sha256 = "1anh6v4dfvy1ymffz3y77rlj859mmjamf026f2fqlagmql2lbj73"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - description = "Semantic version numbers and constraints"; - license = stdenv.lib.licenses.mit; - }) {}; - - "salve_1_0_10" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { pname = "salve"; @@ -216700,7 +215314,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Semantic version numbers and constraints"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "salvia" = callPackage @@ -219422,13 +218035,13 @@ self: { "secp256k1-haskell" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cereal - , deepseq, entropy, hashable, hspec, hspec-discover, HUnit, mtl - , QuickCheck, secp256k1, string-conversions + , deepseq, entropy, hashable, hspec, hspec-discover, HUnit + , monad-par, mtl, QuickCheck, secp256k1, string-conversions }: mkDerivation { pname = "secp256k1-haskell"; - version = "0.1.8"; - sha256 = "0ymmgcvlw4wrmnn0r6nmmpk0djihpappiywwfxvmnq8brqdkf3jk"; + version = "0.2.5"; + sha256 = "12hv8fi2acvv0pmk9scsw584sj2b9hfacr7bhbrry10sihrd4xv4"; libraryHaskellDepends = [ base base16-bytestring bytestring cereal deepseq entropy hashable QuickCheck string-conversions @@ -219436,22 +218049,22 @@ self: { libraryPkgconfigDepends = [ secp256k1 ]; testHaskellDepends = [ base base16-bytestring bytestring cereal deepseq entropy hashable - hspec HUnit mtl QuickCheck string-conversions + hspec HUnit monad-par mtl QuickCheck string-conversions ]; testToolDepends = [ hspec-discover ]; - description = "Bindings for secp256k1 library from Bitcoin Core"; - license = stdenv.lib.licenses.publicDomain; + description = "Bindings for secp256k1"; + license = stdenv.lib.licenses.mit; }) {inherit (pkgs) secp256k1;}; - "secp256k1-haskell_0_2_2" = callPackage + "secp256k1-haskell_0_3_0" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cereal - , deepseq, entropy, hashable, hspec, hspec-discover, HUnit, mtl - , QuickCheck, secp256k1, string-conversions + , deepseq, entropy, hashable, hspec, hspec-discover, HUnit + , monad-par, mtl, QuickCheck, secp256k1, string-conversions }: mkDerivation { pname = "secp256k1-haskell"; - version = "0.2.2"; - sha256 = "10yz62z5s23b0q4pla8047cv5ksrd78j9l8y156b0yjjnmlxd013"; + version = "0.3.0"; + sha256 = "1zkcacmjhbmgi06qwhva37z1piacl51gxkn4b1wy70y5b8cm0y24"; libraryHaskellDepends = [ base base16-bytestring bytestring cereal deepseq entropy hashable QuickCheck string-conversions @@ -219459,11 +218072,11 @@ self: { libraryPkgconfigDepends = [ secp256k1 ]; testHaskellDepends = [ base base16-bytestring bytestring cereal deepseq entropy hashable - hspec HUnit mtl QuickCheck string-conversions + hspec HUnit monad-par mtl QuickCheck string-conversions ]; testToolDepends = [ hspec-discover ]; - description = "Bindings for secp256k1 library from Bitcoin Core"; - license = stdenv.lib.licenses.publicDomain; + description = "Bindings for secp256k1"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) secp256k1;}; @@ -219633,6 +218246,8 @@ self: { pname = "selda-json"; version = "0.1.1.0"; sha256 = "1ai24qmz5nkpqx0zd24ix0ci5aqiccfy57fkf8f87swrv28101l8"; + revision = "1"; + editedCabalFile = "1gajzv8zhj8i3bxzjh81vjn8j2igh3nrawfpddvxg1ayb5l2d2y0"; libraryHaskellDepends = [ aeson base bytestring selda text ]; description = "JSON support for the Selda database library"; license = stdenv.lib.licenses.mit; @@ -219693,23 +218308,6 @@ self: { }) {}; "selective" = callPackage - ({ mkDerivation, base, containers, mtl, QuickCheck, tasty - , tasty-expected-failure, tasty-quickcheck, transformers - }: - mkDerivation { - pname = "selective"; - version = "0.3"; - sha256 = "135lq99h1iaip44d5kh7wpb3fcf8f6ypn5rxngm5agazy6ia42as"; - libraryHaskellDepends = [ base containers transformers ]; - testHaskellDepends = [ - base containers mtl QuickCheck tasty tasty-expected-failure - tasty-quickcheck transformers - ]; - description = "Selective applicative functors"; - license = stdenv.lib.licenses.mit; - }) {}; - - "selective_0_4_1" = callPackage ({ mkDerivation, base, containers, mtl, QuickCheck, tasty , tasty-expected-failure, tasty-quickcheck, transformers }: @@ -219724,7 +218322,6 @@ self: { ]; description = "Selective applicative functors"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "selectors" = callPackage @@ -222687,29 +221284,6 @@ self: { }) {}; "servant-purescript" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, http-types, lens, mainland-pretty, purescript-bridge - , servant, servant-foreign, servant-server, servant-subscriber - , text - }: - mkDerivation { - pname = "servant-purescript"; - version = "0.9.0.4"; - sha256 = "07h00hazz4hvhhslfa8hm2jqpxmj0kqz0yw7a4vk002r027daryi"; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath http-types lens - mainland-pretty purescript-bridge servant servant-foreign - servant-server servant-subscriber text - ]; - testHaskellDepends = [ - aeson base containers lens mainland-pretty purescript-bridge - servant servant-foreign servant-subscriber text - ]; - description = "Generate PureScript accessor functions for you servant API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-purescript_0_10_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, http-types, lens, mainland-pretty, purescript-bridge , servant, servant-foreign, servant-server, servant-subscriber @@ -222730,7 +221304,6 @@ self: { ]; description = "Generate PureScript accessor functions for you servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-pushbullet-client" = callPackage @@ -223136,8 +221709,8 @@ self: { }: mkDerivation { pname = "servant-static-th"; - version = "0.2.2.1"; - sha256 = "15i5sgi30m5y8capc10k4hsaldzglvmknfq6sr1mrrzc9z9c3lrm"; + version = "0.2.3.0"; + sha256 = "0gyfjrrq7anhn4b613gnaa0r2xm8rkminx1nrrbpn6bw47axadj4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223245,32 +221818,6 @@ self: { }) {}; "servant-subscriber" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder - , bytestring, case-insensitive, containers, directory, filepath - , http-types, lens, lifted-base, monad-control, monad-logger - , network-uri, purescript-bridge, servant, servant-foreign - , servant-server, stm, text, time, transformers, wai - , wai-websockets, warp, websockets - }: - mkDerivation { - pname = "servant-subscriber"; - version = "0.6.0.3"; - sha256 = "1h1nqjmnn129ir2k9dvc6izak3hh0bvz6rpqhdf55gvxl3dbbiqi"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async attoparsec base blaze-builder bytestring - case-insensitive containers directory filepath http-types lens - lifted-base monad-control monad-logger network-uri servant - servant-foreign servant-server stm text time transformers wai - wai-websockets warp websockets - ]; - executableHaskellDepends = [ base purescript-bridge ]; - description = "When REST is not enough ..."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-subscriber_0_7_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder , bytestring, case-insensitive, containers, directory, filepath , http-types, lens, lifted-base, monad-control, monad-logger @@ -223294,7 +221841,6 @@ self: { executableHaskellDepends = [ base purescript-bridge ]; description = "When REST is not enough ..."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger" = callPackage @@ -223706,33 +222252,6 @@ self: { }) {}; "serverless-haskell" = callPackage - ({ mkDerivation, aeson, aeson-casing, amazonka-core - , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive - , hspec, hspec-discover, http-types, iproute, lens, network - , network-simple, raw-strings-qq, text, time, unix - , unordered-containers - }: - mkDerivation { - pname = "serverless-haskell"; - version = "0.10.5"; - sha256 = "187pah3k88vp27k1imwj1mqxavd9zykms3is517xrp209ldx5kw1"; - libraryHaskellDepends = [ - aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base - bytestring case-insensitive http-types iproute lens network - network-simple text time unix unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base - bytestring case-insensitive hspec hspec-discover http-types iproute - lens network network-simple raw-strings-qq text time unix - unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Deploying Haskell code onto AWS Lambda using Serverless"; - license = stdenv.lib.licenses.mit; - }) {}; - - "serverless-haskell_0_11_3" = callPackage ({ mkDerivation, aeson, aeson-casing, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive , hspec, hspec-discover, http-client, http-types, iproute, lens @@ -223757,6 +222276,33 @@ self: { testToolDepends = [ hspec-discover ]; description = "Deploying Haskell code onto AWS Lambda using Serverless"; license = stdenv.lib.licenses.mit; + }) {}; + + "serverless-haskell_0_12_1" = callPackage + ({ mkDerivation, aeson, aeson-casing, amazonka-core + , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive + , hspec, hspec-discover, http-client, http-types, iproute, lens + , raw-strings-qq, safe-exceptions, text, time, transformers, unix + , unordered-containers + }: + mkDerivation { + pname = "serverless-haskell"; + version = "0.12.1"; + sha256 = "0a9df4mxl73wbyf9mvbrczmcn0vvf8yn3p4wb9ggf29x4ls22zg8"; + libraryHaskellDepends = [ + aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base + bytestring case-insensitive http-client http-types iproute lens + safe-exceptions text time unix unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base + bytestring case-insensitive hspec hspec-discover http-client + http-types iproute lens raw-strings-qq safe-exceptions text time + transformers unix unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Deploying Haskell code onto AWS Lambda using Serverless"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -224194,8 +222740,8 @@ self: { pname = "setlocale"; version = "1.0.0.9"; sha256 = "18b6xafspzxrmz5m9r9nzy3z053crqi59xc8n8aqd4gw0pvqdcrv"; - revision = "1"; - editedCabalFile = "01i087l8v129q90jf09khaw5p4iqix5s17gzgfz2pbi030zhb82h"; + revision = "2"; + editedCabalFile = "0l0hlxhjspm05hxd06972ilw4c3ni72mnzcyljg3a01i8pxi53cl"; libraryHaskellDepends = [ base ]; description = "Haskell bindings to setlocale"; license = stdenv.lib.licenses.bsd3; @@ -224739,10 +223285,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.19"; - sha256 = "1579as1ni0n5zjnrqbp3s8gss34pl690g7jnq5i3kb3d118awk3b"; - revision = "1"; - editedCabalFile = "1w6yvk30nj6mcl0w5lj9j6q4vqjllp4r8wady3hbly8jpxjdq7dc"; + version = "0.19.1"; + sha256 = "14znwscqdhac421igz26r0p1im9p0zawxzmi3hh1lhmxc5fprk2n"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -225041,8 +223585,8 @@ self: { }: mkDerivation { pname = "shake-plus"; - version = "0.1.4.1"; - sha256 = "1sy93fyc6vwwvdhl1pcnhl3f86k3ywf5ajp9zbv3n93dz7nfyvkm"; + version = "0.1.6.0"; + sha256 = "0121lbjfsq0ira5nrz83v2lvm1225m9m806x9rrg2kq9j7nj1zab"; libraryHaskellDepends = [ base comonad extra hashable path rio shake within ]; @@ -225050,35 +223594,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "shake-plus_0_1_7_0" = callPackage + ({ mkDerivation, base, comonad, extra, hashable, path, rio, shake + , within + }: + mkDerivation { + pname = "shake-plus"; + version = "0.1.7.0"; + sha256 = "0gmvmzi9mnbrd3xblqimx6rpdrv45cd80yglrj8f84rb6c61aiiq"; + libraryHaskellDepends = [ + base comonad extra hashable path rio shake within + ]; + description = "Re-export of Shake using well-typed paths and ReaderT"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shakebook" = callPackage ({ mkDerivation, aeson, aeson-with, base, comonad, comonad-extras - , doctemplates, extra, feed, free, lens, lens-aeson, mustache - , optparse-applicative, pandoc, pandoc-types, path, relude, rio - , shake, shake-plus, slick, split, tasty, tasty-golden, text-time - , within, zipper-extra + , doctemplates, feed, free, lens, lens-aeson, mustache, pandoc + , pandoc-types, path-extensions, relude, rio, shake-plus, slick + , split, tasty, tasty-golden, text-time, zipper-extra }: mkDerivation { pname = "shakebook"; - version = "0.4.0.0"; - sha256 = "1qj1zybxizxg9bbvpdq5ac6dar2dh8i60zlhy6dxf4jjpimii7h7"; - isLibrary = true; - isExecutable = true; + version = "0.5.1.0"; + sha256 = "1yjk1zayfiisa927gh6rmsh0qvy64gvgw77b1vd4h22alndfchxr"; libraryHaskellDepends = [ - aeson aeson-with base comonad comonad-extras doctemplates extra - feed free lens lens-aeson mustache pandoc pandoc-types path relude - rio shake shake-plus slick split text-time within zipper-extra - ]; - executableHaskellDepends = [ - aeson aeson-with base comonad comonad-extras doctemplates extra - feed free lens lens-aeson mustache optparse-applicative pandoc - pandoc-types path relude rio shake shake-plus slick split text-time - within zipper-extra + aeson aeson-with base comonad comonad-extras doctemplates feed free + lens lens-aeson mustache pandoc pandoc-types path-extensions relude + rio shake-plus slick split text-time zipper-extra ]; testHaskellDepends = [ - aeson aeson-with base comonad comonad-extras doctemplates extra - feed free lens lens-aeson mustache pandoc pandoc-types path relude - rio shake shake-plus slick split tasty tasty-golden text-time - within zipper-extra + aeson aeson-with base comonad comonad-extras doctemplates feed free + lens lens-aeson mustache pandoc pandoc-types path-extensions relude + rio shake-plus slick split tasty tasty-golden text-time + zipper-extra ]; description = "Shake-based technical documentation generator; HTML & PDF"; license = stdenv.lib.licenses.mit; @@ -225155,6 +223706,32 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "shakespeare_2_0_24_1" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec + , process, scientific, template-haskell, text, th-lift, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.24.1"; + sha256 = "0r9msld629fh9h98iclhd30h1rbg1xqzjqxj64k0n1p39fkx4ndm"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim parsec process scientific template-haskell text + th-lift time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + description = "A toolkit for making compile-time interpolated templates"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -225558,17 +224135,6 @@ self: { }) {}; "shell-utility" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "shell-utility"; - version = "0.0"; - sha256 = "1s3482vxllmmjbcqbwsrql9ka6zng7qbbqk3kfjs6dvkcs710hbs"; - libraryHaskellDepends = [ base ]; - description = "Utility functions for writing command-line programs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "shell-utility_0_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "shell-utility"; @@ -225577,7 +224143,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Utility functions for writing command-line programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shellish" = callPackage @@ -226037,20 +224602,6 @@ self: { }) {}; "show-combinators" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "show-combinators"; - version = "0.1.1.0"; - sha256 = "02h2fvmw22v1mpxlxn9c6p7as3xspvspdphybxapac4s50mvyfnm"; - revision = "1"; - editedCabalFile = "1zr6xw4fvgx187yiqy7n0r9mnasyv1hxg2q9xzw3lmsf4z3xz6y7"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - description = "Combinators to write Show instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "show-combinators_0_2_0_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "show-combinators"; @@ -226062,7 +224613,6 @@ self: { testHaskellDepends = [ base ]; description = "Combinators to write Show instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "show-please" = callPackage @@ -226310,7 +224860,7 @@ self: { version = "0.1.0.1"; sha256 = "19zjwzh3i8ql5xz9rvmbz7n2l3z7dcq683ikrpvqx3wxnc06058m"; libraryHaskellDepends = [ base ]; - description = "Sieve is an implementation of the Sieve abstract data type."; + description = "Sieve is an implementation of the Sieve abstract data type"; license = stdenv.lib.licenses.gpl2; }) {}; @@ -226674,6 +225224,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-cmd_0_2_2" = callPackage + ({ mkDerivation, base, directory, extra, filepath, process, unix }: + mkDerivation { + pname = "simple-cmd"; + version = "0.2.2"; + sha256 = "0pf9nfh8xcz0y9l9w7hj305r8gqdaz6hmrjkd7h3yb7ql7j6538w"; + libraryHaskellDepends = [ + base directory extra filepath process unix + ]; + description = "Simple String-based process commands"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-cmd-args" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -227306,24 +225870,6 @@ self: { }) {}; "simple-templates" = callPackage - ({ mkDerivation, aeson, attoparsec, base, hspec, HUnit, scientific - , text, unordered-containers, vector - }: - mkDerivation { - pname = "simple-templates"; - version = "0.9.0.0"; - sha256 = "09s81syr45dvrqski4gz96ynmv8gb3zwyy4n6a7frv49z843phda"; - libraryHaskellDepends = [ - aeson attoparsec base scientific text unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base hspec HUnit scientific vector - ]; - description = "A basic template language for the Simple web framework"; - license = stdenv.lib.licenses.lgpl3; - }) {}; - - "simple-templates_1_0_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, hspec, HUnit, scientific , text, unordered-containers, vector }: @@ -227339,7 +225885,6 @@ self: { ]; description = "A basic template language for the Simple web framework"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-text-format" = callPackage @@ -227391,25 +225936,6 @@ self: { }) {}; "simple-vec3" = callPackage - ({ mkDerivation, base, criterion, doctest, doctest-driver-gen - , QuickCheck, tasty, tasty-quickcheck, vector - }: - mkDerivation { - pname = "simple-vec3"; - version = "0.6"; - sha256 = "1vw03xlnf8hj6rlcgpblg3swcbvqj4qp04zdv3a9j2a47j780qhh"; - libraryHaskellDepends = [ base QuickCheck vector ]; - testHaskellDepends = [ - base doctest doctest-driver-gen tasty tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base criterion vector ]; - description = "Three-dimensional vectors of doubles with basic operations"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "simple-vec3_0_6_0_1" = callPackage ({ mkDerivation, base, criterion, doctest, doctest-driver-gen , QuickCheck, tasty, tasty-quickcheck, vector }: @@ -227650,17 +226176,6 @@ self: { }) {}; "simplistic-generics" = callPackage - ({ mkDerivation, base, comonad, kind-apply }: - mkDerivation { - pname = "simplistic-generics"; - version = "0.1.0.0"; - sha256 = "11z02m4dr9p2y29xwhy6a3l2cz2np164c8cwp0a0b9vkhphw4y1j"; - libraryHaskellDepends = [ base comonad kind-apply ]; - description = "Generic programming without too many type classes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simplistic-generics_2_0_0" = callPackage ({ mkDerivation, base, containers, deepseq, kind-apply, mtl , template-haskell }: @@ -227673,7 +226188,6 @@ self: { ]; description = "Generic programming without too many type classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simseq" = callPackage @@ -227752,8 +226266,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "a class for single tuple implementations"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "singlethongs" = callPackage @@ -228876,6 +227388,25 @@ self: { broken = true; }) {}; + "slip32" = callPackage + ({ mkDerivation, base, base16-bytestring, bech32, binary, bip32 + , bytestring, hedgehog, tasty, tasty-hedgehog, tasty-hunit, text + }: + mkDerivation { + pname = "slip32"; + version = "0.2"; + sha256 = "1cc83lwclm68ss2pgqznfqrhbnpi5hg46d19gzja1a23a4pmp86i"; + libraryHaskellDepends = [ + base bech32 binary bip32 bytestring text + ]; + testHaskellDepends = [ + base base16-bytestring bip32 bytestring hedgehog tasty + tasty-hedgehog tasty-hunit text + ]; + description = "SLIP-0032: Extended serialization format for BIP-32 wallets"; + license = stdenv.lib.licenses.asl20; + }) {}; + "slist" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { @@ -229071,18 +227602,28 @@ self: { }) {}; "smallcheck" = callPackage - ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }: + ({ mkDerivation, base, logict, mtl, pretty }: mkDerivation { pname = "smallcheck"; - version = "1.1.5"; - sha256 = "195fj7w3v03d1y1nm2ylavzrwxjcdbq0lb6zsw1dwyx5jmwfc84h"; - revision = "1"; - editedCabalFile = "1zhhmad21sv0201hd7fahq769xpmzcj352l0sfalcwqs4kbc3mg0"; - libraryHaskellDepends = [ base ghc-prim logict mtl pretty ]; + version = "1.1.7"; + sha256 = "0dcnwg1mn1v57fbm9g5a94qfqwp9a6nzvxlwyxca4vf27qn9wpyh"; + libraryHaskellDepends = [ base logict mtl pretty ]; description = "A property-based testing library"; license = stdenv.lib.licenses.bsd3; }) {}; + "smallcheck_1_2_0" = callPackage + ({ mkDerivation, base, logict, mtl, pretty }: + mkDerivation { + pname = "smallcheck"; + version = "1.2.0"; + sha256 = "1y6rh1g7pi99jqq32xdv79yli9hmbfwjqg8ix1z2i2qkqqkr5iyn"; + libraryHaskellDepends = [ base logict mtl pretty ]; + description = "A property-based testing library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "smallcheck-kind-generics" = callPackage ({ mkDerivation, base, gauge, kind-generics, kind-generics-th , smallcheck @@ -229770,21 +228311,20 @@ self: { "smuggler2" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc - , ghc-exactprint, ghc-paths, syb, tasty, tasty-golden - , typed-process + , ghc-boot, ghc-exactprint, ghc-paths, split, syb, tasty + , tasty-golden, typed-process }: mkDerivation { pname = "smuggler2"; - version = "0.3.2.2"; - sha256 = "0j9pwb0v78x70qr3dmwrfc2250z8wm481r8k5n0xdf2m44aix31r"; - isLibrary = true; - isExecutable = true; + version = "0.3.6.1"; + sha256 = "1wr7qskz75dr0zzhg5gzpjci70rhlcwzlx3cavii7199kvm8axhd"; libraryHaskellDepends = [ - base containers directory filepath ghc ghc-exactprint syb + base containers directory filepath ghc ghc-boot ghc-exactprint + split syb ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ - base filepath ghc-paths tasty tasty-golden typed-process + base containers directory filepath ghc ghc-paths tasty tasty-golden + typed-process ]; description = "GHC Source Plugin that helps to minimise imports and generate explicit exports"; license = stdenv.lib.licenses.mpl20; @@ -232583,6 +231123,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "sparse-tensor_0_2_1_4" = callPackage + ({ mkDerivation, ad, base, bytestring, Cabal, cereal, containers + , deepseq, ghc-typelits-knownnat, ghc-typelits-natnormalise + , hmatrix, parallel, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, tf-random, zlib + }: + mkDerivation { + pname = "sparse-tensor"; + version = "0.2.1.4"; + sha256 = "10caf86g33hcccmpicxfjh0jq3z9d7vs4jafl0f8zhy09dirq8bn"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + ad base bytestring cereal containers deepseq ghc-typelits-knownnat + ghc-typelits-natnormalise hmatrix parallel tf-random zlib + ]; + testHaskellDepends = [ + base hmatrix QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "typesafe tensor algebra library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sparsebit" = callPackage ({ mkDerivation, base, haskell98 }: mkDerivation { @@ -232749,7 +231312,7 @@ self: { aeson base blaze-markup bytestring cereal deepseq hashable mwc-random path-pieces primitive safecopy text uuid ]; - description = "Simple data types that help me here and there."; + description = "Simple data types that help me here and there"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -237028,8 +235591,8 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.49.0"; - sha256 = "18qw7m0h9nlg0vicg3rr7dghmpdfnrpd0ayqyi60c1ifzk4ys4sf"; + version = "0.53.0"; + sha256 = "0842sfn7vspbq5kc6rx7i2mvmk6zap87233khybbmvrzzyrp0sp2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237045,15 +235608,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_53_0" = callPackage + "stratosphere_0_54_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.53.0"; - sha256 = "0842sfn7vspbq5kc6rx7i2mvmk6zap87233khybbmvrzzyrp0sp2"; + version = "0.54.0"; + sha256 = "1d56fl71qvhzaka3sx1306nwlpmry9q7gykb6fxa7c92279c2nly"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237369,14 +235932,14 @@ self: { }: mkDerivation { pname = "streaming-bracketed"; - version = "0.1.0.1"; - sha256 = "1czzx0xraxpdm9qffx435m64nhib66gvgpvf8ian6iqwzdf09z60"; + version = "0.1.1.0"; + sha256 = "0lrk2x7c90sw9l9d5vr0zsa8v9q8sg3qqziin46219694y0vy32h"; libraryHaskellDepends = [ base streaming ]; testHaskellDepends = [ base containers directory doctest filepath streaming streaming-commons tasty tasty-hunit ]; - description = "A resource management decorator for \"streaming\"."; + description = "A resource management decorator for \"streaming\""; license = stdenv.lib.licenses.mit; }) {}; @@ -237673,8 +236236,8 @@ self: { }: mkDerivation { pname = "streaming-postgresql-simple"; - version = "0.2.0.4"; - sha256 = "1qdfqp1w7pszks4iqbvgqsxmr2c6bx81jgkyz9k8wfz7vajg6f67"; + version = "0.2.0.5"; + sha256 = "1gaj099hxdvyzmzz6z0s1kzv3qqv3py609jz7cp2j3f6497dhdqa"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq postgresql-simple resourcet safe-exceptions streaming transformers @@ -238736,8 +237299,8 @@ self: { }: mkDerivation { pname = "stripeapi"; - version = "0.1.0.0"; - sha256 = "18qprai04gmpqzlqlqi8rabhljriqb2ph2g3iy2glq8yf3cnvc1n"; + version = "0.1.0.2"; + sha256 = "1zls2k2bzrkwcqav8s416gjsc4rp6glb4rv0ljkjab55ym3fkbqq"; libraryHaskellDepends = [ aeson base bytestring ghc-prim http-client http-conduit http-types mtl scientific text time transformers unordered-containers vector @@ -239136,36 +237699,6 @@ self: { }) {}; "stylish-haskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , directory, file-embed, filepath, haskell-src-exts, HsYAML - , HsYAML-aeson, HUnit, mtl, optparse-applicative, random - , semigroups, strict, syb, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "stylish-haskell"; - version = "0.10.0.0"; - sha256 = "1ribq5fnfg7bwzj7h8br2jnpjnw905dzr9yysx3h9nkw1593rw56"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring Cabal containers directory file-embed - filepath haskell-src-exts HsYAML HsYAML-aeson mtl semigroups syb - ]; - executableHaskellDepends = [ - aeson base bytestring Cabal containers directory file-embed - filepath haskell-src-exts HsYAML HsYAML-aeson mtl - optparse-applicative strict syb - ]; - testHaskellDepends = [ - aeson base bytestring Cabal containers directory file-embed - filepath haskell-src-exts HsYAML HsYAML-aeson HUnit mtl random syb - test-framework test-framework-hunit - ]; - description = "Haskell code prettifier"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stylish-haskell_0_11_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, file-embed, filepath, haskell-src-exts, HsYAML , HsYAML-aeson, HUnit, mtl, optparse-applicative, random @@ -239195,7 +237728,6 @@ self: { ]; description = "Haskell code prettifier"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stylist" = callPackage @@ -240577,7 +239109,7 @@ self: { base containers hashable HUnit network-uri old-locale semigroups test-framework test-framework-hunit text time ]; - description = "A semantic web toolkit."; + description = "A semantic web toolkit"; license = stdenv.lib.licenses.lgpl21; }) {}; @@ -242004,20 +240536,6 @@ self: { }) {inherit (pkgs) libossp_uuid;}; "systemd" = callPackage - ({ mkDerivation, base, bytestring, network, transformers, unix }: - mkDerivation { - pname = "systemd"; - version = "2.2.0"; - sha256 = "18z0wc71k3wwxfighwk4y03aprf5sd94vadzbyjysrac2np1qz20"; - libraryHaskellDepends = [ - base bytestring network transformers unix - ]; - testHaskellDepends = [ base network unix ]; - description = "Systemd facilities (Socket activation, Notify)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "systemd_2_3_0" = callPackage ({ mkDerivation, base, bytestring, network, transformers, unix }: mkDerivation { pname = "systemd"; @@ -242029,7 +240547,6 @@ self: { testHaskellDepends = [ base network unix ]; description = "Systemd facilities (Socket activation, Notify)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "systemstats" = callPackage @@ -242143,7 +240660,7 @@ self: { libraryHaskellDepends = [ base containers ghc-prim mtl Takusen template-haskell time ]; - description = "Transito Abierto: convenience library when using Takusen and Oracle."; + description = "Transito Abierto: convenience library when using Takusen and Oracle"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -242186,8 +240703,8 @@ self: { }: mkDerivation { pname = "table-layout"; - version = "0.9.0.0"; - sha256 = "1dbh2j0520xfab6sn0zmi05xw8kv20pqqwk57b1h1xa01mh68xld"; + version = "0.9.0.1"; + sha256 = "09lj27z5jnnzj0piyr9g3g76j4i0wcmvz65zk839ssaqymmnl9cg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -242200,7 +240717,7 @@ self: { base data-default-class data-default-instances-base hspec HUnit QuickCheck ]; - description = "Layout text as grid or table"; + description = "Format tabular data as grid or table"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -243979,8 +242496,8 @@ self: { }: mkDerivation { pname = "tasty-silver"; - version = "3.1.13"; - sha256 = "1sd9xgjcvlnw338dn5rcy5la7gw15yvg4xl85ym7aav5fr97apfs"; + version = "3.1.15"; + sha256 = "07iiaw5q5jb6bxm5ys1s6bliw0qxsqp100awzxwkwfia03i1iz8z"; libraryHaskellDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa @@ -244417,6 +242934,8 @@ self: { pname = "tdlib"; version = "0.3.0"; sha256 = "1aa7f6jb021gx9lidhbrnvaq01jyxhrr7bslq0n5b89wqwng9zfm"; + revision = "1"; + editedCabalFile = "1syyxdbq44wiw7lc86qyvrv5swc596b987xf0r7h77xz6dj6q601"; libraryHaskellDepends = [ aeson base bytestring containers monad-loops polysemy polysemy-plugin stm tdlib-types text unordered-containers @@ -244439,8 +242958,8 @@ self: { }: mkDerivation { pname = "tdlib-gen"; - version = "0.2.0"; - sha256 = "0bd0lh0sgyyc1ngdrk5lalj22wz6zhag9r8389b16kr2xbxm4p3d"; + version = "0.4.0"; + sha256 = "08p2zy8q114aklz5rcrddmwc1xd9hg1fwgb83j5cmck8p3w53h16"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -244466,8 +242985,8 @@ self: { }: mkDerivation { pname = "tdlib-types"; - version = "0.3.0"; - sha256 = "0whg2cz51h2wnmaj6m7vfxbg7zcbg6svawd50y3671biff15n7z2"; + version = "0.4.0"; + sha256 = "0vb4pvmd40gwzx9a48c0ydj9q555r1mjlfsar9f0bq2kkzdx7d78"; libraryHaskellDepends = [ aeson base base64-bytestring-type bytestring language-tl polysemy polysemy-plugin tdlib-gen text @@ -244712,8 +243231,8 @@ self: { }: mkDerivation { pname = "telegram-types"; - version = "0.4.0"; - sha256 = "1giv1d713rfdc8svcba2ws8mv6g957f7v1dm3qr9p8082nry2llm"; + version = "0.4.1"; + sha256 = "0zw5in801d7sxavjs28ra026xganca0b21qv4pwhk967vzsf12yy"; libraryHaskellDepends = [ aeson base bytestring deriving-aeson filepath generic-lens lens mime-types open-union servant servant-multipart text time @@ -246605,12 +245124,12 @@ self: { }) {}; "text-ansi" = callPackage - ({ mkDerivation, base, text, text-builder }: + ({ mkDerivation, base, text }: mkDerivation { pname = "text-ansi"; - version = "0.1.0"; - sha256 = "08klbx8jwam3ngxh8kv6z83yh5sbsyb0glycsb1w4zdr8ijsyd3z"; - libraryHaskellDepends = [ base text text-builder ]; + version = "0.1.0.1"; + sha256 = "1qy5qqwm41xcxc5bs0aicdm40vnz1rm8mgmxzfxvjnwc9p28pyb3"; + libraryHaskellDepends = [ base text ]; description = "Text styling for ANSI terminals"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -247975,8 +246494,8 @@ self: { }: mkDerivation { pname = "th-lift-instances"; - version = "0.1.16"; - sha256 = "08ivlz37ir2xyl8ch5x4n2gb34rgk5ryaybfr2xbfc4ah4zfjfav"; + version = "0.1.17"; + sha256 = "0k59j460dcr9vidmww2has78g3zx2wl0cjlpqc1laqai9w8klda5"; libraryHaskellDepends = [ base bytestring containers template-haskell text th-lift transformers vector @@ -248356,24 +246875,6 @@ self: { }) {}; "these" = callPackage - ({ mkDerivation, aeson, assoc, base, base-compat, binary, deepseq - , hashable, QuickCheck, semigroupoids, unordered-containers - }: - mkDerivation { - pname = "these"; - version = "1.0.1"; - sha256 = "1k0pi65g7cm9hzdw6my6bzz2zvddkmj1qs45ymqmi316bpiixk3r"; - revision = "4"; - editedCabalFile = "06w5wyiq9cbbk1r9ga1ib2d8phlbs483kxp7ql8ygpapdd2a5nsq"; - libraryHaskellDepends = [ - aeson assoc base base-compat binary deepseq hashable QuickCheck - semigroupoids unordered-containers - ]; - description = "An either-or-both data type"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "these_1_1" = callPackage ({ mkDerivation, assoc, base, base-compat, binary, deepseq , hashable }: @@ -248386,7 +246887,6 @@ self: { ]; description = "An either-or-both data type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "these-lens" = callPackage @@ -248724,8 +247224,8 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.8.3.2"; - sha256 = "0l18slr09dn4vq9avc1l724cqfv1xclx32f0gnvkcwksg6yjig0r"; + version = "0.9.0.0"; + sha256 = "0mvx661xk3nzvvxcda4vdk2ka7mff8jbpib1x59n230w80bc5sja"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -249100,27 +247600,6 @@ self: { }) {}; "tidal" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, clock, colour - , containers, criterion, deepseq, hosc, microspec, mwc-random - , network, parsec, primitive, random, text, transformers, vector - , weigh - }: - mkDerivation { - pname = "tidal"; - version = "1.4.9"; - sha256 = "0np32jnvqmnnqy166a17i367c5j5xc9mniqzr0x76wk7mb5zlwzj"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bifunctors bytestring clock colour containers deepseq hosc - mwc-random network parsec primitive random text transformers vector - ]; - testHaskellDepends = [ base containers microspec parsec ]; - benchmarkHaskellDepends = [ base criterion weigh ]; - description = "Pattern language for improvised music"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "tidal_1_5_2" = callPackage ({ mkDerivation, base, bifunctors, bytestring, clock, colour , containers, criterion, deepseq, hosc, microspec, network, parsec , primitive, random, text, transformers, vector, weigh @@ -249138,6 +247617,26 @@ self: { benchmarkHaskellDepends = [ base criterion weigh ]; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; + }) {}; + + "tidal_1_6_0" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, clock, colour + , containers, criterion, deepseq, hosc, microspec, network, parsec + , primitive, random, text, transformers, vector, weigh + }: + mkDerivation { + pname = "tidal"; + version = "1.6.0"; + sha256 = "0fz2sgy3fjkm3p6lzv0sa71p1madf06qfv05i3vv6zn3qrpfrx1q"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bifunctors bytestring clock colour containers deepseq hosc + network parsec primitive random text transformers vector + ]; + testHaskellDepends = [ base containers deepseq microspec parsec ]; + benchmarkHaskellDepends = [ base criterion weigh ]; + description = "Pattern language for improvised music"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -249962,13 +248461,13 @@ self: { }) {}; "timer-wheel" = callPackage - ({ mkDerivation, atomic-primops, base, psqueues, random, vector }: + ({ mkDerivation, atomic-primops, base, psqueues, vector }: mkDerivation { pname = "timer-wheel"; - version = "0.2.0.1"; - sha256 = "1m3bv095kbm4ksva3plhggkq2c0jf441wm994l57jfmlcng2i4xy"; + version = "0.3.0"; + sha256 = "16v663mcsj0h17x4jriq50dps3m3f8wqcsm19kl48vrs7f4mp07s"; libraryHaskellDepends = [ atomic-primops base psqueues vector ]; - testHaskellDepends = [ base random ]; + testHaskellDepends = [ base ]; description = "A timer wheel"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -250128,21 +248627,6 @@ self: { }) {}; "timezone-olson" = callPackage - ({ mkDerivation, base, binary, bytestring, extensible-exceptions - , time, timezone-series - }: - mkDerivation { - pname = "timezone-olson"; - version = "0.1.9"; - sha256 = "05abywx1nrcaz0nqzfy4zw62bc5qd7pdfnjvv4drxkwv084ha8rj"; - libraryHaskellDepends = [ - base binary bytestring extensible-exceptions time timezone-series - ]; - description = "A pure Haskell parser and renderer for binary Olson timezone files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "timezone-olson_0_2_0" = callPackage ({ mkDerivation, base, binary, bytestring, extensible-exceptions , time, timezone-series }: @@ -250155,7 +248639,6 @@ self: { ]; description = "A pure Haskell parser and renderer for binary Olson timezone files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timezone-olson-th" = callPackage @@ -250544,7 +249027,7 @@ self: { sha256 = "1snw5cdkyqyninqqqwa6qfndfmwfr4lkdg0v94267g7xbwcqjj8h"; libraryHaskellDepends = [ base containers network-uri text ]; testHaskellDepends = [ base HUnit network-uri text ]; - description = "This project separates subdomains, domains, and top-level-domains from URLs."; + description = "This project separates subdomains, domains, and top-level-domains from URLs"; license = stdenv.lib.licenses.mit; }) {}; @@ -250754,8 +249237,6 @@ self: { ]; description = "Start and stop a temporary postgres"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tmpl" = callPackage @@ -251213,39 +249694,6 @@ self: { }) {}; "tomland" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , hashable, hedgehog, hspec-megaparsec, markdown-unlit, megaparsec - , mtl, parser-combinators, tasty, tasty-discover, tasty-hedgehog - , tasty-hspec, tasty-silver, text, time, transformers - , unordered-containers - }: - mkDerivation { - pname = "tomland"; - version = "1.2.1.0"; - sha256 = "0bzwmk3zw2lzhppgr73b5v3i4qz0hxn1zag665vpakq6knssj7qy"; - revision = "1"; - editedCabalFile = "00lb4ivrqrj5yqnfz5ji3vjaa284img9xhkjvrzc291bs83vl4kr"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers deepseq hashable megaparsec mtl - parser-combinators text time transformers unordered-containers - ]; - executableHaskellDepends = [ - base containers hashable text time unordered-containers - ]; - executableToolDepends = [ markdown-unlit ]; - testHaskellDepends = [ - base bytestring containers directory hashable hedgehog - hspec-megaparsec megaparsec tasty tasty-hedgehog tasty-hspec - tasty-silver text time unordered-containers - ]; - testToolDepends = [ tasty-discover ]; - description = "Bidirectional TOML serialization"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "tomland_1_3_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , hashable, hedgehog, hspec, hspec-golden, hspec-hedgehog , hspec-megaparsec, markdown-unlit, megaparsec, mtl @@ -251274,7 +249722,6 @@ self: { ]; description = "Bidirectional TOML serialization"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tomlcheck" = callPackage @@ -253121,8 +251568,8 @@ self: { ({ mkDerivation, base, tree-sitter }: mkDerivation { pname = "tree-sitter-php"; - version = "0.4.0.0"; - sha256 = "14qylmzcpn3zn35lbyimyy1sk5v34lqpdn2yn2ly3kg1cphkh50g"; + version = "0.5.0.0"; + sha256 = "18qjr4hm8v3kg9933y7g96cj76qfw38ca825j90bg8yfiya5186p"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for PHP"; @@ -254018,6 +252465,7 @@ self: { ]; description = "Things Tracker Network JSON Types"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ sorki ]; }) {}; "ttn-client" = callPackage @@ -254421,6 +252869,8 @@ self: { pname = "turtle"; version = "1.5.19"; sha256 = "06hxmhz1i6f5r8k3bf5h54g4ahjsvxhv44sa4xiy52rz6qp0211g"; + revision = "1"; + editedCabalFile = "1z0wjrd25k7zc0bvsy1cxicfml0sdchs7sfr6fz5jlnlggpbn0fq"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -254619,7 +253069,7 @@ self: { libraryHaskellDepends = [ base twentefp-eventloop-graphics twentefp-number ]; - description = "RoseTree type and show functions for lab assignment of University of Twente."; + description = "RoseTree type and show functions for lab assignment of University of Twente"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -255360,6 +253810,8 @@ self: { pname = "type-errors"; version = "0.2.0.0"; sha256 = "1d1fi4ij18q39rpibc056mgvly75zqixkba4l8bn307c62f50k8p"; + revision = "1"; + editedCabalFile = "157fjnr98fn5943siqwk1rd2wwnzd7nlbkbkzvdqv7d723cmh126"; libraryHaskellDepends = [ base first-class-families syb template-haskell th-abstraction ]; @@ -255975,8 +254427,8 @@ self: { }: mkDerivation { pname = "typed-encoding"; - version = "0.4.1.0"; - sha256 = "00zyza0n7gc2jqlwcwl1lj6zfsl10j2b4d0d8axycl20b9g0a5xs"; + version = "0.4.2.0"; + sha256 = "19ng2cf68v2j6csw39zxh756amq195479v883y5lgkvjzsx37dbn"; libraryHaskellDepends = [ base base64-bytestring bytestring symbols text ]; @@ -257972,8 +256424,8 @@ self: { }: mkDerivation { pname = "units"; - version = "2.4.1.2"; - sha256 = "0ipjkwcawchgfbldm56y6xb31qs6ifj7lvw4xabl2jjb6j5f0sr6"; + version = "2.4.1.3"; + sha256 = "1ksrw65ci9j8qnqj6cxpdmdb9b3k4k9w8ld3j4h00r2vkcqgn9qg"; libraryHaskellDepends = [ base containers deepseq lens linear mtl multimap singletons syb template-haskell th-desugar units-parser vector-space @@ -258658,6 +257110,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unordered-containers_0_2_11_0" = callPackage + ({ mkDerivation, base, bytestring, ChasingBottoms, containers + , deepseq, deepseq-generics, gauge, hashable, hashmap, HUnit, mtl + , QuickCheck, random, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.11.0"; + sha256 = "0z58qi781n1znjw35s1pq0k7fqn0995jqmrsznp1773gg66qqfib"; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ + base ChasingBottoms containers hashable HUnit QuickCheck random + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq deepseq-generics gauge hashable + hashmap mtl random + ]; + description = "Efficient hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unordered-containers-rematch" = callPackage ({ mkDerivation, base, hashable, hspec, HUnit, rematch , unordered-containers @@ -259167,21 +257643,6 @@ self: { }) {}; "urbit-hob" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, hspec - , hspec-core, murmur3, QuickCheck, text, vector - }: - mkDerivation { - pname = "urbit-hob"; - version = "0.3.2"; - sha256 = "0zs9gwnik7l587apf4giiii6jc4l6a7gj3ygfcab1gd58wfwwm6f"; - libraryHaskellDepends = [ base bytestring murmur3 text vector ]; - testHaskellDepends = [ base hspec hspec-core QuickCheck text ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; - description = "Hoon-style atom manipulation and printing functions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "urbit-hob_0_3_3" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hspec , hspec-core, murmur3, QuickCheck, text, vector }: @@ -259194,7 +257655,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Hoon-style atom manipulation and printing functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ureader" = callPackage @@ -259286,19 +257746,6 @@ self: { }) {}; "uri-bytestring-aeson" = callPackage - ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: - mkDerivation { - pname = "uri-bytestring-aeson"; - version = "0.1.0.7"; - sha256 = "16zg0fsxzdii72119jyhn2g2gy7j6pk7r8i7w5hk9a353kmvb43y"; - libraryHaskellDepends = [ - aeson base bytestring text uri-bytestring - ]; - description = "Aeson instances for URI Bytestring"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "uri-bytestring-aeson_0_1_0_8" = callPackage ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: mkDerivation { pname = "uri-bytestring-aeson"; @@ -259309,7 +257756,6 @@ self: { ]; description = "Aeson instances for URI Bytestring"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-conduit" = callPackage @@ -260870,18 +259316,6 @@ self: { }) {}; "validity" = callPackage - ({ mkDerivation, base, hspec }: - mkDerivation { - pname = "validity"; - version = "0.9.0.3"; - sha256 = "1iqn07n1fv54waln0jj9hf3pivxiz138hzm38z0cdl8yj76qgx7x"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; - description = "Validity typeclass"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity_0_11_0_0" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { pname = "validity"; @@ -260891,7 +259325,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Validity typeclass"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-aeson" = callPackage @@ -260933,6 +259366,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-containers_0_5_0_4" = callPackage + ({ mkDerivation, base, containers, validity }: + mkDerivation { + pname = "validity-containers"; + version = "0.5.0.4"; + sha256 = "1qw5p60dr54d2wh49y6x33hbks4d74m8pr5zygblzk0y70warqld"; + libraryHaskellDepends = [ base containers validity ]; + description = "Validity instances for containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-path" = callPackage ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path , validity @@ -262180,23 +260625,6 @@ self: { }) {}; "verbosity" = callPackage - ({ mkDerivation, base, binary, data-default-class, deepseq, dhall - , generic-lens, serialise - }: - mkDerivation { - pname = "verbosity"; - version = "0.3.0.0"; - sha256 = "0wzhkzgd6yxzdkmd2n8hwhrfyh5n88xs0hkil9l98wjh3mnn1qja"; - revision = "1"; - editedCabalFile = "11nw7xwvfc4aqnl9wibgfx0adzpnfbz58cjhcanf04j8pjk609lf"; - libraryHaskellDepends = [ - base binary data-default-class deepseq dhall generic-lens serialise - ]; - description = "Simple enum that encodes application verbosity"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "verbosity_0_4_0_0" = callPackage ({ mkDerivation, base, binary, deepseq, dhall, generic-lens , serialise }: @@ -262209,7 +260637,6 @@ self: { ]; description = "Simple enum that encodes application verbosity"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "verdict" = callPackage @@ -262613,7 +261040,7 @@ self: { version = "1.0"; sha256 = "0kzwp58lki3jvx09n6w8rc97idhy947xqik72p2fqjyigkymv04h"; libraryHaskellDepends = [ base mtl ]; - description = "Views allow you to run a State monad on part of a state."; + description = "Views allow you to run a State monad on part of a state"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -263321,40 +261748,6 @@ self: { }) {inherit (pkgs) vte;}; "vty" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers - , deepseq, directory, filepath, hashable, HUnit, microlens - , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck - , quickcheck-assertions, random, smallcheck, stm, string-qq - , terminfo, test-framework, test-framework-hunit - , test-framework-smallcheck, text, transformers, unix, utf8-string - , vector - }: - mkDerivation { - pname = "vty"; - version = "5.26"; - sha256 = "03iznvkdm11blzx09il96262qpgc4mmi3qzarhl8grrijkgzxj4x"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring containers deepseq directory filepath - hashable microlens microlens-mtl microlens-th mtl parallel parsec - stm terminfo text transformers unix utf8-string vector - ]; - executableHaskellDepends = [ - base containers microlens microlens-mtl mtl - ]; - testHaskellDepends = [ - base blaze-builder bytestring Cabal containers deepseq HUnit - microlens microlens-mtl mtl QuickCheck quickcheck-assertions random - smallcheck stm string-qq terminfo test-framework - test-framework-hunit test-framework-smallcheck text unix - utf8-string vector - ]; - description = "A simple terminal UI library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vty_5_28_2" = callPackage ({ mkDerivation, ansi-terminal, base, binary, blaze-builder , bytestring, Cabal, containers, deepseq, directory, filepath , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl @@ -263387,7 +261780,6 @@ self: { ]; description = "A simple terminal UI library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vty-examples" = callPackage @@ -265463,8 +263855,8 @@ self: { pname = "warc"; version = "1.0.4"; sha256 = "1mxfm8kdvm0l1lnzma4n9mriz94ypckxqcz1f34fa3n1j3ckc45b"; - revision = "5"; - editedCabalFile = "1h0pm3zhyzhayfiknqzljayj50gzaagmian81fs94nb6hs5sww5p"; + revision = "6"; + editedCabalFile = "0s563lg70ks3s6plvwi79glq6vkrh7n769fh6l6b4pvj7vp604cj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -266270,37 +264662,37 @@ self: { "web3" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base58string - , basement, bytestring, cereal, cryptonite, data-default, errors - , exceptions, generics-sop, hspec, hspec-contrib, hspec-discover - , hspec-expectations, http-client, http-client-tls, http-media - , http-types, machines, memory, microlens, microlens-aeson - , microlens-mtl, microlens-th, mtl, network, OneTuple, parsec - , random, relapse, servant, servant-client, split, stm, tagged, tar - , template-haskell, text, time, transformers, unordered-containers - , uuid-types, vinyl, websockets + , basement, bitvec, bytestring, cereal, cryptonite, data-default + , errors, exceptions, generics-sop, hspec, hspec-contrib + , hspec-discover, hspec-expectations, http-client, http-client-tls + , http-media, http-types, machines, memory, microlens + , microlens-aeson, microlens-mtl, microlens-th, mtl, network + , OneTuple, parsec, random, relapse, servant, servant-client, split + , stm, tagged, tar, template-haskell, text, time, transformers + , unordered-containers, uuid-types, vector, vinyl, websockets }: mkDerivation { pname = "web3"; - version = "0.9.0.0"; - sha256 = "19814hp7ngwv5g16yi1sldshrzy3kk0flgqhhh6dd48vr0p4n8f8"; + version = "0.9.1.0"; + sha256 = "12nx9hgwx61yj44iym7na9jxf05jry3aa82j2s8l5rpw3qdv7dis"; libraryHaskellDepends = [ - aeson async attoparsec base base58string basement bytestring cereal - cryptonite data-default errors exceptions generics-sop hspec + aeson async attoparsec base base58string basement bitvec bytestring + cereal cryptonite data-default errors exceptions generics-sop hspec http-client http-client-tls http-media http-types machines memory microlens microlens-aeson microlens-mtl microlens-th mtl network OneTuple parsec relapse servant servant-client tagged tar template-haskell text transformers unordered-containers uuid-types - vinyl websockets + vector vinyl websockets ]; testHaskellDepends = [ - aeson async attoparsec base base58string basement bytestring cereal - cryptonite data-default errors exceptions generics-sop hspec + aeson async attoparsec base base58string basement bitvec bytestring + cereal cryptonite data-default errors exceptions generics-sop hspec hspec-contrib hspec-discover hspec-expectations http-client http-client-tls http-media http-types machines memory microlens microlens-aeson microlens-mtl microlens-th mtl network OneTuple parsec random relapse servant servant-client split stm tagged tar template-haskell text time transformers unordered-containers - uuid-types vinyl websockets + uuid-types vector vinyl websockets ]; testToolDepends = [ hspec-discover ]; description = "Web3 API for Haskell"; @@ -269374,7 +267766,7 @@ self: { revision = "1"; editedCabalFile = "1jszf2hdipr9iry6pcdhhk42aglcq6m3zvg9rgmnickfdzd4k71h"; libraryHaskellDepends = [ base containers time vector-space ]; - description = "Pure Haskell PostScript and SVG generation."; + description = "Pure Haskell PostScript and SVG generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -269433,20 +267825,6 @@ self: { }) {}; "wuss" = callPackage - ({ mkDerivation, base, bytestring, connection, network, websockets - }: - mkDerivation { - pname = "wuss"; - version = "1.1.16"; - sha256 = "1rhc0i4bkx09iv291531mawll9h89bp57xmpkwg0j3kfklilcavl"; - libraryHaskellDepends = [ - base bytestring connection network websockets - ]; - description = "Secure WebSocket (WSS) clients"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wuss_1_1_17" = callPackage ({ mkDerivation, base, bytestring, connection, network, websockets }: mkDerivation { @@ -269458,7 +267836,6 @@ self: { ]; description = "Secure WebSocket (WSS) clients"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wx" = callPackage @@ -269997,20 +268374,20 @@ self: { }) {}; "xdot" = callPackage - ({ mkDerivation, base, cairo, graphviz, gtk3, mtl, polyparse, text - , transformers + ({ mkDerivation, base, cairo, deepseq, graphviz, gtk3, mtl + , polyparse, text, transformers }: mkDerivation { pname = "xdot"; - version = "0.3.0.1"; - sha256 = "0gdfaviib1hnsnkq65d71v90xl09rdyqm9n3wjkdplxz9rj5d6mh"; + version = "0.3.0.2"; + sha256 = "0k3lklghlj51nslv8pi8anj78hls2srmdr6hz5yibfhvycpib0c2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base cairo graphviz gtk3 mtl polyparse text + base cairo deepseq graphviz gtk3 mtl polyparse text ]; executableHaskellDepends = [ - base cairo graphviz gtk3 text transformers + base cairo deepseq graphviz gtk3 text transformers ]; description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo"; license = stdenv.lib.licenses.bsd3; @@ -270019,26 +268396,6 @@ self: { }) {}; "xeno" = callPackage - ({ mkDerivation, array, base, bytestring, criterion, deepseq - , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector - , weigh, xml - }: - mkDerivation { - pname = "xeno"; - version = "0.3.5.2"; - sha256 = "0xfhdi5d0y3rlsmzczdg8b896l9q31nify1vsq0vfqqhfn75pw8l"; - libraryHaskellDepends = [ - array base bytestring deepseq mtl mutable-containers vector - ]; - testHaskellDepends = [ base bytestring hexml hspec ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml - ]; - description = "A fast event-based XML parser in pure Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "xeno_0_4_1" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-mmap, bzlib , criterion, deepseq, filepath, ghc-prim, hexml, hexpat, hspec, mtl , mutable-containers, time, vector, weigh, xml @@ -270063,7 +268420,6 @@ self: { ]; description = "A fast event-based XML parser in pure Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xenstore" = callPackage @@ -270488,8 +268844,8 @@ self: { pname = "xml"; version = "1.3.14"; sha256 = "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j"; - revision = "1"; - editedCabalFile = "130xwqmgmg9vp988mppm5ivz1r5qbivb270fz2rwl4q0x04czdzd"; + revision = "2"; + editedCabalFile = "15cxa19dp8nqvrrp0bmndkdas2jzg573x8ri75r6kiv8r4vkv8y7"; libraryHaskellDepends = [ base bytestring text ]; description = "A simple XML library"; license = stdenv.lib.licenses.bsd3; @@ -271098,8 +269454,8 @@ self: { ({ mkDerivation, base, deepseq, text }: mkDerivation { pname = "xml-types"; - version = "0.3.6"; - sha256 = "1jgqxsa9p2q3h6nymbfmvhldqrqlwrhrzmwadlyc0li50x0d8dwr"; + version = "0.3.7"; + sha256 = "0x0fdwx6gyhwbx4wfah6ssnpfq5bkybrh0f75wr0gvw4hrnx81k3"; libraryHaskellDepends = [ base deepseq text ]; description = "Basic types for representing XML"; license = stdenv.lib.licenses.mit; @@ -271335,16 +269691,16 @@ self: { "xmobar" = callPackage ({ mkDerivation, alsa-core, alsa-mixer, async, base, bytestring , containers, dbus, directory, extensible-exceptions, filepath - , hinotify, hspec, http-conduit, http-types, iwlib, libmpd, libXpm - , libXrandr, libXrender, mtl, old-locale, parsec, parsec-numbers - , process, regex-compat, stm, temporary, time, timezone-olson - , timezone-series, transformers, unix, utf8-string, wirelesstools - , X11, X11-xft + , hinotify, hspec, http-client-tls, http-conduit, http-types, iwlib + , libmpd, libXpm, libXrandr, libXrender, mtl, old-locale, parsec + , parsec-numbers, process, regex-compat, stm, temporary, time + , timezone-olson, timezone-series, transformers, unix, utf8-string + , wirelesstools, X11, X11-xft }: mkDerivation { pname = "xmobar"; - version = "0.33"; - sha256 = "1hr3qqykc5givcpcwrr9f2y920jmiinmxm5mcy6qgpgymgwqb618"; + version = "0.34"; + sha256 = "0x09xbz7y9ay0046j1xpr9jjk5jqivqi06vm3q6mhcrgc4y922rx"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -271355,10 +269711,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ alsa-core alsa-mixer async base bytestring containers dbus - directory extensible-exceptions filepath hinotify http-conduit - http-types iwlib libmpd mtl old-locale parsec parsec-numbers - process regex-compat stm time timezone-olson timezone-series - transformers unix utf8-string X11 X11-xft + directory extensible-exceptions filepath hinotify http-client-tls + http-conduit http-types iwlib libmpd mtl old-locale parsec + parsec-numbers process regex-compat stm time timezone-olson + timezone-series transformers unix utf8-string X11 X11-xft ]; librarySystemDepends = [ libXpm libXrandr libXrender wirelesstools @@ -275322,33 +273678,6 @@ self: { }) {}; "yesod-test" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , bytestring, case-insensitive, conduit, containers, cookie, hspec - , hspec-core, html-conduit, http-types, HUnit, memory, network - , pretty-show, semigroups, text, time, transformers, unliftio - , unliftio-core, wai, wai-extra, xml-conduit, xml-types, yesod-core - , yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.6.9"; - sha256 = "0v25lqq7hgd5lggnyfd9kamkzd4126rd7vlhc131n253n4by4yak"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html bytestring - case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit memory network pretty-show semigroups text time - transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers cookie hspec html-conduit http-types - HUnit text unliftio unliftio-core wai wai-extra xml-conduit - yesod-core yesod-form - ]; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-test_1_6_9_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , bytestring, case-insensitive, conduit, containers, cookie, hspec , hspec-core, html-conduit, http-types, HUnit, memory, network @@ -275373,7 +273702,6 @@ self: { ]; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test-json" = callPackage @@ -276733,38 +275061,34 @@ self: { }) {}; "zephyr" = callPackage - ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, async, base , base-compat, boxes, bytestring, containers, directory, filepath , formatting, Glob, hspec, hspec-core, HUnit, language-javascript , mtl, optparse-applicative, process, purescript, QuickCheck, safe - , text, transformers, transformers-base, transformers-compat - , utf8-string + , text, transformers, utf8-string }: mkDerivation { pname = "zephyr"; - version = "0.2.1"; - sha256 = "0yhpy1dwh1axbh3xgxn97vnh616pywz56r7gy6sfvqaxj9bqviha"; + version = "0.3.1"; + sha256 = "1bzairza82vp7yydw5f4am0nsc1pldqrz6j4fz1c4lmrp045a87h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base base-compat boxes bytestring containers - directory filepath formatting Glob language-javascript mtl - optparse-applicative purescript safe text transformers - transformers-base transformers-compat utf8-string + aeson ansi-terminal base base-compat boxes containers formatting + language-javascript mtl purescript safe text ]; executableHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base base-compat bytestring - containers directory filepath formatting Glob language-javascript - mtl optparse-applicative purescript text transformers - transformers-base transformers-compat utf8-string + aeson ansi-terminal ansi-wl-pprint async base bytestring containers + directory filepath formatting Glob language-javascript mtl + optparse-applicative purescript text transformers utf8-string ]; testHaskellDepends = [ - aeson ansi-terminal base base-compat bytestring containers - directory filepath hspec hspec-core HUnit language-javascript mtl - optparse-applicative process purescript QuickCheck text - transformers transformers-base transformers-compat utf8-string + aeson base base-compat containers directory hspec hspec-core HUnit + language-javascript mtl optparse-applicative process purescript + QuickCheck text transformers utf8-string ]; - description = "Zephyr tree shaking for PureScript Language"; + testToolDepends = [ purescript ]; + description = "Zephyr, tree-shaking for the PureScript language"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -277000,6 +275324,30 @@ self: { broken = true; }) {}; + "zettelkast" = callPackage + ({ mkDerivation, base, containers, directory, filepath, lens, mtl + , optparse-generic, pandoc, pandoc-types, pointed, process, text + , time, transformers + }: + mkDerivation { + pname = "zettelkast"; + version = "0.1.0.0"; + sha256 = "111383ddpalaiwbq5plyi02v2givv21xnxb4j0fb31k8ssmkgbqj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath lens mtl pandoc pandoc-types + pointed process text time + ]; + executableHaskellDepends = [ + base containers directory lens optparse-generic process text time + transformers + ]; + testHaskellDepends = [ base ]; + description = "Command-line utility for working with zettelkast files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zifter" = callPackage ({ mkDerivation, ansi-terminal, async, base, colour, directory , exceptions, filepath, genvalidity, genvalidity-hspec @@ -277187,34 +275535,6 @@ self: { }) {}; "zip" = callPackage - ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive - , cereal, conduit, conduit-extra, containers, digest, directory - , dlist, exceptions, filepath, hspec, monad-control, mtl - , QuickCheck, resourcet, temporary, text, time, transformers - , transformers-base - }: - mkDerivation { - pname = "zip"; - version = "1.3.2"; - sha256 = "0nmqp34w82wzlkip9zk05dy4yjnwy8dc2k7n1kq0rrdsb9zsc360"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring bzlib-conduit case-insensitive cereal conduit - conduit-extra containers digest directory dlist exceptions filepath - monad-control mtl resourcet text time transformers - transformers-base - ]; - executableHaskellDepends = [ base filepath ]; - testHaskellDepends = [ - base bytestring conduit containers directory dlist exceptions - filepath hspec QuickCheck temporary text time transformers - ]; - description = "Operations on zip archives"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "zip_1_5_0" = callPackage ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive , cereal, conduit, conduit-extra, containers, digest, directory , dlist, exceptions, filepath, hspec, monad-control, mtl @@ -277240,7 +275560,6 @@ self: { ]; description = "Operations on zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zip-archive" = callPackage @@ -277758,7 +276077,7 @@ self: { "zre" = callPackage ({ mkDerivation, async, attoparsec, base, binary, bytestring - , config-ini, containers, data-default, directory, filepath + , cereal, containers, data-default, directory, filepath , lifted-async, monad-control, mtl, network, network-bsd , network-info, network-multicast, optparse-applicative, process , QuickCheck, quickcheck-instances, random, repline, sockaddr, stm @@ -277766,28 +276085,27 @@ self: { }: mkDerivation { pname = "zre"; - version = "0.1.0.2"; - sha256 = "09h1vsnm9p4yds8k4k7c5ixn8q6cikwkiw6wxf7srl9bbrwxhj9l"; + version = "0.1.1.0"; + sha256 = "0xq37fiqy82xvk4bz3ia4gykhm1vr3jlv9p8b1bdmsqsmn8kxd2x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async attoparsec base binary bytestring config-ini containers - data-default directory filepath monad-control mtl network - network-bsd network-info network-multicast optparse-applicative - process random sockaddr stm text time transformers-base uuid - zeromq4-haskell + async attoparsec base binary bytestring cereal containers + data-default directory filepath lifted-async monad-control mtl + network network-bsd network-info network-multicast + optparse-applicative process random sockaddr stm text time + transformers-base uuid zeromq4-haskell ]; executableHaskellDepends = [ - async base bytestring lifted-async monad-control mtl repline stm - time + async base bytestring lifted-async monad-control mtl + optparse-applicative repline stm time ]; testHaskellDepends = [ base bytestring QuickCheck quickcheck-instances uuid ]; description = "ZRE protocol implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ sorki ]; }) {}; "zsdd" = callPackage From 89997f69b167defe08ab3e518cfaf86af5aa41e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Jun 2020 11:31:09 +0200 Subject: [PATCH 2174/3452] Drop obsolete overrides now that LTS 16.x has arrived. --- .../haskell-modules/configuration-common.nix | 42 ++----------------- .../configuration-ghc-8.10.x.nix | 5 +-- 2 files changed, 5 insertions(+), 42 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2177630f8bb7..dc593ef893b1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1411,11 +1411,6 @@ self: super: { # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2. haskell-ci = doJailbreak super.haskell-ci; - # Needs the latest version of vty. - matterhorn = super.matterhorn.overrideScope (self: super: { - vty = self.vty_5_28_2; - }); - # Test suite requires database persistent-mysql = dontCheck super.persistent-mysql; persistent-postgresql = dontCheck super.persistent-postgresql; @@ -1440,9 +1435,6 @@ self: super: { sha256 = "097wqn8hxsr50b9mhndg5pjim5jma2ym4ylpibakmmb5m98n17zp"; }); - # Needs a version that's newer than LTS-15.x provides. - weeder = super.weeder.override { generic-lens = self.generic-lens_2_0_0_0; }; - polysemy-plugin = super.polysemy-plugin.override { # polysemy-plugin 0.2.5.0 has constraint ghc-tcplugins-extra (==0.3.*) # This upstream issue is relevant: @@ -1465,38 +1457,9 @@ self: super: { sha256 = "0xbfhzhzg94b4r5qy5dg1c40liswwpqarrc2chcwgfbfnrmwkfc2"; }); - # Depends on selective >= 0.4, but the default of selective is 0.3 - headed-megaparsec = super.headed-megaparsec.override { - selective = self.selective_0_4_1; - }; - - # Needed for ghcide - haskell-lsp_0_22_0_0 = super.haskell-lsp_0_22_0_0.override { - haskell-lsp-types = self.haskell-lsp-types_0_22_0_0; - }; - # this will probably need to get updated with every ghcide update, # we need an override because ghcide is tracking haskell-lsp closely. - ghcide = dontCheck (super.ghcide.override rec { - haskell-lsp-types = self.haskell-lsp-types_0_22_0_0; - haskell-lsp = self.haskell-lsp_0_22_0_0; - hie-bios = self.hie-bios_0_5_0; - ghc-check = self.ghc-check_0_3_0_1; - }); - - # stackage right now is not new enough for hlint-3.0 - ghc-lib-parser-ex_8_10_0_13 = super.ghc-lib-parser-ex_8_10_0_13.override { - ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200523; - }; - - hlint = super.hlint.override { - ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200523; - ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_13; - extra = self.extra_1_7_3; - filepattern = self.filepattern.override { - extra = self.extra_1_7_3; - }; - }; + ghcide = dontCheck (super.ghcide.override { ghc-check = self.ghc-check_0_3_0_1; }); # hasn‘t bumped upper bounds # upstream: https://github.com/obsidiansystems/which/pull/6 @@ -1506,4 +1469,7 @@ self: super: { # through $PATH but they aren't in $PATH dhall-lsp-server = dontCheck super.dhall-lsp-server; + # https://github.com/ocharles/weeder/issues/15 + weeder = doJailbreak super.weeder; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 4dd08bbd4333..26a03c45cdd7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -84,8 +84,6 @@ self: super: { zlib = doJailbreak super.zlib; # Use the latest version to fix the build. - dhall = self.dhall_1_32_0; - ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4; lens = self.lens_4_19_2; optics-core = self.optics-core_0_3; repline = self.repline_0_3_0_0; @@ -97,7 +95,7 @@ self: super: { # multiple verions of `ghc-lib-parser(-ex)` available, and the default ones # are older ones, those older ones will complain. Because we have a newer # GHC, we can just set the dependency to `null` as it is not used. - ghc-lib-parser-ex_8_10_0_4 = super.ghc-lib-parser-ex_8_10_0_4.override { ghc-lib-parser = null; }; + ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = null; }; # Jailbreak to fix the build. aeson-diff = doJailbreak super.aeson-diff; @@ -111,7 +109,6 @@ self: super: { serialise = doJailbreak super.serialise; setlocale = doJailbreak super.setlocale; shellmet = doJailbreak super.shellmet; - weeder = doJailbreak super.weeder; # https://github.com/ocharles/weeder/issues/15 xmobar = doJailbreak super.xmobar; # The shipped Setup.hs file is broken. From 1ca0005c6bdf397bc02e39001daca8f311a7cb95 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Thu, 11 Jun 2020 15:27:08 +0100 Subject: [PATCH 2175/3452] Agda: Fix version 2.6.1 --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 093a363a0800..4da1e312bb35 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2537,6 +2537,7 @@ default-package-overrides: extra-packages: - aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier + - Agda == 2.6.1 # allows the agdaPackage set to be fixed to this version so that it won't break when another agda version is released. - ansi-terminal == 0.10.3 # required by cabal-plan, and policeman in ghc-8.8.x - aeson-pretty < 0.8 # required by elm compiler - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x From 91754464d37957710cf778ce78f02a918d4c03d4 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 12 Jun 2020 18:23:52 +0200 Subject: [PATCH 2176/3452] haskellPackages.neuron: Fix build --- .../haskell-modules/configuration-common.nix | 12 +++++ .../configuration-hackage2nix.yaml | 1 + .../haskell-modules/hackage-packages.nix | 53 +++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dc593ef893b1..9472414d243f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1027,6 +1027,7 @@ self: super: { # 2020-06-04: HACK: dontCheck - The test suite attempts to use the network. # Should be solved when: https://github.com/dhall-lang/dhall-haskell/issues/1837 dhall = generateOptparseApplicativeCompletion "dhall" (dontCheck super.dhall); + dhall_1_30_0 = dontCheck super.dhall_1_30_0; dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] @@ -1472,4 +1473,15 @@ self: super: { # https://github.com/ocharles/weeder/issues/15 weeder = doJailbreak super.weeder; + # Requested version bump on upstream https://github.com/obsidiansystems/constraints-extras/issues/32 + constraints-extras = doJailbreak super.constraints-extras; + # Requested version bump on upstream https://github.com/srid/rib/issues/160 + rib = doJailbreak (super.rib.override { + dhall = self.dhall_1_30_0; + }); + # Necessary for neuron 0.4.0 + neuron = super.neuron.override { + dhall = self.dhall_1_30_0; + }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 4da1e312bb35..3acdf164e6f8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2557,6 +2557,7 @@ extra-packages: - dbus <1 # for xmonad-0.26 - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3 - dhall == 1.29.0 # required for spago 0.14.0. + - dhall == 1.30.0 # required for neuron 0.4.0.0. - doctemplates == 0.8 # required by pandoc-2.9.x - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x - ghc-check == 0.3.0.1 # only version compatible with ghcide 0.2.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f312b0e69f0d..43b79933b2e8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -70836,6 +70836,59 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dhall_1_30_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write + , base, bytestring, case-insensitive, cborg, cborg-json, containers + , contravariant, cryptonite, data-fix, deepseq, Diff, directory + , doctest, dotgen, either, exceptions, filepath, foldl, gauge + , generic-random, hashable, haskeline, http-client, http-client-tls + , http-types, lens-family-core, megaparsec, memory, mockery, mtl + , network-uri, optparse-applicative, parser-combinators, parsers + , pretty-simple, prettyprinter, prettyprinter-ansi-terminal + , profunctors, QuickCheck, quickcheck-instances, repline + , scientific, semigroups, serialise, special-values, spoon, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , template-haskell, text, th-lift-instances, transformers + , transformers-compat, turtle, unordered-containers, uri-encode + , vector + }: + mkDerivation { + pname = "dhall"; + version = "1.30.0"; + sha256 = "10aagimwa5ycrq15240ff2g7r0n995waa33vaz0h51nqvncrbgpj"; + revision = "1"; + editedCabalFile = "1pazhb3h1rabb80wxh29k5yfp915zqp1gmhcv4mx7ibzv9zw7miq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal atomic-write base bytestring + case-insensitive cborg cborg-json containers contravariant + cryptonite data-fix deepseq Diff directory dotgen either exceptions + filepath hashable haskeline http-client http-client-tls http-types + lens-family-core megaparsec memory mtl network-uri + optparse-applicative parser-combinators parsers pretty-simple + prettyprinter prettyprinter-ansi-terminal profunctors repline + scientific serialise template-haskell text th-lift-instances + transformers transformers-compat unordered-containers uri-encode + vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring cborg containers data-fix deepseq directory doctest + either filepath foldl generic-random lens-family-core megaparsec + mockery prettyprinter QuickCheck quickcheck-instances scientific + semigroups serialise special-values spoon tasty + tasty-expected-failure tasty-hunit tasty-quickcheck text + transformers turtle unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers directory gauge serialise text + ]; + description = "A configuration language guaranteed to terminate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers From b53c8b281050b0c72c3b1fed5dae89c907b2597f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Jun 2020 20:36:45 +0200 Subject: [PATCH 2177/3452] haskell-polysemy-plugin: drop obsolete overrides --- pkgs/development/haskell-modules/configuration-common.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9472414d243f..0c01fb040141 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1436,13 +1436,11 @@ self: super: { sha256 = "097wqn8hxsr50b9mhndg5pjim5jma2ym4ylpibakmmb5m98n17zp"; }); + # polysemy-plugin 0.2.5.0 has constraint ghc-tcplugins-extra (==0.3.*) + # This upstream issue is relevant: + # https://github.com/polysemy-research/polysemy/issues/322 polysemy-plugin = super.polysemy-plugin.override { - # polysemy-plugin 0.2.5.0 has constraint ghc-tcplugins-extra (==0.3.*) - # This upstream issue is relevant: - # https://github.com/polysemy-research/polysemy/issues/322 ghc-tcplugins-extra = self.ghc-tcplugins-extra_0_3_2; - # version of Polysemy the plugin goes with - polysemy = self.polysemy_1_3_0_0; }; # Test suite requires running a database server. Testing is done upstream. From 102ae12936bec536daad69b18d3191103907e2de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Jun 2020 20:44:56 +0200 Subject: [PATCH 2178/3452] haskell-stack: drop obsolete overrides http-download versios 2.0.x is the default in LTS 16.x. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0c01fb040141..2164fc6a9d83 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1046,8 +1046,7 @@ self: super: { # Generate shell completion. cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; - stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: { http-download = self.http-download_0_2_0_0; })); - http-download_0_2_0_0 = dontCheck super.http-download_0_2_0_0; + stack = generateOptparseApplicativeCompletion "stack" super.stack; # musl fixes # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test From c44fa2a1be102fa5ab420e86ec2b9de1e834acea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Jun 2020 20:56:43 +0200 Subject: [PATCH 2179/3452] haskell-src-exts-simple: drop obsolete overrides --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2164fc6a9d83..d23d504d110f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1244,9 +1244,6 @@ self: super: { ]; }); - # Needs the corresponding version of haskell-src-exts. - haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_23_1; }; - # https://github.com/Daniel-Diaz/HaTeX/issues/144 HaTeX = dontCheck super.HaTeX; From b0042de0cfe878d15b7e7220b18553b36b027c31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Jun 2020 20:58:24 +0200 Subject: [PATCH 2180/3452] haskell-postgresql-syntax: drop obsolete overrides --- .../haskell-modules/configuration-nix.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index ec14c565b74e..1a00a8d809a4 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -755,18 +755,6 @@ self: super: builtins.intersectAttrs super { ''; }); - postgresql-syntax = super.postgresql-syntax.override { - rerebase = self.rerebase_1_6_1; - }; - - rerebase_1_6_1 = super.rerebase_1_6_1.override { - rebase = self.rebase_1_6_1; - }; - - rebase_1_6_1 = super.rebase_1_6_1.override { - selective = super.selective_0_4_1; - }; - # Fix compilation of Setup.hs by removing the module declaration. # See: https://github.com/tippenein/guid/issues/1 guid = overrideCabal (super.guid) (drv: { From 6e8d0133f982a72ede88b4016f671164c32ffce2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Jun 2020 21:50:53 +0200 Subject: [PATCH 2181/3452] all-cabal-hashes: update to Hackage at 2020-06-12T00:09:36Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 73429770b295..7d66d31690cb 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e8df5568f80e6230e29c2381e842db35fe11cd71.tar.gz"; - sha256 = "1fz4iax88pmlqpb4zp3l6mb6bmkzzha0q6mm3xasabh5yl83dbhy"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/73b209cba2ed84fa95c0fdde9616b4c5f983855f.tar.gz"; + sha256 = "0sm3kqd3blvk18frjfx1nkrbfpds780qv63rkcl5fp5f1z02lhv3"; } From 116021c98a2ade19b1f48b205e83acdeae836d0c Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 4 Jun 2020 18:18:03 +0200 Subject: [PATCH 2182/3452] haskellPackages.c2hsc: apply patchto find gcc ...used in tests. Fix is upstream but there has been no sign of release for the past 6 months, fixes https://github.com/NixOS/nixpkgs/issues/63764. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d23d504d110f..84f33911f31e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -26,6 +26,12 @@ self: super: { # successfully with recent versions of the compiler). bin-package-db = null; + # waiting for release: https://github.com/jwiegley/c2hsc/issues/41 + c2hsc = appendPatch super.c2hsc (pkgs.fetchpatch { + url = "https://github.com/jwiegley/c2hsc/commit/490ecab202e0de7fc995eedf744ad3cb408b53cc.patch"; + sha256 = "1c7knpvxr7p8c159jkyk6w29653z5yzgjjqj11130bbb8mk9qhq7"; + }); + # Some Hackage packages reference this attribute, which exists only in the # GHCJS package set. We provide a dummy version here to fix potential # evaluation errors. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 3acdf164e6f8..50b47ab30514 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3562,7 +3562,6 @@ broken-packages: - c0parser - c10k - c2ats - - c2hsc - cabal-audit - cabal-bounds - cabal-bundle-clib From 6dcb4185f605ad0c5c54e04a554974e9c88c474b Mon Sep 17 00:00:00 2001 From: David Baynard Date: Sat, 13 Jun 2020 22:53:57 +0100 Subject: [PATCH 2183/3452] =?UTF-8?q?haskellPackages.x509-validation:=20Do?= =?UTF-8?q?n=E2=80=99t=20check=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The test suite hangs — issue vincenthz/hs-certificate#120. Required to build tls, and thereby stack. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 84f33911f31e..4b5df5082c83 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1484,4 +1484,7 @@ self: super: { dhall = self.dhall_1_30_0; }; + # Stack + x509-validation = dontCheck super.x509-validation; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From a2caf7f309f1fa99ec7c2ec70522769930ae6bf5 Mon Sep 17 00:00:00 2001 From: David Baynard Date: Sat, 13 Jun 2020 23:14:52 +0100 Subject: [PATCH 2184/3452] =?UTF-8?q?haskellPackages.tls:=20Don=E2=80=99t?= =?UTF-8?q?=20check=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ‘Extended Master Secret (resumption)’ test is failing. See vincenth/hs-tls#434. Required for stack. --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4b5df5082c83..39727e1d7b50 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1486,5 +1486,6 @@ self: super: { # Stack x509-validation = dontCheck super.x509-validation; + tls = dontCheck super.tls; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 2ab43eafd4b0bbd880e06bc10000c0251c0d8735 Mon Sep 17 00:00:00 2001 From: David Baynard Date: Sun, 14 Jun 2020 16:52:06 +0100 Subject: [PATCH 2185/3452] Describe reasons for disabling tests --- pkgs/development/haskell-modules/configuration-common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 39727e1d7b50..a94c3f07808e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1484,7 +1484,9 @@ self: super: { dhall = self.dhall_1_30_0; }; - # Stack + # Necessary for stack + # x509-validation test suite hangs: upstream https://github.com/vincenthz/hs-certificate/issues/120 + # tls test suite fails: upstream https://github.com/vincenthz/hs-tls/issues/434 x509-validation = dontCheck super.x509-validation; tls = dontCheck super.tls; From cdda16b1b13e4e4f2d3cddcc20cb50ddf563fe6a Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 15 Jun 2020 21:01:43 +0900 Subject: [PATCH 2186/3452] spago: 0.15.1 -> 0.15.3 --- .../haskell-modules/configuration-nix.nix | 13 +++++-------- pkgs/development/tools/purescript/spago/spago.nix | 6 +++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 1a00a8d809a4..e0758a16325b 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -639,17 +639,14 @@ self: super: builtins.intersectAttrs super { spago = let # Spago needs a small patch to work with the latest versions of rio. - # https://github.com/purescript/spago/pull/616 - # This can probably be removed when a version after spago-0.15.1 is released. + # https://github.com/purescript/spago/pull/647 spagoWithPatches = appendPatch super.spago (pkgs.fetchpatch { - url = "https://github.com/purescript/spago/pull/616/commits/95b5fa0f1d3bfb07972d1ef5004b8bee8a070667.patch"; - sha256 = "0v3890lwhddfrq9mhbq92962pkxra8kwbin97wg3s0b02dk65ysc"; + url = "https://github.com/purescript/spago/pull/647/commits/917ee541a966db74f0f5d11f2f86df0030c35dd7.patch"; + sha256 = "1nspqgcjk6z90cl9zhard0rn2q979kplcqz72x8xv5mh57zabk0w"; }); - # Spago basically compiles with LTS-14, but it requires a newer version - # of directory. This is to work around a bug only present on windows, so - # we can safely jailbreak spago and use the older directory package from - # LTS-14. + # spago requires an older version of megaparsec, but it appears to work + # fine with newer versions. spagoWithOverrides = doJailbreak spagoWithPatches; # This defines the version of the purescript-docs-search release we are using. diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index 254a7bc97e43..20a1f53f6751 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -11,11 +11,11 @@ }: mkDerivation { pname = "spago"; - version = "0.15.1"; + version = "0.15.3"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "09ypbm03ap8xfhq803ra3cc01dxcavckn7nis6hi80dk2xxlhc3d"; - rev = "d5d206ff0f5c686f8b609fb4bc2e866959cc0144"; + sha256 = "0spc7r531kmh9magaxzy4jls3bzfazwf8sq3qzk6f292d7ky6n8y"; + rev = "da6d91c19b23f06f3ede793f78599a6589c9e7cd"; fetchSubmodules = true; }; isLibrary = true; From b4723d2156aed7d4865c3fc70a22abbb806b2b80 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 13 Jun 2020 23:01:44 +0200 Subject: [PATCH 2187/3452] haskellPackages.reflex-dom and dependencies: Fix build --- .../haskell-modules/configuration-common.nix | 64 ++++++++++++++++++- .../configuration-hackage2nix.yaml | 4 +- .../haskell-modules/hackage-packages.nix | 6 +- 3 files changed, 65 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a94c3f07808e..03e22f2344f5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -352,7 +352,6 @@ self: super: { pwstore-cli = dontCheck super.pwstore-cli; quantities = dontCheck super.quantities; redis-io = dontCheck super.redis-io; - reflex = dontCheck super.reflex; # test suite uses hlint, which has different haskell-src-exts version rethinkdb = dontCheck super.rethinkdb; Rlang-QQ = dontCheck super.Rlang-QQ; safecopy = dontCheck super.safecopy; @@ -1490,4 +1489,67 @@ self: super: { x509-validation = dontCheck super.x509-validation; tls = dontCheck super.tls; + # Upstream PR: https://github.com/bgamari/monoidal-containers/pull/62 + # Bump these version bound + monoidal-containers = appendPatch super.monoidal-containers (pkgs.fetchpatch { + url = "https://github.com/bgamari/monoidal-containers/pull/62/commits/715093b22a015398a1390f636be6f39a0de83254.patch"; + sha256="1lfxvwp8g55ljxvj50acsb0wjhrvp2hvir8y0j5pfjkd1kq628ng"; + }); + + patch = appendPatches super.patch [ + # Upstream PR: https://github.com/reflex-frp/patch/pull/20 + # Makes tests work with hlint 3 + (pkgs.fetchpatch { + url = "https://github.com/reflex-frp/patch/pull/20/commits/3ed23a4e4049ee17e64a1a5bbebf1990cdbe033a.patch"; + sha256 ="1hfa980wln8kzbqw1lr8ddszgcibw25xf12ki2jb9xkl464aynzf"; + }) + # Upstream PR: https://github.com/reflex-frp/patch/pull/17 + # Bumps version dependencies + (pkgs.fetchpatch { + url = "https://github.com/reflex-frp/patch/pull/17/commits/a191ed9ded708ed7ff0cf53ad6dafaf54db5b95a.patch"; + sha256 ="1x9w5fimhk3a0l2aa5z91nqaa6s2irz1775iidd0191m6w25vszp"; + }) + ]; + + reflex = appendPatches super.reflex [ + # Upstream PR: https://github.com/reflex-frp/reflex/pull/434 + # Bump version bounds + (pkgs.fetchpatch { + url = "https://github.com/reflex-frp/reflex/pull/434/commits/e6104bdfd7f664f524b6765275490722e376df4d.patch"; + sha256 ="1awp5p4640cnhfd50dplsvp0kzy6h8r0hpbw1s40blni74r3dhzr"; + }) + # Upstream PR: https://github.com/reflex-frp/reflex/pull/436 + # Fix build with newest dependent-map version + (pkgs.fetchpatch { + url = "https://github.com/reflex-frp/reflex/pull/436/commits/dc3bf44d822d70594e3c474fe3869261776c3554.patch"; + sha256 ="0rbjfj9b8p6zkvd5j4pak5kpgard6cyfvzk750s4xwpc1v84iiqd"; + }) + # Upstream PR: https://github.com/reflex-frp/reflex/pull/437 + # Fix tests with newer dep versions + (pkgs.fetchpatch { + url = "https://github.com/reflex-frp/reflex/pull/437/commits/87c74a1b9d9098eae8a56148c59ed4963a5232c2.patch"; + sha256 ="0qhjjgd6n4fms1hpbblny78c95bfh74izhx9dvrdlnhz6q7xlm9q"; + }) + ]; + + # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 + # Tests disabled because of very old dep: https://github.com/reflex-frp/reflex-dom/issues/393 + reflex-dom-core = unmarkBroken (dontCheck (appendPatches super.reflex-dom-core [ + # Upstream PR: https://github.com/reflex-frp/reflex-dom/pull/388 + # Fix upper bounds + (pkgs.fetchpatch { + url = "https://github.com/reflex-frp/reflex-dom/pull/388/commits/5ef04d8e478f410d2c63603b84af052c9273a533.patch"; + sha256 ="0d0b819yh8mqw8ih5asdi9qcca2kmggfsi8gf22akfw1n7xvmavi"; + stripLen = 2; + extraPrefix = ""; + }) + # Upstream PR: https://github.com/reflex-frp/reflex-dom/pull/394 + # Bump dependent-map + (pkgs.fetchpatch { + url = "https://github.com/reflex-frp/reflex-dom/pull/394/commits/695bd17d5dcdb1bf321ee8858670731637f651db.patch"; + sha256 ="0llky3i37rakgsw9vqaqmwryv7s91w8ph8xjkh83nxjs14p5zfyk"; + stripLen = 2; + extraPrefix = ""; + }) + ])); } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 50b47ab30514..b014ff0b5fb5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2668,6 +2668,7 @@ package-maintainers: terlar: - nix-diff maralorn: + - reflex-dom - ghcide - cabal-fmt - neuron @@ -2805,7 +2806,6 @@ dont-distribute-packages: - reflex-dom-contrib - reflex-dom-fragment-shader-canvas - reflex-dom-helpers - - reflex-dom - reflex-jsx - sneathlane-haste - spike @@ -8302,7 +8302,6 @@ broken-packages: - pastis - pasty - patat - - patch - patches-vector - path-text-utf8 - Pathfinder @@ -8918,7 +8917,6 @@ broken-packages: - references - refh - reflection-extras - - reflex - reflex-animation - reflex-backend-socket - reflex-backend-wai diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 43b79933b2e8..9b4e5deca6b8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -187807,8 +187807,6 @@ self: { testHaskellDepends = [ base directory filemanip filepath hlint ]; description = "Infrastructure for writing patches which act on other types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "patch-combinators" = callPackage @@ -207627,8 +207625,6 @@ self: { ]; description = "Higher-order Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "reflex-animation" = callPackage @@ -207735,7 +207731,7 @@ self: { ]; description = "Functional Reactive Web Apps with Reflex"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ maralorn ]; }) {}; "reflex-dom-colonnade" = callPackage From 3f301b06d9758a1ba81222ece900662443a9396a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Jun 2020 21:12:25 +0200 Subject: [PATCH 2188/3452] haskell-homotuple: don't mark this as broken; the build succeeds --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b014ff0b5fb5..92029329f465 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6193,7 +6193,6 @@ broken-packages: - homeomorphic - hommage - homoiconic - - homotuple - homplexity - HongoDB - honi From a2656aad20c562a38561bf5054bd34bcf9859e7c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Jun 2020 21:13:44 +0200 Subject: [PATCH 2189/3452] haskell-postgresql-libpq-notify: disable test suite to fix the build The tests need a running PostgreSQL database. --- .../haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 92029329f465..008bd06e23e3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8547,7 +8547,6 @@ broken-packages: - postgres-embedded - postgres-tmp - postgres-websockets - - postgresql-libpq-notify - postgresql-lo-stream - postgresql-named - postgresql-query diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index e0758a16325b..46ddf4a048a8 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -762,4 +762,8 @@ self: super: builtins.intersectAttrs super { # Tests disabled as recommended at https://github.com/luke-clifton/shh/issues/39 shh = dontCheck super.shh; + # The test suites fail because there's no PostgreSQL database running in our + # build sandbox. + postgresql-libpq-notify = dontCheck super.postgresql-libpq-notify; + } From 8a34e3369e2807b076d2282b8ccffb20e75cde41 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Jun 2020 21:14:12 +0200 Subject: [PATCH 2190/3452] haskell-hasql-queue: disable test suite to fix the build The tests need a running PostgreSQL database. --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 + pkgs/development/haskell-modules/configuration-nix.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 008bd06e23e3..f80787b2c777 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5848,6 +5848,7 @@ broken-packages: - hasql-optparse-applicative - hasql-postgres - hasql-postgres-options + - hasql-queue - hasql-simple - hastache - hastache-aeson diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 46ddf4a048a8..fa0a8e441e9a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -765,5 +765,6 @@ self: super: builtins.intersectAttrs super { # The test suites fail because there's no PostgreSQL database running in our # build sandbox. postgresql-libpq-notify = dontCheck super.postgresql-libpq-notify; + hasql-queue = dontCheck super.hasql-queue; } From d60fe7154065001b78ff4ec952d81e3f399075c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Jun 2020 21:17:43 +0200 Subject: [PATCH 2191/3452] haskell-postgresql-pure: disable test suite to fix the build The tests need a running PostgreSQL database. --- pkgs/development/haskell-modules/configuration-nix.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index fa0a8e441e9a..9f1bdb147934 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -764,7 +764,8 @@ self: super: builtins.intersectAttrs super { # The test suites fail because there's no PostgreSQL database running in our # build sandbox. - postgresql-libpq-notify = dontCheck super.postgresql-libpq-notify; hasql-queue = dontCheck super.hasql-queue; + postgresql-libpq-notify = dontCheck super.postgresql-libpq-notify; + postgresql-pure = dontCheck super.postgresql-pure; } From 2187753da6e10539d60609bbf650f57cc97def3d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Jun 2020 21:25:34 +0200 Subject: [PATCH 2192/3452] haskell-base-noprelude: jailbreak when building with ghc-8.10.x --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 26a03c45cdd7..e1adab87a4ec 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -62,6 +62,7 @@ self: super: { # Jailbreak to fix the build. async = doJailbreak super.async; + base-noprelude = doJailbreak super.base-noprelude; ChasingBottoms = doJailbreak super.ChasingBottoms; ed25519 = doJailbreak super.ed25519; email-validate = doJailbreak super.email-validate; # https://github.com/Porges/email-validate-hs/issues/51 From 3ee117a0a96919bb01c37adb112e8b98b2b73dfb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Jun 2020 21:50:15 +0200 Subject: [PATCH 2193/3452] xmobar: jailbreak latest version to accept recent timezone-olson packages --- pkgs/development/haskell-modules/configuration-common.nix | 7 ++++++- .../haskell-modules/configuration-ghc-8.10.x.nix | 1 - .../haskell-modules/configuration-ghc-8.8.x.nix | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 03e22f2344f5..789f1e8fd0d9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1120,8 +1120,12 @@ self: super: { # }); libnix = dontCheck super.libnix; + # Jailbreak: https://github.com/jaor/xmobar/issues/463 # The test suite tries to mess with ALSA, which doesn't work in the build sandbox. - xmobar = dontCheck super.xmobar; + xmobar = appendPatch (dontCheck super.xmobar) (pkgs.fetchpatch { + url = "https://github.com/jaor/xmobar/pull/464.patch"; + sha256 = "0y1dd878yzy1cx0cjj0ijd3dmywr7jdmk68vxdjimxzblrdw1al6"; + }); # https://github.com/mgajda/json-autotype/issues/25 json-autotype = dontCheck super.json-autotype; @@ -1552,4 +1556,5 @@ self: super: { extraPrefix = ""; }) ])); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index e1adab87a4ec..7348dd9f22e9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -110,7 +110,6 @@ self: super: { serialise = doJailbreak super.serialise; setlocale = doJailbreak super.setlocale; shellmet = doJailbreak super.shellmet; - xmobar = doJailbreak super.xmobar; # The shipped Setup.hs file is broken. csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index c23b15ffef3e..bb2f9294cc1e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -74,7 +74,6 @@ self: super: { # TODO: remove when upstream accepts https://github.com/snapframework/io-streams-haproxy/pull/17 io-streams-haproxy = doJailbreak super.io-streams-haproxy; # base >=4.5 && <4.13 snap-server = doJailbreak super.snap-server; - xmobar = doJailbreak super.xmobar; exact-pi = doJailbreak super.exact-pi; time-compat = doJailbreak super.time-compat; http-media = doJailbreak super.http-media; From 14688c2700e4d9dfb0b1ec0eeaa4633ea602cda4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Jun 2020 21:59:38 +0200 Subject: [PATCH 2194/3452] haskell-single-tuple: don't mark as broken; the package builds fine --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f80787b2c777..64db05e82a9f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -9512,7 +9512,6 @@ broken-packages: - SimpleServer - simplesmtpclient - simseq - - single-tuple - singleton-dict - singleton-typelits - singnal From c0162e64f16bb3b7f3ad3b9692a5f3647bf35574 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Jun 2020 22:12:32 +0200 Subject: [PATCH 2195/3452] haskell-indigo: mark broken, because it depends on broken 'lorentz' --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 64db05e82a9f..f727834de5f7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6698,6 +6698,7 @@ broken-packages: - indextype - indices - indieweb-algorithms + - indigo - inf-interval - infer-upstream - infernal From b62a82a2f5393629027943ed234d4185031d0a3b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Jun 2020 22:20:20 +0200 Subject: [PATCH 2196/3452] haskell-postgresql-pure: this build is probably not broken ... ... but I'll disable it anyway, because I need haskell-updates to be free of evaluation errors, and figuring which dependency of this packages is still marked broken even though it actually builds too much effort right nom. I'll re-visit this next week. Maybe. --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f727834de5f7..35ee3037d07d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8551,6 +8551,7 @@ broken-packages: - postgres-websockets - postgresql-lo-stream - postgresql-named + - postgresql-pure - postgresql-query - postgresql-simple-bind - postgresql-simple-named From 3206ba84de4ef76ef029e1e7de2e3911eb398020 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Jun 2020 22:13:54 +0200 Subject: [PATCH 2197/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-1-g5b5ad23 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/ab74bc3b0b5e512f1e25cb0570d01e2abf408132. --- pkgs/development/haskell-modules/hackage-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9b4e5deca6b8..ccef54178a7b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -116215,8 +116215,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.32.1"; - sha256 = "0rl97p0627ycwkp32kwbih4gdm2ci8dl5q0mpxf8583b7i6fxjzr"; + version = "0.32.2"; + sha256 = "0xdjzigkygapx3r374ds11gnschddhiyacxx49xsybmhfxlhsdj7"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network @@ -140759,6 +140759,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Convenient imperative eDSL over Lorentz"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "inf-interval" = callPackage @@ -196006,6 +196008,8 @@ self: { ]; description = "pure Haskell PostgreSQL driver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-query" = callPackage From 881e0cffaf39c97734a2e7b330bac9cf7f11f814 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Jun 2020 22:26:03 +0200 Subject: [PATCH 2198/3452] all-cabal-hashes: update to Hackage at 2020-06-19T00:10:12Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 7d66d31690cb..fa4cdf15d9e5 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/73b209cba2ed84fa95c0fdde9616b4c5f983855f.tar.gz"; - sha256 = "0sm3kqd3blvk18frjfx1nkrbfpds780qv63rkcl5fp5f1z02lhv3"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/65a280e01c4f90470959f0423a5450d2831f845a.tar.gz"; + sha256 = "0m5zg7hswch702gprlfsjmp2xk6hs828c1489d1c85w9kxiyqkdq"; } From d78a3bac05eec1752e585c2dcbb74ee610cd8a03 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 19 Jun 2020 17:52:53 +0200 Subject: [PATCH 2199/3452] =?UTF-8?q?ocamlPackages.mirage-crypto*:=200.7.0?= =?UTF-8?q?=20=E2=86=92=200.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ocamlPackages.mirage-crypto * ocamlPackages.mirage-crypto-pk * ocamlPackages.mirage-crypto-rng * ocamlPackages.mirage-crypto-rng-mirage: new package which was previously part of mirage-crypto-rng --- .../ocaml-modules/mirage-crypto/default.nix | 4 ++-- .../ocaml-modules/mirage-crypto/rng-mirage.nix | 18 ++++++++++++++++++ .../ocaml-modules/mirage-crypto/rng.nix | 7 ++----- pkgs/top-level/ocaml-packages.nix | 2 ++ 4 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index f78ed2ef77f3..d778a7eb4872 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -4,11 +4,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "0k7kllv3bh192yj6p9dk2z81r56w7x2kyr46pxygb5gnhqqxcncf"; + sha256 = "1wb2923v17z179v866ragil0r601w5b3kvpnbkmkwlijp4i5grih"; }; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix new file mode 100644 index 000000000000..473704d7ea22 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -0,0 +1,18 @@ +{ buildDunePackage, mirage-crypto-rng, duration, cstruct, mirage-runtime +, mirage-time, mirage-clock, mirage-unix, mirage-time-unix, mirage-clock-unix }: + +buildDunePackage { + pname = "mirage-crypto-rng-mirage"; + + inherit (mirage-crypto-rng) version src useDune2 minimumOCamlVersion; + + doCheck = true; + checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ]; + + propagatedBuildInputs = [ duration cstruct mirage-crypto-rng mirage-runtime + mirage-time mirage-clock ]; + + meta = mirage-crypto-rng.meta // { + description = "Entropy collection for a cryptographically secure PRNG"; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix index 3a12580f89f2..b4da06816351 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -1,6 +1,5 @@ { buildDunePackage, mirage-crypto, ounit, randomconv, dune-configurator -, cstruct, duration, logs, mtime, ocaml_lwt, mirage-runtime, mirage-time -, mirage-clock, mirage-time-unix, mirage-clock-unix, mirage-unix }: +, cstruct, duration, logs, mtime, ocaml_lwt }: buildDunePackage { pname = "mirage-crypto-rng"; @@ -11,9 +10,7 @@ buildDunePackage { checkInputs = [ ounit randomconv ]; nativeBuildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt - mirage-runtime mirage-time mirage-clock mirage-time-unix - mirage-clock-unix mirage-unix ]; + propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ]; meta = mirage-crypto.meta // { description = "A cryptographically secure PRNG"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5ee24287dd67..d5d7a81a0875 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -531,6 +531,8 @@ let mirage-crypto-rng = callPackage ../development/ocaml-modules/mirage-crypto/rng.nix { }; + mirage-crypto-rng-mirage = callPackage ../development/ocaml-modules/mirage-crypto/rng-mirage.nix { }; + mirage-device = callPackage ../development/ocaml-modules/mirage-device { }; mirage-flow = callPackage ../development/ocaml-modules/mirage-flow { }; From 008570968ca42afa078c54cde3a3b3c650c6c3b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Jun 2020 23:10:21 +0200 Subject: [PATCH 2200/3452] Comment out broken packages hasura-cli & hasura-graphql-engine. These packages don't evaluate and I couldn't find out how to fix that or how to mark them broken. If I may say so, it is a really bad idea to duplicate Haskell packages locally like that. Ping @offlinehacker. --- pkgs/top-level/all-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b587ee846f69..39f7770a4da4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15772,9 +15772,17 @@ in hashi-ui = callPackage ../servers/hashi-ui {}; + /* This package duplicates a lot of functionality from haskellPackages + instead of using the packages we maintain there. Now, a recent update to + haskellPackages causes these tools to fail evaluation, and I have been + unable to mark them as "broken" in a way that ofBorg bot recognizes. Since + I don't want to merge code into master that generates evaluation errors, I + have no other idea but to comment them out entirely. + inherit (callPackage ../servers/hasura { }) hasura-cli hasura-graphql-engine; + */ heapster = callPackage ../servers/monitoring/heapster { }; From 58302584d931d3aac48b7c22a171701b6e657b29 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 19 Jun 2020 19:15:47 +0200 Subject: [PATCH 2201/3452] bcache-tools: Fix the cross compilation Fix #90726. --- pkgs/tools/filesystems/bcache-tools/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index 749aa04ebc70..c3b1759bcdd5 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { sed -e "/INSTALL.*initramfs\/hook/d" \ -e "/INSTALL.*initcpio\/install/d" \ -e "/INSTALL.*dracut\/module-setup.sh/d" \ + -e "s/pkg-config/$PKG_CONFIG/" \ -i Makefile ''; @@ -28,8 +29,12 @@ stdenv.mkDerivation rec { ./fix-static.patch ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "UDEVLIBDIR=${placeholder "out"}/lib/udev/" + ]; + preBuild = '' - export makeFlags="$makeFlags PREFIX=\"$out\" UDEVLIBDIR=\"$out/lib/udev/\""; sed -e "s|/bin/sh|${bash}/bin/sh|" -i *.rules ''; From 3077a7dc59a06d3918bcc92341fcd92251fbce04 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 19 Jun 2020 21:41:24 +0000 Subject: [PATCH 2202/3452] 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 56a5f3ed41886a3f45b012d3c7ed3d22a16bddc0 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Sat, 20 Jun 2020 00:14:57 +0200 Subject: [PATCH 2203/3452] vscode, vscodium: 1.46.0 -> 1.46.1 --- pkgs/applications/editors/vscode/vscode.nix | 6 +++--- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 7ca981b2958d..968cc69d92db 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0hmmqdamsjhjy1q8m85bs081cwmskpsp57rkj7vc2wj918wgissm"; - x86_64-darwin = "00xwvi53h9rnwyba12jmsp6grkymmn6vjibypaxb96q7q7p894gh"; + x86_64-linux = "1c8gi2001p2f0zc165cqwwf9f8ls34fgg040qn9l08za7djb9hyv"; + x86_64-darwin = "06n17s3qa2jkmg5qx3zvshz6rvdx33dhxn65j0x5mi62dv93gjgg"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.46.0"; + version = "1.46.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index fd48a4b1084e..cc0c73b73e9f 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "088nsflscak315704vqnh8m4q7601fczglbhdz5i70kfyg89ar4w"; - x86_64-darwin = "0fxpx1ydsag4gyn2kq5ddq55lpw15w176p3fypk80fyfix4kziqf"; + x86_64-linux = "0l9sg2d0657k9dacy7k2jn8z07z50v8d1czgy4bkzbrj9vz7c6a7"; + x86_64-darwin = "0mnq0ykahwfrgs28rdy1jl366qyclipsr3apnmhym1xsylk0mpfx"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.46.0"; + version = "1.46.1"; pname = "vscodium"; executableName = "codium"; From d0cdf0c5287fdc66b66eae77019518518759ef13 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Fri, 19 Jun 2020 15:38:40 -0700 Subject: [PATCH 2204/3452] 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 2205/3452] 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 2206/3452] 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 841ab711ab291c8700064c396be0dc62afcc6c99 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 20 Jun 2020 10:20:30 +1000 Subject: [PATCH 2207/3452] cri-o: 1.18.1 -> 1.18.2 https://github.com/cri-o/cri-o/releases/tag/v1.18.2 --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 95f8580cb397..5421bedf2927 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.18.1"; + version = "1.18.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "1fd7ix329kqimysqfh8yl29c0hwrddlirq9bnz95mrllhsgn8kw2"; + sha256 = "0p6gprbs54v3n09fjpyfxnzxs680ms8924wdim4q9qw52wc6sbdz"; }; vendorSha256 = null; outputs = [ "out" "man" ]; From 160faaa06167a6288d91026497b3f4d27e65d838 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 20 Jun 2020 02:30:25 +0200 Subject: [PATCH 2208/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-5-g7c30584 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/a4534198c9406045f79eac25df59dedbe4524826. --- .../haskell-modules/hackage-packages.nix | 77 ++++++++++++++++++- 1 file changed, 73 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ccef54178a7b..23f9a3df3163 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -52948,6 +52948,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "circular" = callPackage + ({ mkDerivation, aeson, base, hspec, hspec-discover, QuickCheck + , quickcheck-instances, vector + }: + mkDerivation { + pname = "circular"; + version = "0.1.0"; + sha256 = "106kfb45dp8ys739g0k69n66j1wydfzhj6vhxy9fgzkajcc0q37b"; + libraryHaskellDepends = [ aeson base vector ]; + testHaskellDepends = [ + aeson base hspec hspec-discover QuickCheck quickcheck-instances + vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Circular fixed-sized mutable vectors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cirru-parser" = callPackage ({ mkDerivation, aeson, base, text, vector }: mkDerivation { @@ -61937,8 +61955,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.5.4"; - sha256 = "1269zgvcvd18zdmg4rf73mh89a3gcph91fqm46p5h05wz500179w"; + version = "0.2.5.6"; + sha256 = "1fvwvaqd9nn4pnblyi874kwb450h85gg2afa6khp4vsz1bybc8ch"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116174,8 +116192,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.32.1"; - sha256 = "1b79z6jngz1rwaah41fndp37isrydzgmjv0vc92hqrsl7j4xm0zl"; + version = "0.32.2"; + sha256 = "08skvs3b6yfrz78g49m6c70i06wcs2ihfr5p1wq98fg11vk7xvla"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227038,6 +227056,24 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "skylighting_0_8_5" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , skylighting-core + }: + mkDerivation { + pname = "skylighting"; + version = "0.8.5"; + sha256 = "1b8m0spspp060p5hkl2qxarh3cwji0shq5kdwz2w93kiyl8hk8sv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers skylighting-core + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-core" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring @@ -227070,6 +227106,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "skylighting-core_0_8_5" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random + , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, text, transformers, utf8-string + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.8.5"; + sha256 = "1azcq7g8c4p18q4akk7rl0bczjvp0vl4mnqvsfmzcdf7sdjlg9f7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath hxt mtl regex-pcre-builtin safe text transformers + utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath HUnit + pretty-show QuickCheck random tasty tasty-golden tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + base containers criterion directory filepath text + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text From 7156cd1c3918f1533af6196bbeff615474d5aecc Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 20 Jun 2020 01:17:46 +0000 Subject: [PATCH 2209/3452] 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 2210/3452] 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 2211/3452] 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 2212/3452] 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 2213/3452] 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 1dca47c19a9cc3aa2d481a35cacf49eb2daa1843 Mon Sep 17 00:00:00 2001 From: Evils Date: Sun, 31 May 2020 04:11:23 +0200 Subject: [PATCH 2214/3452] tuptime: 4.1.0 -> 5.0.0 uptimed import script removed from source ("unreliable") new database format, including migration script instead --- pkgs/tools/system/tuptime/default.nix | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/tools/system/tuptime/default.nix index acc96998952d..abfc8ae5ac87 100644 --- a/pkgs/tools/system/tuptime/default.nix +++ b/pkgs/tools/system/tuptime/default.nix @@ -1,28 +1,37 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ stdenv, fetchFromGitHub +, makeWrapper, installShellFiles +, python3, sqlite }: stdenv.mkDerivation rec { pname = "tuptime"; - version = "4.1.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "rfrail3"; repo = "tuptime"; rev = version; - sha256 = "0p5v1jp6bl0hjv04q3gh11q6dx9z0x61h6svcbvwp5ni0h1bkz1a"; + sha256 = "0izps85p8pxidfrzp7l4hp221fx3dcgapapsix1zavq6jrsl2qyh"; }; + nativeBuildInputs = [ makeWrapper installShellFiles ]; + buildInputs = [ python3 ]; + outputs = [ "out" "man" ]; + installPhase = '' mkdir -p $out/bin - install -m 755 src/tuptime $out/bin/ + install -m 755 $src/src/tuptime $out/bin/ - mkdir -p $out/share/man/man1 - cp src/man/tuptime.1 $out/share/man/man1/ + installManPage $src/src/man/tuptime.1 - # upstream only ships this, there are more scripts there... - mkdir -p $out/usr/share/doc/tuptime/contrib - cp misc/scripts/uptimed-to-tuptime.py $out/usr/share/doc/tuptime/contrib/ + install -Dm 0755 $src/misc/scripts/db-tuptime-migrate-4.0-to-5.0.sh \ + $out/share/tuptime/db-tuptime-migrate-4.0-to-5.0.sh + ''; + + preFixup = '' + wrapProgram $out/share/tuptime/db-tuptime-migrate-4.0-to-5.0.sh \ + --prefix PATH : "${stdenv.lib.makeBinPath [ sqlite ]}" ''; meta = with stdenv.lib; { From 73a90b015433e68a95a4ecdd14bfa3c175d7f7f6 Mon Sep 17 00:00:00 2001 From: Evils Date: Sun, 31 May 2020 04:11:56 +0200 Subject: [PATCH 2215/3452] nixos/tuptime: change group/user to match upstream --- nixos/modules/services/monitoring/tuptime.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/monitoring/tuptime.nix b/nixos/modules/services/monitoring/tuptime.nix index 731260a5c20a..8f79d9165990 100644 --- a/nixos/modules/services/monitoring/tuptime.nix +++ b/nixos/modules/services/monitoring/tuptime.nix @@ -32,7 +32,10 @@ in { environment.systemPackages = [ pkgs.tuptime ]; - users.users.tuptime.description = "tuptime database owner"; + users = { + groups._tuptime.members = [ "_tuptime" ]; + users._tuptime.description = "tuptime database owner"; + }; systemd = { services = { @@ -45,7 +48,7 @@ in { serviceConfig = { StateDirectory = "tuptime"; Type = "oneshot"; - User = "tuptime"; + User = "_tuptime"; RemainAfterExit = true; ExecStart = "${pkgs.tuptime}/bin/tuptime -x"; ExecStop = "${pkgs.tuptime}/bin/tuptime -xg"; @@ -57,7 +60,7 @@ in { serviceConfig = { StateDirectory = "tuptime"; Type = "oneshot"; - User = "tuptime"; + User = "_tuptime"; ExecStart = "${pkgs.tuptime}/bin/tuptime -x"; }; }; From 39626dcc2ac2e594bd4e1c8ee3c2714a1a8bf708 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 20 Jun 2020 07:31:37 +0200 Subject: [PATCH 2216/3452] python3.pkgs.fsspec: fix build --- .../python-modules/fsspec/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 8f2c11f4265b..a20b00087b79 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -2,28 +2,32 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, pytest +, pytestCheckHook +, numpy }: buildPythonPackage rec { pname = "fsspec"; - version = "0.6.2"; + version = "0.7.4"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "intake"; repo = "filesystem_spec"; rev = version; - sha256 = "1y3d6xw14rcldz9779ir6mjaff4rk82ch6ahn4y9mya0qglpc31i"; + sha256 = "0ylslmkzc803050yh8dl6cagabb9vrygz6w2zsmglzn4v9sz6jgd"; }; checkInputs = [ - pytest + pytestCheckHook + numpy ]; - checkPhase = '' - pytest - ''; + disabledTests = [ + # Test assumes user name is part of $HOME + # AssertionError: assert 'nixbld' in '/homeless-shelter/foo/bar' + "test_strip_protocol_expanduser" + ]; meta = with lib; { description = "A specification that python filesystems should adhere to"; From 6b719544c6d041f331f634a5935d63eaa75e177d Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 20 Jun 2020 07:04:58 +0200 Subject: [PATCH 2217/3452] 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 2218/3452] 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 2219/3452] 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 54bba2ee123c04b614fae06d7026959635bd2003 Mon Sep 17 00:00:00 2001 From: Philipp Mildenberger Date: Thu, 18 Jun 2020 08:27:18 +0200 Subject: [PATCH 2220/3452] nushell: add checkPhase without --target which causes failing tests --- pkgs/shells/nushell/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 5994e2829ed6..a52cc4621cb2 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -39,6 +39,13 @@ rustPlatform.buildRustPackage rec { export HOME=$TMPDIR ''; + checkPhase = '' + runHook preCheck + echo "Running cargo test" + cargo test + runHook postCheck + ''; + meta = with lib; { description = "A modern shell written in Rust"; homepage = "https://www.nushell.sh/"; From 2f139e40c6c3abaa77937216600e2ae0431f2ce1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 19 Jun 2020 17:26:42 +0200 Subject: [PATCH 2221/3452] haskellPackages.utc: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 789f1e8fd0d9..c4056f42d5b5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1557,4 +1557,11 @@ self: super: { }) ])); + # add unreleased commit fixing version constraint as a patch + # Can be removed if https://github.com/lpeterse/haskell-utc/issues/8 is resolved + utc = appendPatch super.utc (pkgs.fetchpatch { + url = "https://github.com/lpeterse/haskell-utc/commit/e4502c08591e80d411129bb7c0414539f6302aaf.diff"; + sha256 = "0v6kv1d4syjzgzc2s7a76c6k4vminlcq62n7jg3nn9xd00gwmmv7"; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 35ee3037d07d..f64489361fb2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -10527,7 +10527,6 @@ broken-packages: - usb-safe - users-mysql-haskell - users-persistent - - utc - utf8-prelude - utf8-validator - UTFTConverter 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 2222/3452] 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 2223/3452] 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 2224/3452] 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 2225/3452] 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 2226/3452] 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 2227/3452] 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 2228/3452] 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 2229/3452] 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 2230/3452] 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 2231/3452] 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 2232/3452] 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 2233/3452] 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 2234/3452] 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 2235/3452] 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 2236/3452] 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 2237/3452] 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 2238/3452] 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 2239/3452] 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 2240/3452] 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 2241/3452] 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 2242/3452] 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 2243/3452] 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 2244/3452] 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 2245/3452] 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 2246/3452] 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 2247/3452] 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 2248/3452] 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 2249/3452] 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 2250/3452] 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 2251/3452] 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 2252/3452] 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 2253/3452] 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 2254/3452] 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 2255/3452] 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 2256/3452] 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 2257/3452] 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 2258/3452] 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 2259/3452] 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 2260/3452] 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 2261/3452] 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 2262/3452] 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 2263/3452] 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 2264/3452] 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 2265/3452] 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 2266/3452] 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 2267/3452] 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 2268/3452] 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 2269/3452] 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 2270/3452] 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 2271/3452] 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 ffbf8ba912e21b5fc5e139d23fd15bb273800030 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 21 Jun 2020 02:30:25 +0200 Subject: [PATCH 2272/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-5-g7c30584 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/fa1cee3827410c77df71b292a5a07d61aa5282ef. --- .../haskell-modules/hackage-packages.nix | 315 +++++++++++++++--- 1 file changed, 262 insertions(+), 53 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 23f9a3df3163..d53834a5913a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -36966,6 +36966,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base16-bytestring_0_1_1_7" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim }: + mkDerivation { + pname = "base16-bytestring"; + version = "0.1.1.7"; + sha256 = "1fk9zvkx005sy4adbyil86svnqhgrvmczmf16ajhzj2wkmkqjmjj"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + testHaskellDepends = [ base bytestring ]; + description = "Fast base16 (hex) encoding and decoding for ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base16-lens" = callPackage ({ mkDerivation, base, base16, bytestring, Cabal, cabal-doctest , doctest, lens, text @@ -52949,19 +52962,20 @@ self: { }) {}; "circular" = callPackage - ({ mkDerivation, aeson, base, hspec, hspec-discover, QuickCheck - , quickcheck-instances, vector + ({ mkDerivation, aeson, base, criterion, hspec, hspec-discover + , QuickCheck, quickcheck-instances, vector }: mkDerivation { pname = "circular"; - version = "0.1.0"; - sha256 = "106kfb45dp8ys739g0k69n66j1wydfzhj6vhxy9fgzkajcc0q37b"; + version = "0.1.1"; + sha256 = "0kj9sfal78k0ba5djq10xddy2h8lq0grf5cknwcr96j555nlwhk9"; libraryHaskellDepends = [ aeson base vector ]; testHaskellDepends = [ aeson base hspec hspec-discover QuickCheck quickcheck-instances vector ]; testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ aeson base criterion vector ]; description = "Circular fixed-sized mutable vectors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -56881,8 +56895,8 @@ self: { }: mkDerivation { pname = "commander-cli"; - version = "0.5.0.0"; - sha256 = "0brs8irdshp1mhrp5xmj608c7n80nlkxz2kp3dc7b69wzs0k40k7"; + version = "0.6.1.0"; + sha256 = "0macdmhzkg101gb1fddrs0wz4i318cxjfbhli6cib4h7ril3pvbp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59195,16 +59209,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conferer_0_4_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , hspec, text + }: + mkDerivation { + pname = "conferer"; + version = "0.4.1.1"; + sha256 = "1fi3sflfkzgxzjv5s0w6ja9dqrlc72lli382j6phqdw3h4qja10d"; + libraryHaskellDepends = [ + base bytestring containers directory text + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory hspec text + ]; + description = "Configuration management library"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conferer-hedis" = callPackage ({ mkDerivation, base, conferer, hedis, hspec, text }: mkDerivation { pname = "conferer-hedis"; - version = "0.4.0.0"; - sha256 = "0w6ndawqcc25kq3jzlr907pga69php06sfnmkm2dnw5sw4ws5766"; + version = "0.4.0.1"; + sha256 = "0drsyagkdzlkrrq0x43j72804x1i3p4b9pjyqff5jdrr8h9jrv37"; libraryHaskellDepends = [ base conferer hedis text ]; testHaskellDepends = [ base conferer hedis hspec text ]; description = "conferer's FromConfig instances for hedis settings"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -59221,6 +59254,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conferer-hspec_0_4_0_1" = callPackage + ({ mkDerivation, base, conferer, hspec, hspec-core, text }: + mkDerivation { + pname = "conferer-hspec"; + version = "0.4.0.1"; + sha256 = "1g2dglsvj7caqrvbg1yc08j98ljf71l885kxmmk469ab07j1c5sz"; + libraryHaskellDepends = [ base conferer hspec-core text ]; + testHaskellDepends = [ base conferer hspec hspec-core text ]; + description = "conferer's FromConfig instances for hspec Config"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conferer-provider-dhall" = callPackage ({ mkDerivation, base, bytestring, conferer, conferer-provider-json , dhall, dhall-json, directory, hspec, text @@ -59289,8 +59335,8 @@ self: { }: mkDerivation { pname = "conferer-snap"; - version = "0.4.0.0"; - sha256 = "1k7pnk3jlrrgky7fb3bf397w5ad9qkh2k42bw5777s35ni3v7955"; + version = "0.4.0.1"; + sha256 = "1z5p8zchykp8fc7lag3mi32z4wzb0bxcw5p4j3ya57bqs2xhhsdd"; libraryHaskellDepends = [ base conferer snap-core snap-server text ]; @@ -59298,7 +59344,7 @@ self: { base conferer hspec snap-core snap-server text ]; description = "conferer's FromConfig instances for snap Config"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -59309,8 +59355,8 @@ self: { }: mkDerivation { pname = "conferer-source-dhall"; - version = "0.4.0.0"; - sha256 = "0s3f0r9q16b08g6kv7vbk7hy48a6bgf5xqalw7n9zkmn4i6qb2cf"; + version = "0.4.0.1"; + sha256 = "00i3sk948bg6brf97m41n9s4da4m25n220l5gkddb589li0lq0rk"; libraryHaskellDepends = [ base bytestring conferer conferer-source-json dhall dhall-json directory text @@ -59320,7 +59366,7 @@ self: { directory hspec text ]; description = "Configuration for reading dhall files"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mpl20; }) {}; "conferer-source-json" = callPackage @@ -59343,13 +59389,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conferer-source-json_0_4_0_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer + , directory, hspec, text, unordered-containers, vector + }: + mkDerivation { + pname = "conferer-source-json"; + version = "0.4.0.1"; + sha256 = "01kfm771qks7b66z0nlv2b108r002xv8bzacr9p6ih7nsbcbiqdn"; + libraryHaskellDepends = [ + aeson base bytestring conferer directory text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson aeson-qq base bytestring conferer directory hspec text + unordered-containers vector + ]; + description = "conferer's source for reading json files"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conferer-source-yaml" = callPackage ({ mkDerivation, base, conferer, conferer-source-json, hspec, yaml }: mkDerivation { pname = "conferer-source-yaml"; - version = "0.4.0.0"; - sha256 = "1cpq88z525fw0zabvn4m14shp0pvbchzbmhiby4cyp7qzb5cjiyn"; + version = "0.4.0.1"; + sha256 = "0ydciicxd7lxz2b6jmcc8ipyp99rp9gr9s2s2fnhmnhjv0xw6d7a"; libraryHaskellDepends = [ base conferer conferer-source-json yaml ]; @@ -59357,7 +59424,7 @@ self: { base conferer conferer-source-json hspec yaml ]; description = "Configuration for reading yaml files"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mpl20; }) {}; "conferer-warp" = callPackage @@ -59375,6 +59442,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conferer-warp_0_4_0_1" = callPackage + ({ mkDerivation, base, conferer, hspec, http-types, text, wai, warp + }: + mkDerivation { + pname = "conferer-warp"; + version = "0.4.0.1"; + sha256 = "1swvrkfqvpnpw2nihqzgn8rxv0pfbc9cl8wlyfshrqirjm0lhbj3"; + libraryHaskellDepends = [ base conferer http-types text wai warp ]; + testHaskellDepends = [ + base conferer hspec http-types text wai warp + ]; + description = "conferer's FromConfig instances for warp settings"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "confetti" = callPackage ({ mkDerivation, base, cmdargs, directory, filepath, MissingH , tasty, tasty-hunit, tasty-smallcheck, text, time, unix, yaml @@ -67830,8 +67913,8 @@ self: { }: mkDerivation { pname = "dataflower"; - version = "0.2.0.0"; - sha256 = "19b265w70dcaw5xw9y0bhvfng0yyywm8my3c0rp0jqdwacp7c126"; + version = "0.2.1.0"; + sha256 = "14pypk9lv5fri55waigl5526nq9rrbk4q3i5nxn4cyxra4gk3946"; libraryHaskellDepends = [ base hashable mtl pretty-show stm time transformers vector ]; @@ -70219,6 +70302,17 @@ self: { broken = true; }) {}; + "derive-lifted-instances" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "derive-lifted-instances"; + version = "0"; + sha256 = "0giq1w0k3w45blb51v7inbwffq47jhj6mw4ck59c91mxpc4y163i"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Derive class instances though various kinds of lifting"; + license = stdenv.lib.licenses.asl20; + }) {}; + "derive-monoid" = callPackage ({ mkDerivation, base, semigroups, template-haskell }: mkDerivation { @@ -76564,6 +76658,21 @@ self: { broken = true; }) {}; + "drunken-bishop" = callPackage + ({ mkDerivation, array, base, bytestring, pureMD5 }: + mkDerivation { + pname = "drunken-bishop"; + version = "0.1.0.0"; + sha256 = "114728h8zznmjygp1ddjnkklk0pcs8w7in7698k9xi54j6v467gy"; + revision = "1"; + editedCabalFile = "1iaq53nvyzh84g91a6p7y4m38v0mcqpw1c18s2fxlzb5zg342zqi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base bytestring pureMD5 ]; + description = "An implementation of the Drunken Bishop visual fingerprinting algorithm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ds-kanren" = callPackage ({ mkDerivation, base, containers, logict, QuickCheck, tasty , tasty-quickcheck @@ -91217,16 +91326,17 @@ self: { }) {}; "free-functors" = callPackage - ({ mkDerivation, algebraic-classes, base, bifunctors, comonad - , contravariant, profunctors, template-haskell, transformers + ({ mkDerivation, base, bifunctors, comonad, contravariant + , derive-lifted-instances, profunctors, template-haskell + , transformers }: mkDerivation { pname = "free-functors"; - version = "1.0.1"; - sha256 = "1y1cmm4z5s5a1ivs30vwb2rbgc9q24y6z2a9in3azwpgfb1x4fw0"; + version = "1.1.1"; + sha256 = "0bk985q1663rsgmkr08x6zr5yqvf84g0w7450qzccivis4wc5hp2"; libraryHaskellDepends = [ - algebraic-classes base bifunctors comonad contravariant profunctors - template-haskell transformers + base bifunctors comonad contravariant derive-lifted-instances + profunctors template-haskell transformers ]; description = "Free functors, adjoint to functors that forget class constraints"; license = stdenv.lib.licenses.bsd3; @@ -105863,21 +105973,22 @@ self: { "graphql" = callPackage ({ mkDerivation, aeson, base, containers, hspec, hspec-expectations , hspec-megaparsec, megaparsec, parser-combinators, QuickCheck - , raw-strings-qq, text, transformers, unordered-containers + , raw-strings-qq, scientific, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "graphql"; - version = "0.7.0.0"; - sha256 = "03bfg4whf7blf91x0h4qk6q7f1j7nfvhmqh4ggpnbyxdbyzx9sk4"; + version = "0.8.0.0"; + sha256 = "08xi2q8jzk78a62q5qbi8i2d2kq0qcn0dzdx1haq2c4qjsf09798"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base containers megaparsec parser-combinators text - transformers unordered-containers + aeson base containers megaparsec parser-combinators scientific text + transformers unordered-containers vector ]; testHaskellDepends = [ aeson base containers hspec hspec-expectations hspec-megaparsec - megaparsec parser-combinators QuickCheck raw-strings-qq text - transformers unordered-containers + megaparsec parser-combinators QuickCheck raw-strings-qq scientific + text transformers unordered-containers vector ]; description = "Haskell GraphQL implementation"; license = stdenv.lib.licenses.bsd3; @@ -116192,8 +116303,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.32.2"; - sha256 = "08skvs3b6yfrz78g49m6c70i06wcs2ihfr5p1wq98fg11vk7xvla"; + version = "0.32.3"; + sha256 = "18wvxjlfq2rj521ddfk2chkvxc9yvqk2lpm0xychpl9hxcnr8ghq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116233,8 +116344,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.32.2"; - sha256 = "0xdjzigkygapx3r374ds11gnschddhiyacxx49xsybmhfxlhsdj7"; + version = "0.32.3"; + sha256 = "1f91llj13qv5cmwbsm1sa5lri1ggcb9a3z35d5fyvvfdmb9gmr7a"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network @@ -154119,8 +154230,8 @@ self: { pname = "lens-process"; version = "0.3.0.2"; sha256 = "1bv6z7309bq9jv2lzr79bcbwg1pkhy728pnrjnl3c3nv807a3igk"; - revision = "1"; - editedCabalFile = "0cfh8yw9b88jvhq6plk9i79akq4w7bpmy6w6f7wjji0lv1mkj15m"; + revision = "2"; + editedCabalFile = "1l71hi0a5yn5x9w4br5bzypa25zdlqw6jcb69z3bhb6dx53197ma"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base filepath lens process ]; testHaskellDepends = [ @@ -156615,6 +156726,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linenoise_0_3_2" = callPackage + ({ mkDerivation, base, bytestring, exceptions, mtl, text + , unliftio-core + }: + mkDerivation { + pname = "linenoise"; + version = "0.3.2"; + sha256 = "0hs910k358mfx1s1cmrc76f8ra3r34748h22m68a64mspibd2frx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring exceptions mtl text unliftio-core + ]; + executableHaskellDepends = [ + base bytestring exceptions mtl text unliftio-core + ]; + description = "A lightweight readline-replacement library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lines-of-action" = callPackage ({ mkDerivation, base, containers, mtl, safe }: mkDerivation { @@ -171864,8 +171996,8 @@ self: { }: mkDerivation { pname = "mssql-simple"; - version = "0.6.0.0"; - sha256 = "1ijaxamabxwabyvh30blscxxgpbmr55far373nhn98w224b1jddy"; + version = "0.6.0.1"; + sha256 = "1qrbrvk4df7179zpjngq6r0xvy3jfv4r1vh88m7knzm75wkg77xx"; libraryHaskellDepends = [ base binary bytestring hostname ms-tds mtl network template-haskell text time tls uuid-types @@ -197943,6 +198075,32 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "prettyprinter_1_6_2" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring + , containers, deepseq, doctest, gauge, mtl, pgp-wordlist + , QuickCheck, quickcheck-instances, random, tasty, tasty-hunit + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "prettyprinter"; + version = "1.6.2"; + sha256 = "023hfz75xgvyymbipyph7xmaaki2d5qa6fh4lx9adl1h4s8g34yi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base bytestring doctest pgp-wordlist QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + ansi-wl-pprint base base-compat containers deepseq gauge mtl + QuickCheck random text transformers + ]; + description = "A modern, easy to use, well-documented, extensible pretty-printer"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prettyprinter-ansi-terminal" = callPackage ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text }: @@ -209189,6 +209347,35 @@ self: { broken = true; }) {}; + "registry_0_1_9_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph + , MonadRandom, mtl, multimap, protolude, random, resourcet + , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog + , tasty-th, template-haskell, text, transformers-base, universum + }: + mkDerivation { + pname = "registry"; + version = "0.1.9.0"; + sha256 = "0vblhmqjgx8h3jkqq1ch3iy2dg8xgqxj1jhnhsln3l0kzyh1d5wj"; + libraryHaskellDepends = [ + base containers exceptions hashable mmorph mtl protolude resourcet + semigroupoids semigroups template-haskell text transformers-base + ]; + testHaskellDepends = [ + async base bytestring containers directory exceptions generic-lens + hashable hedgehog io-memoize mmorph MonadRandom mtl multimap + protolude random resourcet semigroupoids semigroups tasty + tasty-discover tasty-hedgehog tasty-th template-haskell text + transformers-base universum + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "registry-hedgehog" = callPackage ({ mkDerivation, base, containers, generic-lens, hedgehog, mmorph , multimap, protolude, registry, tasty, tasty-discover @@ -210425,14 +210612,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "repline_0_3_0_0" = callPackage + "repline_0_4_0_0" = callPackage ({ mkDerivation, base, containers, exceptions, haskeline, mtl , process }: mkDerivation { pname = "repline"; - version = "0.3.0.0"; - sha256 = "0niihfyggg2qisadg7w49cr5k5qyyynia93iip0ng2bbmzwi88g8"; + version = "0.4.0.0"; + sha256 = "1dspwi28krinkxdd7waq4y6plz0dfmzz72885p9pcqp1r14qrhj3"; libraryHaskellDepends = [ base containers exceptions haskeline mtl process ]; @@ -224164,6 +224351,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shell-conduit_5_0_0" = callPackage + ({ mkDerivation, async, base, bytestring, conduit, conduit-extra + , directory, filepath, hspec, hspec-expectations, monads-tf + , process, resourcet, semigroups, split, template-haskell, text + , transformers, unix, unliftio + }: + mkDerivation { + pname = "shell-conduit"; + version = "5.0.0"; + sha256 = "02zilgrb64x0rk4b4bihprwq9fr5gydzj003y3fq8ryf7r60g41w"; + libraryHaskellDepends = [ + async base bytestring conduit conduit-extra directory filepath + monads-tf process resourcet semigroups split template-haskell text + transformers unix unliftio + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra hspec hspec-expectations + template-haskell + ]; + description = "Write shell scripts with Conduit"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shell-escape" = callPackage ({ mkDerivation, base, binary, bytestring, containers, vector }: mkDerivation { @@ -238612,8 +238823,8 @@ self: { }: mkDerivation { pname = "superrecord"; - version = "0.5.0.1"; - sha256 = "0l1zimami83701djj47nk3izb10m6jxszq52zwmb8411dbn9pclb"; + version = "0.5.1.0"; + sha256 = "0dg1h7213vinlm6vmdr73xh81j0ysvs7mqmphwr58d3ymn12mfqa"; libraryHaskellDepends = [ aeson base bytestring constraints deepseq ghc-prim mtl text ]; @@ -246879,15 +247090,15 @@ self: { }) {}; "theatre" = callPackage - ({ mkDerivation, base, base-prelude, contravariant, semigroups - , slave-thread, unagi-chan + ({ mkDerivation, base, contravariant, semigroups, slave-thread + , unagi-chan }: mkDerivation { pname = "theatre"; - version = "1"; - sha256 = "1jwa4851rvac084gb70bqfwarwv6rjhqcs7b48md5kaad3zvgbd2"; + version = "1.0.0.1"; + sha256 = "0vcli8i0vrxv8fzjdyp684fvp7640xmwc3yawz12mfvxcpgrs2xq"; libraryHaskellDepends = [ - base base-prelude contravariant semigroups slave-thread unagi-chan + base contravariant semigroups slave-thread unagi-chan ]; description = "Minimalistic actor library"; license = stdenv.lib.licenses.mit; @@ -258448,8 +258659,6 @@ self: { ]; description = "A pragmatic time and date library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "utf" = callPackage From 560201da661a4c916d0732e3bab8a77084485659 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Mon, 8 Jun 2020 21:47:46 +1200 Subject: [PATCH 2273/3452] Implement dockerTools.streamLayeredImage --- pkgs/build-support/docker/default.nix | 384 ++++++------------ .../docker/store-path-to-layer.sh | 54 --- .../docker/stream_layered_image.py | 165 ++++++++ pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 303 insertions(+), 304 deletions(-) delete mode 100755 pkgs/build-support/docker/store-path-to-layer.sh create mode 100644 pkgs/build-support/docker/stream_layered_image.py diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 83f4a9e0c01b..d0ec90264ee7 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -11,6 +11,7 @@ jq, jshon, lib, + makeWrapper, moreutils, nix, pigz, @@ -29,6 +30,7 @@ writeReferencesToFile, writeScript, writeText, + writePython3, }: # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future. @@ -204,24 +206,17 @@ rec { mkdir image tar -C image -xpf "$fromImage" - # If the image name isn't set, read it from the image repository json. - if [[ -z "$fromImageName" ]]; then - fromImageName=$(jshon -k < image/repositories | head -n 1) - echo "From-image name wasn't set. Read $fromImageName." + if [[ -n "$fromImageName" ]] && [[ -n "$fromImageTag" ]]; then + parentID="$( + cat "image/manifest.json" | + jq -r '.[] | select(.RepoTags | contains([$desiredTag])) | rtrimstr(".json")' \ + --arg desiredTag "$fromImageName:$fromImageTag" + )" + else + echo "From-image name or tag wasn't set. Reading the first ID." + parentID="$(cat "image/manifest.json" | jq -r '.[0].Config | rtrimstr(".json")')" fi - # If the tag isn't set, use the name as an index into the json - # and read the first key found. - if [[ -z "$fromImageTag" ]]; then - fromImageTag=$(jshon -e $fromImageName -k < image/repositories \ - | head -n1) - echo "From-image tag wasn't set. Read $fromImageTag." - fi - - # Use the name and tag to get the parent ID field. - parentID=$(jshon -e $fromImageName -e $fromImageTag -u \ - < image/repositories) - cat ./image/manifest.json | jq -r '.[0].Layers | .[]' > layer-list else touch layer-list @@ -305,106 +300,6 @@ rec { ${text} ''; - # Create $maxLayers worth of Docker Layers, one layer per store path - # unless there are more paths than $maxLayers. In that case, create - # $maxLayers-1 for the most popular layers, and smush the remainaing - # store paths in to one final layer. - # - # NOTE: the `closures` parameter is a list of closures to include. - # The TOP LEVEL store paths themselves will never be present in the - # resulting image. At this time (2019-12-16) none of these layers - # are appropriate to include, as they are all created as - # implementation details of dockerTools. - mkManyPureLayers = { - name, - # Files to add to the layer. - closures, - configJson, - # Docker has a 125-layer maximum, we pick 100 to ensure there is - # plenty of room for extension. - # https://github.com/moby/moby/blob/b3e9f7b13b0f0c414fa6253e1f17a86b2cff68b5/layer/layer_store.go#L23-L26 - maxLayers ? 100 - }: - let - storePathToLayer = substituteAll - { shell = runtimeShell; - isExecutable = true; - src = ./store-path-to-layer.sh; - }; - - overallClosure = writeText "closure" (lib.concatStringsSep " " closures); - in - runCommand "${name}-granular-docker-layers" { - inherit maxLayers; - paths = referencesByPopularity overallClosure; - nativeBuildInputs = [ jshon rsync tarsum moreutils ]; - enableParallelBuilding = true; - } - '' - mkdir layers - - # Delete impurities for store path layers, so they don't get - # shared and taint other projects. - cat ${configJson} \ - | jshon -d config \ - | jshon -s "1970-01-01T00:00:01Z" -i created > generic.json - - # WARNING! - # The following code is fiddly w.r.t. ensuring every layer is - # created, and that no paths are missed. If you change the - # following head and tail call lines, double-check that your - # code behaves properly when the number of layers equals: - # maxLayers-1, maxLayers, and maxLayers+1, 0 - paths() { - cat $paths ${lib.concatMapStringsSep " " (path: "| (grep -v ${path} || true)") (closures ++ [ overallClosure ])} - } - - paths | head -n $((maxLayers - 1)) | cat -n | xargs -r -P$NIX_BUILD_CORES -n2 ${storePathToLayer} - if [ $(paths | wc -l) -ge $maxLayers ]; then - paths | tail -n+$maxLayers | xargs ${storePathToLayer} $maxLayers - fi - - echo "Finished building layer '$name'" - - mv ./layers $out - ''; - - # Create a "Customisation" layer which adds symlinks at the root of - # the image to the root paths of the closure. Also add the config - # data like what command to run and the environment to run it in. - mkCustomisationLayer = { - name, - # Files to add to the layer. - contents, - baseJson, - extraCommands, - uid ? 0, gid ? 0, - }: - runCommand "${name}-customisation-layer" { - nativeBuildInputs = [ jshon rsync tarsum ]; - inherit extraCommands; - } - '' - cp -r ${contents}/ ./layer - - if [[ -n $extraCommands ]]; then - chmod ug+w layer - (cd layer; eval "$extraCommands") - fi - - # Tar up the layer and throw it into 'layer.tar', while calculating its checksum. - echo "Packing layer..." - mkdir $out - tarhash=$(tar --transform='s|^\./||' -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf - . | tee $out/layer.tar | tarsum) - - # Add a 'checksum' field to the JSON, with the value set to the - # checksum of the tarball. - cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json - - # Indicate to docker that we're using schema version 1.0. - echo -n "1.0" > $out/VERSION - ''; - # Create a "layer" (set of files). mkPureLayer = { # Name of the layer @@ -541,131 +436,14 @@ rec { ''; }; - buildLayeredImage = { - # Image Name - name, - # Image tag, the Nix's output hash will be used if null - tag ? null, - # Files to put on the image (a nix store path or list of paths). - contents ? [], - # Docker config; e.g. what command to run on the container. - config ? {}, - # Time of creation of the image. Passing "now" will make the - # created date be the time of building. - created ? "1970-01-01T00:00:01Z", - # Optional bash script to run on the files prior to fixturizing the layer. - extraCommands ? "", uid ? 0, gid ? 0, - # We pick 100 to ensure there is plenty of room for extension. I - # believe the actual maximum is 128. - maxLayers ? 100 - }: - assert - (lib.assertMsg (maxLayers > 1) - "the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})"); + buildLayeredImage = {name, ...}@args: let - baseName = baseNameOf name; - contentsEnv = symlinkJoin { - name = "bulk-layers"; - paths = if builtins.isList contents - then contents - else [ contents ]; - }; - - configJson = let - pure = writeText "${baseName}-config.json" (builtins.toJSON { - inherit created config; - architecture = buildPackages.go.GOARCH; - os = "linux"; - }); - impure = runCommand "${baseName}-standard-dynamic-date.json" - { nativeBuildInputs = [ jq ]; } - '' - jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out - ''; - in if created == "now" then impure else pure; - - bulkLayers = mkManyPureLayers { - name = baseName; - closures = [ contentsEnv configJson ]; - # One layer will be taken up by the customisationLayer, so - # take up one less. - maxLayers = maxLayers - 1; - inherit configJson; - }; - customisationLayer = mkCustomisationLayer { - name = baseName; - contents = contentsEnv; - baseJson = configJson; - inherit uid gid extraCommands; - }; - result = runCommand "docker-image-${baseName}.tar.gz" { - nativeBuildInputs = [ jshon pigz coreutils findutils jq ]; - # Image name and tag must be lowercase - imageName = lib.toLower name; - baseJson = configJson; - passthru.imageTag = - if tag == null - then lib.head (lib.splitString "-" (lib.last (lib.splitString "/" result))) - else lib.toLower tag; - # Docker can't be made to run darwin binaries - meta.badPlatforms = lib.platforms.darwin; - } '' - ${if (tag == null) then '' - outName="$(basename "$out")" - outHash=$(echo "$outName" | cut -d - -f 1) - - imageTag=$outHash - '' else '' - imageTag="${tag}" - ''} - - find ${bulkLayers} -mindepth 1 -maxdepth 1 | sort -t/ -k5 -n > layer-list - echo ${customisationLayer} >> layer-list - - mkdir image - imageJson=$(cat ${configJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}") - manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]") - for layer in $(cat layer-list); do - layerChecksum=$(sha256sum $layer/layer.tar | cut -d ' ' -f1) - layerID=$(sha256sum "$layer/json" | cut -d ' ' -f 1) - ln -s "$layer" "./image/$layerID" - - manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= . + [\"$layerID/layer.tar\"]") - imageJson=$(echo "$imageJson" | jq ".history |= . + [{\"created\": \"$(jq -r .created ${configJson})\"}]") - imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= . + [\"sha256:$layerChecksum\"]") - done - imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1) - echo "$imageJson" > "image/$imageJsonChecksum.json" - manifestJson=$(echo "$manifestJson" | jq ".[0].Config = \"$imageJsonChecksum.json\"") - echo "$manifestJson" > image/manifest.json - - jshon -n object \ - -n object -s "$layerID" -i "$imageTag" \ - -i "$imageName" > image/repositories - - echo "Cooking the image..." - # tar exits with an exit code of 1 if files changed while it was - # reading them. It considers a change in the number of hard links - # to be a "change", which can cause this to fail if images are being - # built concurrently and the auto-optimise-store nix option is turned on. - # Since the contents of these files will not change, we can reasonably - # ignore this exit code. - set +e - tar -C image --dereference --hard-dereference --sort=name \ - --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 \ - --mode=a-w --xform s:'^./':: --use-compress-program='pigz -nT' \ - --warning=no-file-changed -cf $out . - RET=$? - if [ $RET -ne 0 ] && [ $RET -ne 1 ]; then - exit $RET - fi - set -e - - echo "Finished." - ''; - + stream = streamLayeredImage args; in - result; + runCommand "${name}.tar.gz" { + inherit (stream) imageName; + buildInputs = [ pigz ]; + } "${stream} | pigz -nT > $out"; # 1. extract the base image # 2. create the layer @@ -774,20 +552,22 @@ rec { configName="$(cat ./image/manifest.json | jq -r '.[0].Config')" baseEnvs="$(cat "./image/$configName" | jq '.config.Env // []')" + # Extract the parentID from the manifest + if [[ -n "$fromImageName" ]] && [[ -n "$fromImageTag" ]]; then + parentID="$( + cat "image/manifest.json" | + jq -r '.[] | select(.RepoTags | contains([$desiredTag])) | rtrimstr(".json")' \ + --arg desiredTag "$fromImageName:$fromImageTag" + )" + else + echo "From-image name or tag wasn't set. Reading the first ID." + parentID="$(cat "image/manifest.json" | jq -r '.[0].Config | rtrimstr(".json")')" + fi + # Otherwise do not import the base image configuration and manifest chmod a+w image image/*.json rm -f image/*.json - if [[ -z "$fromImageName" ]]; then - fromImageName=$(jshon -k < image/repositories|head -n1) - fi - if [[ -z "$fromImageTag" ]]; then - fromImageTag=$(jshon -e $fromImageName -k \ - < image/repositories|head -n1) - fi - parentID=$(jshon -e $fromImageName -e $fromImageTag -u \ - < image/repositories) - for l in image/*/layer.tar; do ls_tar $l >> baseFiles done @@ -904,4 +684,110 @@ rec { }) ); + streamLayeredImage = { + # Image Name + name, + # Image tag, the Nix's output hash will be used if null + tag ? null, + # Files to put on the image (a nix store path or list of paths). + contents ? [], + # Docker config; e.g. what command to run on the container. + config ? {}, + # Time of creation of the image. Passing "now" will make the + # created date be the time of building. + created ? "1970-01-01T00:00:01Z", + # Optional bash script to run on the files prior to fixturizing the layer. + extraCommands ? "", + # We pick 100 to ensure there is plenty of room for extension. I + # believe the actual maximum is 128. + maxLayers ? 100 + }: + assert + (lib.assertMsg (maxLayers > 1) + "the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})"); + let + streamScript = writePython3 "stream" {} ./stream_layered_image.py; + baseJson = writeText "${name}-base.json" (builtins.toJSON { + inherit config; + architecture = buildPackages.go.GOARCH; + os = "linux"; + }); + customisationLayer = runCommand "${name}-customisation-layer" { inherit extraCommands; } '' + cp -r ${contentsEnv}/ $out + + if [[ -n $extraCommands ]]; then + chmod u+w $out + (cd $out; eval "$extraCommands") + fi + ''; + contentsEnv = symlinkJoin { + name = "${name}-bulk-layers"; + paths = if builtins.isList contents + then contents + else [ contents ]; + }; + + # NOTE: the `closures` parameter is a list of closures to include. + # The TOP LEVEL store paths themselves will never be present in the + # resulting image. At this time (2019-12-16) none of these layers + # are appropriate to include, as they are all created as + # implementation details of dockerTools. + closures = [ baseJson contentsEnv ]; + overallClosure = writeText "closure" (lib.concatStringsSep " " closures); + conf = runCommand "${name}-conf.json" { + inherit maxLayers created; + imageName = lib.toLower name; + paths = referencesByPopularity overallClosure; + buildInputs = [ jq ]; + } '' + paths() { + cat $paths ${lib.concatMapStringsSep " " (path: "| (grep -v ${path} || true)") (closures ++ [ overallClosure ])} + } + ${if (tag == null) then '' + outName="$(basename "$out")" + outHash=$(echo "$outName" | cut -d - -f 1) + + imageTag=$outHash + '' else '' + imageTag="${tag}" + ''} + + if [[ "$created" == "now" ]]; then + created="$(TZ=utc date --iso-8601="seconds")" + fi + + # Create $maxLayers worth of Docker Layers, one layer per store path + # unless there are more paths than $maxLayers. In that case, create + # $maxLayers-1 for the most popular layers, and smush the remainaing + # store paths in to one final layer. + store_layers="$( + paths | + jq -sR ' + rtrimstr("\n") | split("\n") + | (.[:$maxLayers-1] | map([.])) + [ .[$maxLayers-1:] ] + | map(select(length > 0)) + ' \ + --argjson maxLayers "$(( maxLayers - 1 ))" # one layer will be taken up by the customisation layer + )" + + cat ${baseJson} | jq ' + . + { + "store_layers": $store_layers, + "customisation_layer", $customisation_layer, + "repo_tag": $repo_tag, + "created": $created + } + ' --argjson store_layers "$store_layers" \ + --arg customisation_layer ${customisationLayer} \ + --arg repo_tag "$imageName:$imageTag" \ + --arg created "$created" | + tee $out + ''; + result = runCommand "stream-${name}" { + inherit (conf) imageName; + buildInputs = [ makeWrapper ]; + } '' + makeWrapper ${streamScript} $out --add-flags ${conf} + ''; + in result; } diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh deleted file mode 100755 index 3a1fcd0c27a1..000000000000 --- a/pkgs/build-support/docker/store-path-to-layer.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!@shell@ - -set -eu - -layerNumber=$1 -shift - -layerPath="./layers/$layerNumber" -echo "Creating layer #$layerNumber for $@" - -mkdir -p "$layerPath" - -# Make sure /nix and /nix/store appear first in the archive. -# -# We create the directories here and use them because -# when there are other things being added to the -# nix store, tar could fail, saying, -# "tar: /nix/store: file changed as we read it" -# -# In addition, we use `__Nix__` instead of `nix` to avoid renaming -# relative symlink destinations like -# /nix/store/...-nix-2.3.4/bin/nix-daemon -> nix -mkdir -p __Nix__/store - -# Then we change into the /nix/store in order to -# avoid a similar "file changed as we read it" error -# as above. Namely, if we use the absolute path of -# /nix/store/123-pkg and something new is added to the nix -# store while tar is running, it will detect a change to -# /nix/store and fail. Instead, if we cd into the nix store -# and copy the relative nix store path, tar will ignore -# changes to /nix/store. In order to create the correct -# structure in the tar file, we transform the relative nix -# store path to the absolute store path. -tarhash=$( - basename -a "$@" | - tar --create --preserve-permissions --absolute-names nix \ - --directory /nix/store --verbatim-files-from --files-from - \ - --hard-dereference --sort=name \ - --mtime="@$SOURCE_DATE_EPOCH" \ - --owner=0 --group=0 \ - --transform 's,^__Nix__$,/nix,' \ - --transform 's,^__Nix__/store$,/nix/store,' \ - --transform 's,^[^/],/nix/store/\0,rS' | - tee "$layerPath/layer.tar" | - tarsum -) - -# Add a 'checksum' field to the JSON, with the value set to the -# checksum of the tarball. -cat ./generic.json | jshon -s "$tarhash" -i checksum > $layerPath/json - -# Indicate to docker that we're using schema version 1.0. -echo -n "1.0" > $layerPath/VERSION diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py new file mode 100644 index 000000000000..a0f2cf726e30 --- /dev/null +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -0,0 +1,165 @@ +import io +import os +import re +import sys +import json +import hashlib +import tarfile +import itertools +import threading +from collections import namedtuple + + +# Adds the given store paths to as a tar to the given writable stream. +def archive_paths_to(obj, paths, add_nix, filter=None): + filter = filter if filter else lambda i: i + + # gettarinfo makes the paths relative, this makes them + # absolute again + def append_root(ti): + ti.name = "/" + ti.name + return ti + + def dir(path): + ti = tarfile.TarInfo(path) + ti.type = tarfile.DIRTYPE + return ti + + with tarfile.open(fileobj=obj, mode="w|") as tar: + if add_nix: + tar.addfile(dir("/nix")) + tar.addfile(dir("/nix/store")) + + for path in paths: + ti = tar.gettarinfo(os.path.join("/", path)) + tar.addfile(filter(append_root(ti))) + + for root, dirs, files in os.walk(path, topdown=True): + for name in itertools.chain(dirs, files): + name = os.path.join(root, name) + ti = append_root(tar.gettarinfo(name)) + + # copy hardlinks as regular files + if ti.islnk(): + ti.type = tarfile.REGTYPE + + ti = filter(ti) + if ti.isfile(): + with open(name, "rb") as f: + tar.addfile(ti, f) + else: + tar.addfile(ti) + + +# A writable stream which only calculates the final file size and +# sha256sum, while discarding the actual contents. +class ExtractChecksum: + def __init__(self): + self._digest = hashlib.sha256() + self._size = 0 + + def write(self, data): + self._digest.update(data) + self._size += len(data) + + def extract(self): + return (self._digest.hexdigest(), self._size) + + +# Some metadata for a layer +LayerInfo = namedtuple("LayerInfo", ["size", "checksum", "path", "paths"]) + + +# Given a list of store paths 'paths', creates a layer add append it +# to tarfile 'tar'. Returns some a 'LayerInfo' for the layer. +def add_layer_dir(tar, paths, add_nix=True, filter=None): + assert all(i.startswith("/nix/store/") for i in paths) + + extract_checksum = ExtractChecksum() + archive_paths_to(extract_checksum, paths, add_nix=add_nix, filter=filter) + (checksum, size) = extract_checksum.extract() + + path = f"{checksum}/layer.tar" + ti = tarfile.TarInfo(path) + ti.size = size + + read_fd, write_fd = os.pipe() + with open(read_fd, "rb") as read, open(write_fd, "wb") as write: + def producer(): + archive_paths_to(write, paths, add_nix=add_nix, filter=filter) + write.close() + threading.Thread(target=producer).start() + tar.addfile(ti, read) + + return LayerInfo(size=size, checksum=checksum, path=path, paths=paths) + + +def add_customisation_layer(tar, path): + def filter(ti): + ti.name = re.sub("^/nix/store/[^/]*", "", ti.name) + return ti + return add_layer_dir(tar, [path], add_nix=False, filter=filter) + + +# Adds a file to the tarball with given path and contents. +def add_bytes(tar, path, content): + assert type(content) is bytes + + ti = tarfile.TarInfo(path) + ti.size = len(content) + tar.addfile(ti, io.BytesIO(content)) + + +# Main + +with open(sys.argv[1], "r") as f: + conf = json.load(f) + +with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar: + layers = [] + for num, store_layer in enumerate(conf["store_layers"]): + print( + "Creating layer", num, + "from paths:", store_layer, + file=sys.stderr) + info = add_layer_dir(tar, store_layer) + layers.append(info) + + print("Creating the customisation layer...", file=sys.stderr) + layers.append(add_customisation_layer(tar, conf["customisation_layer"])) + + print("Adding manifests...", file=sys.stderr) + image_json = { + "created": conf["created"], + "architecture": conf["architecture"], + "os": "linux", + "config": conf["config"], + "rootfs": { + "diff_ids": [f"sha256:{layer.checksum}" for layer in layers], + "type": "layers", + }, + "history": [ + { + "created": conf["created"], + "comment": f"store paths: {layer.paths}" + } + for layer in layers + ], + } + + image_json = json.dumps(image_json, indent=4).encode("utf-8") + image_json_checksum = hashlib.sha256(image_json).hexdigest() + image_json_path = f"{image_json_checksum}.json" + add_bytes(tar, image_json_path, image_json) + + manifest_json = [ + { + "Config": image_json_path, + "RepoTags": [conf["repo_tag"]], + "Layers": [layer.path for layer in layers], + } + ] + manifest_json = json.dumps(manifest_json, indent=4).encode("utf-8") + add_bytes(tar, "manifest.json", manifest_json) + + print("Done.", file=sys.stderr) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e31c42261e72..fa68b7493639 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -213,7 +213,9 @@ in grsync = callPackage ../applications/misc/grsync { }; - dockerTools = callPackage ../build-support/docker { }; + dockerTools = callPackage ../build-support/docker { + writePython3 = writers.writePython3; + }; snapTools = callPackage ../build-support/snap { }; From 4e0109f87362ee31f71ee5805806a3915afd3fbd Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Thu, 11 Jun 2020 12:44:04 +1200 Subject: [PATCH 2274/3452] Set mtime to get more deterministic builds --- pkgs/build-support/docker/default.nix | 5 +- .../docker/stream_layered_image.py | 62 +++++++++++++++---- 2 files changed, 52 insertions(+), 15 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index d0ec90264ee7..06f2d9235698 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -752,8 +752,9 @@ rec { imageTag="${tag}" ''} - if [[ "$created" == "now" ]]; then - created="$(TZ=utc date --iso-8601="seconds")" + # convert "created" to iso format + if [[ "$created" != "now" ]]; then + created="$(date -Iseconds -d "$created")" fi # Create $maxLayers worth of Docker Layers, one layer per store path diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index a0f2cf726e30..fd8c2428d918 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -7,11 +7,12 @@ import hashlib import tarfile import itertools import threading +from datetime import datetime from collections import namedtuple # Adds the given store paths to as a tar to the given writable stream. -def archive_paths_to(obj, paths, add_nix, filter=None): +def archive_paths_to(obj, paths, created, add_nix, filter=None): filter = filter if filter else lambda i: i # gettarinfo makes the paths relative, this makes them @@ -20,6 +21,10 @@ def archive_paths_to(obj, paths, add_nix, filter=None): ti.name = "/" + ti.name return ti + def apply_filters(ti): + ti.mtime = int(created.timestamp()) + return filter(ti) + def dir(path): ti = tarfile.TarInfo(path) ti.type = tarfile.DIRTYPE @@ -27,12 +32,12 @@ def archive_paths_to(obj, paths, add_nix, filter=None): with tarfile.open(fileobj=obj, mode="w|") as tar: if add_nix: - tar.addfile(dir("/nix")) - tar.addfile(dir("/nix/store")) + tar.addfile(apply_filters(dir("/nix"))) + tar.addfile(apply_filters(dir("/nix/store"))) for path in paths: ti = tar.gettarinfo(os.path.join("/", path)) - tar.addfile(filter(append_root(ti))) + tar.addfile(apply_filters(append_root(ti))) for root, dirs, files in os.walk(path, topdown=True): for name in itertools.chain(dirs, files): @@ -43,7 +48,7 @@ def archive_paths_to(obj, paths, add_nix, filter=None): if ti.islnk(): ti.type = tarfile.REGTYPE - ti = filter(ti) + ti = apply_filters(ti) if ti.isfile(): with open(name, "rb") as f: tar.addfile(ti, f) @@ -72,11 +77,17 @@ LayerInfo = namedtuple("LayerInfo", ["size", "checksum", "path", "paths"]) # Given a list of store paths 'paths', creates a layer add append it # to tarfile 'tar'. Returns some a 'LayerInfo' for the layer. -def add_layer_dir(tar, paths, add_nix=True, filter=None): +def add_layer_dir(tar, paths, created, add_nix=True, filter=None): assert all(i.startswith("/nix/store/") for i in paths) extract_checksum = ExtractChecksum() - archive_paths_to(extract_checksum, paths, add_nix=add_nix, filter=filter) + archive_paths_to( + extract_checksum, + paths, + created=created, + add_nix=add_nix, + filter=filter + ) (checksum, size) = extract_checksum.extract() path = f"{checksum}/layer.tar" @@ -86,7 +97,13 @@ def add_layer_dir(tar, paths, add_nix=True, filter=None): read_fd, write_fd = os.pipe() with open(read_fd, "rb") as read, open(write_fd, "wb") as write: def producer(): - archive_paths_to(write, paths, add_nix=add_nix, filter=filter) + archive_paths_to( + write, + paths, + created=created, + add_nix=add_nix, + filter=filter + ) write.close() threading.Thread(target=producer).start() tar.addfile(ti, read) @@ -94,11 +111,17 @@ def add_layer_dir(tar, paths, add_nix=True, filter=None): return LayerInfo(size=size, checksum=checksum, path=path, paths=paths) -def add_customisation_layer(tar, path): +def add_customisation_layer(tar, path, created): def filter(ti): ti.name = re.sub("^/nix/store/[^/]*", "", ti.name) return ti - return add_layer_dir(tar, [path], add_nix=False, filter=filter) + return add_layer_dir( + tar, + [path], + created=created, + add_nix=False, + filter=filter + ) # Adds a file to the tarball with given path and contents. @@ -115,6 +138,12 @@ def add_bytes(tar, path, content): with open(sys.argv[1], "r") as f: conf = json.load(f) +created = ( + datetime.now(tz=datetime.timezone.utc) + if conf["created"] == "now" + else datetime.fromisoformat(conf["created"]) +) + with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar: layers = [] for num, store_layer in enumerate(conf["store_layers"]): @@ -122,15 +151,22 @@ with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar: "Creating layer", num, "from paths:", store_layer, file=sys.stderr) - info = add_layer_dir(tar, store_layer) + info = add_layer_dir(tar, store_layer, created=created) layers.append(info) print("Creating the customisation layer...", file=sys.stderr) - layers.append(add_customisation_layer(tar, conf["customisation_layer"])) + layers.append( + add_customisation_layer( + tar, + conf["customisation_layer"], + created=created + ) + ) print("Adding manifests...", file=sys.stderr) + image_json = { - "created": conf["created"], + "created": datetime.isoformat(created), "architecture": conf["architecture"], "os": "linux", "config": conf["config"], From a5a611cacbc11d267d394f2a7bde06c098ef65af Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Thu, 11 Jun 2020 12:51:47 +1200 Subject: [PATCH 2275/3452] Set mtime in even more places --- .../docker/stream_layered_image.py | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index fd8c2428d918..f502e855e954 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -12,7 +12,7 @@ from collections import namedtuple # Adds the given store paths to as a tar to the given writable stream. -def archive_paths_to(obj, paths, created, add_nix, filter=None): +def archive_paths_to(obj, paths, mtime, add_nix, filter=None): filter = filter if filter else lambda i: i # gettarinfo makes the paths relative, this makes them @@ -22,7 +22,7 @@ def archive_paths_to(obj, paths, created, add_nix, filter=None): return ti def apply_filters(ti): - ti.mtime = int(created.timestamp()) + ti.mtime = mtime return filter(ti) def dir(path): @@ -77,14 +77,14 @@ LayerInfo = namedtuple("LayerInfo", ["size", "checksum", "path", "paths"]) # Given a list of store paths 'paths', creates a layer add append it # to tarfile 'tar'. Returns some a 'LayerInfo' for the layer. -def add_layer_dir(tar, paths, created, add_nix=True, filter=None): +def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): assert all(i.startswith("/nix/store/") for i in paths) extract_checksum = ExtractChecksum() archive_paths_to( extract_checksum, paths, - created=created, + mtime=mtime, add_nix=add_nix, filter=filter ) @@ -93,6 +93,7 @@ def add_layer_dir(tar, paths, created, add_nix=True, filter=None): path = f"{checksum}/layer.tar" ti = tarfile.TarInfo(path) ti.size = size + ti.mtime = mtime read_fd, write_fd = os.pipe() with open(read_fd, "rb") as read, open(write_fd, "wb") as write: @@ -100,7 +101,7 @@ def add_layer_dir(tar, paths, created, add_nix=True, filter=None): archive_paths_to( write, paths, - created=created, + mtime=mtime, add_nix=add_nix, filter=filter ) @@ -111,25 +112,26 @@ def add_layer_dir(tar, paths, created, add_nix=True, filter=None): return LayerInfo(size=size, checksum=checksum, path=path, paths=paths) -def add_customisation_layer(tar, path, created): +def add_customisation_layer(tar, path, mtime): def filter(ti): ti.name = re.sub("^/nix/store/[^/]*", "", ti.name) return ti return add_layer_dir( tar, [path], - created=created, + mtime=mtime, add_nix=False, filter=filter ) # Adds a file to the tarball with given path and contents. -def add_bytes(tar, path, content): +def add_bytes(tar, path, content, mtime): assert type(content) is bytes ti = tarfile.TarInfo(path) ti.size = len(content) + ti.mtime = mtime tar.addfile(ti, io.BytesIO(content)) @@ -143,6 +145,7 @@ created = ( if conf["created"] == "now" else datetime.fromisoformat(conf["created"]) ) +mtime = int(created.timestamp()) with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar: layers = [] @@ -151,7 +154,7 @@ with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar: "Creating layer", num, "from paths:", store_layer, file=sys.stderr) - info = add_layer_dir(tar, store_layer, created=created) + info = add_layer_dir(tar, store_layer, mtime=mtime) layers.append(info) print("Creating the customisation layer...", file=sys.stderr) @@ -159,7 +162,7 @@ with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar: add_customisation_layer( tar, conf["customisation_layer"], - created=created + mtime=mtime ) ) @@ -186,7 +189,7 @@ with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar: image_json = json.dumps(image_json, indent=4).encode("utf-8") image_json_checksum = hashlib.sha256(image_json).hexdigest() image_json_path = f"{image_json_checksum}.json" - add_bytes(tar, image_json_path, image_json) + add_bytes(tar, image_json_path, image_json, mtime=mtime) manifest_json = [ { @@ -196,6 +199,6 @@ with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar: } ] manifest_json = json.dumps(manifest_json, indent=4).encode("utf-8") - add_bytes(tar, "manifest.json", manifest_json) + add_bytes(tar, "manifest.json", manifest_json, mtime=mtime) print("Done.", file=sys.stderr) From 4ab7baf6f61f2c89bbd4f3825546b48adcd031c4 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Thu, 18 Jun 2020 14:29:59 +1200 Subject: [PATCH 2276/3452] stream_layered_image.py: comments --- .../docker/stream_layered_image.py | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index f502e855e954..6687f49e1bc8 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -1,3 +1,36 @@ +""" +This script generates a Docker image from a set of store paths. Uses +Docker Image Specification v1.2 as reference [1]. + +It expects a JSON file with the following properties and writes the +image as an uncompressed tarball to stdout: + +* "architecture", "config", "os", "created", "repo_tag" correspond to + the fields with the same name on the image spec [2]. +* "created" can be "now". +* "created" is also used as mtime for files added to the image. +* "store_layers" is a list of layers in ascending order, where each + layer is the list of store paths to include in that layer. + +The main challenge for this script to create the final image in a +streaming fashion, without dumping any intermediate data to disk +for performance. + +A docker image has each layer contents archived as separate tarballs, +and they later all get enveloped into a single big tarball in a +content addressed fashion. However, because how "tar" format works, +we have to know about the name (which includes the checksum in our +case) and the size of the tarball before we can start adding it to the +outer tarball. We achieve that by creating the layer tarballs twice; +on the first iteration we calculate the file size and the checksum, +and on the second one we actually stream the contents. 'add_layer_dir' +function does all this. + +[1]: https://github.com/moby/moby/blob/master/image/spec/v1.2.md +[2]: https://github.com/moby/moby/blob/4fb59c20a4fb54f944fe170d0ff1d00eb4a24d6f/image/spec/v1.2.md#image-json-field-descriptions +""" # noqa: E501 + + import io import os import re @@ -31,6 +64,9 @@ def archive_paths_to(obj, paths, mtime, add_nix, filter=None): return ti with tarfile.open(fileobj=obj, mode="w|") as tar: + # To be consistent with the docker utilities, we need to have + # these directories first when building layer tarballs. But + # we don't need them on the customisation layer. if add_nix: tar.addfile(apply_filters(dir("/nix"))) tar.addfile(apply_filters(dir("/nix/store"))) @@ -80,6 +116,7 @@ LayerInfo = namedtuple("LayerInfo", ["size", "checksum", "path", "paths"]) def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): assert all(i.startswith("/nix/store/") for i in paths) + # First, calculate the tarball checksum and the size. extract_checksum = ExtractChecksum() archive_paths_to( extract_checksum, @@ -95,6 +132,7 @@ def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): ti.size = size ti.mtime = mtime + # Then actually stream the contents to the outer tarball. read_fd, write_fd = os.pipe() with open(read_fd, "rb") as read, open(write_fd, "wb") as write: def producer(): @@ -106,12 +144,20 @@ def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): filter=filter ) write.close() + + # Closing the write end of the fifo also closes the read end, + # so we don't need to wait until this thread is finished. + # + # Any exception from the thread will get printed by the default + # exception handler, and the 'addfile' call will fail since it + # won't be able to read required amount of bytes. threading.Thread(target=producer).start() tar.addfile(ti, read) return LayerInfo(size=size, checksum=checksum, path=path, paths=paths) +# Adds the contents of the store path to the root as a new layer. def add_customisation_layer(tar, path, mtime): def filter(ti): ti.name = re.sub("^/nix/store/[^/]*", "", ti.name) From 307804d97d1b2b81dcb792cee62afdad435b28a8 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Thu, 18 Jun 2020 14:34:27 +1200 Subject: [PATCH 2277/3452] dockerTools.streamLayeredImage: comments --- pkgs/build-support/docker/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 06f2d9235698..11d5c2b36428 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -729,7 +729,7 @@ rec { # NOTE: the `closures` parameter is a list of closures to include. # The TOP LEVEL store paths themselves will never be present in the - # resulting image. At this time (2019-12-16) none of these layers + # resulting image. At this time (2020-06-18) none of these layers # are appropriate to include, as they are all created as # implementation details of dockerTools. closures = [ baseJson contentsEnv ]; @@ -761,6 +761,12 @@ rec { # unless there are more paths than $maxLayers. In that case, create # $maxLayers-1 for the most popular layers, and smush the remainaing # store paths in to one final layer. + # + # The following code is fiddly w.r.t. ensuring every layer is + # created, and that no paths are missed. If you change the + # following lines, double-check that your code behaves properly + # when the number of layers equals: + # maxLayers-1, maxLayers, and maxLayers+1, 0 store_layers="$( paths | jq -sR ' From 26402290bfdec5b012dc66c1d0418ad7ffdb284e Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Sun, 21 Jun 2020 11:46:15 +1200 Subject: [PATCH 2278/3452] stream_layered_image: Add main method --- .../docker/stream_layered_image.py | 121 +++++++++--------- 1 file changed, 62 insertions(+), 59 deletions(-) diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index 6687f49e1bc8..44c6cbba21c6 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -181,70 +181,73 @@ def add_bytes(tar, path, content, mtime): tar.addfile(ti, io.BytesIO(content)) -# Main +def main(): + with open(sys.argv[1], "r") as f: + conf = json.load(f) -with open(sys.argv[1], "r") as f: - conf = json.load(f) - -created = ( - datetime.now(tz=datetime.timezone.utc) - if conf["created"] == "now" - else datetime.fromisoformat(conf["created"]) -) -mtime = int(created.timestamp()) - -with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar: - layers = [] - for num, store_layer in enumerate(conf["store_layers"]): - print( - "Creating layer", num, - "from paths:", store_layer, - file=sys.stderr) - info = add_layer_dir(tar, store_layer, mtime=mtime) - layers.append(info) - - print("Creating the customisation layer...", file=sys.stderr) - layers.append( - add_customisation_layer( - tar, - conf["customisation_layer"], - mtime=mtime - ) + created = ( + datetime.now(tz=datetime.timezone.utc) + if conf["created"] == "now" + else datetime.fromisoformat(conf["created"]) ) + mtime = int(created.timestamp()) - print("Adding manifests...", file=sys.stderr) + with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar: + layers = [] + for num, store_layer in enumerate(conf["store_layers"]): + print( + "Creating layer", num, + "from paths:", store_layer, + file=sys.stderr) + info = add_layer_dir(tar, store_layer, mtime=mtime) + layers.append(info) - image_json = { - "created": datetime.isoformat(created), - "architecture": conf["architecture"], - "os": "linux", - "config": conf["config"], - "rootfs": { - "diff_ids": [f"sha256:{layer.checksum}" for layer in layers], - "type": "layers", - }, - "history": [ - { - "created": conf["created"], - "comment": f"store paths: {layer.paths}" - } - for layer in layers - ], - } + print("Creating the customisation layer...", file=sys.stderr) + layers.append( + add_customisation_layer( + tar, + conf["customisation_layer"], + mtime=mtime + ) + ) - image_json = json.dumps(image_json, indent=4).encode("utf-8") - image_json_checksum = hashlib.sha256(image_json).hexdigest() - image_json_path = f"{image_json_checksum}.json" - add_bytes(tar, image_json_path, image_json, mtime=mtime) + print("Adding manifests...", file=sys.stderr) - manifest_json = [ - { - "Config": image_json_path, - "RepoTags": [conf["repo_tag"]], - "Layers": [layer.path for layer in layers], + image_json = { + "created": datetime.isoformat(created), + "architecture": conf["architecture"], + "os": "linux", + "config": conf["config"], + "rootfs": { + "diff_ids": [f"sha256:{layer.checksum}" for layer in layers], + "type": "layers", + }, + "history": [ + { + "created": conf["created"], + "comment": f"store paths: {layer.paths}" + } + for layer in layers + ], } - ] - manifest_json = json.dumps(manifest_json, indent=4).encode("utf-8") - add_bytes(tar, "manifest.json", manifest_json, mtime=mtime) - print("Done.", file=sys.stderr) + image_json = json.dumps(image_json, indent=4).encode("utf-8") + image_json_checksum = hashlib.sha256(image_json).hexdigest() + image_json_path = f"{image_json_checksum}.json" + add_bytes(tar, image_json_path, image_json, mtime=mtime) + + manifest_json = [ + { + "Config": image_json_path, + "RepoTags": [conf["repo_tag"]], + "Layers": [layer.path for layer in layers], + } + ] + manifest_json = json.dumps(manifest_json, indent=4).encode("utf-8") + add_bytes(tar, "manifest.json", manifest_json, mtime=mtime) + + print("Done.", file=sys.stderr) + + +if __name__ == "__main__": + main() From f1d7a09146678b60f78b08c2dec3ce14dc59499f Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Sun, 21 Jun 2020 12:09:22 +1200 Subject: [PATCH 2279/3452] stream_layered_image: Add docstrings to functions --- .../docker/stream_layered_image.py | 64 +++++++++++++++++-- 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index 44c6cbba21c6..d7267b25672d 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -44,8 +44,19 @@ from datetime import datetime from collections import namedtuple -# Adds the given store paths to as a tar to the given writable stream. def archive_paths_to(obj, paths, mtime, add_nix, filter=None): + """ + Writes the given store paths as a tar file to the given stream. + + obj: Stream to write to. Should have a 'write' method. + paths: List of store paths. + add_nix: Whether /nix and /nix/store directories should be + prepended to the archive. + filter: An optional transformation to be applied to TarInfo + objects. Should take a single TarInfo object and return + another one. Defaults to identity. + """ + filter = filter if filter else lambda i: i # gettarinfo makes the paths relative, this makes them @@ -92,9 +103,12 @@ def archive_paths_to(obj, paths, mtime, add_nix, filter=None): tar.addfile(ti) -# A writable stream which only calculates the final file size and -# sha256sum, while discarding the actual contents. class ExtractChecksum: + """ + A writable stream which only calculates the final file size and + sha256sum, while discarding the actual contents. + """ + def __init__(self): self._digest = hashlib.sha256() self._size = 0 @@ -104,6 +118,9 @@ class ExtractChecksum: self._size += len(data) def extract(self): + """ + Returns: Hex-encoded sha256sum and size as a tuple. + """ return (self._digest.hexdigest(), self._size) @@ -111,9 +128,24 @@ class ExtractChecksum: LayerInfo = namedtuple("LayerInfo", ["size", "checksum", "path", "paths"]) -# Given a list of store paths 'paths', creates a layer add append it -# to tarfile 'tar'. Returns some a 'LayerInfo' for the layer. def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): + """ + Appends given store paths to a TarFile object as a new layer. + + tar: 'tarfile.TarFile' object for the new layer to be added to. + paths: List of store paths. + mtime: 'mtime' of the added files and the layer tarball. + Should be an integer representing a POSIX time. + add_nix: Whether /nix and /nix/store directories should be + added to a layer. + filter: An optional transformation to be applied to TarInfo + objects inside the layer. Should take a single TarInfo + object and return another one. Defaults to identity. + + Returns: A 'LayerInfo' object containing some metadata of + the layer added. + """ + assert all(i.startswith("/nix/store/") for i in paths) # First, calculate the tarball checksum and the size. @@ -157,8 +189,19 @@ def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): return LayerInfo(size=size, checksum=checksum, path=path, paths=paths) -# Adds the contents of the store path to the root as a new layer. def add_customisation_layer(tar, path, mtime): + """ + Adds the contents of the store path as a new layer. This is different + than the 'add_layer_dir' function defaults in the sense that the contents + of a single store path will be added to the root of the layer. eg (without + the /nix/store prefix). + + tar: 'tarfile.TarFile' object for the new layer to be added to. + path: A store path. + mtime: 'mtime' of the added files and the layer tarball. Should be an + integer representing a POSIX time. + """ + def filter(ti): ti.name = re.sub("^/nix/store/[^/]*", "", ti.name) return ti @@ -171,8 +214,15 @@ def add_customisation_layer(tar, path, mtime): ) -# Adds a file to the tarball with given path and contents. def add_bytes(tar, path, content, mtime): + """ + Adds a file to the tarball with given path and contents. + + tar: 'tarfile.TarFile' object. + path: Path of the file as a string. + content: Contents of the file. + mtime: 'mtime' of the file. Should be an integer representing a POSIX time. + """ assert type(content) is bytes ti = tarfile.TarInfo(path) From 4bff5b7f3d2bfd1705a10ee7f85d2494ac7bac9f Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Sun, 21 Jun 2020 12:11:56 +1200 Subject: [PATCH 2280/3452] dockerTools: Properly quote a shell variable --- pkgs/build-support/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 11d5c2b36428..7ff325382a6b 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -333,7 +333,7 @@ rec { chmod ug+w layer - if [[ -n $extraCommands ]]; then + if [[ -n "$extraCommands" ]]; then (cd layer; eval "$extraCommands") fi From 87a538e149cbf41361afda3b417eac1632f00c5b Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Sun, 21 Jun 2020 12:14:52 +1200 Subject: [PATCH 2281/3452] stream_layered_image: Use more descriptive variable name --- pkgs/build-support/docker/stream_layered_image.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index d7267b25672d..bbad5f5023c4 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -160,9 +160,9 @@ def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): (checksum, size) = extract_checksum.extract() path = f"{checksum}/layer.tar" - ti = tarfile.TarInfo(path) - ti.size = size - ti.mtime = mtime + layer_tarinfo = tarfile.TarInfo(path) + layer_tarinfo.size = size + layer_tarinfo.mtime = mtime # Then actually stream the contents to the outer tarball. read_fd, write_fd = os.pipe() @@ -184,7 +184,7 @@ def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): # exception handler, and the 'addfile' call will fail since it # won't be able to read required amount of bytes. threading.Thread(target=producer).start() - tar.addfile(ti, read) + tar.addfile(layer_tarinfo, read) return LayerInfo(size=size, checksum=checksum, path=path, paths=paths) From fe71abfc12ede6700f599a08c7528fe66461486f Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Sun, 21 Jun 2020 12:18:28 +1200 Subject: [PATCH 2282/3452] stream_layered_image: Clarify assertion failure --- pkgs/build-support/docker/stream_layered_image.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index bbad5f5023c4..5d251e8bfb05 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -146,7 +146,9 @@ def add_layer_dir(tar, paths, mtime, add_nix=True, filter=None): the layer added. """ - assert all(i.startswith("/nix/store/") for i in paths) + invalid_paths = [i for i in paths if not i.startswith("/nix/store/")] + assert len(invalid_paths) == 0, \ + "Expecting absolute store paths, but got: {invalid_paths}" # First, calculate the tarball checksum and the size. extract_checksum = ExtractChecksum() From 16199521eaaf5d31952c19e44bcca205959df57f Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Sun, 21 Jun 2020 12:23:55 +1200 Subject: [PATCH 2283/3452] stream_layered_image: Always set uid and gid to root --- pkgs/build-support/docker/stream_layered_image.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index 5d251e8bfb05..a9de10f9efaa 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -67,6 +67,10 @@ def archive_paths_to(obj, paths, mtime, add_nix, filter=None): def apply_filters(ti): ti.mtime = mtime + ti.uid = 0 + ti.gid = 0 + ti.uname = "root" + ti.gname = "root" return filter(ti) def dir(path): From 00f7558225d6e12cd59397a213ac8bb2dcd60205 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 20 Jun 2020 20:46:17 -0400 Subject: [PATCH 2284/3452] 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 2285/3452] 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 2286/3452] 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 2287/3452] 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 2288/3452] =?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 7e7aa529d94971e172f741013d10d8002553bffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Thu, 18 Jun 2020 13:23:32 +0200 Subject: [PATCH 2289/3452] test-driver.py: delete VM state directory after test run Keeping the VM state test across several run sometimes lead to subtle and hard to spot errors in practice. We delete the VM state which contains (among other things) the qcow volume. We also introduce a -K (--keep-vm-state) flag making VM state to persist after the test run. This flag makes test-driver.py to match its previous behaviour. --- .../running-nixos-tests-interactively.xml | 9 +++++++-- nixos/doc/manual/release-notes/rl-2009.xml | 6 ++++++ nixos/lib/test-driver/test-driver.py | 20 +++++++++++++++++-- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml index 31216874c706..a11a9382764d 100644 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml @@ -38,7 +38,12 @@ starting VDE switch for network 1 - The machine state is kept across VM restarts in - /tmp/vm-state-machinename. + You can re-use the VM states coming from a previous run + by setting the --keep-vm-state flag. + +$ ./result/bin/nixos-run-vms --keep-vm-state + + The machine state is stored in the + $TMPDIR/vm-state-machinename directory. diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index a0a0b2cb40e4..627f1d08edd2 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -656,6 +656,12 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; nextcloud18 before upgrading to nextcloud19 since Nextcloud doesn't support upgrades across multiple major versions. + + The nixos-run-vms script now deletes the + previous run machines states on test startup. You can use the + --keep-vm-state flag to match the previous + behaviour and keep the same VM state between different test runs. + diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index e7b05968b079..f454b052dc31 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -4,6 +4,7 @@ from queue import Queue, Empty from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List from xml.sax.saxutils import XMLGenerator import _thread +import argparse import atexit import base64 import codecs @@ -751,6 +752,11 @@ class Machine: self.log("QEMU running (pid {})".format(self.pid)) + def cleanup_statedir(self) -> None: + self.log("delete the VM state directory") + if os.path.isfile(self.state_dir): + shutil.rmtree(self.state_dir) + def shutdown(self) -> None: if not self.booted: return @@ -889,6 +895,15 @@ def subtest(name: str) -> Iterator[None]: if __name__ == "__main__": + arg_parser = argparse.ArgumentParser() + arg_parser.add_argument( + "-K", + "--keep-vm-state", + help="re-use a VM state coming from a previous run", + action="store_true", + ) + (cli_args, vm_scripts) = arg_parser.parse_known_args() + log = Logger() vlan_nrs = list(dict.fromkeys(os.environ.get("VLANS", "").split())) @@ -896,8 +911,10 @@ if __name__ == "__main__": for nr, vde_socket, _, _ in vde_sockets: os.environ["QEMU_VDE_SOCKET_{}".format(nr)] = vde_socket - vm_scripts = sys.argv[1:] machines = [create_machine({"startCommand": s}) for s in vm_scripts] + for machine in machines: + if not cli_args.keep_vm_state: + machine.cleanup_statedir() machine_eval = [ "{0} = machines[{1}]".format(m.name, idx) for idx, m in enumerate(machines) ] @@ -911,7 +928,6 @@ if __name__ == "__main__": continue log.log("killing {} (pid {})".format(machine.name, machine.pid)) machine.process.kill() - for _, _, process, _ in vde_sockets: process.terminate() log.close() From 43424688db8b30904e8bf8efd077304016bf0340 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 21 Jun 2020 10:25:52 +0200 Subject: [PATCH 2290/3452] 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 2291/3452] 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 2292/3452] 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 2293/3452] 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 2294/3452] 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 2295/3452] 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 2296/3452] 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 2297/3452] 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 2298/3452] 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 2299/3452] 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 2300/3452] 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 2301/3452] 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 2302/3452] 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 2303/3452] 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 2304/3452] 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 2305/3452] 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 2306/3452] 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 2307/3452] 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 f96feeef7cab221539f51ca035926daca1871354 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 20 Jun 2020 13:28:12 +0200 Subject: [PATCH 2308/3452] 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 2309/3452] 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 357655a58926067df761a95303adac00fe1f4579 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 21 Jun 2020 17:05:18 +0200 Subject: [PATCH 2310/3452] haskellPackages.reflex-dom and deps: Fix patch urls The previously used PR specific urls do cease to exist after a force push to the PR branch. Also manually enable hydra builds for reflex-dom-core until upstream provides a better fix. --- .../haskell-modules/configuration-common.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c4056f42d5b5..1976d3307c5f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1496,7 +1496,7 @@ self: super: { # Upstream PR: https://github.com/bgamari/monoidal-containers/pull/62 # Bump these version bound monoidal-containers = appendPatch super.monoidal-containers (pkgs.fetchpatch { - url = "https://github.com/bgamari/monoidal-containers/pull/62/commits/715093b22a015398a1390f636be6f39a0de83254.patch"; + url = "https://github.com/bgamari/monoidal-containers/commit/715093b22a015398a1390f636be6f39a0de83254.patch"; sha256="1lfxvwp8g55ljxvj50acsb0wjhrvp2hvir8y0j5pfjkd1kq628ng"; }); @@ -1504,13 +1504,13 @@ self: super: { # Upstream PR: https://github.com/reflex-frp/patch/pull/20 # Makes tests work with hlint 3 (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/patch/pull/20/commits/3ed23a4e4049ee17e64a1a5bbebf1990cdbe033a.patch"; + url = "https://github.com/reflex-frp/patch/commit/3ed23a4e4049ee17e64a1a5bbebf1990cdbe033a.patch"; sha256 ="1hfa980wln8kzbqw1lr8ddszgcibw25xf12ki2jb9xkl464aynzf"; }) # Upstream PR: https://github.com/reflex-frp/patch/pull/17 # Bumps version dependencies (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/patch/pull/17/commits/a191ed9ded708ed7ff0cf53ad6dafaf54db5b95a.patch"; + url = "https://github.com/reflex-frp/patch/commit/a191ed9ded708ed7ff0cf53ad6dafaf54db5b95a.patch"; sha256 ="1x9w5fimhk3a0l2aa5z91nqaa6s2irz1775iidd0191m6w25vszp"; }) ]; @@ -1519,30 +1519,30 @@ self: super: { # Upstream PR: https://github.com/reflex-frp/reflex/pull/434 # Bump version bounds (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex/pull/434/commits/e6104bdfd7f664f524b6765275490722e376df4d.patch"; + url = "https://github.com/reflex-frp/reflex/commit/e6104bdfd7f664f524b6765275490722e376df4d.patch"; sha256 ="1awp5p4640cnhfd50dplsvp0kzy6h8r0hpbw1s40blni74r3dhzr"; }) # Upstream PR: https://github.com/reflex-frp/reflex/pull/436 # Fix build with newest dependent-map version (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex/pull/436/commits/dc3bf44d822d70594e3c474fe3869261776c3554.patch"; + url = "https://github.com/reflex-frp/reflex/commit/dc3bf44d822d70594e3c474fe3869261776c3554.patch"; sha256 ="0rbjfj9b8p6zkvd5j4pak5kpgard6cyfvzk750s4xwpc1v84iiqd"; }) # Upstream PR: https://github.com/reflex-frp/reflex/pull/437 # Fix tests with newer dep versions (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex/pull/437/commits/87c74a1b9d9098eae8a56148c59ed4963a5232c2.patch"; + url = "https://github.com/reflex-frp/reflex/commit/87c74a1b9d9098eae8a56148c59ed4963a5232c2.patch"; sha256 ="0qhjjgd6n4fms1hpbblny78c95bfh74izhx9dvrdlnhz6q7xlm9q"; }) ]; # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 # Tests disabled because of very old dep: https://github.com/reflex-frp/reflex-dom/issues/393 - reflex-dom-core = unmarkBroken (dontCheck (appendPatches super.reflex-dom-core [ + reflex-dom-core = doDistribute (unmarkBroken (dontCheck (appendPatches super.reflex-dom-core [ # Upstream PR: https://github.com/reflex-frp/reflex-dom/pull/388 # Fix upper bounds (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex-dom/pull/388/commits/5ef04d8e478f410d2c63603b84af052c9273a533.patch"; + url = "https://github.com/reflex-frp/reflex-dom/commit/5ef04d8e478f410d2c63603b84af052c9273a533.patch"; sha256 ="0d0b819yh8mqw8ih5asdi9qcca2kmggfsi8gf22akfw1n7xvmavi"; stripLen = 2; extraPrefix = ""; @@ -1550,12 +1550,12 @@ self: super: { # Upstream PR: https://github.com/reflex-frp/reflex-dom/pull/394 # Bump dependent-map (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex-dom/pull/394/commits/695bd17d5dcdb1bf321ee8858670731637f651db.patch"; + url = "https://github.com/reflex-frp/reflex-dom/commit/695bd17d5dcdb1bf321ee8858670731637f651db.patch"; sha256 ="0llky3i37rakgsw9vqaqmwryv7s91w8ph8xjkh83nxjs14p5zfyk"; stripLen = 2; extraPrefix = ""; }) - ])); + ]))); # add unreleased commit fixing version constraint as a patch # Can be removed if https://github.com/lpeterse/haskell-utc/issues/8 is resolved 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 2311/3452] 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 2312/3452] 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 2313/3452] 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 2314/3452] 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 2315/3452] 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 2316/3452] 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 2317/3452] 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 2318/3452] 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 2319/3452] =?UTF-8?q?lepton:=201.2.1=20=E2=86=92=202019-08?= =?UTF-8?q?-20?= 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 2320/3452] 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 2321/3452] 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 2322/3452] 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 2323/3452] 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 2324/3452] 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 2325/3452] 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 2326/3452] 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 2327/3452] 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 2328/3452] 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 2329/3452] 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 2330/3452] 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 2331/3452] 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 15f104a742aa5ce04ad35ffe8ece31e4d715f771 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 22 Jun 2020 02:30:29 +0200 Subject: [PATCH 2332/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-5-g7c30584 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/db7bf3bb1b774657b089749fe414002befb41d99. --- .../haskell-modules/hackage-packages.nix | 470 ++++++++++++++++-- 1 file changed, 417 insertions(+), 53 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d53834a5913a..97c569d32c75 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -18174,6 +18174,17 @@ self: { broken = true; }) {}; + "Shpadoinkle-debug" = callPackage + ({ mkDerivation, aeson, base, jsaddle, lens, text, unliftio }: + mkDerivation { + pname = "Shpadoinkle-debug"; + version = "0.0.0.1"; + sha256 = "1yvr3d40aa6sl3gpyr24a5hij63jm2p0jrx0kac7asjihvd6fk2g"; + libraryHaskellDepends = [ aeson base jsaddle lens text unliftio ]; + description = "Debugging tools for Shpadoinkle applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Shpadoinkle-examples" = callPackage ({ mkDerivation, aeson, base, beam-core, beam-sqlite, bytestring , containers, exceptions, file-embed, lens, mtl @@ -37182,6 +37193,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base64_0_4_2_1" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, criterion + , deepseq, ghc-byteorder, QuickCheck, quickcheck-instances + , random-bytestring, tasty, tasty-hunit, tasty-quickcheck, text + , text-short + }: + mkDerivation { + pname = "base64"; + version = "0.4.2.1"; + sha256 = "14ssr4h59bx71fln3igi0nxrn749lqkanj49wahn77z3izm2s2xd"; + libraryHaskellDepends = [ + base bytestring ghc-byteorder text text-short + ]; + testHaskellDepends = [ + base base64-bytestring bytestring QuickCheck quickcheck-instances + random-bytestring tasty tasty-hunit tasty-quickcheck text + text-short + ]; + benchmarkHaskellDepends = [ + base base64-bytestring bytestring criterion deepseq + random-bytestring text + ]; + description = "Fast RFC 4648-compliant Base64 encoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base64-bytes" = callPackage ({ mkDerivation, base, base64, base64-bytestring, byte-order , bytebuild, byteslice, bytestring, gauge, natural-arithmetic @@ -41228,6 +41266,23 @@ self: { broken = true; }) {}; + "bitcoin-keys" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, hedgehog + , secp256k1-haskell, tasty, tasty-hedgehog, tasty-hunit + }: + mkDerivation { + pname = "bitcoin-keys"; + version = "0.1"; + sha256 = "18xdwp3p2r1cv5f84mfl5dj2hd6v2dnvqam8ny9jv9kswn4m66c0"; + libraryHaskellDepends = [ base bytestring secp256k1-haskell ]; + testHaskellDepends = [ + base base16-bytestring bytestring hedgehog tasty tasty-hedgehog + tasty-hunit + ]; + description = "Bitcoin keys"; + license = stdenv.lib.licenses.asl20; + }) {}; + "bitcoin-payment-channel" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring , blockchain-restful-address-index-api, bytestring, cereal @@ -48281,8 +48336,8 @@ self: { }: mkDerivation { pname = "cairo"; - version = "0.13.8.0"; - sha256 = "09g93jzackry9yi4xsd5d6h75z0r7mbw2s2w7wd2af4dmp76l2d9"; + version = "0.13.8.1"; + sha256 = "1hpkyhrlg1d24s34kq6d379z8l8fvznm98wpq37haqjma4nl25hk"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -48488,8 +48543,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.14.6"; - sha256 = "0xz4pc0z9v1x59391jdnc3ragfhip67y784bmgkfifi6gjp9jdl7"; + version = "0.1.14.8"; + sha256 = "0w3cbghfrm51m4byixz2fwyi6fswrrbq54cjl7fg5r5nckaabmng"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers data-default-class data-flags deepseq deque df1 di-polysemy @@ -54306,6 +54361,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "climb_0_3_2" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions + , linenoise, mtl, text, unliftio-core + }: + mkDerivation { + pname = "climb"; + version = "0.3.2"; + sha256 = "1ch91ll2sg05fqqlbphhjrmsvnn5a3cjj3ngag29sv60afasll0i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers exceptions linenoise mtl text + unliftio-core + ]; + executableHaskellDepends = [ + base bytestring containers exceptions linenoise mtl text + unliftio-core + ]; + description = "Building blocks for a GHCi-like REPL with colon-commands"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clingo" = callPackage ({ mkDerivation, base, bifunctors, clingo, deepseq, exceptions , hashable, mtl, StateVar, text, transformers, wl-pprint-text @@ -56895,8 +56973,8 @@ self: { }: mkDerivation { pname = "commander-cli"; - version = "0.6.1.0"; - sha256 = "0macdmhzkg101gb1fddrs0wz4i318cxjfbhli6cib4h7ril3pvbp"; + version = "0.7.0.0"; + sha256 = "1xrlgfyq59g7x7msrwl58bzg108jkxk0k5sra8la7zwpx46ach4z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63943,6 +64021,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptonite_0_27" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, gauge + , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit + , tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.27"; + sha256 = "1c68wvn2b49gijq9day2bzi0axcbdz41ip3j0wdahdhcjfl4a9y8"; + libraryHaskellDepends = [ + base basement bytestring deepseq ghc-prim integer-gmp memory + ]; + testHaskellDepends = [ + base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge memory random + ]; + description = "Cryptography Primitives sink"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cryptonite-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, cryptonite, exceptions, memory, resourcet, tasty @@ -71619,8 +71720,8 @@ self: { ({ mkDerivation, base, df1, di-core, di-df1, di-handle, polysemy }: mkDerivation { pname = "di-polysemy"; - version = "0.1.3.1"; - sha256 = "0gxcpn3x2rwykimzhv473f9sjphja7bzsjxn2r9i9yjl89mjb7y8"; + version = "0.1.4.0"; + sha256 = "0p9wyli73skjbdbb0dgqb3p37rbijpadywsi0dwjdwdzpddjarcm"; libraryHaskellDepends = [ base df1 di-core di-df1 di-handle polysemy ]; @@ -81056,8 +81157,8 @@ self: { ({ mkDerivation, base, containers, deepseq }: mkDerivation { pname = "enummaps"; - version = "0.6.2.1.3"; - sha256 = "0ki60a2lg1hdbcrd10ldfja0ayrwlxg2hvbip9llqaj0lkw01r6r"; + version = "0.6.2.1.4"; + sha256 = "18a0akkj22x89m4a29rl1ic07ds1qgjixvdmjbqh3lb3bphk0f5l"; libraryHaskellDepends = [ base containers deepseq ]; description = "Enum wrappers for IntMap and IntSet"; license = stdenv.lib.licenses.bsd3; @@ -82083,6 +82184,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "esqueleto_3_3_3_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring + , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql + , mysql-simple, persistent, persistent-mysql, persistent-postgresql + , persistent-sqlite, persistent-template, postgresql-libpq + , postgresql-simple, resourcet, tagged, text, time, transformers + , unliftio, unordered-containers, vector + }: + mkDerivation { + pname = "esqueleto"; + version = "3.3.3.1"; + sha256 = "0f1samnc59zahlsk2k174yi0c1wbjzhnkbyxwp27b443v62g87v6"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + monad-logger persistent resourcet tagged text time transformers + unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + exceptions hspec monad-logger mtl mysql mysql-simple persistent + persistent-mysql persistent-postgresql persistent-sqlite + persistent-template postgresql-libpq postgresql-simple resourcet + tagged text time transformers unliftio unordered-containers vector + ]; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ess" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -89871,6 +90001,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fold-debounce-conduit_0_2_0_5" = callPackage + ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet + , stm, transformers, transformers-base + }: + mkDerivation { + pname = "fold-debounce-conduit"; + version = "0.2.0.5"; + sha256 = "1qvr3wqqv2lvs22ddmalavggp8a4a50d056a50dsz6lcml1k6hdg"; + libraryHaskellDepends = [ + base conduit fold-debounce resourcet stm transformers + transformers-base + ]; + testHaskellDepends = [ + base conduit hspec resourcet stm transformers + ]; + description = "Regulate input traffic from conduit Source with Control.FoldDebounce"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foldable1" = callPackage ({ mkDerivation, base, transformers, util }: mkDerivation { @@ -94906,15 +95056,17 @@ self: { }) {}; "generic-data-surgery" = callPackage - ({ mkDerivation, base, first-class-families, generic-data, tasty - , tasty-hunit + ({ mkDerivation, base, first-class-families, generic-data + , show-combinators, tasty, tasty-hunit }: mkDerivation { pname = "generic-data-surgery"; - version = "0.2.1.0"; - sha256 = "0mjx8yi4f1wvf5w2wp5vzzrh3z5n6900qsp2lbhd2xzzq4zlvzy7"; + version = "0.3.0.0"; + sha256 = "1dg9mg10g0abs21wksplnaqgig42jb6zvk7xqwj2mkl5yln3h9is"; libraryHaskellDepends = [ base first-class-families generic-data ]; - testHaskellDepends = [ base generic-data tasty tasty-hunit ]; + testHaskellDepends = [ + base generic-data show-combinators tasty tasty-hunit + ]; description = "Surgery for generic data types"; license = stdenv.lib.licenses.mit; }) {}; @@ -99502,8 +99654,8 @@ self: { }: mkDerivation { pname = "gio"; - version = "0.13.8.0"; - sha256 = "1wx35fm7jba69x33mhp0h6j0lszi62hmmb1inflx7gax0ncmk2n2"; + version = "0.13.8.1"; + sha256 = "00dq87p6nqk4x2n98a6b35l7a4crkmhr36zjk0xsfdsr3lf7zmr6"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -101189,8 +101341,8 @@ self: { }: mkDerivation { pname = "glib"; - version = "0.13.8.0"; - sha256 = "18k1drykl3mpmyj43kp9nvkzr9g3allr19ihscmxwc1w9ss6zklw"; + version = "0.13.8.1"; + sha256 = "170sbi1gg38sxl4yhd4z716fljlcbf21vgl58p0pcx2adnn2il6w"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring containers text utf8-string @@ -104471,6 +104623,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "goldplate" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring, Diff + , directory, filepath, Glob, optparse-applicative, process + , regex-pcre-builtin, text, time, unordered-containers + }: + mkDerivation { + pname = "goldplate"; + version = "0.1.0"; + sha256 = "0ccy1xcch224b09ka75j11zw6c0lm1rygc3910s7zlq8illlj34s"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty async base bytestring Diff directory filepath + Glob optparse-applicative process regex-pcre-builtin text time + unordered-containers + ]; + description = "A lightweight golden test runner"; + license = stdenv.lib.licenses.asl20; + }) {}; + "gooey" = callPackage ({ mkDerivation, base, renderable, transformers, varying }: mkDerivation { @@ -106382,6 +106554,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "greskell_1_1_0_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover + , exceptions, greskell-core, hashable, hint, hspec, semigroups + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "greskell"; + version = "1.1.0.3"; + sha256 = "1q3m4m994vmfk80szphfd74vzfq6zp678bdla6v4siwqjskagyn3"; + libraryHaskellDepends = [ + aeson base exceptions greskell-core hashable semigroups text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover greskell-core hint + hspec text unordered-containers + ]; + description = "Haskell binding for Gremlin graph query language"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "greskell-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , doctest-discover, hashable, hspec, QuickCheck, scientific @@ -106403,6 +106597,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "greskell-core_0_1_3_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , doctest-discover, hashable, hspec, QuickCheck, scientific + , semigroups, text, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "greskell-core"; + version = "0.1.3.5"; + sha256 = "08jpgnsnmh9zbm1pw768ik28vhl3m4jz75l8cbxb3whfgwk5vyy4"; + libraryHaskellDepends = [ + aeson base containers hashable scientific semigroups text + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover hspec QuickCheck + text unordered-containers vector + ]; + description = "Haskell binding for Gremlin graph query language - core data types and tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "greskell-websocket" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , greskell-core, hashtables, hspec, safe-exceptions, stm, text @@ -106425,6 +106641,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "greskell-websocket_0_1_2_4" = callPackage + ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring + , greskell-core, hashtables, hspec, safe-exceptions, stm, text + , unordered-containers, uuid, vector, websockets + }: + mkDerivation { + pname = "greskell-websocket"; + version = "0.1.2.4"; + sha256 = "1w5867pdb07jlms3gddx8n3ds94qp4yq1yxcy880vcww2gyb4jda"; + libraryHaskellDepends = [ + aeson async base base64-bytestring bytestring greskell-core + hashtables safe-exceptions stm text unordered-containers uuid + vector websockets + ]; + testHaskellDepends = [ + aeson base bytestring greskell-core hspec unordered-containers uuid + vector + ]; + description = "Haskell client for Gremlin Server using WebSocket serializer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "grid" = callPackage ({ mkDerivation, base, containers, QuickCheck, test-framework , test-framework-quickcheck2 @@ -107275,8 +107514,8 @@ self: { }: mkDerivation { pname = "gtk"; - version = "0.15.4"; - sha256 = "1wm42m4963abqiswkc3ngwf9jm4z9kyyx2h8w064f62ngnkdz84z"; + version = "0.15.5"; + sha256 = "096xawq85shmdhsqwpcmidjc4asqgqxsxv0f0xff78169jrdh6a2"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -107613,8 +107852,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.15.4"; - sha256 = "17g93j8az1gqgf9kxg1k1lls6c0if45bzgbhrc99qgm8s9f2dr1c"; + version = "0.15.5"; + sha256 = "1y5wmxxpvhfw1ypli3f48k5bg3hfbx081d9xr5ks8sj3g7f7cf60"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -124229,8 +124468,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.18"; - sha256 = "0rz2pbzsl8y9vwp09njiw8qazdbpxvhkaayiyxzwjbk5zw0vnvw6"; + version = "1.18.1"; + sha256 = "1yl6akcbmz5qy559m0k0cndwb6wdzvq2jqn7ahc46v3ai6hwk20c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124426,8 +124665,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.18"; - sha256 = "021zk938001s02zg3aq6b0frj69a62zpkbh6x42c1qycdpkagiq7"; + version = "1.18.1"; + sha256 = "16fd3412n4vdnjacngjx5078yzmypn389m91308kgbd8anv6bhj4"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -124503,8 +124742,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.18"; - sha256 = "10qrikwx4riixylz5qiml7mdrbx2gnfgmwggax1l910l58g8czci"; + version = "1.18.1"; + sha256 = "0ggfz93f14znnjzkznzblsdk6iqbwwj2yxzx5rgsr0xcjzm8gx64"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -124551,8 +124790,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.18"; - sha256 = "07gcb1kxlkjb37x645xravad1jzcsdcyz403zgdcnxdar21x9iw9"; + version = "1.18.1"; + sha256 = "1s10xyiqs77xl949m7rc71a4511i755yiv88jb0pc32xba7a2b1y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132126,6 +132365,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hspec-need-env_0_1_0_5" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-expectations + , setenv, transformers + }: + mkDerivation { + pname = "hspec-need-env"; + version = "0.1.0.5"; + sha256 = "0bgjhzc4m24sbmfyczq1r61gbgm5i1lsgyql88ki4flllscg4hsh"; + libraryHaskellDepends = [ base hspec-core hspec-expectations ]; + testHaskellDepends = [ base hspec hspec-core setenv transformers ]; + description = "Read environment variables for hspec tests"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-parsec" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, parsec }: mkDerivation { @@ -141971,8 +142225,8 @@ self: { }: mkDerivation { pname = "interact"; - version = "0.1.0.0"; - sha256 = "100qvyh4148g1hc6lw1pf7bzr16aas3jqc3xm8gbj7mmm1i1ycnp"; + version = "0.2.0.0"; + sha256 = "0fnzhcdyd95z5jll88y8zi9dgr2z55w0ddiv4kfyjxy6jampdypj"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base bytestring hspec main-tester mtl silently @@ -176060,8 +176314,8 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.4.3.3"; - sha256 = "12yaxvf1qagby5zjyf620qsxxf4a7y0jljvqdr92i49p2jkm8xrm"; + version = "0.4.3.4"; + sha256 = "1whn8hkwbqx76vn1550j9fjkjhj7fxp295dcsv5jl25cvxpj5rml"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger regex-applicative @@ -176084,8 +176338,8 @@ self: { }: mkDerivation { pname = "net-spider-cli"; - version = "0.2.0.3"; - sha256 = "1zs579xrp52q9573ckcr69yf6n2cjh17g2p1xpw1gncaa0rljng4"; + version = "0.2.0.4"; + sha256 = "0g9p1l3pyd8c43fj1h4c29n44257n4awlsqb4g821a62s4mjypwf"; libraryHaskellDepends = [ aeson base greskell-core hashable net-spider optparse-applicative text @@ -176126,8 +176380,8 @@ self: { }: mkDerivation { pname = "net-spider-rpl"; - version = "0.4.1.2"; - sha256 = "0ks170nwybnkqp64dgkl5zswrh66f9cw3w74i0vp6ypl8cggkwq5"; + version = "0.4.1.3"; + sha256 = "0sflq9sg4xnfgfbx2iikvkzrs44kb11s6v23h3q3zwy1kdxakhr8"; libraryHaskellDepends = [ aeson base conduit conduit-parse greskell hashable ip monad-logger mtl net-spider regex-applicative safe-exceptions text time @@ -176150,8 +176404,8 @@ self: { }: mkDerivation { pname = "net-spider-rpl-cli"; - version = "0.1.3.1"; - sha256 = "0y1bagnlazd7pj240ka1lf970qclf569qbsdxas27pj1pi91jb0r"; + version = "0.1.3.2"; + sha256 = "1nqhrfbii58rhh19nxhr9zaqm3pd0yvlshwdwl50xrw7hr0jjxfc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185871,8 +186125,8 @@ self: { }: mkDerivation { pname = "pango"; - version = "0.13.8.0"; - sha256 = "1skyfj0phd5hzpk86lj7qx0g6n09b1cfijlf759p7v34f47g6w2s"; + version = "0.13.8.1"; + sha256 = "0by8ada93srgapdg78n8hyk5xsqb7n54mjacvplwwsbrd1b7m9j0"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -189731,8 +189985,8 @@ self: { }: mkDerivation { pname = "persist-state"; - version = "0.1.1.6"; - sha256 = "0qj7g3df1hf07k65wwvwv0amsv0wnggcca4qm0gsa4qgq9ww8qii"; + version = "0.2.0.0"; + sha256 = "1jmrba3nmd9qvvgmm1zz0qrhikzjdcg6rc38f4q3gq6yw4rap4kj"; libraryHaskellDepends = [ base bytestring containers ghc-prim text ]; @@ -189740,7 +189994,7 @@ self: { base bytestring QuickCheck test-framework test-framework-quickcheck2 text ]; - description = "Minimal serialization library with focus on performance"; + description = "Serialization library with state and leb128 encoding"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -194772,18 +195026,20 @@ self: { "polysemy-webserver" = callPackage ({ mkDerivation, base, bytestring, hspec, http-conduit, http-types - , polysemy, polysemy-plugin, wai, warp + , polysemy, polysemy-plugin, text, wai, wai-websockets, warp + , websockets }: mkDerivation { pname = "polysemy-webserver"; - version = "0.1.0.0"; - sha256 = "1rlmx5l3n87gy3dwf3fl6jpckn2gn70v7avdw52jaqjdlip0f6bb"; + version = "0.2.0.0"; + sha256 = "0ld1ncal2isibzjbq72jk3dp8rgvz32zyvisjdd79wxwxg1z1nad"; libraryHaskellDepends = [ - base bytestring http-types polysemy polysemy-plugin wai warp + base bytestring http-types polysemy polysemy-plugin wai + wai-websockets warp websockets ]; testHaskellDepends = [ base bytestring hspec http-conduit http-types polysemy - polysemy-plugin wai warp + polysemy-plugin text wai wai-websockets warp websockets ]; description = "Start web servers from within a Polysemy effect stack"; license = stdenv.lib.licenses.bsd3; @@ -234184,6 +234440,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stan" = callPackage + ({ mkDerivation, array, base, base64, blaze-html, bytestring, clay + , colourista, containers, cryptohash-sha1, dir-traverse, directory + , extensions, filepath, ghc, ghc-boot-th, gitrev, hedgehog, hspec + , hspec-hedgehog, optparse-applicative, pretty-simple, relude + , slist, text, tomland, trial, trial-optparse-applicative + , trial-tomland, unordered-containers + }: + mkDerivation { + pname = "stan"; + version = "0.0.0.0"; + sha256 = "0x4avzclyx41kncwzaky70ky3mz4pcfcgzg17jnza8gpm7bfacxg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base base64 blaze-html bytestring clay colourista containers + cryptohash-sha1 dir-traverse directory extensions filepath ghc + ghc-boot-th gitrev optparse-applicative pretty-simple relude slist + text tomland trial trial-optparse-applicative trial-tomland + unordered-containers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers filepath ghc hedgehog hspec hspec-hedgehog + optparse-applicative relude text tomland trial unordered-containers + ]; + doHaddock = false; + description = "Haskell STatic ANalyser"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "standalone-derive-topdown" = callPackage ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { @@ -234855,8 +235142,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.2.3.6"; - sha256 = "0887cn2bcs9py30yla07camjhzgsmi1dh83grh9iv2hb360sc92k"; + version = "0.2.3.7"; + sha256 = "0mrkm7gr6s27dngws7p3mcfyp9pdvyr25mg9nd3ygklaql74jmng"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -252168,6 +252455,44 @@ self: { broken = true; }) {}; + "trial" = callPackage + ({ mkDerivation, base, colourista, dlist, doctest, hedgehog, hspec + , hspec-hedgehog, splitmix + }: + mkDerivation { + pname = "trial"; + version = "0.0.0.0"; + sha256 = "0lnq80983bg2cjim3fy8rwisn55f6acqwp67w7791kzfdwshxkww"; + libraryHaskellDepends = [ base colourista dlist ]; + testHaskellDepends = [ + base dlist doctest hedgehog hspec hspec-hedgehog splitmix + ]; + description = "Trial Data Structure"; + license = stdenv.lib.licenses.mpl20; + }) {}; + + "trial-optparse-applicative" = callPackage + ({ mkDerivation, base, optparse-applicative, trial }: + mkDerivation { + pname = "trial-optparse-applicative"; + version = "0.0.0.0"; + sha256 = "1h8pfznf1dp9z3r2kl2ljgmxxkfp3va9yqba00fyvw85lna2aggn"; + libraryHaskellDepends = [ base optparse-applicative trial ]; + description = "Trial helper functions for optparse-applicative"; + license = stdenv.lib.licenses.mpl20; + }) {}; + + "trial-tomland" = callPackage + ({ mkDerivation, base, text, tomland, trial }: + mkDerivation { + pname = "trial-tomland"; + version = "0.0.0.0"; + sha256 = "12klfq5ajn4bjrws633pfdc2zhpkwvwmrm7269xfh252fjwk1x23"; + libraryHaskellDepends = [ base text tomland trial ]; + description = "Trial helper functions for tomland"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "triangulation" = callPackage ({ mkDerivation, array, base, collada-types, haskell98, tuple , vector, vector-algorithms @@ -266230,6 +266555,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wild-bind_0_1_2_6" = callPackage + ({ mkDerivation, base, containers, hspec, microlens, QuickCheck + , semigroups, stm, text, transformers + }: + mkDerivation { + pname = "wild-bind"; + version = "0.1.2.6"; + sha256 = "1sfwz7qwlfhvdkw8f0xmywi7m3b3yd7p5hlrjndlqs8h2k8c7809"; + libraryHaskellDepends = [ + base containers semigroups text transformers + ]; + testHaskellDepends = [ + base hspec microlens QuickCheck stm transformers + ]; + description = "Dynamic key binding framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wild-bind-indicator" = callPackage ({ mkDerivation, base, containers, gtk, text, transformers , wild-bind @@ -266285,6 +266629,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wild-bind-x11_0_2_0_10" = callPackage + ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl + , semigroups, stm, text, time, transformers, wild-bind, X11 + }: + mkDerivation { + pname = "wild-bind-x11"; + version = "0.2.0.10"; + sha256 = "0wq6jhaq2mh476mwjqc6ianqvvrywlvrkcwh7acdxznz2djkgjm5"; + libraryHaskellDepends = [ + base containers fold-debounce mtl semigroups stm text transformers + wild-bind X11 + ]; + testHaskellDepends = [ + async base hspec text time transformers wild-bind X11 + ]; + description = "X11-specific implementation for WildBind"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wilton-ffi" = callPackage ({ mkDerivation, aeson, base, bytestring, utf8-string }: mkDerivation { From 06e55617a4ba3e93123130d55ddef87ff2301813 Mon Sep 17 00:00:00 2001 From: Kim Burgess Date: Mon, 22 Jun 2020 11:26:42 +1000 Subject: [PATCH 2333/3452] 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 fa8f2bf34f3f065571670c59217f877a73868f8f Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Mon, 22 Jun 2020 15:11:04 +1200 Subject: [PATCH 2334/3452] stream_layered_image: Use pathlib module for directory traversal --- .../docker/stream_layered_image.py | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index a9de10f9efaa..4348513338d7 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -37,8 +37,8 @@ import re import sys import json import hashlib +import pathlib import tarfile -import itertools import threading from datetime import datetime from collections import namedtuple @@ -90,21 +90,20 @@ def archive_paths_to(obj, paths, mtime, add_nix, filter=None): ti = tar.gettarinfo(os.path.join("/", path)) tar.addfile(apply_filters(append_root(ti))) - for root, dirs, files in os.walk(path, topdown=True): - for name in itertools.chain(dirs, files): - name = os.path.join(root, name) - ti = append_root(tar.gettarinfo(name)) + for filename in pathlib.Path(path).rglob("*"): + ti = append_root(tar.gettarinfo(filename)) - # copy hardlinks as regular files - if ti.islnk(): - ti.type = tarfile.REGTYPE + # copy hardlinks as regular files + if ti.islnk(): + ti.type = tarfile.REGTYPE + ti.linkname = "" - ti = apply_filters(ti) - if ti.isfile(): - with open(name, "rb") as f: - tar.addfile(ti, f) - else: - tar.addfile(ti) + ti = apply_filters(ti) + if ti.isfile(): + with open(filename, "rb") as f: + tar.addfile(ti, f) + else: + tar.addfile(ti) class ExtractChecksum: From c9e6a02c822936b2d9156151031f40d6c2e5435d Mon Sep 17 00:00:00 2001 From: Steve Purcell Date: Mon, 22 Jun 2020 15:11:46 +1200 Subject: [PATCH 2335/3452] Add docs for dockerTools.streamLayeredImage --- doc/builders/images/dockertools.xml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/doc/builders/images/dockertools.xml b/doc/builders/images/dockertools.xml index e7f37fdaaf00..126698d0a9ed 100644 --- a/doc/builders/images/dockertools.xml +++ b/doc/builders/images/dockertools.xml @@ -166,7 +166,7 @@ hello latest de2bf4786de6 About a minute ago 25.2MB buildLayeredImage - Create a Docker image with many of the store paths being on their own layer to improve sharing between images. + Create a Docker image with many of the store paths being on their own layer to improve sharing between images. The image is realized into the Nix store as a gzipped tarball. Depending on the intended usage, many users might prefer to use streamLayeredImage instead, which this function uses internally. @@ -327,6 +327,27 @@ pkgs.dockerTools.buildLayeredImage { +
+ streamLayeredImage + + + Builds a script which, when run, will stream an uncompressed tarball of a Docker image to stdout. The arguments to this function are as for buildLayeredImage. This method of constructing an image does not realize the image into the Nix store, so it saves on IO and disk/cache space, particularly with large images. + + + + The image produced by running the output script can be piped directly into docker load, to load it into the local docker daemon: + + + + Alternatively, the image be piped via gzip into skopeo, e.g. to copy it into a registry: + + +
+
pullImage From 0458e8862ea4f21e3a8d1ffd313f9513d522ff00 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Jun 2020 09:11:55 -0700 Subject: [PATCH 2336/3452] 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 2337/3452] 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 2338/3452] 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 2339/3452] 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 2340/3452] 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 2341/3452] 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 2342/3452] 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 2343/3452] 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 2344/3452] 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 2345/3452] 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 2346/3452] 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 2347/3452] 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 2348/3452] 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 2349/3452] 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 2350/3452] 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 2351/3452] 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 186d01eff3e9816f1b50d22c962c896329d16919 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 21 Jun 2020 18:43:13 +0300 Subject: [PATCH 2352/3452] haskellPackages.gi-gtk-declarative: fix build by disabling tests gi-gtk-declarative requires an X11 display in its test suite. X11 display is not available inside nix build sandbox, which makes tests fail. Solution: disable tests for gi-gtk-declarative. --- .../haskell-modules/configuration-hackage2nix.yaml | 2 -- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ pkgs/development/haskell-modules/hackage-packages.nix | 4 ---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f64489361fb2..9c9e83b50e07 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5270,8 +5270,6 @@ broken-packages: - gi-gsk - gi-gstpbutils - gi-gsttag - - gi-gtk-declarative - - gi-gtk-declarative-app-simple - gi-gtkosxapplication - gi-handy - gi-poppler diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9f1bdb147934..8d5a18c22a29 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -442,6 +442,9 @@ self: super: builtins.intersectAttrs super { [ pkgs.darwin.apple_sdk.frameworks.OpenCL ]; }); + # requires an X11 display in test suite + gi-gtk-declarative = dontCheck super.gi-gtk-declarative; + # depends on 'hie' executable lsp-test = dontCheck super.lsp-test; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 97c569d32c75..8118ee21e137 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -99083,8 +99083,6 @@ self: { ]; description = "Declarative GTK+ programming in Haskell"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gi-gtk-declarative-app-simple" = callPackage @@ -99103,8 +99101,6 @@ self: { ]; description = "Declarative GTK+ programming in Haskell in the style of Pux"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gi-gtk-hs" = callPackage From 7bf20d7c17fe08f5c8ceb914b27b9be08da4454e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 22 Jun 2020 09:29:55 +0200 Subject: [PATCH 2353/3452] 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 2354/3452] 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 4c0a6e855c674183b59e1725698c97961e4c792e Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 22 Jun 2020 11:53:50 +0300 Subject: [PATCH 2355/3452] 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 2356/3452] 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 2357/3452] 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 2358/3452] 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 2359/3452] 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 2360/3452] 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 b10b50d4336f68877222a75a1a786a3e1b8692af Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 22 Jun 2020 11:21:19 +0100 Subject: [PATCH 2361/3452] pythonPackages.qscintilla-qt5: Do not copy pyqt5 tree This commit ensures the entire PyQt5 tree is not included inside qscintilla as pointed out by https://github.com/NixOS/nixpkgs/issues/73975#issuecomment-639178216 --- .../python-modules/qscintilla-qt5/default.nix | 12 ++++++------ pkgs/top-level/python-packages.nix | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index 4d63cb5f4548..2ee9c82f08db 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -1,7 +1,6 @@ { lib , pythonPackages , qscintilla -, lndir , qtbase }: with pythonPackages; @@ -11,8 +10,9 @@ buildPythonPackage { src = qscintilla.src; format = "other"; - nativeBuildInputs = [ lndir sip qtbase ]; - buildInputs = [ qscintilla pyqt5 ]; + nativeBuildInputs = [ sip qtbase ]; + buildInputs = [ qscintilla ]; + propagatedBuildInputs = [ pyqt5 ]; postPatch = '' substituteInPlace Python/configure.py \ @@ -22,9 +22,9 @@ buildPythonPackage { ''; preConfigure = '' - mkdir -p $out - lndir ${pyqt5} $out - rm -rf "$out/nix-support" + # configure.py will look for this folder + mkdir -p $out/share/sip/PyQt5 + cd Python substituteInPlace configure.py \ --replace "qmake = {'CONFIG': 'qscintilla2'}" "qmake = {'CONFIG': 'qscintilla2', 'QT': 'widgets printsupport'}" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d4a3ad052bf..1268c43a525a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5637,7 +5637,6 @@ in { qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; - lndir = pkgs.xorg.lndir; }; qscintilla = self.qscintilla-qt4; From dbda6555c1ec1fe32adb3fe6d925d57103170acb Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 5 Jun 2020 14:18:40 +0200 Subject: [PATCH 2362/3452] 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 2363/3452] 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 2364/3452] 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 2365/3452] 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 2366/3452] 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 2367/3452] 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 2368/3452] 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 7130ea45ceac03406689ffc9ccd7ee5db3fd9d14 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Mon, 22 Jun 2020 12:00:00 +0000 Subject: [PATCH 2369/3452] network-manager-applet: 1.16.0 -> 1.18.0 --- pkgs/tools/networking/network-manager/applet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/applet/default.nix b/pkgs/tools/networking/network-manager/applet/default.nix index 109c4c8cce15..9f92fcfa1ab3 100644 --- a/pkgs/tools/networking/network-manager/applet/default.nix +++ b/pkgs/tools/networking/network-manager/applet/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.16.0"; + version = "1.18.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1rf3nm0hjcy9f8ajb4vmvwy503w8yj8d4daxkcb7w7i7b92qmyfn"; + sha256 = "12xiy8g8qk18jvxvn78mvq03zvzp06bww49na765jjw0rq541fyx"; }; mesonFlags = [ From 7bbca84761b0ff53f0cc01b4b8f6e357b627012c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 22 Jun 2020 08:13:13 -0400 Subject: [PATCH 2370/3452] 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 2371/3452] 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 2372/3452] 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 2373/3452] 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 2374/3452] 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 2375/3452] 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 2376/3452] 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 2377/3452] 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 2378/3452] 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 2379/3452] 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 2380/3452] =?UTF-8?q?ocamlPackages.async=5Funix:=200.13.0?= =?UTF-8?q?=20=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 2381/3452] 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 2382/3452] 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 bc8b615344c6ca7746a527058ffc1f0726aff897 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 21 Jun 2020 21:23:47 +0200 Subject: [PATCH 2383/3452] hackagePackages.hnix: Fix build hnix 0.9.0 does not provide an executable for ghc <8.10 anymore. So we need to disable optparse-applicative completion generation for all other versions. --- .../haskell-modules/configuration-common.nix | 10 ++++++---- .../haskell-modules/configuration-ghc-8.10.x.nix | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c4056f42d5b5..fcb692d77d32 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -219,10 +219,12 @@ self: super: { # base bound digit = doJailbreak super.digit; - # 2020-06-05: HACK: does not passes own build suite - `dontCheck` - hnix = generateOptparseApplicativeCompletion "hnix" ( - dontCheck super.hnix - ); + # 2020-06-05: HACK: does not passes own build suite - `dontCheck` We should + # generate optparse-applicative completions for the hnix executable. Sadly + # building of the executable has been disabled for ghc < 8.10 in hnix. + # Generating the completions should be activated again, once we default to + # ghc 8.10. + hnix = dontCheck super.hnix; # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 7348dd9f22e9..cdc366335638 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -132,4 +132,7 @@ self: super: { excludes = ["package.yaml"]; }); + # hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now. + hnix = generateOptparseApplicativeCompletion "hnix" super.hnix; + } From 417c171c3ad1da92465b47f1c586c684ec147701 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 22 Jun 2020 21:40:20 +0200 Subject: [PATCH 2384/3452] haskellPackages.jsaddle-warp: Fix build --- .../haskell-modules/configuration-common.nix | 10 ++++++++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c4056f42d5b5..9fe7c55f1a03 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1564,4 +1564,14 @@ self: super: { sha256 = "0v6kv1d4syjzgzc2s7a76c6k4vminlcq62n7jg3nn9xd00gwmmv7"; }); + # Picking fixed version constraint from upstream + # Issue: https://github.com/ghcjs/jsaddle/issues/115 + # Tests disabled because they assume to run in the whole jsaddle repo and not the hackage tarbal of jsaddle-warp. + jsaddle-warp = dontCheck (appendPatch super.jsaddle-warp (pkgs.fetchpatch { + url = "https://github.com/ghcjs/jsaddle/commit/86b166033186c1724d4d52eeaf0935f0f29fe1ca.patch"; + sha256 = "0j4g3hcqrandlnzr9n9mixygg86accdyk2nyj9hh9g4p7mrcyb7j"; + stripLen = 2; + extraPrefix = ""; + })); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f64489361fb2..614325882946 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6866,7 +6866,6 @@ broken-packages: - jpeg - js-good-parts - jsaddle-hello - - jsaddle-warp - jsaddle-wkwebview - JsContracts - jsmw diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d53834a5913a..45e4c266df64 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -145939,8 +145939,6 @@ self: { ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "jsaddle-webkit2gtk" = callPackage From ccc6486b368e6187e94d723744a72999e47fc5d7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Jun 2020 00:37:08 +0200 Subject: [PATCH 2385/3452] =?UTF-8?q?ocamlPackages.tls:=200.12.1=20?= =?UTF-8?q?=E2=86=92=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 2386/3452] 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 2387/3452] 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 71801d291fb87ed015ec6d2fea7a93e194d21874 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 22 Jun 2020 22:38:51 +0200 Subject: [PATCH 2388/3452] haskellPackages: Fix gtk2hs packages glib and friends have been bumped to 0.13.8.1 so we can drop a patch picked from that version. --- .../haskell-modules/configuration-common.nix | 55 +------------------ 1 file changed, 3 insertions(+), 52 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1976d3307c5f..bc5b3ae08e94 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1297,59 +1297,10 @@ self: super: { ''; }); - # Several gtk2hs-provided packages at v0.13.8.0 fail to build on Darwin - # until we pick up https://github.com/gtk2hs/gtk2hs/pull/293 so apply that - # patch here. That single patch is for the gtk2hs super-repo, out of which - # we extract the patch for each indvidiual project (glib/gio/pango/gtk/gtk3). - glib = appendPatch super.glib (pkgs.fetchpatch { - url = "https://github.com/gtk2hs/gtk2hs/commit/1cf2f9bff2427d39986e32880d1383cfff49ab0e.patch"; - includes = [ "glib.cabal" ]; - stripLen = 1; - sha256 = "1zdss1xgsbijs3kx8dp5a81qryrfc1zm1xrd20whna3dqakf8b7g"; - }); - gio = appendPatch super.gio (pkgs.fetchpatch { - url = "https://github.com/gtk2hs/gtk2hs/commit/1cf2f9bff2427d39986e32880d1383cfff49ab0e.patch"; - includes = [ "gio.cabal" ]; - stripLen = 1; - sha256 = "0d72k6gqvgax9jcqi3gz1gqnar7jg8p5065z3mw2fcwvdw46s2zv"; - }); - pango = appendPatch super.pango (pkgs.fetchpatch { - url = "https://github.com/gtk2hs/gtk2hs/commit/1cf2f9bff2427d39986e32880d1383cfff49ab0e.patch"; - includes = [ "pango.cabal" ]; - stripLen = 1; - sha256 = "0dc221wlmyhc24h6ybfhbkxmcx4i6bvkbr1zgqidbnj3yp6w0l5w"; - }); - # gtk/gtk3 have an additional complication: independent of the above - # 0.13.8.0-specific fix, they need to be told on Darwin to use the Quartz + # gtk/gtk3 needs to be told on Darwin to use the Quartz # rather than X11 backend (see eg https://github.com/gtk2hs/gtk2hs/issues/249). - gtk3 = - let - patchedGtk3 = appendPatch super.gtk3 (pkgs.fetchpatch { - url = "https://github.com/gtk2hs/gtk2hs/commit/1cf2f9bff2427d39986e32880d1383cfff49ab0e.patch"; - includes = [ "gtk3.cabal" ]; - stripLen = 1; - sha256 = "0zvj0dzfwf9bksfhi0m4v0h5aij236gd0qhyr1adpdcjrkd8zbkd"; - }); - in - # The appendConfigureFlags should remain even after we can drop patchedGtk3. - appendConfigureFlags patchedGtk3 (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk"); - gtk = - let - patchedGtk = appendPatch super.gtk (pkgs.fetchpatch { - url = "https://github.com/gtk2hs/gtk2hs/commit/1cf2f9bff2427d39986e32880d1383cfff49ab0e.patch"; - includes = [ "gtk.cabal-renamed" ]; - stripLen = 1; - sha256 = "0wb0scvmhg8b42hxpns9m6zak3r8b25a2z7wg6vl56n17nb635l7"; - # One final complication: the gtk cabal file in the source repo (as seen - # by the patch) is `gtk.cabal-renamed`, but this gets changed to the usual - # `gtk.cabal` before uploading to Hackage by a script. - postFetch = '' - substituteInPlace $out --replace "-renamed" "" - ''; - }); - in - # The appendConfigureFlags should remain even after we can drop patchedGtk. - appendConfigureFlags patchedGtk (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk"); + gtk3 = appendConfigureFlags super.gtk3 (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk"); + gtk = appendConfigureFlags super.gtk (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk"); # Chart-tests needs and compiles some modules from Chart itself Chart-tests = (addExtraLibrary super.Chart-tests self.QuickCheck).overrideAttrs (old: { 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 2389/3452] 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 2390/3452] 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 2391/3452] 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 2392/3452] 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 2393/3452] 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 2394/3452] 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 af9608d6d133ad9b6de712418db52603bbc8531c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Jun 2020 02:30:29 +0200 Subject: [PATCH 2395/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-5-g7c30584 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/c69592683fdd0265a0918fdda036319142f8f735. --- .../haskell-modules/hackage-packages.nix | 407 ++++++++++++++++-- 1 file changed, 373 insertions(+), 34 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8118ee21e137..07e1d88aae2e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3322,6 +3322,27 @@ self: { broken = true; }) {}; + "Color_0_2_0" = callPackage + ({ mkDerivation, base, colour, criterion, data-default-class + , deepseq, doctest, hspec, HUnit, JuicyPixels, massiv, massiv-test + , QuickCheck, random, vector + }: + mkDerivation { + pname = "Color"; + version = "0.2.0"; + sha256 = "1w7d1wjssldybbg46s4hc83f96n49v53wyq0sc1q8mkvqdl35vsh"; + libraryHaskellDepends = [ base data-default-class deepseq vector ]; + testHaskellDepends = [ + base colour doctest hspec HUnit JuicyPixels massiv massiv-test + QuickCheck random vector + ]; + benchmarkHaskellDepends = [ base colour criterion deepseq random ]; + description = "Color spaces and conversions between them"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "Combinatorrent" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, cereal , containers, deepseq, directory, filepath, hopenssl, hslogger @@ -20478,8 +20499,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.3.2"; - sha256 = "0f94lzb05v4myr1qrpklxhina0iiv7p7zfmjhf2fkd2q1bnffhdw"; + version = "0.3.3"; + sha256 = "0kjyyqwck2b4vv9z2121b3x1bnsc6zswp41idcpmqjxrwhs7whcz"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -32149,6 +32170,20 @@ self: { broken = true; }) {}; + "array-list" = callPackage + ({ mkDerivation, array, base, doctest, doctest-driver-gen, hspec }: + mkDerivation { + pname = "array-list"; + version = "0.1.0.0"; + sha256 = "1km2d0j1qc4cm7nnfhxa9x9m806f2mrz20y4vpwgxwqmvlwl70iy"; + libraryHaskellDepends = [ array base ]; + testHaskellDepends = [ + array base doctest doctest-driver-gen hspec + ]; + description = "IsList instances of Array for OverloadedLists extension"; + license = stdenv.lib.licenses.mit; + }) {}; + "array-memoize" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -34879,8 +34914,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "36"; - editedCabalFile = "12bwnqb8m1z3f84xml7wf8h0lvs5wb67fdhdp5bl1pf42yr94izz"; + revision = "37"; + editedCabalFile = "09z2wlr6g1lm4cdbbf0zjbl1j19xs31y126lcbzcs254f8mx5m13"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -41155,6 +41190,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bitcoin-address" = callPackage + ({ mkDerivation, base, base16-bytestring, base58-bytestring, bech32 + , binary, bitcoin-hash, bitcoin-keys, bitcoin-script, bytestring + , hedgehog, tasty, tasty-hedgehog, tasty-hunit, text + }: + mkDerivation { + pname = "bitcoin-address"; + version = "0.1"; + sha256 = "1pxxscq4giqgkk5dy55lmsypqssdddbwp25a7d3n04x3gd23j5ym"; + libraryHaskellDepends = [ + base base58-bytestring bech32 binary bitcoin-hash bitcoin-keys + bitcoin-script bytestring text + ]; + testHaskellDepends = [ + base base16-bytestring bitcoin-keys bitcoin-script bytestring + hedgehog tasty tasty-hedgehog tasty-hunit + ]; + description = "Bitcoin address generation and rendering. Parsing coming soon."; + license = stdenv.lib.licenses.asl20; + }) {}; + "bitcoin-api" = callPackage ({ mkDerivation, aeson, base, base58string, binary, bitcoin-block , bitcoin-script, bitcoin-tx, bitcoin-types, bytestring, hexstring @@ -48543,8 +48599,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.14.8"; - sha256 = "0w3cbghfrm51m4byixz2fwyi6fswrrbq54cjl7fg5r5nckaabmng"; + version = "0.1.15.0"; + sha256 = "0y7b36nrlwl8jvqw07f66hfr1mx54s76w7hj8yxr83pxb0592pis"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers data-default-class data-flags deepseq deque df1 di-polysemy @@ -70404,12 +70460,12 @@ self: { }) {}; "derive-lifted-instances" = callPackage - ({ mkDerivation, base, template-haskell }: + ({ mkDerivation, base, bifunctors, template-haskell }: mkDerivation { pname = "derive-lifted-instances"; - version = "0"; - sha256 = "0giq1w0k3w45blb51v7inbwffq47jhj6mw4ck59c91mxpc4y163i"; - libraryHaskellDepends = [ base template-haskell ]; + version = "0.1"; + sha256 = "0ybnhz7pxi5i0k8hg9ain1im25hlmz5ra062hpsxyn0imbx3a1vd"; + libraryHaskellDepends = [ base bifunctors template-haskell ]; description = "Derive class instances though various kinds of lifting"; license = stdenv.lib.licenses.asl20; }) {}; @@ -82184,7 +82240,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "esqueleto_3_3_3_1" = callPackage + "esqueleto_3_3_3_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql , mysql-simple, persistent, persistent-mysql, persistent-postgresql @@ -82194,8 +82250,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.3.3.1"; - sha256 = "0f1samnc59zahlsk2k174yi0c1wbjzhnkbyxwp27b443v62g87v6"; + version = "3.3.3.2"; + sha256 = "0488vrv85gzv190j4npyjll5v1fchqlxlg5346j4p90zb9vl2pzl"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -91484,6 +91540,8 @@ self: { pname = "free-functors"; version = "1.1.1"; sha256 = "0bk985q1663rsgmkr08x6zr5yqvf84g0w7450qzccivis4wc5hp2"; + revision = "1"; + editedCabalFile = "0wvqwfvvl82z6jr7zy8f38bbqvjiikric8k7krcrlqix4v7zd6zi"; libraryHaskellDepends = [ base bifunctors comonad contravariant derive-lifted-instances profunctors template-haskell transformers @@ -97845,6 +97903,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-typelits-presburger_0_3_0_1" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, mtl + , pretty, reflection, syb, transformers + }: + mkDerivation { + pname = "ghc-typelits-presburger"; + version = "0.3.0.1"; + sha256 = "0h403zi5lqbpygpqw5469fafz1cgh5mcx96sp0iw4scnmh7z3cj9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra mtl pretty reflection syb + transformers + ]; + description = "Presburger Arithmetic Solver for GHC Type-level natural numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-usage" = callPackage ({ mkDerivation, base, containers, ghc, ghc-paths, unix }: mkDerivation { @@ -131174,8 +131251,8 @@ self: { pname = "hsimport"; version = "0.11.0"; sha256 = "1z55gpwyb2gwjlll2c32g9r4aqpdybjpnjy785z60wpjdl48qwaa"; - revision = "2"; - editedCabalFile = "00blkkmxc7ldwa7jywrg32pq0nz7z8sidj56qdy5s8cpzx57gwg8"; + revision = "3"; + editedCabalFile = "017yfag3k4j9v9mj5fv7v8s2j7cla97isx8z4q6ks5wfvjvyfpjy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140436,8 +140513,8 @@ self: { }: mkDerivation { pname = "implicit-hie"; - version = "0.1.0.0"; - sha256 = "1mdavvr4pmkq82yb5qnp77szjraa06ybw7v3fkys83b045plzdr6"; + version = "0.1.1.0"; + sha256 = "048y1wbwcp1vs4shgfzvcmbgg8fnm0pw2i7a8488b5kshfzf9syb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145643,12 +145720,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "jira-wiki-markup_1_3_1" = callPackage + "jira-wiki-markup_1_3_2" = callPackage ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: mkDerivation { pname = "jira-wiki-markup"; - version = "1.3.1"; - sha256 = "1870yrg8npjn8g5aq61a73ffn2jij9zp281111j53pzlgk0nh20q"; + version = "1.3.2"; + sha256 = "16vcy9gn6qrzvr99l26az4yi2dy9xngcb1wmj86yl7bmk1hcq3wc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec text ]; @@ -163614,6 +163691,8 @@ self: { pname = "massiv-io"; version = "0.2.1.0"; sha256 = "0p7z4nk0fv9lql17s9d18hi5mrnvr4zry6rghqnhjmhlp97g4yi6"; + revision = "1"; + editedCabalFile = "0sqlkva81p748537vwbg0pzgvlx8xs7560rpd0fjcxafhj32m03x"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring Color data-default-class deepseq exceptions @@ -163629,6 +163708,30 @@ self: { broken = true; }) {}; + "massiv-io_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, Color, data-default-class + , deepseq, doctest, exceptions, filepath, hspec, JuicyPixels + , massiv, massiv-test, netpbm, QuickCheck, random, template-haskell + , unliftio, vector + }: + mkDerivation { + pname = "massiv-io"; + version = "0.3.0.0"; + sha256 = "1d0hvhb8im7j3khvx2s8k8gd9y0v83zgyfk8sdvh4icx4bc9nhj6"; + libraryHaskellDepends = [ + base bytestring Color data-default-class deepseq exceptions + filepath JuicyPixels massiv netpbm unliftio vector + ]; + testHaskellDepends = [ + base bytestring doctest hspec JuicyPixels massiv massiv-test + QuickCheck random template-haskell + ]; + description = "Import/export of Image files into massiv Arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "massiv-scheduler" = callPackage ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest , deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell @@ -164166,16 +164269,16 @@ self: { "matrix-sized" = callPackage ({ mkDerivation, base, bytestring, bytestring-lexing, conduit - , conduit-extra, data-ordlist, ieee754, primitive, singletons + , data-ordlist, double-conversion, ieee754, primitive, singletons , store, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "matrix-sized"; - version = "0.1.0"; - sha256 = "0qmbckk1bmmg8lszdnd8lcgplniqzd53iq1aqv9jky96zdmmrna6"; + version = "0.1.1"; + sha256 = "00s08dnyr45c04k4qxydf3sfpyigrg1g8i0671z40m23wpcmzlyd"; libraryHaskellDepends = [ - base bytestring bytestring-lexing conduit conduit-extra primitive - singletons store vector + base bytestring bytestring-lexing conduit double-conversion + primitive singletons store vector ]; testHaskellDepends = [ base conduit data-ordlist ieee754 singletons store tasty @@ -164629,6 +164732,33 @@ self: { broken = true; }) {}; + "mcmc" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , directory, hspec, hspec-discover, log-domain, microlens + , mwc-random, QuickCheck, statistics, text, time, transformers + , vector, zlib + }: + mkDerivation { + pname = "mcmc"; + version = "0.1.3"; + sha256 = "1rrbbnw6wi6k1p63n65a5rjr3fznzb48ksldb1w2xdbzmsa71nim"; + libraryHaskellDepends = [ + aeson base bytestring containers directory log-domain microlens + mwc-random statistics text time transformers vector zlib + ]; + testHaskellDepends = [ + base hspec hspec-discover log-domain mwc-random QuickCheck + statistics vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion log-domain microlens mwc-random statistics text + vector + ]; + description = "Sample from a posterior using Markov chain Monte Carlo"; + license = stdenv.lib.licenses.gpl3Plus; + }) {}; + "mcmc-samplers" = callPackage ({ mkDerivation, base, containers, hakaru, hmatrix, mwc-random , primitive, statistics @@ -171234,6 +171364,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "morpheus-graphql_0_13_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, megaparsec + , morpheus-graphql-core, mtl, scientific, tasty, tasty-hunit + , template-haskell, text, transformers, unliftio-core + , unordered-containers, uuid, vector, websockets + }: + mkDerivation { + pname = "morpheus-graphql"; + version = "0.13.0"; + sha256 = "0gcrgpdiazridddm9imjhsx05cnqxxb24dhg18d9n6c1qm1d4q30"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers megaparsec morpheus-graphql-core + mtl scientific template-haskell text transformers unliftio-core + unordered-containers uuid vector websockets + ]; + testHaskellDepends = [ + aeson base bytestring containers megaparsec morpheus-graphql-core + mtl scientific tasty tasty-hunit template-haskell text transformers + unliftio-core unordered-containers uuid vector websockets + ]; + description = "Morpheus GraphQL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "morpheus-graphql-cli" = callPackage ({ mkDerivation, base, bytestring, filepath, morpheus-graphql , optparse-applicative @@ -171262,8 +171418,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.12.0"; - sha256 = "15sqs0b86m55asj3rzpw52wcrnmlj6x99icx3b171q19i8wi8wh0"; + version = "0.13.0"; + sha256 = "0m1a379csfs3bqysl8ai2k7ybpb2gbm9w1rccgr41p9lk7w2w40k"; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-core mtl template-haskell text transformers unordered-containers @@ -171296,6 +171452,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "morpheus-graphql-core_0_13_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, hashable + , megaparsec, mtl, scientific, tasty, tasty-hunit, template-haskell + , text, th-lift-instances, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "morpheus-graphql-core"; + version = "0.13.0"; + sha256 = "0ix5n3c1db6qa6zdk74r890klc81wa1f4mdlqln6g039dbh423j7"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring hashable megaparsec mtl scientific + template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring directory hashable megaparsec mtl scientific + tasty tasty-hunit template-haskell text th-lift-instances + transformers unordered-containers vector + ]; + description = "Morpheus GraphQL Core"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "morphisms" = callPackage ({ mkDerivation }: mkDerivation { @@ -186033,6 +186215,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-types_1_21" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, transformers + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.21"; + sha256 = "1wbb0hhjiw0b66kj1ck3qipwgdac5v7qvjaqszsz5fll3cqp4sna"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq ghc-prim QuickCheck syb + text transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit QuickCheck string-qq syb + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Types for representing a structured document"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-unlit" = callPackage ({ mkDerivation, base, pandoc }: mkDerivation { @@ -186333,7 +186539,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pantry_0_5_0_0" = callPackage + "pantry_0_5_1_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers , cryptonite, cryptonite-conduit, digest, exceptions, filelock @@ -186347,8 +186553,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.5.0.0"; - sha256 = "1v5nnmrg62phnwym8cw6bjld8impdmrkq9cwxmyrab48gjwds41l"; + version = "0.5.1.0"; + sha256 = "1z6l4qqmlpk21j8vdl81km5iq5bl1qmasyprvmi0q31i59yk4p0f"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -197534,8 +197740,8 @@ self: { }: mkDerivation { pname = "predicate-typed"; - version = "0.6.0.1"; - sha256 = "1izg98ql496qn8dvn3blz2654bhy8901x7hfh0dxqqzrm1gi5bf4"; + version = "0.6.2.1"; + sha256 = "11gby9bjkh6bqznxxiz3ggdr0z13qihgh6pry014rap2iqzj71za"; libraryHaskellDepends = [ aeson base binary bytestring comonad containers deepseq directory ghc-prim hashable lens mtl pcre-heavy pcre-light pretty @@ -214090,6 +214296,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;}; + "rounded-hw" = callPackage + ({ mkDerivation, array, base, Cabal, deepseq, doctest, gauge, hspec + , integer-logarithms, long-double, primitive, QuickCheck, random + , tagged, vector + }: + mkDerivation { + pname = "rounded-hw"; + version = "0.1.0.0"; + sha256 = "0kmbp7x7avadsn09zfcjd54x5b6vvc527ybmmmnaklvfdzf8r88x"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + array base deepseq integer-logarithms long-double primitive tagged + vector + ]; + testHaskellDepends = [ + array base deepseq doctest hspec integer-logarithms long-double + primitive QuickCheck random vector + ]; + benchmarkHaskellDepends = [ + array base deepseq gauge integer-logarithms primitive vector + ]; + description = "Directed rounding for built-in floating types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rounding" = callPackage ({ mkDerivation, array, base, numeric-extras }: mkDerivation { @@ -226928,6 +227159,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singletons-presburger_0_3_0_1" = callPackage + ({ mkDerivation, base, ghc, ghc-typelits-presburger, reflection + , singletons + }: + mkDerivation { + pname = "singletons-presburger"; + version = "0.3.0.1"; + sha256 = "1j7azll9cjg5gcvpw8aq1hia1njg4bm8llwms1v941gwi7gk481m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base ghc ghc-typelits-presburger reflection singletons + ]; + description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singnal" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -227199,6 +227448,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sized_0_5_0_0" = callPackage + ({ mkDerivation, base, constraints, containers, deepseq + , equational-reasoning, ghc-typelits-presburger, hashable, lens + , ListLike, mono-traversable, singletons, type-natural, vector + }: + mkDerivation { + pname = "sized"; + version = "0.5.0.0"; + sha256 = "0g47mn1j4a0p7w01pjr2fxcass6lwl460a0rs4rq001kj38zxrcx"; + libraryHaskellDepends = [ + base constraints containers deepseq equational-reasoning + ghc-typelits-presburger hashable lens ListLike mono-traversable + singletons type-natural vector + ]; + description = "Sized sequence data-types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sized-grid" = callPackage ({ mkDerivation, adjunctions, aeson, ansi-terminal, base, comonad , constraints, distributive, generics-sop, HUnit, lens @@ -234382,6 +234650,30 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "stackcollapse-ghc_0_0_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, extra, foldl, hspec + , hspec-golden, recursion-schemes, rosezipper, safe, text + , transformers, utf8-string + }: + mkDerivation { + pname = "stackcollapse-ghc"; + version = "0.0.1.1"; + sha256 = "18glq0hkfr02iw8p842hmk4rv5d8sb565lyccklxdmfn708ick23"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers extra foldl recursion-schemes rosezipper + safe text transformers + ]; + testHaskellDepends = [ + base bytestring containers extra foldl hspec hspec-golden + recursion-schemes rosezipper safe text transformers utf8-string + ]; + description = "Program to fold GHC prof files into flamegraph input"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stacked-dag" = callPackage ({ mkDerivation, base, containers, doctest, graphviz , optparse-applicative, text @@ -254764,6 +255056,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-natural_0_9_0_0" = callPackage + ({ mkDerivation, base, constraints, equational-reasoning + , ghc-typelits-natnormalise, ghc-typelits-presburger, singletons + , singletons-presburger, template-haskell + }: + mkDerivation { + pname = "type-natural"; + version = "0.9.0.0"; + sha256 = "1jg8qqha60mxj7mrbi69jbcniayksyggi2s7fxy88ap4ay1hky3a"; + libraryHaskellDepends = [ + base constraints equational-reasoning ghc-typelits-natnormalise + ghc-typelits-presburger singletons singletons-presburger + template-haskell + ]; + description = "Type-level natural and proofs of their properties"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-of-html" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim @@ -262511,8 +262822,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.4"; - sha256 = "1wwbhz9p3psrfirmzygfjlpak17gyc8qhrqgf0qd7835phid7vxb"; + version = "3.5"; + sha256 = "1jly8hwfr11aczyrrx2yf64dlq2xgyp51jxrms2kz8izgbdh0h1h"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -274395,6 +274706,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-test_1_6_10" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , bytestring, case-insensitive, conduit, containers, cookie, hspec + , hspec-core, html-conduit, http-types, HUnit, memory, network + , pretty-show, semigroups, text, time, transformers, unliftio + , unliftio-core, wai, wai-extra, xml-conduit, xml-types, yesod-core + , yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.6.10"; + sha256 = "0vw6yg5b22a6flbl822z23k0l23as5mmxjcdnj2zgjjv5i713yfx"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html bytestring + case-insensitive conduit containers cookie hspec-core html-conduit + http-types HUnit memory network pretty-show semigroups text time + transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers cookie hspec html-conduit http-types + HUnit text unliftio unliftio-core wai wai-extra xml-conduit + yesod-core yesod-form + ]; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test From c61b5aa9682ca929cce776cbe1685a8ccce45dba Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 20:51:46 -0400 Subject: [PATCH 2396/3452] 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 2397/3452] (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 2398/3452] 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 2399/3452] 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 2400/3452] =?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 2401/3452] 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 9bcae11dacf4ee2ccb7503af90b64cee05f82d85 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 23 Jun 2020 07:06:38 +0000 Subject: [PATCH 2402/3452] python37Packages.fastapi: 0.54.1 -> 0.55.1 --- pkgs/development/python-modules/fastapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 3513f57cdbe5..32ebd6a0307d 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.54.1"; + version = "0.55.1"; format = "flit"; disabled = !isPy3k; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "0k0lss8x6lzf0szcli48v28r269fsx1jdkr9q78liz47dz5x03d8"; + sha256 = "1515nhwari48v0angyl5z3cfpvwn4al2nvqh0cjd9xgxzvm310s8"; }; postPatch = '' 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 2403/3452] 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 2404/3452] 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 fb6fb89c6fee68ec25b7de4b3378553d31e772de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 20 Jun 2020 13:18:53 +0200 Subject: [PATCH 2405/3452] radicale2: 2.1.11 -> 2.1.12 --- pkgs/servers/radicale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index fc98795bbc79..8d36717ec69b 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "Radicale"; - version = "2.1.11"; + version = "2.1.12"; # No tests in PyPI tarball src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = version; - sha256 = "1k32iy55lnyyp1r75clarhwdqvw6w8mxb5v0l5aysga07fg2mix4"; + sha256 = "14f9ql0fiwapaa4xaslwgk1ah9fzxxan2p1p2rxb4a5iqph1z0cl"; }; # We only want functional tests @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = "https://www.radicale.org/"; + homepage = "https://www.radicale.org/2.x.nix"; description = "CalDAV CardDAV server"; longDescription = '' The Radicale Project is a complete CalDAV (calendar) and CardDAV From 45bf7757c0a3f810ce23e8346028bdfd2bb11c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 20 Jun 2020 14:18:58 +0200 Subject: [PATCH 2406/3452] radicale3: init at 3.0.3 --- .../servers/radicale/{default.nix => 2.x.nix} | 0 pkgs/servers/radicale/3.x.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++- 3 files changed, 41 insertions(+), 2 deletions(-) rename pkgs/servers/radicale/{default.nix => 2.x.nix} (100%) create mode 100644 pkgs/servers/radicale/3.x.nix diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/2.x.nix similarity index 100% rename from pkgs/servers/radicale/default.nix rename to pkgs/servers/radicale/2.x.nix diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix new file mode 100644 index 000000000000..7b42bd3be34f --- /dev/null +++ b/pkgs/servers/radicale/3.x.nix @@ -0,0 +1,38 @@ +{ lib, python3, fetchFromGitHub }: + +python3.pkgs.buildPythonApplication rec { + pname = "radicale"; + version = "3.0.3"; + + # No tests in PyPI tarball + src = fetchFromGitHub { + owner = "Kozea"; + repo = "Radicale"; + rev = version; + sha256 = "170mqxlnfzx15img4wb71axq9cnxwllk5cabsv8i008q7wyjqp0n"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + defusedxml + passlib + vobject + python-dateutil + setuptools + ]; + + checkInputs = with python3.pkgs; [ + pytestrunner + pytest + pytestcov + pytest-flake8 + pytest-isort + waitress + ]; + + meta = with lib; { + homepage = "https://www.radicale.org/3.0.html"; + description = "CalDAV and CardDAV server"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d380d480e3a..0dce5ceb1397 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16302,9 +16302,10 @@ in }; radicale1 = callPackage ../servers/radicale/1.x.nix { }; - radicale2 = callPackage ../servers/radicale { }; + radicale2 = callPackage ../servers/radicale/2.x.nix { }; + radicale3 = callPackage ../servers/radicale/3.x.nix { }; - radicale = radicale2; + radicale = radicale3; rake = callPackage ../development/tools/build-managers/rake { }; From e4356601d3fd4fdca0c2aea679a32d19bcdad47a Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Thu, 18 Jun 2020 10:18:43 +0200 Subject: [PATCH 2407/3452] 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 d77fb3729dbad2a38e36d3b5726813866f43b545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 20 Jun 2020 14:30:33 +0200 Subject: [PATCH 2408/3452] nixos/radicale: use radicale3 --- nixos/doc/manual/release-notes/rl-2009.xml | 10 +++++++ .../modules/services/networking/radicale.nix | 11 +++++--- nixos/tests/radicale.nix | 28 +++++++++++++++---- 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index a0a0b2cb40e4..d830d5eff035 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -495,6 +495,16 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; In the resilio module, has been changed to listen to [::1] instead of 0.0.0.0. + + + Radicale's default package has changed from 2.x to 3.x. An upgrade + checklist can be found + here. + You can use the newer version in the NixOS service by setting the + package to radicale3, which is done + automatically if stateVersion is 20.09 or higher. + +
diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index 30bf22586f86..5af035fd59e0 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -8,8 +8,10 @@ let confFile = pkgs.writeText "radicale.conf" cfg.config; - # This enables us to default to version 2 while still not breaking configurations of people with version 1 - defaultPackage = if versionAtLeast config.system.stateVersion "17.09" then { + defaultPackage = if versionAtLeast config.system.stateVersion "20.09" then { + pkg = pkgs.radicale3; + text = "pkgs.radicale3"; + } else if versionAtLeast config.system.stateVersion "17.09" then { pkg = pkgs.radicale2; text = "pkgs.radicale2"; } else { @@ -35,8 +37,9 @@ in defaultText = defaultPackage.text; description = '' Radicale package to use. This defaults to version 1.x if - system.stateVersion < 17.09 and version 2.x - otherwise. + system.stateVersion < 17.09, version 2.x if + 17.09 ≤ system.stateVersion < 20.09, and + version 3.x otherwise. ''; }; diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix index c81e78a8f994..1d3679c82a20 100644 --- a/nixos/tests/radicale.nix +++ b/nixos/tests/radicale.nix @@ -14,9 +14,6 @@ let [storage] filesystem_folder = /tmp/collections - - [logging] - debug = True ''; }; # WARNING: DON'T DO THIS IN PRODUCTION! @@ -49,13 +46,18 @@ in services.radicale.extraArgs = [ "--export-storage" "/tmp/collections-new" ]; + system.stateVersion = "17.03"; }; radicale2_verify = lib.recursiveUpdate radicale2 { - services.radicale.extraArgs = [ "--verify-storage" ]; + services.radicale.extraArgs = [ "--debug" "--verify-storage" ]; + system.stateVersion = "17.09"; }; radicale2 = lib.recursiveUpdate (common args) { system.stateVersion = "17.09"; }; + radicale3 = lib.recursiveUpdate (common args) { + system.stateVersion = "20.09"; + }; }; # This tests whether the web interface is accessible to an authenticated user @@ -117,6 +119,22 @@ in retcode == 0 and "VCALENDAR" in output ), "Could not read calendar from Radicale 2" - radicale.succeed("curl --fail http://${user}:${password}@localhost:${port}/.web/") + radicale.succeed("curl --fail http://${user}:${password}@localhost:${port}/.web/") + + with subtest("Check Radicale 3 functionality"): + radicale.succeed( + "${switchToConfig "radicale3"} >&2" + ) + radicale.wait_for_unit("radicale.service") + radicale.wait_for_open_port(${port}) + + (retcode, output) = radicale.execute( + "curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/" + ) + assert ( + retcode == 0 and "VCALENDAR" in output + ), "Could not read calendar from Radicale 3" + + radicale.succeed("curl --fail http://${user}:${password}@localhost:${port}/.web/") ''; }) From 0d55d48f0fb4ca47bce2a45fdd9102174d832b18 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 23 Jun 2020 06:08:40 -0400 Subject: [PATCH 2409/3452] ZFS: Ask for stage 2 encryption passwords using systemd-ask-password --- nixos/modules/tasks/filesystems/zfs.nix | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 71eed4d6f1a4..3cdfcebe1b0a 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -490,7 +490,11 @@ in description = "Import ZFS pool \"${pool}\""; # we need systemd-udev-settle until https://github.com/zfsonlinux/zfs/pull/4943 is merged requires = [ "systemd-udev-settle.service" ]; - after = [ "systemd-udev-settle.service" "systemd-modules-load.service" ]; + after = [ + "systemd-udev-settle.service" + "systemd-modules-load.service" + "systemd-ask-password-console.service" + ]; wantedBy = (getPoolMounts pool) ++ [ "local-fs.target" ]; before = (getPoolMounts pool) ++ [ "local-fs.target" ]; unitConfig = { @@ -515,7 +519,20 @@ in done poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool. if poolImported "${pool}"; then - ${optionalString cfgZfs.requestEncryptionCredentials "\"${packages.zfsUser}/sbin/zfs\" load-key -r \"${pool}\""} + ${optionalString cfgZfs.requestEncryptionCredentials '' + ${packages.zfsUser}/sbin/zfs list -rHo name,keylocation ${pool} | while read ds kl; do + case "$kl" in + none ) + ;; + prompt ) + ${config.systemd.package}/bin/systemd-ask-password "Enter key for $ds:" | ${packages.zfsUser}/sbin/zfs load-key "$ds" + ;; + * ) + ${packages.zfsUser}/sbin/zfs load-key "$ds" + ;; + esac + done + ''} echo "Successfully imported ${pool}" else exit 1 From 0d8649c4e9b37e7343a8a613351ea9532671a944 Mon Sep 17 00:00:00 2001 From: pblkt Date: Tue, 23 Jun 2020 11:57:58 +0300 Subject: [PATCH 2410/3452] 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 6e36b3ac40fce322ee0c442a74a59450ca6b7f29 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Mon, 22 Jun 2020 21:09:37 +0300 Subject: [PATCH 2411/3452] xmobar: update patch description M pkgs/development/haskell-modules/configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1976d3307c5f..d827c7cb88a8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1120,8 +1120,8 @@ self: super: { # }); libnix = dontCheck super.libnix; - # Jailbreak: https://github.com/jaor/xmobar/issues/463 - # The test suite tries to mess with ALSA, which doesn't work in the build sandbox. + # 2020-06-23: NOTE: > 0.33 => rm 464.patch: https://github.com/jaor/xmobar/issues/466 + # dontCheck: The test suite tries to mess with ALSA, which doesn't work in the build sandbox. xmobar = appendPatch (dontCheck super.xmobar) (pkgs.fetchpatch { url = "https://github.com/jaor/xmobar/pull/464.patch"; sha256 = "0y1dd878yzy1cx0cjj0ijd3dmywr7jdmk68vxdjimxzblrdw1al6"; From e9d03e9e94a9b45140d0152a66a0903df3ed40b7 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Mon, 22 Jun 2020 20:39:11 +0300 Subject: [PATCH 2412/3452] statistics: clean-up M pkgs/development/haskell-modules/configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d827c7cb88a8..d01ca2c63308 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -51,10 +51,6 @@ self: super: { # Needs older QuickCheck version attoparsec-varword = dontCheck super.attoparsec-varword; - # Tests are failing - # https://github.com/bos/statistics/issues/123 - statistics = dontCheck super.statistics; - # These packages (and their reverse deps) cannot be built with profiling enabled. ghc-heap-view = disableLibraryProfiling super.ghc-heap-view; ghc-datasize = disableLibraryProfiling super.ghc-datasize; From 535d4d895e4d6ebfcfa201b224644b8ebf636ba2 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Mon, 22 Jun 2020 21:05:33 +0300 Subject: [PATCH 2413/3452] rib: update override description M pkgs/development/haskell-modules/configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d01ca2c63308..ddd4b01cfa78 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1474,7 +1474,7 @@ self: super: { # Requested version bump on upstream https://github.com/obsidiansystems/constraints-extras/issues/32 constraints-extras = doJailbreak super.constraints-extras; - # Requested version bump on upstream https://github.com/srid/rib/issues/160 + # 2020-06-22: NOTE: > 0.10.0.0 => rm dhall override: https://github.com/srid/rib/issues/161 rib = doJailbreak (super.rib.override { dhall = self.dhall_1_30_0; }); From a03288a37cd95a2cd9860f46f8a634319c669a9e Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Mon, 22 Jun 2020 20:50:05 +0300 Subject: [PATCH 2414/3452] binary-instances: update override description Previously mentioned issue closed as duplicate of an older one. Issue waits upon QuickCheck release that includes a patch. M pkgs/development/haskell-modules/configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ddd4b01cfa78..5b8d14b7f479 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1393,7 +1393,7 @@ self: super: { # https://github.com/serokell/nixfmt/pull/62 nixfmt = doJailbreak super.nixfmt; - # https://github.com/phadej/binary-orphans/issues/45 + # 2020-06-22: NOTE: QuickCheck upstreamed https://github.com/phadej/binary-instances/issues/7 binary-instances = dontCheck super.binary-instances; # Disabling the test suite lets the build succeed on older CPUs From 55df075fcba2adc8fe29c3685d84e86b9e626c5e Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Mon, 22 Jun 2020 20:55:24 +0300 Subject: [PATCH 2415/3452] nixfmt: update override description M pkgs/development/haskell-modules/configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5b8d14b7f479..2dff208ae07b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1390,7 +1390,7 @@ self: super: { }) ]; - # https://github.com/serokell/nixfmt/pull/62 + # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71 nixfmt = doJailbreak super.nixfmt; # 2020-06-22: NOTE: QuickCheck upstreamed https://github.com/phadej/binary-instances/issues/7 From 61fe6c9969d2ab16663db60b0d47e3f426d00b14 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 23 Jun 2020 14:00:50 +0300 Subject: [PATCH 2416/3452] pantry: free from override and upstreamed patch M pkgs/development/haskell-modules/configuration-common.nix --- .../haskell-modules/configuration-common.nix | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2dff208ae07b..ed49ac59cfc5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1366,30 +1366,6 @@ self: super: { # https://github.com/bergmark/feed/issues/43 feed = dontCheck super.feed; - pantry_0_2_0_0 = appendPatches (dontCheck super.pantry_0_2_0_0) [ - # pantry-0.2.0.0 doesn't build with ghc-8.8, but there is a PR adding support. - # https://github.com/commercialhaskell/pantry/pull/6 - # Currently stack-2.1.3.1 requires pantry-0.2.0.0, but when a newer version of - # stack is released, it will probably use the newer pantry version, so we - # can completely get rid of pantry-0.2.0.0. - (pkgs.fetchpatch { - url = "https://github.com/commercialhaskell/pantry/pull/6.diff"; - sha256 = "0aml06jshpjh3aiscs5av7y33m3d6s6x5pzdvh7pky476izfg87k"; - excludes = [ - ".azure/azure-linux-template.yml" - ".azure/azure-osx-template.yml" - ".azure/azure-windows-template.yml" - "package.yaml" - "pantry.cabal" - "stack-lts-11.yaml" - "stack-lts-12.yaml" - "stack-nightly.yaml" - "stack-windows.yaml" - "stack.yaml" - ]; - }) - ]; - # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71 nixfmt = doJailbreak super.nixfmt; From ed96ed88acf3bca4bfdbcdb8c6df941bf37e7f84 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 23 Jun 2020 14:01:20 +0300 Subject: [PATCH 2417/3452] feed: free from override M pkgs/development/haskell-modules/configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ed49ac59cfc5..c078fe99a065 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1363,9 +1363,6 @@ self: super: { # Therefore we jailbreak it. hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation; - # https://github.com/bergmark/feed/issues/43 - feed = dontCheck super.feed; - # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71 nixfmt = doJailbreak super.nixfmt; From d37f1f8095e1ed65ff4c981d2b66d0ff0e326dee Mon Sep 17 00:00:00 2001 From: 1000101 Date: Tue, 23 Jun 2020 13:04:57 +0200 Subject: [PATCH 2418/3452] blockbook: add static files necessary for module --- pkgs/servers/blockbook/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 4afabb858c38..3dad2f1c6cea 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -61,6 +61,12 @@ buildGoModule rec { subPackages = [ "." ]; + postInstall = '' + mkdir -p $out/share/ + cp -r $src/static/templates/ $out/share/ + cp -r $src/static/css/ $out/share/ + ''; + meta = with lib; { description = "Trezor address/account balance backend"; homepage = "https://github.com/trezor/blockbook"; From 880695f4c5a0cfef44f508395087ecfb850b9cef Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 23 Jun 2020 14:16:23 +0200 Subject: [PATCH 2419/3452] 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 b930b2df8aa208e90e999751a4a2cc2980925e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 23 Jun 2020 14:59:07 +0200 Subject: [PATCH 2420/3452] haskell.compiler.ghc865-binary: strip to fix aarch64 --- .../development/compilers/ghc/8.6.5-binary.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index 97793d912895..41af279e83ff 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -78,18 +78,6 @@ stdenv.mkDerivation rec { patchShebangs ghc-${version}/configure '' + - # Strip is harmful, see also below. It's important that this happens - # first. The GHC Cabal build system makes use of strip by default and - # has hardcoded paths to /usr/bin/strip in many places. We replace - # those below, making them point to our dummy script. - '' - mkdir "$TMP/bin" - for i in strip; do - echo '#! ${stdenv.shell}' > "$TMP/bin/$i" - chmod +x "$TMP/bin/$i" - done - PATH="$TMP/bin:$PATH" - '' + # We have to patch the GMP paths for the integer-gmp package. '' find . -name integer-gmp.buildinfo \ @@ -125,17 +113,13 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; - # Stripping combined with patchelf breaks the executables (they die - # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) - dontStrip = true; - # No building is necessary, but calling make without flags ironically # calls install-strip ... dontBuild = true; # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - preFixup = stdenv.lib.optionalString stdenv.isLinux '' + postFixup = stdenv.lib.optionalString stdenv.isLinux '' for p in $(find "$out" -type f -executable); do if isELF "$p"; then echo "Patchelfing $p" From 21a21a422498c89d2c87ae07e390501318a5a9ea Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Fri, 19 Jun 2020 12:14:19 +0200 Subject: [PATCH 2421/3452] 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 2422/3452] 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 2423/3452] 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 2424/3452] 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 2425/3452] 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 2426/3452] 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 2427/3452] 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 c5a80c20f502d9b85b0b6520165a8ee4f1d707ae Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Tue, 23 Jun 2020 17:25:55 +0200 Subject: [PATCH 2428/3452] matrix-appservice-slack: 1.3.1 -> 1.4.0 --- .../matrix-appservice-slack/node-packages.nix | 1034 +++++++++-------- .../matrix-appservice-slack/package.json | 2 +- 2 files changed, 548 insertions(+), 488 deletions(-) diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix index fb1b51508589..a2045ee15f11 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix @@ -4,31 +4,40 @@ let sources = { - "@babel/code-frame-7.8.3" = { + "@babel/code-frame-7.10.3" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz"; - sha512 = "3d85pd9lfbm8yrlpn6wj9g56snbnpr9fx0w1b9x26jbirc2xfrvnifwzprp0f6bhqijshgm0q35axic8d11v4j0kq493dapcyk33n3b"; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz"; + sha512 = "fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg=="; }; }; - "@babel/helper-validator-identifier-7.9.5" = { + "@babel/helper-validator-identifier-7.10.3" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.9.5"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; - sha512 = "3i5wlljsvjm0hxwjq4j1ddq6gcj2k518gh95wkx8qywkf90sb7l3d5aqga7hvfvz44nb2b0aq16jd3394zilmlbqcvczaq5llnapipz"; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz"; + sha512 = "bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw=="; }; }; - "@babel/highlight-7.9.0" = { + "@babel/highlight-7.10.3" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.9.0"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz"; - sha512 = "2qmdx9wdiv4yy36dc1ljghwd45kq6bhsddcbps8qznsrwvg3zjir6pb7nsfg4ypqrq6z2zif0ysjmwybpqp5xpz6rvymv2pbj54z5ll"; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz"; + sha512 = "Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw=="; + }; + }; + "@dabh/diagnostics-2.0.2" = { + name = "_at_dabh_slash_diagnostics"; + packageName = "@dabh/diagnostics"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; + sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; }; "@slack/logger-1.1.1" = { @@ -37,34 +46,34 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/@slack/logger/-/logger-1.1.1.tgz"; - sha512 = "26482151iyqnbfawnpnqggppifriyxx1gbyyi3688j782iiq4g1rqkm7q979z9qkv0pvvjrxdbi8v0gk3prax6j7v2zy0ndr44bj01w"; + sha512 = "PAC5CMnNAv/FPtJ0le+YD2wUV+tZ7n3Bnjj9dBI+deIcHsExCnQkQmZE79cLvfuYXbz3PWyv5coti30MJQhEjA=="; }; }; - "@slack/rtm-api-5.0.4" = { + "@slack/rtm-api-5.0.5" = { name = "_at_slack_slash_rtm-api"; packageName = "@slack/rtm-api"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.4.tgz"; - sha512 = "1zx7c5wzbp2wc99lrzy0ipiil7jayn1643q0mm8bawdbi3gansd7axzn7ivcjlzgv9bn8pqlzc3lw0mwwlaqjs4z4d7zq6vnf6cw5g7"; + url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.5.tgz"; + sha512 = "x2B4hyoxjg62cxf4M5QRomx+xYp2XoajPKdd24SM2Sl4m+IrzwKzmcrysQuYmF6BMsm3IoTKymW5BBGckHGTIw=="; }; }; - "@slack/types-1.6.0" = { + "@slack/types-1.7.0" = { name = "_at_slack_slash_types"; packageName = "@slack/types"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/types/-/types-1.6.0.tgz"; - sha512 = "0hpy7rczl2a6379ipm7qxspq6qfh97iy2l7g0zzwn5jcmxlh5sjzl439k1hpxg7fpy66ldc455wlfyrk3wmgy8drlndw33iyq7w1fja"; + url = "https://registry.npmjs.org/@slack/types/-/types-1.7.0.tgz"; + sha512 = "aigLPmTO513JxeFyeII/74y+S5jU39tabDWPsZyMHJWCYqK3vCkRvV73NL+Ay+Tq5RC2NgSmkedk1wvQJ6oXLg=="; }; }; - "@slack/web-api-5.8.1" = { + "@slack/web-api-5.10.0" = { name = "_at_slack_slash_web-api"; packageName = "@slack/web-api"; - version = "5.8.1"; + version = "5.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.8.1.tgz"; - sha512 = "065zsa2i8s2av3igs52g2r8pn2i3qw3glflwbdn28i6wzvq0f3q2gp9vx44gfp5r5q1ymjwvk8wapsaaqgz1s781pymspcf6n977qrh"; + url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.10.0.tgz"; + sha512 = "t8c2lcSrdX8LIUOS1RvslbBBKvuNaTtbEcrWai4yDGkiNIxzhk+dHPcJzd7A4A0DkAgiEwXeezR7RCELuG8WgQ=="; }; }; "@types/body-parser-1.19.0" = { @@ -73,7 +82,7 @@ let version = "1.19.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "0av4v9bdhgbq0jils3jajym9gcfddyx63g2xx8fh6vqafqb5vdcm98p1kfl70ydih9m393zp13krslmii5bmf05ngyaxn139nn0kpsv"; + sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; "@types/caseless-0.12.2" = { @@ -82,7 +91,7 @@ let version = "0.12.2"; src = fetchurl { url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz"; - sha512 = "39jv2a7v9mi41wxbv242icriy5asbzyk95iy25ay3gwa1d6yi40cd6gclbzn81hig9xvvi5z7j2gq4ybirjfyihpq8wa3s160r33jg9"; + sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="; }; }; "@types/chai-4.2.11" = { @@ -91,7 +100,7 @@ let version = "4.2.11"; src = fetchurl { url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.11.tgz"; - sha512 = "2rkrhbd0aip5x0bqbp3az1pfnz3wx0dqwmid3ibyrvgvz9z93xbf1prkm5rcnj7j58w70fydsrrjk0rl1fj3hcxm2z36zjsw7lrdfxp"; + sha512 = "t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw=="; }; }; "@types/connect-3.4.33" = { @@ -100,16 +109,7 @@ let version = "3.4.33"; src = fetchurl { url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz"; - sha512 = "3n5gxr7z1jn60gvcnzls1c3fgzbv171acdp4shbn095wnbb8hdba3cjq1sac8aina3bg957ww5hg89swcgbdjfp9irmkkiqfs8npqfv"; - }; - }; - "@types/events-3.0.0" = { - name = "_at_types_slash_events"; - packageName = "@types/events"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; - sha512 = "3v6shgxnlkc7izsc00g8ilpxi1q2mpcmbjyfawyqcj8mwfhlx2cnkm3hj87gsd39yyq33pilb0dbb4cdc8wwhn7dcwj4srg0amrp8qi"; + sha512 = "2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A=="; }; }; "@types/express-4.17.6" = { @@ -118,7 +118,7 @@ let version = "4.17.6"; src = fetchurl { url = "https://registry.npmjs.org/@types/express/-/express-4.17.6.tgz"; - sha512 = "3kwllih0493ahk6gi09pibb3c3x21r3qll2fv7vs9ixz694i6dp59w4799q8ar1yx500d03rvyc5pppf9p3rrdcw4fpkws8svvapycz"; + sha512 = "n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w=="; }; }; "@types/express-serve-static-core-4.17.7" = { @@ -127,7 +127,7 @@ let version = "4.17.7"; src = fetchurl { url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.7.tgz"; - sha512 = "07pihlgvdmd0kkpxd77h2mcqx93c3mz0g4jcv2p511jgksqwc4wgi4qjb59gbp2ya25inn0gsh9f3wsc8dzi73w5mhamxn5y27i7j0h"; + sha512 = "EMgTj/DF9qpgLXyc+Btimg+XoH7A2liE8uKul8qSmMTHCeNYzydDKFdsJskDvw42UsesCnhO63dO0Grbj8J4Dw=="; }; }; "@types/is-stream-1.1.0" = { @@ -136,16 +136,16 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/is-stream/-/is-stream-1.1.0.tgz"; - sha512 = "1i12j74qq6aga8wpwbn5vmy5abb0hms26hinya0mx503dwx51iqy39rsl07kha49nfmmz0sbrjbbm4s1lrcwj3as9xb8m8hxsv5lilf"; + sha512 = "jkZatu4QVbR60mpIzjINmtS1ZF4a/FqdTUTBeQDVOQ2PYyidtwFKr0B5G6ERukKwliq+7mIXvxyppwzG5EgRYg=="; }; }; - "@types/mime-2.0.1" = { + "@types/mime-2.0.2" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz"; - sha512 = "35iimmp0d3zg4774qavnq9wh54dgnxfks59fks65f8q8d1008x00a1fmkdnxcs27znlc69mzbxp1frzpxx85c5w4x0ha5prgs0ks0hp"; + url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.2.tgz"; + sha512 = "4kPlzbljFcsttWEq6aBW0OZe6BDajAmyvr2xknBG92tejQnvdGtT9+kXSZ580DqpxY9qG2xeQVF9Dq0ymUTo5Q=="; }; }; "@types/mocha-7.0.2" = { @@ -154,7 +154,7 @@ let version = "7.0.2"; src = fetchurl { url = "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz"; - sha512 = "3bnvharvlw03v41ibz38mhzb9h9ai3r3h46j9j6jj0g32ny0xak0ls9mnbs6bf7yfqccidc2vg1xwx16adxqngyayyci6130ysbdwv6"; + sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; "@types/nedb-1.8.9" = { @@ -163,7 +163,7 @@ let version = "1.8.9"; src = fetchurl { url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.9.tgz"; - sha512 = "1ajp6pwl4fnpr0w1bkvd7fx77amhgwm32q8wcr6r124m6fq73f88qkgbgr8r0ll2s2pn1b9kajzzvbvl7rgib0p3bsd94826kffbm63"; + sha512 = "w9Tl3DQCkdT0Ghes+PKhe+3/pZppBXuFFpSCjPJbb2KE3DjYmUpEyCYzjrAYlT9Y1TndnbbnChzkax2h/JorVQ=="; }; }; "@types/node-13.9.3" = { @@ -181,7 +181,16 @@ let version = "1.8.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/node-emoji/-/node-emoji-1.8.1.tgz"; - sha512 = "288j4d6vcg0fbj43jaaf628f02s8zpsc0xagw0a5dr397ks6qnrcmjf91vl50b6f5xiddm6606hg3fa0va3yfpw4n56wnh5vl1mzx6i"; + sha512 = "0fRfA90FWm6KJfw6P9QGyo0HDTCmthZ7cWaBQndITlaWLTZ6njRyKwrwpzpg+n6kBXBIGKeUHEQuBx7bphGJkA=="; + }; + }; + "@types/nunjucks-3.1.3" = { + name = "_at_types_slash_nunjucks"; + packageName = "@types/nunjucks"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/nunjucks/-/nunjucks-3.1.3.tgz"; + sha512 = "42IiIIBdoB7ZDwCVhCWYT4fMCj+4TeacuVgh7xyT2du5EhkpA+OFeeDdYTFCUt1MrHb8Aw7ZqFvr8s1bwP9l8w=="; }; }; "@types/p-queue-2.3.2" = { @@ -190,16 +199,16 @@ let version = "2.3.2"; src = fetchurl { url = "https://registry.npmjs.org/@types/p-queue/-/p-queue-2.3.2.tgz"; - sha512 = "2ypziq4lf4i0kvxck1nv6l40sivqa5w95sagcihxbw8j87whz8yl80hwailygwlgyl3k3c6vca9nzn5h720l2vmhwfvz4vs17jjz83q"; + sha512 = "eKAv5Ql6k78dh3ULCsSBxX6bFNuGjTmof5Q/T6PiECDq0Yf8IIn46jCyp3RJvCi8owaEmm3DZH1PEImjBMd/vQ=="; }; }; - "@types/qs-6.9.2" = { + "@types/qs-6.9.3" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.2"; + version = "6.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.2.tgz"; - sha512 = "3wd0wx623wmzc5fs372ziw4zr9ay93zqd17aqbsfvs90y6jp2n9ipv0k0mpgjidvrhrzkwdhh6xpxlyy3xmzxdvw1gjdk3phs5w7mkb"; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.3.tgz"; + sha512 = "7s9EQWupR1fTc2pSMtXRQ9w9gLOcrJn+h7HOXw4evxyvVqMi4f+q7d2tnFe3ng3SNHjtK+0EzGMGFUQX4/AQRA=="; }; }; "@types/randomstring-1.1.6" = { @@ -208,7 +217,7 @@ let version = "1.1.6"; src = fetchurl { url = "https://registry.npmjs.org/@types/randomstring/-/randomstring-1.1.6.tgz"; - sha512 = "0fx5jypv2k0dqp2wh8li9g82pylxq9d0d2qsgn55a1dkyvd8lsw31ih0n44sb9ippmiad7j21qrnq8md4bn0754j8pcb3giqhh1j4jx"; + sha512 = "XRIZIMTxjcUukqQcYBdpFWGbcRDyNBXrvTEtTYgFMIbBNUVt+9mCKsU+jUUDLeFO/RXopUgR5OLiBqbY18vSHQ=="; }; }; "@types/range-parser-1.2.3" = { @@ -217,16 +226,16 @@ let version = "1.2.3"; src = fetchurl { url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz"; - sha512 = "0w59kqlbrl9ich2pv2xqanzmg9f51404zqsba9l8aimqd77zbrdxcyq9q13xfnhr0d1dz4mx6z7n976ryc2nk2gfch5p507njm5f0bv"; + sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; }; }; - "@types/request-2.48.4" = { + "@types/request-2.48.5" = { name = "_at_types_slash_request"; packageName = "@types/request"; - version = "2.48.4"; + version = "2.48.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz"; - sha512 = "21mnsvbrykpzp1f1rd2ibk3nsgr8kyqikk5rdmq4qlkpf10gnpxp414hnvnbwjp27l5hvpc5l0fx0qhw20h7zi143qw6iwq68qpansv"; + url = "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz"; + sha512 = "/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ=="; }; }; "@types/request-promise-native-1.0.17" = { @@ -235,7 +244,7 @@ let version = "1.0.17"; src = fetchurl { url = "https://registry.npmjs.org/@types/request-promise-native/-/request-promise-native-1.0.17.tgz"; - sha512 = "2m1kxdl06xbzf2zq8qx0kvwm6wjsxpxipyzzix8g7pvbnsi454zar84inrfm1bd5kyh1n2hj8q6ljv705r7816633nhifz6cv8xv7yk"; + sha512 = "05/d0WbmuwjtGMYEdHIBZ0tqMJJQ2AD9LG2F6rKNBGX1SSFR27XveajH//2N/XYtual8T9Axwl+4v7oBtPUZqg=="; }; }; "@types/retry-0.12.0" = { @@ -244,16 +253,16 @@ let version = "0.12.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz"; - sha512 = "2y01s1x2dh20ms4h4ih8j4rz6c66k40nj7kfl8z5bv1s77vqv4jq0ycai1gi0irx0m9y7jqcz140ica6273vrqmcvf2r2nkah58wqn1"; + sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; }; }; - "@types/serve-static-1.13.3" = { + "@types/serve-static-1.13.4" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.3"; + version = "1.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz"; - sha512 = "39fm32fi9qpb1bz4q399y9rzv02ywml2m1qmclyr1ckrmy4vdn8nv5f9986ckn19yapxif0ljs0gc717xd7dmssjnh37qrxkp1d56m2"; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.4.tgz"; + sha512 = "jTDt0o/YbpNwZbQmE/+2e+lfjJEJJR0I3OFaKQKPWkASkCoW3i6fsUnqudSMcNAfbtmADGu8f4MV4q+GqULmug=="; }; }; "@types/tough-cookie-4.0.0" = { @@ -262,25 +271,25 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz"; - sha512 = "3lf0afkwkxmp6a7g8ghfbm5zjaxy2i1hqirzcr2iycxzvwwihdldbkfwgyxrc6b8b40sqfmvl5g2k6v6mdmpq5m6gs81nvn12g6rpr3"; + sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A=="; }; }; - "@types/uuid-7.0.3" = { + "@types/uuid-7.0.4" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; - version = "7.0.3"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.3.tgz"; - sha512 = "0xq5zlv2b74hz2yna42yd0j6p1xr1mx681x9phwl3njd8by5i82n15zc03srpkjzmhb3r12llhhwfk3k941wjw8f36q8dbbjm6nlirx"; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.4.tgz"; + sha512 = "WGZCqBZZ0mXN2RxvLHL6/7RCu+OWs28jgQMP04LWfpyJlQUMTR6YU9CNJAKDgbw+EV/u687INXuLUc7FuML/4g=="; }; }; - "@types/ws-5.1.2" = { + "@types/ws-7.2.5" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "5.1.2"; + version = "7.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-5.1.2.tgz"; - sha512 = "0x1hv5p5js6n69q53qgw3qly7d1ipwz0cqfd2kr8g79kx8rm4bqak7azjwgagzm1b96xrqaydfkaw9rqr3536jd7ikpfxfqli8dfi1n"; + url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.5.tgz"; + sha512 = "4UEih9BI1nBKii385G9id1oFrSkLcClbwtDfcYj8HJLQqZVAtb/42vXVrYvRWCcufNF/a+rZD3MxNwghA7UmCg=="; }; }; "@types/yargs-13.0.9" = { @@ -289,7 +298,7 @@ let version = "13.0.9"; src = fetchurl { url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.9.tgz"; - sha512 = "3758l5yl7cqv06qqaljs8hac31hwp4kz1nycsm1lj20dha116ylwx9kyd2dzpp8bml82ydl5r1ih31qxp9bmxc1hq1h6yyrh1ky3fy6"; + sha512 = "xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg=="; }; }; "@types/yargs-parser-13.1.0" = { @@ -298,7 +307,7 @@ let version = "13.1.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.1.0.tgz"; - sha512 = "0mdq44p4sr9zvkcmaaa0jgyz34qirza6kl4qcln5ir9h0lg63kr9ndclj6p8gpf3mir7kv3rlr7pzkkjhhgkj96l9rsrs0r2my9naw0"; + sha512 = "gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg=="; }; }; "Slackdown-git://github.com/Half-Shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" = { @@ -311,13 +320,22 @@ let sha256 = "474e972819b3e1db3af70be75966a3d501c6b9285f4550ff5548193e031eaf9b"; }; }; + "a-sync-waterfall-1.0.1" = { + name = "a-sync-waterfall"; + packageName = "a-sync-waterfall"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz"; + sha512 = "RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA=="; + }; + }; "abbrev-1.1.1" = { name = "abbrev"; packageName = "abbrev"; version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; "accepts-1.3.7" = { @@ -326,7 +344,7 @@ let version = "1.3.7"; src = fetchurl { url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "2j51dxzbgz22q0k7dhivimfsqx9a0f0h9slfd7n20gz3y1944gx3y7xai54za0x3zhbar6vqiaab2i9p913cwqk414qk3cnrm138pr2"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; "ajv-6.12.2" = { @@ -335,7 +353,7 @@ let version = "6.12.2"; src = fetchurl { url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz"; - sha512 = "18zdchlpq20znwglnbc54yvqpr9m7q96qp9zvys27is5c0vxfn5fk8nmwhpnplbxyka88xqqabad0427mbgz7y7mz6azrp6723pxrck"; + sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; }; }; "another-json-0.2.0" = { @@ -353,7 +371,7 @@ let version = "3.2.3"; src = fetchurl { url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; - sha512 = "2gpv8bq9jq550ygnnm5srza0w0lfg8mr8z39702l0rgxhf35sxmdzxpppvwcp50rpk0dgjz516nbkygm0fk4675kb9qsgb5x35cfh9c"; + sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; }; }; "ansi-regex-3.0.0" = { @@ -371,7 +389,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1v2gfp292kslpvam0l0h1iba35yi0n7dc6qv6fmxsdyfcp6zakkl13vrh3hzsw4zgh50jrrsg7xb2q2hn4g8a0dmf947mfcylymxanm"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; }; "ansi-styles-3.2.1" = { @@ -380,7 +398,7 @@ let version = "3.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; "anymatch-3.1.1" = { @@ -389,7 +407,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"; - sha512 = "2776jrfn8kh9r6qhz6s43znnwvqmbqrjsch99hdv21j53sj4njyjhrya67drxk8y7hvi28mjvdjj277jy4qd2zfayrjli3cdbdkkkwq"; + sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; }; }; "arg-4.1.3" = { @@ -398,7 +416,7 @@ let version = "4.1.3"; src = fetchurl { url = "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz"; - sha512 = "2y8gq3qabgg6wbnvzwm79j1ncabh960rrr2qxq657mv4zsynr92l46mpfgpvk7hq416dpvqi66sy617bzgll3wcxmv7rlc6790bvi77"; + sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="; }; }; "argparse-1.0.10" = { @@ -407,7 +425,7 @@ let version = "1.0.10"; src = fetchurl { url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; - sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; }; "array-flatten-1.1.1" = { @@ -428,13 +446,22 @@ let sha1 = "5fcc373920775723cfd64d65c64bef53bf9eba6d"; }; }; + "asap-2.0.6" = { + name = "asap"; + packageName = "asap"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + }; + }; "asn1-0.2.4" = { name = "asn1"; packageName = "asn1"; version = "0.2.4"; src = fetchurl { url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; - sha512 = "1v2z1ll0l8rif8hh0d03jc49kz3p8hym63q8ixbas48w4a8akl413hwn08nx83m89sj3mxl06aa0grp7n8hj6hcbsb2k3fhj913674g"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; "assert-options-0.6.2" = { @@ -443,7 +470,7 @@ let version = "0.6.2"; src = fetchurl { url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.2.tgz"; - sha512 = "09k5n3gb7n70yrif6qql3da1jbby6nc5g2h4lp6wbqcj14x71nyms3rgvwngl6jc1wrrw3jykiln04dr0cjs9k67i0d39jpizkm5zr8"; + sha512 = "KP9S549XptFAPGYmLRnIjQBL4/Ry8Jx5YNLQZ/l+eejqbTidBMnw4uZSAsUrzBq/lgyqDYqxcTF7cOxZb9gyEw=="; }; }; "assert-plus-1.0.0" = { @@ -461,7 +488,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz"; - sha512 = "07swiwljqy13fyil4y9lp319zcqsgdkchaic1y4dlfi3flh5l4qlwv497g40bnspsl9h857a3ig5assmvjdwv913dppgymkvcsil2wf"; + sha512 = "jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw=="; }; }; "async-0.2.10" = { @@ -473,13 +500,13 @@ let sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; }; }; - "async-2.6.3" = { + "async-3.2.0" = { name = "async"; packageName = "async"; - version = "2.6.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz"; - sha512 = "1g679kw2qqpqx1yd4s778r8rw3cv9qwmib5x3klk64kcl5ndw71bljcpav5jkk6grizlpvrqszsbs6fkmnlvcq5fnz2q33mrnb6zyfd"; + url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz"; + sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; }; }; "async-limiter-1.0.1" = { @@ -488,7 +515,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; - sha512 = "0sy81yyf4na58ic2m0ib0prkb9njb1qzl7wf3vlq4hhm4xnwgxaph0lr43gs1sd0rai2xp1h6phlwvni9jiggm94dd54i0wc1cabhvj"; + sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; }; }; "asynckit-0.4.0" = { @@ -509,13 +536,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.9.1" = { + "aws4-1.10.0" = { name = "aws4"; packageName = "aws4"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz"; - sha512 = "2x4b6c0ny64yv6ljfs6sv82akh200klmnh1m1i18hdj28ksxkr9c0szphnwcasy3g5y3l1wn858wcxnc2gi9q5wql8s678fc61xbhf0"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz"; + sha512 = "3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="; }; }; "axios-0.19.2" = { @@ -524,7 +551,7 @@ let version = "0.19.2"; src = fetchurl { url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz"; - sha512 = "0fa6ngb4rkbyp5r4ccjgs2ykdbz8i2hcr41av59jicgq6mfva739kcd6n5dqzj3hsx7d4qi201g93li3qddn14bz9qvh76irgj2cf3y"; + sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA=="; }; }; "babel-runtime-6.26.0" = { @@ -551,7 +578,7 @@ let version = "3.0.8"; src = fetchurl { url = "https://registry.npmjs.org/base-x/-/base-x-3.0.8.tgz"; - sha512 = "0j1z1n32mik68bxyihzyn0fik2lfw6msi9h22hnrdqz1x9dbsql1xyz7590vkpp54d8apf92cvnp1qzf4cqcy2fmv8zq9zqcc0zaps6"; + sha512 = "Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA=="; }; }; "basic-auth-2.0.1" = { @@ -560,7 +587,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz"; - sha512 = "1x9j0wn0a3ia9mwgvicd30w346wzxj86zk9sly5wp07a2mpjm1sk4hk9iwrbcc8z6c72bkhvck6zrxbvcb6p8bbjhald78xw6k9wprl"; + sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="; }; }; "bcrypt-pbkdf-1.0.2" = { @@ -578,7 +605,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz"; - sha512 = "2izzpdg2m0av5pzbv1zyjfi15ddz5yk1d4h9cilzc8z6pzq5abcicnm2xx4b2jdrjk2l4h3zfawsxhnbzlgvlv4700q5930k796s69y"; + sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="; }; }; "binary-search-tree-0.2.5" = { @@ -614,7 +641,7 @@ let version = "3.5.5"; src = fetchurl { url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz"; - sha512 = "3gqgjzrc40ykm2hcmh2g98d09h8wh19n5psqc5b7k03aysyymfnvlak115vfi4s02ygnky872sfhdl1r077wcnyrsmyndyzg4gbmag5"; + sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="; }; }; "body-parser-1.19.0" = { @@ -623,7 +650,7 @@ let version = "1.19.0"; src = fetchurl { url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "2rl5ww96fwgmxdqhqmnknsaafw44vsr2xz7vf7nax8qz9jy8bmmdyawcy6yfny0wm7pi8m2jssakzjc1nin8z8207kv0gclpnrhy4bn"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; "brace-expansion-1.1.11" = { @@ -632,7 +659,7 @@ let version = "1.1.11"; src = fetchurl { url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; "braces-3.0.2" = { @@ -641,7 +668,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha512 = "38dmhgggv4r7xf3chli957yj4gzfv9xhif8zzaqjnxavkrs1qbmj9m84vxh42n1jl9sddy16ryp4g93l1p8dvrc1pbcvk2ippwadjvg"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; "browser-request-0.3.3" = { @@ -659,7 +686,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"; - sha512 = "21jjhrf3wdmzsfqgva5s7shs1wdmcdxsjvi75p8z7i0q2i6n3654gpxjqlhbnpmzm25cpkshyi8swy13017qkp9m7xnbgw0bwiia45a"; + sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; "bs58-4.0.1" = { @@ -677,7 +704,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "3c0m16i3fdv3vlq2zz8dakrnhqvs16gvggj485f91fiaa5v0p7pyhamcdw5fggr7djzd8nshmvz4hgbp7714smqxlld2an28q8if1ri"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; }; "buffer-writer-2.0.0" = { @@ -686,7 +713,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz"; - sha512 = "21laqrygizzy6ccv03l1af9pq07ligp755ybgfzln99lh62xnn5sxhw6qlw717g9dym9pa2cg0k9mz5r1nkb0hckxnk9mal6swnkdkb"; + sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; }; }; "builtin-modules-1.1.1" = { @@ -704,7 +731,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; - sha512 = "073ccjmvxf726gcgzy0pksvi8x8r51dq6hyv69sc75ynrin7anwk9q3sqhbbbjhqjjrmq42s5f5gdbcgj2jxai6ldpyq6y2ny78payd"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; "camelcase-5.3.1" = { @@ -713,7 +740,7 @@ let version = "5.3.1"; src = fetchurl { url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; - sha512 = "0kg17fpj4c7akmpa9x0a3fi5glrc3y5k3ppjcpb3pd02ylg3fnzfdvz0pixd223crbs5980sjaxsk9q8kcqxm5d9cb7rlkv3m614vrg"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; "caseless-0.12.0" = { @@ -731,7 +758,7 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz"; - sha512 = "27pdhh35fbig9yxb0h8qp98cjapnpdxjnia2jc1hrhrda9ajab2hkpclrfd8b568ggrv2wrgi09bh0rf1vndc1b82nb74kf21p3f1ax"; + sha512 = "XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw=="; }; }; "chalk-2.4.2" = { @@ -740,7 +767,7 @@ let version = "2.4.2"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; - sha512 = "2wr55z22i274wadq2cvpxga28a8igq9whc4m1q06sz5sn2hc4amradd5vd02wm92vyfg2qrb0bysd5drv7mfmlb2wqdf939v5zvxn1j"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; "check-error-1.0.2" = { @@ -758,7 +785,16 @@ let version = "3.3.0"; src = fetchurl { url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; - sha512 = "3hbyi14x38mvx936wbajln4g1l8fcyi8fwvcrhf2jqn0yzcyda1d20q67k445j9bvs5kr7jdhd2s07srb2pnm7hxmjngp2k6wn8lsbl"; + sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; + }; + }; + "chokidar-3.4.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz"; + sha512 = "aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ=="; }; }; "cliui-5.0.0" = { @@ -767,7 +803,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; - sha512 = "1fg1afsij2xwc4gpqbyhrp3s7q19w7bmii0ghmdv6cdx6giz3v0yqn25i3g7fw2lpi388jpvaf6nf9z2c7xp7w7psrww7569548d1rx"; + sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; }; }; "color-3.0.0" = { @@ -776,7 +812,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/color/-/color-3.0.0.tgz"; - sha512 = "3xh3l9zhh6dav7pp5hy88kbb6c52j0pf331ywpp6w2jaf94w25fjn4am930775mskxy75cxl90fji17cym40ivslxxlpcrlxgkmsalc"; + sha512 = "jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w=="; }; }; "color-convert-1.9.3" = { @@ -785,7 +821,7 @@ let version = "1.9.3"; src = fetchurl { url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "0d5pmdh1dh0qbpjrzdczwqkh0jwf8gxhq71mknwlxqz80h1q6kdrpghq4qfp0y4v650ia2jdihmzpb2n8hg00h72lnx05dgvysi9w21"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; }; "color-name-1.1.3" = { @@ -803,16 +839,7 @@ let version = "1.5.3"; src = fetchurl { url = "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz"; - sha512 = "11p4cihq5874fmyvwkh0fp4dr2syliqsgg610rw46lsav41l6wcm4bgpkrl34gip3cqncw0ppmqwfknm5v02m1fj8qqk8cnlzk84bbl"; - }; - }; - "colornames-1.1.1" = { - name = "colornames"; - packageName = "colornames"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz"; - sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96"; + sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw=="; }; }; "colors-1.4.0" = { @@ -821,7 +848,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; - sha512 = "2saczc8hcdmgns1cp1g1p7g2sq4yksrik0ffvfkhkavmmgx8haqm034a4c9zj8im6kfjh00n2xi360yqfy7vbsi98zri0943r72mrbb"; + sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; }; }; "colorspace-1.1.2" = { @@ -830,7 +857,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz"; - sha512 = "36j3cgfzngcjms1c0yfn487ibflffmb6hxgrknxbyrxrflc4kybm2r8a0mc1v8ljj7rbb7cjd54v2bimqb6rw0q5sqvwxznhfh8xpxy"; + sha512 = "vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ=="; }; }; "combined-stream-1.0.8" = { @@ -839,7 +866,7 @@ let version = "1.0.8"; src = fetchurl { url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "1v09nkip7zpn3k3prkkg53w331rhczpfgcqb0q42i97nafra43l2khl5zvhd4ar0qmh145nmw7944jy8p108ny0xpgy29gf2wqph0qm"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; "commander-2.20.3" = { @@ -848,7 +875,16 @@ let version = "2.20.3"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; - sha512 = "1qqrwy7z476gqa94kjjyyzyi3x49k28ji7znbc65plrp67yzmpa2yyslh6bl965yl4jqb2fwb2ljzhgcvv2xxj8ab86n5rgryc6958s"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; + }; + }; + "commander-3.0.2" = { + name = "commander"; + packageName = "commander"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz"; + sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="; }; }; "concat-map-0.0.1" = { @@ -866,7 +902,7 @@ let version = "0.5.3"; src = fetchurl { url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; - sha512 = "3976ggkw1lp21a6m3s19blb9a74kq7a0spw47v0m3vvi1k5wiamrsn20slcr9byx80x2la2sppkwjp7x10gc58142dl7412pvpv84qk"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; }; }; "content-type-1.0.4" = { @@ -875,7 +911,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; "cookie-0.4.0" = { @@ -884,7 +920,7 @@ let version = "0.4.0"; src = fetchurl { url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; - sha512 = "1g7bscknfpc6zgznz77hvll6cy5m9jv7zg9nkpdqzmgi0vhv75kh8iyqf6rdslkml47l3jihsz7hy0i8x5n6bfx9ba0kvvrp9y7qypq"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; }; }; "cookie-signature-1.0.6" = { @@ -902,7 +938,7 @@ let version = "2.6.11"; src = fetchurl { url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz"; - sha512 = "1db6yjq48a8kkrfrxd0miblcf7nk2b4afgpr8dfgjl3jvz3xclvrqmz590hx2h59jh79lgl35r101lw5jqs46qybizdbpgzljjyf277"; + sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; }; }; "core-util-is-1.0.2" = { @@ -938,7 +974,7 @@ let version = "2.6.9"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; "debug-3.1.0" = { @@ -947,7 +983,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr"; + sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; }; }; "debug-3.2.6" = { @@ -956,7 +992,7 @@ let version = "3.2.6"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; - sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; }; }; "decamelize-1.2.0" = { @@ -974,7 +1010,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz"; - sha512 = "1rrbk0h0a836gj1x6lalzgqfs0v34d4fswq23c8lxzmb6k7pna45zd509h1r1fr312n4qml94xqlmzzga40sfa9vnzf6rkr4d1qh1zr"; + sha512 = "+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="; }; }; "define-properties-1.1.3" = { @@ -983,7 +1019,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "1fsa8nx7qgi958fykj36cndsf8ygj3132if6k4a36mkf11bl2j2gn7dn2nz07mfsygkx0415yxrjpzx8j369z1767fvr57nm1h9zjnw"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; }; "delayed-stream-1.0.0" = { @@ -1010,7 +1046,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; - sha512 = "2phijq20j255bs4jjs11j5pa0x7y1084k6ch9xa8wgzp71zzgbpm23wyzbcs0mszvj971l9i5aav40sddm000484sl3ij4xzvlcgfc3"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; }; "destroy-1.0.4" = { @@ -1022,22 +1058,13 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "diagnostics-1.1.1" = { - name = "diagnostics"; - packageName = "diagnostics"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz"; - sha512 = "0liin689xf3v7wxk1z5l1par3dyjkg487nk3siqn6b7zqxw2rd93rgw88ifsqwhv66s8d7qjxy8fjv4gxfgiwd69ryv573fcwzga2gk"; - }; - }; "diff-3.5.0" = { name = "diff"; packageName = "diff"; version = "3.5.0"; src = fetchurl { url = "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz"; - sha512 = "32bkv3cfhax4x5zhiyfn63wjhqwkzsjiql3my8p3d9hvv020p8f9hdi7mpqixrkpgs0g9k15mn736s449yad9wq1plhxyhxb2sam3h3"; + sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="; }; }; "diff-4.0.2" = { @@ -1046,7 +1073,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"; - sha512 = "3ndiq7a8qsn2j6vlq5c6d38ynlydlhvk6q01rj321lcarrh0z7721w6cbrdw7lkx6pyfms59y1jkqcl6g2ir1rz5xr17q40lk26djg7"; + sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; }; }; "ecc-jsbn-0.1.2" = { @@ -1073,16 +1100,16 @@ let version = "7.0.3"; src = fetchurl { url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha512 = "2s4i22ccvwa2l4xwl9yz6mkyn2kpf58hp1nqiwmmgqlpyr57345i3ll0l4656ryik6a6wz1lgk4vbl6y0dwj5hx2kcbpv0h8924n00b"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; }; }; - "enabled-1.0.2" = { + "enabled-2.0.0" = { name = "enabled"; packageName = "enabled"; - version = "1.0.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz"; - sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93"; + url = "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz"; + sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="; }; }; "encodeurl-1.0.2" = { @@ -1094,22 +1121,13 @@ let sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; }; - "env-variable-0.0.6" = { - name = "env-variable"; - packageName = "env-variable"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz"; - sha512 = "2v5v2dckp87kblfsmmyn76ky74yj2cvrv6kw1i7wlcidk2r7gnyhfil6i4zmw2qscgbsviv85x4840k7qgrkv8p6ssd8vj1v7sgjz3c"; - }; - }; - "es-abstract-1.17.5" = { + "es-abstract-1.17.6" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.5"; + version = "1.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz"; - sha512 = "2kayciqh331d3kp1l8wdsp33kzdc02rv72z6x2327w2i6yks9b7xwxbg1xdrrkhaglr06liqzdjavq9qk9d487sf572rjfv62xml7q5"; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz"; + sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="; }; }; "es-to-primitive-1.2.1" = { @@ -1118,7 +1136,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "2y6j97j2f10gc52kw7qin10gm24m5hz1qq7ph6jf89y8a9i8vb268f2q0z78qjmngc765y9v0f1ldc5qb10b638yqlabda90sbaa8s0"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; }; "escape-html-1.0.3" = { @@ -1145,7 +1163,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; - sha512 = "3xkdrhqvjj7430kp98pllh0yxbawxp4z1fnvbw5cawjr6mlbgyrd2v3b3kalrx3s515zc731a6ckmb10x9vaizf6sf4b5g84lndr72j"; + sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; }; }; "esprima-4.0.1" = { @@ -1154,7 +1172,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; - sha512 = "3h999di4dnwxb22lxlb7cbz42nalrv8g8sqdvrkkl5c27gnwhp1rva4039hmq6g1i0y4mfjgx6p4i2vwxxl0zlahfzdd9fl1qbqasvq"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; "etag-1.8.1" = { @@ -1172,7 +1190,7 @@ let version = "3.1.2"; src = fetchurl { url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz"; - sha512 = "3hv1mm8y1m0ayl0ds213ajdpc0xwalhi1iwvy2zdkg4kys5vdy97s8jz0sfvd91a3xwyy4946wmzk2lc1kpzww94pj307nmw8hm1yxn"; + sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; }; }; "eventemitter3-4.0.4" = { @@ -1181,7 +1199,7 @@ let version = "4.0.4"; src = fetchurl { url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz"; - sha512 = "2cj4h27lly85zb08gprjrkb92l8q8l1977704j7acj7rif052jiqap3l8d7zpdn9krqqi7if1f2cxp7f584045vr3l1pdviflp9ammf"; + sha512 = "rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ=="; }; }; "express-4.17.1" = { @@ -1190,7 +1208,7 @@ let version = "4.17.1"; src = fetchurl { url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; - sha512 = "3i2sxjf2x1r9wbfdyh5ll8ybbnqq6n4xfxdlc4dsqhssljrlih18csqg142lf16lcfcdgsmvf9pff0rzxjw7p0shnlmpajipwxpswlq"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; }; }; "extend-3.0.2" = { @@ -1199,7 +1217,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; - sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; "extsprintf-1.3.0" = { @@ -1211,13 +1229,13 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-3.1.1" = { + "fast-deep-equal-3.1.3" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha512 = "1j7wq3vqvfgnpd2sjblnlgryxlic2fsy343fx8w4ywb2mngj1w5afq8fmly8cp9fi66dhz1fhcfpn23g5zasnzs6n1snb83qkkilhgi"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -1226,7 +1244,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "0gz06zkjlqc4r59ka14n3vwqjdgn40zd8r115ql3rkwqb7j42frmnsj3axr7p2md8ik52nqjn3myyv8ddavdhl4cq3xz4wbbz07y5wn"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; "fast-safe-stringify-2.0.7" = { @@ -1235,7 +1253,7 @@ let version = "2.0.7"; src = fetchurl { url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz"; - sha512 = "1ab0spv3wadhidsh9x8qar1ryn7ahv308yzc5cl32wssk99rr7vrkcs00vn2kggz6drps08vk24gi9gmqpg39jd1rnaryykvh4vmnaj"; + sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; }; }; "fecha-2.3.3" = { @@ -1244,7 +1262,16 @@ let version = "2.3.3"; src = fetchurl { url = "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz"; - sha512 = "1v95kkfm8jnmrsplzk6zhsc2ngkvv2478pnvjnkl8z104b0mx3khf7xdps3dyi8d94kb73xcr5b2dmh58by9sirwcj0qk56hsf82hcm"; + sha512 = "lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="; + }; + }; + "fecha-4.2.0" = { + name = "fecha"; + packageName = "fecha"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz"; + sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg=="; }; }; "file-stream-rotator-0.4.1" = { @@ -1253,7 +1280,7 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.4.1.tgz"; - sha512 = "1jr6bdf22x3f4ql12ympal24yy1ggbxv5xl73ri70llghlcxr8wi9s8j40b5rf0h0sxm9m3g27qgck04aa5d7f9v19c0ws40bfrlxjv"; + sha512 = "W3aa3QJEc8BS2MmdVpQiYLKHj3ijpto1gMDlsgCRSKfIUe6MwkcpODGPQ3vZfb0XvCeCqlu9CBQTN7oQri2TZQ=="; }; }; "fill-range-7.0.1" = { @@ -1262,7 +1289,7 @@ let version = "7.0.1"; src = fetchurl { url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "2jrai6ri6sni8xyi8yji49ai8vkczbbiw6pb3pd9bcdizb58ncgnhnfmghhw87flm8y96y2z16738lwdyshby665nv60ljcwwbkvsm8"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; "finalhandler-1.1.2" = { @@ -1271,7 +1298,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; - sha512 = "1cfqk6g78cb12b1cki4pbcspsy40d0yny513myqji716njyhc5hrj7ll539kz96m6vn27168hhyqvd52cr5x1cs85mm7igfkrdrq1b8"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; "find-up-3.0.0" = { @@ -1280,7 +1307,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; - sha512 = "2bg49lifm64h5jqjc20612wrx7cazw9np9ms02ys94kif4li8cp5in4rvmb1c1ssa8yhbsqkgprykkj4lf3jbz8qrgp1mf8c93gl86p"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; }; }; "finity-0.5.4" = { @@ -1289,7 +1316,7 @@ let version = "0.5.4"; src = fetchurl { url = "https://registry.npmjs.org/finity/-/finity-0.5.4.tgz"; - sha512 = "3420xkd0dmzdspn9mf3c8hkgfm081kahfnnn03y27ahkdf5bm8slndl5ahmypqs11gnl34s7bcmvxy5lqc41x065rxavhvfbgzvjpyy"; + sha512 = "3l+5/1tuw616Lgb0QBimxfdd2TqaDGpfCBpfX6EqtFmqUV3FtQnVEX4Aa62DagYEqnsTIjZcTfbq9msDbXYgyA=="; }; }; "flat-4.1.0" = { @@ -1298,7 +1325,16 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz"; - sha512 = "0bj2zrb5x98lffdcjsvaf2hns9ih2jzj4dz9yg9k8zqrak4x0i93dvf01qp458mr6d1x4dsqsxc3ag00g2mskrr23h7x71kna4d67rz"; + sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="; + }; + }; + "fn.name-1.1.0" = { + name = "fn.name"; + packageName = "fn.name"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz"; + sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; "follow-redirects-1.5.10" = { @@ -1307,7 +1343,7 @@ let version = "1.5.10"; src = fetchurl { url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz"; - sha512 = "1alfnscb0lnmf1ka8d5jrp48bizkbqrdz616r7q9yv4afqadlli1xmmf7lsvany1kmmnmwpvhbgx70mvcsnjf1ywjnzmkmk53h6apni"; + sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ=="; }; }; "forever-agent-0.6.1" = { @@ -1325,7 +1361,7 @@ let version = "2.3.3"; src = fetchurl { url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; - sha512 = "0jj3hgqp9pmxmfavx6rvdfl3r4yf98clpsarqadz3hq0dxhjlh2ppd9x8bvmaq3nwjdqpdvqx25pwyin4ipixhgsn7s3p9fcc3wllnn"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; "form-data-2.5.1" = { @@ -1334,7 +1370,7 @@ let version = "2.5.1"; src = fetchurl { url = "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz"; - sha512 = "1aa6m5c13kybvcycjdyhr0qbb7097qs7kah89bbhynjs9r5fl6ibbhscpin31nshzhw5nszw5c6x10krrig90afh88la456cgflsvcv"; + sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA=="; }; }; "forwarded-0.1.2" = { @@ -1370,7 +1406,7 @@ let version = "2.1.3"; src = fetchurl { url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; - sha512 = "2wj74g6h0wq34x3d4ncr7h3jkv1fdznmqpd4wdb1jfaz0icha7h65jq8sq6y6n3bc0i0z6w577z7hq4yiz8y7v5yid6ma9ih1mkvv02"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; }; }; "function-bind-1.1.1" = { @@ -1379,7 +1415,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; "generate-function-2.3.1" = { @@ -1388,7 +1424,7 @@ let version = "2.3.1"; src = fetchurl { url = "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz"; - sha512 = "0lp1r8njdds2dp6nd5drc8f3xhg0bishvbn8g54s9ka42yss4lvq84sg465vgb2bw45kww8r4cilsw629nsnn34zkkfny8dyccpkq3r"; + sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ=="; }; }; "generate-object-property-1.2.0" = { @@ -1406,7 +1442,7 @@ let version = "2.0.5"; src = fetchurl { url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "0b7da6kb3xqk26cw4i6kb1lk911z06z53if2g8l23hmfpbhl6vfbn8iip55j1yplbqnly2abb9d349r6ky2z570839q3p9z2gf4y88g"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; "get-func-name-2.0.0" = { @@ -1433,7 +1469,7 @@ let version = "7.1.3"; src = fetchurl { url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; - sha512 = "30h0j9f3xj7mwciwmi9q9ilhlc0l391jrvv0xws0yxgh389ynin3qqrw8xiyfy5w3f667bwn9p0i3f01s2ir0ai1rwbb038ij4fxixx"; + sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; }; }; "glob-parent-5.1.1" = { @@ -1442,7 +1478,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; - sha512 = "1hi3ypyic536qm0jd2aw65wbaian4vxmgsnprw6p1mdfd75ks5x1mrgkgzl41xr6hnav27fqzpm227rj7qq8vcwb63m37m9cda3wwhn"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; }; }; "growl-1.10.5" = { @@ -1451,7 +1487,7 @@ let version = "1.10.5"; src = fetchurl { url = "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz"; - sha512 = "146i7if4fjml1p6xw1ybb7vm22k6i8yc7r8wcw8yia7qy385w1s6j18ip91g5mv47zvv5fw5m8kpzlaayjs183fkpg174hbw4xgh6m8"; + sha512 = "qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA=="; }; }; "har-schema-2.0.0" = { @@ -1469,7 +1505,7 @@ let version = "5.1.3"; src = fetchurl { url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "3kaldgfsh3lfvgvw31s8b7q345zf7ixjahllncdckcw6qfs3gnbsamdxgs9kfigq7rwmja7v51ghh7y0rsp6q7jmvmbydhh645wxnxh"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; "has-1.0.3" = { @@ -1478,7 +1514,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "37vh53c11hws66navka0w9xxm6rcr034bxpyvaldiqz1msafqf0jpi1aqxbaygs53arz9y510qg6dl6vrm285hrxniygs2l8lxnyrvz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; }; "has-flag-3.0.0" = { @@ -1496,7 +1532,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; - sha512 = "0mb9d5yqvznqmq073hdc4wl7175niiqpkpb7iqqv8p0q6xgmrhfap9ni6iwrx44w8p9vyg8n3zsllil5pdflzlh462dkydymfi2rdrw"; + sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; }; }; "he-1.2.0" = { @@ -1505,7 +1541,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; - sha512 = "0dwml2q9r97ga11qbbn5sb46v4g47lx174dz9g1jgxpycknhg1d5dlsij2vja905p8h243jj51hfa5cmzh8n9rdcs8r78lg86fl7z8p"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; "http-errors-1.7.2" = { @@ -1514,7 +1550,7 @@ let version = "1.7.2"; src = fetchurl { url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; - sha512 = "13c4825kzqlxdqfjrlrwh15ira0bjm9m3b8qcrfzaysiky1m3gb6dv6gcjgpnap9mbl0fajqiibzp1w5r8qnyn8glaj4wgzf6vh2i5r"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; }; }; "http-signature-1.2.0" = { @@ -1532,7 +1568,7 @@ let version = "0.4.24"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; "immediate-3.0.6" = { @@ -1568,7 +1604,7 @@ let version = "1.9.1"; src = fetchurl { url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha512 = "3gcwhv1wa2hb1vljlcmzhvzliks9rj7nzsw165vgy69jakw8g55ky474mj4j41vfbid8viy9nhwn9kx8pfqrikyl29i98zi9vmkz8nh"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; "is-arrayish-0.3.2" = { @@ -1577,7 +1613,7 @@ let version = "0.3.2"; src = fetchurl { url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"; - sha512 = "1cmy0k81vgz5z55rdyxfnx307053ksyp1lfgyj5jldkqqzmkx1z2k63fvzn7lgj8wdakmsa1mw408rm5xxfpk3avjqbnrb5yl56lm3r"; + sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; }; "is-binary-path-2.1.0" = { @@ -1586,7 +1622,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; - sha512 = "1gldm4swvg3612pg55yjza8dvpv4daf374dijjg8kcmndlq55933pdd7gw4gq4c2aa5fn9vnasz3h9spg3pd8p1rafkr91sxdhi3hb4"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; "is-buffer-2.0.4" = { @@ -1595,16 +1631,16 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz"; - sha512 = "3c1f1cy2867lfdcfxpy91qxbjxizlwa2dhz3mgckg17xd4xcx284ylzvfk3v7l6mdynrk7xc2rg31avi6caj053p7bgaf4p8ni6pb9a"; + sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="; }; }; - "is-callable-1.1.5" = { + "is-callable-1.2.0" = { name = "is-callable"; packageName = "is-callable"; - version = "1.1.5"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz"; - sha512 = "3wmff73yzck45x5shydqswbww8zkl03i43yhy7mm6av9770yvd2gj7xfrc8f45fw2ncn7mwblxvxlcap5rngmklkjiis902qgkay8hi"; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz"; + sha512 = "pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="; }; }; "is-date-object-1.0.2" = { @@ -1613,7 +1649,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; - sha512 = "39f971gzwirnxjw4b72c175nbn1hnmrn1wljvbzvxv69hw9vpialhjafh9nkh0g3p26a49zss3rr7pxfww1f6day4s89hmqkm7l6aai"; + sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; }; }; "is-extglob-2.1.1" = { @@ -1640,7 +1676,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "19c23n8r8rfbz5rgs5csbjbpwgxvwi7y6kpsvlylgs2v1r1z2zm18qzzz2g8vnnwaldn5c4qalpc6p88rl0gjrrm278j52ks0m2svg4"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; }; "is-my-ip-valid-1.0.0" = { @@ -1649,7 +1685,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz"; - sha512 = "1lnwwykigbkg3yqmr61cyiplxfdvpchcsi1fz67jwn55gvdrl597jpsd6jds205gjkn8c3zxbqmppmf3danpj0rrla7ffnicmwpys42"; + sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; }; }; "is-my-json-valid-2.20.0" = { @@ -1658,7 +1694,7 @@ let version = "2.20.0"; src = fetchurl { url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz"; - sha512 = "005dmrjrjkysq1ggcr34y7610cxy29gjkx91cv6lxl4gzk6hm9qmdqbbsx5qbcfd9b5vck824wgzk4pg5qfvq4mn44dpi0849jw2cax"; + sha512 = "XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA=="; }; }; "is-number-7.0.0" = { @@ -1667,7 +1703,7 @@ let version = "7.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; - sha512 = "2g7332xqrb0cm36cn6rwdmgq7sllf9w19sf6jy4w0s4vgqdq1kngsnpz0z49i3vnknk8ms442yjllrdbqxbap9ajprc8yrs91za4l73"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; "is-property-1.0.2" = { @@ -1679,13 +1715,13 @@ let sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; }; }; - "is-regex-1.0.5" = { + "is-regex-1.1.0" = { name = "is-regex"; packageName = "is-regex"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz"; - sha512 = "1hqaalcf1yqll2yzm71a1axvid0x87jp41hyicw16rl12rrh6sp6srr9lk7wxm6a1vl3ypw8qyd0imbq8fl2h7yq8l8xawdnkbrclmy"; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz"; + sha512 = "iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw=="; }; }; "is-stream-1.1.0" = { @@ -1697,13 +1733,22 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; + "is-stream-2.0.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + }; + }; "is-symbol-1.0.3" = { name = "is-symbol"; packageName = "is-symbol"; version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; - sha512 = "1lmzzy2360gfg5639x8mzi5fpc1bgpdx0ffjlqaz9affd0lvvpi7yjwk15jsm1y1l8rf5jahyapv6rm2w3p86gxkghsp0jjlj2s621v"; + sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; }; }; "is-typedarray-1.0.0" = { @@ -1748,7 +1793,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; - sha512 = "0lwyvximqkf1q5w94x2747nj2v035is66vzalrbl3f2gdh9k1m3m29p8zw6r65ps5784x2lxwz8akmv085l4ai358rwbp84axz59lj5"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; "js-yaml-3.13.1" = { @@ -1757,7 +1802,16 @@ let version = "3.13.1"; src = fetchurl { url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; - sha512 = "0kkjjrr0znm2ka89ywc5518c8dw0210z91fm94c7v11l8c96mkjh0ddld5mb7jmmnpzap7vn0fhvr29lma63c9is2ixq3fpp0xxrxk1"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; + }; + }; + "js-yaml-3.14.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"; + sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; }; }; "jsbn-0.1.1" = { @@ -1784,7 +1838,7 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; "json-stringify-safe-5.0.1" = { @@ -1814,13 +1868,13 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "kuler-1.0.1" = { + "kuler-2.0.0" = { name = "kuler"; packageName = "kuler"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz"; - sha512 = "20zvfs0bqxvpjlp6kx2fhafnldxfv36dqcac42qng3x9kh25vqy4w6910fs63p5d56yjghbrn36niix6wsyi9dbj3n9zmh6wx9dbn97"; + url = "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz"; + sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; }; }; "lie-3.1.1" = { @@ -1832,13 +1886,13 @@ let sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e"; }; }; - "localforage-1.7.3" = { + "localforage-1.7.4" = { name = "localforage"; packageName = "localforage"; - version = "1.7.3"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/localforage/-/localforage-1.7.3.tgz"; - sha512 = "20hynm98vq3srgz2h48290n0x06drf8avxm73rnqhkh036v5s5x2kk3phm2551p0zy3bh9hp5cjr6f0mwyhb4j0xi9fgqnwhz4safym"; + url = "https://registry.npmjs.org/localforage/-/localforage-1.7.4.tgz"; + sha512 = "3EmVZatmNVeCo/t6Te7P06h2alGwbq8wXlSkcSXMvDE2/edPmsVqTPlzGnZaqwZZDBs6v+kxWpqjVsqsNJT8jA=="; }; }; "locate-path-3.0.0" = { @@ -1847,7 +1901,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; - sha512 = "3jbllbkvv54d6k6zss6spzsknz5icscyfclf377jjpndb8mmacq0v9vjr1w07zjn14gaz4d2hfi0yaqk4nvg6hbm16qi70nrkivn0zc"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; }; }; "lodash-4.17.15" = { @@ -1856,7 +1910,7 @@ let version = "4.17.15"; src = fetchurl { url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; - sha512 = "3a41cs1932x00vd7h32v6rfkaak3vhkwv4x0bg27ilhlmbpl95r3abc4vja21k42cdfprsy3sdfcp2xs02sfp1fflf7m3n2gd29q4zk"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; }; }; "lodash.toarray-4.4.0" = { @@ -1874,7 +1928,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz"; - sha512 = "2fmk82kxm1wkgm5kgxx84nsf7pvyspj47axslj3sfcyx69hx1vymrgbqj00jfnmrjc80wb87xs3kyfa37k55wzhgvk6v21vw8d0sabm"; + sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; }; }; "logform-1.10.0" = { @@ -1883,16 +1937,16 @@ let version = "1.10.0"; src = fetchurl { url = "https://registry.npmjs.org/logform/-/logform-1.10.0.tgz"; - sha512 = "1d27lbbzad8mj23z63lca3z7y2mjwnzdcrj2zpvcdid78ds12jyc349g1yc0naxbqrl3cz2cw9lprhgwryxygzc634cgmsli266hvks"; + sha512 = "em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg=="; }; }; - "logform-2.1.2" = { + "logform-2.2.0" = { name = "logform"; packageName = "logform"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz"; - sha512 = "36z0bhkyb62pjrzaff6vpig94lzbaah80iq2hpy4pb49lkhxfawjlx9j8mw168wv33mb7i3lgl2xm2q82x0rc1qm95k0i24xbh62mps"; + url = "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz"; + sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; }; }; "loglevel-1.6.8" = { @@ -1901,7 +1955,7 @@ let version = "1.6.8"; src = fetchurl { url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz"; - sha512 = "044sm3k7yyjzkbvzw2fgqqxdbd7z7gwqsi4sz03kb9cagpnr4jn2gfsxkfrdn4m1gnxd7n0rjbrvxymzr6w3wcwma99s01x0zx3pibf"; + sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="; }; }; "make-error-1.3.6" = { @@ -1910,7 +1964,7 @@ let version = "1.3.6"; src = fetchurl { url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"; - sha512 = "2glh9fqac2bycfy6gmvv1r03pr484iglvv5ry3pjm6iz43h6qnkkw2l4sz9ydyadq6hip4wyjpj9jllbshxchh8k6lg5g5vsya23idk"; + sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; "matrix-appservice-0.4.1" = { @@ -1919,7 +1973,7 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/matrix-appservice/-/matrix-appservice-0.4.1.tgz"; - sha512 = "0l9avxiihfhkrlwsibbl641ic15lc4gbfzs8zgrsssnlifzmbaz547yng8862rg65rp77gdyw427hci4jz7ssz1x3lxzg6ff3syn4cv"; + sha512 = "mxHr9XDOvN/p6OFrfb4kkcEjCPftnXNzMS8Lg9Cz/pDy1arfRWq11vl9pL9bjzBaAouBGLpW1JzmCR2MsW+VKA=="; }; }; "matrix-appservice-bridge-1.12.2" = { @@ -1928,7 +1982,7 @@ let version = "1.12.2"; src = fetchurl { url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.12.2.tgz"; - sha512 = "1avi6wrbnajmrf8il54w8zzb9ghvyqm8b09k2l2x009ixhrb1sj8k5yw5qnx03p640llnfsv2qch492vncwij40qxkh9q72qbagfq3h"; + sha512 = "cGD31MLi4ARnx4DIyJndIhHIsNjaWUoBMXeAbnHhvkwkdVgZ9pgA6IKKmcBCFfsNX1r/I04KjcjlKpVdmZu4VQ=="; }; }; "matrix-js-sdk-2.4.6" = { @@ -1937,7 +1991,7 @@ let version = "2.4.6"; src = fetchurl { url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-2.4.6.tgz"; - sha512 = "110nkrnw1667nkd00z3j6bgsl3pyvx2al4iffipy7phz88b3c7l6n2r1agd1qqxvyk7ay75ir4ycw9kr7zlxjcy9kd5hq00dkhkmmf9"; + sha512 = "ydU64WwAYFjaTJ7JTv/JM3HmSY7leHWm3x3j0J4KWVhDDxsLoQ/v8Tc6FwlVom9/B9VvGTk+AG3aY0zgNk8LQg=="; }; }; "media-typer-0.3.0" = { @@ -1973,7 +2027,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; - sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; "mime-db-1.44.0" = { @@ -1982,7 +2036,7 @@ let version = "1.44.0"; src = fetchurl { url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; - sha512 = "2k6dwvka8mhl2jrx9zhc926nvifn7jpi4fcwjr3gdqik53ifzn67h986p9wcdd4qpc3hjmqpywdwssm5kw18bdn3xg1ag7cp9y97lzw"; + sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; "mime-types-2.1.27" = { @@ -1991,7 +2045,7 @@ let version = "2.1.27"; src = fetchurl { url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; - sha512 = "3pyj0i5wygq13w5i5i2ksjwrragi0p1dybqd5lvcd0gx21jxx1i1r567dbxklh9p50pwhaxwq9d4507hymr49ibz61xq8xc4sf6m214"; + sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; "minimatch-3.0.4" = { @@ -2000,7 +2054,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; "minimist-1.2.5" = { @@ -2009,7 +2063,7 @@ let version = "1.2.5"; src = fetchurl { url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; "mkdirp-0.5.5" = { @@ -2018,25 +2072,25 @@ let version = "0.5.5"; src = fetchurl { url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "32zxwnp110xb9sm0w7xdr51v2zj4k0b07yq702phnac2l8c91mxw6va27y193m42nvnw5dhby2jzg3b24fzjzkdr8337slz8ja81a9l"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mocha-7.1.2" = { + "mocha-7.2.0" = { name = "mocha"; packageName = "mocha"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-7.1.2.tgz"; - sha512 = "0j821z4q3x7gz52pwp0ccpwmrw4k67x07njcpbnzgiij7dnmbwvsnkbg7h7ylyhhlk9xhccbn9hr12vx9vqw6sdy728sa4c29ss9pm3"; + url = "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz"; + sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; }; }; - "moment-2.25.3" = { + "moment-2.27.0" = { name = "moment"; packageName = "moment"; - version = "2.25.3"; + version = "2.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz"; - sha512 = "1v4vcj4k5s10qp4b8r46xib1h9klyqv5y31da7w46i769dbgliqp7ff5yd6pxmfp37ghnlgkk33x10ashkg7aclszfgqrpiy782zriy"; + url = "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz"; + sha512 = "al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="; }; }; "morgan-1.10.0" = { @@ -2045,7 +2099,7 @@ let version = "1.10.0"; src = fetchurl { url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"; - sha512 = "1fzbmlpmyqjjnff6sjxk5h2ffib2ldzziy9x5k6200az86l7z9gqag28s6brw9yg2q7w0yjp69ir0p5qc5kfq7djy21xciqa82s1dq1"; + sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; }; }; "ms-2.0.0" = { @@ -2063,7 +2117,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; - sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; }; }; "ms-2.1.2" = { @@ -2072,7 +2126,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; "nedb-1.8.0" = { @@ -2090,7 +2144,7 @@ let version = "0.6.2"; src = fetchurl { url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "0xi79rad0khwah5v2k6pvh8ajjgi7hp3zlkg6gk11pv70ydcq7li0kzcv1gnaf13gmblzhvx7hxs2nhypphb0sp4cggiy4ympndr5c5"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; "node-emoji-1.10.0" = { @@ -2099,7 +2153,7 @@ let version = "1.10.0"; src = fetchurl { url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz"; - sha512 = "2zkcpjx5cbyc76hfkbldxgkkcs4cns9n7fqfnc2cxh3fsw1dr7zgbhh5pczvg34yclih7ja68xpvvrg2dy8hiv5c20pxr0zhbrzgpb2"; + sha512 = "Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw=="; }; }; "node-environment-flags-1.0.6" = { @@ -2108,7 +2162,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"; - sha512 = "0gis4xp1wacn31j3p8vdd32ykzs2pskf8pgfjkm092zcx72v03dphpsayrls8bmmi91s6ic4718lgi28mm40hj96f9ywbvfxbcz4jz4"; + sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; }; }; "nopt-3.0.6" = { @@ -2126,7 +2180,16 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; - sha512 = "0n301s7qa4645iyk3zpcgin8r19p0p8h8g50c3mnnrl9n3m9rpyxv79hjl6miix9daq12s69am1sbskhqnzbabmn2id0nippgj6rrp9"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; + }; + }; + "nunjucks-3.2.1" = { + name = "nunjucks"; + packageName = "nunjucks"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.1.tgz"; + sha512 = "LYlVuC1ZNSalQQkLNNPvcgPt2M9FTY9bs39mTCuFXtqh7jWbYzhDlmz2M6onPiXEhdZo+b9anRhc+uBGuJZ2bQ=="; }; }; "oauth-sign-0.9.0" = { @@ -2135,7 +2198,7 @@ let version = "0.9.0"; src = fetchurl { url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha512 = "1jz644r7ybsq688ifahm64ih3ljqjjskm533bgir20pvc350f9cl0z162scih0r1idx8lpw5f8hxa2pkf0lhbdhr5y6ak2ga5863v3x"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; "object-hash-1.3.1" = { @@ -2144,16 +2207,16 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz"; - sha512 = "06crm6ynp4rxakk4frrb4kjmi758r38fs5h0f6b7giyxhj0dghb6mdx7sbp0nhnk2w8cyb1bli07d9nbm086i34j8yx641qjpzawarr"; + sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="; }; }; - "object-inspect-1.7.0" = { + "object-inspect-1.8.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz"; - sha512 = "19lmsxagwl8zzqckw6p0bdjwjbq2bshicnw78az9ka40d0gjghmdm0ify1n3857fxadv43c6v0g27rk1dl514iwh40a5i3mv0fl9fkb"; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz"; + sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; }; }; "object-keys-1.1.1" = { @@ -2162,7 +2225,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "0nf2rr25ncya39v7cq274x3w4drfbdrc3iqdwd017s1wndwh9plsjagbvhl6j6l6piipprdsvgfx4vfz8q2piz7bi4bjcll8d4h9q1n"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; }; "object.assign-4.1.0" = { @@ -2171,7 +2234,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; - sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv"; + sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; }; }; "object.getownpropertydescriptors-2.1.0" = { @@ -2180,7 +2243,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha512 = "1b08dy2xs3gqhwviks5245b0m3fa6kkdcqi8wldr5cfvkpgwbvdx474k9y5cjnsf2z075gysifxsc39i59fslxrl55kgpa03xmcx7b7"; + sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg=="; }; }; "on-finished-2.3.0" = { @@ -2198,7 +2261,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; - sha512 = "2n6994y8y4b146a5wpzzgw779yc227cqkmwsifc3fbn2kc9dzypjigqf72bpgsqrk7gs93l6fk4iqdk752jnsnpr89j58sbabw09455"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; }; }; "once-1.4.0" = { @@ -2210,13 +2273,13 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "one-time-0.0.4" = { + "one-time-1.0.0" = { name = "one-time"; packageName = "one-time"; - version = "0.0.4"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz"; - sha1 = "f8cdf77884826fe4dff93e3a9cc37b1e4480742e"; + url = "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz"; + sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g=="; }; }; "p-cancelable-1.1.0" = { @@ -2225,7 +2288,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz"; - sha512 = "2bmkd9ncr81p8w6jy9v676ajg9q27znbjk80r723ydvf8gxk000q13693dhbd22dcagrmhwyjxblmm8w4xnfn6ng5srpkkqwv2dggdk"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; }; "p-finally-1.0.0" = { @@ -2243,7 +2306,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; - sha512 = "3mmng2h8sji2ah2j3f5gf0c26j2cmfwwqwck4kbpm8srxllwa8q1fd8jayhrk4f46g6zmw14lrzd4jc04079w1cqhjiy9wjanc3rzzz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; }; "p-locate-3.0.0" = { @@ -2252,7 +2315,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; - sha512 = "14sa2r3zdhvy3sq757d4l21nxrlb7picyigb8zm956bbjadcv22chrfa95wzzrf28z0cyj62b6yihhdc9508q82gs2q3yz8yk1pdvf7"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; }; }; "p-queue-2.4.2" = { @@ -2261,7 +2324,7 @@ let version = "2.4.2"; src = fetchurl { url = "https://registry.npmjs.org/p-queue/-/p-queue-2.4.2.tgz"; - sha512 = "2gg2x51sw9m0zkdwnjpl5qldvapn19wkyf8zam8gzh2s77xnxcbxvvdhdhadavg4dcp6h1v68ni19kdbci1kd875pl1ih6943xz5kwz"; + sha512 = "n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng=="; }; }; "p-queue-6.4.0" = { @@ -2270,7 +2333,7 @@ let version = "6.4.0"; src = fetchurl { url = "https://registry.npmjs.org/p-queue/-/p-queue-6.4.0.tgz"; - sha512 = "13h8pdq8v2smhrh39bf4ks1z8cdik8qcv2df1wj3bxgs3k090sxccxxg9q1qjj120lvs1ki6cj9rc9aapqdyb95zk8v5ych333mvdsz"; + sha512 = "X7ddxxiQ+bLR/CUt3/BVKrGcJDNxBr0pEEFKHHB6vTPWNUhgDv36GpIH18RmGM3YGPpBT+JWGjDDqsVGuF0ERw=="; }; }; "p-retry-4.2.0" = { @@ -2279,7 +2342,7 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/p-retry/-/p-retry-4.2.0.tgz"; - sha512 = "2cdd5shqcldjwsdr9wiccvsx1f27mx7lblp872mlm16kwamgy83swzwq5w9hlr98qwbzswldxp4jq9q9l0d6am752vnx1qiygrzgwcc"; + sha512 = "jPH38/MRh263KKcq0wBNOGFJbm+U6784RilTmHjB/HM9kH9V8WlCpVUcdOmip9cjXOh6MxZ5yk1z2SjDUJfWmA=="; }; }; "p-timeout-3.2.0" = { @@ -2288,7 +2351,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"; - sha512 = "03cbpzps5mxhlp6hywp92mnnrj4b6ag82f8vdqyz59xrxsrpn58qbh8nzrpiix2asj2d333i81aq0pw9bhki4yw7yf05hr04x9k04mf"; + sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; }; }; "p-try-2.2.0" = { @@ -2297,7 +2360,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; - sha512 = "1skmb50xzdk3qzd1f9l5mw8xp29frkizl63bhb9l1amivqybqb23n2824906vx790hjlwyhhrfzpzr5xr6ilzvy1xyl0ly0ah0wz2a7"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; "packet-reader-1.0.0" = { @@ -2306,7 +2369,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz"; - sha512 = "1fkk6mw49b8mqs4rghv7bwpyvgj3qkcj4qz8zkrwcw0xcwg7q0cdd1w17i962ppxl3d6rss2a03ws5b7ihz20207g2r27mpy7ysw0hw"; + sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; }; }; "parseurl-1.3.3" = { @@ -2315,7 +2378,7 @@ let version = "1.3.3"; src = fetchurl { url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "2lzxqjq4zp60k9gbskpqz7pr1yvb0c6nygd42sia7n6km2gc0cc844nlc5d6r9sshrjhjvs284143jzvz9wzd4r6xr9dz2k24xrwb0a"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; }; "path-exists-3.0.0" = { @@ -2342,7 +2405,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "37qw5986wccpwwqckqky509s4nd6zwv200s9r2v6mcf5nsyxgf2x00m4yp918mkkz84sdh4q0kjbg0hhfq4flpz0l6v47hvc57qwa8r"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; }; }; "path-to-regexp-0.1.7" = { @@ -2372,22 +2435,22 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pg-8.1.0" = { + "pg-8.2.1" = { name = "pg"; packageName = "pg"; - version = "8.1.0"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.1.0.tgz"; - sha512 = "19rxgl1nvww0s9csajl3j2q04j6gw6wnlbnpq4z7scayycs7721rfga1qmgmlaxkvh3fap43qqrirsxh6wj2q31fgnkqq66si49g7r6"; + url = "https://registry.npmjs.org/pg/-/pg-8.2.1.tgz"; + sha512 = "DKzffhpkWRr9jx7vKxA+ur79KG+SKw+PdjMb1IRhMiKI9zqYUGczwFprqy+5Veh/DCcFs1Y6V8lRLN5I1DlleQ=="; }; }; - "pg-connection-string-2.2.2" = { + "pg-connection-string-2.2.3" = { name = "pg-connection-string"; packageName = "pg-connection-string"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.2.2.tgz"; - sha512 = "2masbrlwl4dan6y1qp1scs1y7j4qblmvdf006wslc1kj90zh2ipcqwqlmaqad1wr7dnlap7s6hybrcbn85r884w16ir0jdf67haa5zs"; + url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.2.3.tgz"; + sha512 = "I/KCSQGmOrZx6sMHXkOs2MjddrYcqpza3Dtsy0AjIgBr/bZiPJRK9WhABXN1Uy1UDazRbi9gZEzO2sAhL5EqiQ=="; }; }; "pg-int8-1.0.1" = { @@ -2396,43 +2459,43 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz"; - sha512 = "2kr12hlmhrlca9f6gb14rvq93rn1z4ydmgv0ll7vak0nl5xxggq27y17346c3wj5afw3imsbvpaqcwjymb55hchj89czpdd5rnmlasq"; + sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; }; - "pg-minify-1.6.0" = { + "pg-minify-1.6.1" = { name = "pg-minify"; packageName = "pg-minify"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.0.tgz"; - sha512 = "3v9hxw7f1r7k4lz9lkz7757anv76xclkafdk534yxfmd3qbnikn5f5f3rcfdvlkvlsg5vh8b69lyahbs9x27bpyg9bmzfj73yx5v375"; + url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.1.tgz"; + sha512 = "ujanxJJB9CSDUvlAOshtjdKAywOPR2vY0a7D+vvgk5rbrYcthZA7TjpN+Z+UwZsz/G/bUexYDT6huE33vYVN0g=="; }; }; - "pg-pool-3.2.0" = { + "pg-pool-3.2.1" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.0.tgz"; - sha512 = "20fvxybgsq315qj83xcgnii0aysl8pzr23flwzpndidax4zy48bp0f13zj32dls45jrw68m62w71c9w16vn9rnv2diz2z64s06g04pc"; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.1.tgz"; + sha512 = "BQDPWUeKenVrMMDN9opfns/kZo4lxmSWhIqo+cSAF7+lfi9ZclQbr9vfnlNaPr8wYF3UYjm5X0yPAhbcgqNOdA=="; }; }; - "pg-promise-10.5.5" = { + "pg-promise-10.5.7" = { name = "pg-promise"; packageName = "pg-promise"; - version = "10.5.5"; + version = "10.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.5.5.tgz"; - sha512 = "3s3cyq162gdkgmdbc14skqwa4pyjx9cyia2148l9mlwfz2kqwfppmakzjp02q3z3bxjvlah51rlxdi5438r1fafqbsc1f3pngjs1k8i"; + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.5.7.tgz"; + sha512 = "feCpn4J4MsNnR5Ve3fpbIlmbohwRirvZEI1Dcy72zwKvIKKRHPk7TJZFQHP4YQhaZ3sT3VGgg0o1/I+uhht/1g=="; }; }; - "pg-protocol-1.2.2" = { + "pg-protocol-1.2.4" = { name = "pg-protocol"; packageName = "pg-protocol"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.2.tgz"; - sha512 = "2m49phqnmaig70q5a3ny43y8r5ks1sm3w1xrcfhwwchyrpdpgwnxmj3vhgw0i0rg49wwgwg1zj5c99rs2gi989riq6cgpd4fg24dj5g"; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.4.tgz"; + sha512 = "/8L/G+vW/VhWjTGXpGh8XVkXOFx1ZDY+Yuz//Ab8CfjInzFkreI+fDG3WjCeSra7fIZwAFxzbGptNbm8xSXenw=="; }; }; "pg-types-2.2.0" = { @@ -2441,7 +2504,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz"; - sha512 = "0c38xh9gvx9z3lxphm8y090qzm5rj4n7a9a80ls7dsf772ygk52w4v1pbn8il48wrrhgsqdshhhrxqff2pn641178wcp5rcn6b00c59"; + sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="; }; }; "pgpass-1.0.2" = { @@ -2459,7 +2522,7 @@ let version = "2.2.2"; src = fetchurl { url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; - sha512 = "1d2xjd4r28xk5ggmns7n33nvga0ywk30plvs17dr70qwq0jc17p8kmfsm50idvj6xdrj1fikz0yv63x1pychmz90bs6mkj7wvskyhxb"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; }; }; "postgres-array-2.0.0" = { @@ -2468,7 +2531,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz"; - sha512 = "2wdj5g97ilfpmjbpn3cmzhfysw77z8x3hqxvlmcknxm6488jpxvjshdqmd8m59ydhznadxcq1wlnfynh2877di58dgay0rrlm96p5jn"; + sha512 = "VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="; }; }; "postgres-bytea-1.0.0" = { @@ -2486,7 +2549,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.5.tgz"; - sha512 = "24bvdwh2jsv4xbp64ansgpqi55db9xbdv4clyh3aajxvx1lc4wm5mw8aqkf5f144szp2ram50ziy49bqqcr0c24c501f4agcklaxmm5"; + sha512 = "pdau6GRPERdAYUQwkBnGKxEfPyhVZXG/JiS44iZWiNdSOWE09N2lUgN6yshuq6fVSon4Pm0VMXd1srUUkLe9iA=="; }; }; "postgres-interval-1.2.0" = { @@ -2495,7 +2558,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz"; - sha512 = "1jy8mn5fadqlhqhznmyr55ghlzi2k9bxvvbyqbzb8rzzw101gbphlz18jyd533qqhkqf9wdyj3wc68vvdhvjbss6xs7xhzbrwl5g67m"; + sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; "process-nextick-args-2.0.1" = { @@ -2504,7 +2567,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; "prom-client-11.5.3" = { @@ -2513,7 +2576,7 @@ let version = "11.5.3"; src = fetchurl { url = "https://registry.npmjs.org/prom-client/-/prom-client-11.5.3.tgz"; - sha512 = "3hnz5ii2bvrrh14qkfcnxkjsxwfrcasfr34masbkwg1n4c41yvv1ir5k9ylmc806izl1xcjzyhidsb3qp832x7vva5lrdnvchbbcgcb"; + sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q=="; }; }; "proxy-addr-2.0.6" = { @@ -2522,7 +2585,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "0xy6dm0910h3nsa0ik45yccdfm6f84nl3h9dpkb22crqhdr3mmiczcbrq9z53gq7l2ijxhxi3pzsfzafrzymw4c1nn68ml1y2pdy7vn"; + sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; }; }; "psl-1.8.0" = { @@ -2531,7 +2594,7 @@ let version = "1.8.0"; src = fetchurl { url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; - sha512 = "0hn7s5bxnn3k2hiqh8fmm7bvq4vd6j0a5hwj09jk31r1ylv6q28g5hl3z70m3gycwfb40vdp04fqi59hdjih3jz0fhszg0s5b7lx1s4"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; }; "punycode-2.1.1" = { @@ -2540,7 +2603,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; "qs-6.5.2" = { @@ -2549,7 +2612,7 @@ let version = "6.5.2"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; "qs-6.7.0" = { @@ -2558,16 +2621,16 @@ let version = "6.7.0"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; - sha512 = "34x6fm4dnq8m0kps5ann831k8fvx7jzlrcw8vvri0ki2g2ywdrjr8j5y14bvj9c0fd01ndsyx43y6ji51bfhnxk2gr5fpsks52429sl"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "quick-lru-5.1.0" = { + "quick-lru-5.1.1" = { name = "quick-lru"; packageName = "quick-lru"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.0.tgz"; - sha512 = "00p370py6dg4v3n92n6ma2a1pn9sa2j1dq1hah5935s1fghs4x3l4aqx149i2d2ix18rgk2rmrcdkd9sqjmxj985sizmklisd1hlc2s"; + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz"; + sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; }; }; "randomstring-1.1.5" = { @@ -2585,7 +2648,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; - sha512 = "15b00vag4wijzsp0lwi9jznpz16n858vq5p1p3dgjrqqil9c6d4x55s1nl1fi4cbq8307bylbvkd9qkhyk6qib8ksh8raibxb3jrf0y"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; "raw-body-2.4.0" = { @@ -2594,7 +2657,7 @@ let version = "2.4.0"; src = fetchurl { url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; - sha512 = "3flyhj96ayiy8is22lwh9sp1yqq9ksym43x22yri2ikzladqqzxj6z657bc0xb5f2wl7qr2ja4byf57c9f7l2d3wqdglxih886zrv70"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; "readable-stream-2.3.7" = { @@ -2603,7 +2666,7 @@ let version = "2.3.7"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; "readable-stream-3.6.0" = { @@ -2612,7 +2675,7 @@ let version = "3.6.0"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "1s8hs6ax9jwmmw558j3hyfx5lfn7qf66xg0giplz9jci7d8zp2d8vh96dzlis6xzpxfa5b2zbm8nm4mgsr71r6rl3w3qyfanb5qfn05"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; "readdirp-3.2.0" = { @@ -2621,7 +2684,16 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; - sha512 = "0chzz12q3inpmwm6b4gi7g9n39jp24ah3mmjgss87hfsbx86vnxf49bx9wk2ng66037x2fh0cjf5rgx00c1m86lqlh7r6g9xm13ifbj"; + sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; + }; + }; + "readdirp-3.4.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; + sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; }; }; "regenerator-runtime-0.11.1" = { @@ -2630,7 +2702,7 @@ let version = "0.11.1"; src = fetchurl { url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; - sha512 = "03d4l8l8cyywh93wf5vw84lq56jh1b1d7jll4ny4z060j9hvx7w5q3q0b8q227jm93749k1c9h86r2pz0bm2xq5vp14g3r2kbvqc2rj"; + sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; "request-2.88.2" = { @@ -2639,7 +2711,7 @@ let version = "2.88.2"; src = fetchurl { url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; - sha512 = "23hm71jcxrwvp33azx8mx3w6dg21fr4w6lwvkvxyf6ckvhk3hz9dk8lzgkbiyzfl9ylhp4n807xp88ppq4gj5h07cmrgxf6nwxfvjrj"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; "request-promise-core-1.1.3" = { @@ -2648,7 +2720,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz"; - sha512 = "00riv5nw32j70g67b1ll1h599bvdbnkgasnwl1m26pfdgdmgr6zaq500mprx5n77yrnhza27vs3c9icb4z5h6wnwmlha6f81bw3d2s0"; + sha512 = "QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ=="; }; }; "request-promise-native-1.0.8" = { @@ -2657,7 +2729,7 @@ let version = "1.0.8"; src = fetchurl { url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz"; - sha512 = "0qx1n06bjj430fidkma2dr90dmrixiza4ymk561v1xxpd5yp7r36lwirgsdn0nvra7s4xs9gs1xhd6fxvlps6q1wh5xq7m4d8n71akm"; + sha512 = "dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ=="; }; }; "require-directory-2.1.1" = { @@ -2675,7 +2747,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; - sha512 = "2d0gd2x49nz3hgfwms6326sjw5fx7gqf997dnggc7l084cibgang6wr6ryksky32fvdz1bq72xm73kfxd3lj2qnfyjsp57jq287k8rl"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; "resolve-1.17.0" = { @@ -2684,7 +2756,7 @@ let version = "1.17.0"; src = fetchurl { url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; - sha512 = "3byf4g1wqfhz5vqx4rbssknblmf4hbjxijmlzvnr7z2l54yr1m4lk14bly6kk6mkdhncfzvvikzk449liiia1ilrfv5iwcmi0jvpkw9"; + sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; }; "retry-0.12.0" = { @@ -2702,7 +2774,7 @@ let version = "5.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; "safe-buffer-5.2.1" = { @@ -2711,7 +2783,7 @@ let version = "5.2.1"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha512 = "1fq5yb2drm5x0pvp2ansqp7p3lq7q9p9z1pfhqfjgqs0ycq9zpnid55m5gx8ani9cwmjjcmn7nnn8j1f6iq3bxi56kdjwfa9six57df"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; "safer-buffer-2.1.2" = { @@ -2720,7 +2792,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; "semver-4.3.2" = { @@ -2738,7 +2810,7 @@ let version = "5.7.1"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; "semver-6.3.0" = { @@ -2747,7 +2819,7 @@ let version = "6.3.0"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; - sha512 = "17wg4dv63jhss5hwqd135zz67r5c30b7a1xz33kfa7knxr0wfypyb8mj2xmc3l71qkxrz569n89xwp5d77m7adn0sr5wzfjlh2m6zvg"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; "send-0.17.1" = { @@ -2756,7 +2828,7 @@ let version = "0.17.1"; src = fetchurl { url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; - sha512 = "016qgvxg1si6vn34p7piyc8mhvmav1zscm294wkcjf221y1l9zk5kwk5z6yn1ixspj12df25bpazb2h3fdclcf59xqc2h4w46r4mi86"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; "serve-static-1.14.1" = { @@ -2765,7 +2837,7 @@ let version = "1.14.1"; src = fetchurl { url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; - sha512 = "0551vv6s1vgk5krzdn9cwnybsv6g4cyqpkk1dlkyv1pd8n7m8r7pi12r16bw12dzwl6ghj4qwizjsxc8vl26lv9c61fkq9r059yzji4"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; "set-blocking-2.0.0" = { @@ -2783,7 +2855,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha512 = "01qxzb0a6jrcxa6qh776v04ihqrmcy3qfbp9drfsjhfcsmaqd21mppr3ndj970ixfh6bpm8ai45jyqyzjfjw26pcyd82y6pyrcl1xr6"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; "simple-swizzle-0.2.2" = { @@ -2801,7 +2873,7 @@ let version = "0.6.1"; src = fetchurl { url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; "source-map-support-0.5.19" = { @@ -2810,7 +2882,7 @@ let version = "0.5.19"; src = fetchurl { url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; - sha512 = "0dsfcfq64jhz0vidzqf94hmh4vlzhfid0z2wnr5fdv2lkpv7dvcqbya7fpha9cwqlpkc8w2if8z9aixdkcglh87370rq8426gpyd2as"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; }; "spex-3.0.1" = { @@ -2819,7 +2891,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/spex/-/spex-3.0.1.tgz"; - sha512 = "06c3i67lmyilbk851pqd0iy8vcd78y81p3mkbqzfcl69pmxx8n8qbjc3fpy8w3j70xsyi1hwl4761pfj93vb9ik3m7na1np99jrdf56"; + sha512 = "priWZUrXBmVPHTOmtUeS7gZzCOUwRK87OHJw5K8bTC6MLOq93mQocx+vWccNyKPT2EY+goZvKGguGn2lx8TBDA=="; }; }; "split-1.0.1" = { @@ -2828,7 +2900,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz"; - sha512 = "2916kdi862ik0dlvr2wf2kvzmw8i8wk5spbr9wpdcksrkhrl3m0082jj1q4mqzvv50mlah5s4vcy6k18nacbj09kxbzp2pbysh8wg4r"; + sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg=="; }; }; "sprintf-js-1.0.3" = { @@ -2846,7 +2918,7 @@ let version = "1.16.1"; src = fetchurl { url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; - sha512 = "0i4jnrxh6i17qij2vfki7qxmk435cnacvg363qg0hya5incfj57akgbas8zcx2cl5pds9jfgfyhqm8wlqz6damsg059gymv99aylx8x"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; "stack-trace-0.0.10" = { @@ -2882,7 +2954,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; }; "string-width-3.1.0" = { @@ -2891,7 +2963,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; - sha512 = "3bix3jva53vcp1im3aa1y2v1lywkm7ix81gkwkj4915s2675pmw1c9n5x98q1m985hzgwkk1fnc2q78qz7s0fixhf994md3lazxr9xx"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; "string.prototype.trimend-1.0.1" = { @@ -2900,25 +2972,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha512 = "3mb88v9lf22jx2d71lnxcxvixdfypq1iq7ys5f3zv0ayv2w3cij73wnfbq43yyd8gdyjn1k29pphx639shjk39pn6c9mdlk8qaz24rd"; - }; - }; - "string.prototype.trimleft-2.1.2" = { - name = "string.prototype.trimleft"; - packageName = "string.prototype.trimleft"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; - sha512 = "15qfz59cpsj9svgvcs24q6h47jfy5zfhg7dy3b8ik3nvf97vhvijy8d51vrprx4z0vfyscg7i2xv9qs960h1pvnmzm1n95m6svk8840"; - }; - }; - "string.prototype.trimright-2.1.2" = { - name = "string.prototype.trimright"; - packageName = "string.prototype.trimright"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; - sha512 = "0b5kvxgqr55r745bccsjz35w9galqf42rm3lf5f4p2i21c4yq5l0fz0s03z4gq1d7yi52i3x6n8fa1n3fhlplc8d49vlaipqvp51m34"; + sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; }; }; "string.prototype.trimstart-1.0.1" = { @@ -2927,7 +2981,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha512 = "13md9cfrlvkvbprd9svis80yjkv8glqai07nlqizqi2yhxzhw7mxza2jhb6k6mx1z67ndgf4dcf0hy5579fj8772hsi5b3g1bwnf5jz"; + sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; }; }; "string_decoder-1.1.1" = { @@ -2936,7 +2990,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; "string_decoder-1.3.0" = { @@ -2945,7 +2999,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; - sha512 = "1w0mz57mvmqykm0jwma6lr4i9pip8p8c1ldaax7sxnrl6j0jbrkwggs037r1psmac0w04i9mb2rc1gzj1n2f0xvy1fr332n9pqmfi46"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; }; "strip-ansi-4.0.0" = { @@ -2963,7 +3017,7 @@ let version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha512 = "1cf4mpsr46nik5xxyb9wc4cz6c4yymi2ijpfx1nghnkl39l8pgq1sc7q19jzrjkwpn9i7hwg4q3rs4ny3vssrc6506an1lv0bb6rr0f"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; "strip-json-comments-2.0.1" = { @@ -2981,7 +3035,7 @@ let version = "5.5.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "2ihqi2z38fr1sq2jvwqgjqymncmkhxqz0x3bi97w4b4fn24wsdy71j139p95sb3nfrh3a449n0sqhm1z0jsi04860y8vdy8sp0n6da2"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; "supports-color-6.0.0" = { @@ -2990,7 +3044,7 @@ let version = "6.0.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"; - sha512 = "0p5l02lyminbqmcpm7257093sd8w5ca7q5xnnym2z71bwbhmisnyzn2jh5xma418sx29m8yinka6f7rphc7dl76lc88bm2w4z14lzx2"; + sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="; }; }; "tdigest-0.1.1" = { @@ -3008,7 +3062,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz"; - sha512 = "1pazh99870gi3zslirzkribr37akp4zc5r73q78y89vpzjlcmpdrv7qx6wc3x2bwl20xcrq5hhs7cv3rzk8llm38nhqq9z0dhsldrds"; + sha512 = "uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="; }; }; "through-2.3.8" = { @@ -3026,7 +3080,7 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "2qkrna8q80arai14s6f17djc3cgwiilnhibfykwzkif4gs9ny3fmqmxqf56fvc7fjwyr01p97nk1ckd67s8476cslmj3rwp7s5zp4zb"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; }; "toidentifier-1.0.0" = { @@ -3035,7 +3089,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; - sha512 = "1bip1yxcfy4c0yl2kwmj9jyzfg1ixyj564wd1aaf46rabdiasx62yznb8bwn9cki886f353axgca42zma7q9rb4b50lhm1zz7y8g8y9"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; }; }; "tough-cookie-2.5.0" = { @@ -3044,7 +3098,7 @@ let version = "2.5.0"; src = fetchurl { url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha512 = "3xgcny117pqhfncr4gbmagzlnjiqqgq0lrvmljdfcdy64nc0xjfcbf1r08dmp1v1m3s51kq0yxc18nl3j9lbpr5bp5lgmi6719yqlly"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; "triple-beam-1.3.0" = { @@ -3053,25 +3107,25 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz"; - sha512 = "0ppdjj0px3nrh57jbdhh12f3hx0xc2zg2zn61h3sdws4glcixr2k793bkv7hakb273pw8jq4qaxn0l28z658biy4bkd59a7bsyx9cay"; + sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; - "ts-node-8.10.1" = { + "ts-node-8.10.2" = { name = "ts-node"; packageName = "ts-node"; - version = "8.10.1"; + version = "8.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.10.1.tgz"; - sha512 = "2zyrdhgyii4klwqhy8r5pps3w0g6x6rpbqnifm75sn9ws67zlalw9fbsfwfwkbww3n729hil48a6nxkavb1x4jypa4pi40ypva77lvd"; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz"; + sha512 = "ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA=="; }; }; - "tslib-1.12.0" = { + "tslib-1.13.0" = { name = "tslib"; packageName = "tslib"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.12.0.tgz"; - sha512 = "2l8pn1y3qicb8m0bf97jljyxbyjkarikq1z6vgh2rq527v2ah57p0rhsngsqx3ad4wzfchg8mlz2s4aylff6lvxw1gjp4zl8d145g76"; + url = "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz"; + sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; }; }; "tslint-6.1.2" = { @@ -3080,7 +3134,7 @@ let version = "6.1.2"; src = fetchurl { url = "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz"; - sha512 = "24dh0i5b1rkxy5g1n9d0kf4rg6layq6z3l5jg2hyz11lk8zdpqx2b03s0kwnjhx4l4ywg3js616wbh00nh3cmpw3g84f4xps8nnn8sk"; + sha512 = "UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA=="; }; }; "tsutils-2.29.0" = { @@ -3089,7 +3143,7 @@ let version = "2.29.0"; src = fetchurl { url = "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz"; - sha512 = "2cc8fsdfbgfcjj6y7dlr0kpmkhbw0j69cak4s21jb44w57dlwksrjx8wn1h4f1j2vx8dhj9mrqsbmmwd96mrsd59743ghq948f5b4l3"; + sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; }; }; "tunnel-agent-0.6.0" = { @@ -3116,7 +3170,7 @@ let version = "4.0.8"; src = fetchurl { url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"; - sha512 = "3z3kf4kgd3czn50a158v1k2l61lpbznrbk8xvh2pdsfsrcsda3271427fzmp1r7awnvvzrhzclfm03cpv671rdlqyz56xpmh6cgzyni"; + sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; "type-is-1.6.18" = { @@ -3125,16 +3179,16 @@ let version = "1.6.18"; src = fetchurl { url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; - sha512 = "3r7402x79nilhdgk4z21yjh5y9vix8lwlll1kzcn8jd2m89vzksdb6wddia77cxv3iwhd6i5hkv6n7diwjbhpy7y03i2kqlvfplli2f"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typescript-3.9.2" = { + "typescript-3.9.5" = { name = "typescript"; packageName = "typescript"; - version = "3.9.2"; + version = "3.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.2.tgz"; - sha512 = "15y587awly8lrclsfw0fp2r1545332rrpf0g7cpi90jj67sryyj76hgbb1fna5bzwlg3940bmnyhd7qmll6nwi86n6vpf7zi6mjssdb"; + url = "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz"; + sha512 = "hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ=="; }; }; "underscore-1.4.4" = { @@ -3146,13 +3200,13 @@ let sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }; }; - "unhomoglyph-1.0.5" = { + "unhomoglyph-1.0.6" = { name = "unhomoglyph"; packageName = "unhomoglyph"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/unhomoglyph/-/unhomoglyph-1.0.5.tgz"; - sha512 = "1p3flai5dwdy5krysfl6wjvz6b3pmkkzxwwpcycfkq93k17ghw7frlc5rnm1ra43h1a6lg6q44yp9ga19zhjv2q0nw3m0m8n7d31l5c"; + url = "https://registry.npmjs.org/unhomoglyph/-/unhomoglyph-1.0.6.tgz"; + sha512 = "7uvcWI3hWshSADBu4JpnyYbTVc7YlhF5GDW/oPD5AxIxl34k4wXR3WDkPnzLxkN32LiTCTKMQLtKVZiwki3zGg=="; }; }; "unpipe-1.0.0" = { @@ -3170,7 +3224,7 @@ let version = "4.2.2"; src = fetchurl { url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "2fz60s71ghl56ddfiiaws81xpiidlbjk69jyjmahz190d2advy9zdbcwh5if4rgg5hxdbfxhkwiipjrnjy8w834bxsmzambd2p4b3r9"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; }; }; "util-deprecate-1.0.2" = { @@ -3197,7 +3251,7 @@ let version = "3.4.0"; src = fetchurl { url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; - sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; "uuid-7.0.3" = { @@ -3206,7 +3260,7 @@ let version = "7.0.3"; src = fetchurl { url = "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz"; - sha512 = "057la6a6bzkdwiz137vdyjaigybq0gyc3i8xvgc3gs4ja5blpjwbq9si4zmji0cgb81wzsj44q8l1nrmmjgkpazl1h3d1ap99xs9x0c"; + sha512 = "DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="; }; }; "vary-1.1.2" = { @@ -3233,7 +3287,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; - sha512 = "0hr4hxkk8yb9fz993bs69pf8z2z2qb6sdpxfxb84sd16lja9fsx444pk1ang1ivmjjv5srnsm6fihdj593w7rwxdh834cdmd9hms4hz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; }; "which-module-2.0.0" = { @@ -3251,16 +3305,16 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; }; - "winston-3.2.1" = { + "winston-3.3.2" = { name = "winston"; packageName = "winston"; - version = "3.2.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz"; - sha512 = "0xywwwrgdf54nfk0pzdpkgn27jwxkkfimf5s9jd04xihx03wwj71r0nafdmsdfg5brj9hsdalqj19vpl2442gx82210ax5xfj1ayknd"; + url = "https://registry.npmjs.org/winston/-/winston-3.3.2.tgz"; + sha512 = "vTOrUZlyQPS8VpCcQ1JT8BumDAUe4awCHZ9nmGgO7LqkV4atj0dKa5suA7Trf7QKtBszE2yUs9d8744Kz9j4jQ=="; }; }; "winston-compat-0.1.5" = { @@ -3269,7 +3323,7 @@ let version = "0.1.5"; src = fetchurl { url = "https://registry.npmjs.org/winston-compat/-/winston-compat-0.1.5.tgz"; - sha512 = "3v94p4wq3xmi9d5f1gsk39fj6nc6nq8ivh7ka0whzvg7g71zplmgw9b5vkl7kqr66qm9xd5i4l0vhazmxzpgflqvhaq1lzsfiqczyqh"; + sha512 = "EPvPcHT604AV3Ji6d3+vX8ENKIml9VSxMRnPQ+cuK/FX6f3hvPP2hxyoeeCOCFvDrJEujalfcKWlWPvAnFyS9g=="; }; }; "winston-daily-rotate-file-3.10.0" = { @@ -3278,16 +3332,16 @@ let version = "3.10.0"; src = fetchurl { url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-3.10.0.tgz"; - sha512 = "22fkfci36zb0q6ygc6sg2x2l0886j2cayl6jbi703smf5h4iwa1g2j4dwwr30jr2zjgdyh95ig8yqfk0y8h51gnvi8zf2inn9yh5vr8"; + sha512 = "KO8CfbI2CvdR3PaFApEH02GPXiwJ+vbkF1mCkTlvRIoXFI8EFlf1ACcuaahXTEiDEKCii6cNe95gsL4ZkbnphA=="; }; }; - "winston-transport-4.3.0" = { + "winston-transport-4.4.0" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz"; - sha512 = "3a2khvz9qld5b1ci486nyphyi96pg5n8xin9f0lrx0hllvvjqkj8y393rs2fiyz7afg7244vchiv3ka3klm4xgykxrzipi20nxhyv07"; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz"; + sha512 = "Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw=="; }; }; "wrap-ansi-5.1.0" = { @@ -3296,7 +3350,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; - sha512 = "3nmsfqfd98a7bgjyhd334y5gzc98nnkipfkmk2z1v4m0acagmpq951d8brmrsxvpnk256fbrp7zkn5n8v02pn4q4zai7zgnvy47yba0"; + sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; }; }; "wrappy-1.0.2" = { @@ -3314,7 +3368,7 @@ let version = "5.2.2"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz"; - sha512 = "0f6ay7yn6xslzh3h66d5krqnp48d9g3ikwk0ijiyyxfkwaqxxf3b0qdswy6ych79mj44315qd16snlnk6m6npc5l0habgy5lc7wb8cd"; + sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; }; }; "xtend-4.0.2" = { @@ -3323,7 +3377,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; - sha512 = "08w1d6fg23v422cfwd55306pfs9n9cqpz6hycahq3adm3n29wmhl9bmpn4vk75rlzgwn7hp4n3idqxvw8c53zbr04h7a98p43b199ic"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; "y18n-4.0.0" = { @@ -3332,7 +3386,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; - sha512 = "3zj75gvpcgiphxpci4ji1znykk9n4cs0aw3dd6inwdvkmxyqn2483vya70lssjwq8alspnpw88vgii21fdrcn2vmfyppzgf4mkvzm5g"; + sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; }; "yargs-13.3.2" = { @@ -3341,7 +3395,7 @@ let version = "13.3.2"; src = fetchurl { url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz"; - sha512 = "19rg5b2rhj2kg44as5vv9jxmpr39lw250885w6nlfwyhvwd5nxnnx7fc35v7h615i65cik7k3wi7ac20c91kcgfi5wy7blgk31xjz81"; + sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; }; }; "yargs-parser-13.1.2" = { @@ -3350,7 +3404,7 @@ let version = "13.1.2"; src = fetchurl { url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz"; - sha512 = "375nan6m28q81h8q9a8vmcxgiq7s81yn1ql7zdikac0c4j2kmxdjzmbq14fcp9jm4ilcfzkd9ym4x7c80s7r6g488wf13zz2wsyqmny"; + sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; }; }; "yargs-unparser-1.6.0" = { @@ -3359,7 +3413,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz"; - sha512 = "17qgbcv8wypl4qr620558qd8ff03nqqiq84mp200mizrbsfj4nyil345iny8zx4ia5hfpjmk2mnhqp7y54qpsypd993ml57cj14mnsv"; + sha512 = "W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw=="; }; }; "yn-3.1.1" = { @@ -3368,33 +3422,34 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz"; - sha512 = "3lq5f8c7lb89pyxhpb8nrbif4p5ganpyfzz267dgqxr6dn6yr0vgh017403bmy2v651m1wmd8k6x2fm5v37nmn1i8xngfxccn0347jk"; + sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; }; }; }; in { - "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.3.1" = nodeEnv.buildNodePackage { + "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.4.0" = nodeEnv.buildNodePackage { name = "matrix-appservice-slack"; packageName = "matrix-appservice-slack"; - version = "1.3.1"; + version = "1.4.0"; src = fetchgit { url = "https://github.com/matrix-org/matrix-appservice-slack.git"; - rev = "368c7af0c87053779d61b3c702fc533003960a99"; - sha256 = "add6a164e982cfa8837168e4a8c0b4a3fb248c9cf331ea8c6109767f6fc76cef"; + rev = "933c3a64fdff42ebc11e5385f588f981e201897d"; + sha256 = "cddcff326688ceddfd37eae44d3947ea84cf1d8fd2062e3c203ffbf35e2ea7f6"; }; dependencies = [ - sources."@babel/code-frame-7.8.3" - sources."@babel/helper-validator-identifier-7.9.5" - sources."@babel/highlight-7.9.0" + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + sources."@babel/highlight-7.10.3" + sources."@dabh/diagnostics-2.0.2" sources."@slack/logger-1.1.1" - (sources."@slack/rtm-api-5.0.4" // { + (sources."@slack/rtm-api-5.0.5" // { dependencies = [ sources."p-queue-2.4.2" ]; }) - sources."@slack/types-1.6.0" - (sources."@slack/web-api-5.8.1" // { + sources."@slack/types-1.7.0" + (sources."@slack/web-api-5.10.0" // { dependencies = [ sources."p-queue-2.4.2" ]; @@ -3403,29 +3458,30 @@ in sources."@types/caseless-0.12.2" sources."@types/chai-4.2.11" sources."@types/connect-3.4.33" - sources."@types/events-3.0.0" sources."@types/express-4.17.6" sources."@types/express-serve-static-core-4.17.7" sources."@types/is-stream-1.1.0" - sources."@types/mime-2.0.1" + sources."@types/mime-2.0.2" sources."@types/mocha-7.0.2" sources."@types/nedb-1.8.9" sources."@types/node-13.9.3" sources."@types/node-emoji-1.8.1" + sources."@types/nunjucks-3.1.3" sources."@types/p-queue-2.3.2" - sources."@types/qs-6.9.2" + sources."@types/qs-6.9.3" sources."@types/randomstring-1.1.6" sources."@types/range-parser-1.2.3" - sources."@types/request-2.48.4" + sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/retry-0.12.0" - sources."@types/serve-static-1.13.3" + sources."@types/serve-static-1.13.4" sources."@types/tough-cookie-4.0.0" - sources."@types/uuid-7.0.3" - sources."@types/ws-5.1.2" + sources."@types/uuid-7.0.4" + sources."@types/ws-7.2.5" sources."@types/yargs-13.0.9" sources."@types/yargs-parser-13.1.0" sources."Slackdown-git://github.com/Half-Shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" + sources."a-sync-waterfall-1.0.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.12.2" @@ -3438,6 +3494,7 @@ in sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."array-uniq-1.0.2" + sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-options-0.6.2" sources."assert-plus-1.0.0" @@ -3446,7 +3503,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" + sources."aws4-1.10.0" sources."axios-0.19.2" sources."babel-runtime-6.26.0" sources."balanced-match-1.0.0" @@ -3480,17 +3537,16 @@ in ]; }) sources."check-error-1.0.2" - sources."chokidar-3.3.0" + sources."chokidar-3.4.0" sources."cliui-5.0.0" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.3" - sources."colornames-1.1.1" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" - sources."commander-2.20.3" + sources."commander-3.0.2" sources."concat-map-0.0.1" sources."content-disposition-0.5.3" sources."content-type-1.0.4" @@ -3507,15 +3563,13 @@ in sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."diagnostics-1.1.1" sources."diff-3.5.0" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emoji-regex-7.0.3" - sources."enabled-1.0.2" + sources."enabled-2.0.0" sources."encodeurl-1.0.2" - sources."env-variable-0.0.6" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-2.0.0" @@ -3529,10 +3583,10 @@ in }) sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" + sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" - sources."fecha-2.3.3" + sources."fecha-4.2.0" sources."file-stream-rotator-0.4.1" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { @@ -3543,6 +3597,7 @@ in sources."find-up-3.0.0" sources."finity-0.5.4" sources."flat-4.1.0" + sources."fn.name-1.1.0" sources."follow-redirects-1.5.10" sources."forever-agent-0.6.1" sources."form-data-2.5.1" @@ -3575,7 +3630,7 @@ in sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" - sources."is-callable-1.1.5" + sources."is-callable-1.2.0" sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -3584,7 +3639,7 @@ in sources."is-my-json-valid-2.20.0" sources."is-number-7.0.0" sources."is-property-1.0.2" - sources."is-regex-1.0.5" + sources."is-regex-1.1.0" sources."is-stream-1.1.0" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" @@ -3592,21 +3647,21 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."js-tokens-4.0.0" - sources."js-yaml-3.13.1" + sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonpointer-4.0.1" sources."jsprim-1.4.1" - sources."kuler-1.0.1" + sources."kuler-2.0.0" sources."lie-3.1.1" - sources."localforage-1.7.3" + sources."localforage-1.7.4" sources."locate-path-3.0.0" sources."lodash-4.17.15" sources."lodash.toarray-4.4.0" sources."log-symbols-3.0.0" - (sources."logform-2.1.2" // { + (sources."logform-2.2.0" // { dependencies = [ sources."ms-2.1.2" ]; @@ -3629,15 +3684,18 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-7.1.2" // { + (sources."mocha-7.2.0" // { dependencies = [ + sources."chokidar-3.3.0" sources."debug-3.2.6" sources."escape-string-regexp-1.0.5" + sources."js-yaml-3.13.1" sources."ms-2.1.1" + sources."readdirp-3.2.0" sources."supports-color-6.0.0" ]; }) - sources."moment-2.25.3" + sources."moment-2.27.0" (sources."morgan-1.10.0" // { dependencies = [ sources."debug-2.6.9" @@ -3655,16 +3713,17 @@ in }) sources."nopt-3.0.6" sources."normalize-path-3.0.0" + sources."nunjucks-3.2.1" sources."oauth-sign-0.9.0" sources."object-hash-1.3.1" - sources."object-inspect-1.7.0" + sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.1.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."one-time-0.0.4" + sources."one-time-1.0.0" sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" sources."p-limit-2.3.0" @@ -3685,13 +3744,13 @@ in sources."path-to-regexp-0.1.7" sources."pathval-1.1.0" sources."performance-now-2.1.0" - sources."pg-8.1.0" - sources."pg-connection-string-2.2.2" + sources."pg-8.2.1" + sources."pg-connection-string-2.2.3" sources."pg-int8-1.0.1" - sources."pg-minify-1.6.0" - sources."pg-pool-3.2.0" - sources."pg-promise-10.5.5" - sources."pg-protocol-1.2.2" + sources."pg-minify-1.6.1" + sources."pg-pool-3.2.1" + sources."pg-promise-10.5.7" + sources."pg-protocol-1.2.4" sources."pg-types-2.2.0" sources."pgpass-1.0.2" sources."picomatch-2.2.2" @@ -3705,12 +3764,12 @@ in sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" - sources."quick-lru-5.1.0" + sources."quick-lru-5.1.1" sources."randomstring-1.1.5" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."readable-stream-3.6.0" - sources."readdirp-3.2.0" + sources."readdirp-3.4.0" sources."regenerator-runtime-0.11.1" (sources."request-2.88.2" // { dependencies = [ @@ -3753,8 +3812,6 @@ in sources."stealthy-require-1.1.1" sources."string-width-3.1.0" sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" sources."string.prototype.trimstart-1.0.1" (sources."string_decoder-1.3.0" // { dependencies = [ @@ -3771,14 +3828,15 @@ in sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."triple-beam-1.3.0" - (sources."ts-node-8.10.1" // { + (sources."ts-node-8.10.2" // { dependencies = [ sources."diff-4.0.2" ]; }) - sources."tslib-1.12.0" + sources."tslib-1.13.0" (sources."tslint-6.1.2" // { dependencies = [ + sources."commander-2.20.3" sources."diff-4.0.2" sources."semver-5.7.1" ]; @@ -3788,9 +3846,9 @@ in sources."tweetnacl-0.14.5" sources."type-detect-4.0.8" sources."type-is-1.6.18" - sources."typescript-3.9.2" + sources."typescript-3.9.5" sources."underscore-1.4.4" - sources."unhomoglyph-1.0.5" + sources."unhomoglyph-1.0.6" sources."unpipe-1.0.0" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" @@ -3807,13 +3865,15 @@ in sources."strip-ansi-4.0.0" ]; }) - (sources."winston-3.2.1" // { + (sources."winston-3.3.2" // { dependencies = [ - sources."async-2.6.3" + sources."async-3.2.0" + sources."is-stream-2.0.0" ]; }) (sources."winston-compat-0.1.5" // { dependencies = [ + sources."fecha-2.3.3" sources."logform-1.10.0" sources."ms-2.1.2" ]; @@ -3823,7 +3883,7 @@ in sources."semver-6.3.0" ]; }) - (sources."winston-transport-4.3.0" // { + (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json index 1807b9085b69..52568eefb77e 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json @@ -1,3 +1,3 @@ [ - {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.3.1" } + {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.4.0" } ] From f09718c84abae8fa8d45a2cb7fbf128f9b259d50 Mon Sep 17 00:00:00 2001 From: Tim Zook Date: Wed, 27 May 2020 13:48:05 -0500 Subject: [PATCH 2429/3452] 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 2430/3452] 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 2431/3452] 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 2432/3452] 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 2433/3452] 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 2434/3452] 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 2435/3452] 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 2436/3452] 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 2437/3452] 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 2438/3452] 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 2439/3452] 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 37ec7c488a3579a868014f53b87f669bf65ed83f Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Sun, 21 Jul 2019 16:39:07 +0000 Subject: [PATCH 2440/3452] grub: add support for passwords This patch adds support for user accounts/passwords in GRUB 2. When configured, everything but the default option is password-protected. --- .../modules/system/boot/loader/grub/grub.nix | 62 +++++++++++++++++++ .../system/boot/loader/grub/install-grub.pl | 45 +++++++++++++- 2 files changed, 104 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 3975372e15ec..b760c3f96ddf 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -55,6 +55,7 @@ let storePath = config.boot.loader.grub.storePath; bootloaderId = if args.efiBootloaderId == null then "NixOS${efiSysMountPoint'}" else args.efiBootloaderId; timeout = if config.boot.loader.timeout == null then -1 else config.boot.loader.timeout; + users = if cfg.users == {} || cfg.version != 1 then cfg.users else throw "GRUB version 1 does not support user accounts."; inherit efiSysMountPoint; inherit (args) devices; inherit (efi) canTouchEfiVariables; @@ -137,6 +138,67 @@ in ''; }; + users = mkOption { + default = {}; + example = { + root = { hashedPasswordFile = "/path/to/file"; }; + }; + description = '' + User accounts for GRUB. When specified, the GRUB command line and + all boot options except the default are password-protected. + All passwords and hashes provided will be stored in /boot/grub/grub.cfg, + and will be visible to any local user who can read this file. Additionally, + any passwords and hashes provided directly in a Nix configuration + (as opposed to external files) will be copied into the Nix store, and + will be visible to all local users. + ''; + type = with types; attrsOf (submodule { + options = { + hashedPasswordFile = mkOption { + example = "/path/to/file"; + default = null; + type = with types; uniq (nullOr str); + description = '' + Specifies the path to a file containing the password hash + for the account, generated with grub-mkpasswd-pbkdf2. + This hash will be stored in /boot/grub/grub.cfg, and will + be visible to any local user who can read this file. + ''; + }; + hashedPassword = mkOption { + example = "grub.pbkdf2.sha512.10000.674DFFDEF76E13EA...2CC972B102CF4355"; + default = null; + type = with types; uniq (nullOr str); + description = '' + Specifies the password hash for the account, + generated with grub-mkpasswd-pbkdf2. + This hash will be copied to the Nix store, and will be visible to all local users. + ''; + }; + passwordFile = mkOption { + example = "/path/to/file"; + default = null; + type = with types; uniq (nullOr str); + description = '' + Specifies the path to a file containing the + clear text password for the account. + This password will be stored in /boot/grub/grub.cfg, and will + be visible to any local user who can read this file. + ''; + }; + password = mkOption { + example = "Pa$$w0rd!"; + default = null; + type = with types; uniq (nullOr str); + description = '' + Specifies the clear text password for the account. + This password will be copied to the Nix store, and will be visible to all local users. + ''; + }; + }; + }); + }; + mirroredBoots = mkOption { default = [ ]; example = [ diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index e469b18abd09..918a66866e96 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -247,6 +247,45 @@ if ($grubVersion == 1) { } else { + my @users = (); + foreach my $user ($dom->findnodes('/expr/attrs/attr[@name = "users"]/attrs/attr')) { + my $name = $user->findvalue('@name') or die; + my $hashedPassword = $user->findvalue('./attrs/attr[@name = "hashedPassword"]/string/@value'); + my $hashedPasswordFile = $user->findvalue('./attrs/attr[@name = "hashedPasswordFile"]/string/@value'); + my $password = $user->findvalue('./attrs/attr[@name = "password"]/string/@value'); + my $passwordFile = $user->findvalue('./attrs/attr[@name = "passwordFile"]/string/@value'); + + if ($hashedPasswordFile) { + open(my $f, '<', $hashedPasswordFile) or die "Can't read file '$hashedPasswordFile'!"; + $hashedPassword = <$f>; + chomp $hashedPassword; + } + if ($passwordFile) { + open(my $f, '<', $passwordFile) or die "Can't read file '$passwordFile'!"; + $password = <$f>; + chomp $password; + } + + if ($hashedPassword) { + if (index($hashedPassword, "grub.pbkdf2.") == 0) { + $conf .= "\npassword_pbkdf2 $name $hashedPassword"; + } + else { + die "Password hash for GRUB user '$name' is not valid!"; + } + } + elsif ($password) { + $conf .= "\npassword $name $password"; + } + else { + die "GRUB user '$name' has no password!"; + } + push(@users, $name); + } + if (@users) { + $conf .= "\nset superusers=\"" . join(' ',@users) . "\"\n"; + } + if ($copyKernels == 0) { $conf .= " " . $grubStore->search; @@ -350,7 +389,7 @@ sub copyToKernelsDir { } sub addEntry { - my ($name, $path) = @_; + my ($name, $path, $options) = @_; return unless -e "$path/kernel" && -e "$path/initrd"; my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel")); @@ -396,7 +435,7 @@ sub addEntry { $conf .= " " . ($xen ? "module" : "kernel") . " $kernel $kernelParams\n"; $conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n\n"; } else { - $conf .= "menuentry \"$name\" {\n"; + $conf .= "menuentry \"$name\" " . ($options||"") . " {\n"; $conf .= $grubBoot->search . "\n"; if ($copyKernels == 0) { $conf .= $grubStore->search . "\n"; @@ -413,7 +452,7 @@ sub addEntry { # Add default entries. $conf .= "$extraEntries\n" if $extraEntriesBeforeNixOS; -addEntry("NixOS - Default", $defaultConfig); +addEntry("NixOS - Default", $defaultConfig, "--unrestricted"); $conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS; From b9e9effb442f5a937804399f803157498bcabf55 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Wed, 15 Apr 2020 21:29:52 +0200 Subject: [PATCH 2441/3452] elmPackages: Refactor lib and builds of packages --- pkgs/development/compilers/elm/default.nix | 58 +- .../elm/packages/generate-node-packages.sh | 2 +- .../compilers/elm/packages/lib.nix | 43 + .../elm/packages/node-composition.nix | 2 +- .../compilers/elm/packages/node-packages.nix | 5058 ++++++++--------- .../compilers/elm/packages/patch-binwrap.nix | 30 - 6 files changed, 2448 insertions(+), 2745 deletions(-) create mode 100644 pkgs/development/compilers/elm/packages/lib.nix delete mode 100644 pkgs/development/compilers/elm/packages/patch-binwrap.nix diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 625d7adab411..133235e5d402 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -71,56 +71,60 @@ let }; }; - /* - Node/NPM based dependecies can be upgraded using script - `packages/generate-node-packages.sh`. - Packages which rely on `bin-wrap` will fail by default - and can be patched using `patchBinwrap` function defined in `packages/patch-binwrap.nix`. + /* Node/NPM based dependecies can be upgraded using script `packages/generate-node-packages.sh`. + + * Packages which rely on `bin-wrap` will fail by default + and can be patched using `patchBinwrap` function defined in `packages/lib.nix`. + + * Packages which depend on npm installation of elm can be patched using + `patchNpmElm` function also defined in `packages/lib.nix`. */ - elmNodePackages = + elmLib = import ./packages/lib.nix { + inherit lib writeScriptBin stdenv; + inherit (hsPkgs.elmPkgs) elm; + }; + + elmNodePackages = with elmLib; let nodePkgs = import ./packages/node-composition.nix { inherit nodejs pkgs; inherit (stdenv.hostPlatform) system; }; in with hsPkgs.elmPkgs; { - elm-test = patchBinwrap [elmi-to-json] nodePkgs.elm-test; - elm-verify-examples = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples; + + elm-test = patchBinwrap [elmi-to-json] + nodePkgs.elm-test; + + elm-verify-examples = patchBinwrap [elmi-to-json] + nodePkgs.elm-verify-examples; + elm-coverage = - let patched = patchBinwrap [elmi-to-json] nodePkgs.elm-coverage; - in patched.override { - preRebuild = '' + let patched = patchNpmElm (patchBinwrap [elmi-to-json] nodePkgs.elm-coverage); + in patched.override (old: { + # Symlink Elm instrument binary + preRebuild = (old.preRebuild or "") + '' + # Noop custom installation script sed 's/\"install\".*/\"install\":\"echo no-op\"/g' --in-place package.json # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done # in case of just this package + # TODO: investigate sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json - - rm node_modules/elm/install.js - echo "console.log('no-op');" > node_modules/elm/install.js ''; - - # Link Elm instrument binary - postInstall = patched.postInstall + '' + postInstall = (old.postInstall or "") + '' mkdir -p unpacked_bin ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument ''; - }; + }); - create-elm-app = patchBinwrap [elmi-to-json] (nodePkgs.create-elm-app.override { - preRebuild = '' - rm node_modules/elm/install.js - echo "console.log('no-op');" > node_modules/elm/install.js - ''; - }); + create-elm-app = patchNpmElm (patchBinwrap [elmi-to-json] + nodePkgs.create-elm-app); elm-language-server = nodePkgs."@elm-tooling/elm-language-server"; inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse; }; - patchBinwrap = import ./packages/patch-binwrap.nix { inherit lib writeScriptBin stdenv; }; - in hsPkgs.elmPkgs // elmNodePackages // { - lib = { inherit patchBinwrap; }; + lib = elmLib; } diff --git a/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/pkgs/development/compilers/elm/packages/generate-node-packages.sh index 343721208b89..0ffa56eae90a 100755 --- a/pkgs/development/compilers/elm/packages/generate-node-packages.sh +++ b/pkgs/development/compilers/elm/packages/generate-node-packages.sh @@ -6,7 +6,7 @@ set -eu -o pipefail rm -f node-env.nix $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ - --nodejs-10 \ + --nodejs-12 \ -i node-packages.json \ -o node-packages.nix \ -c node-composition.nix \ diff --git a/pkgs/development/compilers/elm/packages/lib.nix b/pkgs/development/compilers/elm/packages/lib.nix new file mode 100644 index 000000000000..12e0600dc231 --- /dev/null +++ b/pkgs/development/compilers/elm/packages/lib.nix @@ -0,0 +1,43 @@ +{ writeScriptBin, stdenv, lib, elm }: +let + patchBinwrap = + let + # Patching binwrap by NoOp script + binwrap = writeScriptBin "binwrap" '' + #! ${stdenv.shell} + echo "binwrap called: Returning 0" + return 0 + ''; + binwrap-install = writeScriptBin "binwrap-install" '' + #! ${stdenv.shell} + echo "binwrap-install called: Doing nothing" + ''; + in targets: pkg: + pkg.override (old: { + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ binwrap binwrap-install ]; + + # Manually install targets + # by symlinking binaries into `node_modules` + postInstall = let + binFile = module: lib.strings.removeSuffix ("-" + module.version) module.name; + in (old.postInstall or "") + '' + ${lib.concatStrings (map (module: '' + echo "linking ${binFile module}" + ln -sf ${module}/bin/${binFile module} \ + node_modules/${binFile module}/bin/${binFile module} + '') targets)} + ''; + }); + + patchNpmElm = pkg: + pkg.override (old: { + preRebuild = (old.preRebuild or "") + '' + rm node_modules/elm/install.js + echo "console.log('Nixpkgs\' version of Elm will be used');" > node_modules/elm/install.js + ''; + postInstall = (old.postInstall or "") + '' + ln -sf ${elm}/bin/elm node_modules/elm/bin/elm + ''; + }); +in +{ inherit patchBinwrap patchNpmElm; } diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index 4add754b5999..9c6bdb2006a1 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: let nodeEnv = import ../../../node-packages/node-env.nix { diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index ba1190750432..5b30111289ee 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@babel/cli-7.2.3" = { + "@babel/cli-7.8.4" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.2.3"; + version = "7.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.2.3.tgz"; - sha512 = "1h5r08pml55n7xvbgqp701sdr9mz4dykd0aj055qgpwk7rmpvq6c6ac24k3x0q6a0iy5szdd66qq73zhkvk8mwq1jkmw9g6p7vxmybd"; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.8.4.tgz"; + sha512 = "XXLgAm6LBbaNxaGhMAznXXaxtCWfuv6PIDJ9Alsy9JYTOh+j2jJz+L/162kkfU1j/pTSxK1xGmlwI4pdIMkoag=="; }; }; "@babel/code-frame-7.0.0" = { @@ -19,286 +19,340 @@ let version = "7.0.0"; src = fetchurl { url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz"; - sha512 = "1n9xn1d8d9ai52qv1n1q1a521hrwi2akjlj4lsidm8xr6hbnx1akh3h2lxnl73mwhix4cv2x5iff3m22r4jvpdnygmpb4lsx6wvdw1r"; + sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; }; }; - "@babel/code-frame-7.8.3" = { + "@babel/code-frame-7.10.3" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz"; - sha512 = "3d85pd9lfbm8yrlpn6wj9g56snbnpr9fx0w1b9x26jbirc2xfrvnifwzprp0f6bhqijshgm0q35axic8d11v4j0kq493dapcyk33n3b"; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz"; + sha512 = "fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg=="; }; }; - "@babel/core-7.3.4" = { + "@babel/compat-data-7.10.3" = { + name = "_at_babel_slash_compat-data"; + packageName = "@babel/compat-data"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.3.tgz"; + sha512 = "BDIfJ9uNZuI0LajPfoYV28lX8kyCPMHY6uY4WH1lJdcicmAfxCK5ASzaeV0D/wsUaRH/cLk+amuxtC37sZ8TUg=="; + }; + }; + "@babel/core-7.9.6" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.3.4"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.3.4.tgz"; - sha512 = "2n2a167ki533xdbc8n9n3hqa5m3ykxxc8g5p7wn111bgrr9jj7xw2km0dmbglvi5hf85nkb4v7q39l544y9rjnysx6xm8y1wnqjw6wd"; + url = "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz"; + sha512 = "nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg=="; }; }; - "@babel/generator-7.9.4" = { + "@babel/generator-7.10.3" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.9.4"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz"; - sha512 = "10dhzfcyh1jfi1436lwl0ic1z15x4rd0y1ih2n9j8fq7jss6vrbi0ka558wp7ag366hpixbsn59lsp68i6s3hmvhqpgmjw32rmgqcxf"; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.3.tgz"; + sha512 = "drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA=="; }; }; - "@babel/helper-annotate-as-pure-7.8.3" = { + "@babel/helper-annotate-as-pure-7.10.1" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz"; - sha512 = "19zxjzlr2w22hia04020h7cfgvc14ifv25ra5in7c3yi0l7w8r17xmvg62gqn538hpfm5nxq1bxcvn1fgzwxi5ybw2fmi21nqkad3za"; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz"; + sha512 = "ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.10.3" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz"; - sha512 = "2bhyq7n603yhsvhh8if76f9hspd8ywwfac3xbr01xhbk3qglspkw54w34vasds8ngn1vbi8gl2fbplc8g231mqx8swg455jcjdlxqg5"; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.3.tgz"; + sha512 = "lo4XXRnBlU6eRM92FkiZxpo1xFLmv3VsPFk61zJKMm7XYJfwqXHsYJTY6agoc4a3L8QPw1HqWehO18coZgbT6A=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.8.8" = { + "@babel/helper-compilation-targets-7.10.2" = { + name = "_at_babel_slash_helper-compilation-targets"; + packageName = "@babel/helper-compilation-targets"; + version = "7.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz"; + sha512 = "hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA=="; + }; + }; + "@babel/helper-create-regexp-features-plugin-7.10.1" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.8.8"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz"; - sha512 = "2mfpciziyvm031vs1rlwyk7861w57k8bl0dxzsq4iqw70klb81lrili086xx973ksc24jdm1fcyn17zvp9dnlgdyyblhh1b15vlz19d"; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz"; + sha512 = "Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA=="; }; }; - "@babel/helper-define-map-7.8.3" = { + "@babel/helper-define-map-7.10.3" = { name = "_at_babel_slash_helper-define-map"; packageName = "@babel/helper-define-map"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz"; - sha512 = "3z4d17xj2zhm7zk023hs0w9wydxpw5np319d6rlkllcc2zqnxws3m4wdl9lav0chq3p54rfwcmdqqq99qbfp7brnxf6nr38vii831ry"; + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.3.tgz"; + sha512 = "bxRzDi4Sin/k0drWCczppOhov1sBSdBvXJObM1NLHQzjhXhwRtn7aRWGvLJWCYbuu2qUk3EKs6Ci9C9ps8XokQ=="; }; }; - "@babel/helper-explode-assignable-expression-7.8.3" = { + "@babel/helper-explode-assignable-expression-7.10.3" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz"; - sha512 = "0iz6s1cb2asrb2iv9kblqv7zdqljaq278iydlnwdrvy4w730nb68c3rzf181w4scfmgmzgc0ykkkj4nkimipgdkxmw3samzrrdixvrp"; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.3.tgz"; + sha512 = "0nKcR64XrOC3lsl+uhD15cwxPvaB6QKUDlD84OT9C3myRbhJqTMYir69/RWItUvHpharv0eJ/wk7fl34ONSwZw=="; }; }; - "@babel/helper-function-name-7.8.3" = { + "@babel/helper-function-name-7.10.3" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz"; - sha512 = "0w35m1kq2dmsgdgjxvpmg6gxm1rzl1jqf23h3k7pwh9nmwsmqbgv0rzy7fs6dq31dqq6j17bwyww0091r41aj0rl3zi1nj2a1gn0b04"; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.3.tgz"; + sha512 = "FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw=="; }; }; - "@babel/helper-get-function-arity-7.8.3" = { + "@babel/helper-get-function-arity-7.10.3" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz"; - sha512 = "12g2gjipd8svg02d12iqbf0rz4m99g36qccn3f81xij3ac4f7kqzx0407xma49h11j88iz8jil2whj7j96wqpwd67abi23xczwd2l0m"; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.3.tgz"; + sha512 = "iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg=="; }; }; - "@babel/helper-hoist-variables-7.8.3" = { + "@babel/helper-hoist-variables-7.10.3" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz"; - sha512 = "110zw1xx11769dn6nmx1nrl4afckadg5rb4kbnyn717kyyfprvhvz9q4483ziwjk7502k0bl9kzpxv1c56bfr7cfd94n3fwx0n4jbck"; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.3.tgz"; + sha512 = "9JyafKoBt5h20Yv1+BXQMdcXXavozI1vt401KBiRc2qzUepbVnd7ogVNymY1xkQN9fekGwfxtotH2Yf5xsGzgg=="; }; }; - "@babel/helper-member-expression-to-functions-7.8.3" = { + "@babel/helper-member-expression-to-functions-7.10.3" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz"; - sha512 = "123n860dm1xyq93wl0qjc6025awwl14371k9glbv23dvh5vdgnssi0ck7jj75lffxswv1pcdamcaqlqqqhsvkrn2q8dkfiwmy109vkw"; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.3.tgz"; + sha512 = "q7+37c4EPLSjNb2NmWOjNwj0+BOyYlssuQ58kHEWk1Z78K5i8vTUsteq78HMieRPQSl/NtpQyJfdjt3qZ5V2vw=="; }; }; - "@babel/helper-module-imports-7.8.3" = { + "@babel/helper-module-imports-7.10.3" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz"; - sha512 = "0m3mnvpihbbzmv12qzlpms63wlv1krvd9v6m2r3cga0xyvi6aj40fz8vq9yp6cz3qiw6g8iwp6ax20lzagsbr6w2b0cd9m973g72h27"; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.3.tgz"; + sha512 = "Jtqw5M9pahLSUWA+76nhK9OG8nwYXzhQzVIGFoNaHnXF/r4l7kz4Fl0UAW7B6mqC5myoJiBP5/YQlXQTMfHI9w=="; }; }; - "@babel/helper-module-transforms-7.9.0" = { + "@babel/helper-module-transforms-7.10.1" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.9.0"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz"; - sha512 = "30gcd0pfjswf9s036nznz9znhb9dwbkzxdb1dyrzvv50vaiyi844s04492jww141ai1k927wx29dly9q1dcc9618g4gg910xp5clnyh"; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz"; + sha512 = "RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg=="; }; }; - "@babel/helper-optimise-call-expression-7.8.3" = { + "@babel/helper-optimise-call-expression-7.10.3" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz"; - sha512 = "0fs3wpyfm9fmnarclkhbj2c5y1b3hnsjm00myhq6nmmmfap9b12a0vg3ryf0pp9396aawx0rmvq1ymj16hnpp7i0avb6w9sgz93da19"; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.3.tgz"; + sha512 = "kT2R3VBH/cnSz+yChKpaKRJQJWxdGoc6SjioRId2wkeV3bK0wLLioFpJROrX0U4xr/NmxSSAWT/9Ih5snwIIzg=="; }; }; - "@babel/helper-plugin-utils-7.8.3" = { + "@babel/helper-plugin-utils-7.10.3" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz"; - sha512 = "1jj9ibj72hqv1qm4hvdnk728fi9mihrwhq0xcs2qlxbs8iz9d2zb4a23sm7ny0s42asrdyy2s98shgnqm0rhn2314k6pcyxspiymrwg"; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz"; + sha512 = "j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g=="; }; }; - "@babel/helper-regex-7.8.3" = { + "@babel/helper-regex-7.10.1" = { name = "_at_babel_slash_helper-regex"; packageName = "@babel/helper-regex"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz"; - sha512 = "18s59gjlmhr59fb91klimh3l4r3xha8mmddi7iz7ssf3jlz3r4j8fmlqmvjv5c98y1nwgzr7xmg0zvj3n9h23p76lzwiz9gsr178sq5"; + url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.1.tgz"; + sha512 = "7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g=="; }; }; - "@babel/helper-remap-async-to-generator-7.8.3" = { + "@babel/helper-remap-async-to-generator-7.10.3" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz"; - sha512 = "360dpccwg08h484w138qxqzsq6lwhgp90cmmhsa309drgwi1wd9h463b728cfcip3jyagx3kwdfiyj723lhxf04av00w2hz1sdh634j"; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.3.tgz"; + sha512 = "sLB7666ARbJUGDO60ZormmhQOyqMX/shKBXZ7fy937s+3ID8gSrneMvKSSb+8xIM5V7Vn6uNVtOY1vIm26XLtA=="; }; }; - "@babel/helper-replace-supers-7.8.6" = { + "@babel/helper-replace-supers-7.10.1" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.8.6"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz"; - sha512 = "0acgcd28lns7vqyj6s66c00yghxy6kk70iifxmd0yyb229mj4k3nlz0pjavalakn8x1izq5sngznn59iw9c1mwcgzbgyjiqs2nh1qrx"; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz"; + sha512 = "SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A=="; }; }; - "@babel/helper-simple-access-7.8.3" = { + "@babel/helper-simple-access-7.10.1" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz"; - sha512 = "05xs5m527nwqh8qq916v0yad41rnwm9px7134xh2v13sc4bpygi5vngly5yw9bih573q1l7kxhhkdj358glvhpvwah2aw3r7h799lal"; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz"; + sha512 = "VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw=="; }; }; - "@babel/helper-split-export-declaration-7.8.3" = { + "@babel/helper-split-export-declaration-7.10.1" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz"; - sha512 = "1sgm6wd88kmizvig5m0ims97vmlylfii72xcw4k01h2wsw3cpc312s1asnjrq5y472hcqfh2mwn8dwpqkpcvs0ssqwnz1c1xhwz47fz"; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz"; + sha512 = "UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g=="; }; }; - "@babel/helper-validator-identifier-7.9.0" = { + "@babel/helper-validator-identifier-7.10.3" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.9.0"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz"; - sha512 = "0gx4vkhiijg7fwwjybwryz8ilwr56ziamj68fnzmam13lbgspdjal8s742nmsc7p84nl87y9sanmd7ywq84wzzmw0gym1yfm101nvz8"; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz"; + sha512 = "bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw=="; }; }; - "@babel/helper-wrap-function-7.8.3" = { + "@babel/helper-wrap-function-7.10.1" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz"; - sha512 = "08jncd536l4pg9svm19ksyfadg2c0sxd06zgb4ssdgz04vkm5ybb8x9fvn41i04a9pr7p02vbnzwgkqqip91yin1w8dfkq4nnnqj01c"; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz"; + sha512 = "C0MzRGteVDn+H32/ZgbAv5r56f2o1fZSA/rj/TYo8JEJNHg+9BdSmKBUND0shxWRztWhjlT2cvHYuynpPsVJwQ=="; }; }; - "@babel/helpers-7.9.2" = { + "@babel/helpers-7.10.1" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.9.2"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz"; - sha512 = "2j2k8r3s6hwlqg3whjxhsm1cpg030hylh2gimbxvi89f5w4s9j6z525hllf11mrgzcc11zsnlvqhczzgl0zyp2gg6y36gnmap7fy0i7"; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz"; + sha512 = "muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw=="; }; }; - "@babel/highlight-7.9.0" = { + "@babel/highlight-7.10.3" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.9.0"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz"; - sha512 = "2qmdx9wdiv4yy36dc1ljghwd45kq6bhsddcbps8qznsrwvg3zjir6pb7nsfg4ypqrq6z2zif0ysjmwybpqp5xpz6rvymv2pbj54z5ll"; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz"; + sha512 = "Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw=="; }; }; - "@babel/parser-7.9.4" = { + "@babel/parser-7.10.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.9.4"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz"; - sha512 = "0fa6q1spz676yd7fadv1k2ki32yskai2zvzg7i3gwqc98n1082zsg6gb2f3d6rrvm53d73i9zlgcww2g343hq48alzxvs6psni3sbkc"; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.3.tgz"; + sha512 = "oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.8.3" = { + "@babel/plugin-proposal-async-generator-functions-7.10.3" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz"; - sha512 = "0rwwfjlp32i4bvax3zzcx990wylgr57wr6x9p6cdf2y145q8b5hjmrgr507d3sgpzmg565c8bzv6ipd44hsyg0vvqarpw1qzwp777rm"; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.3.tgz"; + sha512 = "WUUWM7YTOudF4jZBAJIW9D7aViYC/Fn0Pln4RIHlQALyno3sXSjqmTA4Zy1TKC2D49RCR8Y/Pn4OIUtEypK3CA=="; }; }; - "@babel/plugin-proposal-json-strings-7.8.3" = { + "@babel/plugin-proposal-dynamic-import-7.10.1" = { + name = "_at_babel_slash_plugin-proposal-dynamic-import"; + packageName = "@babel/plugin-proposal-dynamic-import"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz"; + sha512 = "Cpc2yUVHTEGPlmiQzXj026kqwjEQAD9I4ZC16uzdbgWgitg/UHKHLffKNCQZ5+y8jpIZPJcKcwsr2HwPh+w3XA=="; + }; + }; + "@babel/plugin-proposal-json-strings-7.10.1" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz"; - sha512 = "3ahyf2462nwk892y4fa4dpzksln13c50zpwkwn0620d98zbs12mwabdx76mmmjrndqxmlka5zivazxq602nrlf8zh328m6kklsm0s18"; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz"; + sha512 = "m8r5BmV+ZLpWPtMY2mOKN7wre6HIO4gfIiV+eOmsnZABNenrt/kzYBwrh+KOfgumSWpnlGs5F70J8afYMSJMBg=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.9.0" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.10.1" = { + name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; + packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz"; + sha512 = "56cI/uHYgL2C8HVuHOuvVowihhX0sxb3nnfVRzUeVHTWmRHTZrKuAh/OBIMggGU/S1g/1D2CRCXqP+3u7vX7iA=="; + }; + }; + "@babel/plugin-proposal-numeric-separator-7.10.1" = { + name = "_at_babel_slash_plugin-proposal-numeric-separator"; + packageName = "@babel/plugin-proposal-numeric-separator"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz"; + sha512 = "jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA=="; + }; + }; + "@babel/plugin-proposal-object-rest-spread-7.10.3" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.9.0"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz"; - sha512 = "2ik5r2xl569yrh5l5qdh8q3vd18n7c3wfb92xfl8jx57dzvlqn0ypbjyhd8rgv3xp9rj9rinqkvbjf1zvbvp96bdz1qgaz3lszq22jj"; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.3.tgz"; + sha512 = "ZZh5leCIlH9lni5bU/wB/UcjtcVLgR8gc+FAgW2OOY+m9h1II3ItTO1/cewNUcsIDZSYcSaz/rYVls+Fb0ExVQ=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.8.3" = { + "@babel/plugin-proposal-optional-catch-binding-7.10.1" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz"; - sha512 = "1vxbchc54810whpqi4s5v4v86r30k8cnplwl8krkwj5f29nh1pf91ldlh1v7yfhyczxi1bamlzmxjlga1aw5p6pqd00py64kvn1f2fj"; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz"; + sha512 = "VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.8.8" = { + "@babel/plugin-proposal-optional-chaining-7.10.3" = { + name = "_at_babel_slash_plugin-proposal-optional-chaining"; + packageName = "@babel/plugin-proposal-optional-chaining"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.3.tgz"; + sha512 = "yyG3n9dJ1vZ6v5sfmIlMMZ8azQoqx/5/nZTSWX1td6L1H1bsjzA8TInDChpafCZiJkeOFzp/PtrfigAQXxI1Ng=="; + }; + }; + "@babel/plugin-proposal-unicode-property-regex-7.10.1" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.8.8"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz"; - sha512 = "3qaz0kiybhl1f774kv904b7c168i2q3ajpw6ygk4h5llxjlbpk0lr5inzfml5f7y4g0yykzqr1pfbcbfqn5kiwpypq14vi9qdb66n0i"; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz"; + sha512 = "JjfngYRvwmPwmnbRZyNiPFI8zxCZb8euzbCG/LxyKdeTb59tVciKo9GK9bi6JYKInk1H11Dq9j/zRqIH4KigfQ=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -307,7 +361,16 @@ let version = "7.8.4"; src = fetchurl { url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; - sha512 = "0vr768w42hfh5r9hz6rqmx5gh8d6phcx615miv2dyhp68g5w3yy9b24c0i8a340bgv2m9jpd5snjldrsx9mwny4hjqrcz8635kjc9xp"; + sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; + }; + }; + "@babel/plugin-syntax-dynamic-import-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-dynamic-import"; + packageName = "@babel/plugin-syntax-dynamic-import"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; + sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; "@babel/plugin-syntax-json-strings-7.8.3" = { @@ -316,7 +379,25 @@ let version = "7.8.3"; src = fetchurl { url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; - sha512 = "08g9zcfg8k58q0bki8ar2b26fadfmmcc3v4znspy4bg0f16mxa5hqqldcc1js74jxcwq45x3q2jx4baq1mf3r3bgglgh7jnd9sa93lm"; + sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; + }; + }; + "@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-nullish-coalescing-operator"; + packageName = "@babel/plugin-syntax-nullish-coalescing-operator"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; + sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; + }; + }; + "@babel/plugin-syntax-numeric-separator-7.10.1" = { + name = "_at_babel_slash_plugin-syntax-numeric-separator"; + packageName = "@babel/plugin-syntax-numeric-separator"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz"; + sha512 = "uTd0OsHrpe3tH5gRPTxG8Voh99/WCU78vIm5NMRYPAqC8lR4vajt6KkCAknCHrx24vkPdd/05yfdGSB4EIY2mg=="; }; }; "@babel/plugin-syntax-object-rest-spread-7.8.3" = { @@ -325,7 +406,7 @@ let version = "7.8.3"; src = fetchurl { url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; - sha512 = "2a9vg6b6p2rfhcflic2w6rbrbiqrdgj4ra2q20g1qv6ncwmvja2jq8snygwfw1ll1k94rqnbj4hc1fpizgr1v35rfvxqvwr6658r2jy"; + sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; }; }; "@babel/plugin-syntax-optional-catch-binding-7.8.3" = { @@ -334,331 +415,367 @@ let version = "7.8.3"; src = fetchurl { url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; - sha512 = "3frbi2r4lw5ba5mik8ms5bmzw9kc43s4gs39kfxq1jrcmhi4bjnanxch5jb390g7jw3v8a0d28pw81jagja32j6qgm995imyz8c6lz9"; + sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; }; }; - "@babel/plugin-transform-arrow-functions-7.8.3" = { + "@babel/plugin-syntax-optional-chaining-7.8.3" = { + name = "_at_babel_slash_plugin-syntax-optional-chaining"; + packageName = "@babel/plugin-syntax-optional-chaining"; + version = "7.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; + sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; + }; + }; + "@babel/plugin-syntax-top-level-await-7.10.1" = { + name = "_at_babel_slash_plugin-syntax-top-level-await"; + packageName = "@babel/plugin-syntax-top-level-await"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz"; + sha512 = "hgA5RYkmZm8FTFT3yu2N9Bx7yVVOKYT6yEdXXo6j2JTm0wNxgqaGeQVaSHRjhfnQbX91DtjFB6McRFSlcJH3xQ=="; + }; + }; + "@babel/plugin-transform-arrow-functions-7.10.1" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz"; - sha512 = "338cllyizyzn9jldb8b19zzc0kzkrdw37rapvkr7sqw32my3zad5sm4vcbg0bvxkfjna8f7xp4fqb1xn0jlr25vfpwa24mwl3w4bi6h"; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz"; + sha512 = "6AZHgFJKP3DJX0eCNJj01RpytUa3SOGawIxweHkNX2L6PYikOZmoh5B0d7hIHaIgveMjX990IAa/xK7jRTN8OA=="; }; }; - "@babel/plugin-transform-async-to-generator-7.8.3" = { + "@babel/plugin-transform-async-to-generator-7.10.1" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz"; - sha512 = "1alfn84kb2xm5fra8p2zwplf243ncwh74ax888krbhm66ffn9xmaa5ndmlcgqia375zfxrh8fx2jy797wif9pd0wwnqixn3aas7sswa"; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz"; + sha512 = "XCgYjJ8TY2slj6SReBUyamJn3k2JLUIiiR5b6t1mNCMSvv7yx+jJpaewakikp0uWFQSF7ChPPoe3dHmXLpISkg=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.8.3" = { + "@babel/plugin-transform-block-scoped-functions-7.10.1" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz"; - sha512 = "2d0kvarza8mnbqfkyl1xbq32vrr2140a73ixv3qh9qmb1pgnnw678x6mpc8yhlzw6vix3gp6falg48h6swjg6pcsz0kdamhwzc0b3my"; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz"; + sha512 = "B7K15Xp8lv0sOJrdVAoukKlxP9N59HS48V1J3U/JGj+Ad+MHq+am6xJVs85AgXrQn4LV8vaYFOB+pr/yIuzW8Q=="; }; }; - "@babel/plugin-transform-block-scoping-7.8.3" = { + "@babel/plugin-transform-block-scoping-7.10.1" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz"; - sha512 = "3mp8c45pg6kwvci67fndm7k631ab4799di740limmwb7lrch9c9ma8r743lg6dhw7ail9pas486wybc77dqknrf8qc1hdfidrzdhsd4"; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz"; + sha512 = "8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw=="; }; }; - "@babel/plugin-transform-classes-7.9.2" = { + "@babel/plugin-transform-classes-7.10.3" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.9.2"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz"; - sha512 = "0qnwdi6360a4j2yifxl76d3plhldndy1p4qnswanbr6ldsc3vllbq22h4majaa5jqg7qfxxhagabrwy154s6nd0nb9gpcgkngfsjbac"; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.3.tgz"; + sha512 = "irEX0ChJLaZVC7FvvRoSIxJlmk0IczFLcwaRXUArBKYHCHbOhe57aG8q3uw/fJsoSXvZhjRX960hyeAGlVBXZw=="; }; }; - "@babel/plugin-transform-computed-properties-7.8.3" = { + "@babel/plugin-transform-computed-properties-7.10.3" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz"; - sha512 = "36fk87d811md1xxgp154k5i7389qwlibklymq8p5frx64628jaybqvxjjg49y7z5fp201n1820n8ddm633xjl4l85mnff5jjhi6561v"; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.3.tgz"; + sha512 = "GWzhaBOsdbjVFav96drOz7FzrcEW6AP5nax0gLIpstiFaI3LOb2tAg06TimaWU6YKOfUACK3FVrxPJ4GSc5TgA=="; }; }; - "@babel/plugin-transform-destructuring-7.8.8" = { + "@babel/plugin-transform-destructuring-7.10.1" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.8.8"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz"; - sha512 = "0jl5irg4ra9nwbdqzcbi4kyhwd1sah1f8z3ikw5pmdpj79rn1n7hc3f7xxjizf2x3qd6jagzjiihpbd6x1ksq972innpbinbghnw4kr"; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz"; + sha512 = "V/nUc4yGWG71OhaTH705pU8ZSdM6c1KmmLP8ys59oOYbT7RpMYAR3MsVOt6OHL0WzG7BlTU076va9fjJyYzJMA=="; }; }; - "@babel/plugin-transform-dotall-regex-7.8.3" = { + "@babel/plugin-transform-dotall-regex-7.10.1" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz"; - sha512 = "0ihnh0bfa5fb3m5wpd5m2nb837kahwcyrzz70x9rs8968qrqf7x6379kgw95l2rpyzmns2589ncr9brh1z5qlc70llc9q37sf7kbfwh"; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz"; + sha512 = "19VIMsD1dp02RvduFUmfzj8uknaO3uiHHF0s3E1OHnVsNj8oge8EQ5RzHRbJjGSetRnkEuBYO7TG1M5kKjGLOA=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.8.3" = { + "@babel/plugin-transform-duplicate-keys-7.10.1" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz"; - sha512 = "08ww1bysk4r4s47pp58pw2pdx2f2kxxykdwx1kdsiqgb0z2v0pbfl2d1ni4gcq5g2cmvr8y52zq4sjqdv0lif4liahb8w8v2n44gixk"; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz"; + sha512 = "wIEpkX4QvX8Mo9W6XF3EdGttrIPZWozHfEaDTU0WJD/TDnXMvdDh30mzUl/9qWhnf7naicYartcEfUghTCSNpA=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.8.3" = { + "@babel/plugin-transform-exponentiation-operator-7.10.1" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz"; - sha512 = "26i4rkcf5lgs5ccx03swkk0kb1z9rjvqvjd7jizzch1ldj5m5s60fh3fxwmraj85b5w1l5y5zcpbi1mvb0r5nw9f0170vx6ijw2j0ng"; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz"; + sha512 = "lr/przdAbpEA2BUzRvjXdEDLrArGRRPwbaF9rvayuHRvdQ7lUTTkZnhZrJ4LE2jvgMRFF4f0YuPQ20vhiPYxtA=="; }; }; - "@babel/plugin-transform-for-of-7.9.0" = { + "@babel/plugin-transform-for-of-7.10.1" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.9.0"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz"; - sha512 = "0aphbh180fndrdkpy3vvncgvjx7s260qvx2n6yyfsxprri5gwsz2yn4kf31k0nycwm92zfsss67fqf2nbgyhx1wr3lybh2cx9c2fc4m"; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz"; + sha512 = "US8KCuxfQcn0LwSCMWMma8M2R5mAjJGsmoCBVwlMygvmDUMkTCykc84IqN1M7t+agSfOmLYTInLCHJM+RUoz+w=="; }; }; - "@babel/plugin-transform-function-name-7.8.3" = { + "@babel/plugin-transform-function-name-7.10.1" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz"; - sha512 = "04hzrww1ccdhk8gg5g89zxd90paqsfsxxv2d0jld3sr5lxbkhqnwi6hwp27w58cm3hi0qljwr3ilbgkdwpkzy9rdsgliw5v6jfcxvxc"; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz"; + sha512 = "//bsKsKFBJfGd65qSNNh1exBy5Y9gD9ZN+DvrJ8f7HXr4avE5POW6zB7Rj6VnqHV33+0vXWUwJT0wSHubiAQkw=="; }; }; - "@babel/plugin-transform-literals-7.8.3" = { + "@babel/plugin-transform-literals-7.10.1" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz"; - sha512 = "38bav1jy57qq8fikvzz2hlmay39i8xg3s12vw1gx3nmm23bxf9dm7h5690700z8mldgc9dxx10sx7z7sgj9fijpgb9ixa3zjbq9yfnx"; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz"; + sha512 = "qi0+5qgevz1NHLZroObRm5A+8JJtibb7vdcPQF1KQE12+Y/xxl8coJ+TpPW9iRq+Mhw/NKLjm+5SHtAHCC7lAw=="; }; }; - "@babel/plugin-transform-modules-amd-7.9.0" = { + "@babel/plugin-transform-member-expression-literals-7.10.1" = { + name = "_at_babel_slash_plugin-transform-member-expression-literals"; + packageName = "@babel/plugin-transform-member-expression-literals"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz"; + sha512 = "UmaWhDokOFT2GcgU6MkHC11i0NQcL63iqeufXWfRy6pUOGYeCGEKhvfFO6Vz70UfYJYHwveg62GS83Rvpxn+NA=="; + }; + }; + "@babel/plugin-transform-modules-amd-7.10.1" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.9.0"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz"; - sha512 = "3wj8qylkfbb2mmi5s3r72yh654s27cqc97lcyi3llr15nw93ynf0sh7grakfihh2ihpxx9yr3icfwrfsx2wpjfc7dw1vp1lbl60765x"; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz"; + sha512 = "31+hnWSFRI4/ACFr1qkboBbrTxoBIzj7qA69qlq8HY8p7+YCzkCT6/TvQ1a4B0z27VeWtAeJd6pr5G04dc1iHw=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.9.0" = { + "@babel/plugin-transform-modules-commonjs-7.10.1" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.9.0"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz"; - sha512 = "3rag3vbizrryxgh63crd9b5j9dan0hwnkxzzh0ag6rq6g1jl61bs4bkirlr0mbx2q1wz2ld4ipvh5rc1i9yh2aq98w2manap6n44fdb"; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz"; + sha512 = "AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.9.0" = { + "@babel/plugin-transform-modules-systemjs-7.10.3" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.9.0"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz"; - sha512 = "14zkvrxkxqyava1yschic2apfnpgjsxaizwk1aki9say2ksnj2256lfzgrsxi0f94ql35xikfdwx0kjb80y7clmv6fzp8ysz6zq1j0n"; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.3.tgz"; + sha512 = "GWXWQMmE1GH4ALc7YXW56BTh/AlzvDWhUNn9ArFF0+Cz5G8esYlVbXfdyHa1xaD1j+GnBoCeoQNlwtZTVdiG/A=="; }; }; - "@babel/plugin-transform-modules-umd-7.9.0" = { + "@babel/plugin-transform-modules-umd-7.10.1" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.9.0"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz"; - sha512 = "16ys0wvmbpijqqi3yjfhgbcq0h79wgfbi9d2r2379bw6mmhpaqgps74byy16dj65z9p6h07x8hjijx084bh120l374hzdhm89ga8ddr"; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz"; + sha512 = "EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.8.3" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.10.3" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz"; - sha512 = "2givr1pfhw82nf5drhqd5is8lyikd8njd0lgj9ixkikxllj8c1hd9nirxigd0yn0af62j6djh71sqixd2id76xh9qx4yg8mqpzlbsvz"; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.3.tgz"; + sha512 = "I3EH+RMFyVi8Iy/LekQm948Z4Lz4yKT7rK+vuCAeRm0kTa6Z5W7xuhRxDNJv0FPya/her6AUgrDITb70YHtTvA=="; }; }; - "@babel/plugin-transform-new-target-7.8.3" = { + "@babel/plugin-transform-new-target-7.10.1" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz"; - sha512 = "0bnq7wb7y55gsll55gvm7w1cdnplmn47sbdxfik4jvy1jayjlg2q4lig22ws8698pfcd8v3p6cq5bvimwnvlwhlgfqrqhlvr358dr22"; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz"; + sha512 = "MBlzPc1nJvbmO9rPr1fQwXOM2iGut+JC92ku6PbiJMMK7SnQc1rytgpopveE3Evn47gzvGYeCdgfCDbZo0ecUw=="; }; }; - "@babel/plugin-transform-object-super-7.8.3" = { + "@babel/plugin-transform-object-super-7.10.1" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz"; - sha512 = "06hyil9pvnm5jg66c563cs62035ymbf52sn705wr4rpzl3wn5vly5sghlahrjl5xhw4b91yrrm964l0r0i267rsgb36zd08x29mgcg7"; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz"; + sha512 = "WnnStUDN5GL+wGQrJylrnnVlFhFmeArINIR9gjhSeYyvroGhBrSAXYg/RHsnfzmsa+onJrTJrEClPzgNmmQ4Gw=="; }; }; - "@babel/plugin-transform-parameters-7.9.3" = { + "@babel/plugin-transform-parameters-7.10.1" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.9.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz"; - sha512 = "09al69prgs8rs1fpkvk4a1grhcs2ggkcw80sq3bch8nybafpwfr9drxn8yhg0fyy98l7mwa0ihw5yvxibwb93ir7chn5vk910ax0fkz"; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz"; + sha512 = "tJ1T0n6g4dXMsL45YsSzzSDZCxiHXAQp/qHrucOq5gEHncTA3xDxnd5+sZcoQp+N1ZbieAaB8r/VUCG0gqseOg=="; }; }; - "@babel/plugin-transform-regenerator-7.8.7" = { + "@babel/plugin-transform-property-literals-7.10.1" = { + name = "_at_babel_slash_plugin-transform-property-literals"; + packageName = "@babel/plugin-transform-property-literals"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz"; + sha512 = "Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA=="; + }; + }; + "@babel/plugin-transform-regenerator-7.10.3" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.8.7"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz"; - sha512 = "2n9vklnwvsx5nl6p39n3x6ylby7p2l1ymrn9320ggbl2yp95dqfpzh3wlcjkvdswwfgd7zs85jpvqlk2av9kxv0bavlcrvq1603x22c"; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.3.tgz"; + sha512 = "H5kNeW0u8mbk0qa1jVIVTeJJL6/TJ81ltD4oyPx0P499DhMJrTmmIFCmJ3QloGpQG8K9symccB7S7SJpCKLwtw=="; }; }; - "@babel/plugin-transform-runtime-7.3.4" = { + "@babel/plugin-transform-reserved-words-7.10.1" = { + name = "_at_babel_slash_plugin-transform-reserved-words"; + packageName = "@babel/plugin-transform-reserved-words"; + version = "7.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz"; + sha512 = "qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ=="; + }; + }; + "@babel/plugin-transform-runtime-7.9.6" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.3.4"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.3.4.tgz"; - sha512 = "0yb11rhnni08x0l9dhbzz8km2q4g33bpjixvq8hnyp1cghsib2h5xlqrvrl57x7m4h9lakrxd8hhc10cw68r58769wxf0gdxi301aix"; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz"; + sha512 = "qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.8.3" = { + "@babel/plugin-transform-shorthand-properties-7.10.1" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz"; - sha512 = "3rh55yhh4q4sy77lmf2cqpscb553j904j99jjfih53hxiz32hgil33ndvbsdxqw84p6g8dk4xs0q27jnhsnzwr1qiq95l30wzlcil13"; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz"; + sha512 = "AR0E/lZMfLstScFwztApGeyTHJ5u3JUKMjneqRItWeEqDdHWZwAOKycvQNCasCK/3r5YXsuNG25funcJDu7Y2g=="; }; }; - "@babel/plugin-transform-spread-7.8.3" = { + "@babel/plugin-transform-spread-7.10.1" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz"; - sha512 = "3p85332hnhff55y3is8q3hvmq1jgr2dkypaz8ydyawhch6x56a2j28vw2aqxd2w7mbra8c2k9gz71k1ar8r4vcd702hm64vv59r6jqa"; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz"; + sha512 = "8wTPym6edIrClW8FI2IoaePB91ETOtg36dOkj3bYcNe7aDMN2FXEoUa+WrmPc4xa1u2PQK46fUX2aCb+zo9rfw=="; }; }; - "@babel/plugin-transform-sticky-regex-7.8.3" = { + "@babel/plugin-transform-sticky-regex-7.10.1" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz"; - sha512 = "1dmlmw2s1fmy0jllpwqpkdcrlg9rlggm7gxbm0wc5091afpjr1rqmdvb192zqbbfxmcxlq6acndn1p7i9s5vnczw5dr03w2y796lapm"; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz"; + sha512 = "j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA=="; }; }; - "@babel/plugin-transform-template-literals-7.8.3" = { + "@babel/plugin-transform-template-literals-7.10.3" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz"; - sha512 = "1qsqiwghf845xmas44mbh7vhhhqv08wfm8g9v7fq4yrwj3f14zvxlp0wc5hlhwzwbg4487dxhv597a42gkn839z2n5h68d4vh310vgk"; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.3.tgz"; + sha512 = "yaBn9OpxQra/bk0/CaA4wr41O0/Whkg6nqjqApcinxM7pro51ojhX6fv1pimAnVjVfDy14K0ULoRL70CA9jWWA=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.8.4" = { + "@babel/plugin-transform-typeof-symbol-7.10.1" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.8.4"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz"; - sha512 = "2mfnlkk7zxq37znqknq8z9wrk5g9r1zs2v1f21w1xnnqp69y5f0dcwclaw6khxbv13whzh27rn2b9wl85qamyy63rgy7glx65zb40nr"; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz"; + sha512 = "qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g=="; }; }; - "@babel/plugin-transform-unicode-regex-7.8.3" = { + "@babel/plugin-transform-unicode-regex-7.10.1" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.8.3"; + version = "7.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz"; - sha512 = "1kml3kqk32kcwg2snmk38k4xiisyim2nm4g0xji5h9pgzm2bgwad9ad85kddddqmldkc9i3qyrsf7ai8valp3gf8g96g68x6qkf1rzs"; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz"; + sha512 = "Y/2a2W299k0VIUdbqYm9X2qS6fE0CUBhhiPpimK6byy7OJ/kORLlIX+J6UrjgNu5awvs62k+6RSslxhcvVw2Tw=="; }; }; - "@babel/preset-env-7.3.4" = { + "@babel/preset-env-7.9.6" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.3.4"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.3.4.tgz"; - sha512 = "203xg6r6imb5gaqxzk06ann6568pgn61398ygl79421ybxkj7xcpijxsvlnzd15zjypr20x9a43flg0mnih8bhdsa00gwqahdyjlv6s"; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz"; + sha512 = "0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ=="; }; }; - "@babel/runtime-7.3.4" = { + "@babel/preset-modules-0.1.3" = { + name = "_at_babel_slash_preset-modules"; + packageName = "@babel/preset-modules"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; + sha512 = "Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg=="; + }; + }; + "@babel/runtime-7.9.6" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.3.4"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.4.tgz"; - sha512 = "3m5vxl1yg3z98wjmhhxyxdwmk2a10yj2dvh42zqvjfl43cwqw2ir57gimhwr7n820bs2w1n0z2575i233xqvd7bnmdb0s2jqyffzxr2"; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz"; + sha512 = "64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ=="; }; }; - "@babel/runtime-7.9.2" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz"; - sha512 = "3sh2slrgff4njf77qzi5x2b8l2a2bksb8nfxzcfa0y4vq6g7jcz3vzl1p5kxg96ni206l0z4wvxzm45vr243pzrwv8nwz3fwys86k9l"; - }; - }; - "@babel/template-7.8.6" = { + "@babel/template-7.10.3" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.8.6"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz"; - sha512 = "0z8kzrpis50nr4vsyqr77cpqad0xfsacw45jdhwsl89mdzpvy8wcvc0kdy938kb0ll069plxhgy3a3fpag408ci2pb47gxzrhy2rcyd"; + url = "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz"; + sha512 = "5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA=="; }; }; - "@babel/traverse-7.9.0" = { + "@babel/traverse-7.10.3" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.9.0"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz"; - sha512 = "3giz5rwk1g73w7f31fpnpf418bk0pkh05npk3vajnybyxhfxj7s5wcs4z1wlj8f055sxv24lspca5ia36cm2pgf3j9qb7x49y7m01lc"; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.3.tgz"; + sha512 = "qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug=="; }; }; - "@babel/types-7.9.0" = { + "@babel/types-7.10.3" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.9.0"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz"; - sha512 = "2g85q87d2pq07ggy89zwnd847mlxig5blaapazf7940b8vjbff48l2digxcjfi3dg9vnrkv8n4yjz4j8s15nvhry5jk5kz4yllljbq5"; - }; - }; - "@cnakazawa/watch-1.0.4" = { - name = "_at_cnakazawa_slash_watch"; - packageName = "@cnakazawa/watch"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz"; - sha512 = "2hl7iz90jal2f27hgyb5rbmcp96p182xkmflyj5rsyqqffng8vkzz3fcjvbvcpdykij40ax4yirdc6p68yrmjvai7hr8y93mj20indz"; + url = "https://registry.npmjs.org/@babel/types/-/types-7.10.3.tgz"; + sha512 = "nZxaJhBXBQ8HVoIcGsf9qWep3Oh3jCENK54V4mRF7qaJabVsAYdbTtmSD8WmAp1R6ytPiu5apMwSXyxB1WlaBA=="; }; }; "@hapi/address-2.1.4" = { @@ -667,7 +784,7 @@ let version = "2.1.4"; src = fetchurl { url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz"; - sha512 = "1sqi7ls27blq5mlm1r1lbkpyyx347q67x6732qsxw0ms2cqxm814wqpfysa3c64ak47qcfmknk2xsjayi0myv1csr7pvcry162lyga0"; + sha512 = "QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="; }; }; "@hapi/bourne-1.3.2" = { @@ -676,7 +793,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz"; - sha512 = "2jaj0r6ay5qf2ayzcsb02495kaxxdflks99g9k8ff9fi2qq8xns3f6vjiq4949af9gxjrzq6n7vxry55y3lskg2vm6ywlps7qflvmfm"; + sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; }; }; "@hapi/hoek-8.5.1" = { @@ -685,7 +802,7 @@ let version = "8.5.1"; src = fetchurl { url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz"; - sha512 = "2ir1zjr8jp78q5v2sm9lh7w5vlb7spdynsy25ndaqgh78d6p9rvmvzc09pzbimbh04p06527jk00jwzadzyffb75jrvbww3r1ny9pn8"; + sha512 = "yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow=="; }; }; "@hapi/joi-15.1.1" = { @@ -694,7 +811,7 @@ let version = "15.1.1"; src = fetchurl { url = "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz"; - sha512 = "00w6lcx6spr7z1xbkfady5yxfxkiw4f3crds9l6qirvnsp30c026jziafi6km0p5146dygrfs1rz47j9klph7y6zcfcnaqfjgqmyyvs"; + sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="; }; }; "@hapi/topo-3.1.6" = { @@ -703,7 +820,7 @@ let version = "3.1.6"; src = fetchurl { url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz"; - sha512 = "04mh0ix6qpfggy9if6vjicickw0xydydny3hh2vs1q9gji5fg31jyr25mnagl48pl6mzn2p4dc65fbpm7w53bka7zz033qw679a01ml"; + sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -712,7 +829,7 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz"; - sha512 = "3g9wzm6hszqh30x6hmwc9l4vw51c6a224cp2y9qzlj98vzbwbc4s7lfafi67v8401qagjsdxrndnnannzz6i71krmn8svxwk3lfkwbc"; + sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -721,7 +838,7 @@ let version = "2.1.3"; src = fetchurl { url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; - sha512 = "07zn0jp8b7nrrpkxwx715n68ncr51xiyz46j8g1fdvy07cr3s60npwhds1difzwdgz762zwirirppmc5dwl5pdqmww1m0zp15hv0sbq"; + sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw=="; }; }; "@nodelib/fs.stat-1.1.3" = { @@ -730,7 +847,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz"; - sha512 = "0zx6w7vq6bz1fxg0dhvd9nwbrbvghcln2xmj89p93dq84bm8pdiiddds49wn45wplh8f8mdnkjv2w0cjn3a1i83v3yq22wh4q7jc45j"; + sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; "@nodelib/fs.stat-2.0.3" = { @@ -739,7 +856,7 @@ let version = "2.0.3"; src = fetchurl { url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; - sha512 = "2n8008qx9kqgxsgsd22r2xrkm56nwsnwjfws9s4jjmbrk4gz8vfhdw7vp70kn59mqfihkdks6s0101javrpfi7hg8l0qk3nwjp4a03d"; + sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="; }; }; "@nodelib/fs.walk-1.2.4" = { @@ -748,25 +865,34 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; - sha512 = "2nsw6dfpkrkm8pxp2d9jlva5mnwqfzssj9r3xlyvrybb26xvjjkw7c0jvfilz08xvvgaanjxvqz6ycqh35avnqwg8mns39biqwmfpym"; + sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ=="; }; }; - "@sindresorhus/is-0.7.0" = { + "@sindresorhus/is-0.14.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "0.7.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz"; - sha512 = "2ilygr40l2yqbk6lix4xnnnqsq6fxa6sysdxg49bg1ax5gzhwy3bcjbdlk7lndgh9055slpx6fybs3p8mhvbsnnjkmkqzrfy8l5mn1q"; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz"; + sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; }; }; - "@sindresorhus/is-2.1.0" = { + "@sindresorhus/is-2.1.1" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.0.tgz"; - sha512 = "0v01lvb36q7cjz2v5spd6h3gcqmw69jmrpa6nsdpdmipxihzn6wv8clkyxibcvxv4b5ajpsz5rg0aiwwhjy7nl0jcwax8sa59zrfwlm"; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz"; + sha512 = "/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg=="; + }; + }; + "@szmarczak/http-timer-1.1.2" = { + name = "_at_szmarczak_slash_http-timer"; + packageName = "@szmarczak/http-timer"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; + sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; }; "@szmarczak/http-timer-4.0.5" = { @@ -775,7 +901,7 @@ let version = "4.0.5"; src = fetchurl { url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz"; - sha512 = "06naxv8ahcw0kc4pzg2fzqqrmb0ah6lsi3qvy3s4a5x2fkil74z97yiagbykqanf1b0zrzq4lhrip8sc6fs124kiypaqqdmr7v4091z"; + sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; }; }; "@types/anymatch-1.3.1" = { @@ -784,7 +910,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz"; - sha512 = "32g2n75z48j6mx4k8iz6hm75q7r6dd24gk40lb02x7bffcjf6zf4ca10g51x8zqd1yr0zq2xny0wrvgfz1ynhmg8hv9l3j1g8yr3q7z"; + sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; }; }; "@types/cacheable-request-6.0.1" = { @@ -793,7 +919,7 @@ let version = "6.0.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz"; - sha512 = "2nx7h47i6xjvrbxlp329m2sx4qa8s7fw3c7xycfd6gr6wwfkjvyv1j5z1pf151w09vzhn721bjrh8p1ydba3vc5ljdy064177dnlhfa"; + sha512 = "ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ=="; }; }; "@types/color-name-1.1.1" = { @@ -802,34 +928,25 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz"; - sha512 = "0yy21xdbsflgxc7lcl8i2cb4mnw9a518gcj77g39hslrlfanliz7agc4dihnkkhcdpnkas7i2sd5lf9f2i4kaq53axkgir3411qxgxf"; + sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="; }; }; - "@types/events-3.0.0" = { - name = "_at_types_slash_events"; - packageName = "@types/events"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; - sha512 = "3v6shgxnlkc7izsc00g8ilpxi1q2mpcmbjyfawyqcj8mwfhlx2cnkm3hj87gsd39yyq33pilb0dbb4cdc8wwhn7dcwj4srg0amrp8qi"; - }; - }; - "@types/glob-7.1.1" = { + "@types/glob-7.1.2" = { name = "_at_types_slash_glob"; packageName = "@types/glob"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz"; - sha512 = "3dhbgdkzpgx010hfgkhndrb094kbd3z6s4waicihnl0rp3jk0f0gs8vvzi84xzissrhml1dfgvbdhahzbh75nny1g6429fnqvlp866l"; + url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.2.tgz"; + sha512 = "VgNIkxK+j7Nz5P7jvUZlRvhuPSmsEfS03b0alKcq5V/STUKAa3Plemsn5mrQUO7am6OErJ4rhGEGJbACclrtRA=="; }; }; - "@types/html-minifier-terser-5.0.0" = { + "@types/html-minifier-terser-5.1.0" = { name = "_at_types_slash_html-minifier-terser"; packageName = "@types/html-minifier-terser"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.0.0.tgz"; - sha512 = "05y4l2y0vv2pif8awwvi76jy0b19pgwma0d3whwls29q6jzzrwnw1yncza40h1br0zsd980vfwn19hznim1gd031ds634jxh4zm5pmb"; + url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz"; + sha512 = "iYCgjm1dGPRuo12+BStjd1HiVQqhlRhWDOQigNxn023HcjnhsiFz9pc6CzJj4HwDCSQca9bxTL4PxJDbkdm3PA=="; }; }; "@types/http-cache-semantics-4.0.0" = { @@ -838,7 +955,25 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz"; - sha512 = "3a59p84bj2kf33npin2307frq0xhm47cvw2rw1xijb53yalq3m4bhxkjl045jraj56nz13xnis7amcnr0bd5x1r7785wf54dv9z4xbk"; + sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A=="; + }; + }; + "@types/http-proxy-1.17.4" = { + name = "_at_types_slash_http-proxy"; + packageName = "@types/http-proxy"; + version = "1.17.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.4.tgz"; + sha512 = "IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q=="; + }; + }; + "@types/json-schema-7.0.5" = { + name = "_at_types_slash_json-schema"; + packageName = "@types/json-schema"; + version = "7.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz"; + sha512 = "7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ=="; }; }; "@types/keyv-3.1.1" = { @@ -847,7 +982,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz"; - sha512 = "1bydwp0jnaxaygfaw3xj8g6drxla6vamlgd2533jq8iplf1hfll274n67kcqj465la3k515krc53v8aqz23vnl2avxhsra0574niyrh"; + sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; }; }; "@types/minimatch-3.0.3" = { @@ -856,25 +991,25 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha512 = "2ff7lcgph45bp2v5zsaxcy00rbh5n5h4njbicwhqilz66pd1lw7xfrpfl4i4ppfcx78zg9cp582b5fjif0dg7r18m44vxfksslvlyml"; + sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-13.11.0" = { + "@types/node-14.0.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.11.0"; + version = "14.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.11.0.tgz"; - sha512 = "32v8pzb6g76fjsp064dr7qqry3f3dbbff56bkzw7qxpzg37kpldx5d61n87183b2s8svx1pid84c225frhy7gp3r6zz4808dfg2dkmq"; + url = "https://registry.npmjs.org/@types/node/-/node-14.0.13.tgz"; + sha512 = "rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA=="; }; }; - "@types/q-1.5.2" = { + "@types/q-1.5.4" = { name = "_at_types_slash_q"; packageName = "@types/q"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz"; - sha512 = "17nxpx18sizfrmzc6d7xcc2pr2xn2cq83vh0hm24wpm8ibdlcq5r0m12gbps0sww2jayl9v7lqplss6nsyy6xc4rcn1s4rpmpg5vvki"; + url = "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz"; + sha512 = "1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="; }; }; "@types/responselike-1.0.0" = { @@ -883,7 +1018,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz"; - sha512 = "161bm0d6lm7yvh41bc6yspj5nb36j9v4nx7d3xfqgc3h2cg6z03ik6kfd8cv1q93qwblz5ibp30a7scscxj8vw963d5qz5f7033d5pk"; + sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; }; }; "@types/source-list-map-0.1.2" = { @@ -892,43 +1027,43 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz"; - sha512 = "2q5qxxw2xrn72030yyfpxzl3b498dw1wbfbb86gk9a4i5mhq3adc2711mfdwyg7ixdy79ax1hdfp0vw0aqzwj32dlyklbbwd75bx4ib"; + sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; }; }; - "@types/tapable-1.0.5" = { + "@types/tapable-1.0.6" = { name = "_at_types_slash_tapable"; packageName = "@types/tapable"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.5.tgz"; - sha512 = "2sv1nmhp8gvylghvxmxvc02zral5hbrhj45cpl5bz7grf36r8mpaihybdvz1nwkkdn325lap4v1q2jbzzy1l3wz2q8bghr6y8rvc0gy"; + url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz"; + sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA=="; }; }; - "@types/uglify-js-3.0.5" = { + "@types/uglify-js-3.9.2" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.0.5"; + version = "3.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.0.5.tgz"; - sha512 = "0kqcqx89pacasl4g5azinlm111qla4fn4k5ghsmyc9lsh2a2nhlj74zrm1apzw5zvnaxcl86ysym559000n93szj9ln0saj9151pc9g"; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.9.2.tgz"; + sha512 = "d6dIfpPbF+8B7WiCi2ELY7m0w1joD8cRW4ms88Emdb2w062NeEpbNCeWwVCgzLRpVG+5e74VFSg4rgJ2xXjEiQ=="; }; }; - "@types/webpack-4.41.10" = { + "@types/webpack-4.41.17" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.10"; + version = "4.41.17"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.10.tgz"; - sha512 = "2f211d97906nnasrwxk3c1f6bd5gc9za6vs3dqp6j5rg928kp975xsj7gfk9sbbvrqcfp0mrb6hjw7fd2m3x1dvcjik60mwmalv935w"; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.17.tgz"; + sha512 = "6FfeCidTSHozwKI67gIVQQ5Mp0g4X96c2IXxX75hYEQJwST/i6NyZexP//zzMOBb+wG9jJ7oO8fk9yObP2HWAw=="; }; }; - "@types/webpack-sources-0.1.7" = { + "@types/webpack-sources-1.4.0" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; - version = "0.1.7"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.7.tgz"; - sha512 = "0px6j424ivmklnnzd5kspgsq0irlhf086gbcd74ycjhrmgz0wy6sv4lkz7l5p4ddz6fghjkl3j4vlxi99cnkf2h3masv30bjan8f9jz"; + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.0.tgz"; + sha512 = "c88dKrpSle9BtTqR6ifdaxu1Lvjsl3C5OsfvuUbUwdXymshv1TkufUAXBajCCUM/f/TmnkZC/Esb03MinzSiXQ=="; }; }; "@webassemblyjs/ast-1.9.0" = { @@ -937,7 +1072,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz"; - sha512 = "08744px0y61c8svh84df8xg0m3905gkz9wfjlp9pkk8j5dnfs66l43qff6d60y1n0igdzwdpf9bvrdy4jwrkcjs1l98ivlvpzj1db0b"; + sha512 = "C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA=="; }; }; "@webassemblyjs/floating-point-hex-parser-1.9.0" = { @@ -946,7 +1081,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz"; - sha512 = "10dqii9lv28nj4ls9wv7ys4ckd7v9iz08cb2alpph0xgz44a437yfa6mdzgnkgw5zcgxjy4xqsxv9sfp49ay8c3hdw01w8jbdq6lvjc"; + sha512 = "TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA=="; }; }; "@webassemblyjs/helper-api-error-1.9.0" = { @@ -955,7 +1090,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz"; - sha512 = "2dmpj9vdgdq3wjfa9a6jlb6xrg4d25l2an1r41sw91a7psdc9lp793ca7z7i9q2712p7gp42095r50xfsc2fwci9409npjch670phrm"; + sha512 = "NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw=="; }; }; "@webassemblyjs/helper-buffer-1.9.0" = { @@ -964,7 +1099,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz"; - sha512 = "04387f8f3q0kk96h7l1js39xg4xy8ja9bxgqpmfpsj17xma1y3p3risra4yh8j3xbiyn4bxqmcgn6zlwv6n0yzw0jrax1iagbijb6m9"; + sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA=="; }; }; "@webassemblyjs/helper-code-frame-1.9.0" = { @@ -973,7 +1108,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz"; - sha512 = "1j2zclfh4a784bb015c39kahlmalikwdx0k1xws46iynf1nskcy6szv1cldldn1zhm8ckj8wddfx6idpj3m2qzvw9pda3v4j1s9h40i"; + sha512 = "ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA=="; }; }; "@webassemblyjs/helper-fsm-1.9.0" = { @@ -982,7 +1117,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz"; - sha512 = "2bjr61kxvrfhqr7439jkapxcij4cgm9lb32x55qq7hxn07cdkz69aaqvmzqqyir0bn8a1rfblmgvmd53jxg0jgwwjdi1clv2716ix1q"; + sha512 = "OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw=="; }; }; "@webassemblyjs/helper-module-context-1.9.0" = { @@ -991,7 +1126,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz"; - sha512 = "3r1d7c1zr0b9f85526k03d1p47kq7qgih4q1fzwxv540aid771cjrmw68f6fipmhzlzxwxhj09q2vrxb96p59v7jd6cplw247r9d41h"; + sha512 = "MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g=="; }; }; "@webassemblyjs/helper-wasm-bytecode-1.9.0" = { @@ -1000,7 +1135,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz"; - sha512 = "19im6kssfy0rjipdvz4jp03rjzkwhnvkp1q8zw7mjfx8yf2w7nlxpy5ambbzvlq5jvh8ks6x35nlh0kcmz68hmcqixwfdgjijs55ca7"; + sha512 = "R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw=="; }; }; "@webassemblyjs/helper-wasm-section-1.9.0" = { @@ -1009,7 +1144,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz"; - sha512 = "2zs0rl7x9l6adbbiqgw2br1w09b1da351rc69znxakjg9c9wkb227xy374k1zkc7a79rc4q7lgwv9ami3pr4555mipqp4yybpr02wsy"; + sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw=="; }; }; "@webassemblyjs/ieee754-1.9.0" = { @@ -1018,7 +1153,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz"; - sha512 = "17f4ncqxsp9b8ssciw5icvf8bxpd732cda6z1jdbddbxl58m3vkjaxpx3ymi4z0y8nnrify698x8g65w38761rjkgr0pzhlwqkgribm"; + sha512 = "dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg=="; }; }; "@webassemblyjs/leb128-1.9.0" = { @@ -1027,7 +1162,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz"; - sha512 = "2kz1bim131l0y9pjznjv3qmw030gli8yb3hhd38hjrc2py5h551lgzcsjlrx6pnpwnq9rdsyh3ppkyarymrpnnqncimlmvhjlrp7m8h"; + sha512 = "ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw=="; }; }; "@webassemblyjs/utf8-1.9.0" = { @@ -1036,7 +1171,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz"; - sha512 = "3rlyvh0fy205d045jr17hjj8y641hmhkkzk3gq78865jcqm55ff2n3jbalj5121q8li786hm9jg5ggv66qixp7fsb7i9938dfax15hr"; + sha512 = "GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w=="; }; }; "@webassemblyjs/wasm-edit-1.9.0" = { @@ -1045,7 +1180,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz"; - sha512 = "33jfv92rsn09qz41blq4a781clr7n5lzpy44zb42fb499mbd1hd4mf0q4l6karmbm8gg552p9ayqgzawz29r2n56gwhrfrldw3g608n"; + sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw=="; }; }; "@webassemblyjs/wasm-gen-1.9.0" = { @@ -1054,7 +1189,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz"; - sha512 = "26a9wb1a8jglkv330fkmcg7l4z9v1b8ygn32lw96z2wiq1m65f7b3rqp1f1rhgg72sxdx0zsirs6am97phy66svps3y7k0qisikgwbh"; + sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA=="; }; }; "@webassemblyjs/wasm-opt-1.9.0" = { @@ -1063,7 +1198,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz"; - sha512 = "3c2a28pzyrsdrichvzc0v1kik18sb0pwfjkwhbm1cc6xakfw5wgialgqkrrv9c7ibskwh1k75m9xf9v4hmd42xj6676z1i7l2dy0j22"; + sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A=="; }; }; "@webassemblyjs/wasm-parser-1.9.0" = { @@ -1072,7 +1207,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz"; - sha512 = "0n0927dbd3wsan69ljwzlp9pi15axs3a11sypfl720s8dm8g0q81kxq0w0qybzgm16fwk073y7ffkhm4gqv0cv496fhkn0iihr29v7p"; + sha512 = "9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA=="; }; }; "@webassemblyjs/wast-parser-1.9.0" = { @@ -1081,7 +1216,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz"; - sha512 = "1pkw353ygc8csplwi4nfx5n296wcj4b8yawrl0kxhizq4fdbbsvrhphzzcvx1p8r8ccj9yq2x5yix17q54gyhikcvr74hyhzl095jma"; + sha512 = "qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw=="; }; }; "@webassemblyjs/wast-printer-1.9.0" = { @@ -1090,7 +1225,7 @@ let version = "1.9.0"; src = fetchurl { url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz"; - sha512 = "2qb0ghchp4dw0yxp9c4h9iw6m7lk58sz7f9j4kmrvp5hj804kwxdskgbjcc96g3r7f3zwvcyw3nlnr718rml73f8gr727bbvq9jg7fq"; + sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; }; }; "@xtuc/ieee754-1.2.0" = { @@ -1099,7 +1234,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; - sha512 = "1wczr2c331gq4q6w6nsiylqs6q6dp0j2lvc231826gfrdhr3lcimmyhswp4g0b5p7k7k525gq6gh0wpg65sjlp2s4f0n6ww18m2fzqd"; + sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; }; }; "@xtuc/long-4.2.2" = { @@ -1108,7 +1243,7 @@ let version = "4.2.2"; src = fetchurl { url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"; - sha512 = "00n8akj5s578b8r7vcdz817cnmga21vznz895kygvb0j780968szj171f91b0bgvz880ff7zq025q4087cgxb2fqpyg01sgil2ymq9n"; + sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; }; }; "abbrev-1.1.1" = { @@ -1117,7 +1252,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; "accepts-1.3.7" = { @@ -1126,7 +1261,7 @@ let version = "1.3.7"; src = fetchurl { url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "2j51dxzbgz22q0k7dhivimfsqx9a0f0h9slfd7n20gz3y1944gx3y7xai54za0x3zhbar6vqiaab2i9p913cwqk414qk3cnrm138pr2"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; "acorn-6.4.1" = { @@ -1135,7 +1270,7 @@ let version = "6.4.1"; src = fetchurl { url = "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz"; - sha512 = "1s65pswzbh0155lsrdln08lifgs34zb53vkfl8fvxwnfmrc84vj01m9b31w4n846k7vk8lr5ns6wqf0fxc8xz98vkihldxsgn9ksl35"; + sha512 = "ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA=="; }; }; "address-1.0.3" = { @@ -1144,16 +1279,16 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/address/-/address-1.0.3.tgz"; - sha512 = "27dii2i2aw9z3pw09110914532z5dfywxp8gbrfr14737cwy8m0jysam3abmfsbp8g51sd02ys57j5snwly3zfd0vrbli4109rni7ng"; + sha512 = "z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg=="; }; }; - "ajv-6.12.0" = { + "ajv-6.12.2" = { name = "ajv"; packageName = "ajv"; - version = "6.12.0"; + version = "6.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; - sha512 = "0gkcic96nmpcq311i2jfwbaa961x0mj7mkl7iwk213hyn4jgxbl0a472lcpg9dr7ybacn3i45fj6q0dz3g8rqmva7r14i9la240ba0g"; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz"; + sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; }; }; "ajv-errors-1.0.1" = { @@ -1162,16 +1297,16 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz"; - sha512 = "24kqslzd256yc0dckqcg8n1rngyfzdflfznp55hnhkv3rhyzirjhpj31rgiiryyjlw8a64x9ba7hdqkpiwf6jpllwyyyhr7zqxmy90c"; + sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="; }; }; - "ajv-keywords-3.4.1" = { + "ajv-keywords-3.5.0" = { name = "ajv-keywords"; packageName = "ajv-keywords"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; - sha512 = "1lyjmfg70gijr3gjs63qmawfazm5mz8vb1bknyy1vzdif6a30vi3dpwkrlv4j4i5dg56jd3fliqgfq0rxbm98a42jxbgnyxmdn65va4"; + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.0.tgz"; + sha512 = "eyoaac3btgU8eJlvh01En8OCKzRqlLe2G5jDsCr3RiE2uLGMEEB1aaGwVVpwR8M95956tGH6R+9edC++OvzaVw=="; }; }; "alphanum-sort-1.0.2" = { @@ -1189,7 +1324,7 @@ let version = "3.2.4"; src = fetchurl { url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz"; - sha512 = "2n6gl8300ihln724832pvvzrii5c4qjli9xc16s632ywnyrfbv1kmcqg133v25583hqhflpsfi2yhkjy6nhzj0si5v36zhym0cifxc4"; + sha512 = "hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA=="; }; }; "ansi-escapes-3.2.0" = { @@ -1198,7 +1333,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; - sha512 = "12pp3q4c44hrzr2xl9vqjigwjn2wr1j0lhvshl75z5m6a97hqkd047sdcma1inzjvxhpkzk1qkvag7cw3sya32s9wsfasr6xsnnj63h"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; }; }; "ansi-html-0.0.7" = { @@ -1234,7 +1369,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1v2gfp292kslpvam0l0h1iba35yi0n7dc6qv6fmxsdyfcp6zakkl13vrh3hzsw4zgh50jrrsg7xb2q2hn4g8a0dmf947mfcylymxanm"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; }; "ansi-regex-5.0.0" = { @@ -1243,7 +1378,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha512 = "2bgymyprr0q59vfj2qnmnlcbi60jvry6kzdk94nlw3x6176ar5g0qddm8w01bw7fj2hrb4xlb75x4dqs38198sjachhslcfks7rz3kd"; + sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; }; }; "ansi-styles-2.2.1" = { @@ -1261,7 +1396,7 @@ let version = "3.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "2lgkskkj4c1fsnrksy0yffda0wss84p8lfiazdc7jli7iqnvrxkzbxjzpvx13lm28qw0zkawfxvz2bdiisc72ccy7hx8i8rm4iijgam"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; "ansi-styles-4.2.1" = { @@ -1270,7 +1405,7 @@ let version = "4.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz"; - sha512 = "2619xzd910i29pa6v368sk8jdgjk3yqqvjwbg3hyj6byd3ygcrs3xix3fy03smqgiylhdrkrvyrhhnv1l5pkc64qn7zgmh6rfna6lgm"; + sha512 = "9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA=="; }; }; "anymatch-2.0.0" = { @@ -1279,7 +1414,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"; - sha512 = "03mjsaw6xk4zhvl17fpqn59j4v2bafqs0yfw5y45hl8x97xlihwvjmcx3icnaamvipplnczymvzg4sb4ixwpzak0k3p21c00nqqxmz6"; + sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; }; }; "anymatch-3.1.1" = { @@ -1288,7 +1423,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"; - sha512 = "2776jrfn8kh9r6qhz6s43znnwvqmbqrjsch99hdv21j53sj4njyjhrya67drxk8y7hvi28mjvdjj277jy4qd2zfayrjli3cdbdkkkwq"; + sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; }; }; "aproba-1.2.0" = { @@ -1297,7 +1432,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; - sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; }; }; "argparse-1.0.10" = { @@ -1306,7 +1441,7 @@ let version = "1.0.10"; src = fetchurl { url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; - sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; }; "arr-diff-4.0.0" = { @@ -1324,7 +1459,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g"; + sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; }; }; "arr-union-3.1.0" = { @@ -1360,7 +1495,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"; - sha512 = "2swmvaw9xcvzv29i247057pq4khyss7gnc0p244v1l2g2p2xpsr47m0dfaf54yscd3fc9njh3kvwly99w8shvd9p5fq6nvwwmqg7mw4"; + sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; }; }; "array-map-0.0.0" = { @@ -1396,7 +1531,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; - sha512 = "35whnhqnw23y121ilf8kl79pyqb9bjsg32gsazzlmww9zgk22c5jycf0vlkpsnp67rqw05hhw97hxw216hpnm6bxa620lyqwjhb2v0w"; + sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; "array-uniq-1.0.3" = { @@ -1432,7 +1567,7 @@ let version = "0.2.4"; src = fetchurl { url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; - sha512 = "1v2z1ll0l8rif8hh0d03jc49kz3p8hym63q8ixbas48w4a8akl413hwn08nx83m89sj3mxl06aa0grp7n8hj6hcbsb2k3fhj913674g"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; "asn1.js-4.10.1" = { @@ -1441,7 +1576,7 @@ let version = "4.10.1"; src = fetchurl { url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; - sha512 = "15j9ms7k6dx08m1wqrvc4958vcrshjjpicpxmz9bflsyk0x2r7w20lxlm27jpyj7cwj6158a0582vifk393hqp0ysn9mlbabqw9qzd7"; + sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; }; }; "assert-1.5.0" = { @@ -1450,7 +1585,7 @@ let version = "1.5.0"; src = fetchurl { url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz"; - sha512 = "1n2xh5m359gm4my50j2206n32q2h044lqrl8h122gjn41fizlrh32j1lj7wqfix1iblyvi7zvdgvzbf97f840lr17vfk8ph1imj0fqh"; + sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="; }; }; "assert-plus-1.0.0" = { @@ -1468,7 +1603,7 @@ let version = "3.9.12"; src = fetchurl { url = "https://registry.npmjs.org/assets-webpack-plugin/-/assets-webpack-plugin-3.9.12.tgz"; - sha512 = "0s21gk3wrzrj44dcpsxj8yffp5iwnjccj9h7yn3l7qls5gcw0cgbd25qqd04b192px7kyjyfx9adwp3vxp286g27g15vlsg5gyd79ca"; + sha512 = "iqXT/CtP013CO+IZJG7f4/KmUnde+nn6FSksAhrGRbT1GODsFU3xocP6A5NkTFoey3XOI9n1ZY0QmX/mY74gNA=="; }; }; "assign-symbols-1.0.0" = { @@ -1486,7 +1621,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"; - sha512 = "0ga6b0jymkw4jrfvjilhfrddml29l1nrvj7r57d140p7rn31mmbni4j9z343v2zzz2zcnlsr2s17kmlgjkyvs9pxrf88an11pm9y77r"; + sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; }; }; "async-0.9.2" = { @@ -1513,7 +1648,7 @@ let version = "2.6.3"; src = fetchurl { url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz"; - sha512 = "1g679kw2qqpqx1yd4s778r8rw3cv9qwmib5x3klk64kcl5ndw71bljcpav5jkk6grizlpvrqszsbs6fkmnlvcq5fnz2q33mrnb6zyfd"; + sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; }; }; "async-each-1.0.3" = { @@ -1522,7 +1657,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz"; - sha512 = "00vbg0zvq40mmvzz9q3klkk5ly5jh75kc8s3bf7j2ff9zivla3wlc8d622gajjq4w66mln5570dc936my6wh08ippfj5jagj51s3xfg"; + sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; }; }; "async-limiter-1.0.1" = { @@ -1531,7 +1666,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; - sha512 = "0sy81yyf4na58ic2m0ib0prkb9njb1qzl7wf3vlq4hhm4xnwgxaph0lr43gs1sd0rai2xp1h6phlwvni9jiggm94dd54i0wc1cabhvj"; + sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; }; }; "asynckit-0.4.0" = { @@ -1549,7 +1684,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; - sha512 = "1rbq2rl2ry0y3nkqs3013vgjrnzf03609rg58092r8zkvzzn6v15grhv2yhzb48sz74zmjcj8ix7f5whrfp4zvsxyzrh64fhs9awvjs"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; }; "autoprefixer-8.6.5" = { @@ -1558,7 +1693,7 @@ let version = "8.6.5"; src = fetchurl { url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.6.5.tgz"; - sha512 = "25g0ccq9v5sb77q5yhffaxnva8ps64yqp82rzn9jfwl2hpcqbv02175icm0v6c6k4aywnayf6di6cq44agrlzjc6sfbrzp8flvqkd9w"; + sha512 = "PLWJN3Xo/rycNkx+mp8iBDMTm3FeWe4VmYaZDSqL5QQB9sLsQkG5k8n+LNDFnhh9kdq2K+egL/icpctOmDHwig=="; }; }; "aws-sign2-0.7.0" = { @@ -1570,13 +1705,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.9.1" = { + "aws4-1.10.0" = { name = "aws4"; packageName = "aws4"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz"; - sha512 = "2x4b6c0ny64yv6ljfs6sv82akh200klmnh1m1i18hdj28ksxkr9c0szphnwcasy3g5y3l1wn858wcxnc2gi9q5wql8s678fc61xbhf0"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz"; + sha512 = "3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="; }; }; "babel-extract-comments-1.0.0" = { @@ -1585,25 +1720,25 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz"; - sha512 = "1ay21zjvpavyw19hzijli4ax209jw3lxrn2lfzdyd8v29b76r4i35nq4q6iff2zlz88x2py8lkvyczb5l41fnyx0chxlxg5hj5v6rd9"; + sha512 = "qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ=="; }; }; - "babel-loader-8.0.4" = { + "babel-loader-8.1.0" = { name = "babel-loader"; packageName = "babel-loader"; - version = "8.0.4"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.4.tgz"; - sha512 = "2pn5lfvi0s3fhz6fllidilfkz4h9v3l4632p55h9pyzccqda3fgpn2ayywyg2shfcw3y3q900xhkc7k63zyly3myqb9g80k8lv6243y"; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz"; + sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw=="; }; }; - "babel-plugin-dynamic-import-node-2.3.0" = { + "babel-plugin-dynamic-import-node-2.3.3" = { name = "babel-plugin-dynamic-import-node"; packageName = "babel-plugin-dynamic-import-node"; - version = "2.3.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz"; - sha512 = "2ay3wlyykpjfs9awvl9xigggavibxvbi9hx1mplf87zmqff733aag7hzw89c4f28wf4hxcr404lsp01ndan45yxm9f1q44hjy98bam3"; + url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; }; }; "babel-plugin-syntax-object-rest-spread-6.13.0" = { @@ -1648,7 +1783,7 @@ let version = "6.18.0"; src = fetchurl { url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"; - sha512 = "1qk460vyxfs08g8586jdc02wqzyy2y06596qcn1na9bz7yxra6vgh6177qf345xai0virpaz56bkpgmfcrd8yx5l2vjkn49y66h9xdb"; + sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="; }; }; "balanced-match-1.0.0" = { @@ -1666,7 +1801,7 @@ let version = "0.11.2"; src = fetchurl { url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; - sha512 = "11dwi4v72034dqafp0qxsg8h6cpn92vv4vf909a9fybd69yfg6gqn4hhav6x59r1wbi8h1qlgfh9np0340mpljv1hc9v9p02giqygp5"; + sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; }; "base64-js-1.3.1" = { @@ -1675,7 +1810,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; - sha512 = "3mbfy80f2q6z8fwzch81hn7z0wjjsz6lwzz4jwrgr62pyql94mwi21k0l28xba2q1pydf8hf0jzzvr8w34rjmk135pjpmqfcj5kid4q"; + sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; }; }; "batch-0.6.1" = { @@ -1702,7 +1837,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz"; - sha512 = "3qicqys1bg16slzbzjn3f0fir82r4d1h6lvy5y0cqqwzbs2iaxf93xgi6x47m7l87i102ifjn4qvjbf764gyncsxcqw7lw33mk7y4zs"; + sha512 = "+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="; }; }; "big.js-5.2.2" = { @@ -1711,7 +1846,7 @@ let version = "5.2.2"; src = fetchurl { url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"; - sha512 = "2cin34lhbrlligarblnrqnl6f419mkpqd4abjms0y1fk1mxzb6rqvh1sg0zif7bgskirhh6shxnqa444syk4cf87fmndil954xzc8mz"; + sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; }; "binary-0.3.0" = { @@ -1729,7 +1864,7 @@ let version = "1.13.1"; src = fetchurl { url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz"; - sha512 = "0drjfs8xmgc4rfi8nbbx7adsinnc5m0nc96dw3r3gars8zvg1kzay5a7a5s3islf13wmw7q9v15i7d2gdghs1lp6rh2wl6x80hcqzjj"; + sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; }; "binary-extensions-2.0.0" = { @@ -1738,7 +1873,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz"; - sha512 = "2izzpdg2m0av5pzbv1zyjfi15ddz5yk1d4h9cilzc8z6pzq5abcicnm2xx4b2jdrjk2l4h3zfawsxhnbzlgvlv4700q5930k796s69y"; + sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="; }; }; "bindings-1.5.0" = { @@ -1747,7 +1882,7 @@ let version = "1.5.0"; src = fetchurl { url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; - sha512 = "24xpa35sym31k1x9hs78jbmsh58yx7ldkn03d4g5qhmvm0bi5cwqvpn2s6r8hkwhks5mhm81gz878gbp5g9b2s7zniy7gm1z6vvysm7"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; }; }; "binwrap-0.2.2" = { @@ -1756,7 +1891,7 @@ let version = "0.2.2"; src = fetchurl { url = "https://registry.npmjs.org/binwrap/-/binwrap-0.2.2.tgz"; - sha512 = "1rh0lsxhj45r639casyzy4jncilkcfygfzz2h7hqm7rjbh0za510z2qmqjbzyrx98618fmcycgraqq115fbwh7n33wi29ipk75azrb3"; + sha512 = "Y+Wvypk3JhH5GPZAvlwJAWOVH/OsOhQMSj37vySuWHwQivoALplPxfBA8b973rFJI7OS+O+1YmmYXIiEXVMAcw=="; }; }; "bluebird-3.7.2" = { @@ -1765,16 +1900,25 @@ let version = "3.7.2"; src = fetchurl { url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; - sha512 = "2v12rs2wvv94hrlyv0nadxn9x11796k9mk7a8vg0bqsry8m2pbyy9dribalwikh34qkk3rp6gnis849y5z9x5mxzbbdgkfhc3l674sy"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; - "bn.js-4.11.8" = { + "bn.js-4.11.9" = { name = "bn.js"; packageName = "bn.js"; - version = "4.11.8"; + version = "4.11.9"; src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; - sha512 = "20bg51v29zygy89w84qb64pkjikxfjdsgjs0ry6pvv8fkwn5kd1izrqn022d838q3rcaq8dmy033g7q8b6960j4f8ipan74y9ydimr2"; + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz"; + sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="; + }; + }; + "bn.js-5.1.2" = { + name = "bn.js"; + packageName = "bn.js"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz"; + sha512 = "40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA=="; }; }; "body-parser-1.18.2" = { @@ -1792,7 +1936,7 @@ let version = "1.19.0"; src = fetchurl { url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "2rl5ww96fwgmxdqhqmnknsaafw44vsr2xz7vf7nax8qz9jy8bmmdyawcy6yfny0wm7pi8m2jssakzjc1nin8z8207kv0gclpnrhy4bn"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; "bonjour-3.5.0" = { @@ -1819,7 +1963,7 @@ let version = "1.1.11"; src = fetchurl { url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; "braces-2.3.2" = { @@ -1828,7 +1972,7 @@ let version = "2.3.2"; src = fetchurl { url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; - sha512 = "3gxrfbb03jf6nh75n99snhv4a9jni48hfc0gkj5yl1cginpqx3d73dnp8snph1fdkc804iz6zg0aqibifjnscjfbpfziw2g7yg5pmv8"; + sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; }; }; "braces-3.0.2" = { @@ -1837,7 +1981,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha512 = "38dmhgggv4r7xf3chli957yj4gzfv9xhif8zzaqjnxavkrs1qbmj9m84vxh42n1jl9sddy16ryp4g93l1p8dvrc1pbcvk2ippwadjvg"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; "brorand-1.1.0" = { @@ -1855,7 +1999,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"; - sha512 = "22gkxh9wf4hjxkyvj427k9r76xkz9vs63s1drwcggbpv0r7qdclzdvw167s7iq8936zak241cc5ck3bqkp6hy99zlkrbcmfl5g8gc7v"; + sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="; }; }; "browserify-cipher-1.0.1" = { @@ -1864,7 +2008,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; - sha512 = "3bz6v63l37ndb18236yjdkbxjcvy4x16a8j7vsqxqprvnkcnkq1hg1ffd1c9zk9a3j555ppnpisfyh0x4adlb8lmpwbfa8i837n9y5h"; + sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; }; }; "browserify-des-1.0.2" = { @@ -1873,7 +2017,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz"; - sha512 = "3j1gv3firnsbjppm47ldxbav9rmh3plq026zn728wvhgf19i4r7kxzyyj7hpibhjv61lcm9i4b869yy90c8hfj7w8rmr17p2zbhwah6"; + sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; }; "browserify-rsa-4.0.1" = { @@ -1885,13 +2029,13 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "browserify-sign-4.0.4" = { + "browserify-sign-4.2.0" = { name = "browserify-sign"; packageName = "browserify-sign"; - version = "4.0.4"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz"; - sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz"; + sha512 = "hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA=="; }; }; "browserify-zlib-0.2.0" = { @@ -1900,7 +2044,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; - sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7"; + sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; "browserslist-3.2.8" = { @@ -1909,7 +2053,7 @@ let version = "3.2.8"; src = fetchurl { url = "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz"; - sha512 = "00i65frm5jkbv8pzc13i02fzd39q0ahh653zzjzhq35pz6p0idajfjqg1b7mnnlvxymihcpmd1cfhwaj51hnqjmh4alrg8sjrq6hxaq"; + sha512 = "WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ=="; }; }; "browserslist-4.1.1" = { @@ -1918,25 +2062,16 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/browserslist/-/browserslist-4.1.1.tgz"; - sha512 = "3clmw7m8rqcpk4qygqml0750q666n48jv76xgw4v7vsff8yyxylgb8lh9hkfx282pg4sj5ggzzysd2gjmaas88nsicyp930xg1jn6jl"; + sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.11.1" = { + "browserslist-4.12.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.11.1"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.11.1.tgz"; - sha512 = "3kf0caz4k8wilf978inqj6sgcxbsb9y7rc7m54gv7is132s81fc984wmrh8wl8hglcyvkxwwxm0vd2lf5qz8nx2qc6lca7b83gfn90c"; - }; - }; - "bser-2.1.1" = { - name = "bser"; - packageName = "bser"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz"; - sha512 = "30jby01rqjgx78xnzyysjav12c0cj8dcwd40wprcfh1jn3768cdkb834q1zyf3wivhifi47xqa7jai7x16m1jv1mq4g40f69ws56341"; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz"; + sha512 = "UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg=="; }; }; "buffer-4.9.2" = { @@ -1945,7 +2080,7 @@ let version = "4.9.2"; src = fetchurl { url = "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz"; - sha512 = "1d85syv6ashl8f3a6h553d185cg3vq6nhjqnc80vr2z3bak0c9xbm1jawfk9zs43xz34yih6h6j3bhb3njkahdqpji12fsc4kfsmby6"; + sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="; }; }; "buffer-from-1.1.1" = { @@ -1954,7 +2089,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "3c0m16i3fdv3vlq2zz8dakrnhqvs16gvggj485f91fiaa5v0p7pyhamcdw5fggr7djzd8nshmvz4hgbp7714smqxlld2an28q8if1ri"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; }; "buffer-indexof-1.1.1" = { @@ -1963,7 +2098,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; - sha512 = "3bgz1zhq9ng3gypq825f00p9qi9y6z7wvkkf28nhjlyifnb3lk1dkmbya84k0ja79zv8kmmhvalwcnnz92533ip7pnjp3is1w9cxyp3"; + sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; }; }; "buffer-xor-1.0.3" = { @@ -2008,7 +2143,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; - sha512 = "073ccjmvxf726gcgzy0pksvi8x8r51dq6hyv69sc75ynrin7anwk9q3sqhbbbjhqjjrmq42s5f5gdbcgj2jxai6ldpyq6y2ny78payd"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; "cacache-10.0.4" = { @@ -2017,7 +2152,7 @@ let version = "10.0.4"; src = fetchurl { url = "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz"; - sha512 = "0f1zwi8bbiia995410m24xljd0ra0vk579q7rk48p7mrq9nbilx3qa2rnp7hjdwnvx28zfad0rfdcwyq3blzkb3rk8b9yl77crp960f"; + sha512 = "Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA=="; }; }; "cacache-12.0.4" = { @@ -2026,7 +2161,7 @@ let version = "12.0.4"; src = fetchurl { url = "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz"; - sha512 = "00qxfz1yqkizw00vx1948yfzilxv1c4pzxknh5hbwby5cgiyrzb488qwcdff4qdrbwm13skvhpxpshryw30py3s4bpgny98il3lqjvb"; + sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; }; }; "cache-base-1.0.1" = { @@ -2035,7 +2170,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; - sha512 = "36i943khi87af4gif9r6imjgybqxq9cbd69z2h8p2s2j6scfbhrv7j3n591xl982fmyq29rkwh70a6qdcf3v0piwzfh8n2jf571v9q0"; + sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; }; }; "cacheable-lookup-2.0.1" = { @@ -2044,16 +2179,16 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.1.tgz"; - sha512 = "2714rgpq0wwdfnahlxn4a3g1fr6mf5dj2f3lkl874x991d7ilqvccrja0j4hk8nbc7g7yivvp9b2pf4rrgq3fpj6ghdjwck4fr1phqh"; + sha512 = "EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg=="; }; }; - "cacheable-request-2.1.4" = { + "cacheable-request-6.1.0" = { name = "cacheable-request"; packageName = "cacheable-request"; - version = "2.1.4"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz"; - sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz"; + sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; }; }; "cacheable-request-7.0.1" = { @@ -2062,7 +2197,7 @@ let version = "7.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.1.tgz"; - sha512 = "1kmzafhx567pf4kbwdg03gxjx0d1l6j8lnb05y7f66kn8c1szz41kawa2jkf4zndaihac3i1yv7yjg6mrkk2lxs2b0wm7h0lqkjdpcn"; + sha512 = "lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw=="; }; }; "call-me-maybe-1.0.1" = { @@ -2107,7 +2242,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz"; - sha512 = "3llmv9zy6jv6wn9nyxai15vw5zpjjpax70zzsz10gnd55kp1p86x59swnnylp20gjhgdnq5pj4ycfvd85n14bsjf9j82zdqq5cvdxpd"; + sha512 = "7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q=="; }; }; "camelcase-3.0.0" = { @@ -2125,7 +2260,7 @@ let version = "5.3.1"; src = fetchurl { url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; - sha512 = "0kg17fpj4c7akmpa9x0a3fi5glrc3y5k3ppjcpb3pd02ylg3fnzfdvz0pixd223crbs5980sjaxsk9q8kcqxm5d9cb7rlkv3m614vrg"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; "caniuse-api-3.0.0" = { @@ -2134,25 +2269,16 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz"; - sha512 = "2xvajfx062fy4i060qa7p4acawzmcpqs69jmklswq856lyzjq6p8vjgm5zi21ll5gxm7vvyc5xsh9bd30v5bppszr59c19zi2wg1i3f"; + sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001039" = { + "caniuse-lite-1.0.30001087" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001039"; + version = "1.0.30001087"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001039.tgz"; - sha512 = "3qyz2ijjl61hkbifqpr2k8nrjw9gqlamp914lagh29kf1az6hkslbklljq5ss31n8lblczdvdi3pjjs2hgq71w52sr8gpyk4icdpv29"; - }; - }; - "capture-exit-2.0.0" = { - name = "capture-exit"; - packageName = "capture-exit"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz"; - sha512 = "3m6md2j1rsn26hijf0yfbbfnx6w2jrrqhr2b2xwjc9lyzvypidyz5krczc9wb04z1vq4mgb759ljwn7iggiiigijzhp38lk162zy91y"; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001087.tgz"; + sha512 = "KAQRGtt+eGCQBSp2iZTQibdCf9oe6cNTi5lmpsW38NnxP4WMYzfU6HCRmh4kJyh6LrTM9/uyElK4xcO93kafpg=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -2161,7 +2287,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz"; - sha512 = "1fzkc65mi135002lk75zd133f7k3cda42n14yb5lc6inqj10xpd2d3zyhc3bjq1k7zfdrlkxq9c26mdz48dpd30bqbmbjxwjjfj11pz"; + sha512 = "/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ=="; }; }; "caseless-0.12.0" = { @@ -2179,7 +2305,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz"; - sha512 = "2wa0gi2wljxw00rvqz454sgdr8yy90z8lhprxjc1prwi695lnzrh6sk0qqhp63h9gmbldyvvzfvm8k1jk0sbv6icdawcss441jky3qa"; + sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="; }; }; "chainsaw-0.1.0" = { @@ -2206,7 +2332,7 @@ let version = "2.4.1"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz"; - sha512 = "1yl5ffjp5w65b9ydnw4vp13n563121hs64xbnajif51grhpqmslaqllj24zm1pfaw9ywvdx69n8ppa3riwlps25k5934zgnbf3pmcrr"; + sha512 = "ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ=="; }; }; "chalk-2.4.2" = { @@ -2215,7 +2341,7 @@ let version = "2.4.2"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; - sha512 = "2wr55z22i274wadq2cvpxga28a8igq9whc4m1q06sz5sn2hc4amradd5vd02wm92vyfg2qrb0bysd5drv7mfmlb2wqdf939v5zvxn1j"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; "chalk-3.0.0" = { @@ -2224,7 +2350,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; - sha512 = "31damxvnvxjdp3hhqfn9nxi6hrw9cmmy5vlf0nqfvns1qhp3ybc0y7viswj1jdxvc0w1f3zapjsl89hx9hcwv2p8jca7m7qczlw2gg0"; + sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; }; }; "chardet-0.7.0" = { @@ -2233,7 +2359,7 @@ let version = "0.7.0"; src = fetchurl { url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; - sha512 = "1qg04aw34n3l68g6s6li7pfdspkj3zmb7qsqf096h19jwc34mv8sbhik4xcx9aazys1ycb5k736f4lql46s0rhl361pmlz1r86j4gwr"; + sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; }; }; "charenc-0.0.2" = { @@ -2251,7 +2377,7 @@ let version = "2.1.8"; src = fetchurl { url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz"; - sha512 = "21d2yf3364v025ivy6ak1bh61qvvq9llryh8c1rhvrif1kalx0j996x8m0qs717cgl97q5c40awyv8gi8hbmpgfpl6zvkff6xmm8rk6"; + sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="; }; }; "chokidar-3.0.2" = { @@ -2260,7 +2386,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz"; - sha512 = "0l3pn1afpk9h62fjazidrp2dpgigsqwmpjy92686srm8j8ky8zx8072s00jmvz1mr8g78dj70y0vdg9j1h6m6vfp8sk4di3x3cx30vk"; + sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; "chokidar-3.2.1" = { @@ -2269,7 +2395,7 @@ let version = "3.2.1"; src = fetchurl { url = "https://registry.npmjs.org/chokidar/-/chokidar-3.2.1.tgz"; - sha512 = "3mkp71nvz0h69nzh9z15is5l5lpmcs7nf5nypdv5s47fi1z1an9qm29677y5j6sviwky0kr82z4cild7f6qxgnpnflyq5gr8qz4ygpy"; + sha512 = "/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w=="; }; }; "chokidar-3.3.0" = { @@ -2278,7 +2404,16 @@ let version = "3.3.0"; src = fetchurl { url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; - sha512 = "3hbyi14x38mvx936wbajln4g1l8fcyi8fwvcrhf2jqn0yzcyda1d20q67k445j9bvs5kr7jdhd2s07srb2pnm7hxmjngp2k6wn8lsbl"; + sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; + }; + }; + "chokidar-3.4.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz"; + sha512 = "aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ=="; }; }; "chownr-1.1.4" = { @@ -2287,7 +2422,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; - sha512 = "1b03acmav1awkygrda5h64pn8msd6wda119q553hik728i1j72bfqyq7yzn1x7nmw28hvg9mcyh7krsj8vwsq3karnn55mj6smip7cc"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; "chrome-trace-event-1.0.2" = { @@ -2296,7 +2431,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; - sha512 = "06mh145f12ppkxn7xdzrvh7rrjg9c770rqai08m8r5i31br1ihc96i63dyn0c4arfl1hl0za33kzy5i09x4agz77c11xv7hb33z7vzm"; + sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ=="; }; }; "cipher-base-1.0.4" = { @@ -2305,7 +2440,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; - sha512 = "3cm9kdc1sv7pakzlhrc1pazdvg9lk4hv31lximwbcrgmwfzg6imxrndszgx9yzlizknfh2b73cr7b5mfcv50bldpyq6jr5s4zknsj1a"; + sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; }; }; "class-utils-0.3.6" = { @@ -2314,7 +2449,7 @@ let version = "0.3.6"; src = fetchurl { url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; - sha512 = "1xcqwmfmsbrm2ck76brwiqjmcza655khgh5szh6wngk357i37sgwsga1pbarwzaz9hvzkriqhq6j0z5mv0pmz61cf9wxvk3y5mlzs58"; + sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; }; "clean-css-4.2.3" = { @@ -2323,7 +2458,7 @@ let version = "4.2.3"; src = fetchurl { url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"; - sha512 = "0ad50l577m99sgpcdd49zspq8h9n9i3hhngapg9y5q76s7zwdz3hmaw2kc2jg30lk4z3wlyp9kgiyg71dvg0fg89g1xyr3qvq61dhsm"; + sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; }; }; "cli-cursor-2.1.0" = { @@ -2344,13 +2479,13 @@ let sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; }; }; - "cli-width-2.2.0" = { + "cli-width-2.2.1" = { name = "cli-width"; packageName = "cli-width"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz"; + sha512 = "GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="; }; }; "cliui-3.2.0" = { @@ -2362,22 +2497,13 @@ let sha1 = "120601537a916d29940f934da3b48d585a39213d"; }; }; - "cliui-4.1.0" = { - name = "cliui"; - packageName = "cliui"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; - sha512 = "26knyxdavl3y7kq82vfa094ym3n05vy2h2j5srb9fhhy8l43l0kwlasah5i78jks77zqgc373hbf96xcxv6am042gpbw35x452vwlg0"; - }; - }; "cliui-5.0.0" = { name = "cliui"; packageName = "cliui"; version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; - sha512 = "1fg1afsij2xwc4gpqbyhrp3s7q19w7bmii0ghmdv6cdx6giz3v0yqn25i3g7fw2lpi388jpvaf6nf9z2c7xp7w7psrww7569548d1rx"; + sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; }; }; "cliui-6.0.0" = { @@ -2386,7 +2512,7 @@ let version = "6.0.0"; src = fetchurl { url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"; - sha512 = "2nrnc0jqyx39906mqm5rb1svgckj19nfhs2101bm0pmirf4fglfzjzxrfr3si7vfl8bhz84xg9fv8v295y83l6yn8rz0ph2va11pb5p"; + sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; }; }; "clone-response-1.0.2" = { @@ -2404,7 +2530,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz"; - sha512 = "1f80c0924lf6b1w99d89a62dbp6sc8mkndhv2gd5lz4l87vca1df8hglf3pd28v1i4x411akwjl3sixwmgf1m8lknw2r78hwqdy77xb"; + sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="; }; }; "code-point-at-1.1.0" = { @@ -2431,7 +2557,7 @@ let version = "3.1.2"; src = fetchurl { url = "https://registry.npmjs.org/color/-/color-3.1.2.tgz"; - sha512 = "2k8bl73w917gsvrf34vprlahwjr6wj4al3rmhb25388gk1kkjgma55v1a80766b3slgppl1xgkm32f3b0rbqhvrkxcjq1wvfy2cjx5x"; + sha512 = "vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg=="; }; }; "color-convert-1.9.3" = { @@ -2440,7 +2566,7 @@ let version = "1.9.3"; src = fetchurl { url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "0d5pmdh1dh0qbpjrzdczwqkh0jwf8gxhq71mknwlxqz80h1q6kdrpghq4qfp0y4v650ia2jdihmzpb2n8hg00h72lnx05dgvysi9w21"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; }; "color-convert-2.0.1" = { @@ -2449,7 +2575,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; - sha512 = "0ljb8898z3dy87kw5y4xzfajw793q0bqvkp039sk5k3bps50mgjg6iz6fz2klal75vgx3zcv4a6jahx0p5n22lsdzqyz2pvr0z044a5"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; }; }; "color-name-1.1.3" = { @@ -2467,7 +2593,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; - sha512 = "102q02y0q23lgfnxmqq3arriahq9jsbkx3pyhcyaqrfzq6zqyiw6xirgn8p36zv5y0znlwbdf620dx537ij4ixn6nqavpcn1gfbxv3l"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; "color-string-1.5.3" = { @@ -2476,7 +2602,7 @@ let version = "1.5.3"; src = fetchurl { url = "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz"; - sha512 = "11p4cihq5874fmyvwkh0fp4dr2syliqsgg610rw46lsav41l6wcm4bgpkrl34gip3cqncw0ppmqwfknm5v02m1fj8qqk8cnlzk84bbl"; + sha512 = "dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw=="; }; }; "colors-1.0.3" = { @@ -2494,7 +2620,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; - sha512 = "2saczc8hcdmgns1cp1g1p7g2sq4yksrik0ffvfkhkavmmgx8haqm034a4c9zj8im6kfjh00n2xi360yqfy7vbsi98zri0943r72mrbb"; + sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; }; }; "combined-stream-1.0.8" = { @@ -2503,7 +2629,7 @@ let version = "1.0.8"; src = fetchurl { url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "1v09nkip7zpn3k3prkkg53w331rhczpfgcqb0q42i97nafra43l2khl5zvhd4ar0qmh145nmw7944jy8p108ny0xpgy29gf2wqph0qm"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; "commander-2.14.1" = { @@ -2512,7 +2638,7 @@ let version = "2.14.1"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; - sha512 = "11j7mwxfdnhi3yfkhxjvfkg1mzdsi3wq7iygma6ksmj1f7hfs0z8rpfcysqmy85f67mqvzhda3w1lyy1jqxxm31k799sazbipm7b17r"; + sha512 = "+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="; }; }; "commander-2.17.1" = { @@ -2521,7 +2647,7 @@ let version = "2.17.1"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"; - sha512 = "21fbnprzkj53pjsp5wd7f5wa50jrirag11gq351jr8hhrib5gw62kylpvcddv3c2a1vcs1p8llq80wdnflh6lny3frnq7v7l6vi9wy0"; + sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; }; }; "commander-2.20.3" = { @@ -2530,16 +2656,7 @@ let version = "2.20.3"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; - sha512 = "1qqrwy7z476gqa94kjjyyzyi3x49k28ji7znbc65plrp67yzmpa2yyslh6bl965yl4jqb2fwb2ljzhgcvv2xxj8ab86n5rgryc6958s"; - }; - }; - "commander-3.0.2" = { - name = "commander"; - packageName = "commander"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz"; - sha512 = "2ilf2mvb0dww4ghk17nncvymsankhk01lf7l0vls1dzf25ih2djz36n8xz6xh2rh5iacn1i7azfcfm80wyf0rc81f53q17q400z9ahr"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; }; }; "commander-4.1.1" = { @@ -2548,7 +2665,16 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz"; - sha512 = "1cblg9al7s2w55kglhr3skkiw5m55apxk6idj5j0d0nrxi2djizbz9gv3cap5dd16acshaikaxzwx009vzdl08z2zrhik3433rsdqil"; + sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; + }; + }; + "commander-5.1.0" = { + name = "commander"; + packageName = "commander"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz"; + sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; "common-tags-1.8.0" = { @@ -2557,7 +2683,7 @@ let version = "1.8.0"; src = fetchurl { url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz"; - sha512 = "2vvj4chc55svz1wkvkg2r38n3n0qs238fgcjpnn1hrz9w1hd3r23j4dc2vcz61can4c8m0n94bwa9j0j3wcp56wn6zra6mdwz9a1zp8"; + sha512 = "6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="; }; }; "commondir-1.0.1" = { @@ -2575,7 +2701,7 @@ let version = "3.6.0"; src = fetchurl { url = "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz"; - sha512 = "029zalmhpzy6rz52kpc6z465asw21dl1jhmsvijp9z3l9hjvp1zq82r0bsm5d4hc8z17f4hs5drv3pbdy456bmfxs0q1krmikc1z82v"; + sha512 = "W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA=="; }; }; "component-emitter-1.3.0" = { @@ -2584,7 +2710,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"; - sha512 = "136ravx3m3gf0ca84sf21hj47wmpqyjzmx6yvhj0b14mga7xcxfcgdc7yj9z8klcbr4yfqzy88fksmf233qx68a9ysw7yh1lixyrpa5"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; }; }; "compressible-2.0.18" = { @@ -2593,7 +2719,7 @@ let version = "2.0.18"; src = fetchurl { url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"; - sha512 = "13341lfj8d36v6gha16xmv92w4875z8irqdbns3jxlkc3a63aswys5sajq97y1sd42l08inw1l0s51r4l9lv20w6gy14nsxzvnfnp80"; + sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; }; }; "compression-1.7.4" = { @@ -2602,7 +2728,7 @@ let version = "1.7.4"; src = fetchurl { url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; - sha512 = "24kqcbwm455isy2yiyfrdrsh011qi09pbgylw1jws2yfmiwmwp2j8pmax52c41z3x1n84v1j5va29dnxwygkl4pw599b9gx6c7qi94d"; + sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; }; }; "concat-map-0.0.1" = { @@ -2629,7 +2755,7 @@ let version = "1.6.2"; src = fetchurl { url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; - sha512 = "05nnf80j9ls12y3cw2dfnc6rmand3ya5sx9cqn9dgg19ljzdnyfjjv8ig79xi73gr2y4rkfzn9wjip2zzwp5n2d49njd3ki2a1c3cfv"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; }; "config-chain-1.1.12" = { @@ -2638,7 +2764,7 @@ let version = "1.1.12"; src = fetchurl { url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz"; - sha512 = "2hg7rni4gx8l765i8qzkp9dv69c8r06i8rxxkkkrsklbd8iz6ingxnp10r4fqqrm9jxy3gp8yp0lzpybwdf27kq49abkyxwrchqwmvb"; + sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; }; }; "connect-history-api-fallback-1.6.0" = { @@ -2647,7 +2773,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; - sha512 = "0p9s5aqb76hamj9z64zd53ndh5r1jv76iw97hwrylmwwjprjn1246hrr5nvp5vs1xwwipq6dv7zj4qwywbn3n4cxc3llfdzvbvh37kv"; + sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; }; }; "console-browserify-1.2.0" = { @@ -2656,7 +2782,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz"; - sha512 = "168x7bp4xr522yw92himv9xv14q336ps1kkg79qcmarg3q4yzpd52pa8x8zgq11b6996f8053799k6365437si3pk85w5z4y8xiijb4"; + sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="; }; }; "constants-browserify-1.0.0" = { @@ -2683,7 +2809,7 @@ let version = "0.5.3"; src = fetchurl { url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; - sha512 = "3976ggkw1lp21a6m3s19blb9a74kq7a0spw47v0m3vvi1k5wiamrsn20slcr9byx80x2la2sppkwjp7x10gc58142dl7412pvpv84qk"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; }; }; "content-type-1.0.4" = { @@ -2692,7 +2818,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; - sha512 = "1f4y61wc913jrnga7nny83gzf9l2488q6sl1ry9lbwgh5x5d3va0xcc0xrmjk6gdxl6d4r6rsk800xp5bazhjrx05yx1wpc8c8gg0w4"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; "convert-source-map-1.7.0" = { @@ -2701,7 +2827,7 @@ let version = "1.7.0"; src = fetchurl { url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz"; - sha512 = "2hgf7brri4yaflx3y24d2cvznsk0km17mq8mp7sb2hhskf45hcamlgf8vzzbimw36lw128bjbf442p2rx96d1bhn9sk044p69gn8lp0"; + sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA=="; }; }; "cookie-0.3.1" = { @@ -2719,7 +2845,7 @@ let version = "0.4.0"; src = fetchurl { url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; - sha512 = "1g7bscknfpc6zgznz77hvll6cy5m9jv7zg9nkpdqzmgi0vhv75kh8iyqf6rdslkml47l3jihsz7hy0i8x5n6bfx9ba0kvvrp9y7qypq"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; }; }; "cookie-signature-1.0.6" = { @@ -2737,7 +2863,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; - sha512 = "3c1ggiqqnjgqlwdnimx94gm176c8rjsrih5qw2lbm642l8x7grx07v065k4j89c1p0adkm7v6sz11drb6j6sp51np2m1cazvycnhrvz"; + sha512 = "f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A=="; }; }; "copy-descriptor-0.1.1" = { @@ -2755,7 +2881,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz"; - sha512 = "1p74sgd6krkddnl160vhab1v634p3n24fy8nzbs7hr9l1snhwxslv3c2xb22599gcc96r3g0m5b9ngx3a17gc3m82ij0xxwj3jlqpiz"; + sha512 = "P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg=="; }; }; "core-js-2.6.11" = { @@ -2764,16 +2890,16 @@ let version = "2.6.11"; src = fetchurl { url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz"; - sha512 = "1db6yjq48a8kkrfrxd0miblcf7nk2b4afgpr8dfgjl3jvz3xclvrqmz590hx2h59jh79lgl35r101lw5jqs46qybizdbpgzljjyf277"; + sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; }; }; - "core-js-3.6.4" = { - name = "core-js"; - packageName = "core-js"; - version = "3.6.4"; + "core-js-compat-3.6.5" = { + name = "core-js-compat"; + packageName = "core-js-compat"; + version = "3.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz"; - sha512 = "35hfghyllz0wqcz293wdsy4vry8yjx8m9b7f1gr4s8m528d4vqiva2na7b5mwddj0jzrfhimzvzpm9gvykrbqkm47v9708d4wcq75p2"; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz"; + sha512 = "7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng=="; }; }; "core-util-is-1.0.2" = { @@ -2785,22 +2911,13 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "cosmiconfig-2.2.2" = { - name = "cosmiconfig"; - packageName = "cosmiconfig"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz"; - sha512 = "3j2bwqqxpllfpdbnnjl2n380q8mcvz08p2xi5c7kzhqrscl8f3lmpa11jzsn76b5q2rz4604bffg2vxbbx4rrlmvgr82g8500pmf8qs"; - }; - }; "cosmiconfig-5.2.1" = { name = "cosmiconfig"; packageName = "cosmiconfig"; version = "5.2.1"; src = fetchurl { url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; - sha512 = "287zy383n43wsxg7y8jwzzf3slyn945k312ilkg7l7c96j458cy25jab60692lb1zvggrcm28hilkr6vsp2garryggshj1mgaqn1bhz"; + sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="; }; }; "create-ecdh-4.0.3" = { @@ -2809,7 +2926,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz"; - sha512 = "1mhn55gf43qsdrp2klyyyxqjsd5mw9l6s51vsfj7wl44pq7ymfw68r8wkd4yd8dd6adg3k6q18sddxfjljr0gbk56lh3cqfyd00gc8r"; + sha512 = "GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw=="; }; }; "create-hash-1.2.0" = { @@ -2818,7 +2935,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"; - sha512 = "055xaldi3hy1bjxhvznh3470j1kq2xk827mxal79bgqik3lblax6s4inxqby27ymgcghl2hn7wnx9fnacmyq3q93hk6y327cc41nkfg"; + sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="; }; }; "create-hmac-1.1.7" = { @@ -2827,7 +2944,7 @@ let version = "1.1.7"; src = fetchurl { url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"; - sha512 = "0p2jhk94k3as67lhrr1jyljkr0y65snxjzqnix0nifnfcanhilccrzkc47gwlg5wy0m8l1gv12lj78ivgmw5m1ww4f8iylr52bbv49h"; + sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; "crocks-0.12.1" = { @@ -2836,7 +2953,7 @@ let version = "0.12.1"; src = fetchurl { url = "https://registry.npmjs.org/crocks/-/crocks-0.12.1.tgz"; - sha512 = "0qic3mmpra56jzjnkqhc1pq1wzzlsacpl4r9a7c1qks0dkfw1lvva0iyqhjkp1zjvyf7d55vcidmlxpc17x4y9pbx858gk600kr386s"; + sha512 = "2qCRJwBmPlRQXzd50k9gt9PaItultOP8lj/cKSH2Eai9aeBuNqAnDuyolAm9TGn6Pw/4BgbxtPJLU1S+tQ4WMQ=="; }; }; "cross-spawn-5.0.1" = { @@ -2863,7 +2980,7 @@ let version = "6.0.5"; src = fetchurl { url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha512 = "1csj16gwq9riz0pm73dlxhbnsl1r3ldc5v0aincwj71ambi6xf3kc1kgsbwaakd8rj16k4mrli2syrjd57g6cr81zdzivdd2jn4ndbr"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; }; "cross-spawn-7.0.0" = { @@ -2872,7 +2989,7 @@ let version = "7.0.0"; src = fetchurl { url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.0.tgz"; - sha512 = "2vnqmy0kzk78wrwyz8533a4li5x1gx1mxj5qi73v17sxis3fsxhamlhblqdn06nkvj09mphm72ivjinpa7l6s3d0xki655nq94gqkz9"; + sha512 = "6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw=="; }; }; "cross-spawn-7.0.1" = { @@ -2881,16 +2998,16 @@ let version = "7.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz"; - sha512 = "21fi60ixr252k0gn4mwbd6k36fhbw4mjl75jq6h49yzqm47mgfaapnzb2zb8nvlaf8yxq5n4zzgbb371y3j0z36vx1mmh0jrsizifxv"; + sha512 = "u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg=="; }; }; - "cross-spawn-7.0.2" = { + "cross-spawn-7.0.3" = { name = "cross-spawn"; packageName = "cross-spawn"; - version = "7.0.2"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz"; - sha512 = "33hqaimyh16rpn80vgg92ihza7cvx5xwnxadalkzsag2sifp40w1q90wpm9ayz4k6scqcnc17c8wfmc22qib1khzm582jxp07qqcgiw"; + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; }; "crypt-0.0.2" = { @@ -2908,7 +3025,7 @@ let version = "3.12.0"; src = fetchurl { url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; - sha512 = "1d3mrhqlay037azmjp2ml5a8yyls9ijdhilv6f0znz0ajgfm972yr9bhm78wqi09p4crc3shgflk50jc63zijsqv777ikkyi2j2qgkz"; + sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; }; }; "css-color-names-0.0.4" = { @@ -2926,16 +3043,16 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz"; - sha512 = "02cfxb0d2yngcgfhk64i1sgg22sg0qd0llh8hkd5k7zwm7skwlwdibag8dv0zszdwj1mf2kjg9qb10zxichaafngqa4846jli451k05"; + sha512 = "BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA=="; }; }; - "css-loader-3.4.2" = { + "css-loader-3.5.3" = { name = "css-loader"; packageName = "css-loader"; - version = "3.4.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/css-loader/-/css-loader-3.4.2.tgz"; - sha512 = "36dsndmik7z39c4mvjpjdkjw44n2lnvkafsr6gm0xk9p4ys04j5d2j8m1zkwsmhzcd1jnlgx0hx2lndlzxgjb994fs89ljksv6vi2ld"; + url = "https://registry.npmjs.org/css-loader/-/css-loader-3.5.3.tgz"; + sha512 = "UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw=="; }; }; "css-select-1.2.0" = { @@ -2953,7 +3070,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz"; - sha512 = "16wjx4f410fs6vdg0hgmf0b437d19f9gx73pbb9bj0l2dkrwiin4kg3rk8as74m6lr29kl05csjms6dwjcwsbssvl3vmh5908nkpa8f"; + sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; }; }; "css-select-base-adapter-0.1.1" = { @@ -2962,7 +3079,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"; - sha512 = "3prww0p33p31w3r3qw6hlmqabd6s1vgjb73pjv4xiy63nfb56yjhby47zpnj4q19abvvchrkbh7n6hzcgyw34zly8s05ldv25wmw1cd"; + sha512 = "jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="; }; }; "css-tree-1.0.0-alpha.37" = { @@ -2971,7 +3088,7 @@ let version = "1.0.0-alpha.37"; src = fetchurl { url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; - sha512 = "27dw695h47z8hlav2dn6mcm8fxli9gljif9jiwdxdvg70yn4129lpwwiq53mx4anajcxl28w82zvwjk8w6x34qjhga3x7rb1lk5dk0c"; + sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; }; }; "css-tree-1.0.0-alpha.39" = { @@ -2980,7 +3097,7 @@ let version = "1.0.0-alpha.39"; src = fetchurl { url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; - sha512 = "2fay50khaq33f27bwnjc7cxvny8xb7y7fnfdrp8ffcxyika56mmbiw8wk05dw1djdvxw5475jn16fy6b14z6zfvyi378001i08y8jzd"; + sha512 = "7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA=="; }; }; "css-what-2.1.3" = { @@ -2989,16 +3106,16 @@ let version = "2.1.3"; src = fetchurl { url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz"; - sha512 = "092jz28b0dcfww936mpi3blcr79h3dzl0ksq69ismfks6q03vfm23d7i271jpvymy7fs9d7mqak1m1vlw6wfpzfhxgj6rmf7yh0zqbb"; + sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="; }; }; - "css-what-3.2.1" = { + "css-what-3.3.0" = { name = "css-what"; packageName = "css-what"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-3.2.1.tgz"; - sha512 = "0djs0gslzbmmdrlzzd6wqvil6dnjirpdpfb5hxd3gdswxkyj4caxwmak6nabgn6spnm9p0xbb8hlqdwp68fbqp4nfkgqklhr2ian0sv"; + url = "https://registry.npmjs.org/css-what/-/css-what-3.3.0.tgz"; + sha512 = "pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg=="; }; }; "cssesc-3.0.0" = { @@ -3007,7 +3124,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"; - sha512 = "1bgy350qm3f9vcr9yssaj62kkfiqf3fkdfw0z7xqy7b9qy4p8774n3460wzsh9a1ra26s1msfs2gnrn9jza21i76mkmvmyar0jzydpx"; + sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; }; }; "cssnano-4.1.10" = { @@ -3016,7 +3133,7 @@ let version = "4.1.10"; src = fetchurl { url = "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz"; - sha512 = "1lr95m334m2kzy2l8l9arg688wi21ha5wslfm9kh8ks00j546fzy3sw8m83ccmgkansp56v9xxkgmwjz2kajnnrh08zzqw7bvwg42g7"; + sha512 = "5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ=="; }; }; "cssnano-preset-default-4.0.7" = { @@ -3025,7 +3142,7 @@ let version = "4.0.7"; src = fetchurl { url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz"; - sha512 = "2q4cndyhj7jwz0mjwpavg3vggb703pmxrg1h06aqlm752q71misnkga66j4imxwpc3fidk5g6pgp05fzp966wsx18grvsm13lghfin7"; + sha512 = "x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA=="; }; }; "cssnano-util-get-arguments-4.0.0" = { @@ -3052,7 +3169,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz"; - sha512 = "105dpashgi6r1x5yxknn3c9ksn3bj04hgzy3q1jv4h6l1j3zjgp1nm6kckmc5j58cw9xirccvlpamnbwiynag4jwzr60vxncasrifx8"; + sha512 = "qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA=="; }; }; "cssnano-util-same-parent-4.0.1" = { @@ -3061,7 +3178,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz"; - sha512 = "3apdjffzy480hz1vghhhah8a90d1ah2vz624apbn2gn7847v4mpjfz7phwk959wfs11fqp4md9vbb25850fjmhh0f488aiywvjb3hjr"; + sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; }; }; "csso-4.0.3" = { @@ -3070,7 +3187,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz"; - sha512 = "0fk58wf7qcd30fdfrrwvhh9swyrlzbz63z9kkmhq2557c32627dzjkh8w2ha000ngbsc6w19249lpbn2wzb3s8978mlflii5fkyrg9l"; + sha512 = "NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ=="; }; }; "cycle-1.0.3" = { @@ -3106,7 +3223,7 @@ let version = "2.6.9"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "0q0fsr8bk1m83z0am0h2xn09vyfcf18adscxms8hclznwks1aihsisd96h8npx0idq5wwnypnqrkyk25m5d9zh3dk7rjs29nybc8bkc"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; "debug-3.2.6" = { @@ -3115,16 +3232,16 @@ let version = "3.2.6"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; - sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; }; }; - "debug-4.1.1" = { + "debug-4.2.0" = { name = "debug"; packageName = "debug"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; - sha512 = "1kmf9j5pka2rsljg5x6shniwmgs9444ksgdn0d3fjmis7yghxxn2zj526s36ip8rmpfni9zpj8z74w7irax32a67j59xw38wk6hi055"; + url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; + sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; }; }; "decamelize-1.2.0" = { @@ -3160,7 +3277,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/decompress-response/-/decompress-response-5.0.0.tgz"; - sha512 = "0rnf28sjgvk6j7kjw5pw6604hzpvbb6w3j8p1rykk7klpyd4568r0adaaiqylsg2xnhz38lxg66zp5bl3zr5wmjbcl6iigf4rdmddjc"; + sha512 = "TLZWWybuxWgoW7Lykv+gq9xvzOsUjQ9tF09Tj6NSTYGMTCHNXzrPnD6Hi+TgZq19PyTAGH4Ll/NIM/eTGglnMw=="; }; }; "deep-equal-0.2.2" = { @@ -3178,7 +3295,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz"; - sha512 = "3r4bwyfb492cwv2lz8slgy0ch8gx4wx1smr39qzjscnqvwswnk3r748qdmh8i5867sdm017rwjj2fgl3d2c3p4qz08mgab20zj5rpy9"; + sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; }; }; "deep-extend-0.6.0" = { @@ -3187,7 +3304,7 @@ let version = "0.6.0"; src = fetchurl { url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; - sha512 = "0wc0sqg1aqx864bxf8xa4j8ncrc8rcvmiaj1sp3x1np2i8hdjybzjfd0w9gbf1yasmwycwzzg1mz6smr3q42hhv4pjx2qcgwqhg3q9c"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; "default-gateway-4.2.0" = { @@ -3196,7 +3313,16 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz"; - sha512 = "2067xswfnhdrq76l5wqibx50y8r46q0sdbkax2nxq6gq0ljjrrmmq95k99vnkgcz5xc7r1hhv0w7bw978krjxvdmnawam3ma2nhraw7"; + sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; + }; + }; + "defer-to-connect-1.1.3" = { + name = "defer-to-connect"; + packageName = "defer-to-connect"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; + sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; }; }; "defer-to-connect-2.0.0" = { @@ -3205,7 +3331,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.0.tgz"; - sha512 = "0i5i9bz9viv04jwx2lnk4485zggbrsnljkfx7dr2n4iaikvgdf8lfmx98wyyq7ba92azw0pr42fxlq2sadwfka64ksjffbg9rvzd0kd"; + sha512 = "bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg=="; }; }; "define-properties-1.1.3" = { @@ -3214,7 +3340,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "1fsa8nx7qgi958fykj36cndsf8ygj3132if6k4a36mkf11bl2j2gn7dn2nz07mfsygkx0415yxrjpzx8j369z1767fvr57nm1h9zjnw"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; }; "define-property-0.2.5" = { @@ -3241,7 +3367,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; - sha512 = "1hrk3pzr4hyhfnrjy1msrlj2zh769x4l35q9fq0a2cy2glq3h1iwjkpmvz39y9idwy71h9hd98lydi92485bzkff1dzm70wbr8vc0lg"; + sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; }; }; "del-4.1.1" = { @@ -3250,7 +3376,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/del/-/del-4.1.1.tgz"; - sha512 = "1fkk8r4abk9009whl0yqapv13rjzj6mr01ghkxpbjkrvr6a6n6hg492mdr72wf3dc13zp3dmzq6z4bzm31h59q7q4anjgrf988sw0a3"; + sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; }; }; "delayed-stream-1.0.0" = { @@ -3286,7 +3412,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz"; - sha512 = "085ljc5q2yk3jabd61p91n821q4prv13qalbfni9ybcb900b4mmcdnndi5b5prfs9wybp13asd13shlxgrbsgvyfx7nbgvby6jkhhj3"; + sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA=="; }; }; "destroy-1.0.4" = { @@ -3304,7 +3430,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz"; - sha512 = "0mncqs8asq6722qr5jcv5bwi1653nd4s61s9mb9iyk3jkv83w9iynwjfd6ynp1jwsmr7qaspk6yd1x8c05qi9pxikikwfkbnajd3334"; + sha512 = "ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="; }; }; "detect-port-alt-1.1.6" = { @@ -3313,7 +3439,7 @@ let version = "1.1.6"; src = fetchurl { url = "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz"; - sha512 = "3jmpnxszsgf863rw2247kalaihrslvrsp49qvnhymgx1skhhsfs51nkf3galxkn5lk39zw9p53xqbpdy620q6j60i2z5acbvy935m76"; + sha512 = "5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q=="; }; }; "diffie-hellman-5.0.3" = { @@ -3322,7 +3448,7 @@ let version = "5.0.3"; src = fetchurl { url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; - sha512 = "37186rz3862gn294acnwnm59jwm62x1rz9ca0y5anvmj0a7abs4rhw974qp1j684qpd4rxb8c2kagv21hapxfddr2q72zvyv7ya19lj"; + sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; }; }; "dir-glob-2.2.2" = { @@ -3331,7 +3457,7 @@ let version = "2.2.2"; src = fetchurl { url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz"; - sha512 = "2rlgbmwy8bl5xqrwifdqhggx21ac4c8k6vgq7ia2h6cxmaiprrlm1p99cn4hb4dmax9wwk4vx96bc50b7ngxgx74fvqbk0njj5w3lkz"; + sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw=="; }; }; "dir-glob-3.0.1" = { @@ -3340,7 +3466,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; - sha512 = "0h761rklv8qk0vhv6ms98gsvdiyk8455iqqh6wh8dfal5xjx87gmmpyg7773zdrxwvhnzw58pan4rdqjfwkhcv653gsbq4is6kxcjjs"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; }; }; "dns-equal-1.0.0" = { @@ -3358,7 +3484,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; - sha512 = "19g682cvkba33mwrism28hibd2nv9xd16k5bj807jx3ih1cc7ff9dn8chmfjnqgglzl6lq3m3jarxng9vbarccgchd0aq118d15yk6i"; + sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg=="; }; }; "dns-txt-2.0.2" = { @@ -3376,7 +3502,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz"; - sha512 = "06bmys00dd8r5s4k2xi892s3xhgwnwj704y2jbpd2bgdm0vvmv0wv81npa6bfb2s7jvk2ny516cxhfy0jpjmj4qhzywlf6zhfjg5pc1"; + sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA=="; }; }; "dom-serializer-0.2.2" = { @@ -3385,7 +3511,7 @@ let version = "0.2.2"; src = fetchurl { url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz"; - sha512 = "3v6s9yk4g6cw8chgrba79rbahiqw782013df898df7k7d81n69x2135qashgf23q59zr3w42qncyf4hszlll8knkhv0xccifdplzz6v"; + sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; }; }; "domain-browser-1.2.0" = { @@ -3394,7 +3520,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz"; - sha512 = "1fcxv8rzfhs99afvhji7bs5ppxwn9mw040ixdgvkm6iabz72q61arly2lr57086rjn4g2vkb3rkih1cyc7z35kzv1jjciwyrs4g4y4f"; + sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; }; }; "domelementtype-1.3.1" = { @@ -3403,7 +3529,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"; - sha512 = "3gmb8frh13hzm986ggv14h63h5033jp045mvy1wrcj9j56j822a86arwq7x743i6glkv1bw6qwqriivypd0icbkzi492cm96kwq28h5"; + sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; "domelementtype-2.0.1" = { @@ -3412,7 +3538,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz"; - sha512 = "00vkhxlz4gkgfqzkp7faclfand3fr36zi4lpr50rjwbx54nfpr2fy612p2ixzpysqi28nfyzznngx5gvgcd13b52iy6ar8q7d88fwz4"; + sha512 = "5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="; }; }; "domhandler-2.4.2" = { @@ -3421,7 +3547,7 @@ let version = "2.4.2"; src = fetchurl { url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz"; - sha512 = "307i53zii3hv9zr3skxhp9pxa09ki0xwx9q1k7mxnq3hanjanlpr1mmavfzz68r2h6cl1bnv2836plrhk02rpa7yfzrpdq73pib88i6"; + sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; }; }; "domutils-1.5.1" = { @@ -3439,7 +3565,7 @@ let version = "1.7.0"; src = fetchurl { url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"; - sha512 = "076s2v293f9jixaddq6qmjc76y3z0kqddmjb4nclydp23y0jzpg6f7h32j6adilfdjxwwhxkclrhc1vn7rbsidvzcq32dkzq9fpc1rf"; + sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; }; }; "dot-case-3.0.3" = { @@ -3448,7 +3574,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz"; - sha512 = "1w5d7iardzdlbrww41km4v8wmhlzbiizk4jvr4n95xdqrwg228v0jfbkvc3vxjvl0vr0d8dfv5wlr8102z3rc7ikcgj92ci1sd0877f"; + sha512 = "7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA=="; }; }; "dot-prop-5.2.0" = { @@ -3457,16 +3583,16 @@ let version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz"; - sha512 = "3afnifh0aygp94kbnxph4rkg71zmgx2lwv2hhsja42kvryzcy30k767avsjpbvs6qksnbzifi5blka8c679gg7aw160sjd869l34idq"; + sha512 = "uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A=="; }; }; - "dotenv-5.0.1" = { + "dotenv-8.2.0" = { name = "dotenv"; packageName = "dotenv"; - version = "5.0.1"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz"; - sha512 = "2ixnvlqm3fb7javs7yhqb26afyf3wkd3hqpspwrg89mcfwshwyva5473zv7hhh3rrvn0vqywp5vnwkdq9r5mgkhapxhczz3zaw3q2z0"; + url = "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz"; + sha512 = "8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="; }; }; "duplexer-0.1.1" = { @@ -3493,7 +3619,7 @@ let version = "3.7.1"; src = fetchurl { url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"; - sha512 = "3k23dn0v8n7r3ds3v137vmw1vg3ngd6fw3bb4hasa6bm40qasvdaidjwx0wb4gakp8xvdrsckjn0wkmmi90z8a2sswj8cxhznxgrg6k"; + sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; }; }; "ecc-jsbn-0.1.2" = { @@ -3514,22 +3640,22 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.3.397" = { + "electron-to-chromium-1.3.481" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.397"; + version = "1.3.481"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.397.tgz"; - sha512 = "3cfkdvg9vdi3s7f5jh2hk2l0gqnfkqd5sw3v22cfx3za6vpfvdhx6hc8779bzwj8isagxxj0hwc9fdxhsx4w0k9fp939jzvkzb1vifd"; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.481.tgz"; + sha512 = "q2PeCP2PQXSYadDo9uNY+uHXjdB9PcsUpCVoGlY8TZOPHGlXdevlqW9PkKeqCxn2QBkGB8b6AcMO++gh8X82bA=="; }; }; - "elliptic-6.5.2" = { + "elliptic-6.5.3" = { name = "elliptic"; packageName = "elliptic"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz"; - sha512 = "33kzl02iwbq3pl33ihcdq9nm48yzhfj96183zzra06hp3z6bacz3d99pl74jziwygys4npxbxwnvszz12wl8lpkjw8b4r9ki797p33z"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz"; + sha512 = "IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw=="; }; }; "elm-0.19.1" = { @@ -3538,7 +3664,7 @@ let version = "0.19.1"; src = fetchurl { url = "https://registry.npmjs.org/elm/-/elm-0.19.1.tgz"; - sha512 = "1y57kz7w9064cmchjigsn0man2vw8b97fx9a88rxjfmxpqn1v7rdqi0kakivh0d0rkmjllbgz81zl742yq7fsyrfl1qdglrjas4xs5d"; + sha512 = "rehOtJKZvoYDddlrd7AX5NAf0H+LUllnBg3AHaeaIOKWzw4W316d7Bkhlbo7aSG+hVUVWP2ihKwyYkDi589TfA=="; }; }; "elm-0.19.1-3" = { @@ -3547,17 +3673,17 @@ let version = "0.19.1-3"; src = fetchurl { url = "https://registry.npmjs.org/elm/-/elm-0.19.1-3.tgz"; - sha512 = "1lmaszcl984nawb51x833i84ywff32l8wm63dkbaglvyc7312kllhqiw79ng3q7i928azlck8iy2xmki71fsqy9qz768mlw01xzlbgb"; + sha512 = "6y36ewCcVmTOx8lj7cKJs3bhI5qMfoVEigePZ9PhEUNKpwjjML/pU2u2YSpHVAznuCcojoF6KIsrS1Ci7GtVaQ=="; }; }; - "elm-analyse-git://github.com/elm-tooling/elm-analyse#1a665a6e540d7d11b29b3c5e3c52089704325d9c" = { + "elm-analyse-git://github.com/elm-tooling/elm-analyse#7f4000cce5ef024fe5e82c7ee1725feef95a9daf" = { name = "elm-analyse"; packageName = "elm-analyse"; - version = "0.16.5"; + version = "0.16.6-alpha"; src = fetchgit { url = "git://github.com/elm-tooling/elm-analyse"; - rev = "1a665a6e540d7d11b29b3c5e3c52089704325d9c"; - sha256 = "a442bce37ae37a65c1488c66e477c404da1c7f137a6668d89c4b09de845ca374"; + rev = "7f4000cce5ef024fe5e82c7ee1725feef95a9daf"; + sha256 = "270cb1adfdeb368dde2b780938f653e9aa46cc97afbe4de828813fef7c30e556"; }; }; "elm-asset-webpack-loader-1.1.2" = { @@ -3566,7 +3692,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/elm-asset-webpack-loader/-/elm-asset-webpack-loader-1.1.2.tgz"; - sha512 = "0sd764hrl2vzqvidwcpajafn8l24rd25v1bx534y92bvd5da96djd520r1sl0kbbd8n10690r963qs6zrnlz8hhdznvbp1m36vxidcf"; + sha512 = "jrXYtxk13LXtbxCiT23+RuNhUgbJgGBRW2sCqkMGojTZTFKttL1E8mSUvsIuomUiKLJOSXUZb3HjvwXNkJjTNA=="; }; }; "elm-hot-1.1.4" = { @@ -3575,7 +3701,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/elm-hot/-/elm-hot-1.1.4.tgz"; - sha512 = "2grbnfn0995mgsbg3jnzs9b94sk2si3n0fazl66na6lhvfyzj3vzblxn47f1b68hdr2i3l8pvj42wc47dqpynmci7mjg4n5izzczw58"; + sha512 = "qPDP/o/Fkifriaxaf3E7hHFB5L6Ijihyg8is4A6xna6/h/zebUiNssbQrxywI2oxNUkr6W/leEu/WlIC1tmVnw=="; }; }; "elm-hot-webpack-loader-1.1.6" = { @@ -3584,7 +3710,7 @@ let version = "1.1.6"; src = fetchurl { url = "https://registry.npmjs.org/elm-hot-webpack-loader/-/elm-hot-webpack-loader-1.1.6.tgz"; - sha512 = "2s6yhby0lmvjl8979zxpzdqhdwvy21m42ml4mlrh02hcq0zn5zirshwjsazy2rs8bz0j2qmv4cambh5jya1vdjkpv7izzmww7mbg3vx"; + sha512 = "fY+36uG8/h/PvlO2HZSXBa6qGNkVCwn+QjoL/5WWHOocf7EfYAYFgJlWQqsgNQi/eYO4/dt/OglRuSsFfkFvtA=="; }; }; "elm-test-0.19.1" = { @@ -3593,7 +3719,7 @@ let version = "0.19.1"; src = fetchurl { url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1.tgz"; - sha512 = "2677ylcn8afd1z2hsk628i7dkc8cp4pb6aassgwv6y6cky0w5393ahkydvy39jlqi95gghiybql8ga26m1r7dylp6dsvaviz1kn09jb"; + sha512 = "SyZgZ/hxq62budS3k0M1Qj1E8fIRvldSxFSm4XfzE6qRRuHAT2a82fxprZRZl1yG2GwnImGmhuKH5hSyjPpzjA=="; }; }; "elm-test-0.19.1-revision2" = { @@ -3602,16 +3728,16 @@ let version = "0.19.1-revision2"; src = fetchurl { url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision2.tgz"; - sha512 = "24qc3z9z059c0dp97lfpsqgigxks6dd8akf14p3wvnvsy5ih3nf4947qc94xfrr0jdql0nnq12727nyyyyz3zrfyy54y85jayckcnyd"; + sha512 = "zVs2mVeyIE+K9y7/8b333h5xRMDWAoqbBDm7ThLDhyTi7ICxeL3t5uOS4KZCrRk9+4sP6+voSbcBlgr46Q+GiQ=="; }; }; - "elm-webpack-loader-6.0.0" = { + "elm-webpack-loader-6.0.1" = { name = "elm-webpack-loader"; packageName = "elm-webpack-loader"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-webpack-loader/-/elm-webpack-loader-6.0.0.tgz"; - sha512 = "0qd4ac4xsbhp76jaqpcr9skahccpj7vva111bxinnbmcl5p7n5y8ryy539hnzvxq3gy3j3x68ikil2fcvzqaf3mnm3jrwn5ix98m5w3"; + url = "https://registry.npmjs.org/elm-webpack-loader/-/elm-webpack-loader-6.0.1.tgz"; + sha512 = "SkltiDAbegaiPxsQq7sxqTyRUXzD4n6UaT9JTZXIYoAjAEi/ogaIbYLQD6Ne5ZaSW3JOo6S/vb+VO5v0qDdirw=="; }; }; "elmi-to-json-1.2.0" = { @@ -3620,7 +3746,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/elmi-to-json/-/elmi-to-json-1.2.0.tgz"; - sha512 = "3yyy4v1cp6bqkriy1dhq77dsliafaxpcmacyxyk5gwk7kflw9lafhh6l0lsrqwlb2nb2qp4l7g0qib7pm80c7kqskswlq5zvv7agn6c"; + sha512 = "zNinzt6/YMr11HgeBlC9Z0UM3qHkYrGsWJTjrCmgBkKnaOLUzTP5K9N3z1RltyunItXtHAxb8DFPvMxlYRPv/Q=="; }; }; "elmi-to-json-1.3.0" = { @@ -3629,7 +3755,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/elmi-to-json/-/elmi-to-json-1.3.0.tgz"; - sha512 = "0m6ryjnwyvjg5nif66bn9vlpwgrkc6vkrbx15aq4f1in806xm7j2ljdjri8z8syczh651k7bwmsckbwnw8q30g390mrbrnvygkl6vga"; + sha512 = "6m1D5/Pb5pUrSOOBgRG3fE2mK19nhmLgZ16jj2KWTVIhT+0GIBuDI1iV0Fee27CZH790J7uMcdGWJ7fnVvpsKg=="; }; }; "emoji-regex-7.0.3" = { @@ -3638,7 +3764,7 @@ let version = "7.0.3"; src = fetchurl { url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha512 = "2s4i22ccvwa2l4xwl9yz6mkyn2kpf58hp1nqiwmmgqlpyr57345i3ll0l4656ryik6a6wz1lgk4vbl6y0dwj5hx2kcbpv0h8924n00b"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; }; }; "emoji-regex-8.0.0" = { @@ -3647,7 +3773,7 @@ let version = "8.0.0"; src = fetchurl { url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha512 = "3l88qajsl4nn4jy6gfp9fq41z6m68nykklbg1piszmhjgniiw51b3pbnf57lvbw3d6jv3xj1v16z0d5651wzs81q0g0sf4dqp6xha1i"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; }; "emojis-list-2.1.0" = { @@ -3665,7 +3791,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"; - sha512 = "3cib7aw0206bfcb324aqh3fsda46mjxghd08gaasxagv6jfc74r2jvcv78rb8h10m879w42nbrn3q8rjifg9s5rclbpr2hzq7bqqk7y"; + sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; }; }; "encodeurl-1.0.2" = { @@ -3683,16 +3809,16 @@ let version = "1.4.4"; src = fetchurl { url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha512 = "3jyw0a0c7m1yxglwk7i5jh8zb3vvx7f9l4frbskxkgf9cyf4i8ww26p8bimnsryrh1dx7lwrxq64vbpjwfcv1svd4lg8m07fa53bv7s"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; - "enhanced-resolve-4.1.1" = { + "enhanced-resolve-4.2.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz"; - sha512 = "2w4dww5r1bxbycbb3kq0pdl9v56942678c53j9rwikxf05xd2n5h0b3a6914wxcmzr9wx4m0w56adp3qp21rk1wzkhbybxb9z67djpp"; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.2.0.tgz"; + sha512 = "S7eiFb/erugyd1rLb6mQ3Vuq+EXHv5cpCkNqqIkYkBgN2QdFnyCZzFBleqwGEx4lgNGYij81BWnCrFNK7vxvjQ=="; }; }; "entities-1.1.2" = { @@ -3701,16 +3827,16 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"; - sha512 = "3dv4zcyi5bjn1q5sd46vapv1y0wilalg5bwh5cf62w8bpiwms4q9c3yhfvvj6fh2fkc3bcdwsjabrs4d3j86ji0c6xkn5vmi4qxjqkz"; + sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; }; }; - "entities-2.0.0" = { + "entities-2.0.3" = { name = "entities"; packageName = "entities"; - version = "2.0.0"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz"; - sha512 = "0pqz0h0aafqad2dm3qs73sqk6nhgr7icrfqwnxbzysbdkh11grcbssa7m1nkyzc22g9zwpi752fpw5r58rrldhjjlqh4isj89bzpmqg"; + url = "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz"; + sha512 = "MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="; }; }; "errno-0.1.7" = { @@ -3719,7 +3845,7 @@ let version = "0.1.7"; src = fetchurl { url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"; - sha512 = "2bdzcjwgdkg5yrvlw6my57pn77k4j7a2pzppwqrq4va9f5bd4b5mzbhwpklhsy1jl7w9sjvnfs30h42nhz2dbdfhagnh8dk6l2d3yii"; + sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg=="; }; }; "error-ex-1.3.2" = { @@ -3728,16 +3854,16 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; - sha512 = "3igrl2amb9mpa9d2z6qghz3ljqd7amjla8ahfs5fdgl0w52pw6gz3y32q5fk229yvfyg3x9kpfygadcm2w0lv4hv4nj25cyd8v4glgd"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.17.5" = { + "es-abstract-1.17.6" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.5"; + version = "1.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz"; - sha512 = "2kayciqh331d3kp1l8wdsp33kzdc02rv72z6x2327w2i6yks9b7xwxbg1xdrrkhaglr06liqzdjavq9qk9d487sf572rjfv62xml7q5"; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz"; + sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="; }; }; "es-to-primitive-1.2.1" = { @@ -3746,16 +3872,16 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "2y6j97j2f10gc52kw7qin10gm24m5hz1qq7ph6jf89y8a9i8vb268f2q0z78qjmngc765y9v0f1ldc5qb10b638yqlabda90sbaa8s0"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; }; - "es6-promisify-6.1.0" = { + "es6-promisify-6.1.1" = { name = "es6-promisify"; packageName = "es6-promisify"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.0.tgz"; - sha512 = "2pr75bj70p2qd7if8kpmm7pqfgkq9317mvb09q8pfrha2kcvn8g0y3b7a63iwm28wh36d0a681j3zaig10hwk7xasn5n42zzbcj8awc"; + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.1.tgz"; + sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg=="; }; }; "escape-html-1.0.3" = { @@ -3782,7 +3908,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; - sha512 = "3xkdrhqvjj7430kp98pllh0yxbawxp4z1fnvbw5cawjr6mlbgyrd2v3b3kalrx3s515zc731a6ckmb10x9vaizf6sf4b5g84lndr72j"; + sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; + }; + }; + "escape-string-regexp-4.0.0" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; "eslint-scope-4.0.3" = { @@ -3791,7 +3926,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz"; - sha512 = "2p4myi99y1nk5dy7fvmbspjdynigw3dzkhcm7zaiwfyw2wp6j61y0i8mba18ksv9qi2s1wp6w6xhn7471qs631bqwmz8fzmvas6xdd7"; + sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="; }; }; "esprima-4.0.1" = { @@ -3800,7 +3935,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; - sha512 = "3h999di4dnwxb22lxlb7cbz42nalrv8g8sqdvrkkl5c27gnwhp1rva4039hmq6g1i0y4mfjgx6p4i2vwxxl0zlahfzdd9fl1qbqasvq"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; "esrecurse-4.2.1" = { @@ -3809,7 +3944,7 @@ let version = "4.2.1"; src = fetchurl { url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; - sha512 = "06zyknk70y80n428x20wvjqy5822wgz2yaxzw387njnz3ar6ixzjcxzr2jsl8wrm0m9jpa4ysbcr9znpk6gbkqd7wby084zxw3l317b"; + sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; }; }; "estraverse-4.3.0" = { @@ -3818,7 +3953,16 @@ let version = "4.3.0"; src = fetchurl { url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; - sha512 = "2kh3lczc7smb84ryllqrdvrknxl3h47khh7li6n9m76mj9jfh1ahz2jm8ffpcaac7i4k8zkf3sc3nczzp7djgqmsi6wrkynywlygnfz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + }; + "esutils-2.0.3" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; }; }; "etag-1.8.1" = { @@ -3836,16 +3980,16 @@ let version = "3.1.2"; src = fetchurl { url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz"; - sha512 = "3hv1mm8y1m0ayl0ds213ajdpc0xwalhi1iwvy2zdkg4kys5vdy97s8jz0sfvd91a3xwyy4946wmzk2lc1kpzww94pj307nmw8hm1yxn"; + sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; }; }; - "eventemitter3-4.0.0" = { + "eventemitter3-4.0.4" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "4.0.0"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz"; - sha512 = "05cdww9h7f3kjfmv478p0rcq2ia3lcrvqmsh155hd6wm895i2jn6j68w0ly09c3gjn8hshfdvnh99qchipbclycnb241y993m2d5sm9"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz"; + sha512 = "rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ=="; }; }; "events-3.1.0" = { @@ -3854,7 +3998,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/events/-/events-3.1.0.tgz"; - sha512 = "1d21craxji58ccc5l8c39mw7pgk0is7gj1sixm8v1va1zc81hrw8426b9rhrv7z2kwqvix5l7cyfc8awwypj19him6ffd67qbqaxzs6"; + sha512 = "Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg=="; }; }; "eventsource-0.1.6" = { @@ -3872,7 +4016,7 @@ let version = "1.0.7"; src = fetchurl { url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz"; - sha512 = "02zyvvhbzxhb7q9pzn867l80whipj03h4nkzjw1r8kppkmgaw0fcgvnkkv11fkfnlcdhkr9f55xrap5qpvbggkad4y4jkymxgpzbfg0"; + sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ=="; }; }; "evp_bytestokey-1.0.3" = { @@ -3881,16 +4025,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; - sha512 = "1wd18zxd7n42asa63aa4k1bdf58warg29c7c8cdzzkd4r1wva7qwzqnn52h8g8hqwj7bxjkk3ryghajrvz4i27h5bzp30p8hjiqdzgx"; - }; - }; - "exec-sh-0.3.4" = { - name = "exec-sh"; - packageName = "exec-sh"; - version = "0.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz"; - sha512 = "3a56in0wklcqf6hk0n22z22yg9kzb7y4xj7yfmj2sahbnkjbr5s0sngpzrr60r5rq9b3f0f1m13da5fn9mfz7p3b5nbxgxmrs8lhhdh"; + sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; }; }; "execa-1.0.0" = { @@ -3899,16 +4034,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; - sha512 = "0nbazkdhh5zqw7l7y4ml860h6pbn72x5kp2iaknqbdk0ygcrp3yh6bnq0brzzsyk3f72ard3ss3kp9a2ffsglib3yiamqwm4mrz3mk9"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-4.0.0" = { + "execa-4.0.2" = { name = "execa"; packageName = "execa"; - version = "4.0.0"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz"; - sha512 = "06ajp8gz1276n02cd50rh0q2qfhxrj623shfcc7fq6iafmk43kzwifyfm1nfc7jhkdhn8r4fn2rf9h2bcjsvl2mcpwq81kp0p3x9c15"; + url = "https://registry.npmjs.org/execa/-/execa-4.0.2.tgz"; + sha512 = "QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q=="; }; }; "expand-brackets-2.1.4" = { @@ -3944,7 +4079,7 @@ let version = "4.17.1"; src = fetchurl { url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; - sha512 = "3i2sxjf2x1r9wbfdyh5ll8ybbnqq6n4xfxdlc4dsqhssljrlih18csqg142lf16lcfcdgsmvf9pff0rzxjw7p0shnlmpajipwxpswlq"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; }; }; "express-ws-2.0.0" = { @@ -3962,7 +4097,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/express-ws/-/express-ws-4.0.0.tgz"; - sha512 = "1ih0006jpjcg33hwp2whynvvdcnqy87nbhpv636v3d6vzp8yjbzhfy8nxhi284nh9nj46nyy7ywj2i58j6v1iaqi3v48i1hq31r8k18"; + sha512 = "KEyUw8AwRET2iFjFsI1EJQrJ/fHeGiJtgpYgEWG3yDv4l/To/m3a2GaYfeGyB3lsWdvbesjF5XCMx+SVBgAAYw=="; }; }; "extend-3.0.2" = { @@ -3971,7 +4106,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; - sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; "extend-shallow-2.0.1" = { @@ -3998,7 +4133,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; - sha512 = "1xm0arqcf7jp9kgq1g67ss2jvj8kblzbb7dd7sj2gm1g8cj4ilcwnn8vwspz3rh83yjphbl1lvqdyivrji6ccmnp3k2rmk9gl4kii44"; + sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; }; }; "extglob-2.0.4" = { @@ -4007,7 +4142,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; - sha512 = "2klp0045k4wnaspb9khqx90ddv7rjg997mlyp5qz41sl2yqdrpw8g8wji77qq16aawl4yhvg0f993ln48lja0kfmy0wnbh4g50zlrin"; + sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; }; }; "extsprintf-1.3.0" = { @@ -4028,13 +4163,13 @@ let sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; }; }; - "fast-deep-equal-3.1.1" = { + "fast-deep-equal-3.1.3" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha512 = "1j7wq3vqvfgnpd2sjblnlgryxlic2fsy343fx8w4ywb2mngj1w5afq8fmly8cp9fi66dhz1fhcfpn23g5zasnzs6n1snb83qkkilhgi"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; "fast-diff-1.2.0" = { @@ -4043,7 +4178,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz"; - sha512 = "3iz2v3js0dw0ds77cg0v543ba30in2ld6ynakphh1g6nbrdpn4qkydrk6m3qa76ckh1nmqh73ck383zj7b7jw6bczjxbxwbkx7si6y4"; + sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; }; "fast-glob-2.2.7" = { @@ -4052,16 +4187,16 @@ let version = "2.2.7"; src = fetchurl { url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz"; - sha512 = "2rwrxvdl61rfj9v6hgif4qilfh3g4kqsjk380f2avp0g3m76h6q7n553gdh0nig13hchkwi7pwyxn0ff5vv90fbcj70jr6f051swll3"; + sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; - "fast-glob-3.2.2" = { + "fast-glob-3.2.4" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz"; - sha512 = "3n0a23s3nq6f339d9hw9mw4plbzcdmglhzm09w7azz5fb34xiw60rhhhsvcvqw8c86h3ryfvmk1k624jlf36w3wrrijjhrfivd7qdah"; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz"; + sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -4070,16 +4205,16 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "0gz06zkjlqc4r59ka14n3vwqjdgn40zd8r115ql3rkwqb7j42frmnsj3axr7p2md8ik52nqjn3myyv8ddavdhl4cq3xz4wbbz07y5wn"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; - "fastq-1.7.0" = { + "fastq-1.8.0" = { name = "fastq"; packageName = "fastq"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.7.0.tgz"; - sha512 = "1yjamwzvgz5f73c2xc5r4pnhprczp52i9za26qi04w144c7hbjp00s0mykg3b0f23ifgnl5vf54cq7by4gh2bw87sx9lxy7350rvrk0"; + url = "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz"; + sha512 = "SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q=="; }; }; "faye-websocket-0.10.0" = { @@ -4097,16 +4232,7 @@ let version = "0.11.3"; src = fetchurl { url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz"; - sha512 = "0wgmgai5pj0yjcc4gs5b6r94gr8ycsbv1xyjw055cxfy4vm6yrpqp0mpr89ychmzgr5y0mggqrljf9jhb8n5iq63bi3r9yqidpbhv0g"; - }; - }; - "fb-watchman-2.0.1" = { - name = "fb-watchman"; - packageName = "fb-watchman"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz"; - sha512 = "1b67x7n9c1irns63lipsffgi0zm9kfms6k87mznvhak81dijqvfy26nqr3j5mw41mqb3vbbhxbbmcdgc787laz3kaq45slq0wlwjhqf"; + sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA=="; }; }; "figgy-pudding-3.5.2" = { @@ -4115,7 +4241,7 @@ let version = "3.5.2"; src = fetchurl { url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; - sha512 = "1pk6h8pjvxp20pk6y7yagg9vfd4b1y29salqya7mf8kr0rhrk970hyy4d97kh8pk14jbnfayhwqlm4s6h7g63b3pid6lzzwy4ingfyi"; + sha512 = "0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="; }; }; "figures-2.0.0" = { @@ -4133,7 +4259,7 @@ let version = "1.1.11"; src = fetchurl { url = "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz"; - sha512 = "0p00kmxlfgsw0mn4y5h5njv0g1y7gakpygdv6wz318wzpll8zd44r7q0fvym4v837054n04d22r2klkqnckr3k0x2hc2ln79qfphr2c"; + sha512 = "TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg=="; }; }; "file-uri-to-path-1.0.0" = { @@ -4142,7 +4268,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; - sha512 = "0px1qliabg53lwfq4izc9vdll68sd08nlczi2ms5nvg7frm3y6zgy07vdvxywazab26jc723qpmh9a6h3bdp685iddzsmgvfarpx6yi"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; }; }; "filesize-3.6.1" = { @@ -4151,7 +4277,7 @@ let version = "3.6.1"; src = fetchurl { url = "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz"; - sha512 = "1rfby2136b86m318244b42lrcx9hc28vz71cv9i84cd5z7dd3cwvj1gx8mykbjh937yyi1h4q5kk3vhjcldc8pkd2f7iapszgbd3a7c"; + sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; }; }; "fill-range-4.0.0" = { @@ -4169,7 +4295,7 @@ let version = "7.0.1"; src = fetchurl { url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "2jrai6ri6sni8xyi8yji49ai8vkczbbiw6pb3pd9bcdizb58ncgnhnfmghhw87flm8y96y2z16738lwdyshby665nv60ljcwwbkvsm8"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; "finalhandler-1.1.1" = { @@ -4178,7 +4304,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz"; - sha512 = "2v4ymv7dvpxpnrid4cn8qni5k5l024zc2qzg8ipkbxwmqjbaiygbx0hvbnr0ywfy0is4ngyhp6ljgjh4wmk6fqc3hd3wyzxil798lb3"; + sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg=="; }; }; "finalhandler-1.1.2" = { @@ -4187,7 +4313,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; - sha512 = "1cfqk6g78cb12b1cki4pbcspsy40d0yny513myqji716njyhc5hrj7ll539kz96m6vn27168hhyqvd52cr5x1cs85mm7igfkrdrq1b8"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; "find-0.2.7" = { @@ -4223,7 +4349,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz"; - sha512 = "0wjlwmvadzac6hwmxv6hsc16z3285i2y0nkwpg4366flza0rx30s3ncx93xn8hkkpxr493zi5b0h94jczinr87h2m6gbhrl265qzbjf"; + sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ=="; }; }; "find-elm-dependencies-2.0.2" = { @@ -4232,7 +4358,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/find-elm-dependencies/-/find-elm-dependencies-2.0.2.tgz"; - sha512 = "32n3i133knsr1q5ld28ljk3s9yq2i124q8rg8cdb5ar0bp7wgc2a87cfkwhvql8vwzd35w0qf9bfhfa7g1imdk212y523qwnw4m9klw"; + sha512 = "nM5UCbccD1G8CGK2GsM7ykG3ksOAl9E+34jiDfl07CAl2OPnLpBVWY2hlxEmIkSBfdJjSopEowWHrO0cI8RhxQ=="; }; }; "find-parent-dir-0.3.0" = { @@ -4268,7 +4394,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; - sha512 = "2bg49lifm64h5jqjc20612wrx7cazw9np9ms02ys94kif4li8cp5in4rvmb1c1ssa8yhbsqkgprykkj4lf3jbz8qrgp1mf8c93gl86p"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; }; }; "find-up-4.1.0" = { @@ -4277,7 +4403,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; - sha512 = "2bi4wmj1qymhj4ap1nay5isn0w7x6ymxp30h5y1jv0hx7q0inmirmr09mn621h4alg0gpv2hjwl6ai2giw6pz7qvb85aqizsh0v14ry"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; }; "firstline-1.2.0" = { @@ -4295,7 +4421,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/firstline/-/firstline-2.0.2.tgz"; - sha512 = "317ml53ziaxxnvxxp6fwwxxk2w323334kw64d40asdkir6v10br55qb264xk5i9iqh6q1gpwz0ypfwbnk4vjq9pkw123093imy2d9zh"; + sha512 = "8KcmfI0jgSECnzdhucm0i7vrwef3BWwgjimW2YkRC5eSFwjb5DibVoA0YvgkYwwxuJi9c+7M7X3b3lX8o9B6wg=="; }; }; "flush-write-stream-1.1.1" = { @@ -4304,16 +4430,16 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; - sha512 = "3pkp1ymgv73zg0d94la628nagxyngq7zm1jmngx6vjc6vi5d4jkmvfygvgac6w6x929hqljwygaidq2znk3l5xd4apdvxvpas21g7nx"; + sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="; }; }; - "follow-redirects-1.11.0" = { + "follow-redirects-1.12.1" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.11.0"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz"; - sha512 = "2c9vyshmpm00crjxya51av36d379damv2inkkqmfdy6j5kizkc2a1s151h35lfzcnyqmx5bpgaxnp8g77dcs35cmk0zgw35x5bv9699"; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.12.1.tgz"; + sha512 = "tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg=="; }; }; "for-in-1.0.2" = { @@ -4340,7 +4466,7 @@ let version = "2.3.3"; src = fetchurl { url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; - sha512 = "0jj3hgqp9pmxmfavx6rvdfl3r4yf98clpsarqadz3hq0dxhjlh2ppd9x8bvmaq3nwjdqpdvqx25pwyin4ipixhgsn7s3p9fcc3wllnn"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; "forwarded-0.1.2" = { @@ -4394,7 +4520,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz"; - sha512 = "05bphjab1lk12dz3qf87dywgpsjsx0f59kpligxqph53yicigij2gsmvkppgyhpi70h3q3id3ymz30c02v3pphakn06k8vm6xsdpamb"; + sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg=="; }; }; "fs-extra-5.0.0" = { @@ -4403,7 +4529,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz"; - sha512 = "1ssfaw678600iy330a73gqk65ns22sz4ng7jwndj1fxahj8qddrsy2w4mr4ikx28qhdj8rf49n428qnl657bbpag9r3g3qv2vhyd8zb"; + sha512 = "66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ=="; }; }; "fs-extra-6.0.1" = { @@ -4412,7 +4538,7 @@ let version = "6.0.1"; src = fetchurl { url = "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz"; - sha512 = "049jki4y8l719y7754fp6v52jm5r8cw8c4qhag4zgglmc0j19k1dhsbdsahijgv9hzvwz8g76009c8cy8xjg6jhb1a7dkb1m288hz0s"; + sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA=="; }; }; "fs-extra-7.0.1" = { @@ -4421,7 +4547,7 @@ let version = "7.0.1"; src = fetchurl { url = "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz"; - sha512 = "05qcmykw9czycnn3r2rrlspzd4dznr4796abdqzw150j7rafnlq8n4wp4dai34swb23lfvhw8s31l1k83vpwxqddyf1k724jq4dm430"; + sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; }; }; "fs-extra-8.1.0" = { @@ -4430,7 +4556,7 @@ let version = "8.1.0"; src = fetchurl { url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"; - sha512 = "3i4dsx067a564yx62qy0gz15zvsihqybmmx56lqz4cbgh4fiv5ikrj53wa1rfcijlnkywx18az05m1541dm04gb51af57561s0506fa"; + sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; }; "fs-minipass-1.2.7" = { @@ -4439,7 +4565,7 @@ let version = "1.2.7"; src = fetchurl { url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; - sha512 = "1644yfnzfqikaff5s68dm4qfrblxrz68ynigkyzyixjqazxlli0svj1nxkawz35sv2vb3vjh41f1rhg0j4nr770a53fzqbjc4j94r0r"; + sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; }; }; "fs-readdir-recursive-1.1.0" = { @@ -4448,7 +4574,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz"; - sha512 = "129732drwnm77iq4y1xr69pl9iqqhgj4w61ckmna6i923rjpp0rphzbg8bn8rmfsb6cndfswgwwdh9p2y6kf3zbvgs9gnkbamgagmhq"; + sha512 = "GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA=="; }; }; "fs-write-stream-atomic-1.0.10" = { @@ -4469,22 +4595,22 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fsevents-1.2.12" = { + "fsevents-1.2.13" = { name = "fsevents"; packageName = "fsevents"; - version = "1.2.12"; + version = "1.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz"; - sha512 = "38n3fx736zykzjypx7imagh6daz9yl98a8v3lw7xy8qs2k0wa2sdsjrdmhwg914mj648j0wzc02mz7f5ii6ql8nlwyb44vvvcm7y1qs"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz"; + sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="; }; }; - "fsevents-2.1.2" = { + "fsevents-2.1.3" = { name = "fsevents"; packageName = "fsevents"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz"; - sha512 = "1j5ssfzy4xklkj74z7q64dpcld4zicsva1ihfys8dwa9l5apv7q350g4vg65nfp58c7aqkai1qmjlc3xshb97p5h3lsrl0r3j407327"; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; }; }; "function-bind-1.1.1" = { @@ -4493,7 +4619,16 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "38chm1mh077ksx6hy2sssfz4q29hf0ncb9k6ila7si54zqcpl5fxd1rh6wi82blqp7jcspf4aynr7jqhbsg2yc9y42xpqqp6c1jz2n8"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; + "gensync-1.0.0-beta.1" = { + name = "gensync"; + packageName = "gensync"; + version = "1.0.0-beta.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz"; + sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="; }; }; "get-caller-file-1.0.3" = { @@ -4502,7 +4637,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"; - sha512 = "3mw8nv3r73b3lp2pzj116p27flkrv1vq6v0ika46w3xqfinm6gxn38glryibvy834mja8ib4j9cjq27qn164z3793c9g88y79asppny"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; }; }; "get-caller-file-2.0.5" = { @@ -4511,7 +4646,7 @@ let version = "2.0.5"; src = fetchurl { url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "0b7da6kb3xqk26cw4i6kb1lk911z06z53if2g8l23hmfpbhl6vfbn8iip55j1yplbqnly2abb9d349r6ky2z570839q3p9z2gf4y88g"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; "get-own-enumerable-property-symbols-3.0.2" = { @@ -4520,7 +4655,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; - sha512 = "3m4dzkl08xi19c8aim6hxfy32zxi969r2zfzz9swbvsl5jzcnxn2x9y19kp9ri7k7qw07rz2m7c5g0134rm1i4i43j5bkyfymbh2i93"; + sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="; }; }; "get-proxy-2.1.0" = { @@ -4529,16 +4664,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz"; - sha512 = "0kjf4p1krvzah7k5yngvvc39b7jnkzqlp3cdab8451zh1q4mxmav111dmycnadv28ja2wvcwvavjl7w550ja7qyw4dx976n0illhrnf"; - }; - }; - "get-stream-3.0.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + sha512 = "zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw=="; }; }; "get-stream-4.1.0" = { @@ -4547,7 +4673,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; - sha512 = "3pwlllj9naaqzlc5axbxz4jqg3v533xd9jz945mjd3zmca3hh3pr1dpwc7416kjszw6igk060v6x2dgwpr7m1rd4djavmvr8bhavihq"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; "get-stream-5.1.0" = { @@ -4556,7 +4682,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz"; - sha512 = "21v525x0f3qrc6f343xp3wjwwrjf1l3x0lmp34hivvvmdcz0a681s0b9wx4k5r3r8jyhc5kd6dqrwqjhpbl285xg333gkgbxhagayhi"; + sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="; }; }; "get-value-2.0.6" = { @@ -4583,7 +4709,7 @@ let version = "7.1.4"; src = fetchurl { url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; - sha512 = "3a8rf655jknn8ccr4p47spa74d8q4j4znjal0arh502m9pg1iq1cln8qjssv7lhc0gvdfm6zfrha6k3xinilm2swfj756m1jxxcyhl6"; + sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; }; }; "glob-7.1.6" = { @@ -4592,7 +4718,7 @@ let version = "7.1.6"; src = fetchurl { url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; "glob-parent-3.1.0" = { @@ -4610,7 +4736,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; - sha512 = "1hi3ypyic536qm0jd2aw65wbaian4vxmgsnprw6p1mdfd75ks5x1mrgkgzl41xr6hnav27fqzpm227rj7qq8vcwb63m37m9cda3wwhn"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; }; }; "glob-to-regexp-0.3.0" = { @@ -4628,7 +4754,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; - sha512 = "1pgpsvm0rm1fnqmblx77xs67gh8c80nf4dsgcgalhh9phmlp8ahn5w7vzx3xkwyxw3fg33h8vhh3plsycw6fd7c2r76mm7m8w9fkb5h"; + sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="; }; }; "global-prefix-1.0.2" = { @@ -4646,16 +4772,16 @@ let version = "11.12.0"; src = fetchurl { url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; - sha512 = "1ab6f0n8yjl3zkl6dwhvxpxh63b4acc7nj7i21z3dx1fz1jv1c3673qpkwiavmcbbf8jlkxapx0x8ybzz5w2yra4ln24lh687y6kq2q"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globby-11.0.0" = { + "globby-11.0.1" = { name = "globby"; packageName = "globby"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz"; - sha512 = "094y6k3zjiyzmq9xqilgz3p88c5465cmzsxc31gkm7fxb0vj9i2kdvxv28c4izppgrfgvpwwvcbvivlnhcf6rhv0iqfxikpfhba3rwa"; + url = "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz"; + sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ=="; }; }; "globby-6.1.0" = { @@ -4682,7 +4808,7 @@ let version = "8.0.1"; src = fetchurl { url = "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz"; - sha512 = "2kvb22azhxv632w6jbgssa2k29c3vwann1f7g3ra974lg41hcw4s7cbc8260y0kycv93nfvkxsc9wyycsl4xmfjbi5s170ij6ndijm0"; + sha512 = "oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw=="; }; }; "got-10.7.0" = { @@ -4691,25 +4817,25 @@ let version = "10.7.0"; src = fetchurl { url = "https://registry.npmjs.org/got/-/got-10.7.0.tgz"; - sha512 = "0k2vbyaqxs8ikrf2fp7jm1q0147bshpmy94wr1wqlqharvgk1wfachm3yxaf8jn70bdmxl4ph3vnb351hrlwp4k27mfb0rxviwc6r39"; + sha512 = "aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg=="; }; }; - "got-8.3.2" = { + "got-9.6.0" = { name = "got"; packageName = "got"; - version = "8.3.2"; + version = "9.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz"; - sha512 = "05i0zb81f4c0z48y9mjckyajm586ygznh8y8di5g0qrg3vi9hpbw2q3cf548as8zx9b4g1q5zf2cab43yx21wnan1l0qsz19zjhjdda"; + url = "https://registry.npmjs.org/got/-/got-9.6.0.tgz"; + sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; }; }; - "graceful-fs-4.2.3" = { + "graceful-fs-4.2.4" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; }; }; "gzip-size-5.0.0" = { @@ -4718,7 +4844,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz"; - sha512 = "007247c436qdpsvrraz3qgssvq0yzi4xinaydxjprr2dslsynhy09lpnlgd52pxkql3880j340fq4qs4rq6s5qfbgksmji5cyi3n8p6"; + sha512 = "5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA=="; }; }; "handle-thing-2.0.1" = { @@ -4727,7 +4853,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz"; - sha512 = "174zcs1shwmzgb8dxckn95s38pz30irzkrp8zw1rx5drqydb5x6mn1cnc3m6nklbq0jyilpfcrf9br9zrrxlfpcv0him5sy3k4gh2gm"; + sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="; }; }; "har-schema-2.0.0" = { @@ -4745,7 +4871,7 @@ let version = "5.1.3"; src = fetchurl { url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "3kaldgfsh3lfvgvw31s8b7q345zf7ixjahllncdckcw6qfs3gnbsamdxgs9kfigq7rwmja7v51ghh7y0rsp6q7jmvmbydhh645wxnxh"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; "has-1.0.3" = { @@ -4754,7 +4880,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "37vh53c11hws66navka0w9xxm6rcr034bxpyvaldiqz1msafqf0jpi1aqxbaygs53arz9y510qg6dl6vrm285hrxniygs2l8lxnyrvz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; }; "has-ansi-2.0.0" = { @@ -4781,7 +4907,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; - sha512 = "0ylry8j6wanggw1786jw36k056caw516fasjfz5jl945p7g0zl2aqxsjd5fxxfah3hlhrbflnsb88vx42080sfsfbb38aimyi7hja8k"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; "has-symbol-support-x-1.4.2" = { @@ -4790,7 +4916,7 @@ let version = "1.4.2"; src = fetchurl { url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; - sha512 = "0kljkjnsw7jnqm8dpf05rd7a59xjfwlbmp1qxs5kdda78zwwqfpkq5ryc2510iyam6v5vbyy0h7bpkwqadajq1ag2zaa7dymyyhwfnx"; + sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; }; }; "has-symbols-1.0.1" = { @@ -4799,7 +4925,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; - sha512 = "0mb9d5yqvznqmq073hdc4wl7175niiqpkpb7iqqv8p0q6xgmrhfap9ni6iwrx44w8p9vyg8n3zsllil5pdflzlh462dkydymfi2rdrw"; + sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; }; }; "has-to-string-tag-x-1.4.1" = { @@ -4808,7 +4934,7 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; - sha512 = "0bqvhd628h3lrsydbp1xllh7jp23c58j7d4z0x0v9ddffindkk1zfrqmzm28z47ipjp0zxlmzvmlzk98zf9mzjsc47bmp1ydizcmmmx"; + sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; }; }; "has-value-0.3.1" = { @@ -4847,13 +4973,13 @@ let sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; }; - "hash-base-3.0.4" = { + "hash-base-3.1.0" = { name = "hash-base"; packageName = "hash-base"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; - sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz"; + sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="; }; }; "hash.js-1.1.7" = { @@ -4862,7 +4988,7 @@ let version = "1.1.7"; src = fetchurl { url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"; - sha512 = "1f5xc15zpy3b7hssv57xnd92ja5r073zvd2pczvncxmy1jnbjcx716riyr2syvah88qk7328a6fz049mziv2k837093xqxd86r9m8xm"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; }; }; "he-1.2.0" = { @@ -4871,7 +4997,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; - sha512 = "0dwml2q9r97ga11qbbn5sb46v4g47lx174dz9g1jgxpycknhg1d5dlsij2vja905p8h243jj51hfa5cmzh8n9rdcs8r78lg86fl7z8p"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; "hex-color-regex-1.1.0" = { @@ -4880,7 +5006,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz"; - sha512 = "16nq2pq6pbpjp3xhvxzyr0qv7vn58pp9h29j8abcxkibz0ibgh9lls5ws73qwhz75nl8wsrjkri8ka6rjm7c41v52md7aifbc61znwp"; + sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="; }; }; "hmac-drbg-1.0.1" = { @@ -4898,7 +5024,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; - sha512 = "1qc7ngn9k1w5lcqx2ygqb2x9f03knfbsym25l6qsp6q9qdcxa4fzwwjsh9d9lm5l1569v19rjp7sdnz11087f4b6sv34rav9rcacabr"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; "hosted-git-info-2.8.8" = { @@ -4907,7 +5033,7 @@ let version = "2.8.8"; src = fetchurl { url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; - sha512 = "19a25b4xb3hg00d1nsirc3xfcc07rplbh6msa49rgc8xg5rg38y1z8rfrf0dmll8k4jaml8z337bi6y2cgah66jnwxinn0sch5k7z3z"; + sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; }; }; "hpack.js-2.1.6" = { @@ -4943,34 +5069,34 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz"; - sha512 = "2cqjc2vwxqb38sr58kl1gj9vv949wmmnb1i2f3gms2pszqqaf9mjci0q13w3086wia9n7nfxwmk73d68gcjjjkgs1c0w99n0vjkmqrz"; + sha512 = "P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ=="; }; }; - "html-entities-1.2.1" = { + "html-entities-1.3.1" = { name = "html-entities"; packageName = "html-entities"; - version = "1.2.1"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz"; - sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; + url = "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz"; + sha512 = "rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA=="; }; }; - "html-minifier-terser-5.0.5" = { + "html-minifier-terser-5.1.1" = { name = "html-minifier-terser"; packageName = "html-minifier-terser"; - version = "5.0.5"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.0.5.tgz"; - sha512 = "1xh7yad8rlhvqdxf8nzq146y3ay9ifan1yi8whkpgl2nz04d49g325lbkcwaf2fvhz8xmy0bqq124n7ia6jz8plf63zp1sh10b8a53h"; + url = "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; + sha512 = "ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg=="; }; }; - "html-webpack-plugin-4.0.4" = { + "html-webpack-plugin-4.3.0" = { name = "html-webpack-plugin"; packageName = "html-webpack-plugin"; - version = "4.0.4"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.0.4.tgz"; - sha512 = "30npn4h34f7ghwsirydj6icfav14sq5slwk3lpd043jgng2gkii00df1cj6hhldj8d2pmmfvg9aslrgyr2cdanjvw988z658v6i0485"; + url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.3.0.tgz"; + sha512 = "C0fzKN8yQoVLTelcJxZfJCE+aAvQiY2VUf3UuKrR4a9k5UMWYOtpDLsaXwATbcVCnI05hUS7L9ULQHWLZhyi3w=="; }; }; "htmlparser2-3.10.1" = { @@ -4979,16 +5105,7 @@ let version = "3.10.1"; src = fetchurl { url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz"; - sha512 = "04y4izmqmlxvcv7fj67dqaiiwrnq75j6n6yv9a6990y6s23lrj6ipbx0y0i57z8gqzq2ddhb2dj2dflskk2ia7wl81vjcfl50v9w212"; - }; - }; - "http-cache-semantics-3.8.1" = { - name = "http-cache-semantics"; - packageName = "http-cache-semantics"; - version = "3.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; - sha512 = "3gsj16kpvygynld5ajbvg8ii3n3bka4waamdzx30wwhz72mdr6wvffm20rfnxwzid9fq49d5g333yjq5dz1qqbnk9bwcmrj9f5bda75"; + sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="; }; }; "http-cache-semantics-4.1.0" = { @@ -4997,7 +5114,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "1qvqr3inc283iggn9x9wwiv1zb634i5zmlh8dnl2c5n4czaf2yibs4dncrgxfg7zrdfkcali22mvys4pgyhmfqjb57b91qlay9czaki"; + sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; }; }; "http-deceiver-1.2.7" = { @@ -5033,7 +5150,7 @@ let version = "1.7.2"; src = fetchurl { url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; - sha512 = "13c4825kzqlxdqfjrlrwh15ira0bjm9m3b8qcrfzaysiky1m3gb6dv6gcjgpnap9mbl0fajqiibzp1w5r8qnyn8glaj4wgzf6vh2i5r"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; }; }; "http-errors-1.7.3" = { @@ -5042,16 +5159,16 @@ let version = "1.7.3"; src = fetchurl { url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"; - sha512 = "1zx0vws4k6lcw8j8pgc2yrwfw56s6n2z4dvhd9lcj9l1ywnl9ssianilmrlzr6ravkqxv0xbdqg4cn0q3l72d8h0achvcdbqp8dfd35"; + sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; }; }; - "http-parser-js-0.4.10" = { + "http-parser-js-0.5.2" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.4.10"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz"; - sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz"; + sha512 = "opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ=="; }; }; "http-proxy-1.17.0" = { @@ -5060,16 +5177,16 @@ let version = "1.17.0"; src = fetchurl { url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz"; - sha512 = "3z80svhb9hi5fawc8za5qn75lybr53646gfsqm2hkqss4pr186pp7k6f5jnjgw7vrkgjy4yzvb34729q6kvrikn4xgq9gfdg7xsgajd"; + sha512 = "Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g=="; }; }; - "http-proxy-1.18.0" = { + "http-proxy-1.18.1" = { name = "http-proxy"; packageName = "http-proxy"; - version = "1.18.0"; + version = "1.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz"; - sha512 = "2jhzdgr7gcgj58mf798ak1a638wm4mnp45pk48im1rf03dpw39alpyabd7rqwqgjrilaggnmh6nd3m9pqnyn76q3mw5g7rzjf43d0pk"; + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"; + sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; }; }; "http-proxy-middleware-0.19.1" = { @@ -5078,16 +5195,16 @@ let version = "0.19.1"; src = fetchurl { url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"; - sha512 = "3fl42r9rpdqm0jrrd2wqws6syv02r8cqgy0j6ddrjvn5p3by8shm0mmbych1g5k9i5agc70x6z2904nrgidkdnlq1pwafqhcf0i6xn8"; + sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; }; - "http-proxy-middleware-0.20.0" = { + "http-proxy-middleware-0.21.0" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.20.0.tgz"; - sha512 = "21l9r4302hy4pdns6p52jw6mb3mcjqia6vydc5r1fmhifd5a5xrkwg0pmwgiqb0kyrwy4k47wqkzw8sc5zl0cq7i17rh437pn9l1lkl"; + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.21.0.tgz"; + sha512 = "4Arcl5QQ6pRMRJmtM1WVHKHkFAQn5uvw83XuNeqnMTOikDiCoTxv5/vdudhKQsF+1mtaAawrK2SEB1v2tYecdQ=="; }; }; "http-signature-1.2.0" = { @@ -5114,7 +5231,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz"; - sha512 = "1kz5n441pr99yhsdpw8sdamc8c44nc6jiipq41iqvsi1djabh15z8vmqkyqy63hjp6da0szqfk2607vfyqh81pav55k6akwz7p2wi28"; + sha512 = "SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw=="; }; }; "i-0.3.6" = { @@ -5132,7 +5249,7 @@ let version = "0.4.19"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz"; - sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1"; + sha512 = "oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="; }; }; "iconv-lite-0.4.24" = { @@ -5141,7 +5258,7 @@ let version = "0.4.24"; src = fetchurl { url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; "icss-utils-4.1.1" = { @@ -5150,7 +5267,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz"; - sha512 = "0yccn3a8gi1sxrbw7ymv239zs4myhrbavs2wvgv8qn3cjbs4r62f01jgsj26jzlq0vy7ycz400xp6qs5l2g21qvhg5c3j6n1gpnm8g1"; + sha512 = "4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA=="; }; }; "ieee754-1.1.13" = { @@ -5159,7 +5276,7 @@ let version = "1.1.13"; src = fetchurl { url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; - sha512 = "179jm8fhl2advz4j63klrp57sm99wvyb5jcxwfr9rhi730ybcxkyfqrr0pmwvir12zjzpkwwvjjkjclwrss7lpab7dg2myqc8izpxz2"; + sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; }; }; "iferr-0.1.5" = { @@ -5177,16 +5294,16 @@ let version = "3.3.10"; src = fetchurl { url = "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz"; - sha512 = "2x7za00gs7ipwcq29bslxcdv7j47m28jx14n9ybs5h2icr4024jn5ppmbs6953g2qb3amhs1gg5x0s48ky3mk7ybi36wchsb7kks2ry"; + sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; }; }; - "ignore-5.1.4" = { + "ignore-5.1.8" = { name = "ignore"; packageName = "ignore"; - version = "5.1.4"; + version = "5.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz"; - sha512 = "3q41bskh27g3dd95nqaf3lg1ck1iv1dbb6hhzg1jqlkk6j80q5sxb4i3n4k6rfw5nmnvrflaxvi281c7cv2ljlsxip6skb4m14x8dik"; + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; + sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; }; }; "immer-1.7.2" = { @@ -5195,7 +5312,16 @@ let version = "1.7.2"; src = fetchurl { url = "https://registry.npmjs.org/immer/-/immer-1.7.2.tgz"; - sha512 = "32d76qv6hnprfz8mc75aw3nvwh46ydlni7lf6fvw7sqljhqlr7p6pk101mw04zfpj2p08nb71b0zc438ak764qf4z1p5ydx1dryhjp1"; + sha512 = "4Urocwu9+XLDJw4Tc6ZCg7APVjjLInCFvO4TwGsAYV5zT6YYSor14dsZR0+0tHlDIN92cFUOq+i7fC00G5vTxA=="; + }; + }; + "import-cwd-2.1.0" = { + name = "import-cwd"; + packageName = "import-cwd"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz"; + sha1 = "aa6cf36e722761285cb371ec6519f53e2435b0a9"; }; }; "import-fresh-2.0.0" = { @@ -5207,13 +5333,22 @@ let sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; }; }; + "import-from-2.1.0" = { + name = "import-from"; + packageName = "import-from"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz"; + sha1 = "335db7f2a7affd53aaa471d4b8021dee36b7f3b1"; + }; + }; "import-local-2.0.0" = { name = "import-local"; packageName = "import-local"; version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz"; - sha512 = "04jd526svpmpgya7i580qcb13s9b6bw4s9hng2fsni2gxsz6h8vqxl8gbm5k575yxm5aqhy001rl7p1iy60rsi6371cvynfdpi39avg"; + sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ=="; }; }; "imurmurhash-0.1.4" = { @@ -5240,7 +5375,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"; - sha512 = "3s364ysa3q0sxc852a6rlbx0y8spayvg5csradd7s9vn2fr0ky3xpfhy5kkv6afgji3df7kyiswx296kwfakydii9xygqzxgkwn6a90"; + sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; }; }; "inflight-1.0.6" = { @@ -5276,7 +5411,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; "ini-1.3.5" = { @@ -5285,7 +5420,7 @@ let version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5"; + sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; }; }; "inquirer-6.2.0" = { @@ -5294,7 +5429,7 @@ let version = "6.2.0"; src = fetchurl { url = "https://registry.npmjs.org/inquirer/-/inquirer-6.2.0.tgz"; - sha512 = "1x0h1ww7c5dqlkxw4l5y64zw0sknw2z3p2zmkbyajahy74ndsb69ah54x4ya8wlv18mk4wdx4f67c37rk5f5hk0chc6ahrjhqdi10a0"; + sha512 = "QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg=="; }; }; "internal-ip-4.3.0" = { @@ -5303,16 +5438,7 @@ let version = "4.3.0"; src = fetchurl { url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz"; - sha512 = "05c6ydjyg8633b07vn5g168r5lxwvl5k1mjm55brfx35c1z18195bh67f7cfk4bjvyapxfhh8q5i7pv75k353rfp0rcpkgsa2iw2p2b"; - }; - }; - "into-stream-3.1.0" = { - name = "into-stream"; - packageName = "into-stream"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz"; - sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; + sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; "invariant-2.2.4" = { @@ -5321,7 +5447,7 @@ let version = "2.2.4"; src = fetchurl { url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"; - sha512 = "0sa0bflh46zr7zqdifqk3a48bmqlmpikrnmwvgz8nx6979piw2m92qrn1g5xnpjzxn864y2jq3gl84jkws2dad3mlwr6s3fa10my4m6"; + sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="; }; }; "invert-kv-1.0.0" = { @@ -5333,15 +5459,6 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "invert-kv-2.0.0" = { - name = "invert-kv"; - packageName = "invert-kv"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; - sha512 = "0lamd4l8hybnh42bg1nav09fj3h7k31vnvsqbqk3mhbhml32042k8hpixhiapqfssi1jyhnw31mdv9zx0fvxzxqi8igahyh5zznzxf0"; - }; - }; "ip-1.1.5" = { name = "ip"; packageName = "ip"; @@ -5366,7 +5483,7 @@ let version = "1.9.1"; src = fetchurl { url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha512 = "3gcwhv1wa2hb1vljlcmzhvzliks9rj7nzsw165vgy69jakw8g55ky474mj4j41vfbid8viy9nhwn9kx8pfqrikyl29i98zi9vmkz8nh"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; "is-absolute-url-2.1.0" = { @@ -5384,7 +5501,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; - sha512 = "3ssxj0ds0anzx5qcgn5lcawrsv3br0zbi1qcfpi9sslp4iwzb0hr9aqy3y72rf9c0bwb0h5svy7l341j0arlkyvx2yp85pfgqhqv6d2"; + sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="; }; }; "is-accessor-descriptor-0.1.6" = { @@ -5402,7 +5519,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; - sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v"; + sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; }; "is-arguments-1.0.4" = { @@ -5411,7 +5528,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz"; - sha512 = "0n6f8bxyg7bn669kd50zw62x8fjgbckgkfxs9mnka3iw3mklg60ijk5v312y9hd30jvxawag77nv3c0jr4wkvywn2wlwd3wdd379y64"; + sha512 = "xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="; }; }; "is-arrayish-0.2.1" = { @@ -5429,7 +5546,7 @@ let version = "0.3.2"; src = fetchurl { url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"; - sha512 = "1cmy0k81vgz5z55rdyxfnx307053ksyp1lfgyj5jldkqqzmkx1z2k63fvzn7lgj8wdakmsa1mw408rm5xxfpk3avjqbnrb5yl56lm3r"; + sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; }; "is-binary-path-1.0.1" = { @@ -5447,7 +5564,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; - sha512 = "1gldm4swvg3612pg55yjza8dvpv4daf374dijjg8kcmndlq55933pdd7gw4gq4c2aa5fn9vnasz3h9spg3pd8p1rafkr91sxdhi3hb4"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; "is-buffer-1.1.6" = { @@ -5456,16 +5573,16 @@ let version = "1.1.6"; src = fetchurl { url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "3kr8dm9qyklmm2xyiz75s8db90bfilfals4x0g276kncihrrrz0ar4y6dqpvc7pwy7h43jay1bayi1r62x97nzvcswkk4ap18pl1irm"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-callable-1.1.5" = { + "is-callable-1.2.0" = { name = "is-callable"; packageName = "is-callable"; - version = "1.1.5"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz"; - sha512 = "3wmff73yzck45x5shydqswbww8zkl03i43yhy7mm6av9770yvd2gj7xfrc8f45fw2ncn7mwblxvxlcap5rngmklkjiis902qgkay8hi"; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz"; + sha512 = "pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw=="; }; }; "is-color-stop-1.1.0" = { @@ -5492,7 +5609,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; - sha512 = "0ny6kxc752fg3z6fmj8a7fw2lai2y17d9fx0028nvyv1qj0sa30rfryhv9xd7b7is1yfs0val6amsy2b22rh589il10md36a75mgd4d"; + sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; }; "is-date-object-1.0.2" = { @@ -5501,7 +5618,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; - sha512 = "39f971gzwirnxjw4b72c175nbn1hnmrn1wljvbzvxv69hw9vpialhjafh9nkh0g3p26a49zss3rr7pxfww1f6day4s89hmqkm7l6aai"; + sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; }; }; "is-descriptor-0.1.6" = { @@ -5510,7 +5627,7 @@ let version = "0.1.6"; src = fetchurl { url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha512 = "0gbflcxmd30gzj91y19fylsfalirl6qg71sxjximc8lc2vxkg5h9scnahvxsczymchlx742i8ai489843ys431vyw73rp418jpxiw3a"; + sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; }; }; "is-descriptor-1.0.2" = { @@ -5519,7 +5636,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha512 = "2v1a9mn2rzz52v8vs3i7njk9pv95fh971yc81xr0zkaw3dff4gbv1zv048xyjysfgwpajbyryk2px8hinwwh0wagblmw6chdbjsrs6r"; + sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; }; }; "is-directory-0.3.1" = { @@ -5531,6 +5648,15 @@ let sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; }; }; + "is-docker-2.0.0" = { + name = "is-docker"; + packageName = "is-docker"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz"; + sha512 = "pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ=="; + }; + }; "is-extendable-0.1.1" = { name = "is-extendable"; packageName = "is-extendable"; @@ -5546,7 +5672,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; - sha512 = "0w73qlx9ynmv2iznw1kll86yd04z4rsz3788nzgh7amcnpsbyxbrs734im9dibqgps6pjyz61s8kp4lcsbjsdfrlc51m1pm2hrxgfba"; + sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; }; }; "is-extglob-2.1.1" = { @@ -5582,7 +5708,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha512 = "119fphi7bl53f72b5n0jc61iqlkw6fjmxqhhpbp3ap79vnvp123f3qw5sanin1cfr5cjaa2z0bc6pcdkvbaiz90bc92pc5yxgkscafg"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; "is-glob-3.1.0" = { @@ -5600,7 +5726,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "19c23n8r8rfbz5rgs5csbjbpwgxvwi7y6kpsvlylgs2v1r1z2zm18qzzz2g8vnnwaldn5c4qalpc6p88rl0gjrrm278j52ks0m2svg4"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; }; "is-number-3.0.0" = { @@ -5618,7 +5744,7 @@ let version = "7.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; - sha512 = "2g7332xqrb0cm36cn6rwdmgq7sllf9w19sf6jy4w0s4vgqdq1kngsnpz0z49i3vnknk8ms442yjllrdbqxbap9ajprc8yrs91za4l73"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; "is-obj-1.0.1" = { @@ -5636,7 +5762,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz"; - sha512 = "3rji48hhgd1433ipvrz0v97fcg39v3wz6awfs6advkwlhb032wadkxks4wnncbx6rk9vjp5kza6kmwf1rvkjs4l21qkqwqvfwdq7fkn"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; }; "is-object-1.0.1" = { @@ -5654,7 +5780,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; - sha512 = "0aws7clcb9cyvvb4430df9fhfnpg9bl1n07ymzp7jdzia0bvjg25gyd39xp2xhgkgpkqazw8csglblifdql0rpj4kfwg1r26xnkdpn3"; + sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; }; }; "is-path-in-cwd-2.1.0" = { @@ -5663,7 +5789,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; - sha512 = "12yyg4jlg5mmiy2g0r91hz29v3jh5g2wyhdgs1qrfswx2sp7bfsn5g4632yfxmhrpjcy03bxfj12v93yd6pdykkpsmyz912g1f1rnmc"; + sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ=="; }; }; "is-path-inside-2.1.0" = { @@ -5672,16 +5798,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz"; - sha512 = "0b5h3ls9n24ma1wqpfsv7n034ryz86rfn1vkz5g0sih2abi9wrs0vx6w583s6qhcgqa6rx5w5layfz7hlakhxvf07qcnnn36x7s2b62"; - }; - }; - "is-plain-obj-1.1.0" = { - name = "is-plain-obj"; - packageName = "is-plain-obj"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg=="; }; }; "is-plain-object-2.0.4" = { @@ -5690,25 +5807,16 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "0xgsjz9m3kg5pm36lcchblxk53qay59ya7wi5jgdmz0dsl5b0j2j7wcd48yyfaip1m70mj9aqf8kib02fn62k0hy0vxg2hng60yk4w7"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; - "is-promise-2.1.0" = { - name = "is-promise"; - packageName = "is-promise"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; - }; - }; - "is-regex-1.0.5" = { + "is-regex-1.1.0" = { name = "is-regex"; packageName = "is-regex"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz"; - sha512 = "1hqaalcf1yqll2yzm71a1axvid0x87jp41hyicw16rl12rrh6sp6srr9lk7wxm6a1vl3ypw8qyd0imbq8fl2h7yq8l8xawdnkbrclmy"; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz"; + sha512 = "iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw=="; }; }; "is-regexp-1.0.0" = { @@ -5726,16 +5834,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz"; - sha512 = "0r8v3dkj5qbfh2wlj4w1msyqsw6j5myvxi88wkw36isscb97yyc2yc1pwm64djrmh1css6jp9p08cx1zb479fg4gv26prciaifdh05a"; - }; - }; - "is-retry-allowed-1.2.0" = { - name = "is-retry-allowed"; - packageName = "is-retry-allowed"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; - sha512 = "134jdgzg4p15g5jvwsmb0bmglmymn1pyk6r2w8q1fm728f15l7k12sqmfngn0mg3vs34gzg12v684fp9c99l6jnv737b6rgmiwd8ij5"; + sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="; }; }; "is-root-2.0.0" = { @@ -5744,7 +5843,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-root/-/is-root-2.0.0.tgz"; - sha512 = "0z1d0v0af41vz1cwff6262h8zkb0569fwq8yx8gbmrpqp0rc2b3y67b36w2jg4fhv3416m592qqpaarw4g48q9kwjbs63qh9wi4kyhp"; + sha512 = "F/pJIk8QD6OX5DNhRB7hWamLsUilmkDGho48KbgZ6xg/lmAZXHxzXQ91jzB3yRSw5kdQGGGc4yz8HYhTYIMWPg=="; }; }; "is-stream-1.1.0" = { @@ -5762,7 +5861,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; - sha512 = "09j5ybpil7bgiffzq9gw66svm3rrgx634aghkwyslbdx382iqpy991cf3kwfk2jh9bi8fjz5wa996wsjwmq21lzz5svgbsld7wk4ajw"; + sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; }; }; "is-svg-3.0.0" = { @@ -5771,7 +5870,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz"; - sha512 = "36jn8w0rn8szd1vpk2pb9b7bnq3bfvwlakxmk1h792hgirxmh5bz8bi5sq6qmz54kx7aq7acbs232gdnwzmdm8jisp1sbbpmqf24bl2"; + sha512 = "gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ=="; }; }; "is-symbol-1.0.3" = { @@ -5780,7 +5879,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; - sha512 = "1lmzzy2360gfg5639x8mzi5fpc1bgpdx0ffjlqaz9affd0lvvpi7yjwk15jsm1y1l8rf5jahyapv6rm2w3p86gxkghsp0jjlj2s621v"; + sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; }; }; "is-typedarray-1.0.0" = { @@ -5807,7 +5906,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; - sha512 = "0h9a8zw2ddl25yryp7i376iqjdvlsx4gw93sxy4067dw2yi98m3krfwd9xgi9q5w0idw9rqnyhhncr38xsppyi5izkb7ngai58bawkr"; + sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; }; "is-wsl-1.1.0" = { @@ -5819,6 +5918,15 @@ let sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; }; }; + "is-wsl-2.2.0" = { + name = "is-wsl"; + packageName = "is-wsl"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; + }; + }; "isarray-1.0.0" = { name = "isarray"; packageName = "isarray"; @@ -5870,16 +5978,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; - sha512 = "3vs53bpdrwiwwcql2xs20jmd8qha27k4iypdhr0b3isgdaj18vz80nhxwvvqxk6y3x5vj3slchxl0r91gjhz487xmkkp52gridg5zyl"; - }; - }; - "js-levenshtein-1.1.6" = { - name = "js-levenshtein"; - packageName = "js-levenshtein"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz"; - sha512 = "3x709s9ph1yxikp636493f7nkd2qbbrv7qrk0xykq9vgmq2sy1gc4h6rhzfqmji1fjqcayvgkppf675sz1429w1cdmb9dhravbl2q2z"; + sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; }; }; "js-tokens-4.0.0" = { @@ -5888,16 +5987,16 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; - sha512 = "0lwyvximqkf1q5w94x2747nj2v035is66vzalrbl3f2gdh9k1m3m29p8zw6r65ps5784x2lxwz8akmv085l4ai358rwbp84axz59lj5"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; - "js-yaml-3.13.1" = { + "js-yaml-3.14.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.13.1"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; - sha512 = "0kkjjrr0znm2ka89ywc5518c8dw0210z91fm94c7v11l8c96mkjh0ddld5mb7jmmnpzap7vn0fhvr29lma63c9is2ixq3fpp0xxrxk1"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"; + sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; }; }; "jsbn-0.1.1" = { @@ -5924,7 +6023,7 @@ let version = "2.5.2"; src = fetchurl { url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; - sha512 = "20bfkjw0zjachan7rfv75dn5ky7l12xhyz919mdhh9fjn395ss454ykknjza7fwyx09dj89makcs1xi341dvv4k1cvj94739ifbp2rr"; + sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; "json-buffer-3.0.0" = { @@ -5942,7 +6041,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz"; - sha512 = "14iysr3lrpg8rlrd1q7qv6xwc9abgnfd1yw2wk08lahqhzz6jjrjwxd3k4q6y80p39qp251kdkgxmrx9ydmgglr9k8ag6knyh2pkdg1"; + sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="; }; }; "json-parse-better-errors-1.0.2" = { @@ -5951,7 +6050,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; - sha512 = "2pv1kaf7gjr0bhr2djaf1i88li7q3v5daz4zm4hz57i4h21jgryihxb5c2h0p0q1vrq1ffyg279hp0vjrg73shvxr5lir6plxjb5fls"; + sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; }; }; "json-schema-0.2.3" = { @@ -5969,7 +6068,7 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; "json-stable-stringify-1.0.1" = { @@ -5996,7 +6095,7 @@ let version = "3.3.3"; src = fetchurl { url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz"; - sha512 = "049m3dzsr3mcgk3g8hw79w9lr296zxs0qmmn45ngfzinyxsvqh6k52i49690bfjlhsv16yrs87vh4nh6lfy80xrdh02haicnnczrgvk"; + sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; }; }; "json5-0.5.1" = { @@ -6014,16 +6113,16 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; - sha512 = "0xzlb8ipv7y4s06gdr1j09fgp9a8xcjrwy5qq739vgadwzfyslk6xph4f9d8zv7rrc0fg3qn6fpwg3y1mrzf0hbi5qp8yng11cvi938"; + sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; }; }; - "json5-2.1.2" = { + "json5-2.1.3" = { name = "json5"; packageName = "json5"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz"; - sha512 = "2ln46a38zniy6a7n5kb5mc4vxs81ylfnp08wg7g0swcpjw1fgscnws4jf9x68wv8f5x911r19wf56j8952k9fqrqvrdv24xhm1hx19j"; + url = "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz"; + sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; }; }; "jsonfile-2.4.0" = { @@ -6062,22 +6161,22 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "keyv-3.0.0" = { + "keyv-3.1.0" = { name = "keyv"; packageName = "keyv"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz"; - sha512 = "32ga97c763vprf4sjbb2f7gbngfppq9n1hy4cpq2h4yb1msrhh2zjimxib7p09mzgynm6askbigxlsqsm11p644avp4sf5nmng8f2vs"; + url = "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz"; + sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.0.0" = { + "keyv-4.0.1" = { name = "keyv"; packageName = "keyv"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.0.0.tgz"; - sha512 = "2i48smwjjjg1l31fm6cflailqiwx8a4f1bcszskxn40zqxg9h2sgi5r04nym2vd9wy630jmdhpn311qybvjsf7w5maz96i2q09sif2k"; + url = "https://registry.npmjs.org/keyv/-/keyv-4.0.1.tgz"; + sha512 = "xz6Jv6oNkbhrFCvCP7HQa8AaII8y8LRpoSm661NOKLr4uHuBwhX4epXrPQgF3+xdJnN4Esm5X0xwY4bOlALOtw=="; }; }; "killable-1.0.1" = { @@ -6086,7 +6185,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz"; - sha512 = "272kk46rkfh4wq4mispvvy174y6fj8rlnf1m5z8pszpa2igz586k5f8vzz3q3nckxwvkcyqzf48sndd48krwzr9ag22mhjlm4nasfig"; + sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="; }; }; "kind-of-3.2.2" = { @@ -6113,7 +6212,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; - sha512 = "0zk87sccrjx6pgf9n74v4msnqwq5siyhrkpaklx7yk85ygy5ypcgmyfhbd5mmcyd53x8zcw0gzvp9bhbglziqbhp7a6n5zsf6p08q9l"; + sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; }; }; "kind-of-6.0.3" = { @@ -6122,7 +6221,7 @@ let version = "6.0.3"; src = fetchurl { url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"; - sha512 = "23pm3j7jjxhl5igjj2mg91b2w2x6j39axjy2y7b1z0dp9jgnhxl885znwwvglzhnb5ssdc4v5vy04ks7xpwgzllyy1ngdmxbyxbbi3m"; + sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; }; }; "klaw-2.1.1" = { @@ -6140,16 +6239,16 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz"; - sha512 = "3kqxr8xv0rsarmna01c0nhhvkbi9j76r6f2mwa2515dgskwf5dw7ml5iww9bqwr7s8g8yvy8cm8v305b62kqwyav9lsyrc8c6bkd8pc"; + sha512 = "7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w=="; }; }; - "latest-version-4.0.0" = { + "latest-version-5.1.0" = { name = "latest-version"; packageName = "latest-version"; - version = "4.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-4.0.0.tgz"; - sha512 = "37c4yh5igfqlfkxkd25rgnjrksv9xnkj1zc03n0a8zbpgx7rc1xl0ln562x81cm804pwicav8nw8f116bpxhc6bh9ph52chns9k50vg"; + url = "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz"; + sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; }; }; "lcid-1.0.0" = { @@ -6161,13 +6260,22 @@ let sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; }; }; - "lcid-2.0.0" = { - name = "lcid"; - packageName = "lcid"; - version = "2.0.0"; + "leven-3.1.0" = { + name = "leven"; + packageName = "leven"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; - sha512 = "1wcm03j1xmwayngclsgc7xk3rfsn8d3lcas6yfxszjpjwa37nwiia213cxkagdfc56anijwb679bg42ak1w59d0bkq6j47wqdpw9wva"; + url = "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz"; + sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="; + }; + }; + "levenary-1.1.1" = { + name = "levenary"; + packageName = "levenary"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz"; + sha512 = "mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ=="; }; }; "load-json-file-1.1.0" = { @@ -6185,7 +6293,7 @@ let version = "2.4.0"; src = fetchurl { url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz"; - sha512 = "13mmy8rws80fp5mw0b7qwq5zvvlwq8v20hykp1npzsc5i5sw426j6sgi77js3lrqzbc8b7gjxhsrf26bi8xnn7ii8q64p2wskrspj96"; + sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="; }; }; "loader-utils-1.1.0" = { @@ -6203,7 +6311,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz"; - sha512 = "1sdj0mw1y0adq9fpaafpv91yz2ijx06s6fpzjfs0db47cry0q2xjcahr5aksf6vlxp7ripisvjz21hjkkdzrwh8pc3zm7vdq141czd8"; + sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; }; }; "locate-path-2.0.0" = { @@ -6221,7 +6329,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; - sha512 = "3jbllbkvv54d6k6zss6spzsknz5icscyfclf377jjpndb8mmacq0v9vjr1w07zjn14gaz4d2hfi0yaqk4nvg6hbm16qi70nrkivn0zc"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; }; }; "locate-path-5.0.0" = { @@ -6230,7 +6338,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; - sha512 = "3r6llra9imfvg31342986kfkzm34ficva43avn7cng5inb9f5xrnr64jm4pykjjjbjs9np0mhia370ysnf97w4m6jqgnniyjbv71f5p"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; }; "lodash-4.17.15" = { @@ -6239,7 +6347,7 @@ let version = "4.17.15"; src = fetchurl { url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; - sha512 = "3a41cs1932x00vd7h32v6rfkaak3vhkwv4x0bg27ilhlmbpl95r3abc4vja21k42cdfprsy3sdfcp2xs02sfp1fflf7m3n2gd29q4zk"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; }; }; "lodash._reinterpolate-3.0.0" = { @@ -6266,7 +6374,7 @@ let version = "4.5.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz"; - sha512 = "3y567dmr1cb5vl7mf23r20iwxr6c3pc9p6wmpal1k61x039xys53b76nddyq8ydyyhnzacw1jjgsccfr87p8qjwi1a2g6i428bxi2zk"; + sha512 = "84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A=="; }; }; "lodash.templatesettings-4.2.0" = { @@ -6275,7 +6383,7 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz"; - sha512 = "1jkf1vq05gx9z319z598cdf335qi0jsg1pfxbxg51fsjr9m6nfrqkdabg43knd3xrr7gchgkclyxnmzpvrszqq9crkay0dpx37hpn5j"; + sha512 = "stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ=="; }; }; "lodash.uniq-4.5.0" = { @@ -6287,13 +6395,13 @@ let sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; }; }; - "loglevel-1.6.7" = { + "loglevel-1.6.8" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz"; - sha512 = "3y57kcbhh98x86dpx7apanxgnkqf5chybr4jnwhzljd3k2n9knm5h7fp9aiv6bzpyvq1xg0qssgg3i47ddiz80h7vahfj6hb8n9x3bi"; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz"; + sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="; }; }; "loose-envify-1.4.0" = { @@ -6302,7 +6410,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; - sha512 = "3fhlaj5f55z0d4f45a5vsyz1r5k40qy6mfbxphjgnz8x4jx4d1g4pz4v2793viw0hk04a1a6zbiqxbjsjzhidp9jmmzhngzd8yb2awp"; + sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; }; }; "lower-case-2.0.1" = { @@ -6311,16 +6419,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz"; - sha512 = "2nvzg5awqkqrrj7g32x95c48sghvbqvnisp439rxgh9fkwwkkq7jzpjivsx6bvmrybsr7a6rgazw6554llb26aldiq5fvyb69ya099f"; - }; - }; - "lowercase-keys-1.0.0" = { - name = "lowercase-keys"; - packageName = "lowercase-keys"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; - sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; + sha512 = "LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ=="; }; }; "lowercase-keys-1.0.1" = { @@ -6329,7 +6428,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; }; }; "lowercase-keys-2.0.0" = { @@ -6338,7 +6437,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; - sha512 = "2c8fy71cr597nqfq7savid5rdk1msa2pcvxkn504w8bksci9vpm7x3a9yy87zc1lb5chzqnii12rd1h0jpc8k3kxy2c787w5snmg8xn"; + sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; }; }; "lru-cache-4.1.5" = { @@ -6347,7 +6446,7 @@ let version = "4.1.5"; src = fetchurl { url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; - sha512 = "3k64s8pgffvqc84ar3r2jjvxnrll916m1q6s4m2k8pq2gqvlrzy11hdhvx2662fa4x7h1hcpn9wmy4kk28rgk3sj76w2fpn8dn6armi"; + sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; "lru-cache-5.1.1" = { @@ -6356,7 +6455,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "3vjhn04mjkxbkfb4fh7xnlghlgmqffqp5i1w2vg1ndgh5izv7nwvr8lq1n1hypfs5pm3bvbk7wf3fjm2pavld1hipz0n8rp012l14ra"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; }; }; "make-dir-1.3.0" = { @@ -6365,7 +6464,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz"; - sha512 = "2qkk2yzlzrfwnmw8l80cn4l91rfin7fmqn81j39s32i8gzijilbmc798wy51bs3m5gqa6dgrns95gals771jbbl4s4jgdl9ni3za3fv"; + sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ=="; }; }; "make-dir-2.1.0" = { @@ -6374,25 +6473,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz"; - sha512 = "12asfdw6jlwcqjli9xywj755wznjxadmh7q6abrhldss26wdsik8w39dqww20i3ilr9mjam1r80ickwzlp9w7dz15bvqa1wszwmfbrd"; - }; - }; - "makeerror-1.0.11" = { - name = "makeerror"; - packageName = "makeerror"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz"; - sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; - }; - }; - "map-age-cleaner-0.1.3" = { - name = "map-age-cleaner"; - packageName = "map-age-cleaner"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; - sha512 = "3gk1kdfw4z4pjghrxyn53gyb40gbk71ycv5mi2mbidwxg76mbfgkxcn88zkcrjw38mq6vn5kcarw4n5zq79ligh5k1s6gr8fgmg373c"; + sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; }; }; "map-cache-0.2.2" = { @@ -6428,7 +6509,7 @@ let version = "1.3.5"; src = fetchurl { url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"; - sha512 = "29ds70y468n42xivsz4vrgy8rp2x4nxz52z1vkd1k49556gvn74pq998s510g3jgz9972m9yxs6yk1kw752blq97b9w8gaddkwlyay6"; + sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; }; }; "mdn-data-2.0.4" = { @@ -6437,7 +6518,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz"; - sha512 = "1q3dcqzncmynfxw8fbqvgwk8va8mac3lqpd9blz4knhj88fdmdcc863lscf5mm1h0ak34n9zr7bf7bgdzpqgfk8xr83xsilmhsdfpc9"; + sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; }; }; "mdn-data-2.0.6" = { @@ -6446,7 +6527,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz"; - sha512 = "0w2lssr5jjc55m8zhx3c9n9c6qnq9ivsv2fm25d0dr7hkppcmpbrcsqdwdnc8p7c4q0nni2qws676wh8pv7rnr4h93h75v8pnzy62xd"; + sha512 = "rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA=="; }; }; "media-typer-0.3.0" = { @@ -6458,15 +6539,6 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "mem-4.3.0" = { - name = "mem"; - packageName = "mem"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz"; - sha512 = "3znrz98ggx92y1crm2y017k8lriwz4m9y4w451wm0h1jzsq7jgpafymdvgpznvx07l3xw8inznd78zzwyxdzhb0aq8scki9iwdrnzd9"; - }; - }; "memory-fs-0.4.1" = { name = "memory-fs"; packageName = "memory-fs"; @@ -6482,7 +6554,7 @@ let version = "0.5.0"; src = fetchurl { url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz"; - sha512 = "0cgni6pl3js3s6ylnj3j9sydf6z5sbnpyi42xdh4437rd6c7xgbapzdq84wn8dzxrcf7sva66z7m6mna61sdagfs41078aa9rsjn3cc"; + sha512 = "jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA=="; }; }; "merge-descriptors-1.0.1" = { @@ -6500,16 +6572,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; - sha512 = "3gyvijjr3va5jwglqgv7sqxm4a6nhzhj32sl68ffjf8axkzi5z25g0nl2r2mvw1kjs3z49wxjdclljkk4whzpqka4vzjg9fwylgzfv9"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; }; }; - "merge2-1.3.0" = { + "merge2-1.4.1" = { name = "merge2"; packageName = "merge2"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz"; - sha512 = "1inz1swib3crzbwlqrpy74dhmn520qgzg5lkfmm3k1334lpb98d0xjpa6ydpdgwnp013j1n5m2yqkac4r75w6lbcj94hfj1v40h6gns"; + url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; }; }; "methods-1.1.2" = { @@ -6527,7 +6599,7 @@ let version = "3.1.10"; src = fetchurl { url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; - sha512 = "1r9rsac8gdslsplya0cnzyk6q0bh7m0wnxccdisacr5327k5k0v6f48dzp0022z8qqpzpvxw7sv1gzhvrqn6v5sz7qcvx37by1a8s1i"; + sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; "micromatch-4.0.2" = { @@ -6536,7 +6608,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; - sha512 = "3jiz9pr94hycvjgzxbxi0jfz7n142n3z5w14im7i0088lymjpvj8xrapr8s66xcp13ylh374hbpm9ixp8rln55n7lrcll6c4qfnkcfb"; + sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; }; }; "miller-rabin-4.0.1" = { @@ -6545,7 +6617,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; - sha512 = "12277knznlw4myxmgg6vgkrwmrhj9dyniscrlph3s08ndi2q25v3wrv6rwanvz29v5k5x756xa5yif4xllrghpn3jqaamnr3cp5ypnp"; + sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="; }; }; "mime-1.4.1" = { @@ -6554,7 +6626,7 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"; - sha512 = "2sz22r1xrnyvq6jg0h6b6cab3s3xdsfqa0n6vl9xv9gq3ppcxrcpg2hqfc41xjwnfwfkr6240l5gys7nds61ch6xcb3gr3fwsl7x398"; + sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="; }; }; "mime-1.6.0" = { @@ -6563,7 +6635,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; - sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; "mime-2.4.3" = { @@ -6572,34 +6644,34 @@ let version = "2.4.3"; src = fetchurl { url = "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz"; - sha512 = "1kxc6r0xfiblss3gn102f4akmmm3jgcsj95n1hm8qgy4k8f5z2qn8bym7v4aa52dk68mjdzl9rvrn9sv70k3n9kwnmbiyn4jx2cy2j2"; + sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw=="; }; }; - "mime-2.4.4" = { + "mime-2.4.6" = { name = "mime"; packageName = "mime"; - version = "2.4.4"; + version = "2.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz"; - sha512 = "0c4qs0w88nqz2v7441rw9bbsgrsh50cifwmqm2i7c96yz2ncdy35cb5g42zhr6z0wmqqcwq5la04nnf1n4y3zncvgyg8b721hvnc71d"; + url = "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz"; + sha512 = "RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA=="; }; }; - "mime-db-1.43.0" = { + "mime-db-1.44.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; - sha512 = "36x3p6lll5v1g7na92kbba0bpcl36i1argsqn8iy4mgz3zh3llnqhzhfw0l26jqcb0mh9rhhmrx718kvqzchga6y79qdg9884c6r5zv"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; + sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; - "mime-types-2.1.26" = { + "mime-types-2.1.27" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.26"; + version = "2.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; - sha512 = "1cxsgrndjg6jyfqzm74hv6cmy9lil52f1kzkq2niknaiqz20p3yiw0fpgsyld2zrbxr9abpdabz1q6nqa50xr9a0cmbjbi0cqymlnnk"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; + sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; "mimic-fn-1.2.0" = { @@ -6608,7 +6680,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha512 = "1clrrqw75rmpkw0x53axy8va2hq2gzynz9zb58m0xv1nh3lg81cv4dfdy7pk9vrlb9ydwmj6klpicwkv2bjx3m8aj4fi2ph3jxkizwd"; + sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; }; }; "mimic-fn-2.1.0" = { @@ -6617,7 +6689,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha512 = "1r8csnc32c6rrvy8d5d1g33gba52m1863wdwl7qbancmzn795726im9mrwp20k3d8pl4x4msp7n6wpldvcwkmk5y4cy0h84ka9wx9is"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; "mimic-response-1.0.1" = { @@ -6626,7 +6698,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz"; - sha512 = "32nwz24nh1f2nbpk8i638ff8hsg1ajmc6746abkssjr951z28362k5a92dd1cfr7bd1l9f507cn0pbam04ixfgsaygskv87g6v1r4cg"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; }; }; "mimic-response-2.1.0" = { @@ -6635,7 +6707,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz"; - sha512 = "080nd6134s2xyc8jb63q7hqszh9a52py287g4zqw1sy06nq0x9ac8bf2pwx7z9ygj4610ij6nk8a42q4ll4hwjgsg8xwblj7x4s6yn1"; + sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; }; }; "mini-css-extract-plugin-0.4.5" = { @@ -6644,7 +6716,7 @@ let version = "0.4.5"; src = fetchurl { url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.5.tgz"; - sha512 = "3dnk581xzzd2njvqxkqy7ihwbk9pr4r4qyc0cqn2nkmrdlflldw01vcmhqy3v0jknxhpvjpy7a7v67ljl5n5xh2hxv7mdp4syf5m83n"; + sha512 = "dqBanNfktnp2hwL2YguV9Jh91PFX7gu7nRLs4TGsbAfAG6WOtlynFRYzwDwmmeSb5uIwHo9nx1ta0f7vAZVp2w=="; }; }; "minimalistic-assert-1.0.1" = { @@ -6653,7 +6725,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; - sha512 = "3y39pa1xxg7j49vya7xca4p1mg89d0df56hj4yjhpyhmza3g5qvpgp11xs11wkd48zzy7ym970jfbn0ppimmczpijns249j7q05rljj"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; }; }; "minimalistic-crypto-utils-1.0.1" = { @@ -6671,7 +6743,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; "minimist-1.2.0" = { @@ -6689,7 +6761,7 @@ let version = "1.2.5"; src = fetchurl { url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; "minipass-2.9.0" = { @@ -6698,7 +6770,7 @@ let version = "2.9.0"; src = fetchurl { url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"; - sha512 = "1x0k2ycn1r5fig2zy7jj5vjsc7sxdl2a8lidvzsfyhcbrmvyvlbkmb3ga6l8njclvhjz2yrcx57jn26bckzrms017zb2yan1y7d85y3"; + sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; }; }; "minizlib-1.3.3" = { @@ -6707,7 +6779,7 @@ let version = "1.3.3"; src = fetchurl { url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"; - sha512 = "3slcgy5kqasjl8k1n2indaaw0k6j2ipapzxrcqyy2zrwpv8z9w2im5i8c2c73pqdgkd31rwf5bajgv4pm2i6m9jg51cfmp694w0r5p9"; + sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; }; }; "mississippi-2.0.0" = { @@ -6716,7 +6788,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz"; - sha512 = "2gnigixsj38hrqchkf6k8wqywihq6l14pg0qb23x3qpjn56vybljv3nz1z7cbzhl952h1xfw28vsqm09pjhpv9zs9sm43rdxazkqync"; + sha512 = "zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw=="; }; }; "mississippi-3.0.0" = { @@ -6725,7 +6797,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz"; - sha512 = "2895y9fw0xa9bmwbbkv3ziz5gnvr2b9k6kgh1b815ppwhgpcnbzsmn3bjvd2c1852hfakgnxw5hbn8kr8ff1pfbnm8x0lk3qm5gb3n7"; + sha512 = "x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA=="; }; }; "mixin-deep-1.3.2" = { @@ -6734,7 +6806,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz"; - sha512 = "08fzp03g97vcq1dm4qs3kfjbazfs8h2m99bzdhn9caddpi4xr9bw9n9adlrv24qwfdw2jphwfhjszdwnykawd3ysj4ihp76zygh66jr"; + sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; }; }; "mkdirp-0.5.3" = { @@ -6743,7 +6815,7 @@ let version = "0.5.3"; src = fetchurl { url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz"; - sha512 = "0376f05nckrbra8z0qvw9p5bz1w4vyvalyh8bplzqdlm099dj958xqjckbya4gx36mr8f1fq1iybr0x0z2f9yqdgdhwkivan71a1v9z"; + sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg=="; }; }; "mkdirp-0.5.5" = { @@ -6752,16 +6824,16 @@ let version = "0.5.5"; src = fetchurl { url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "32zxwnp110xb9sm0w7xdr51v2zj4k0b07yq702phnac2l8c91mxw6va27y193m42nvnw5dhby2jzg3b24fzjzkdr8337slz8ja81a9l"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "moment-2.24.0" = { + "moment-2.27.0" = { name = "moment"; packageName = "moment"; - version = "2.24.0"; + version = "2.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; - sha512 = "111s7ki890wwh47hr44ps1q5vsh23jpp56dlgvyzz7hg71np9xkrc7k683qvfs7zyijb9fdcwzvinjcnbz36lhn0hg2hhknm7xxypkd"; + url = "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz"; + sha512 = "al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="; }; }; "move-concurrently-1.0.1" = { @@ -6788,7 +6860,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; - sha512 = "352z145jr1zx0w6kmlz2jxcaw6j2pwwg9va3x4gk731zw1agka2b213avw12zx6hgn071ibm0f3p80n5cdv896npay4s6jwbrv7w2mn"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; }; }; "ms-2.1.2" = { @@ -6797,7 +6869,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; "multicast-dns-6.2.3" = { @@ -6806,7 +6878,7 @@ let version = "6.2.3"; src = fetchurl { url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; - sha512 = "3m42kr8y2s1krl4gzb5xsa9v3h01xalvrgdkj99gyfaq7761asmj5m6kzm70mxb22125gia12g7rmarnzmh09403j8j2cyvx7jqjblf"; + sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; }; }; "multicast-dns-service-types-1.1.0" = { @@ -6833,7 +6905,7 @@ let version = "3.2.1"; src = fetchurl { url = "https://registry.npmjs.org/mustache/-/mustache-3.2.1.tgz"; - sha512 = "288avkys1mgcwdv33piblh5i715m64cl4z06ixvr71r4xddk49s4z625i6739hiyakk4j3lqygbjff8ysnpn10j95gs39abawq6yi24"; + sha512 = "RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA=="; }; }; "mute-stream-0.0.7" = { @@ -6851,16 +6923,16 @@ let version = "0.0.8"; src = fetchurl { url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"; - sha512 = "001y43826xy43brn2n49xwvg7pjkn95d938fg0sk04jr9x4ak36w247lxnj48xim5c7ljk4czdgdk3myh08darj9qn2anr8x5cdcxly"; + sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "nan-2.14.0" = { + "nan-2.14.1" = { name = "nan"; packageName = "nan"; - version = "2.14.0"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; - sha512 = "115f4m91pjscflwskc29clsspd2z02gdbz0dbj63ja8bf67nraw14gvppl4872y9z2f5vbjlkpg1i4625zvalx3gp04vvn2gs7qblr0"; + url = "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz"; + sha512 = "isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="; }; }; "nanomatch-1.2.13" = { @@ -6869,7 +6941,7 @@ let version = "1.2.13"; src = fetchurl { url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"; - sha512 = "04al0wvh9hw1p9bblk847c5nbi3lcjz2pg5yzpqdzgllk57firrqinn4yk169iddaagdf9s5l987xh43z87w3hm9h0pqv0i7pcix6ky"; + sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; }; }; "ncp-1.0.1" = { @@ -6887,7 +6959,7 @@ let version = "0.6.2"; src = fetchurl { url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "0xi79rad0khwah5v2k6pvh8ajjgi7hp3zlkg6gk11pv70ydcq7li0kzcv1gnaf13gmblzhvx7hxs2nhypphb0sp4cggiy4ympndr5c5"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; "neo-async-2.6.1" = { @@ -6896,7 +6968,7 @@ let version = "2.6.1"; src = fetchurl { url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz"; - sha512 = "1kvffl97cs76iidch6z424p50m0wdryx6h6b1jdgr71bfg035szlxcdl6dz9jy71aj8msvprdq2ilbs9jisbim3g1b4l2bfy3qsc9lb"; + sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="; }; }; "nice-try-1.0.5" = { @@ -6905,7 +6977,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; - sha512 = "0swp764n5mcgqfjbm3hsw9iayqy46490y4lvqyk6www0a02bw130mji8lvsvlr34sc29rai5i4vpwwhh76mzplf6ljrlvwyszjphy6n"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; }; }; "no-case-3.0.3" = { @@ -6914,7 +6986,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz"; - sha512 = "17pqh35wma9y45ac1apa90fy5l1rl9g0z85mnqhpzgldgz7i09v2j735mkss3q33ns4zzbzapxsg5qldy8b17q2s95x0zq2ajcky5ks"; + sha512 = "ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw=="; }; }; "node-elm-compiler-5.0.4" = { @@ -6923,7 +6995,7 @@ let version = "5.0.4"; src = fetchurl { url = "https://registry.npmjs.org/node-elm-compiler/-/node-elm-compiler-5.0.4.tgz"; - sha512 = "0k6azydldy2w6xamqcm77lm9brm4hn8vxn0na1i7y1s0ikfiblw7f2kd0qg5i793s7ymms50mqxrjg0kggpklbwj03bcym20kqi62sm"; + sha512 = "VQsT8QSierYGkHzRed+b4MnccQVF1+qPHunE8jBoU7jD6YpuRqCDPzEoC2zfyEJS80qVnlMZrqobLnyjzX9lJg=="; }; }; "node-forge-0.9.0" = { @@ -6932,16 +7004,7 @@ let version = "0.9.0"; src = fetchurl { url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz"; - sha512 = "0lhlm8x38i28zwmjycgdcyzcqlb0x3z8scjx7vm3s4ypj99bfj7pmv18yxjsnz532z7g9li2aa1x54hbv61dmvbvm4yj3z9ml6rl17c"; - }; - }; - "node-int64-0.4.0" = { - name = "node-int64"; - packageName = "node-int64"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz"; - sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; + sha512 = "7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ=="; }; }; "node-libs-browser-2.2.1" = { @@ -6950,16 +7013,16 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz"; - sha512 = "3jhlmpgvcnjkg1bh3qp6rqp4a4plsih4bcfqkg0by0acj58r2m1x1jlsgw1k114920vlsvwl563lfjh844mpm02ykcs14gxq47xrz47"; + sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="; }; }; - "node-releases-1.1.53" = { + "node-releases-1.1.58" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.53"; + version = "1.1.58"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz"; - sha512 = "2ww5b7j2zf3ip1ld49jij1c3h7ba402j2p257w9450qqhj0pbf2q3bh4ihs80rl0kx9r84q7qychakxs9z29pczlnhzsybh0p4k77y2"; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz"; + sha512 = "NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg=="; }; }; "node-watch-0.5.5" = { @@ -6968,7 +7031,7 @@ let version = "0.5.5"; src = fetchurl { url = "https://registry.npmjs.org/node-watch/-/node-watch-0.5.5.tgz"; - sha512 = "0wamm245lxkvx31zim6cf1hbqwmmy8bvv1jifm1m23fpiwg6jml1bsl9k748wmns914626yhjr0rhiix3g78njir8agvs684vd4vp6g"; + sha512 = "z9xN2ibI6P0UylFadN7oMcIMsoTeCENC0rZyRM5MVK9AqzSPx+uGqKG6KMPeC/laOV4wOGZq/GH0PTstRNSqOA=="; }; }; "nopt-1.0.10" = { @@ -6986,7 +7049,7 @@ let version = "2.5.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; - sha512 = "1wbwhlsm965n61y23wrm50ric9l7rig90wvx7hjdl34np6n1bbqcc67wgm494z303s6y5aj4xjyism3n6kikp40iz9qaizlfhvqr47z"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; "normalize-path-2.1.1" = { @@ -7004,7 +7067,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; - sha512 = "0n301s7qa4645iyk3zpcgin8r19p0p8h8g50c3mnnrl9n3m9rpyxv79hjl6miix9daq12s69am1sbskhqnzbabmn2id0nippgj6rrp9"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; "normalize-range-0.1.2" = { @@ -7016,22 +7079,13 @@ let sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; }; }; - "normalize-url-2.0.1" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz"; - sha512 = "0rykwifg14xfgm9m6md48rkqqxa2cya4xdsv7jjciacis2nz6dzaccpzyldlpvy14rvihpxbdiysfn49a8x8x5jw84klmxzh9di98qg"; - }; - }; "normalize-url-3.3.0" = { name = "normalize-url"; packageName = "normalize-url"; version = "3.3.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz"; - sha512 = "1k9wdhamvss3wbk5kf7cxyaz3jrdxa6f4n9gk9sxmvhv7y7qlwqf7s6dmvb01pxs6vh03n0ygdxcw6dfsx9swkapcz5l5vfny5lkqjk"; + sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="; }; }; "normalize-url-4.5.0" = { @@ -7040,7 +7094,7 @@ let version = "4.5.0"; src = fetchurl { url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz"; - sha512 = "02k93b4vrh4rvz479dc5rjv43v54pzz5k5kn21cx6gl2b1c45s3sb29cy4cyifvfl9zqghs9m1f5kcv0hp4cwp8sigyqx9i6p5kpkns"; + sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="; }; }; "npm-conf-1.1.3" = { @@ -7049,7 +7103,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz"; - sha512 = "1rx44jzcf3byibrwmgyr0598hng4snjfj9bx29xm7bi5y1bqkbvb2krh8z0ccpzv3aps71qwrq55a56l1qkzlan118xyfn9j5nkh9v2"; + sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; }; }; "npm-run-path-2.0.2" = { @@ -7067,7 +7121,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"; - sha512 = "1dw51xws0pd54mna4n5x07w9bh0zn3xdyq1pxf49w79kall1q4625hyi2vpblar83p2yr5xm018v14l9q6fxrwa6khvrvxvjp6id3sb"; + sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; }; }; "nth-check-1.0.2" = { @@ -7076,7 +7130,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz"; - sha512 = "0g2sh2g0bndg2df1nsbqm3vw97krfwk37bd4r7sbw2vqxwnbm28xdc33xgjrd4pigwm6sa2g9wlnk3166b51lwv6z7pqjmw7dv4xq2r"; + sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; }; }; "num2fraction-1.2.2" = { @@ -7103,7 +7157,7 @@ let version = "0.9.0"; src = fetchurl { url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha512 = "1jz644r7ybsq688ifahm64ih3ljqjjskm533bgir20pvc350f9cl0z162scih0r1idx8lpw5f8hxa2pkf0lhbdhr5y6ak2ga5863v3x"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; "object-assign-4.1.1" = { @@ -7124,22 +7178,22 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-inspect-1.7.0" = { + "object-inspect-1.8.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz"; - sha512 = "19lmsxagwl8zzqckw6p0bdjwjbq2bshicnw78az9ka40d0gjghmdm0ify1n3857fxadv43c6v0g27rk1dl514iwh40a5i3mv0fl9fkb"; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz"; + sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; }; }; - "object-is-1.0.2" = { + "object-is-1.1.2" = { name = "object-is"; packageName = "object-is"; - version = "1.0.2"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz"; - sha512 = "0wsh2mh2v96a9jvknzxad6bxhj8skpsanvcmfldzdj6vlc4y4ffjsjwwpg1awwqwdl0nldilcxpvq00nnd2br7qmlmrqxsrpgws35hj"; + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz"; + sha512 = "5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ=="; }; }; "object-keys-1.1.1" = { @@ -7148,7 +7202,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "0nf2rr25ncya39v7cq274x3w4drfbdrc3iqdwd017s1wndwh9plsjagbvhl6j6l6piipprdsvgfx4vfz8q2piz7bi4bjcll8d4h9q1n"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; }; "object-visit-1.0.1" = { @@ -7166,16 +7220,16 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; - sha512 = "3krdp08gvbxvipalq64qy7bm86znxxdb7ap6bjki235qs17i9fsn6hqd22ga31sqyqa6iyy5xjfnnqc7lsck1kaybwsh154mrxcj4bv"; + sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; }; }; - "object.entries-1.1.1" = { + "object.entries-1.1.2" = { name = "object.entries"; packageName = "object.entries"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.1.tgz"; - sha512 = "2qp48plcipnz0hpb1bjd7qk60f929qsw5i29jhsa11p2ilxn1d1x1c3gyyaakgmi9v3jqrzmlcxydq8szvhqrpb4snrgj8x33n92nla"; + url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz"; + sha512 = "BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA=="; }; }; "object.getownpropertydescriptors-2.1.0" = { @@ -7184,7 +7238,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha512 = "1b08dy2xs3gqhwviks5245b0m3fa6kkdcqi8wldr5cfvkpgwbvdx474k9y5cjnsf2z075gysifxsc39i59fslxrl55kgpa03xmcx7b7"; + sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg=="; }; }; "object.pick-1.3.0" = { @@ -7202,7 +7256,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz"; - sha512 = "1w7lyv8q705mag20f36afs0qcnxjnpdg45xxnkq1ilqfd9rnf21fzbh0ib4vhwz0pzjynmqaszrsjccgk6vmgv4jas2pwla1pibjdjr"; + sha512 = "WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA=="; }; }; "obuf-1.1.2" = { @@ -7211,7 +7265,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"; - sha512 = "0vcjqppr8sr1in2haifxl9q8v6kgn8pddc4ffkjbx5n2fasb3kdrx7mybkfxqdaqfch2hqrwa87rrwllqd5lrmx73md609682xp0z9x"; + sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="; }; }; "on-finished-2.3.0" = { @@ -7229,7 +7283,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; - sha512 = "2n6994y8y4b146a5wpzzgw779yc227cqkmwsifc3fbn2kc9dzypjigqf72bpgsqrk7gs93l6fk4iqdk752jnsnpr89j58sbabw09455"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; }; }; "once-1.4.0" = { @@ -7256,7 +7310,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz"; - sha512 = "3lscn8ddi5nifjriym6zgmh0l8cn60g1d97d8ydnw19ssdyi2s0winvrx0j7gbb05lpf795a5v7wbm1jx54szh3452kbhg1y6815mz4"; + sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="; }; }; "open-6.4.0" = { @@ -7265,7 +7319,16 @@ let version = "6.4.0"; src = fetchurl { url = "https://registry.npmjs.org/open/-/open-6.4.0.tgz"; - sha512 = "0da91ydfkavxd733v8b3bvcrp681xirng4nyrazinl5bc2y3aacjd2g1bnapmzpp7g85bk42qh064hclbflj7jrkg94gvq5z1aafmr0"; + sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg=="; + }; + }; + "open-7.0.4" = { + name = "open"; + packageName = "open"; + version = "7.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-7.0.4.tgz"; + sha512 = "brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ=="; }; }; "opn-5.4.0" = { @@ -7274,7 +7337,7 @@ let version = "5.4.0"; src = fetchurl { url = "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz"; - sha512 = "15vx11m9g7ljkb0rahxyxkvlbvf81rlgdbw5n7a5ffj2q80msblibdpy5nbrhhlnraplh0fmf4ksp6c1rqbmvgh4splmzvjslslqpv0"; + sha512 = "YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw=="; }; }; "opn-5.5.0" = { @@ -7283,7 +7346,16 @@ let version = "5.5.0"; src = fetchurl { url = "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz"; - sha512 = "2qa90jg1bw4yx1an6vbx2cp7lpk6xwa94yrbr6mkpl2h95wl4iinlmlzzy2z5ihm79d4ypkjkf3w5m7cjl79775amsbav5x021fk89y"; + sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA=="; + }; + }; + "opn-6.0.0" = { + name = "opn"; + packageName = "opn"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-6.0.0.tgz"; + sha512 = "I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ=="; }; }; "optimize-css-assets-webpack-plugin-5.0.3" = { @@ -7292,7 +7364,7 @@ let version = "5.0.3"; src = fetchurl { url = "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz"; - sha512 = "0l72h39ll7vgrkls1d7xz21s4bpv54wmpzdxylldnwrf6sx70qacgh5jjrdc5i8fzw9caw9bk38hvda7f7w14m2a0nlds2j4jydpmxb"; + sha512 = "q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA=="; }; }; "options-0.0.6" = { @@ -7310,7 +7382,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/original/-/original-1.0.2.tgz"; - sha512 = "038qn5613vi5gjik4pmng7zf2ib4w81hjyzy9dhflj7kw1p1ll09nq63x9rnkyyflkv33lq8bx0fbw1gzlpp4asy24l7adam2bma847"; + sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg=="; }; }; "os-browserify-0.3.0" = { @@ -7340,15 +7412,6 @@ let sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; }; }; - "os-locale-3.1.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz"; - sha512 = "3frcfnhc4914snsnfqyqrz253i5dd31202gbx4dzkp6bvc8f7wnqhfyc89zp662v016gdqa7wb1z2g6p8nzk6cxzwscwn0qii3pgjb7"; - }; - }; "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; @@ -7358,22 +7421,13 @@ let sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; - "output-file-sync-2.0.1" = { - name = "output-file-sync"; - packageName = "output-file-sync"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/output-file-sync/-/output-file-sync-2.0.1.tgz"; - sha512 = "36zk3d8yzp1i0lxpbv4fk0j853snx2gzaxkfzcx6vgdylnhj3gs6fdr6jf0qw14amcgagbd9r8pcws46n2pky3740bh4nmvm7i6hf4q"; - }; - }; - "p-cancelable-0.4.1" = { + "p-cancelable-1.1.0" = { name = "p-cancelable"; packageName = "p-cancelable"; - version = "0.4.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz"; - sha512 = "02ipk9sgz2q0msm9h53lxbjvqprh9k6zj8q21dvczv6p6a5d4q5yqcmwj6xm0icmdc94n42plfmwlymnqn4f15pgci5j1zgq81vbmhw"; + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; }; "p-cancelable-2.0.0" = { @@ -7382,25 +7436,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz"; - sha512 = "0va49l2crhr6kr1lgbrjc69hz9scdrarzbrzpvddkfdb9wdr16bv48qajb2m0n6fjammxhvj68d4r35wyfy209rnajfv6nccq7dgwy2"; + sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg=="; }; }; - "p-defer-1.0.0" = { - name = "p-defer"; - packageName = "p-defer"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"; - sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; - }; - }; - "p-event-4.1.0" = { + "p-event-4.2.0" = { name = "p-event"; packageName = "p-event"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-event/-/p-event-4.1.0.tgz"; - sha512 = "2059kalwqi0hxv1rnpk504n5piz0cjqw6ifah5mq9vh9y9g26w70x3imkfp2x1smzz8hrqhzy3w3k5cd993f1wcbzjhgcl2l79ivw72"; + url = "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz"; + sha512 = "KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ=="; }; }; "p-finally-1.0.0" = { @@ -7412,40 +7457,22 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "p-is-promise-1.1.0" = { - name = "p-is-promise"; - packageName = "p-is-promise"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz"; - sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; - }; - }; - "p-is-promise-2.1.0" = { - name = "p-is-promise"; - packageName = "p-is-promise"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz"; - sha512 = "0z3jpi001p4scg2h40kyy7mjvscz8l9mpdp79lhk9b19lyiz140gbwi8963dr5nrysmkrl0hy52v6ikg2wzfsmk8m6ccasgak1b8xb3"; - }; - }; "p-limit-1.3.0" = { name = "p-limit"; packageName = "p-limit"; version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; - sha512 = "3sh18calqxbww99pxc84hldflmj0i915g8npihlmazw8wjqabihi9475v0ll3fhx44sxn35j014j1k5d2xr73q3mpwkmx09n2q1gxxy"; + sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; }; }; - "p-limit-2.2.2" = { + "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; - version = "2.2.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz"; - sha512 = "36v4kvifp6msn6gaal1pgwy5qi56fbv8295221a6araml7nzxsnw2jfy7i6k7ybxy3dida9xxnyx447s8i8f15m27xklacwfz27wr2q"; + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; }; "p-locate-2.0.0" = { @@ -7463,7 +7490,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; - sha512 = "14sa2r3zdhvy3sq757d4l21nxrlb7picyigb8zm956bbjadcv22chrfa95wzzrf28z0cyj62b6yihhdc9508q82gs2q3yz8yk1pdvf7"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; }; }; "p-locate-4.1.0" = { @@ -7472,7 +7499,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; - sha512 = "3n0ljmpk3p2j4aaz345w5gkqr128xkhflcb83k75fgns5ddd4bpx7l0q50w9kwy5792xb8d3dpf8bwgzif3463spf3140rhzmkmkgs7"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; }; "p-map-2.1.0" = { @@ -7481,7 +7508,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz"; - sha512 = "0bx813aqd3627xffp035h9nimfd19i0l6may47yd0k7x2bngiyp8z31im58ac1nnxy3gdb3yiilagbyqlb7qwc8wdw06f3wjwmgqxnb"; + sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; }; }; "p-retry-3.0.1" = { @@ -7490,16 +7517,16 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz"; - sha512 = "3gknqxqyn23vmgcqsvnvspzynkbkfn74f3plq72wj54kcyy5f3mbq3lw8pj2gwpmbkqcv7w0wvk3vv54dlny5j5dgv48khkwviqckjw"; + sha512 = "XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w=="; }; }; - "p-timeout-2.0.1" = { + "p-timeout-3.2.0" = { name = "p-timeout"; packageName = "p-timeout"; - version = "2.0.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz"; - sha512 = "0h1wg3bw3pyf3vlnxxfnrs3h33lwbx5n1lz4cz8ivh7bi8vjd6makxf6p1xz1d70ww3gj2ghryhbg6w1myxacgirk51ym23qzksdizk"; + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"; + sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; }; }; "p-try-1.0.0" = { @@ -7517,16 +7544,16 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; - sha512 = "1skmb50xzdk3qzd1f9l5mw8xp29frkizl63bhb9l1amivqybqb23n2824906vx790hjlwyhhrfzpzr5xr6ilzvy1xyl0ly0ah0wz2a7"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; - "package-json-5.0.0" = { + "package-json-6.5.0" = { name = "package-json"; packageName = "package-json"; - version = "5.0.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/package-json/-/package-json-5.0.0.tgz"; - sha512 = "0p21ljjj6v8r8a8fvl691yyfy7n79anx5940c80byrdfwimpnvqwiznwagrvshhnvlmawz8c40nwhf37nqwaa44j3mn44p5ahad1q8i"; + url = "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz"; + sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; }; }; "pako-1.0.11" = { @@ -7535,7 +7562,7 @@ let version = "1.0.11"; src = fetchurl { url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"; - sha512 = "1imm2ygnj1himskq6lblzdh3ngc6p9gkvhrbzivalqf3nwafzfglpmbh8wkaz0rsiaxh67jzxbb16m2ygapfcnfwqg9gkdqzkqc24p2"; + sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; }; }; "parallel-transform-1.2.0" = { @@ -7544,7 +7571,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz"; - sha512 = "35gr4098wc5ibbrpckgva8l9v50z6mcii4y3kv6wc1ymz3aj2i444y3m2qm2ngf0k02ylqkg3gn7g6awkqfs56ppljy5wmpifcd4srz"; + sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg=="; }; }; "param-case-3.0.3" = { @@ -7553,7 +7580,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz"; - sha512 = "162w23h2rysv24bd7qhl4qhv1fd2rvb0n6ai8vg1q463b0wl5gfsqdcgxyn3484b2bj250rd9i7dqv9y374csdarlmy9mww5755aq2m"; + sha512 = "VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA=="; }; }; "parse-asn1-5.1.5" = { @@ -7562,7 +7589,7 @@ let version = "5.1.5"; src = fetchurl { url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz"; - sha512 = "16n59f599pq8832a6c5wyxnqdf4vrqrdnclzs6vp9m2z2h9qmxamjk6xcrl1aal758jyba0pvyz1bkf7npm7achfxxa29jwaygihhwf"; + sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ=="; }; }; "parse-json-2.2.0" = { @@ -7598,7 +7625,7 @@ let version = "1.3.3"; src = fetchurl { url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "2lzxqjq4zp60k9gbskpqz7pr1yvb0c6nygd42sia7n6km2gc0cc844nlc5d6r9sshrjhjvs284143jzvz9wzd4r6xr9dz2k24xrwb0a"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; }; "pascal-case-3.1.1" = { @@ -7607,7 +7634,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz"; - sha512 = "10g214vi3ifgjl3g2ficxdnrxdlgdb3qvr7h0cljj0hbd5kmvcigr9k852m63invlksnbcx359wkmywxaw75xh29naspcibl8m8g1sw"; + sha512 = "XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA=="; }; }; "pascalcase-0.1.1" = { @@ -7625,7 +7652,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz"; - sha512 = "2avzhwqw37c6l7a0f276z7qzchzhwppinxhgg6q7by5bskwb7q7sfhwijb6fx4ingbdzb4i1pw6la5pg0izb5s4z69268278gil1ah5"; + sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; }; }; "path-dirname-1.0.2" = { @@ -7661,7 +7688,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; - sha512 = "3zvnv1dp30y10br2qy98z8760jssvps6g9swamdclgxsmhm14dyq0yacrj0d4mk915qhr1z0yh8l3dyd68wn7h7bgv8d39vjk5m0kva"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; }; }; "path-is-absolute-1.0.1" = { @@ -7697,7 +7724,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; - sha512 = "3ll9f60sa4xi9iswmzar1hldsdhg1y8wy94wa0qmrcapf0prj95yng3bw7fkbi3jh44jc3hjymxwhxg7j7a2b9incijvywx98vrwfd2"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; }; "path-parse-1.0.6" = { @@ -7706,7 +7733,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "37qw5986wccpwwqckqky509s4nd6zwv200s9r2v6mcf5nsyxgf2x00m4yp918mkkz84sdh4q0kjbg0hhfq4flpz0l6v47hvc57qwa8r"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; }; }; "path-to-regexp-0.1.7" = { @@ -7733,7 +7760,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; - sha512 = "2z1csf4c3fmlwl0ahk533z5zqkjdf36ccfx11kakl9xran9f5asxm4cxjq4lx1kwqdp8gki786cgpldvgrkvfc7pcvh07j5ssqm8rjg"; + sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg=="; }; }; "path-type-4.0.0" = { @@ -7742,16 +7769,16 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; - sha512 = "2zw0czk4p8vimrxap6mlnw17lbjrhisby3z1m2j0qdhjcnxlv9lk5d8yxirrqy4ax6ar5qx14rpshmbpvzg9b4mnpzy03aclvqrncl0"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; - "pbkdf2-3.0.17" = { + "pbkdf2-3.1.1" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.17"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz"; - sha512 = "2s4nd3yv3kkyywvh5rkrvbr6w2h6a4q786v548w895ralcq9cllqzyxr0jgxf911k3zpmzycimsg3ggww3lkrhd3bk9wribrgjaby2k"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz"; + sha512 = "4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg=="; }; }; "pem-1.14.2" = { @@ -7760,7 +7787,7 @@ let version = "1.14.2"; src = fetchurl { url = "https://registry.npmjs.org/pem/-/pem-1.14.2.tgz"; - sha512 = "0w57ydgr6304raqbf2svkvkxjw6r91kgdk926wljdpybpmr1xr7y94j4sqi63gc4dm6vi5x6wii8kx6p13awzp6i2kp05nrmnvczsac"; + sha512 = "TOnPtq3ZFnCniOZ+rka4pk8UIze9xG1qI+wNE7EmkiR/cg+53uVvk5QbkWZ7M6RsuOxzz62FW1hlAobJr/lTOA=="; }; }; "performance-now-2.1.0" = { @@ -7778,7 +7805,7 @@ let version = "2.2.2"; src = fetchurl { url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; - sha512 = "1d2xjd4r28xk5ggmns7n33nvga0ywk30plvs17dr70qwq0jc17p8kmfsm50idvj6xdrj1fikz0yv63x1pychmz90bs6mkj7wvskyhxb"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; }; }; "pify-2.3.0" = { @@ -7805,7 +7832,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"; - sha512 = "3d9a1zsv7ca8ffpp7ffl67vp0ahiq78ix1jl21b4nfklinh2ilwh6c45f93syclab0b49p3cfq8d4agpphrbmf6xgfxgzjv268387xq"; + sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; }; }; "pinkie-2.0.4" = { @@ -7832,7 +7859,7 @@ let version = "1.0.9"; src = fetchurl { url = "https://registry.npmjs.org/pjson/-/pjson-1.0.9.tgz"; - sha512 = "1sh37y91m7ii0xy1213jw8ja42309mhxzrv0nvnxl77002lfc0m95fjbnwdn6r0cib8js60v54f2r02n4fcwl98jm74m49kfqglj572"; + sha512 = "4hRJH3YzkUpOlShRzhyxAmThSNnAaIlWZCAb27hd0pVUAXNUAHAO7XZbsPPvsCYwBFEScTmCCL6DGE8NyZ8BdQ=="; }; }; "pkg-dir-2.0.0" = { @@ -7850,7 +7877,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz"; - sha512 = "2znan90js3xrk8a8cvzv7vrjma5dgr9hkk4kpcgciyawbjz404a4rpdj6gngx1dc7f1xzmfm3q0an1rq69qyk2cmawhsy98i40pnkpw"; + sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; }; }; "pkg-up-2.0.0" = { @@ -7880,13 +7907,13 @@ let sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; }; }; - "portfinder-1.0.25" = { + "portfinder-1.0.26" = { name = "portfinder"; packageName = "portfinder"; - version = "1.0.25"; + version = "1.0.26"; src = fetchurl { - url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz"; - sha512 = "0388smj2gw4cwp6pddy75jr5x6sha60s4w055dpxpag7fi9ql9vxrkidnzc1v5h2zp6ra350y8q4n6lqsg0dq12blsm1iavf2f4jjg8"; + url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz"; + sha512 = "Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ=="; }; }; "posix-character-classes-0.1.1" = { @@ -7904,16 +7931,16 @@ let version = "6.0.23"; src = fetchurl { url = "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz"; - sha512 = "1m7l8kr2bwwm21ki5jvrkfaxfxg5nqjn4zk9xf0b7rzyq1xz4s64cm5wh34qf0c13vva14wbmvfkwg7yndmcpnmcq9m7pc93vba90xj"; + sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; }; }; - "postcss-7.0.27" = { + "postcss-7.0.32" = { name = "postcss"; packageName = "postcss"; - version = "7.0.27"; + version = "7.0.32"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz"; - sha512 = "1sm64zw7m5fj7ni24kn3xcjnncf9c0jva67x209x5bz33kf1yvr9dwd9bwk2csavbh42a5yh2q61n9z2rjivdpxswgxanqwyd609r2s"; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz"; + sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; }; }; "postcss-calc-7.0.2" = { @@ -7922,7 +7949,7 @@ let version = "7.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz"; - sha512 = "2yialb25zhak51b057lni6kr12p4aicp8w8m13krhsjq24ghz99l3v6mp5qhc6ihymc2bfqn1sqckmz5mcph3qwplmr5s90fladk1xf"; + sha512 = "rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ=="; }; }; "postcss-colormin-4.0.3" = { @@ -7931,7 +7958,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz"; - sha512 = "0vhqbcpm535dwjglgk0svgxghy7063rwkd7i1rh8ykqmyz9imclbp5blj99i64awgjx6fk68xksqs3r3x6x38vxhx84r96rs00ha92v"; + sha512 = "WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw=="; }; }; "postcss-convert-values-4.0.1" = { @@ -7940,7 +7967,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz"; - sha512 = "0jw9v1315cyal4mc0vd8acqy7g8r6hizrx7pldmzin7dnwbb1pj00q6c301cn8dpwkc5wfcphjqw8zwskjx19wrs01abv5vbjiisara"; + sha512 = "Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ=="; }; }; "postcss-discard-comments-4.0.2" = { @@ -7949,7 +7976,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz"; - sha512 = "29fj6haa98fxl30bgk20jxngsis7r73k0n6zkc0aydqliqj9vddrx3g03zrxhf5k82pyf6kcbhb151kiff1kfw5vigy92kxdqvsv6s4"; + sha512 = "RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg=="; }; }; "postcss-discard-duplicates-4.0.2" = { @@ -7958,7 +7985,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz"; - sha512 = "2hkmiwkgz59h7dvgm53nfwv2pc4ymjx82i1mfrfx3lvh3yc2rj8jpvq7in5cpj26aqlbhr2jzg7slc2qibk810qcsbhhd0gb13izm34"; + sha512 = "ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ=="; }; }; "postcss-discard-empty-4.0.1" = { @@ -7967,7 +7994,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz"; - sha512 = "39k3fi493q6ixpvh0rs3ald21h8mnp0vkls85wfgbhyb5x21dz2xb6knc1xav5ygjzkyckl0wmxd9m2qybqmvzq9pii17pk6r7s5n87"; + sha512 = "B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w=="; }; }; "postcss-discard-overridden-4.0.1" = { @@ -7976,52 +8003,34 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz"; - sha512 = "179r7sbkc1x3x2mv5g2il2vhx0akmcd61lai2y8ipk8g5vy13pd6nr57xak319ll3wn60mih08y5zz32g2i40sj6dbhvvn381n3d1i1"; + sha512 = "IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg=="; }; }; - "postcss-flexbugs-fixes-3.3.1" = { + "postcss-flexbugs-fixes-4.2.1" = { name = "postcss-flexbugs-fixes"; packageName = "postcss-flexbugs-fixes"; - version = "3.3.1"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-3.3.1.tgz"; - sha512 = "3xsv14h0z6rs754dhwmmmkcqpbjd9kck8k78ydv7yqcdfyvb370lz2w5mrbvz1igcw7qv8lzd3814bbipkzdcby54ix25zn6w668bzp"; + url = "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-4.2.1.tgz"; + sha512 = "9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ=="; }; }; - "postcss-load-config-1.2.0" = { + "postcss-load-config-2.1.0" = { name = "postcss-load-config"; packageName = "postcss-load-config"; - version = "1.2.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz"; - sha1 = "539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"; + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz"; + sha512 = "4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q=="; }; }; - "postcss-load-options-1.2.0" = { - name = "postcss-load-options"; - packageName = "postcss-load-options"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz"; - sha1 = "b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"; - }; - }; - "postcss-load-plugins-2.3.0" = { - name = "postcss-load-plugins"; - packageName = "postcss-load-plugins"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz"; - sha1 = "745768116599aca2f009fad426b00175049d8d92"; - }; - }; - "postcss-loader-2.1.5" = { + "postcss-loader-3.0.0" = { name = "postcss-loader"; packageName = "postcss-loader"; - version = "2.1.5"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.5.tgz"; - sha512 = "2r4igq1b6l10xxgqwf5mhvn2afwjs63d1f1j1ndgxzikd5ncqlanpgirq5syb4kn440lpc24h2dbm04ivhxc2wznpsly9yyk43y8pm5"; + url = "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz"; + sha512 = "cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA=="; }; }; "postcss-merge-longhand-4.0.11" = { @@ -8030,7 +8039,7 @@ let version = "4.0.11"; src = fetchurl { url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz"; - sha512 = "2zp1rk4fk9lcg6d4x9yfr1n7zp8kzj5vghnjji9229qv8sbb24ij0y33sj6kwv1m5h7s5a3b72ja7wf1h8rpy5jlxiz4phydb77yp3a"; + sha512 = "alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw=="; }; }; "postcss-merge-rules-4.0.3" = { @@ -8039,7 +8048,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz"; - sha512 = "08rwihmvnqrz9ia48czncj4i50hrii7xgrvdff49a1yb1v28fd8z41bk21j3invi8d3s0x1iihn0598yczm3xwss378rgcvajpvgdsk"; + sha512 = "U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ=="; }; }; "postcss-minify-font-values-4.0.2" = { @@ -8048,7 +8057,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz"; - sha512 = "2vdpqczvay1n44i15jg66gf28pj777img4cps6vx830hhif65w6y92zr555xr5c0f46wnkbx9h0idnldzvghf7x7mrlyid7lcxniklg"; + sha512 = "j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg=="; }; }; "postcss-minify-gradients-4.0.2" = { @@ -8057,7 +8066,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz"; - sha512 = "3whlz4gqxsd8f0g908qwpqn0bmgm1sz3iscx5i4ys15b1kd4bi8cx01kcvjpa18d567kh38kchb7yr7297xakvp0bzwfxcdag1dz8x8"; + sha512 = "qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q=="; }; }; "postcss-minify-params-4.0.2" = { @@ -8066,7 +8075,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz"; - sha512 = "1d4037bvr8ws41rvsrnhcmlx57s6czqxr8wwpwdp9wzrz76wxwn1zxpvq9mdalki6vn3ncm0b63qgiv96f09088zzw15lri675rddqv"; + sha512 = "G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg=="; }; }; "postcss-minify-selectors-4.0.2" = { @@ -8075,7 +8084,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz"; - sha512 = "3gaxsjc0lh0lwy3jri4bsx18fsmx34qsh07bk43pqw3pxr04bq66vw88rr7jijdn745pw96dhkagmds32745ra7yrip13d5b24vb50g"; + sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; }; }; "postcss-modules-extract-imports-2.0.0" = { @@ -8084,7 +8093,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz"; - sha512 = "1cwpb0nbsgvwyxf6kr3wmpnsc0dgyx0mcapbp1103klr5gq7pmg6d423dah9k4sxzxvpz7b62ncjwvlc21ah5k0wl86yj5qsh60p9id"; + sha512 = "LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ=="; }; }; "postcss-modules-local-by-default-3.0.2" = { @@ -8093,7 +8102,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz"; - sha512 = "0hxy2fkb9wv78ws2ki52j3rx5j2m1xy9yg8k9mcn5cjlynwbf9kykmysiqlrcpax3yan7y35ccvg7mf4cg87x38vdzq5qlcxbqxbkwc"; + sha512 = "jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ=="; }; }; "postcss-modules-scope-2.2.0" = { @@ -8102,7 +8111,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"; - sha512 = "1fnivyay60x7kkg653ks8az8palhp4vprn0n0kj75dvc8f761p8q2bvaq95dbspayxzqyjnw4qvwz47wrzyr0kc3rzdg90i6fqj08b3"; + sha512 = "YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ=="; }; }; "postcss-modules-values-3.0.0" = { @@ -8111,7 +8120,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz"; - sha512 = "1r2657ijhxmh1dszbwr1k8mdpda7r8w8gj5x4q76bya68pvwyx9vir5y1kg9qqwxhqn5qymldbm5m22cqmwrzhmk51rzbc163kc9zyp"; + sha512 = "1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg=="; }; }; "postcss-normalize-charset-4.0.1" = { @@ -8120,7 +8129,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz"; - sha512 = "3g41krdk4hzkzly9kw24zwg3dbmxzaiq9wfsin6c8691f9rv94fz8sxinwg7h5v420h7nvcipqg07dxrmxif8adxnva31snp6pc5ic0"; + sha512 = "gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g=="; }; }; "postcss-normalize-display-values-4.0.2" = { @@ -8129,7 +8138,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz"; - sha512 = "2wi1jy4i45d607gv94743b94ii3q66vm059z6zg7hcdvvayalkcjm6ylkpz4dfvh18l3p632cb0z1wvyzzsj00knnavynwcqrra6pfw"; + sha512 = "3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ=="; }; }; "postcss-normalize-positions-4.0.2" = { @@ -8138,7 +8147,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz"; - sha512 = "1s6phjg5gbhmhr5ycjw4q6lr5vi8sz542kqhzj41xsbc0nkbas87npz1z3s3rsr30br7pqmdkjj423s0cb2fpsx6hz139ris3zzfmqf"; + sha512 = "Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA=="; }; }; "postcss-normalize-repeat-style-4.0.2" = { @@ -8147,7 +8156,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz"; - sha512 = "3wkb4bcky7wf9vs92wq6qcwldzxbnbnrww43fyb5i6vi66gzgs5xlhhm8m0na72hqxk08bzjcn52xwwz7vv7j6d2sl2p98chrss1y5a"; + sha512 = "qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q=="; }; }; "postcss-normalize-string-4.0.2" = { @@ -8156,7 +8165,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz"; - sha512 = "1wg89sywdpnm8pck61g313d9igh8cpmqlgv6x6cdixgc98046irm7yq1nwygk5adz990q9h9frskbm358zkfmlgmcm7q3kvvyhi3ca6"; + sha512 = "RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA=="; }; }; "postcss-normalize-timing-functions-4.0.2" = { @@ -8165,7 +8174,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz"; - sha512 = "3h7jmkpmrh0yw6w06k28dgfmhn4g4pbkr3p4wc3n7m8psd4z06q4193l59nha3wd3rf6w44j2qzilmb450x7gpgv7xgwx2yvrihkk39"; + sha512 = "acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A=="; }; }; "postcss-normalize-unicode-4.0.1" = { @@ -8174,7 +8183,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz"; - sha512 = "311iz04wy12nd657s0l1hs8fm9550gzxjkig30cx6wyc7pxlcfraxfjkzdpi30nqplb9rz6k03y7wdnmvkhislzppz8j2dhmm97rpd1"; + sha512 = "od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg=="; }; }; "postcss-normalize-url-4.0.1" = { @@ -8183,7 +8192,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz"; - sha512 = "1a19pc9bvl37skha2a49r50yvfxhg21idcz965v4ir6adhqvy27m40zvmbd27wnlq3djch92xisk6aas9znlk2sxlp7q81ybrl1b6m7"; + sha512 = "p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA=="; }; }; "postcss-normalize-whitespace-4.0.2" = { @@ -8192,7 +8201,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz"; - sha512 = "2s0cgihhy92iqlwlsma7llzfnhi0yznf2n0d0bip7hgc3p182l9yywjjzynxah0m04i7xp146awmrzsjnicl7xzwrypl8zc18i11vxl"; + sha512 = "tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA=="; }; }; "postcss-ordered-values-4.1.2" = { @@ -8201,7 +8210,7 @@ let version = "4.1.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz"; - sha512 = "01rn75rgd2s1jx2q21jc4vhj7zbjzwma81yy5nzay11vs9vb3c9bimnyvab097ff88a77y73f2561cpxp9ax5qp9dppqsjl3rp8xw6r"; + sha512 = "2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw=="; }; }; "postcss-reduce-initial-4.0.3" = { @@ -8210,7 +8219,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz"; - sha512 = "067nl9p2zm8v4vyxs57iz14gxd5vyjn8vqdf78z197zsp5abrvh65d3lajgj5a06gd544c0gqcc48964p80z7rkdyim9flljr3sd9c0"; + sha512 = "gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA=="; }; }; "postcss-reduce-transforms-4.0.2" = { @@ -8219,7 +8228,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz"; - sha512 = "014hrwaf4hyzkglss6k9s77qg6d0ysdh1i71n49ian03j8b0kd1pjm9jzsyx4b436fqz6iz3x1l7pjngja32mwj5q29wh1naj1n4i8h"; + sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; }; }; "postcss-safe-parser-4.0.2" = { @@ -8228,7 +8237,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz"; - sha512 = "3b624jkq9r4n23xq425mb6s1wb71m6nvk8h2g9gyq3k7n12z99hb4viy8fnp3wiinxm7mzkpvzxhrkzmb4zvby4ga7v0d4n2j9rw3jk"; + sha512 = "Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g=="; }; }; "postcss-selector-parser-3.1.2" = { @@ -8237,7 +8246,7 @@ let version = "3.1.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; - sha512 = "224wav8lxk3x5gjdxig09wdjnnkixl6j941a9z6y8w9dnr0dlgvjrrv36hadqkw12rfg5c483ij2lmpcydf63nr79r1bfcnkgzwkdw7"; + sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; }; "postcss-selector-parser-6.0.2" = { @@ -8246,7 +8255,7 @@ let version = "6.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; - sha512 = "031v34kpl4kypkmy5bi46kk3n0dcbczavi0zlcy5r0pzaxc5432rmfjb3fjkap0vni5gh7gvahfr43wdd5ah9120b73933x3r0zd8yz"; + sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; }; }; "postcss-svgo-4.0.2" = { @@ -8255,7 +8264,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz"; - sha512 = "27pwrvcvx4w37dz649dsawii4q43znabznk1nqvza2y1lmd4av4mh5ddz68vagghih2k6505680w9l0pddzhwh08as5kh6min735b0b"; + sha512 = "C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw=="; }; }; "postcss-unique-selectors-4.0.1" = { @@ -8264,7 +8273,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz"; - sha512 = "2k15zwvbnbqb3diyrk5bbb38jdkyzfq2drvs16frm4ix432djb4y1c8r8p2c0blb6x170c1qjghb3lhc1iaxjlqq588ybpjm9asg5pq"; + sha512 = "+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg=="; }; }; "postcss-value-parser-3.3.1" = { @@ -8273,16 +8282,16 @@ let version = "3.3.1"; src = fetchurl { url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"; - sha512 = "34qs1g2jb9y7k8ydk013zqgkcmwclfa0n4f98kfpqbhczldnk5sbyyyj3zj7mmrqcahx3w9080g7ma4f1q58frlgiw4lmhvl3mq9154"; + sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; }; }; - "postcss-value-parser-4.0.3" = { + "postcss-value-parser-4.1.0" = { name = "postcss-value-parser"; packageName = "postcss-value-parser"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz"; - sha512 = "2p1bcqas3ldbvc3pjzyic1w4kvi5hm5k1apps8vj0dpfw4nl6rca26i6fnjyy8qml78s2spiqn38sv1i2k7kwlc210yx7lddyj7if1p"; + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; }; }; "prepend-http-2.0.0" = { @@ -8300,7 +8309,7 @@ let version = "5.3.0"; src = fetchurl { url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz"; - sha512 = "1v427fxhwc53139189yd8i8y9vb41sm5arjs0ib2i0zbbf16f9bjpwdy44x5zi40r8gklq5xns92k3jiqg6i6w58xwamnzxwf3sncc6"; + sha512 = "hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg=="; }; }; "pretty-error-2.1.1" = { @@ -8318,7 +8327,7 @@ let version = "0.1.8"; src = fetchurl { url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz"; - sha512 = "2dgznnpxsgy9bgp4kfby1is72blvca4lhmqb3nlja8yiig1v52c12p5yw0aag8jqazhkqvihpxmqf9gsjlg5dr1jb56jxzgnqrazy2n"; + sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="; }; }; "process-0.11.10" = { @@ -8345,7 +8354,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; "promise-8.1.0" = { @@ -8354,7 +8363,7 @@ let version = "8.1.0"; src = fetchurl { url = "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz"; - sha512 = "3fk4wirp8c5j0drwrlmr69qq3y3ribwfl36dzdaxprq26fd63j7hkmvm4vnnhg5203y40lbpd38sd0akkc8iwqm7pnbyf0bfam00kjv"; + sha512 = "W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q=="; }; }; "promise-inflight-1.0.1" = { @@ -8390,7 +8399,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "0xy6dm0910h3nsa0ik45yccdfm6f84nl3h9dpkb22crqhdr3mmiczcbrq9z53gq7l2ijxhxi3pzsfzafrzymw4c1nn68ml1y2pdy7vn"; + sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; }; }; "prr-1.0.1" = { @@ -8417,7 +8426,7 @@ let version = "1.8.0"; src = fetchurl { url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; - sha512 = "0hn7s5bxnn3k2hiqh8fmm7bvq4vd6j0a5hwj09jk31r1ylv6q28g5hl3z70m3gycwfb40vdp04fqi59hdjih3jz0fhszg0s5b7lx1s4"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; }; "public-encrypt-4.0.3" = { @@ -8426,7 +8435,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz"; - sha512 = "3qnsvs746b98ifyv12qj1g6hl6fq25vip5mswhvn3gnl7r32fids6mw3jb0gdcqrrl5x9ik475sf0vx6mbhmif49idkwjwrhbr5lnnd"; + sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; }; }; "pump-2.0.1" = { @@ -8435,7 +8444,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"; - sha512 = "288hcmlwdnqda84ylx9cv413ic0r59k0dp71hy7a200jsb7h1y63277jwdp1jdp13c1b3pl6g2gzr5gjv9p72f5sp7w3p0d34swrqxf"; + sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; }; }; "pump-3.0.0" = { @@ -8444,7 +8453,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; }; "pumpify-1.5.1" = { @@ -8453,7 +8462,7 @@ let version = "1.5.1"; src = fetchurl { url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz"; - sha512 = "1sxm2mh7jmxhjqdrpdqrhc61ipk2cjyyyvsn9hmxlxnlpsasyzjdicl98pm63zv30012qhrxl57vdpdnnq2m2hl4w4ybgn7gqimjad0"; + sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; }; }; "punycode-1.3.2" = { @@ -8480,7 +8489,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; "q-1.5.1" = { @@ -8498,7 +8507,7 @@ let version = "6.5.1"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz"; - sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r"; + sha512 = "eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="; }; }; "qs-6.5.2" = { @@ -8507,7 +8516,7 @@ let version = "6.5.2"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; }; }; "qs-6.7.0" = { @@ -8516,16 +8525,7 @@ let version = "6.7.0"; src = fetchurl { url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; - sha512 = "34x6fm4dnq8m0kps5ann831k8fvx7jzlrcw8vvri0ki2g2ywdrjr8j5y14bvj9c0fd01ndsyx43y6ji51bfhnxk2gr5fpsks52429sl"; - }; - }; - "query-string-5.1.1" = { - name = "query-string"; - packageName = "query-string"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz"; - sha512 = "0kkwn38nmjd6n6byiz52gngvyiw46fbibx9c9p1vzn9g7l11f2jpbs39d4aqajk7kk2a6k69wx5bjgavbg1lh275ih6k84jdnr8wdc2"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; "querystring-0.2.0" = { @@ -8552,7 +8552,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz"; - sha512 = "1yd3j6k7rr39qm5zsh0k86znfksfcz9rbj48vv2dbsicnvvgzvw1vwl17vk2jlxszwqjiqsj9hy88r74wsdxf8by7a3wia2hk2cpdy3"; + sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="; }; }; "randombytes-2.1.0" = { @@ -8561,7 +8561,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; - sha512 = "2cimbs750ysa2wxsiw9mmc1xqjb8w0c4s22p2mv2n676s8hchvzcl1l5p78jnk62d2jzacpr9zbl9w64kaqnipcbaa25q7ywn47g2dx"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; }; }; "randomfill-1.0.4" = { @@ -8570,7 +8570,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"; - sha512 = "0pm7c7mw7a3qwjr21f8cvxaa2sq5l4svqs51lppn833x0yvz3yx8x4vbd4rswjynykvlgvn4hrpq327pvbzp428f4b1fciy3xnmrfgk"; + sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="; }; }; "range-parser-1.2.1" = { @@ -8579,7 +8579,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; - sha512 = "15b00vag4wijzsp0lwi9jznpz16n858vq5p1p3dgjrqqil9c6d4x55s1nl1fi4cbq8307bylbvkd9qkhyk6qib8ksh8raibxb3jrf0y"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; "raw-body-2.3.2" = { @@ -8597,7 +8597,7 @@ let version = "2.4.0"; src = fetchurl { url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; - sha512 = "3flyhj96ayiy8is22lwh9sp1yqq9ksym43x22yri2ikzladqqzxj6z657bc0xb5f2wl7qr2ja4byf57c9f7l2d3wqdglxih886zrv70"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; "rc-1.2.8" = { @@ -8606,7 +8606,7 @@ let version = "1.2.8"; src = fetchurl { url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; - sha512 = "0xhy1n9n3y6cp28f8f0f2mi0xzc7ay1g5nhbp64fyvcwv9q30zq2zvyc5q2d0al8aa0hx101yq2y6d2ln4r5jxnqifh1pd3la1ccxnb"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; "react-dev-utils-6.1.1" = { @@ -8615,7 +8615,7 @@ let version = "6.1.1"; src = fetchurl { url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-6.1.1.tgz"; - sha512 = "3gzi6h19w4dkr566jbw277xi1gvrq8r18x2b0wbz5zwjjj25gs0vr1p4kjyyx03351c2nkm09sfyd4l4j7lw8playqdwm98lzrwj5jf"; + sha512 = "ThbJ86coVd6wV/QiTo8klDTvdAJ1WsFCGQN07+UkN+QN9CtCSsl/+YuDJToKGeG8X4j9HMGXNKbk2QhPAZr43w=="; }; }; "react-error-overlay-4.0.1" = { @@ -8624,7 +8624,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-4.0.1.tgz"; - sha512 = "2viss03mfyx7xkwyfv6kj5p7j03wpjrq0qjkljc1w715n7q9xb8i0ixhy5vvwfibnsydgr0ib9wifx9bpwm5va808d4ylv40q61nxf5"; + sha512 = "xXUbDAZkU08aAkjtUvldqbvI04ogv+a1XdHxvYuHPYKIVk/42BIOD0zSKTHAWV4+gDy3yGm283z2072rA2gdtw=="; }; }; "react-error-overlay-5.1.6" = { @@ -8633,7 +8633,7 @@ let version = "5.1.6"; src = fetchurl { url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-5.1.6.tgz"; - sha512 = "3az1p6ci7r6nf917lkw5lr2plssa9ajmr3l3z77h6vyrsjwbyjbdw3zqzjlil7135bgbvgfg78a9qgmjnz02y5yas1qkv3q6k93wmjz"; + sha512 = "X1Y+0jR47ImDVr54Ab6V9eGk0Hnu7fVWGeHQSOXHf/C2pF9c6uy3gef8QUeuUiWlNb0i08InPSE5a/KJzNzw1Q=="; }; }; "read-1.0.7" = { @@ -8678,7 +8678,7 @@ let version = "2.3.7"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; "readable-stream-3.6.0" = { @@ -8687,7 +8687,7 @@ let version = "3.6.0"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "1s8hs6ax9jwmmw558j3hyfx5lfn7qf66xg0giplz9jci7d8zp2d8vh96dzlis6xzpxfa5b2zbm8nm4mgsr71r6rl3w3qyfanb5qfn05"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; "readdirp-2.2.1" = { @@ -8696,7 +8696,7 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz"; - sha512 = "2yzl88bp25ig1xnrzqmqiwpfxyqkmdw27h3p90a4a58q0964xcijcx4i948msnlvin9f6hn5hmpxj1s90jzkj8aqxr5d04mmzr3z5fl"; + sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; "readdirp-3.1.3" = { @@ -8705,7 +8705,7 @@ let version = "3.1.3"; src = fetchurl { url = "https://registry.npmjs.org/readdirp/-/readdirp-3.1.3.tgz"; - sha512 = "3snxi021w9pg57mc4wmvpch80fscyqwbrbhwb8541kn7z6xray7ncg6ixykk7vx556lfjnyi4cx6dk0a6zcwk0yg4m6jfr3d561zsv4"; + sha512 = "ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q=="; }; }; "readdirp-3.2.0" = { @@ -8714,7 +8714,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; - sha512 = "0chzz12q3inpmwm6b4gi7g9n39jp24ah3mmjgss87hfsbx86vnxf49bx9wk2ng66037x2fh0cjf5rgx00c1m86lqlh7r6g9xm13ifbj"; + sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; }; }; "readdirp-3.4.0" = { @@ -8723,7 +8723,7 @@ let version = "3.4.0"; src = fetchurl { url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; - sha512 = "0cs2zxxilvxnj5n2726vpigp95pyc33q9qimcigd349sr2d3rfiqg6hh6qdraqmnw9fhky8zhl8071s58zp52pb5d2741nrbg9v85yk"; + sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; }; }; "recursive-readdir-2.2.2" = { @@ -8732,16 +8732,16 @@ let version = "2.2.2"; src = fetchurl { url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; - sha512 = "0bb5d70l5lg02x515r2klvjhhz6xcxdb4ykbx16wq45l822bbsdd8sbki7vb28j17xr7181fmwlzhx3bizvr5xdq6cxpv53sidrq44x"; + sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; }; }; - "regenerate-1.4.0" = { + "regenerate-1.4.1" = { name = "regenerate"; packageName = "regenerate"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz"; - sha512 = "0m5jil0f2yz4js80jxvwilkhq6im5h6h0pa4disk3fsv9lm23lz8ly5219518j47v4fn0h248s9jf5pqhxhcr6z5cmxvbnna0js6vnl"; + url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz"; + sha512 = "j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A=="; }; }; "regenerate-unicode-properties-8.2.0" = { @@ -8750,7 +8750,7 @@ let version = "8.2.0"; src = fetchurl { url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; - sha512 = "225dbzqx56z4pkl71954di1140528vik4pc7q0zxw4k10k6pq5pdqdvhfry1cyj1waqjg4kacgzvnfxhz5wkhz37pnqybnabdiy7l0p"; + sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; }; }; "regenerator-runtime-0.11.1" = { @@ -8759,16 +8759,7 @@ let version = "0.11.1"; src = fetchurl { url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; - sha512 = "03d4l8l8cyywh93wf5vw84lq56jh1b1d7jll4ny4z060j9hvx7w5q3q0b8q227jm93749k1c9h86r2pz0bm2xq5vp14g3r2kbvqc2rj"; - }; - }; - "regenerator-runtime-0.12.1" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz"; - sha512 = "0g2nsc66ha0z9d4p7hxi0lhwqilbbg1ff6pz1mpzn8x4yvrg7zadvk08l4ph8h56156g82df6jjyg8nb2j5w7wpi4w5l3pgbxrlip51"; + sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; "regenerator-runtime-0.13.5" = { @@ -8777,7 +8768,7 @@ let version = "0.13.5"; src = fetchurl { url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha512 = "2a918h23x10x6v446prj8l20irllscvw554hqk8r9pb9vyi7zk7fzcl0bq2dvc218dbpb3chdg9bxx06z7xs5pcrka2j5ja5bq70bk5"; + sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; }; }; "regenerator-runtime-0.9.6" = { @@ -8795,7 +8786,7 @@ let version = "0.14.4"; src = fetchurl { url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; - sha512 = "1pvch513p14nghc7cnlrrb0isf1sc97asa9nvvk5bq8jkvpilf8j2wqsv8r9qgxyvc15h9gz1c7n73yz1ndlczmlv56px28y0l5m8hi"; + sha512 = "EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw=="; }; }; "regex-not-1.0.2" = { @@ -8804,7 +8795,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; - sha512 = "3cggngaj8m70zdn8kghha4mhvavm7jfy5xm2iqi94w4gi5m5irs3nlrgg975w2231y49jnnw7zhsg648pbkl9zb6vwhii83926q7917"; + sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; "regexp.prototype.flags-1.3.0" = { @@ -8813,7 +8804,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; - sha512 = "24rfa56w9i13nr9hfwm8rnvnsji46alvzzm0m62ahpw6grjpvd4108vbar6i26cgr5vjj04rchzgkgwp4mynwsjcajm7rrxk05k9r6v"; + sha512 = "2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ=="; }; }; "regexpu-core-4.7.0" = { @@ -8822,34 +8813,34 @@ let version = "4.7.0"; src = fetchurl { url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz"; - sha512 = "1hpk2aqc7j93nmm07zq652k0cf1yhhwzj7mzxyqygcz5dxcr9kz5qci1izykg1j5gwzh7qa523jryqg4iqsvryqx9rsp7y835fhl3jd"; + sha512 = "TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ=="; }; }; - "registry-auth-token-3.4.0" = { + "registry-auth-token-4.1.1" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "3.4.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz"; - sha512 = "3w8zjx5s044i7wr9bqqgjfkjawg0cajc9j9gmzkqs0i420algjvkd5k27j9pvhx1yq7nvdchsl96zcyjf64n14765q0f18y1wbkmcz0"; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.1.1.tgz"; + sha512 = "9bKS7nTl9+/A1s7tnPeGrUpRcVY+LUh7bfFgzpndALdPfXQBfQV77rQVtqgUV3ti4vc/Ik81Ex8UJDWDQ12zQA=="; }; }; - "registry-url-3.1.0" = { + "registry-url-5.1.0" = { name = "registry-url"; packageName = "registry-url"; - version = "3.1.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; - sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + url = "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz"; + sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; }; }; - "regjsgen-0.5.1" = { + "regjsgen-0.5.2" = { name = "regjsgen"; packageName = "regjsgen"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz"; - sha512 = "35ax8xcn4cw0g7c2295pqza2wg3mmym2dxii4rnlsfgb5ppdr5zxg74wr4hg3cxyhr8qbfirl4rv9968bw4rxrlnwwdrcy3k0cp7b76"; + url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz"; + sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; }; }; "regjsparser-0.6.4" = { @@ -8858,7 +8849,7 @@ let version = "0.6.4"; src = fetchurl { url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz"; - sha512 = "0ksbypdbmkzwvi33jcx15lh2h1x3zxl311702paqw4fkjc682zbkqjsh970jd0z9q9la8454p5hd6li40pahl7lygj0f3jgyzpvr0zb"; + sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw=="; }; }; "relateurl-0.2.7" = { @@ -8885,7 +8876,7 @@ let version = "2.0.3"; src = fetchurl { url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz"; - sha512 = "0cg3aidnv7kgvxnn1a17s6mzzvvjgr9vsqsdiaim8cz89w8vvjin44668r3xgvbp7zdplcifn5w118bzl3p5rr9q3116r64kr18ph6g"; + sha512 = "z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA=="; }; }; "repeat-element-1.1.3" = { @@ -8894,7 +8885,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz"; - sha512 = "3dbpfrs4yh7dd9572m6dc8cxcgqacnvd24xm9licnw1hygqv51a18a84gm04sjssajbm437rq01raggrzmnzk4jnmbnxrnmk78sl4ba"; + sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; }; }; "repeat-string-1.6.1" = { @@ -8912,7 +8903,7 @@ let version = "2.88.0"; src = fetchurl { url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; - sha512 = "2339w6v6d7n7pj0085vkfvk0864gs8kfh1kghbl3smj7s21ny3k265in140frsaipc6bvqbi4k696ic4z13d6a56dfvc653p15822il"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; "request-2.88.2" = { @@ -8921,7 +8912,7 @@ let version = "2.88.2"; src = fetchurl { url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; - sha512 = "23hm71jcxrwvp33azx8mx3w6dg21fr4w6lwvkvxyf6ckvhk3hz9dk8lzgkbiyzfl9ylhp4n807xp88ppq4gj5h07cmrgxf6nwxfvjrj"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; "request-promise-4.2.5" = { @@ -8930,7 +8921,7 @@ let version = "4.2.5"; src = fetchurl { url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.5.tgz"; - sha512 = "0748za8mwvj5605cgqxn24sydig74m341wi9x04dar6xid0jmlwdjy0k4haf838p05w1jf79a4r7p4y59n2i7yfmflxj5d45jjdw2b6"; + sha512 = "ZgnepCykFdmpq86fKGwqntyTiUrHycALuGggpyCZwMvGaZWgxW6yagT0FHkgo5LzYvOaCNvxYwWYIjevSH1EDg=="; }; }; "request-promise-core-1.1.3" = { @@ -8939,7 +8930,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz"; - sha512 = "00riv5nw32j70g67b1ll1h599bvdbnkgasnwl1m26pfdgdmgr6zaq500mprx5n77yrnhza27vs3c9icb4z5h6wnwmlha6f81bw3d2s0"; + sha512 = "QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ=="; }; }; "require-directory-2.1.1" = { @@ -8951,15 +8942,6 @@ let sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; }; - "require-from-string-1.2.1" = { - name = "require-from-string"; - packageName = "require-from-string"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz"; - sha1 = "529c9ccef27380adfec9a2f965b649bbee636418"; - }; - }; "require-main-filename-1.0.1" = { name = "require-main-filename"; packageName = "require-main-filename"; @@ -8975,7 +8957,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; - sha512 = "2d0gd2x49nz3hgfwms6326sjw5fx7gqf997dnggc7l084cibgang6wr6ryksky32fvdz1bq72xm73kfxd3lj2qnfyjsp57jq287k8rl"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; "requires-port-1.0.0" = { @@ -8987,13 +8969,13 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; - "resolve-1.15.1" = { + "resolve-1.17.0" = { name = "resolve"; packageName = "resolve"; - version = "1.15.1"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; - sha512 = "3pr5zjp8nh6qfllxnpqx531srx1igzdm28j4zg1y53yzc8qxp16yx01pw8cp7y4frla90gnpv622d6bi6aayi03iqlkb8gdjklji2pk"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; + sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; }; "resolve-cwd-2.0.0" = { @@ -9047,7 +9029,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz"; - sha512 = "05s3yp7f127kahmmajjyy5fbgvpz4b1d2dfhbv0ifp2b7yw6f1xj2f3vvw7ni08dlhfm37s6hmqp9v8w3xzml8fcxnda1skf6xkqzn4"; + sha512 = "xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw=="; }; }; "restore-cursor-2.0.0" = { @@ -9065,7 +9047,7 @@ let version = "0.1.15"; src = fetchurl { url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; - sha512 = "2d7igpgyzdlpx2ni0sql8gsnqk9qivfsw6bn1aklm19kbhgxjzmlazz8szfsbdpjka4gk6i3zf0jqa0llaf7dni636fnbwfmyjmhfad"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; "retry-0.12.0" = { @@ -9083,7 +9065,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; - sha512 = "37z410bxpvfjlxmd0rfrzmvd4dl33kqqgi51xp8hbbxxwzdddy5q1b20x9msvqhxvhj93w85fr2hlizsi7rfx91j3gcyzdpqvrwgnak"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; }; }; "revalidator-0.1.8" = { @@ -9119,7 +9101,7 @@ let version = "2.6.3"; src = fetchurl { url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"; - sha512 = "242p51rnhbah4ip4k2bqgnn5kx5v7byi6rd7jphxh7g92y8wh523zmqdr3jzyzr156p98kx7igb3mhh3l3fmf1iga06l0zcjmdrw2lv"; + sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; }; }; "rimraf-2.7.1" = { @@ -9128,7 +9110,7 @@ let version = "2.7.1"; src = fetchurl { url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; - sha512 = "3ixwnv4h7x38jd12vyzhx6m6adnfhz1zv881allalyqs8sy3q3zgwldngk4cqslnn2d46l0g91yz8wprmzcsvas9573vp8al9ldns5r"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; }; "ripemd160-2.0.2" = { @@ -9137,25 +9119,16 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"; - sha512 = "0hbd4cqbkycj691cj7gm40x3x5w46xk56xkg6n11wskc3k4xbdz1xxxyy6r27rcwipkzp19y1fmpfmb4lgf10l8asn6prdn11m24bla"; + sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; }; }; - "rsvp-4.8.5" = { - name = "rsvp"; - packageName = "rsvp"; - version = "4.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz"; - sha512 = "2wdl1qh3bdrji9q0whkrhj7gzryfipskamagkg5dq54phmg5c7ifp8va0b8saxs4xmi6c5mlvkh6gbk6r4nqrld4v8ykx5f0ja0xwwx"; - }; - }; - "run-async-2.4.0" = { + "run-async-2.4.1" = { name = "run-async"; packageName = "run-async"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz"; - sha512 = "2k7xr99g0l8qvqzd66mpwp3wylfay2i27dh5ca3bmr92l5yixlk0dh53z9ljvyrm3mi7jz89il8gq55sgdv8d8p0v96wbkvyy3xp564"; + url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"; + sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; "run-parallel-1.1.9" = { @@ -9164,7 +9137,7 @@ let version = "1.1.9"; src = fetchurl { url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"; - sha512 = "3sl2kbxcwy92faw7zm0z4vql32622mag0bh6dv4bjk7cvc8a9sarvdclr9508hknhl0b7v8kzqvg3klvvff7psmvkfg9hy32i4sfjhc"; + sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="; }; }; "run-queue-1.0.3" = { @@ -9182,7 +9155,7 @@ let version = "6.5.5"; src = fetchurl { url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz"; - sha512 = "0csbv2i7lf85kcn3x59ry96c41zx735f8mmaqzid9vp7xz072bxma44arky971djavsjqkdgss4igp4ljwhbgx81psdg198b3xhix2r"; + sha512 = "WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ=="; }; }; "safe-buffer-5.1.1" = { @@ -9191,7 +9164,7 @@ let version = "5.1.1"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh"; + sha512 = "kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="; }; }; "safe-buffer-5.1.2" = { @@ -9200,16 +9173,16 @@ let version = "5.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; - "safe-buffer-5.2.0" = { + "safe-buffer-5.2.1" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha512 = "1pb164cfv1ip3s1rp008433rak88mdcch24q84cbfndg0dzky2ij8vjvsiyx2qf3rg4dgs82zk7vnrd9hkqqdcvp4lbk5ymcr8314bx"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; "safe-regex-1.1.0" = { @@ -9236,16 +9209,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1"; - }; - }; - "sane-4.1.0" = { - name = "sane"; - packageName = "sane"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz"; - sha512 = "1jdy0h2kdi5d2lnxafnbxnqssf306v0pffvw10jspi9v899n7rxknzs78k7nnrgy1mgyfragq91y4ci7z7xksbp92xw6py80h1g65l6"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; "sax-1.2.4" = { @@ -9254,7 +9218,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; }; "schema-utils-0.4.7" = { @@ -9263,7 +9227,7 @@ let version = "0.4.7"; src = fetchurl { url = "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz"; - sha512 = "2fx9w14jysc2biw8niqw9cjrw8y73qnrlx5p4l3ksw1k4j3jsnm4lbkkqlckyij6d8fhjl69hzv64cyzwnwlgdm3ny65h1gmi9v1y5z"; + sha512 = "v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ=="; }; }; "schema-utils-1.0.0" = { @@ -9272,16 +9236,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz"; - sha512 = "3kgnvyq6cxrlx9xwba75z4wp364mf4y4d66d92zwhjdw8nqg5jxzp1bfl6n5srl0aircw32nmry28a4476cpb3ijqzz78hars4wqvlb"; + sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; }; }; - "schema-utils-2.6.5" = { + "schema-utils-2.7.0" = { name = "schema-utils"; packageName = "schema-utils"; - version = "2.6.5"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz"; - sha512 = "14vmb36crpgskhlwsh3ip0vss6pq08pa5lajyvxa968a61nj2qjva4ww0grfhd3ygzxanwb8v31n1grfd6gs8qz3vav8hp2mk0fx9g4"; + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz"; + sha512 = "0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A=="; }; }; "select-hose-2.0.0" = { @@ -9299,7 +9263,7 @@ let version = "1.10.7"; src = fetchurl { url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz"; - sha512 = "165gijv79k6g333d52fwfnna4z0myalk0cywvf9b6pysjfwlib4cvldycwx6yiiy099v9s0yhgvhq1sn21dqy7r85kq4n6y5h2g1kgh"; + sha512 = "8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA=="; }; }; "semver-5.7.1" = { @@ -9308,7 +9272,7 @@ let version = "5.7.1"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; "semver-6.3.0" = { @@ -9317,16 +9281,25 @@ let version = "6.3.0"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; - sha512 = "17wg4dv63jhss5hwqd135zz67r5c30b7a1xz33kfa7knxr0wfypyb8mj2xmc3l71qkxrz569n89xwp5d77m7adn0sr5wzfjlh2m6zvg"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.1.3" = { + "semver-7.0.0" = { name = "semver"; packageName = "semver"; - version = "7.1.3"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz"; - sha512 = "32cdpngjcravgf06jc8ny0d3qq8q5a9llmlxvnafjlgqxj6g5l088cx2w27c94rahds21zph8in4b67c5yxk6n2js0j1xc0z36k8hvs"; + url = "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"; + sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; + }; + }; + "semver-7.3.2" = { + name = "semver"; + packageName = "semver"; + version = "7.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz"; + sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; }; }; "semver-regex-1.0.0" = { @@ -9353,7 +9326,7 @@ let version = "0.16.2"; src = fetchurl { url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz"; - sha512 = "1kh8iy2h9x6mqbb0kssb4d966irri0z8g2151jwx47q32dbmds01j9fs2c8hln68dqqh0ims8p450z3xfw6vs8v2k253c1cyla1ibhk"; + sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw=="; }; }; "send-0.17.1" = { @@ -9362,7 +9335,7 @@ let version = "0.17.1"; src = fetchurl { url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; - sha512 = "016qgvxg1si6vn34p7piyc8mhvmav1zscm294wkcjf221y1l9zk5kwk5z6yn1ixspj12df25bpazb2h3fdclcf59xqc2h4w46r4mi86"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; "serialize-javascript-1.9.1" = { @@ -9371,7 +9344,7 @@ let version = "1.9.1"; src = fetchurl { url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz"; - sha512 = "3a0kvzr1rq0l6v4l587sv58i0xgajs9863srkhxxlzq3dk5mj8r5sag4yyxfidzsbwcbygbg7wdm2nja97kg5n4y9plxsl9hpkzymni"; + sha512 = "0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A=="; }; }; "serialize-javascript-2.1.2" = { @@ -9380,7 +9353,16 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; - sha512 = "26vhlfjji0jk84cvbcpna4h1nfvdwj19g7rjmvz9mzlm277cpgz7xw9q61yrp3x4amas66fxrz0p2rrndv737j4imw4a5ql0614xkxf"; + sha512 = "rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ=="; + }; + }; + "serialize-javascript-3.1.0" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz"; + sha512 = "JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg=="; }; }; "serve-index-1.9.1" = { @@ -9398,7 +9380,7 @@ let version = "1.13.2"; src = fetchurl { url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"; - sha512 = "2gkkd7jlmrn2a8d736x3fcij9jj16aglbq6pcivb897g01k1dlrpvb565d3hq9zwafyr60zlcqr5flgd2yqs36s8wxpylxqnck5vyx7"; + sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw=="; }; }; "serve-static-1.14.1" = { @@ -9407,7 +9389,7 @@ let version = "1.14.1"; src = fetchurl { url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; - sha512 = "0551vv6s1vgk5krzdn9cwnybsv6g4cyqpkk1dlkyv1pd8n7m8r7pi12r16bw12dzwl6ghj4qwizjsxc8vl26lv9c61fkq9r059yzji4"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; "set-blocking-2.0.0" = { @@ -9425,7 +9407,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz"; - sha512 = "15idn47lw67wfq0qfva85xnphqxkzz5apix6gwcnylmqw4ch7bqhq4vzdh53f327agpcg6pdzkbj8m72wm887wd8lqaydw20zbxq497"; + sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; }; }; "setimmediate-1.0.5" = { @@ -9452,7 +9434,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha512 = "2jlhhawfqdiga1m6if01ks1q3yx56k5vj6wf372589vkswvdflw7224viivxali56b0jjsckpmjy10rj6fcakhw2dbq2psr197kzw86"; + sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; }; }; "setprototypeof-1.1.1" = { @@ -9461,7 +9443,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha512 = "01qxzb0a6jrcxa6qh776v04ihqrmcy3qfbp9drfsjhfcsmaqd21mppr3ndj970ixfh6bpm8ai45jyqyzjfjw26pcyd82y6pyrcl1xr6"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; "sha.js-2.4.11" = { @@ -9470,7 +9452,7 @@ let version = "2.4.11"; src = fetchurl { url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; - sha512 = "2lihh3p2mrwymrly93ni37b1dvzwbm1jc47iqp66ax4bj41js4mr94wghv3c2agq98bb44nxxddn2n67ab978zk00xx2znw3vj2kha0"; + sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; }; }; "shebang-command-1.2.0" = { @@ -9488,7 +9470,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; - sha512 = "066cirpvgdn5ywf1lpad9wrzkbk19mdwm662mk09mhlsw16rigayybrp18jna89zbqw06v43nnpbxjzxcx0wsnxmikdfqk96vdnnz4h"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; }; }; "shebang-regex-1.0.0" = { @@ -9506,7 +9488,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha512 = "3a1nivszhfclgwknyblqnd1nis1i1g3v571pbrhrf2dhpdbnkliswcw10s9k883cnxk01xd2z26x0s7qg0annp0vvwpvisw3cb9vvzg"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; "shell-quote-1.6.1" = { @@ -9524,7 +9506,7 @@ let version = "3.0.3"; src = fetchurl { url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; - sha512 = "26893dbicabdw7f4klf18aiw4r88b8ndc9rchbpsaxb3ibvkk37gkffghac7g62clqkhk7szyfwnfxcsfs23wcjq6qm6lxwa3s7hhjm"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; }; }; "simple-swizzle-0.2.2" = { @@ -9551,7 +9533,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz"; - sha512 = "3sbrc1b1qf9m7lhlljmnc51k9bl7jbc9zfmdc4z55iafsck65d9ll77bifknvgvgbc0f0a7cvm1b785ab5d1avm27lm7kvnd3fs30k5"; + sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="; }; }; "slash-3.0.0" = { @@ -9560,7 +9542,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; - sha512 = "3cj4cvlh36f0h6f3dslbkwa3y9nnny8qmwbf4kw3xy8vfbg5mypknds3j2cdhf7xg82hm8smdl8cq88xn4nyw1b9677xjwvly2kbm43"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; }; "slice-ansi-2.1.0" = { @@ -9569,7 +9551,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"; - sha512 = "2hri697iq2zbwfqga7889i00ry55xb9zj48wf292qn7wk0dyl2ymd1bjph6a79glqyhj4lajd4fyhmxmqdhnpxd55fvjq1hf45rbvs2"; + sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; }; }; "snapdragon-0.8.2" = { @@ -9578,7 +9560,7 @@ let version = "0.8.2"; src = fetchurl { url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; - sha512 = "2b0sap2q0c6qbfkw6znql845b143frn5gkkz4gpirjhgwa2j3wy3jsvrfg51s5c1w1m4nkgis97x9yvmzsc533kap9j3h3zcffqxp0n"; + sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; }; }; "snapdragon-node-2.1.1" = { @@ -9587,7 +9569,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; - sha512 = "2gk18pdld8ij1bpa2mdwl8f7i4rl5d4ys3qw31hipj56wslnsfhp1vxp3q36kj1m4f34wzzlvj0282qx5xlflqf978xyqlc2viyaviv"; + sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; }; }; "snapdragon-util-3.0.1" = { @@ -9596,16 +9578,16 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; - sha512 = "1jsaqma4ycl2iq0761i1w7758z1kq7gbsij4xfb7p5cnw0qa62pszv6pr3j856n3pbxww7wwxs5wvcg2cb6vy020kw3bchashqs9clr"; + sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; }; }; - "sockjs-0.3.19" = { + "sockjs-0.3.20" = { name = "sockjs"; packageName = "sockjs"; - version = "0.3.19"; + version = "0.3.20"; src = fetchurl { - url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz"; - sha512 = "0pn77r3rgi2blxla6ilhf4madx8n0cprzb295mw5knx2hyhiwn60z8n8n8clsb1l0wddcrjj5x4rn24ydf2wnxbrn63xwb5lsa293sp"; + url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz"; + sha512 = "SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA=="; }; }; "sockjs-client-1.1.5" = { @@ -9623,16 +9605,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz"; - sha512 = "3pa683q7x6az2iwmd2bh0d2zwdkgklkfi4vpkwnxw4b49mgfdjkal83i9lzxlz6f6sqybyvb0mlyw0mmg9mdd76fawvi7izxz48ndp7"; - }; - }; - "sort-keys-2.0.0" = { - name = "sort-keys"; - packageName = "sort-keys"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; - sha1 = "658535584861ec97d730d6cf41822e1f56684128"; + sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; }; }; "source-list-map-2.0.1" = { @@ -9641,7 +9614,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"; - sha512 = "0izwdwncwz4s14qn5ahkb2mpcdpxq2arn5185dlhljns4nylsw2xfm425zi115ik4kz1vfa97qyix3vf3i149dyi1ndq61iaf0knx5a"; + sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="; }; }; "source-map-0.5.7" = { @@ -9659,7 +9632,16 @@ let version = "0.6.1"; src = fetchurl { url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; + "source-map-0.7.3" = { + name = "source-map"; + packageName = "source-map"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"; + sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; }; }; "source-map-resolve-0.5.3" = { @@ -9668,16 +9650,16 @@ let version = "0.5.3"; src = fetchurl { url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; - sha512 = "2gq1flmkac2lzw8rs6vpch0sanmv8r9gv6bggwkgxzj3n7gw33lbqzk7nk9vvsckdjjkm132jzbl3nxc69cf9bb7xz4wnhpgd3gxp0y"; + sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; - "source-map-support-0.5.16" = { + "source-map-support-0.5.19" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.16"; + version = "0.5.19"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz"; - sha512 = "1ayqxcigra517ylxbrvri7jlw55cv0m6a8j9j6060c5xsh519ip69jjp4jk6bqcj5ra5y318k6la6lfhpsj0k8hhkyw1szbj128pz3r"; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; }; "source-map-url-0.4.0" = { @@ -9689,31 +9671,31 @@ let sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; }; }; - "spdx-correct-3.1.0" = { + "spdx-correct-3.1.1" = { name = "spdx-correct"; packageName = "spdx-correct"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; - sha512 = "3qslnh3c2x2g8lar94rladm2rz692d5ds1bp1cpl223jf67jnazl9ipy4n17n7vqvgwimij36gz740nfqr5pyxq8x6n02rd4xj89gcn"; + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; }; }; - "spdx-exceptions-2.2.0" = { + "spdx-exceptions-2.3.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha512 = "12c442riig2hk7014ahh40chwirmmsl9dr4cnm2dr2bdbv1lnal8xxwsfx403pqkx7ib06gm2hyyd98kn30kxanjm92yai5y44h0x6r"; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; }; }; - "spdx-expression-parse-3.0.0" = { + "spdx-expression-parse-3.0.1" = { name = "spdx-expression-parse"; packageName = "spdx-expression-parse"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; - sha512 = "351djgqvsgqmfg6h764c2k09dmixczw5073jirm8km6i1yym4xjrzc7g5ckwkidi3gls7s910m4ahl8sh37dsb478j8j3sigbfq63k2"; + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; "spdx-license-ids-3.0.5" = { @@ -9722,7 +9704,7 @@ let version = "3.0.5"; src = fetchurl { url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha512 = "3sk6sk6r05ikn5qslbh04h54mv4a34wn4d76s800h94padnjydfvvq73ij6jh81yrigspyr50ay878jjwpj2mcq38br371jkb6mdq97"; + sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; }; }; "spdy-4.0.2" = { @@ -9731,7 +9713,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz"; - sha512 = "2h06dvjrd0vv66jpc6cnrkvbvihcfvr325dkpbif6kxnvn8zvgpvgj748whffn0sc0lk87yd8l8k6k595fvwbc2ysjy4msh0rjs13mg"; + sha512 = "r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA=="; }; }; "spdy-transport-3.0.0" = { @@ -9740,7 +9722,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"; - sha512 = "1rha3zyhardm434kr4h4y44wxpd49hqzzxqk1d9lqg91bkzfbp6qkh9nahdkkmpgbkc5021x8c8cy1aqnaph5ib1a9hx32j9qadbhl6"; + sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="; }; }; "split-1.0.1" = { @@ -9749,7 +9731,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/split/-/split-1.0.1.tgz"; - sha512 = "2916kdi862ik0dlvr2wf2kvzmw8i8wk5spbr9wpdcksrkhrl3m0082jj1q4mqzvv50mlah5s4vcy6k18nacbj09kxbzp2pbysh8wg4r"; + sha512 = "mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg=="; }; }; "split-string-3.1.0" = { @@ -9758,7 +9740,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; - sha512 = "25ih1dx2qb3lawqjxj85znd4l3x8nnigrcdlpfw8064gh2mwxic9bgg5ylgxm9gjl3v8dmyc47rycp8xvqz78jqalg0g9yqj225acrp"; + sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; }; }; "sprintf-js-1.0.3" = { @@ -9776,7 +9758,7 @@ let version = "1.16.1"; src = fetchurl { url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; - sha512 = "0i4jnrxh6i17qij2vfki7qxmk435cnacvg363qg0hya5incfj57akgbas8zcx2cl5pds9jfgfyhqm8wlqz6damsg059gymv99aylx8x"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; "ssri-5.3.0" = { @@ -9785,7 +9767,7 @@ let version = "5.3.0"; src = fetchurl { url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz"; - sha512 = "00qc3iqsi21cc2az3nz36q88psab4ickpzranndk6vmrb6yhn5xsq3kgp21x3lp0406bdaalpb59xy7zzqnl40ans69v3z2l8z8h52x"; + sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ=="; }; }; "ssri-6.0.1" = { @@ -9794,7 +9776,7 @@ let version = "6.0.1"; src = fetchurl { url = "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz"; - sha512 = "107yg08ib4232ppannc6fw8ml8p1fssnvcf88cpq3s5ybq3r5ppxnmc32rp40i0ppbgxcw9q04d5rc90if0q3xyp953swad93biws6x"; + sha512 = "3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA=="; }; }; "stable-0.1.8" = { @@ -9803,7 +9785,7 @@ let version = "0.1.8"; src = fetchurl { url = "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"; - sha512 = "3mw0cg71gcp6hfg3x0snaxcva4yqnifs11vbs3ba4agmcz8njmz70ndk5d8z97441jdvjhvb8aq8r44ngd8z4iw5hpgfmff372nlbwf"; + sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; }; }; "stack-trace-0.0.10" = { @@ -9830,7 +9812,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz"; - sha512 = "1xxwqpj713rq1idbmp7mj7cj9dl52lazgpd5x8a9g88jawbkn9xpwbgljl7cvnd0jqkll2zpdj5xy63dlis9l2k8vmx1n1gvyv8456f"; + sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="; }; }; "statuses-1.5.0" = { @@ -9857,7 +9839,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz"; - sha512 = "2mfvadpwj9mzxps4arl1frxlkz96hfp0sc5pvq76s0ijf8fgw26mm3a721zq3iz1f8155w3a41wkixbdlwn1cavv0mzics796da2zlx"; + sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="; }; }; "stream-each-1.2.3" = { @@ -9866,7 +9848,7 @@ let version = "1.2.3"; src = fetchurl { url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz"; - sha512 = "0pxki70s41jg18b738qvcwxlcakp6658ksicxkcgg8wp9q97fwp3mv13c5k38k47vxkyyk951k7gzavs3r7b93ackdyznh8zzch4lxy"; + sha512 = "vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw=="; }; }; "stream-http-2.8.3" = { @@ -9875,7 +9857,7 @@ let version = "2.8.3"; src = fetchurl { url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz"; - sha512 = "19y2xbs1xzzpjwfdczl21d0d76ahd7013cr3mhfa6a8nbwwv9jpncng8idf0g8hnmnq2mcl3xh912rjlasl06wsz44qw3j7hdya8d7r"; + sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="; }; }; "stream-shift-1.0.1" = { @@ -9884,25 +9866,16 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"; - sha512 = "1ai59bc5x8d6a1c37fp2d2gi6q7x6fhza2jsf1sblrdvbza8j14a4xnp20lg65b8lzm0s95m3pqizblbj6ks44qf73gdllhbahaqa02"; + sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; }; }; - "strict-uri-encode-1.1.0" = { - name = "strict-uri-encode"; - packageName = "strict-uri-encode"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; - sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; - }; - }; - "string-replace-loader-2.2.0" = { + "string-replace-loader-2.3.0" = { name = "string-replace-loader"; packageName = "string-replace-loader"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/string-replace-loader/-/string-replace-loader-2.2.0.tgz"; - sha512 = "134pqnxfq8nmn7k4q06xwvd01cw8009gzr8nlmh071l1qcnvf1cg2km2r3z3rx5ahdw0mvjpls45wlwn3wdzb8v0nfmbi9y5xj7hjsj"; + url = "https://registry.npmjs.org/string-replace-loader/-/string-replace-loader-2.3.0.tgz"; + sha512 = "HYBIHStViMKLZC/Lehxy42OuwsBaPzX/LjcF5mkJlE2SnHXmW6SW6eiHABTXnY8ZCm/REbdJ8qnA0ptmIzN0Ng=="; }; }; "string-width-1.0.2" = { @@ -9920,7 +9893,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "29s1fqgr4mnhfxwczgdghfmmc1f792m9hysvcjxw2h5lfj8ndf2b6gm02m96qk5m75g4aisijvng4pk618anwbr8i9ay2jyszkqgslw"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; }; "string-width-3.1.0" = { @@ -9929,7 +9902,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; - sha512 = "3bix3jva53vcp1im3aa1y2v1lywkm7ix81gkwkj4915s2675pmw1c9n5x98q1m985hzgwkk1fnc2q78qz7s0fixhf994md3lazxr9xx"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; "string-width-4.2.0" = { @@ -9938,43 +9911,25 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz"; - sha512 = "1xbbkr5nbg13x7hdllv0fd9a9b15b6ddzi41aswxpil3rd3yvjclpyk12p7wman4s8dqrvavgfmamdq764c089k1rpap0md7wjgjk6d"; + sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; - "string.prototype.trimend-1.0.0" = { + "string.prototype.trimend-1.0.1" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz"; - sha512 = "181zx0q2zkix0hnlhji6z79wdzp5vzp992c1bv2h0gxmcmmyxy19xj184fjvljlncnic3mhv95vn559s8iwcljfhg4dgi5zlqd6fhhh"; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; }; }; - "string.prototype.trimleft-2.1.2" = { - name = "string.prototype.trimleft"; - packageName = "string.prototype.trimleft"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; - sha512 = "15qfz59cpsj9svgvcs24q6h47jfy5zfhg7dy3b8ik3nvf97vhvijy8d51vrprx4z0vfyscg7i2xv9qs960h1pvnmzm1n95m6svk8840"; - }; - }; - "string.prototype.trimright-2.1.2" = { - name = "string.prototype.trimright"; - packageName = "string.prototype.trimright"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; - sha512 = "0b5kvxgqr55r745bccsjz35w9galqf42rm3lf5f4p2i21c4yq5l0fz0s03z4gq1d7yi52i3x6n8fa1n3fhlplc8d49vlaipqvp51m34"; - }; - }; - "string.prototype.trimstart-1.0.0" = { + "string.prototype.trimstart-1.0.1" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz"; - sha512 = "3ir4q4zbjch2mkkxdn1xq5xb939s03n958b47bs6gkkds4dhljw6w4529vml982kdrf0iiyib54nrnxviaipw790ji8h5ad9n1zq8w8"; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; }; }; "string_decoder-0.10.31" = { @@ -9992,7 +9947,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; "stringify-object-3.3.0" = { @@ -10001,7 +9956,7 @@ let version = "3.3.0"; src = fetchurl { url = "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"; - sha512 = "2pk4j3smpmlm6jkpqqaqwh2jks1hmg5rfk9kqd9msxm5dh5zlf5c2j0m2khy8iajf65f9zr13zy03yi10pj1jv3yn8a15jy3lba4ymc"; + sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw=="; }; }; "strip-ansi-3.0.1" = { @@ -10028,7 +9983,7 @@ let version = "5.2.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha512 = "1cf4mpsr46nik5xxyb9wc4cz6c4yymi2ijpfx1nghnkl39l8pgq1sc7q19jzrjkwpn9i7hwg4q3rs4ny3vssrc6506an1lv0bb6rr0f"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; "strip-ansi-6.0.0" = { @@ -10037,7 +9992,7 @@ let version = "6.0.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha512 = "3mjvs0jv5m5npyr79f0br9kc7nr52ghv6p8gnkmm25adgr0psxalfzlanvzbnqfn87jf6vspvbx2r30px94fnyb446xch6zni7cmsq2"; + sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; }; }; "strip-bom-2.0.0" = { @@ -10055,7 +10010,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/strip-comments/-/strip-comments-1.0.2.tgz"; - sha512 = "0bln256gbzpmrbc1hg4pwkfh9vwncdzgdr6h3bhkmilz5syb1rlsk9rvc6kjqbh6rfhvqv7jwdnppsfdnpdg58444r1mviqaxm7pgwh"; + sha512 = "kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw=="; }; }; "strip-eof-1.0.0" = { @@ -10073,7 +10028,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; - sha512 = "264panbfx7nxdqgcsb6x1gk226kifd6zpksjmdbjp2xsjirbr91gkcj51ssy2j225n8vd1rjj6wlf4vdqaxyrdrmcpxgp84s1y6zfh6"; + sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; }; }; "strip-json-comments-2.0.1" = { @@ -10085,13 +10040,13 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "style-loader-0.21.0" = { + "style-loader-0.23.1" = { name = "style-loader"; packageName = "style-loader"; - version = "0.21.0"; + version = "0.23.1"; src = fetchurl { - url = "https://registry.npmjs.org/style-loader/-/style-loader-0.21.0.tgz"; - sha512 = "33b6cg091mx8mgafvf8d1815mc55w3rqk0527z2l536z5ipprjwkdpm62qyi71snx625y2kqpr6nqfvvmdv7jn30qz8ip950yq0vrag"; + url = "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz"; + sha512 = "XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg=="; }; }; "stylehacks-4.0.3" = { @@ -10100,7 +10055,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz"; - sha512 = "3zfkv97pqkc0k51zsjb6dbyhs1lnf05c4vik7klpyzv7chdqqc49038hlm4rpskfy4nhmpjaib22qqzkfwzx6lfw5c4k53hsa9lnsgc"; + sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; "sums-0.2.4" = { @@ -10127,7 +10082,7 @@ let version = "5.5.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "2ihqi2z38fr1sq2jvwqgjqymncmkhxqz0x3bi97w4b4fn24wsdy71j139p95sb3nfrh3a449n0sqhm1z0jsi04860y8vdy8sp0n6da2"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; "supports-color-6.1.0" = { @@ -10136,7 +10091,7 @@ let version = "6.1.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz"; - sha512 = "30pwyjmww4d54bf2m6lpw20ly4blhb88sy3gn6qcjih2rfq1s5zsl1nszzwgj2j1gqn3c8mw52df0z26rqyk8flzimb70scdmz67vd9"; + sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; }; }; "supports-color-7.1.0" = { @@ -10145,7 +10100,7 @@ let version = "7.1.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz"; - sha512 = "3k12babask2rk5v9n9wdgng00rqac2w5wwvkawlx3brjpqvfpy4j70650ggw5pa7bm5hnn1ppsppsqrcwrvjsk1mxb3vi993yjqh551"; + sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; }; }; "svgo-1.3.2" = { @@ -10154,7 +10109,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz"; - sha512 = "1biic6k5zbjbibabxnqg6cs0hz8vb69zb4kjgwh6nwxqigx23m7gaggva58cpqp7z2a403q9n1sqlfm6yx660nz1dj90iri0sqvy76a"; + sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; }; }; "table-5.4.6" = { @@ -10163,7 +10118,7 @@ let version = "5.4.6"; src = fetchurl { url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz"; - sha512 = "19b85vbk5rflp8b200akryyzrk92yj7v2pk64mmvy3y00x7ibfcbiqwmba2q14h9rvfsj9bxvmvyfxma4hswy8bw8dpm3hzdvr1qqf2"; + sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; }; "tapable-1.1.3" = { @@ -10172,7 +10127,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz"; - sha512 = "283f6rp3hhj0lvi5smcvh4mq56mifjchgv6qlnr4qb1xs2fsyb2vy71b308h1285nngcz8q7cbmjp8qqzh0im71mx5wr3v6hrnvyqp1"; + sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; }; }; "tar-4.4.13" = { @@ -10181,7 +10136,7 @@ let version = "4.4.13"; src = fetchurl { url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; - sha512 = "10gwhmgx7fh619zv48r2lnm42qr7rw4qa9ph7142rizcn8in9dpi49jbmmv8ism60rcg1a7b4103r598jngi1rcn50sw7b8n1570rf3"; + sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; }; }; "temp-0.9.0" = { @@ -10190,7 +10145,7 @@ let version = "0.9.0"; src = fetchurl { url = "https://registry.npmjs.org/temp/-/temp-0.9.0.tgz"; - sha512 = "36zr3d39z8wdb7v4z9inkii3cd1qsc49bf8z2s4ic671dlf2aab95w9z1lg9fivbvwd9cbpghxvfgiz3l3jb1fzwh2d984900yj3xb1"; + sha512 = "YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ=="; }; }; "temp-0.9.1" = { @@ -10199,25 +10154,25 @@ let version = "0.9.1"; src = fetchurl { url = "https://registry.npmjs.org/temp/-/temp-0.9.1.tgz"; - sha512 = "1w4xzn45b7a3qd9vvwfc80ah8xnbvdw8ng5jfhkdivs7kxc1wyjvlf6zza2wgkf3s7av5izd1bfjazahx3i79cy8zwidmws5f18xjsq"; + sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA=="; }; }; - "terser-4.6.10" = { + "terser-4.8.0" = { name = "terser"; packageName = "terser"; - version = "4.6.10"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.6.10.tgz"; - sha512 = "16fv61l1ffv807q775lmwr3bffdh60399bcz3jgm32n4g607madq6pk3vhv2kfisgz4lvivihpvxbixl5nsmv66hbh53mx88gfpzcd9"; + url = "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz"; + sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-webpack-plugin-1.4.3" = { + "terser-webpack-plugin-1.4.4" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; - sha512 = "2n44cgqgz070skn207m3l6zg3q444p1db54g0j87fcjxwyhmlfvgg3kak5v1ffhg765cdxah1l99kjdcy74mc75nlq7907zbiq5xk20"; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz"; + sha512 = "U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA=="; }; }; "text-table-0.2.0" = { @@ -10253,7 +10208,7 @@ let version = "2.0.5"; src = fetchurl { url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; - sha512 = "14xi6lbly1f37015ny2pzcnf5kaksjmpnhm61gfhwn686w5ac519qb1icxdda974n84f342g0y15kysj1hci2vl40z91aiivyhx2spy"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; "thunky-1.1.0" = { @@ -10262,16 +10217,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"; - sha512 = "2n8ys98dmv1625inb52cdr421ry82ri2sninmss1njzy9hxrlblw3fkvgr3na4d69glygww3g80bj4pgr9ik1zcm10ki0gd2yf3nxkq"; - }; - }; - "timed-out-4.0.1" = { - name = "timed-out"; - packageName = "timed-out"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; - sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; + sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; }; }; "timers-browserify-2.0.11" = { @@ -10280,7 +10226,7 @@ let version = "2.0.11"; src = fetchurl { url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz"; - sha512 = "0lrwqck7qvpvxswx5kmydj9nmn2rwckzzfpdf5mf869fqrs9girj45i80hdv99b81m4g8fgwqx2lqk04k7zars7rldq3r89r3m9aipb"; + sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ=="; }; }; "timsort-0.3.0" = { @@ -10307,7 +10253,7 @@ let version = "0.0.33"; src = fetchurl { url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; - sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d"; + sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; }; }; "tmp-0.1.0" = { @@ -10316,16 +10262,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz"; - sha512 = "0mygbkw1yiz5b0mvdivsmwfaw12w70fjvgd3mn2wny7ggrx69swy5kj11xm3llrv98slhjx9d7pmcd8aa94492r0cfnfv139wmpddi7"; - }; - }; - "tmpl-1.0.4" = { - name = "tmpl"; - packageName = "tmpl"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz"; - sha1 = "23640dd7b42d00433911140820e5cf440e521dd1"; + sha512 = "J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw=="; }; }; "to-arraybuffer-1.0.1" = { @@ -10355,13 +10292,22 @@ let sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; }; }; + "to-readable-stream-1.0.0" = { + name = "to-readable-stream"; + packageName = "to-readable-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; + sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; + }; + }; "to-readable-stream-2.1.0" = { name = "to-readable-stream"; packageName = "to-readable-stream"; version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-2.1.0.tgz"; - sha512 = "3pw9wwllhic73ya7g935mwmw4lrjwxf0vxxngs5iqbwlasxbrv506bas7sqqfmmmf7p9lx0g907ihysaxivv78ln8bj3m5067l1lx53"; + sha512 = "o3Qa6DGg1CEXshSdvWNX2sN4QHqg03SPq7U6jPXRahlQdl5dK8oXjkU/2/sGrnOZKeGV1zLSO8qPwyKklPPE7w=="; }; }; "to-regex-3.0.2" = { @@ -10370,7 +10316,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; - sha512 = "03lcq1y1ks55lss37m3cx52f8f4wj85rqsxfxrhi3y8rqa0iiny6df8ardg2f742z870v7xw749lcsxh8yplsmbvaig4rrds1w6asqm"; + sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; }; }; "to-regex-range-2.1.1" = { @@ -10388,7 +10334,7 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "2qkrna8q80arai14s6f17djc3cgwiilnhibfykwzkif4gs9ny3fmqmxqf56fvc7fjwyr01p97nk1ckd67s8476cslmj3rwp7s5zp4zb"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; }; "toidentifier-1.0.0" = { @@ -10397,7 +10343,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; - sha512 = "1bip1yxcfy4c0yl2kwmj9jyzfg1ixyj564wd1aaf46rabdiasx62yznb8bwn9cki886f353axgca42zma7q9rb4b50lhm1zz7y8g8y9"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; }; }; "touch-3.1.0" = { @@ -10406,7 +10352,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"; - sha512 = "2a3sk3562y1ihbl06r5g1pzs37mwhhnz8f8vvcc0k8bhykczzgv9dyw71kkz4mbf81iq7wbf2nq7hpy6z6zhanj8s9d6bjk5r9pq72q"; + sha512 = "WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA=="; }; }; "tough-cookie-2.4.3" = { @@ -10415,7 +10361,7 @@ let version = "2.4.3"; src = fetchurl { url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha512 = "2akhyixx49dkqadghzwj53xwfa1aikf0iv04ib9zj0kbilkzxxh16j5c6vfkcwm3cy29y46q3d8lzinsy6ql2cvb1wcw31gzs9jp6s3"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; }; }; "tough-cookie-2.5.0" = { @@ -10424,7 +10370,7 @@ let version = "2.5.0"; src = fetchurl { url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha512 = "3xgcny117pqhfncr4gbmagzlnjiqqgq0lrvmljdfcdy64nc0xjfcbf1r08dmp1v1m3s51kq0yxc18nl3j9lbpr5bp5lgmi6719yqlly"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; "traverse-0.3.9" = { @@ -10445,13 +10391,13 @@ let sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1"; }; }; - "tslib-1.11.1" = { + "tslib-1.13.0" = { name = "tslib"; packageName = "tslib"; - version = "1.11.1"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz"; - sha512 = "0c0k843zya7w9k5snfr3g76wz2vyl99q149safl5g364jjwq839h3qf8c17i8mahdcqc3zj3xgfv0nv9pcxfm8axva0d49w4vqvr5b9"; + url = "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz"; + sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; }; }; "tty-browserify-0.0.0" = { @@ -10487,7 +10433,7 @@ let version = "0.10.0"; src = fetchurl { url = "https://registry.npmjs.org/type-fest/-/type-fest-0.10.0.tgz"; - sha512 = "25w8hvjk21iqndawz9h3713dmahzg2w3nf4ipfkgfnlhzk1jdlq2jadyd6lr1sgidbyxbp97mcgci1zw4qd6b0gjvqglz9cis77si8i"; + sha512 = "EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw=="; }; }; "type-is-1.6.18" = { @@ -10496,7 +10442,7 @@ let version = "1.6.18"; src = fetchurl { url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; - sha512 = "3r7402x79nilhdgk4z21yjh5y9vix8lwlll1kzcn8jd2m89vzksdb6wddia77cxv3iwhd6i5hkv6n7diwjbhpy7y03i2kqlvfplli2f"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; "typedarray-0.0.6" = { @@ -10514,7 +10460,7 @@ let version = "3.3.10"; src = fetchurl { url = "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.10.tgz"; - sha512 = "31s7k004qjdb42cavkpgszzvz9zm3aw2iv80k1hrykx202x9wb03451l58fhlba1spjgpdq96w7vm6rvavkcwrxj87aynxkq25czz5c"; + sha512 = "rPzPisCzW68Okj1zNrfa2dR9uEm43SevDmpR6FChoZABFk9dANGnzzBMgHYUXI3609//63fnVkyQ1SQmAMyjww=="; }; }; "uglifyjs-webpack-plugin-1.3.0" = { @@ -10523,7 +10469,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz"; - sha512 = "21rq1kl3wanb1w9jp90w5m1anksk2rffnls8sk324lqwwvhyskh64443jm1ixdl5zjf6717khdp3xm23388yyzz1ximqch03mrciwd2"; + sha512 = "ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw=="; }; }; "ultron-1.0.2" = { @@ -10541,7 +10487,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz"; - sha512 = "0x78hsv3jykmjl6qdqlqiz7v5nf06li8b5yvzpj6grnzwbcjch8ngyg55lm8g8mg4znvk7qbryvrr2dxacz3cvyb1nsm64qsw21g0ah"; + sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="; }; }; "unicode-canonical-property-names-ecmascript-1.0.4" = { @@ -10550,7 +10496,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; - sha512 = "2frn6cxiqmhndpdcmrcd2590rx0b4bhn4pvqag2kgif3pqnw52622lpwd0jzz5a9h9jg03yb96m82zf8vvcfrrni43qlxw7fnfwsflc"; + sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="; }; }; "unicode-match-property-ecmascript-1.0.4" = { @@ -10559,7 +10505,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; - sha512 = "2p78i127lk184hfbwyzd4xy6hrgg5gz8s3raf83pqx59rqk2dg339m7dnbi4pvysf7390jpnz84ds8ylwxdf3vynbnzjkbgbs3ji11g"; + sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="; }; }; "unicode-match-property-value-ecmascript-1.2.0" = { @@ -10568,7 +10514,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; - sha512 = "0hxphkw10m0pz129gv1ngjcj5yaw6qk2zvdbx4yp5410lk15pnb7xs2s0gp469650zk66ydd8xp6kicia258vpx4s9gk88mchf90fy2"; + sha512 = "wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="; }; }; "unicode-property-aliases-ecmascript-1.1.0" = { @@ -10577,7 +10523,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; - sha512 = "112w9mql1a57imkl581n0gx21pycfl0cdh5zsfmwxhmv4ipn7g8icjqlvqjsgi2vhahldq2i69qial99fa8ys4qv98fnng93wzai91y"; + sha512 = "PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="; }; }; "union-value-1.0.1" = { @@ -10586,7 +10532,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz"; - sha512 = "1g7i0bs3sa35zpsrr2l3wsz4j6bqpxgm77kg2fdz89irzw6nrk6j93j61wr134mg9rbf039xa4pp1dw0iqfsv15rkf8jn8y2fdxg5xl"; + sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; }; }; "uniq-1.0.1" = { @@ -10613,7 +10559,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"; - sha512 = "0sp2fs9gsv3l6mc9kdk09z835d54gw04x02dlz9q208mda3f6bmqd4vix4634kv9njvvxcz3iswcj6fwcmszvima7wpv5knia678sjn"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; }; }; "unique-slug-2.0.2" = { @@ -10622,7 +10568,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz"; - sha512 = "3dz3f3rqwqssr86c072j9m8m7l98l20b3i75diqrq5l871d647jmdf7pjjml7l83iqvjnb2frz7h6xbs8rpx3rkvk1h5i6swvsap1ff"; + sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; }; }; "universalify-0.1.2" = { @@ -10631,7 +10577,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; - sha512 = "29d9b6i7rf460m0c5761z6xzzjdl2q81ri19x5qcnvi9l85jp71f7lbr7bdk7sx3k3sqwcp9vfpmlh7srgfnzlmssr5j0lpj0imw4mc"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; "unpipe-1.0.0" = { @@ -10667,7 +10613,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/unzip-stream/-/unzip-stream-0.3.0.tgz"; - sha512 = "3j7r4r1rzgz3kisp8d5jk1sckr8f9jxz4ln29wfkl139a6p1qpr4s6cm9581fscqjwc71fqafd4584myll8z31arz3ps8a6qzy62v9l"; + sha512 = "NG1h/MdGIX3HzyqMjyj1laBCmlPYhcO4xEy7gEqqzGiSLw7XqDQCnY4nYSn5XSaH8mQ6TFkaujrO8d/PIZN85A=="; }; }; "upath-1.2.0" = { @@ -10676,7 +10622,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz"; - sha512 = "230pbhzxv0jr9n43qhghbsdbsp1rwalc3rclaqscwjaazi35s6vzw9p66s3ypk6yn3jgpmqflda2yh8j2rlypz9vihasfw5m6jhd739"; + sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; }; }; "upgrade-1.1.0" = { @@ -10694,7 +10640,7 @@ let version = "4.2.2"; src = fetchurl { url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "2fz60s71ghl56ddfiiaws81xpiidlbjk69jyjmahz190d2advy9zdbcwh5if4rgg5hxdbfxhkwiipjrnjy8w834bxsmzambd2p4b3r9"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; }; }; "urix-0.1.0" = { @@ -10721,7 +10667,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/url-loader/-/url-loader-1.1.2.tgz"; - sha512 = "27fp8dsaysmpx7yh2xnc15wngi1qk2n859q75hqjfxaskswh0hl5qxjz7mkk3hrz4v2lf516zfxw5xqd76lvb66pgm165iwdhmf8wbm"; + sha512 = "dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg=="; }; }; "url-parse-1.4.7" = { @@ -10730,7 +10676,7 @@ let version = "1.4.7"; src = fetchurl { url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz"; - sha512 = "2bdb8rqxq8xd530jx6q8awb1y9idrvd8cfznrlyc1h8j4ra1icxcssfg7qldhssj6dxvibkvx6rnn1ljkjbxi95l58dn1y35ibrlyvp"; + sha512 = "d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg=="; }; }; "url-parse-lax-3.0.0" = { @@ -10757,7 +10703,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; - sha512 = "2hzzynss1cv7kn1lf40hqk16qmbf38g7a28m27pcg05mg6vpf7sj0gy175fdscz534fxdi14622rmq3sdpib9c5ypjympjfg5ai40bk"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; }; "util-0.10.3" = { @@ -10775,7 +10721,7 @@ let version = "0.11.1"; src = fetchurl { url = "https://registry.npmjs.org/util/-/util-0.11.1.tgz"; - sha512 = "0fpzl6qczbzr5jniy99vgfxz1k4gdfl13lwwhlfysj22rm18ikfici89wpgv34v67ckays1d500fgk2dlzw95zncn9jvkdygjr40a0x"; + sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ=="; }; }; "util-deprecate-1.0.2" = { @@ -10793,16 +10739,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; - sha512 = "28cvjkydplc2vpnqff8vylscx8851srnkl54y6i54pl6lhpr6548plvyj833jk2mfaf8h31gbn60s00azd28rzc5q5gm1hgcc1smvlb"; - }; - }; - "util.promisify-1.0.1" = { - name = "util.promisify"; - packageName = "util.promisify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz"; - sha512 = "2n8sxd1qdzc7pn348ayx8jm13kvi9wyjkshzwy1fam3aiy8phv8lbikbli433qvnq3ndnqj8yhcf9dgavm2xv6cvzk7cyy7zl5nkll3"; + sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="; }; }; "utila-0.4.0" = { @@ -10838,7 +10775,7 @@ let version = "3.4.0"; src = fetchurl { url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; - sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; "validate-npm-package-license-3.0.4" = { @@ -10847,7 +10784,7 @@ let version = "3.0.4"; src = fetchurl { url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; - sha512 = "09vn7gn5jp2c07pxplc11lvk7ybfaz0rp3qzflyiyhnahkfgh76bij31ll5rg01ranlmljrky2q25d1f6bbd0h23pzxxi5z93csd4hf"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; }; }; "vary-1.1.2" = { @@ -10865,7 +10802,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz"; - sha512 = "3gn1qs4d8i7gd3qakdk95wn5a5sq2y2nw9zmm6v9fbxi31slyfj9b23m9w5m7qv7j73h936ln9z2i5nwg0kzf6bvar80bqkk7mqcfzy"; + sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; }; "verror-1.10.0" = { @@ -10883,7 +10820,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz"; - sha512 = "00japcjqx1df1bgck837ds0xvg5dr7g4j30a38zhbmanqss2kyxs4p7pgmldlnxpa31js50gydy8x9qi89s4x74iidf6k6nfgqsc5ns"; + sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; "vscode-jsonrpc-5.0.1" = { @@ -10892,7 +10829,7 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz"; - sha512 = "384pcmr3aa875r6s41lafcgwbkcahimsdw5933mnnzz2x233q8kl7g7k6lj7r3glmp83pwq338g3h8dmmmmfmbr34861p3hkcz8vwr6"; + sha512 = "JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="; }; }; "vscode-languageserver-6.1.1" = { @@ -10901,7 +10838,7 @@ let version = "6.1.1"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz"; - sha512 = "06xr3d8zihlfb1rfblzhk4jxy9y8hk4b0yfib0hhnywknif9w3l483wv16msq0a7k44yiq5ynkhid79df1js30y9mbkx4008nk89rqf"; + sha512 = "DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ=="; }; }; "vscode-languageserver-protocol-3.15.3" = { @@ -10910,7 +10847,7 @@ let version = "3.15.3"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz"; - sha512 = "2zyg6f9vc3kac0sl30b3lh5zf92rj7aips62jc261j17214gix4zwa7rgaz20a5m43czchnsg7bdqqv95krbpr91miihhc0fg02xcyf"; + sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw=="; }; }; "vscode-languageserver-textdocument-1.0.1" = { @@ -10919,7 +10856,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz"; - sha512 = "1s7rs7mqr3cnpja4fsm58kbni5m6b4qx3ijjavllllhs3gql0nw3pr84kncpmfwn4xzchg95cbzk36cfb9r04mpjcf5j87v6l70k1sh"; + sha512 = "UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA=="; }; }; "vscode-languageserver-types-3.15.1" = { @@ -10928,34 +10865,34 @@ let version = "3.15.1"; src = fetchurl { url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz"; - sha512 = "1jvind0f20qqmjc1lv1g4dwl0kd07ykb8x9fb6v80bazf3bvr4pn3ppv8rnmcaa1biqn8lfb3bkwm31kghx1dsf35mn8d1b8hylrbzr"; + sha512 = "+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="; }; }; - "vscode-uri-2.1.1" = { + "vscode-uri-2.1.2" = { name = "vscode-uri"; packageName = "vscode-uri"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.1.tgz"; - sha512 = "3s05w58p3l2hmv5dqj3ll07l9rvy06lcr9s3fnzvm27wa3anvnlk6v10w7zmwsafh11pzsgvm17pa29wyfaycagaky5g784dac673vr"; + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz"; + sha512 = "8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="; }; }; - "walker-1.0.7" = { - name = "walker"; - packageName = "walker"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz"; - sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; - }; - }; - "watchpack-1.6.1" = { + "watchpack-1.7.2" = { name = "watchpack"; packageName = "watchpack"; - version = "1.6.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz"; - sha512 = "1j6fr0rjlw663ssnc3z7bgv6621zrwj6qsza68h9rbpgy9nl205wp74iyrh62q3l46230qf8awnmdw77fi7vcm2747bcfh5yn2pv0gq"; + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz"; + sha512 = "ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g=="; + }; + }; + "watchpack-chokidar2-2.0.0" = { + name = "watchpack-chokidar2"; + packageName = "watchpack-chokidar2"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz"; + sha512 = "9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA=="; }; }; "wbuf-1.7.3" = { @@ -10964,25 +10901,25 @@ let version = "1.7.3"; src = fetchurl { url = "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz"; - sha512 = "066j9njgvk6mkjalv1zf1p8w9m2hrl97vz1iw8q6g9zlplhphz54j5j0ma0x9053zhczbyi3k1nr493vgnx1lk22hdwp2glg8x11kiv"; + sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; }; }; - "web-tree-sitter-0.16.2" = { + "web-tree-sitter-0.16.4" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; - version = "0.16.2"; + version = "0.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.16.2.tgz"; - sha512 = "2ik05lyzg1xzqrizpfbhxb3ix62zmhs505q85828555saxpwlpffgqig00lm67myj4f24p1qsn42cc2sdms0gk18s0d08i7xsm4f5mz"; + url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.16.4.tgz"; + sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A=="; }; }; - "webpack-4.42.1" = { + "webpack-4.43.0" = { name = "webpack"; packageName = "webpack"; - version = "4.42.1"; + version = "4.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz"; - sha512 = "13b4jgmj0vf8qa13n1cddqaqk28qd1kmfhxqa5gj5sfvhmjjlgkl8rwqjsw4lydilpz39p2m506j91bgm91988if93gf49a50rdhrs8"; + url = "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"; + sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; }; "webpack-dev-middleware-3.7.2" = { @@ -10991,16 +10928,16 @@ let version = "3.7.2"; src = fetchurl { url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; - sha512 = "27qjisacr2wrfj7r3z5hh2x7nrhadc27vg4kcalrdc7rrn8gnnlk64zf1pqmlkffy8klh8r0dr259v1sf6fjm886j5qlqjvpkcbh46p"; + sha512 = "1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw=="; }; }; - "webpack-dev-server-3.10.3" = { + "webpack-dev-server-3.11.0" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "3.10.3"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz"; - sha512 = "1wl6ahwwfvm7620d70by2abmqgvw54mdhr8bxhdnnsvjzincy83rg80vffb1vwm2cvxwdc9qpp7ipq8bqrkf773fi6lbk0qzxxdd2bv"; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz"; + sha512 = "PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg=="; }; }; "webpack-log-2.0.0" = { @@ -11009,7 +10946,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz"; - sha512 = "191qr8nb4rszy53q0ydqfxr1pirimc3k3bi7mhgin5f15cd7vd28maxanyb248kdivmajhji580fv3a1i584icz3cc9bwvzykd0czvi"; + sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; }; }; "webpack-manifest-plugin-2.2.0" = { @@ -11018,7 +10955,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-2.2.0.tgz"; - sha512 = "00w35bc3s8hks7621pdrh0396c091yd4kf58y3yw4vldi861kw2m6vwgjfqa4bk4msgaj6d5ndxal1df9a37wpaznrz71walb49hbpm"; + sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ=="; }; }; "webpack-sources-1.4.3" = { @@ -11027,34 +10964,43 @@ let version = "1.4.3"; src = fetchurl { url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz"; - sha512 = "1wn7ixcv4b15kj3jn4c08n3pgrrd2kgzm2llh9viqx6a6k3j6rqzd5iksxdkalzaz6iic1q4fjj6wr9wfa07llf5a751mkgg3fx414n"; + sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; - "websocket-driver-0.7.3" = { + "websocket-driver-0.6.5" = { name = "websocket-driver"; packageName = "websocket-driver"; - version = "0.7.3"; + version = "0.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz"; - sha512 = "0b5m603phj37lw5vb70ijc77g29cz7vn1w1bs7rhkx1ax3gil0wys841m14gnm3p95lc630hs370dngh68p7aaq69yqw1yvysb5d73f"; + url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; + sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; }; }; - "websocket-extensions-0.1.3" = { + "websocket-driver-0.7.4" = { + name = "websocket-driver"; + packageName = "websocket-driver"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"; + sha512 = "b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg=="; + }; + }; + "websocket-extensions-0.1.4" = { name = "websocket-extensions"; packageName = "websocket-extensions"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz"; - sha512 = "0d1n4yv45ibxf72hj7qka3j7v53dwn58savfiyvsppqhhrgg3g648ykk5v7fpb53hz85kj87m4f45r7d5iazx4yqgs381z6qnfd98cy"; + url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; + sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "whatwg-fetch-2.0.4" = { + "whatwg-fetch-3.0.0" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "2.0.4"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz"; - sha512 = "2g4p2ymmww4wm7cf86xwpb0dndwlxk1gg3brsrj892a4z593h25hyhqv0rmv4hzz4zxv3smmaflsnhilakfpr6y8f2gf3sfd8ckbi3m"; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz"; + sha512 = "9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="; }; }; "which-1.3.1" = { @@ -11063,7 +11009,7 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; - sha512 = "0hr4hxkk8yb9fz993bs69pf8z2z2qb6sdpxfxb84sd16lja9fsx444pk1ang1ivmjjv5srnsm6fihdj593w7rwxdh834cdmd9hms4hz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; }; "which-2.0.1" = { @@ -11072,7 +11018,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/which/-/which-2.0.1.tgz"; - sha512 = "3ph3rnxyan638n4pzf6cvnky97ss1nn321h1q1zxi848b8x2p3d273mmr4csbvhyy0l608n8a6fn1fc7q7680a4jryx1hpcwij83c9p"; + sha512 = "N7GBZOTswtB9lkQBZA4+zAXrjEIWAUOB93AvzUiudRzRxhUdLURQ7D/gAIMY1gatT/LTbmbcv8SiYazy3eYB7w=="; }; }; "which-2.0.2" = { @@ -11081,7 +11027,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; - sha512 = "1nf5j1l1b0k8jmah5l6w4d3f5hmlcn70ghr5d0mmvxjiyq3nf1dfxmnii5945hn32n7mh99mkwj5bk3nwmdy9dxjzpp6nskbm73gch4"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; "which-module-1.0.0" = { @@ -11117,7 +11063,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-4.3.1.tgz"; - sha512 = "130y345yhgrh3zfgiccy1s6m3z2crx1w6f9cydmvabb489xxjnrm7qg3i1yaggfj3vvs032zaqdmkcx0h8m91zhxp5jwph99yyn9qfn"; + sha512 = "1uFkvU8JXi7L7fCHVBEEnc3asPpiAL33kO495UMcD5+arew9IbKW2rV5lpzhoWcm/qhGB89YfO4PmB/0hQwPRg=="; }; }; "workbox-broadcast-update-4.3.1" = { @@ -11126,7 +11072,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-4.3.1.tgz"; - sha512 = "1n0q0vrpbjhpfwa6ga71qv6pvygbml40kgvkrcnqq4vx8csdy2z9gi9yrnm8vq9cxjz391s7x4c9a541273ml8k9j5r53i56a1ryd1i"; + sha512 = "MTSfgzIljpKLTBPROo4IpKjESD86pPFlZwlvVG32Kb70hW+aob4Jxpblud8EhNb1/L5m43DUM4q7C+W6eQMMbA=="; }; }; "workbox-build-4.3.1" = { @@ -11135,7 +11081,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-build/-/workbox-build-4.3.1.tgz"; - sha512 = "33ng87ll8lgd7pwjk7fxky8n3wl2fh2s6wnirm2hyrrwsixiz7alhr89jnnlc0d19yb9sz3lp8dfki7pyaaih6df3i3pb65vnn70xsh"; + sha512 = "UHdwrN3FrDvicM3AqJS/J07X0KXj67R8Cg0waq1MKEOqzo89ap6zh6LmaLnRAjpB+bDIz+7OlPye9iii9KBnxw=="; }; }; "workbox-cacheable-response-4.3.1" = { @@ -11144,7 +11090,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-4.3.1.tgz"; - sha512 = "2ksgzx6ybrks9h3apmybh68wkb53psjkacnz7v6lxyjmk8jz2w0pk62pv01yd7vl8pdhg387a0c7apn9qkr03blpq7c5kxs76bnm7j6"; + sha512 = "Rp5qlzm6z8IOvnQNkCdO9qrDgDpoPNguovs0H8C+wswLuPgSzSp9p2afb5maUt9R1uTIwOXrVQMmPfPypv+npw=="; }; }; "workbox-core-4.3.1" = { @@ -11153,7 +11099,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-core/-/workbox-core-4.3.1.tgz"; - sha512 = "0m3cfqadsbnzp5viw4d5ym72532mp0w4kx7w01db1vpxxkmvx8rvq49wjg4a85ia03h1g3lqw02ir5b896d0v9d03qs6c76aa7bsw13"; + sha512 = "I3C9jlLmMKPxAC1t0ExCq+QoAMd0vAAHULEgRZ7kieCdUd919n53WC0AfvokHNwqRhGn+tIIj7vcb5duCjs2Kg=="; }; }; "workbox-expiration-4.3.1" = { @@ -11162,7 +11108,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-4.3.1.tgz"; - sha512 = "0zwr054a2rjvmlp73a1d6x2cw7x7rvajb8zbl5pm0xlnrh4fy2z1m7nklzvkd79jblxhhfc931n6gkdxsssaavdyspqnhic0j34phmy"; + sha512 = "vsJLhgQsQouv9m0rpbXubT5jw0jMQdjpkum0uT+d9tTwhXcEZks7qLfQ9dGSaufTD2eimxbUOJfWLbNQpIDMPw=="; }; }; "workbox-google-analytics-4.3.1" = { @@ -11171,7 +11117,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-4.3.1.tgz"; - sha512 = "1v0bql2z41fal9w7zacvclnf5yh2ylnhv2d8ny8l75cl9qznrk3lbagn16raj48yvq5p0vjgsksl4jqyav45c0l11wvwfdfh81a6c67"; + sha512 = "xzCjAoKuOb55CBSwQrbyWBKqp35yg1vw9ohIlU2wTy06ZrYfJ8rKochb1MSGlnoBfXGWss3UPzxR5QL5guIFdg=="; }; }; "workbox-navigation-preload-4.3.1" = { @@ -11180,7 +11126,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-4.3.1.tgz"; - sha512 = "0xhpw0szfaqspkdmw7nzdfqcvijmxi9kz9wmawaq71kgnn8fd0gbjwqic4signyj68hxd52j7dq66mdn301ggphxdsql785gagzlkib"; + sha512 = "K076n3oFHYp16/C+F8CwrRqD25GitA6Rkd6+qAmLmMv1QHPI2jfDwYqrytOfKfYq42bYtW8Pr21ejZX7GvALOw=="; }; }; "workbox-precaching-4.3.1" = { @@ -11189,7 +11135,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-4.3.1.tgz"; - sha512 = "2ls1a25idywxi2v60aa2snmi0c07ayqp5n7d1yrafjn5hkhsl4sk1j1gx445hf5h8wni4nci0nlkbnn5n7sgsgkzqi84gicczzs0956"; + sha512 = "piSg/2csPoIi/vPpp48t1q5JLYjMkmg5gsXBQkh/QYapCdVwwmKlU9mHdmy52KsDGIjVaqEUMFvEzn2LRaigqQ=="; }; }; "workbox-range-requests-4.3.1" = { @@ -11198,7 +11144,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-4.3.1.tgz"; - sha512 = "1j267fikkf08y96msxa5vkgaswdhp4jhgirvva3cv8x57yma9dhbbapyivccyryvrfpfvd7jpk5yq67gwll3wlz4nlmqk52vwpy3qab"; + sha512 = "S+HhL9+iTFypJZ/yQSl/x2Bf5pWnbXdd3j57xnb0V60FW1LVn9LRZkPtneODklzYuFZv7qK6riZ5BNyc0R0jZA=="; }; }; "workbox-routing-4.3.1" = { @@ -11207,7 +11153,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-routing/-/workbox-routing-4.3.1.tgz"; - sha512 = "3xdf0mryy66n2mk28ljbvw9yfvb647w4j10cpxz2dp5n4hvxd25aa1h9k9f3jk1n4smp9gqjd1yxigldrplsysaifn8kq60w2nfsihn"; + sha512 = "FkbtrODA4Imsi0p7TW9u9MXuQ5P4pVs1sWHK4dJMMChVROsbEltuE79fBoIk/BCztvOJ7yUpErMKa4z3uQLX+g=="; }; }; "workbox-strategies-4.3.1" = { @@ -11216,7 +11162,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-4.3.1.tgz"; - sha512 = "23k6inrsahycsk4ban80q2jw3zy8fydjr6pkp1sjrq28ybcr0pvgpa86038l3yd1sakxkiz32zfyh4n8650lhm7bwfnym36n3kq9zqp"; + sha512 = "F/+E57BmVG8dX6dCCopBlkDvvhg/zj6VDs0PigYwSN23L8hseSRwljrceU2WzTvk/+BSYICsWmRq5qHS2UYzhw=="; }; }; "workbox-streams-4.3.1" = { @@ -11225,7 +11171,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-streams/-/workbox-streams-4.3.1.tgz"; - sha512 = "2wbc90ms21pr4fdwp2mifggynwgy4a18rhzs8lj4spz9xjhv85q1561047dq55776agxqqk88k29lwxzvpxw9gyhli2vzszrn5ara70"; + sha512 = "4Kisis1f/y0ihf4l3u/+ndMkJkIT4/6UOacU3A4BwZSAC9pQ9vSvJpIi/WFGQRH/uPXvuVjF5c2RfIPQFSS2uA=="; }; }; "workbox-sw-4.3.1" = { @@ -11234,7 +11180,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-sw/-/workbox-sw-4.3.1.tgz"; - sha512 = "3vypra50sn2adwr7dwb7g4h75ay9fsyzwnmz4nbdgsjh3sd4l7ikhnbg02kqlqfsbj79nbby0lp7h20z9a61wndh2wy1nlbq2xdsdfj"; + sha512 = "0jXdusCL2uC5gM3yYFT6QMBzKfBr2XTk0g5TPAV4y8IZDyVNDyj1a8uSXy3/XrvkVTmQvLN4O5k3JawGReXr9w=="; }; }; "workbox-webpack-plugin-4.3.1" = { @@ -11243,7 +11189,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-4.3.1.tgz"; - sha512 = "08lqpz6fx1gh855d9fqj2ac15fsi07zx0pl79068a78bhzdj6rnm2gzwkr17kc5bgvr12nf96d01cp7ipqndz8wdp5h3wqvqdvn77w0"; + sha512 = "gJ9jd8Mb8wHLbRz9ZvGN57IAmknOipD3W4XNE/Lk/4lqs5Htw4WOQgakQy/o/4CoXQlMCYldaqUg+EJ35l9MEQ=="; }; }; "workbox-window-4.3.1" = { @@ -11252,7 +11198,7 @@ let version = "4.3.1"; src = fetchurl { url = "https://registry.npmjs.org/workbox-window/-/workbox-window-4.3.1.tgz"; - sha512 = "0g784xkl3xda99q27b8z0n5jvgnqclcpr9l3a6h2psrcj7ijv13dh4kkqwac1klcqk0garwbjlspvrmfq5d777434vwrrw83qm1d60b"; + sha512 = "C5gWKh6I58w3GeSc0wp2Ne+rqVw8qwcmZnQGpjiek8A2wpbxSJb1FdCoQVO+jDJs35bFgo/WETgl1fqgsxN0Hg=="; }; }; "worker-farm-1.7.0" = { @@ -11261,7 +11207,7 @@ let version = "1.7.0"; src = fetchurl { url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz"; - sha512 = "37m9wq9rvylb71n9kw3qghinwa3x4sggz82k29aall83izni78ijnh8rd6nhas8advw0lbnhby8z74vjlhp3sjsr4qm1wjw6r0kgz5f"; + sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; }; }; "wrap-ansi-2.1.0" = { @@ -11279,7 +11225,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; - sha512 = "3nmsfqfd98a7bgjyhd334y5gzc98nnkipfkmk2z1v4m0acagmpq951d8brmrsxvpnk256fbrp7zkn5n8v02pn4q4zai7zgnvy47yba0"; + sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; }; }; "wrap-ansi-6.2.0" = { @@ -11288,7 +11234,7 @@ let version = "6.2.0"; src = fetchurl { url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; - sha512 = "1f4kz05shsh3xrqa0saaf5hbjp9kzxm7ykg8jmb6l49q8cfyhkrl45kk85p4jw1h95il3qadmsj2cy44yrbp119fd47jrdi25q4zadg"; + sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; }; }; "wrappy-1.0.2" = { @@ -11306,7 +11252,7 @@ let version = "1.1.5"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz"; - sha512 = "3iv2yz706h7wyg563jsfjdykkkxs8j49vz60r6qx5by0npfhs98rgc114kdqs15sc52mldscc22bkfpkrs08cwlqaxx8lfdjn5alwm3"; + sha512 = "o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w=="; }; }; "ws-3.3.1" = { @@ -11315,7 +11261,7 @@ let version = "3.3.1"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-3.3.1.tgz"; - sha512 = "3y6jiddhkfn0qgl1bq8whpn8s7l4vh981nnjih1k81wa7mxgbj6c9nnayxk1hz4qdxy34f8wbzv6kq6pdcsg7n98a1c5jyhr52fw3zh"; + sha512 = "8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A=="; }; }; "ws-5.2.2" = { @@ -11324,7 +11270,7 @@ let version = "5.2.2"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz"; - sha512 = "0f6ay7yn6xslzh3h66d5krqnp48d9g3ikwk0ijiyyxfkwaqxxf3b0qdswy6ych79mj44315qd16snlnk6m6npc5l0habgy5lc7wb8cd"; + sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; }; }; "ws-6.2.1" = { @@ -11333,7 +11279,7 @@ let version = "6.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; - sha512 = "2l27cfiaw6syjvy6vbpqf5c2swd37bqviizzck6842xlankppm9j1sg79x3m8jpda8v6khcpnm5ssab1b8vf34qpviv41ww5mf8130q"; + sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; }; "ws-7.1.1" = { @@ -11342,7 +11288,16 @@ let version = "7.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ws/-/ws-7.1.1.tgz"; - sha512 = "3f5849ggay87yr83snnkb1p2myb2gk8zswyd5v5m2y0kcvy02bvgi7mn7di8rs7zljpzra5sf1k4d17wyyv48d60ssccyc3d7yl73d3"; + sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; + }; + }; + "ws-7.3.0" = { + name = "ws"; + packageName = "ws"; + version = "7.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz"; + sha512 = "iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w=="; }; }; "xmlbuilder-13.0.2" = { @@ -11351,7 +11306,7 @@ let version = "13.0.2"; src = fetchurl { url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz"; - sha512 = "00nxfgckvb3i20my8mmpc2s3bp59qxkfy926lv9ynbnfyqw7h5hq8cims6q86nr2wqnxq3b6rjvm28kn7700fmhfndq438xcj5p9v0j"; + sha512 = "Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ=="; }; }; "xtend-4.0.2" = { @@ -11360,7 +11315,7 @@ let version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; - sha512 = "08w1d6fg23v422cfwd55306pfs9n9cqpz6hycahq3adm3n29wmhl9bmpn4vk75rlzgwn7hp4n3idqxvw8c53zbr04h7a98p43b199ic"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; "y18n-3.2.1" = { @@ -11378,7 +11333,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; - sha512 = "3zj75gvpcgiphxpci4ji1znykk9n4cs0aw3dd6inwdvkmxyqn2483vya70lssjwq8alspnpw88vgii21fdrcn2vmfyppzgf4mkvzm5g"; + sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; }; "yallist-2.1.2" = { @@ -11396,16 +11351,7 @@ let version = "3.1.1"; src = fetchurl { url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb"; - }; - }; - "yargs-12.0.5" = { - name = "yargs"; - packageName = "yargs"; - version = "12.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz"; - sha512 = "1kjmh68p4rb4c04s0gk4ra20crfr32h6v9zhj4clrz61xanslza9g3drbf6471mmvqq3vmxk04grmgillx1rsp6v2zim7wqnr6gq71f"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; }; }; "yargs-13.3.2" = { @@ -11414,7 +11360,7 @@ let version = "13.3.2"; src = fetchurl { url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz"; - sha512 = "19rg5b2rhj2kg44as5vv9jxmpr39lw250885w6nlfwyhvwd5nxnnx7fc35v7h615i65cik7k3wi7ac20c91kcgfi5wy7blgk31xjz81"; + sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; }; }; "yargs-15.3.1" = { @@ -11423,7 +11369,7 @@ let version = "15.3.1"; src = fetchurl { url = "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz"; - sha512 = "10c3d3i284v9l92r3ayx2z43hf4kw4adrlmp6vrjlcrq7mm3xh62c10q79jx73qm4dymnb9222zjr15n4l5w9pq0pn6xhr3c4fvaqzp"; + sha512 = "92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA=="; }; }; "yargs-6.6.0" = { @@ -11435,31 +11381,22 @@ let sha1 = "782ec21ef403345f830a808ca3d513af56065208"; }; }; - "yargs-parser-11.1.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "11.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz"; - sha512 = "14iaywclwncdp3p7878q12cqgdc5rbkl0f6ghi9g7k7f4f1bbqi41dc5ki6hnqmy6jbfk0kx88m47vk3igrql5j6i7ar2a3cbyh3a8b"; - }; - }; "yargs-parser-13.1.2" = { name = "yargs-parser"; packageName = "yargs-parser"; version = "13.1.2"; src = fetchurl { url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz"; - sha512 = "375nan6m28q81h8q9a8vmcxgiq7s81yn1ql7zdikac0c4j2kmxdjzmbq14fcp9jm4ilcfzkd9ym4x7c80s7r6g488wf13zz2wsyqmny"; + sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; }; }; - "yargs-parser-18.1.2" = { + "yargs-parser-18.1.3" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "18.1.2"; + version = "18.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz"; - sha512 = "00h0d3ibv9x6gi9mz2fxg2an5r23vxsvl2svgj8kz6czjgwmw57rrz7fd4dc88cnd2kva21s6a5gahc616djp5xp1c2vk683lshyll6"; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"; + sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; "yargs-parser-4.2.1" = { @@ -11477,7 +11414,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/yn/-/yn-4.0.0.tgz"; - sha512 = "214zjzw9f245al1vhnvhw1ac5xq2sa5d34xa8h0hj3ck2x7nbdkx3j2lgd8zf4cb6bnn0ngffcwkbnl2qy9kq17w6f14kxq4j4a5rc6"; + sha512 = "huWiiCS4TxKc4SfgmTwW1K7JmXPPAmuXWYy4j9qjQo4+27Kni8mGhAAi1cloRWmBe2EqcLgt3IGqQoRL/MtPgg=="; }; }; }; @@ -11489,18 +11426,18 @@ in version = "0.16.5"; src = fetchurl { url = "https://registry.npmjs.org/elm-analyse/-/elm-analyse-0.16.5.tgz"; - sha512 = "0m37f2yxpjlh0b46n8ijx0zxl51swikdsgj8rm61kfy32c45fz98c2a1zxqlwyk98fblc92jc9zg2bhqxgs7civf01ndylwacc61dr3"; + sha512 = "I7dgGFOc+mYDcDuyo1/HcIn3E5MiMbocStNzivsPSjCUviuEieHdDKZmJJ9uM3IdCu0fdBmRNWQBSOXtXrgzKg=="; }; dependencies = [ sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."array-flatten-1.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" + sources."aws4-1.10.0" sources."babel-runtime-6.18.0" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -11549,7 +11486,7 @@ in }) sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" + sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" (sources."finalhandler-1.1.1" // { dependencies = [ @@ -11563,7 +11500,7 @@ in sources."fresh-0.5.2" sources."fs-extra-2.0.0" sources."getpass-0.1.7" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-errors-1.7.2" @@ -11587,8 +11524,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.0" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -11614,7 +11551,7 @@ in (sources."request-2.88.0" // { dependencies = [ sources."qs-6.5.2" - sources."safe-buffer-5.2.0" + sources."safe-buffer-5.2.1" ]; }) sources."safe-buffer-5.1.1" @@ -11675,12 +11612,12 @@ in version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/elm-coverage/-/elm-coverage-0.3.0.tgz"; - sha512 = "378i24sqwydr323g5n696d0nz12d5ld8496fb3wmznf5fhv7p8ahvgf6a6cjfp78y0i53cr5v5jsa3hmb0xplc3jkrk5s5fn3s4wyaq"; + sha512 = "WHlO9LCu6DLzlIPR28GqcCgtyy6ZjRKBR+c6yYwy7m2o0D0buuLsr3wsZxJBjZYmwregmWRseUOM3DzHmoiIzg=="; }; dependencies = [ sources."@types/color-name-1.1.1" sources."abbrev-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" @@ -11689,7 +11626,7 @@ in sources."astral-regex-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" + sources."aws4-1.10.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" @@ -11745,7 +11682,7 @@ in sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" + sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fill-range-7.0.1" sources."find-0.2.9" @@ -11762,12 +11699,12 @@ in sources."fs-extra-4.0.3" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."glob-7.1.4" sources."glob-parent-5.1.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -11796,14 +11733,14 @@ in sources."yallist-2.1.2" ]; }) - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-0.5.5" - sources."moment-2.24.0" + sources."moment-2.27.0" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" sources."nice-try-1.0.5" @@ -11819,7 +11756,7 @@ in sources."once-1.4.0" sources."opn-5.5.0" sources."os-tmpdir-1.0.2" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" @@ -11838,7 +11775,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."rimraf-2.6.3" - sources."safe-buffer-5.2.0" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."set-blocking-2.0.0" @@ -11900,7 +11837,7 @@ in sources."strip-ansi-6.0.0" ]; }) - sources."yargs-parser-18.1.2" + sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -11915,293 +11852,130 @@ in elm-doc-preview = nodeEnv.buildNodePackage { name = "elm-doc-preview"; packageName = "elm-doc-preview"; - version = "3.0.4"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-3.0.4.tgz"; - sha512 = "2cg4fjgjxg94lhak20inr9v05bkr2iyh64acg2msc4dr4jwq97542r115mpyzxc7rxsa2pg3jfflmqv74vy22v9zb9pzqdgh83ipfml"; + url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-5.0.3.tgz"; + sha512 = "j9wli2wOHYiSMARDCRgAZGZ8JkcJqG4rh5+6rSgy5nVGqyXDEN6HCBX/8AhqtKMFKcuCp9ejx04heCaROlb/Eg=="; }; dependencies = [ - sources."@cnakazawa/watch-1.0.4" - sources."@sindresorhus/is-0.7.0" + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@types/color-name-1.1.1" sources."accepts-1.3.7" - sources."ansi-styles-3.2.1" - sources."anymatch-2.0.0" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" + sources."ansi-styles-4.2.1" + sources."anymatch-3.1.1" sources."array-flatten-1.1.1" - sources."array-unique-0.3.2" - sources."assign-symbols-1.0.0" sources."async-limiter-1.0.1" - sources."atob-2.1.2" sources."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) sources."batch-0.6.1" + sources."binary-extensions-2.0.0" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."bser-2.1.1" + sources."braces-3.0.2" sources."bytes-3.1.0" - sources."cache-base-1.0.1" - (sources."cacheable-request-2.1.4" // { + (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."lowercase-keys-1.0.0" - ]; - }) - sources."capture-exit-2.0.0" - sources."chalk-2.4.2" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."get-stream-5.1.0" + sources."lowercase-keys-2.0.0" ]; }) + sources."chalk-3.0.0" + sources."chokidar-3.4.0" sources."clone-response-1.0.2" - sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commander-3.0.2" - sources."component-emitter-1.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-5.1.0" sources."concat-map-0.0.1" sources."content-disposition-0.5.3" sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."copy-descriptor-0.1.1" - sources."core-js-3.6.4" - sources."core-util-is-1.0.2" - sources."cross-spawn-6.0.5" + sources."cross-spawn-7.0.3" sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" - sources."define-properties-1.1.3" - sources."define-property-2.0.2" + sources."defer-to-connect-1.1.3" sources."depd-1.1.2" sources."destroy-1.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."es-abstract-1.17.5" - sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" - sources."exec-sh-0.3.4" - (sources."execa-1.0.0" // { - dependencies = [ - sources."get-stream-4.1.0" - ]; - }) - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) sources."express-4.17.1" (sources."express-ws-4.0.0" // { dependencies = [ sources."ws-5.2.2" ]; }) - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - sources."fb-watchman-2.0.1" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."for-in-1.0.2" sources."forwarded-0.1.2" - sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."from2-2.3.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."get-stream-3.0.0" - sources."get-value-2.0.6" + sources."fsevents-2.1.3" + sources."get-stream-4.1.0" sources."glob-7.1.6" - sources."got-8.3.2" - sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.1" - sources."has-to-string-tag-x-1.4.1" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."http-cache-semantics-3.8.1" + sources."glob-parent-5.1.1" + sources."got-9.6.0" + sources."has-flag-4.0.0" + sources."http-cache-semantics-4.1.0" sources."http-errors-1.7.2" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" - sources."into-stream-3.1.0" sources."ipaddr.js-1.9.1" - sources."is-accessor-descriptor-1.0.0" - sources."is-buffer-1.1.6" - sources."is-callable-1.1.5" - sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-object-1.0.1" - sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" - sources."is-regex-1.0.5" - sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" - sources."is-symbol-1.0.3" - sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" - sources."isarray-1.0.0" + sources."is-binary-path-2.1.0" + sources."is-docker-2.0.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" - sources."isurl-1.0.0" sources."json-buffer-3.0.0" - sources."keyv-3.0.0" - sources."kind-of-6.0.3" - sources."latest-version-4.0.0" + sources."keyv-3.1.0" + sources."latest-version-5.1.0" sources."lowercase-keys-1.0.1" - sources."makeerror-1.0.11" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) sources."ms-2.0.0" - sources."nanomatch-1.2.13" sources."negotiator-0.6.2" - sources."nice-try-1.0.5" - sources."node-int64-0.4.0" - sources."normalize-path-2.1.1" - sources."normalize-url-2.0.1" - sources."npm-run-path-2.0.2" - sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) - sources."object-inspect-1.7.0" - sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.0" - sources."object.pick-1.3.0" + sources."normalize-path-3.0.0" + sources."normalize-url-4.5.0" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."opn-5.5.0" - sources."p-cancelable-0.4.1" - sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" - sources."p-timeout-2.0.1" - sources."package-json-5.0.0" + sources."open-7.0.4" + sources."p-cancelable-1.1.0" + sources."package-json-6.5.0" sources."parseurl-1.3.3" - sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" + sources."path-key-3.1.1" sources."path-to-regexp-0.1.7" - sources."pify-3.0.0" - sources."posix-character-classes-0.1.1" + sources."picomatch-2.2.2" sources."prepend-http-2.0.0" - sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.6" sources."pump-3.0.0" sources."qs-6.7.0" - sources."query-string-5.1.1" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."readable-stream-2.3.7" - sources."regex-not-1.0.2" - sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" - sources."resolve-url-0.2.1" + sources."readdirp-3.4.0" + sources."registry-auth-token-4.1.1" + sources."registry-url-5.1.0" sources."responselike-1.0.2" - sources."ret-0.1.15" sources."rimraf-2.7.1" - sources."rsvp-4.8.5" sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sane-4.1.0" - sources."semver-5.7.1" + sources."semver-6.3.0" (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" @@ -12214,111 +11988,24 @@ in ]; }) sources."serve-static-1.14.1" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) sources."setprototypeof-1.1.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."sort-keys-2.0.0" - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" - sources."split-string-3.1.0" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."statuses-1.5.0" - sources."strict-uri-encode-1.1.0" - sources."string.prototype.trimend-1.0.0" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" - sources."string.prototype.trimstart-1.0.0" - sources."string_decoder-1.1.1" - sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-5.5.0" - sources."timed-out-4.0.1" + sources."supports-color-7.1.0" sources."tmp-0.1.0" - sources."tmpl-1.0.4" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" + sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."type-is-1.6.18" - sources."union-value-1.0.1" sources."unpipe-1.0.0" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."urix-0.1.0" sources."url-parse-lax-3.0.0" - sources."url-to-options-1.0.1" - sources."use-3.1.1" - sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" sources."utils-merge-1.0.1" sources."vary-1.1.2" - sources."walker-1.0.7" - sources."which-1.3.1" + sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-6.2.1" + sources."ws-7.3.0" ]; buildInputs = globalBuildInputs; meta = { @@ -12333,17 +12020,17 @@ in "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { name = "_at_elm-tooling_slash_elm-language-server"; packageName = "@elm-tooling/elm-language-server"; - version = "1.7.1"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.7.1.tgz"; - sha512 = "25ha586wi38w5bh15dvskvixbw8n1ca5y5x3j2593d0nlrlqr69garz2bd444asgad1yvjkf62dfjdswy3nw1l0nrhpphiryd8hlnzx"; + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.9.1.tgz"; + sha512 = "3wqe5OfqVWn0o92vDRuYwK7T6fohG0uSrNRr5EhJYrOUwlZFaSBx50RR79v12j7sNepDrACrsULSENcuyxNzIQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."asn1-0.2.4" @@ -12351,7 +12038,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" + sources."aws4-1.10.0" sources."babel-runtime-6.18.0" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -12360,13 +12047,13 @@ in sources."caseless-0.12.0" sources."combined-stream-1.0.8" sources."concat-stream-1.5.2" - sources."content-disposition-0.5.2" + sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."cookie-0.3.1" + sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."core-js-2.6.11" sources."core-util-is-1.0.2" - sources."cross-spawn-7.0.2" + sources."cross-spawn-7.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."delayed-stream-1.0.0" @@ -12375,34 +12062,18 @@ in sources."dir-glob-3.0.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#1a665a6e540d7d11b29b3c5e3c52089704325d9c" + sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#7f4000cce5ef024fe5e82c7ee1725feef95a9daf" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."escape-html-1.0.3" + sources."escape-string-regexp-4.0.0" sources."etag-1.8.1" - (sources."execa-4.0.0" // { + (sources."execa-4.0.2" // { dependencies = [ sources."is-stream-2.0.0" ]; }) - (sources."express-4.16.3" // { - dependencies = [ - sources."body-parser-1.18.2" - sources."bytes-3.0.0" - sources."http-errors-1.6.3" - sources."iconv-lite-0.4.19" - sources."qs-6.5.1" - (sources."raw-body-2.3.2" // { - dependencies = [ - sources."depd-1.1.1" - sources."http-errors-1.6.2" - sources."setprototypeof-1.0.3" - ]; - }) - sources."setprototypeof-1.1.0" - sources."statuses-1.4.0" - ]; - }) + sources."express-4.17.1" (sources."express-ws-2.0.0" // { dependencies = [ sources."ws-1.1.5" @@ -12410,17 +12081,13 @@ in }) sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" + sources."fast-deep-equal-3.1.3" sources."fast-diff-1.2.0" - sources."fast-glob-3.2.2" + sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.7.0" + sources."fastq-1.8.0" sources."fill-range-7.0.1" - (sources."finalhandler-1.1.1" // { - dependencies = [ - sources."statuses-1.4.0" - ]; - }) + sources."finalhandler-1.1.2" sources."find-0.2.7" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -12430,15 +12097,15 @@ in sources."get-stream-5.1.0" sources."getpass-0.1.7" sources."glob-parent-5.1.1" - sources."globby-11.0.0" - sources."graceful-fs-4.2.3" + sources."globby-11.0.1" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" - sources."ignore-5.1.4" + sources."ignore-5.1.8" sources."inherits-2.0.3" sources."ipaddr.js-1.9.1" sources."is-extglob-2.1.1" @@ -12460,14 +12127,14 @@ in sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" - sources."merge2-1.3.0" + sources."merge2-1.4.1" sources."methods-1.1.2" sources."micromatch-4.0.2" - sources."mime-1.4.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-1.6.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" - sources."minimist-1.2.0" + sources."minimist-1.2.5" sources."ms-2.0.0" sources."negotiator-0.6.2" sources."node-watch-0.5.5" @@ -12476,7 +12143,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-5.1.0" - sources."opn-5.4.0" + sources."opn-6.0.0" sources."options-0.0.6" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -12497,25 +12164,21 @@ in sources."raw-body-2.4.0" sources."readable-stream-2.0.6" sources."regenerator-runtime-0.9.6" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.2" - sources."safe-buffer-5.2.0" ]; }) sources."reusify-1.0.4" sources."run-parallel-1.1.9" - sources."rxjs-6.5.5" - sources."safe-buffer-5.1.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - (sources."send-0.16.2" // { + (sources."send-0.17.1" // { dependencies = [ - sources."http-errors-1.6.3" - sources."setprototypeof-1.1.0" - sources."statuses-1.4.0" + sources."ms-2.1.1" ]; }) - sources."serve-static-1.13.2" + sources."serve-static-1.14.1" sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -12530,13 +12193,8 @@ in sources."tmp-0.0.31" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."tough-cookie-2.5.0" sources."traverse-chain-0.1.0" - sources."tslib-1.11.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -12554,8 +12212,8 @@ in sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" - sources."vscode-uri-2.1.1" - sources."web-tree-sitter-0.16.2" + sources."vscode-uri-2.1.2" + sources."web-tree-sitter-0.16.4" sources."which-2.0.2" sources."wrappy-1.0.2" (sources."ws-3.3.1" // { @@ -12581,7 +12239,7 @@ in version = "4.0.2"; src = fetchurl { url = "https://registry.npmjs.org/elm-live/-/elm-live-4.0.2.tgz"; - sha512 = "1ri6f1ij6617nk0nsgrdfnzwac2hgisf7rvgrq4m8vny6a8f18bg5kb3bmal5mb51fsns2s3k678l6pal5v45ay1fdwps25kjyd93g0"; + sha512 = "4I3UvJxF6MubC14VsgtV11B0zBxaaKtdKKsWquoaa5a3UHBIGW83qgTnt/NxOj4omOLfupaftmDaE4yRMTgTcw=="; }; dependencies = [ sources."ansi-regex-2.1.1" @@ -12605,7 +12263,7 @@ in sources."elm-hot-1.1.4" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."es6-promisify-6.1.0" + sources."es6-promisify-6.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" @@ -12617,14 +12275,9 @@ in }) sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - (sources."follow-redirects-1.11.0" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.2" - ]; - }) + sources."follow-redirects-1.12.1" sources."fresh-0.5.2" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."get-stream-4.1.0" sources."glob-parent-5.1.1" sources."has-ansi-2.0.0" @@ -12703,18 +12356,18 @@ in version = "0.19.1-revision2"; src = fetchurl { url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision2.tgz"; - sha512 = "24qc3z9z059c0dp97lfpsqgigxks6dd8akf14p3wvnvsy5ih3nf4947qc94xfrr0jdql0nnq12727nyyyyz3zrfyy54y85jayckcnyd"; + sha512 = "zVs2mVeyIE+K9y7/8b333h5xRMDWAoqbBDm7ThLDhyTi7ICxeL3t5uOS4KZCrRk9+4sP6+voSbcBlgr46Q+GiQ=="; }; dependencies = [ sources."@types/color-name-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" + sources."aws4-1.10.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" @@ -12741,7 +12394,7 @@ in sources."elmi-to-json-1.3.0" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" + sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fill-range-7.0.1" (sources."find-elm-dependencies-2.0.2" // { @@ -12756,11 +12409,11 @@ in sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-4.0.0" @@ -12781,8 +12434,8 @@ in sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."lodash-4.17.15" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-2.9.0" @@ -12815,7 +12468,7 @@ in sources."request-promise-4.2.5" sources."request-promise-core-1.1.3" sources."rimraf-2.6.3" - sources."safe-buffer-5.2.0" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."shebang-command-2.0.0" @@ -12858,15 +12511,15 @@ in version = "0.19.8"; src = fetchurl { url = "https://registry.npmjs.org/elm-upgrade/-/elm-upgrade-0.19.8.tgz"; - sha512 = "3rqgj507b7yb9ljc0rbfj7fi18h5lh33wvfr1kfdpqklvx3q84jfrma01fwrraxx1jlllhis9r1cpzcbcgmjlvygc2d5frhimbp60sb"; + sha512 = "SwNzV40wu9IEe35TWR9b7F8WctIRUkpl6F3lzF0AqmYnCcKjbzrxbW6G7DYfA9ICUYjuSLcyYJKm5c86oMiH8w=="; }; dependencies = [ - sources."@sindresorhus/is-2.1.0" + sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-13.11.0" + sources."@types/node-14.0.13" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.1" @@ -12885,7 +12538,7 @@ in sources."get-proxy-2.1.0" sources."get-stream-5.1.0" sources."got-10.7.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."http-cache-semantics-4.1.0" @@ -12895,23 +12548,23 @@ in sources."isurl-1.0.0" sources."json-buffer-3.0.1" sources."jsonfile-4.0.0" - sources."keyv-4.0.0" + sources."keyv-4.0.1" sources."lowercase-keys-2.0.0" sources."mimic-response-2.1.0" sources."normalize-url-4.5.0" sources."npm-conf-1.1.3" sources."once-1.4.0" sources."p-cancelable-2.0.0" - sources."p-event-4.1.0" + sources."p-event-4.2.0" sources."p-finally-1.0.0" - sources."p-timeout-2.0.1" + sources."p-timeout-3.2.0" sources."pify-3.0.0" sources."proto-list-1.2.4" sources."pump-3.0.0" sources."responselike-2.0.0" - sources."safe-buffer-5.2.0" + sources."safe-buffer-5.2.1" sources."safename-1.0.2" - sources."semver-7.1.3" + sources."semver-7.3.2" sources."to-readable-stream-2.1.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.10.0" @@ -12937,10 +12590,10 @@ in version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-5.0.0.tgz"; - sha512 = "2npciwj93dprxgd9m14wz73q0bq8jqr3wq2027dvphm6jjl6r13yc9v5xl4g72rrjjrb81hnpk5y1q855lzcxbc8h49spb19zwsy0vl"; + sha512 = "dAOv+U9hXZ0IRGx19mkpCAdf5rUwoJWlzFmcR2gvOzE/QjZUSlPh3e0IIDAfGUuEF8DjfE5CTe31fNtIkkd2rQ=="; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" @@ -12948,7 +12601,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" + sources."aws4-1.10.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" @@ -12991,7 +12644,7 @@ in sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" + sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fill-range-7.0.1" (sources."find-elm-dependencies-2.0.2" // { @@ -13007,12 +12660,12 @@ in sources."fs-extra-5.0.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."glob-7.1.4" sources."glob-parent-5.1.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -13035,8 +12688,8 @@ in sources."jsprim-1.4.1" sources."locate-path-3.0.0" sources."lodash-4.17.15" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-2.9.0" @@ -13055,7 +12708,7 @@ in sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."once-1.4.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."path-exists-3.0.0" @@ -13073,7 +12726,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."rimraf-2.7.1" - sources."safe-buffer-5.2.0" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."set-blocking-2.0.0" @@ -13127,14 +12780,14 @@ in version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/elm-xref/-/elm-xref-4.1.0.tgz"; - sha512 = "24a79m9qhs2ycldf36p7qyr0dj8jvqja0cycp5gr01nkrdhlin4idh33wbvr7yghh5vbf53j3vbi0r9kjp1crs4cy1jvb80iccxayfv"; + sha512 = "23nVGYsArS2DZ0RnFq6cKYO49pCjuLULhM+fvBcfA7ZIbKSw5WkDyK9c5hlQEm+JZAPZ43PNcI0yLzTEqaajiA=="; }; dependencies = [ sources."bluebird-3.7.2" sources."compare-versions-3.6.0" sources."core-util-is-1.0.2" sources."fs-extra-6.0.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."jsonfile-4.0.0" @@ -13169,86 +12822,107 @@ in create-elm-app = nodeEnv.buildNodePackage { name = "create-elm-app"; packageName = "create-elm-app"; - version = "4.2.4"; + version = "4.2.25"; src = fetchurl { - url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-4.2.4.tgz"; - sha512 = "007cbn1hd7hb48mwrn7sg132vj9y0bw17jwgc2fi5m4z8zi24992qqgkdqzqz3bwh7khh1f0y35fzn6va384rlahmwyykxrj62hpl06"; + url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-4.2.25.tgz"; + sha512 = "Lasm7xrh8XQR2aqqwRlB2gJ5CWAGNaVoHpjGVft+EkSKMtHn5xtRAEGU3U4IuRDIhL7kvPFZXX4g8VQ7o79UJg=="; }; dependencies = [ - sources."@babel/cli-7.2.3" - sources."@babel/code-frame-7.8.3" - sources."@babel/core-7.3.4" - sources."@babel/generator-7.9.4" - sources."@babel/helper-annotate-as-pure-7.8.3" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" - sources."@babel/helper-create-regexp-features-plugin-7.8.8" - sources."@babel/helper-define-map-7.8.3" - sources."@babel/helper-explode-assignable-expression-7.8.3" - sources."@babel/helper-function-name-7.8.3" - sources."@babel/helper-get-function-arity-7.8.3" - sources."@babel/helper-hoist-variables-7.8.3" - sources."@babel/helper-member-expression-to-functions-7.8.3" - sources."@babel/helper-module-imports-7.8.3" - sources."@babel/helper-module-transforms-7.9.0" - sources."@babel/helper-optimise-call-expression-7.8.3" - sources."@babel/helper-plugin-utils-7.8.3" - sources."@babel/helper-regex-7.8.3" - sources."@babel/helper-remap-async-to-generator-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" - sources."@babel/helper-simple-access-7.8.3" - sources."@babel/helper-split-export-declaration-7.8.3" - sources."@babel/helper-validator-identifier-7.9.0" - sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.9.2" - sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" - sources."@babel/plugin-proposal-async-generator-functions-7.8.3" - sources."@babel/plugin-proposal-json-strings-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.9.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" - sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" - sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" - sources."@babel/plugin-transform-arrow-functions-7.8.3" - sources."@babel/plugin-transform-async-to-generator-7.8.3" - sources."@babel/plugin-transform-block-scoped-functions-7.8.3" - sources."@babel/plugin-transform-block-scoping-7.8.3" - sources."@babel/plugin-transform-classes-7.9.2" - sources."@babel/plugin-transform-computed-properties-7.8.3" - sources."@babel/plugin-transform-destructuring-7.8.8" - sources."@babel/plugin-transform-dotall-regex-7.8.3" - sources."@babel/plugin-transform-duplicate-keys-7.8.3" - sources."@babel/plugin-transform-exponentiation-operator-7.8.3" - sources."@babel/plugin-transform-for-of-7.9.0" - sources."@babel/plugin-transform-function-name-7.8.3" - sources."@babel/plugin-transform-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.9.0" - sources."@babel/plugin-transform-modules-commonjs-7.9.0" - sources."@babel/plugin-transform-modules-systemjs-7.9.0" - sources."@babel/plugin-transform-modules-umd-7.9.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" - sources."@babel/plugin-transform-new-target-7.8.3" - sources."@babel/plugin-transform-object-super-7.8.3" - sources."@babel/plugin-transform-parameters-7.9.3" - sources."@babel/plugin-transform-regenerator-7.8.7" - sources."@babel/plugin-transform-runtime-7.3.4" - sources."@babel/plugin-transform-shorthand-properties-7.8.3" - sources."@babel/plugin-transform-spread-7.8.3" - sources."@babel/plugin-transform-sticky-regex-7.8.3" - sources."@babel/plugin-transform-template-literals-7.8.3" - sources."@babel/plugin-transform-typeof-symbol-7.8.4" - sources."@babel/plugin-transform-unicode-regex-7.8.3" - sources."@babel/preset-env-7.3.4" - (sources."@babel/runtime-7.3.4" // { + sources."@babel/cli-7.8.4" + sources."@babel/code-frame-7.10.3" + sources."@babel/compat-data-7.10.3" + (sources."@babel/core-7.9.6" // { dependencies = [ - sources."regenerator-runtime-0.12.1" + sources."debug-4.2.0" + sources."ms-2.1.2" ]; }) - sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.0" - sources."@babel/types-7.9.0" + sources."@babel/generator-7.10.3" + sources."@babel/helper-annotate-as-pure-7.10.1" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.3" + sources."@babel/helper-compilation-targets-7.10.2" + sources."@babel/helper-create-regexp-features-plugin-7.10.1" + sources."@babel/helper-define-map-7.10.3" + sources."@babel/helper-explode-assignable-expression-7.10.3" + sources."@babel/helper-function-name-7.10.3" + sources."@babel/helper-get-function-arity-7.10.3" + sources."@babel/helper-hoist-variables-7.10.3" + sources."@babel/helper-member-expression-to-functions-7.10.3" + sources."@babel/helper-module-imports-7.10.3" + sources."@babel/helper-module-transforms-7.10.1" + sources."@babel/helper-optimise-call-expression-7.10.3" + sources."@babel/helper-plugin-utils-7.10.3" + sources."@babel/helper-regex-7.10.1" + sources."@babel/helper-remap-async-to-generator-7.10.3" + sources."@babel/helper-replace-supers-7.10.1" + sources."@babel/helper-simple-access-7.10.1" + sources."@babel/helper-split-export-declaration-7.10.1" + sources."@babel/helper-validator-identifier-7.10.3" + sources."@babel/helper-wrap-function-7.10.1" + sources."@babel/helpers-7.10.1" + sources."@babel/highlight-7.10.3" + sources."@babel/parser-7.10.3" + sources."@babel/plugin-proposal-async-generator-functions-7.10.3" + sources."@babel/plugin-proposal-dynamic-import-7.10.1" + sources."@babel/plugin-proposal-json-strings-7.10.1" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.1" + sources."@babel/plugin-proposal-numeric-separator-7.10.1" + sources."@babel/plugin-proposal-object-rest-spread-7.10.3" + sources."@babel/plugin-proposal-optional-catch-binding-7.10.1" + sources."@babel/plugin-proposal-optional-chaining-7.10.3" + sources."@babel/plugin-proposal-unicode-property-regex-7.10.1" + sources."@babel/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-json-strings-7.8.3" + sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.10.1" + sources."@babel/plugin-syntax-object-rest-spread-7.8.3" + sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" + sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-top-level-await-7.10.1" + sources."@babel/plugin-transform-arrow-functions-7.10.1" + sources."@babel/plugin-transform-async-to-generator-7.10.1" + sources."@babel/plugin-transform-block-scoped-functions-7.10.1" + sources."@babel/plugin-transform-block-scoping-7.10.1" + sources."@babel/plugin-transform-classes-7.10.3" + sources."@babel/plugin-transform-computed-properties-7.10.3" + sources."@babel/plugin-transform-destructuring-7.10.1" + sources."@babel/plugin-transform-dotall-regex-7.10.1" + sources."@babel/plugin-transform-duplicate-keys-7.10.1" + sources."@babel/plugin-transform-exponentiation-operator-7.10.1" + sources."@babel/plugin-transform-for-of-7.10.1" + sources."@babel/plugin-transform-function-name-7.10.1" + sources."@babel/plugin-transform-literals-7.10.1" + sources."@babel/plugin-transform-member-expression-literals-7.10.1" + sources."@babel/plugin-transform-modules-amd-7.10.1" + sources."@babel/plugin-transform-modules-commonjs-7.10.1" + sources."@babel/plugin-transform-modules-systemjs-7.10.3" + sources."@babel/plugin-transform-modules-umd-7.10.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.3" + sources."@babel/plugin-transform-new-target-7.10.1" + sources."@babel/plugin-transform-object-super-7.10.1" + sources."@babel/plugin-transform-parameters-7.10.1" + sources."@babel/plugin-transform-property-literals-7.10.1" + sources."@babel/plugin-transform-regenerator-7.10.3" + sources."@babel/plugin-transform-reserved-words-7.10.1" + sources."@babel/plugin-transform-runtime-7.9.6" + sources."@babel/plugin-transform-shorthand-properties-7.10.1" + sources."@babel/plugin-transform-spread-7.10.1" + sources."@babel/plugin-transform-sticky-regex-7.10.1" + sources."@babel/plugin-transform-template-literals-7.10.3" + sources."@babel/plugin-transform-typeof-symbol-7.10.1" + sources."@babel/plugin-transform-unicode-regex-7.10.1" + sources."@babel/preset-env-7.9.6" + sources."@babel/preset-modules-0.1.3" + sources."@babel/runtime-7.9.6" + sources."@babel/template-7.10.3" + (sources."@babel/traverse-7.10.3" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) + sources."@babel/types-7.10.3" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -13258,27 +12932,28 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/anymatch-1.3.1" sources."@types/color-name-1.1.1" - sources."@types/events-3.0.0" - sources."@types/glob-7.1.1" - sources."@types/html-minifier-terser-5.0.0" + sources."@types/glob-7.1.2" + sources."@types/html-minifier-terser-5.1.0" + sources."@types/http-proxy-1.17.4" + sources."@types/json-schema-7.0.5" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.0" - sources."@types/q-1.5.2" + sources."@types/node-14.0.13" + sources."@types/q-1.5.4" sources."@types/source-list-map-0.1.2" - sources."@types/tapable-1.0.5" - (sources."@types/uglify-js-3.0.5" // { + sources."@types/tapable-1.0.6" + (sources."@types/uglify-js-3.9.2" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.10" // { + (sources."@types/webpack-4.41.17" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-sources-0.1.7" // { + (sources."@types/webpack-sources-1.4.0" // { dependencies = [ - sources."source-map-0.6.1" + sources."source-map-0.7.3" ]; }) sources."@webassemblyjs/ast-1.9.0" @@ -13304,16 +12979,20 @@ in sources."accepts-1.3.7" sources."acorn-6.4.1" sources."address-1.0.3" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.4.1" + sources."ajv-keywords-3.5.0" sources."alphanum-sort-1.0.2" sources."ansi-colors-3.2.4" sources."ansi-escapes-3.2.0" sources."ansi-html-0.0.7" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" - sources."anymatch-3.1.1" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) sources."aproba-1.2.0" sources."argparse-1.0.10" sources."arr-diff-4.0.0" @@ -13328,7 +13007,11 @@ in sources."array-unique-0.3.2" sources."asap-2.0.6" sources."asn1-0.2.4" - sources."asn1.js-4.10.1" + (sources."asn1.js-4.10.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) (sources."assert-1.5.0" // { dependencies = [ sources."inherits-2.0.1" @@ -13336,11 +13019,7 @@ in ]; }) sources."assert-plus-1.0.0" - (sources."assets-webpack-plugin-3.9.12" // { - dependencies = [ - sources."mkdirp-0.5.3" - ]; - }) + sources."assets-webpack-plugin-3.9.12" sources."assign-symbols-1.0.0" sources."async-0.9.2" sources."async-each-1.0.3" @@ -13353,10 +13032,10 @@ in ]; }) sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" + sources."aws4-1.10.0" sources."babel-extract-comments-1.0.0" - sources."babel-loader-8.0.4" - sources."babel-plugin-dynamic-import-node-2.3.0" + sources."babel-loader-8.1.0" + sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-syntax-object-rest-spread-6.13.0" sources."babel-plugin-transform-object-rest-spread-6.26.0" (sources."babel-runtime-6.26.0" // { @@ -13376,16 +13055,14 @@ in sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" sources."binary-0.3.0" - sources."binary-extensions-2.0.0" + sources."binary-extensions-1.13.1" sources."bindings-1.5.0" sources."binwrap-0.2.2" sources."bluebird-3.7.2" - sources."bn.js-4.11.8" + sources."bn.js-5.1.2" (sources."body-parser-1.19.0" // { dependencies = [ sources."bytes-3.1.0" - sources."debug-2.6.9" - sources."ms-2.0.0" sources."qs-6.7.0" ]; }) @@ -13396,15 +13073,29 @@ in }) sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) sources."brorand-1.1.0" sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" sources."browserify-des-1.0.2" - sources."browserify-rsa-4.0.1" - sources."browserify-sign-4.0.4" + (sources."browserify-rsa-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + (sources."browserify-sign-4.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + ]; + }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.11.1" + sources."browserslist-4.12.0" sources."buffer-4.9.2" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" @@ -13421,7 +13112,7 @@ in sources."camel-case-4.1.1" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001039" + sources."caniuse-lite-1.0.30001087" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" sources."chainsaw-0.1.0" @@ -13431,11 +13122,7 @@ in ]; }) sources."chardet-0.7.0" - (sources."chokidar-3.3.0" // { - dependencies = [ - sources."glob-parent-5.1.1" - ]; - }) + sources."chokidar-2.1.8" sources."chownr-1.1.4" sources."chrome-trace-event-1.0.2" sources."cipher-base-1.0.4" @@ -13463,7 +13150,7 @@ in }) sources."cli-cursor-2.1.0" sources."cli-table-0.3.1" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" (sources."cliui-3.2.0" // { dependencies = [ sources."strip-ansi-3.0.1" @@ -13478,17 +13165,12 @@ in sources."color-string-1.5.3" sources."colors-1.0.3" sources."combined-stream-1.0.8" - sources."commander-2.20.3" + sources."commander-4.1.1" sources."common-tags-1.8.0" sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."compressible-2.0.18" - (sources."compression-1.7.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) + sources."compression-1.7.4" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."connect-history-api-fallback-1.6.0" @@ -13503,38 +13185,41 @@ in sources."copy-descriptor-0.1.1" (sources."copy-webpack-plugin-5.1.1" // { dependencies = [ - sources."find-cache-dir-2.1.0" - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."make-dir-2.1.0" - sources."p-limit-2.2.2" - sources."p-locate-3.0.0" + sources."p-limit-2.3.0" sources."p-try-2.2.0" - sources."pify-4.0.1" - sources."pkg-dir-3.0.0" + sources."schema-utils-1.0.0" ]; }) sources."core-js-2.6.11" + (sources."core-js-compat-3.6.5" // { + dependencies = [ + sources."semver-7.0.0" + ]; + }) sources."core-util-is-1.0.2" sources."cosmiconfig-5.2.1" - sources."create-ecdh-4.0.3" + (sources."create-ecdh-4.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - sources."cross-spawn-6.0.5" + sources."cross-spawn-7.0.3" sources."crypto-browserify-3.12.0" sources."css-color-names-0.0.4" (sources."css-declaration-sorter-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) - (sources."css-loader-3.4.2" // { + (sources."css-loader-3.5.3" // { dependencies = [ - sources."postcss-7.0.27" - sources."postcss-value-parser-4.0.3" - sources."schema-utils-2.6.5" + sources."postcss-7.0.32" + sources."postcss-value-parser-4.1.0" + sources."semver-6.3.0" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; @@ -13550,14 +13235,14 @@ in sources."cssesc-3.0.0" (sources."cssnano-4.1.10" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."cssnano-preset-default-4.0.7" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; @@ -13566,7 +13251,7 @@ in sources."cssnano-util-get-match-4.0.0" (sources."cssnano-util-raw-cache-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; @@ -13582,7 +13267,7 @@ in sources."cycle-1.0.3" sources."cyclist-1.0.1" sources."dashdash-1.14.1" - sources."debug-4.1.1" + sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."deep-equal-0.2.2" @@ -13596,7 +13281,6 @@ in sources."pify-2.3.0" ]; }) - sources."pify-4.0.1" ]; }) sources."delayed-stream-1.0.0" @@ -13604,13 +13288,12 @@ in sources."des.js-1.0.1" sources."destroy-1.0.4" sources."detect-node-2.0.4" - (sources."detect-port-alt-1.1.6" // { + sources."detect-port-alt-1.1.6" + (sources."diffie-hellman-5.0.3" // { dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" + sources."bn.js-4.11.9" ]; }) - sources."diffie-hellman-5.0.3" sources."dir-glob-2.2.2" sources."dns-equal-1.0.0" sources."dns-packet-1.3.1" @@ -13627,13 +13310,17 @@ in sources."domutils-1.5.1" sources."dot-case-3.0.3" sources."dot-prop-5.2.0" - sources."dotenv-5.0.1" + sources."dotenv-8.2.0" sources."duplexer-0.1.1" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.397" - sources."elliptic-6.5.2" + sources."electron-to-chromium-1.3.481" + (sources."elliptic-6.5.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) sources."elm-0.19.1-3" sources."elm-asset-webpack-loader-1.1.2" sources."elm-hot-1.1.4" @@ -13641,33 +13328,42 @@ in (sources."elm-test-0.19.1-revision2" // { dependencies = [ sources."ansi-styles-4.2.1" + sources."anymatch-3.1.1" + sources."binary-extensions-2.0.0" + sources."braces-3.0.2" sources."chalk-3.0.0" + sources."chokidar-3.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.1" + sources."fill-range-7.0.1" sources."fs-extra-8.1.0" + sources."fsevents-2.1.3" + sources."glob-parent-5.1.1" sources."has-flag-4.0.0" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" + sources."is-binary-path-2.1.0" + sources."is-number-7.0.0" + sources."readdirp-3.2.0" sources."supports-color-7.1.0" + sources."to-regex-range-5.0.1" sources."which-2.0.1" ]; }) - sources."elm-webpack-loader-6.0.0" + sources."elm-webpack-loader-6.0.1" sources."elmi-to-json-1.3.0" + sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-4.1.1" // { + (sources."enhanced-resolve-4.2.0" // { dependencies = [ sources."memory-fs-0.5.0" ]; }) - sources."entities-2.0.0" + sources."entities-2.0.3" sources."errno-0.1.7" sources."error-ex-1.3.2" - sources."es-abstract-1.17.5" + sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-2.0.0" @@ -13675,15 +13371,23 @@ in sources."esprima-4.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" + sources."esutils-2.0.3" sources."etag-1.8.1" - sources."eventemitter3-4.0.0" + sources."eventemitter3-4.0.4" sources."events-3.1.0" sources."eventsource-0.1.6" sources."evp_bytestokey-1.0.3" - sources."execa-1.0.0" + (sources."execa-1.0.0" // { + dependencies = [ + sources."cross-spawn-6.0.5" + sources."path-key-2.0.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" + ]; + }) (sources."expand-brackets-2.1.4" // { dependencies = [ - sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" (sources."is-accessor-descriptor-0.1.6" // { @@ -13697,56 +13401,31 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" sources."kind-of-5.1.0" - sources."ms-2.0.0" ]; }) sources."expand-tilde-2.0.2" (sources."express-4.17.1" // { dependencies = [ sources."array-flatten-1.1.1" - sources."debug-2.6.9" - sources."ms-2.0.0" sources."qs-6.7.0" ]; }) sources."extend-3.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) + sources."extend-shallow-3.0.2" sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) sources."extsprintf-1.3.0" sources."eyes-0.1.8" - sources."fast-deep-equal-3.1.1" - (sources."fast-glob-2.2.7" // { - dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."micromatch-3.1.10" - sources."to-regex-range-2.1.1" - ]; - }) + sources."fast-deep-equal-3.1.3" + sources."fast-glob-2.2.7" sources."fast-json-stable-stringify-2.1.0" sources."faye-websocket-0.11.3" sources."figgy-pudding-3.5.2" @@ -13762,14 +13441,14 @@ in }) sources."file-uri-to-path-1.0.0" sources."filesize-3.6.1" - sources."fill-range-7.0.1" - (sources."finalhandler-1.1.2" // { + (sources."fill-range-4.0.0" // { dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) - sources."find-cache-dir-1.0.0" + sources."finalhandler-1.1.2" + sources."find-cache-dir-2.1.0" (sources."find-elm-dependencies-2.0.2" // { dependencies = [ sources."firstline-1.2.0" @@ -13779,11 +13458,7 @@ in sources."find-up-2.1.0" sources."firstline-2.0.2" sources."flush-write-stream-1.1.1" - (sources."follow-redirects-1.11.0" // { - dependencies = [ - sources."debug-3.2.6" - ]; - }) + sources."follow-redirects-1.12.1" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -13796,8 +13471,9 @@ in sources."fs-readdir-recursive-1.1.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-1.2.13" sources."function-bind-1.1.1" + sources."gensync-1.0.0-beta.1" sources."get-caller-file-1.0.3" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-stream-4.1.0" @@ -13811,15 +13487,24 @@ in }) sources."glob-to-regexp-0.3.0" sources."global-modules-1.0.0" - sources."global-prefix-1.0.2" + (sources."global-prefix-1.0.2" // { + dependencies = [ + sources."which-1.3.1" + ]; + }) sources."globals-11.12.0" (sources."globby-7.1.1" // { dependencies = [ + sources."pify-3.0.0" sources."slash-1.0.0" ]; }) - sources."graceful-fs-4.2.3" - sources."gzip-size-5.0.0" + sources."graceful-fs-4.2.4" + (sources."gzip-size-5.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) sources."handle-thing-2.0.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -13829,15 +13514,15 @@ in sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) sources."kind-of-4.0.0" ]; }) - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + ]; + }) sources."hash.js-1.1.7" sources."he-1.2.0" sources."hex-color-regex-1.1.0" @@ -13848,17 +13533,9 @@ in sources."hsl-regex-1.0.0" sources."hsla-regex-1.0.0" sources."html-comment-regex-1.1.2" - sources."html-entities-1.2.1" - (sources."html-minifier-terser-5.0.5" // { - dependencies = [ - sources."commander-4.1.1" - ]; - }) - (sources."html-webpack-plugin-4.0.4" // { - dependencies = [ - sources."util.promisify-1.0.0" - ]; - }) + sources."html-entities-1.3.1" + sources."html-minifier-terser-5.1.1" + sources."html-webpack-plugin-4.3.0" (sources."htmlparser2-3.10.1" // { dependencies = [ sources."entities-1.1.2" @@ -13871,16 +13548,24 @@ in sources."inherits-2.0.3" ]; }) - sources."http-parser-js-0.4.10" - sources."http-proxy-1.18.0" - sources."http-proxy-middleware-0.20.0" + sources."http-parser-js-0.5.2" + sources."http-proxy-1.18.1" + (sources."http-proxy-middleware-0.21.0" // { + dependencies = [ + sources."braces-3.0.2" + sources."fill-range-7.0.1" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."to-regex-range-5.0.1" + ]; + }) sources."http-signature-1.2.0" sources."https-browserify-1.0.0" sources."i-0.3.6" sources."iconv-lite-0.4.24" (sources."icss-utils-4.1.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; @@ -13889,17 +13574,10 @@ in sources."iferr-0.1.5" sources."ignore-3.3.10" sources."immer-1.7.2" + sources."import-cwd-2.1.0" sources."import-fresh-2.0.0" - (sources."import-local-2.0.0" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.2.2" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."pkg-dir-3.0.0" - ]; - }) + sources."import-from-2.1.0" + sources."import-local-2.0.0" sources."imurmurhash-0.1.4" sources."indexes-of-1.0.1" sources."infer-owner-1.0.4" @@ -13925,27 +13603,29 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" - sources."is-binary-path-2.1.0" + sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.1.5" + sources."is-callable-1.2.0" sources."is-color-stop-1.1.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" - sources."is-extendable-0.1.1" + sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" - sources."is-number-7.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."is-obj-2.0.0" sources."is-path-cwd-2.2.0" sources."is-path-in-cwd-2.1.0" sources."is-path-inside-2.1.0" - sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" - sources."is-regex-1.0.5" + sources."is-regex-1.1.0" sources."is-regexp-1.0.0" sources."is-resolvable-1.1.0" sources."is-root-2.0.0" @@ -13960,9 +13640,8 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."js-levenshtein-1.1.6" sources."js-tokens-4.0.0" - sources."js-yaml-3.13.1" + sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" @@ -13971,7 +13650,7 @@ in sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."json3-3.3.3" - sources."json5-2.1.2" + sources."json5-2.1.3" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" sources."jsprim-1.4.1" @@ -13979,6 +13658,8 @@ in sources."kind-of-6.0.3" sources."last-call-webpack-plugin-3.0.0" sources."lcid-1.0.0" + sources."leven-3.1.0" + sources."levenary-1.1.1" (sources."load-json-file-1.1.0" // { dependencies = [ sources."parse-json-2.2.0" @@ -13998,33 +13679,35 @@ in sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" sources."lodash.uniq-4.5.0" - sources."loglevel-1.6.7" + sources."loglevel-1.6.8" sources."loose-envify-1.4.0" sources."lower-case-2.0.1" sources."lru-cache-5.1.1" - sources."make-dir-1.3.0" - sources."map-age-cleaner-0.1.3" + sources."make-dir-2.1.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."md5.js-1.3.5" sources."mdn-data-2.0.4" sources."media-typer-0.3.0" - (sources."mem-4.3.0" // { - dependencies = [ - sources."mimic-fn-2.1.0" - ]; - }) sources."memory-fs-0.4.1" sources."merge-descriptors-1.0.1" - sources."merge2-1.3.0" + sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.2" - sources."miller-rabin-4.0.1" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."micromatch-3.1.10" + (sources."miller-rabin-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."mime-2.4.6" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" - sources."mini-css-extract-plugin-0.4.5" + (sources."mini-css-extract-plugin-0.4.5" // { + dependencies = [ + sources."schema-utils-1.0.0" + ]; + }) sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" @@ -14032,39 +13715,47 @@ in sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mississippi-3.0.0" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-0.5.5" + sources."mixin-deep-1.3.2" + sources."mkdirp-0.5.3" sources."move-concurrently-1.0.1" - sources."ms-2.1.2" + sources."ms-2.0.0" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" sources."mute-stream-0.0.8" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."ncp-1.0.1" sources."negotiator-0.6.2" sources."neo-async-2.6.1" sources."nice-try-1.0.5" sources."no-case-3.0.3" - sources."node-elm-compiler-5.0.4" + (sources."node-elm-compiler-5.0.4" // { + dependencies = [ + sources."cross-spawn-6.0.5" + sources."path-key-2.0.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" + ]; + }) sources."node-forge-0.9.0" (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.53" + sources."node-releases-1.1.58" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" sources."normalize-url-3.3.0" - sources."npm-run-path-2.0.2" + (sources."npm-run-path-2.0.2" // { + dependencies = [ + sources."path-key-2.0.1" + ]; + }) sources."nth-check-1.0.2" sources."num2fraction-1.2.2" sources."number-is-nan-1.0.1" @@ -14083,12 +13774,12 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.7.0" - sources."object-is-1.0.2" + sources."object-inspect-1.8.0" + sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" - sources."object.entries-1.1.1" + sources."object.entries-1.1.2" sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" sources."object.values-1.1.1" @@ -14101,13 +13792,9 @@ in sources."optimize-css-assets-webpack-plugin-5.0.3" sources."original-1.0.2" sources."os-browserify-0.3.0" - sources."os-homedir-1.0.2" sources."os-locale-1.4.0" sources."os-tmpdir-1.0.2" - sources."output-file-sync-2.0.1" - sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-2.1.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-map-2.1.0" @@ -14127,23 +13814,36 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" + sources."path-key-3.1.1" sources."path-parse-1.0.6" sources."path-to-regexp-0.1.7" - sources."path-type-3.0.0" - sources."pbkdf2-3.0.17" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."pbkdf2-3.1.1" sources."performance-now-2.1.0" sources."picomatch-2.2.2" - sources."pify-3.0.0" + sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pkg-dir-2.0.0" + (sources."pkg-dir-3.0.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + ]; + }) sources."pkg-up-2.0.0" sources."pkginfo-0.4.1" - (sources."portfinder-1.0.25" // { + (sources."portfinder-1.0.26" // { dependencies = [ sources."async-2.6.3" sources."debug-3.2.6" + sources."ms-2.1.2" ]; }) sources."posix-character-classes-0.1.1" @@ -14154,88 +13854,80 @@ in }) (sources."postcss-calc-7.0.2" // { dependencies = [ - sources."postcss-7.0.27" - sources."postcss-value-parser-4.0.3" + sources."postcss-7.0.32" + sources."postcss-value-parser-4.1.0" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-colormin-4.0.3" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-convert-values-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-discard-comments-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-discard-duplicates-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-discard-empty-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-discard-overridden-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) - sources."postcss-flexbugs-fixes-3.3.1" - (sources."postcss-load-config-1.2.0" // { + (sources."postcss-flexbugs-fixes-4.2.1" // { dependencies = [ - sources."cosmiconfig-2.2.2" - sources."parse-json-2.2.0" + sources."postcss-7.0.32" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" ]; }) - (sources."postcss-load-options-1.2.0" // { + sources."postcss-load-config-2.1.0" + (sources."postcss-loader-3.0.0" // { dependencies = [ - sources."cosmiconfig-2.2.2" - sources."parse-json-2.2.0" - ]; - }) - (sources."postcss-load-plugins-2.3.0" // { - dependencies = [ - sources."cosmiconfig-2.2.2" - sources."parse-json-2.2.0" - ]; - }) - (sources."postcss-loader-2.1.5" // { - dependencies = [ - sources."schema-utils-0.4.7" + sources."postcss-7.0.32" + sources."schema-utils-1.0.0" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" ]; }) (sources."postcss-merge-longhand-4.0.11" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-merge-rules-4.0.3" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."postcss-selector-parser-3.1.2" sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -14243,28 +13935,28 @@ in }) (sources."postcss-minify-font-values-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-minify-gradients-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-minify-params-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-minify-selectors-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."postcss-selector-parser-3.1.2" sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -14272,120 +13964,120 @@ in }) (sources."postcss-modules-extract-imports-2.0.0" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-modules-local-by-default-3.0.2" // { dependencies = [ - sources."postcss-7.0.27" - sources."postcss-value-parser-4.0.3" + sources."postcss-7.0.32" + sources."postcss-value-parser-4.1.0" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-modules-scope-2.2.0" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-modules-values-3.0.0" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-charset-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-display-values-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-positions-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-repeat-style-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-string-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-timing-functions-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-unicode-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-url-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-normalize-whitespace-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-ordered-values-4.1.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-reduce-initial-4.0.3" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-reduce-transforms-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-safe-parser-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; @@ -14393,14 +14085,14 @@ in sources."postcss-selector-parser-6.0.2" (sources."postcss-svgo-4.0.2" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; }) (sources."postcss-unique-selectors-4.0.1" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."source-map-0.6.1" sources."supports-color-6.1.0" ]; @@ -14422,7 +14114,11 @@ in sources."prr-1.0.1" sources."pseudomap-1.0.2" sources."psl-1.8.0" - sources."public-encrypt-4.0.3" + (sources."public-encrypt-4.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -14450,7 +14146,7 @@ in sources."big.js-3.2.0" sources."browserslist-4.1.1" sources."chalk-2.4.1" - sources."debug-2.6.9" + sources."cross-spawn-6.0.5" sources."emojis-list-2.1.0" sources."escape-string-regexp-1.0.5" sources."find-up-3.0.0" @@ -14458,14 +14154,18 @@ in sources."json5-0.5.1" sources."loader-utils-1.1.0" sources."locate-path-3.0.0" - sources."ms-2.0.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" + sources."path-key-2.0.1" + sources."pify-3.0.0" sources."react-error-overlay-5.1.6" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."slash-1.0.0" sources."sockjs-client-1.1.5" sources."strip-ansi-4.0.0" + sources."which-1.3.1" ]; }) sources."react-error-overlay-4.0.1" @@ -14483,20 +14183,16 @@ in ]; }) sources."readable-stream-2.3.7" - sources."readdirp-3.2.0" + sources."readdirp-2.2.1" sources."recursive-readdir-2.2.2" - sources."regenerate-1.4.0" + sources."regenerate-1.4.1" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.5" - (sources."regenerator-transform-0.14.4" // { - dependencies = [ - sources."@babel/runtime-7.9.2" - ]; - }) + sources."regenerator-transform-0.14.4" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.0" sources."regexpu-core-4.7.0" - sources."regjsgen-0.5.1" + sources."regjsgen-0.5.2" (sources."regjsparser-0.6.4" // { dependencies = [ sources."jsesc-0.5.0" @@ -14515,10 +14211,9 @@ in sources."request-promise-4.2.5" sources."request-promise-core-1.1.3" sources."require-directory-2.1.1" - sources."require-from-string-1.2.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."resolve-cwd-2.0.0" sources."resolve-dir-1.0.1" sources."resolve-from-3.0.0" @@ -14531,24 +14226,19 @@ in sources."rgba-regex-1.0.0" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."run-queue-1.0.3" sources."rxjs-6.5.5" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."schema-utils-1.0.0" + sources."schema-utils-2.7.0" sources."select-hose-2.0.0" sources."selfsigned-1.10.7" sources."semver-5.7.1" (sources."send-0.17.1" // { dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) sources."mime-1.6.0" sources."ms-2.1.1" ]; @@ -14556,10 +14246,8 @@ in sources."serialize-javascript-2.1.2" (sources."serve-index-1.9.1" // { dependencies = [ - sources."debug-2.6.9" sources."http-errors-1.6.3" sources."inherits-2.0.3" - sources."ms-2.0.0" sources."setprototypeof-1.1.0" ]; }) @@ -14568,13 +14256,14 @@ in (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) sources."setimmediate-1.0.5" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."shell-quote-1.6.1" sources."signal-exit-3.0.3" (sources."simple-swizzle-0.2.2" // { @@ -14585,7 +14274,6 @@ in sources."slash-2.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ - sources."debug-2.6.9" sources."define-property-0.2.5" sources."extend-shallow-2.0.1" (sources."is-accessor-descriptor-0.1.6" // { @@ -14599,8 +14287,8 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" sources."kind-of-5.1.0" - sources."ms-2.0.0" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -14613,33 +14301,42 @@ in sources."kind-of-3.2.2" ]; }) - (sources."sockjs-0.3.19" // { + (sources."sockjs-0.3.20" // { dependencies = [ sources."faye-websocket-0.10.0" + sources."websocket-driver-0.6.5" ]; }) (sources."sockjs-client-1.4.0" // { dependencies = [ sources."debug-3.2.6" sources."eventsource-1.0.7" + sources."ms-2.1.2" ]; }) sources."source-list-map-2.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."source-map-url-0.4.0" - sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" - sources."spdx-expression-parse-3.0.0" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.5" - sources."spdy-4.0.2" + (sources."spdy-4.0.2" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) (sources."spdy-transport-3.0.0" // { dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" sources."readable-stream-3.6.0" ]; }) @@ -14673,16 +14370,14 @@ in sources."stream-each-1.2.3" sources."stream-http-2.8.3" sources."stream-shift-1.0.1" - sources."string-replace-loader-2.2.0" + sources."string-replace-loader-2.3.0" (sources."string-width-1.0.2" // { dependencies = [ sources."strip-ansi-3.0.1" ]; }) - sources."string.prototype.trimend-1.0.0" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" - sources."string.prototype.trimstart-1.0.0" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.1.1" (sources."stringify-object-3.3.0" // { dependencies = [ @@ -14697,14 +14392,14 @@ in sources."strip-bom-2.0.0" sources."strip-comments-1.0.2" sources."strip-eof-1.0.0" - (sources."style-loader-0.21.0" // { + (sources."style-loader-0.23.1" // { dependencies = [ - sources."schema-utils-0.4.7" + sources."schema-utils-1.0.0" ]; }) (sources."stylehacks-4.0.3" // { dependencies = [ - sources."postcss-7.0.27" + sources."postcss-7.0.32" sources."postcss-selector-parser-3.1.2" sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -14714,7 +14409,7 @@ in (sources."svgo-1.3.2" // { dependencies = [ sources."css-select-2.1.0" - sources."css-what-3.2.1" + sources."css-what-3.3.0" sources."domutils-1.7.0" ]; }) @@ -14725,22 +14420,16 @@ in sources."rimraf-2.6.3" ]; }) - (sources."terser-4.6.10" // { + (sources."terser-4.8.0" // { dependencies = [ + sources."commander-2.20.3" sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.3" // { + (sources."terser-webpack-plugin-1.4.4" // { dependencies = [ - sources."find-cache-dir-2.1.0" - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."make-dir-2.1.0" - sources."p-limit-2.2.2" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."pify-4.0.1" - sources."pkg-dir-3.0.0" + sources."schema-utils-1.0.0" + sources."serialize-javascript-3.1.0" sources."source-map-0.6.1" ]; }) @@ -14759,11 +14448,11 @@ in ]; }) sources."to-regex-3.0.2" - sources."to-regex-range-5.0.1" + sources."to-regex-range-2.1.1" sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."traverse-0.3.9" - sources."tslib-1.11.1" + sources."tslib-1.13.0" sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -14778,8 +14467,12 @@ in (sources."uglifyjs-webpack-plugin-1.3.0" // { dependencies = [ sources."cacache-10.0.4" + sources."find-cache-dir-1.0.0" sources."lru-cache-4.1.5" + sources."make-dir-1.3.0" sources."mississippi-2.0.0" + sources."pify-3.0.0" + sources."pkg-dir-2.0.0" sources."pump-2.0.1" sources."schema-utils-0.4.7" sources."serialize-javascript-1.9.1" @@ -14792,7 +14485,11 @@ in sources."unicode-match-property-ecmascript-1.0.4" sources."unicode-match-property-value-ecmascript-1.2.0" sources."unicode-property-aliases-ecmascript-1.1.0" - sources."union-value-1.0.1" + (sources."union-value-1.0.1" // { + dependencies = [ + sources."is-extendable-0.1.1" + ]; + }) sources."uniq-1.0.1" sources."uniqs-2.0.0" sources."unique-filename-1.1.1" @@ -14819,7 +14516,11 @@ in sources."punycode-1.3.2" ]; }) - sources."url-loader-1.1.2" + (sources."url-loader-1.1.2" // { + dependencies = [ + sources."schema-utils-1.0.0" + ]; + }) sources."url-parse-1.4.7" sources."use-3.1.1" (sources."util-0.11.1" // { @@ -14828,7 +14529,7 @@ in ]; }) sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" + sources."util.promisify-1.0.0" sources."utila-0.4.0" sources."utile-0.3.0" sources."utils-merge-1.0.1" @@ -14838,82 +14539,67 @@ in sources."vendors-1.0.4" sources."verror-1.10.0" sources."vm-browserify-1.1.2" - (sources."watchpack-1.6.1" // { + (sources."watchpack-1.7.2" // { dependencies = [ - sources."anymatch-2.0.0" - sources."binary-extensions-1.13.1" - sources."braces-2.3.2" - sources."chokidar-2.1.8" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."fsevents-1.2.12" - sources."is-binary-path-1.0.1" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" - sources."normalize-path-2.1.1" - sources."readdirp-2.2.1" - sources."to-regex-range-2.1.1" + sources."anymatch-3.1.1" + sources."binary-extensions-2.0.0" + sources."braces-3.0.2" + sources."chokidar-3.4.0" + sources."fill-range-7.0.1" + sources."fsevents-2.1.3" + sources."glob-parent-5.1.1" + sources."is-binary-path-2.1.0" + sources."is-number-7.0.0" + sources."readdirp-3.4.0" + sources."to-regex-range-5.0.1" ]; }) + sources."watchpack-chokidar2-2.0.0" sources."wbuf-1.7.3" - (sources."webpack-4.42.1" // { + (sources."webpack-4.43.0" // { dependencies = [ - sources."braces-2.3.2" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" - sources."to-regex-range-2.1.1" + sources."schema-utils-1.0.0" ]; }) sources."webpack-dev-middleware-3.7.2" - (sources."webpack-dev-server-3.10.3" // { + (sources."webpack-dev-server-3.11.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."anymatch-2.0.0" - sources."binary-extensions-1.13.1" - sources."braces-2.3.2" - sources."chokidar-2.1.8" - (sources."cliui-4.1.0" // { + sources."ansi-regex-4.1.0" + (sources."cliui-5.0.0" // { dependencies = [ - sources."strip-ansi-4.0.0" + sources."strip-ansi-5.2.0" ]; }) - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" + sources."debug-4.2.0" sources."find-up-3.0.0" - sources."fsevents-1.2.12" + sources."get-caller-file-2.0.5" sources."http-proxy-middleware-0.19.1" - sources."invert-kv-2.0.0" sources."is-absolute-url-3.0.3" - sources."is-binary-path-1.0.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."lcid-2.0.0" sources."locate-path-3.0.0" - sources."micromatch-3.1.10" - sources."normalize-path-2.1.1" + sources."ms-2.1.2" sources."opn-5.5.0" - sources."os-locale-3.1.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."readdirp-2.2.1" + sources."require-main-filename-2.0.0" + sources."schema-utils-1.0.0" sources."semver-6.3.0" - (sources."string-width-2.1.1" // { + (sources."string-width-3.1.0" // { dependencies = [ - sources."strip-ansi-4.0.0" + sources."strip-ansi-5.2.0" ]; }) sources."strip-ansi-3.0.1" sources."supports-color-6.1.0" - sources."to-regex-range-2.1.1" sources."which-module-2.0.0" - sources."yargs-12.0.5" - sources."yargs-parser-11.1.1" + (sources."wrap-ansi-5.1.0" // { + dependencies = [ + sources."strip-ansi-5.2.0" + ]; + }) + sources."yargs-13.3.2" + sources."yargs-parser-13.1.2" ]; }) sources."webpack-log-2.0.0" @@ -14927,10 +14613,10 @@ in sources."source-map-0.6.1" ]; }) - sources."websocket-driver-0.7.3" - sources."websocket-extensions-0.1.3" - sources."whatwg-fetch-2.0.4" - sources."which-1.3.1" + sources."websocket-driver-0.7.4" + sources."websocket-extensions-0.1.4" + sources."whatwg-fetch-3.0.0" + sources."which-2.0.2" sources."which-module-1.0.0" (sources."winston-2.1.1" // { dependencies = [ diff --git a/pkgs/development/compilers/elm/packages/patch-binwrap.nix b/pkgs/development/compilers/elm/packages/patch-binwrap.nix deleted file mode 100644 index 30f54e6f5ac5..000000000000 --- a/pkgs/development/compilers/elm/packages/patch-binwrap.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ writeScriptBin, stdenv, lib }: -let - # Patching binwrap by NoOp script - binwrap = writeScriptBin "binwrap" '' - #! ${stdenv.shell} - echo "binwrap called: Returning 0" - return 0 - ''; - binwrap-install = writeScriptBin "binwrap-install" '' - #! ${stdenv.shell} - echo "binwrap-install called: Doing nothing" - ''; -in -targets: -pkg: -pkg.override { - nativeBuildInputs = pkg.nativeBuildInputs ++ [ binwrap binwrap-install ]; - - # Manually install targets - # by symlinking binaries into `node_modules` - postInstall = let - binFile = module: lib.strings.removeSuffix ("-" + module.version) module.name; - in '' - ${lib.concatStrings (map (module: '' - echo "linking ${binFile module}" - ln -sf ${module}/bin/${binFile module} \ - node_modules/${binFile module}/bin/${binFile module} - '') targets)} - ''; -} 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 2442/3452] 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 2443/3452] 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 2444/3452] 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 2445/3452] 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 2446/3452] 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 2447/3452] 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 2448/3452] 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 2449/3452] 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 2450/3452] 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 2451/3452] 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 2452/3452] 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 2453/3452] 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 2454/3452] 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 2455/3452] 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 2456/3452] 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 2457/3452] 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 2458/3452] 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 2459/3452] 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 2460/3452] 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 2461/3452] 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 2462/3452] 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 2463/3452] 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 2464/3452] 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 2465/3452] 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 2466/3452] 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 2467/3452] 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 2468/3452] 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 2469/3452] 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 2470/3452] 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 15197ad89872e3073884f9cadf1fa55f0224b26f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Jun 2020 02:30:44 +0200 Subject: [PATCH 2471/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-5-g7c30584 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/04f759deb65577ab8494cc2f95c7ba2def2ca826. --- .../haskell-modules/hackage-packages.nix | 166 +++++++++++++++--- 1 file changed, 140 insertions(+), 26 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 65db8a8c5731..4309c542d725 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -24723,8 +24723,8 @@ self: { }: mkDerivation { pname = "aeson-with"; - version = "0.0.1.0"; - sha256 = "05xhbcfym586qb0giwr9rayqgyp25bc026kwbn7x5ln4nmzp2x9n"; + version = "0.1.0.0"; + sha256 = "17gzgy1mxcgq46bhys33l31x1bi532fj1qaazkapkx6a248fckw2"; libraryHaskellDepends = [ aeson base hashmap lens lens-aeson scientific text unordered-containers vector @@ -32174,8 +32174,8 @@ self: { ({ mkDerivation, array, base, doctest, doctest-driver-gen, hspec }: mkDerivation { pname = "array-list"; - version = "0.1.0.0"; - sha256 = "1km2d0j1qc4cm7nnfhxa9x9m806f2mrz20y4vpwgxwqmvlwl70iy"; + version = "0.2.0.0"; + sha256 = "17xdkn1p7zfg7rw9sfbv6amfab291gz8fafkl26x38al9khjcgy2"; libraryHaskellDepends = [ array base ]; testHaskellDepends = [ array base doctest doctest-driver-gen hspec @@ -71211,7 +71211,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_33_0" = callPackage + "dhall_1_33_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, cryptonite, data-fix, deepseq, Diff, directory @@ -71229,8 +71229,8 @@ self: { }: mkDerivation { pname = "dhall"; - version = "1.33.0"; - sha256 = "0njkn3kkzj14aa3qixcqpj0gdzkidlx6z92pkam84scs4ghs98k1"; + version = "1.33.1"; + sha256 = "17l6qh5zhy0gnxw0x5v4c6n00dmgk279lfyi65n2hsbpaspw7h2k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75242,8 +75242,8 @@ self: { }: mkDerivation { pname = "dobutokO4"; - version = "0.5.0.0"; - sha256 = "1l11ym6y7gx58cbirr5lanzzin0pybc2gswwwbhnhiqfrj2ybsr9"; + version = "0.6.0.0"; + sha256 = "0y06i7q1899ch205mybkmr6rsnjjs4ibsck2s6q5nx1d0kcpn1p7"; libraryHaskellDepends = [ base directory dobutokO2 mmsyn3 mmsyn7l process vector vector-doublezip @@ -81213,8 +81213,8 @@ self: { ({ mkDerivation, base, containers, deepseq }: mkDerivation { pname = "enummaps"; - version = "0.6.2.1.4"; - sha256 = "18a0akkj22x89m4a29rl1ic07ds1qgjixvdmjbqh3lb3bphk0f5l"; + version = "0.6.2.1.7"; + sha256 = "0p4klnhwr10yiv3w209vl1j09280257z0pz626ynbxbff4mh9wg4"; libraryHaskellDepends = [ base containers deepseq ]; description = "Enum wrappers for IntMap and IntSet"; license = stdenv.lib.licenses.bsd3; @@ -91073,20 +91073,21 @@ self: { }) {}; "fourmolu" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, exceptions - , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl - , optparse-applicative, path, path-io, syb, text + ({ mkDerivation, aeson, base, bytestring, containers, directory + , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec + , hspec-discover, mtl, optparse-applicative, path, path-io, syb + , text, yaml }: mkDerivation { pname = "fourmolu"; - version = "0.0.6.0"; - sha256 = "16i5wlwbvk9868nscj1xg5n8j3z56jbv9q4nipcwmzm76i19iqwf"; + version = "0.1.0.0"; + sha256 = "1kc7hhaqn7sghbcfj9xg8r1pvrmhawy9y2rhizfxzm7z034bgjyk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring containers dlist exceptions ghc-lib-parser mtl syb - text + aeson base bytestring containers directory dlist exceptions + filepath ghc-lib-parser mtl syb text yaml ]; executableHaskellDepends = [ base ghc-lib-parser gitrev optparse-applicative text @@ -114069,13 +114070,13 @@ self: { }) {}; "haskell-exp-parser" = callPackage - ({ mkDerivation, base, template-haskell }: + ({ mkDerivation, base, syb, template-haskell }: mkDerivation { pname = "haskell-exp-parser"; - version = "0.1.1"; - sha256 = "0p4p5ygw068chw6grci8mny2a1bn6nz74jm1q2sj97v7gglglg55"; + version = "0.1.3"; + sha256 = "0cswfpdw6sgmd0fhdpyfi2nk0mhvl8xpv4zfkl9l3wdk5ipbcxdf"; libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base syb template-haskell ]; description = "Simple parser parser from Haskell to TemplateHaskell expressions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -184757,6 +184758,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ormolu_0_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, dlist, exceptions + , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl + , optparse-applicative, path, path-io, syb, text + }: + mkDerivation { + pname = "ormolu"; + version = "0.1.1.0"; + sha256 = "0vi26dqraw2qb56z0x6q9m7klpa70r5wlrhwprap2p8nh73m2484"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers dlist exceptions ghc-lib-parser mtl syb + text + ]; + executableHaskellDepends = [ + base ghc-lib-parser gitrev optparse-applicative text + ]; + testHaskellDepends = [ + base containers filepath hspec path path-io text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "os-release" = callPackage ({ mkDerivation, base, containers, hlint, hspec, parsec, process , regex-compat, temporary, transformers @@ -185766,6 +185795,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-citeproc_0_17_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , Cabal, containers, data-default, directory, filepath, hs-bibutils + , HsYAML, HsYAML-aeson, libyaml, mtl, network, old-locale, pandoc + , pandoc-types, parsec, process, rfc5051, safe, setenv, split, syb + , tagsoup, temporary, text, time, unordered-containers, vector + , xml-conduit, yaml + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.17.0.1"; + sha256 = "0hi31h4jxamnyw0jsbwnbzy9gkp3a03mhsgwy9w73hi13lywxrgk"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hs-bibutils HsYAML HsYAML-aeson mtl network old-locale pandoc + pandoc-types parsec rfc5051 setenv split syb tagsoup text time + unordered-containers vector xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring filepath libyaml + pandoc pandoc-types safe syb text yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath mtl pandoc + pandoc-types process temporary text yaml + ]; + doCheck = false; + description = "Supports using pandoc with citeproc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process , text-conversions @@ -187781,8 +187846,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parsek"; - version = "1.0.1.3"; - sha256 = "184cbw9gz3vv2jbr2wzkygv25y70jayxd8d76pgpvjcaps4qqxp7"; + version = "1.0.2.0"; + sha256 = "05hi14wn6pzhknahyvjkw4cg9qfy20krig2pkx00r4s095zmpqza"; libraryHaskellDepends = [ base ]; description = "Parallel Parsing Processes"; license = stdenv.lib.licenses.gpl3; @@ -202360,6 +202425,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pusher-http-haskell_1_5_1_14" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, hashable, hspec, http-client, http-types, memory + , QuickCheck, scientific, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "1.5.1.14"; + sha256 = "0gfn5rfyyhbrl6sq7b6qyg86afww60c9g8y65m0qci6c91jbrv3a"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite hashable + http-client http-types memory text time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite hspec + http-client http-types QuickCheck scientific text time transformers + unordered-containers vector + ]; + description = "Haskell client library for the Pusher Channels HTTP API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pusher-ws" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hashable, http-conduit, lens, lens-aeson, network, scientific @@ -205196,6 +205286,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "random_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, mtl, mwc-random, primitive, rdtsc, smallcheck, split + , splitmix, tasty, tasty-expected-failure, tasty-hunit + , tasty-smallcheck, time, unliftio, vector + }: + mkDerivation { + pname = "random"; + version = "1.2.0"; + sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4"; + libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; + testHaskellDepends = [ + base bytestring containers doctest mwc-random primitive smallcheck + tasty tasty-expected-failure tasty-hunit tasty-smallcheck unliftio + vector + ]; + benchmarkHaskellDepends = [ + base gauge mtl rdtsc split splitmix time + ]; + description = "Pseudo-random number generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "random-access-file" = callPackage ({ mkDerivation, base, bytestring, concurrent-extra, containers , criterion, directory, lrucaching, mwc-random, random, stm, unix @@ -242823,8 +242937,8 @@ self: { pname = "taskwarrior"; version = "0.3.0.0"; sha256 = "1h24d799q1s6b36hd40bxa4c9m1izkgh6j7p2jv1p6cxngz28ni0"; - revision = "1"; - editedCabalFile = "063b4k4zppvnv6xzk72d4fji203abckwcsg2b1z387p66y3x0914"; + revision = "2"; + editedCabalFile = "16ikncs4aail9ymd2nx9n67b5d64cwk7m6kcbwvji0iggbikmsiv"; libraryHaskellDepends = [ aeson base bytestring containers process random text time unordered-containers uuid From 5f763c7c4acaae2fab7c6a51797ec5d6c9e3d2eb Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Wed, 24 Jun 2020 08:39:06 +0800 Subject: [PATCH 2472/3452] sn0int: 0.18.2 -> 0.19.1 --- pkgs/tools/security/sn0int/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix index 9e9cbe2bb3a5..8b99649e0c9f 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/tools/security/sn0int/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchFromGitHub, rustPlatform, - libsodium, libseccomp, sqlite, pkgconfig }: +{ lib, fetchFromGitHub, rustPlatform, libsodium, libseccomp, sqlite, pkgconfig +}: rustPlatform.buildRustPackage rec { pname = "sn0int"; - version = "0.18.2"; + version = "0.19.1"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "0b21b0ryq03zrhqailg2iajirn30l358aj3k44lfnravr4h9zwkj"; + sha256 = "10f1wblczxlww09f4dl8i9zzgpr14jj7s329wkvm7lafmwx3qrn5"; }; - cargoSha256 = "1pvn0sc325b5fh29m2l6cack4qfssa4lp3zhyb1qzkb3fmw3lgcy"; + cargoSha256 = "1v0q751ylsfpdjwsbl20pvn7g75w503jwjl5kn5kc8xq3g0lnp65"; nativeBuildInputs = [ pkgconfig ]; From 3c6bd1664833dc460afa1593f6b5350c41861492 Mon Sep 17 00:00:00 2001 From: gustavderdraache Date: Tue, 23 Jun 2020 20:42:11 -0400 Subject: [PATCH 2473/3452] 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 2c69af8304b52ee93d52dac9155b259f0c29ec84 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Tue, 23 Jun 2020 22:12:08 -0400 Subject: [PATCH 2474/3452] haskellPackages.hsimport: unbreak --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index cdb5795de4bb..b69a136dbea0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -6372,7 +6372,6 @@ broken-packages: - hsI2C - hsignal - hSimpleDB - - hsimport - HsJudy - hskeleton - hslackbuilder From 4398e9e346c1f127415d3d76afae3bdfe6e4e300 Mon Sep 17 00:00:00 2001 From: Thomas Friese Date: Wed, 24 Jun 2020 04:28:20 +0200 Subject: [PATCH 2475/3452] 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 2476/3452] 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 2477/3452] 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 fd931623a5252c45ab087726bcb684373830d893 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 24 Jun 2020 14:29:49 +0800 Subject: [PATCH 2478/3452] mdbtools: 0.7.1 -> 0.8.2 --- pkgs/tools/misc/mdbtools/default.nix | 42 +++++++++++++++++----------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index 0a887531fb86..aedaa3648887 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -1,30 +1,40 @@ -{ stdenv, fetchFromGitHub, glib, readline -, bison, flex, pkgconfig, autoreconfHook -, txt2man, which }: +{ stdenv, lib, fetchFromGitHub, glib, readline +, bison, flex, pkgconfig, autoreconfHook, libxslt, makeWrapper +, txt2man, which +# withUi currently doesn't work. It compiles but fails to run. +, withUi ? false, gtk2, gnome2 +}: -let version = "0.7.1"; -in stdenv.mkDerivation { +let + uiDeps = [ gtk2 ] ++ (with gnome2; [ GConf libglade libgnomeui gnome-doc-utils ]); + +in +stdenv.mkDerivation rec { pname = "mdbtools"; - inherit version; + version = "0.8.2"; src = fetchFromGitHub { - owner = "brianb"; + owner = "cyberemissary"; repo = "mdbtools"; rev = version; - sha256 = "0gwcpp9y09xhs21g7my2fs8ncb8i6ahlyixcx8jd3q97jbzj441l"; + sha256 = "12rhf6rgnws6br5dn1l2j7i77q9p4l6ryga10jpax01vvzhr26qc"; }; - nativeBuildInputs = [ pkgconfig bison flex autoreconfHook txt2man which ]; - buildInputs = [ glib readline ]; + configureFlags = [ "--disable-scrollkeeper" ]; - preConfigure = '' - sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c - ''; + nativeBuildInputs = [ + pkgconfig bison flex autoreconfHook txt2man which + ] ++ lib.optional withUi libxslt; - meta = with stdenv.lib; { + buildInputs = [ glib readline ] ++ lib.optionals withUi uiDeps; + + enableParallelBuilding = true; + + meta = with lib; { description = ".mdb (MS Access) format tools"; - homepage = "http://mdbtools.sourceforge.net"; - platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + inherit (src.meta) homepage; }; } From 97c886e2c727f1464eae5425e7bbe3b3b84ca4c5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 17 Jun 2020 07:26:25 +0200 Subject: [PATCH 2479/3452] 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 2480/3452] =?UTF-8?q?ocamlPackages.lwt:=20rename=20file=20?= =?UTF-8?q?to=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 2481/3452] =?UTF-8?q?ocamlPackages.dns(-client):=204.6.0?= =?UTF-8?q?=20=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 2482/3452] 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 2483/3452] 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 0bdd6f22b490e5d1996450516a2025d90a12c2a0 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 24 Jun 2020 00:21:29 +0200 Subject: [PATCH 2484/3452] haskellPackages.stan: Fix build --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a35e9f7c3926..95cd6fc51540 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1576,4 +1576,12 @@ self: super: { extraPrefix = ""; })); + # 2020-06-24: Jailbreaking because of restrictive test dep bounds + # Upstream issue: https://github.com/kowainik/trial/issues/62 + trial = doJailbreak super.trial; + + # 2020-06-24: Tests are broken in hackage distribution. + # See: https://github.com/kowainik/stan/issues/316 + stan = dontCheck super.stan; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index cdb5795de4bb..7a3e3f82a7dd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4792,7 +4792,6 @@ broken-packages: - extensible-data - extensible-effects-concurrent - extensible-skeleton - - extensions - external-sort - Extra - extract-dependencies diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 65db8a8c5731..aad59aa92ece 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -84727,8 +84727,6 @@ self: { ]; description = "Parse Haskell Language Extensions"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "external-sort" = callPackage 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 2485/3452] 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 b520055df6c9913ef4ddbc931a1635516433a7a9 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Jun 2020 12:04:05 +0200 Subject: [PATCH 2486/3452] nixos/lib/test-driver: add wait_for_console_text This method is similar to wait_for_text but is based on matching serial console lines instead of the VGA output. --- .../development/writing-nixos-tests.xml | 12 ++++++++++ nixos/lib/test-driver/test-driver.py | 23 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 150bea8c2d86..ff37b3b2f6f3 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -360,6 +360,18 @@ start_all() + + + wait_for_console_text + + + + Wait until the supplied regular expressions match a line of the serial + console output. This method is useful when OCR is not possibile or + accurate enough. + + + wait_for_window diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index e7b05968b079..0c1946387ae9 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -3,6 +3,8 @@ from contextlib import contextmanager, _GeneratorContextManager from queue import Queue, Empty from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List from xml.sax.saxutils import XMLGenerator +import queue +import io import _thread import atexit import base64 @@ -671,6 +673,22 @@ class Machine: with self.nested("waiting for {} to appear on screen".format(regex)): retry(screen_matches) + def wait_for_console_text(self, regex: str) -> None: + self.log("waiting for {} to appear on console".format(regex)) + # Buffer the console output, this is needed + # to match multiline regexes. + console = io.StringIO() + while True: + try: + console.write(self.last_lines.get()) + except queue.Empty: + self.sleep(1) + continue + console.seek(0) + matches = re.search(regex, console.read()) + if matches is not None: + return + def send_key(self, key: str) -> None: key = CHAR_TO_KEY.get(key, key) self.send_monitor_command("sendkey {}".format(key)) @@ -734,11 +752,16 @@ class Machine: self.monitor, _ = self.monitor_socket.accept() self.shell, _ = self.shell_socket.accept() + # Store last serial console lines for use + # of wait_for_console_text + self.last_lines: Queue = Queue() + def process_serial_output() -> None: assert self.process.stdout is not None for _line in self.process.stdout: # Ignore undecodable bytes that may occur in boot menus line = _line.decode(errors="ignore").replace("\r", "").rstrip() + self.last_lines.put(line) eprint("{} # {}".format(self.name, line)) self.logger.enqueue({"msg": line, "machine": self.name}) From 33c4a4bdd52a750205046cc85775e6caea342868 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Jun 2020 12:06:26 +0200 Subject: [PATCH 2487/3452] nixos/tests: add test for grub authentication --- nixos/tests/all-tests.nix | 1 + nixos/tests/grub.nix | 60 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 nixos/tests/grub.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7056d414e9e9..5ac7e73977bb 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -124,6 +124,7 @@ in grafana = handleTest ./grafana.nix {}; graphite = handleTest ./graphite.nix {}; graylog = handleTest ./graylog.nix {}; + grub = handleTest ./grub.nix {}; gvisor = handleTest ./gvisor.nix {}; hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {}; hadoop.yarn = handleTestOn [ "x86_64-linux" ] ./hadoop/yarn.nix {}; diff --git a/nixos/tests/grub.nix b/nixos/tests/grub.nix new file mode 100644 index 000000000000..84bfc90955b5 --- /dev/null +++ b/nixos/tests/grub.nix @@ -0,0 +1,60 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "grub"; + + meta = with lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + machine = { ... }: { + virtualisation.useBootLoader = true; + + boot.loader.timeout = null; + boot.loader.grub = { + enable = true; + users.alice.password = "supersecret"; + + # OCR is not accurate enough + extraConfig = "serial; terminal_output serial"; + }; + }; + + testScript = '' + def grub_login_as(user, password): + """ + Enters user and password to log into GRUB + """ + machine.wait_for_console_text("Enter username:") + machine.send_chars(user + "\n") + machine.wait_for_console_text("Enter password:") + machine.send_chars(password + "\n") + + + def grub_select_all_configurations(): + """ + Selects "All configurations" from the GRUB menu + to trigger a login request. + """ + machine.send_monitor_command("sendkey down") + machine.send_monitor_command("sendkey ret") + + + machine.start() + + # wait for grub screen + machine.wait_for_console_text("GNU GRUB") + + grub_select_all_configurations() + with subtest("Invalid credentials are rejected"): + grub_login_as("wronguser", "wrongsecret") + machine.wait_for_console_text("error: access denied.") + + grub_select_all_configurations() + with subtest("Valid credentials are accepted"): + grub_login_as("alice", "supersecret") + machine.send_chars("\n") # press enter to boot + machine.wait_for_console_text("Linux version") + + with subtest("Machine boots correctly"): + machine.wait_for_unit("multi-user.target") + ''; +}) From c281c84a1e19108f3ae4e06e6d99d254f7c9b5d8 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sat, 20 Jun 2020 13:59:31 +0300 Subject: [PATCH 2488/3452] 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 2489/3452] 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 c25fd71ee811f8f90aed3be232c12f0ae7d74bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 24 Jun 2020 07:56:46 -0300 Subject: [PATCH 2490/3452] qogir-icon-theme: 2020-02-21 -> 2020-06-22 --- pkgs/data/icons/qogir-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index fa52ad176d98..2a9a895b6caf 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-icon-theme"; - version = "2020-02-21"; + version = "2020-06-22"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0m7f26dzzz5gkxi9dbbc96pl0xcvayr1ibxbjkrlsjcdvfg7p3rr"; + sha256 = "0s5fhwfhn4qgk198jw736byxdrfm42l5m681pllbhg02j8ld4iik"; }; nativeBuildInputs = [ gtk3 ]; From 1ddbd8ce8a6cde8c6c72fc305fed1f6dd4e0d24c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 24 Jun 2020 08:25:10 -0400 Subject: [PATCH 2491/3452] 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 2492/3452] 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 2493/3452] 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 2494/3452] =?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 ce47481bd1d5d9deaca68e69ed4a47174326d7b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 24 Jun 2020 09:41:10 -0300 Subject: [PATCH 2495/3452] fbmenugen: 2020-05-20 -> 0.85 --- pkgs/applications/misc/fbmenugen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/applications/misc/fbmenugen/default.nix index fcf8191d3b70..bc40f2dad831 100644 --- a/pkgs/applications/misc/fbmenugen/default.nix +++ b/pkgs/applications/misc/fbmenugen/default.nix @@ -11,13 +11,13 @@ perlPackages.buildPerlPackage rec { pname = "fbmenugen"; - version = "2020-05-20"; + version = "0.85"; src = fetchFromGitHub { owner = "trizen"; repo = pname; - rev = "ed9a680546edbb5b05086971b6a9f42a37cb485f"; - sha256 = "1fikdl08a0s8d6k1ls1pzmw2rcwkfbbczsjfx6lr12ngd2bz222h"; + rev = version; + sha256 = "1pmms3wzkm8h41a8zrkpn6gq9m9yy5wr5rrzmb84lbacprqq6q7q"; }; patches = [ From 8888433072bb5f822e8bd96c4724cb51909e2889 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Wed, 24 Jun 2020 14:41:45 +0200 Subject: [PATCH 2496/3452] 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 e6d5fec97d9784a424aa7a3e7e3d38ef281908f4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 24 Jun 2020 16:45:21 +0200 Subject: [PATCH 2497/3452] wordpress: 5.4.1 -> 5.4.2 Fixes: CVE-2020-4049 Closes: #91305 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index ca4b5d832a62..4ad5b8a216b8 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "0i9ndfhm9iwilqwbqs3dngmzzjmazw4vwbyccjabs3zmzliis6vv"; + sha256 = "1pnl11yws2r2d5dfq0z85zcy5ilvm298bfs7h9z1sjakkwkh5sph"; }; installPhase = '' From f422d6582dc46fcc6b1a3290ce44288596e418d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 24 Jun 2020 16:49:37 +0200 Subject: [PATCH 2498/3452] wordpress: add passthru.tests --- pkgs/servers/web-apps/wordpress/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 4ad5b8a216b8..e1a14ca59d4a 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, nixosTests }: stdenv.mkDerivation rec { pname = "wordpress"; @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { cp -r . $out/share/wordpress ''; + passthru.tests = { + inherit (nixosTests) wordpress; + }; + meta = with stdenv.lib; { homepage = "https://wordpress.org"; description = "WordPress is open source software you can use to create a beautiful website, blog, or app"; From 388038ff98b7b2c5ae305b646a0650ce00eadf6a Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Wed, 24 Jun 2020 17:02:23 +0200 Subject: [PATCH 2499/3452] 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 2500/3452] 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 264cb81ad67974f46b778c954ed8129cbf7ab71f Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Wed, 24 Jun 2020 12:49:36 -0400 Subject: [PATCH 2501/3452] haskellPackages.rdf4h: dontCheck --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 4444e8fa9e3c..4e9252f9c14b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8853,7 +8853,6 @@ broken-packages: - rbr - rc - rclient - - rdf4h - rdioh - react-flux - react-flux-servant From c518e30b00baf32b50fa578ee16b39e9fb19b491 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Wed, 24 Jun 2020 12:54:42 -0400 Subject: [PATCH 2502/3452] Update configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 08020c5ccbc8..809e1076effa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1503,5 +1503,9 @@ self: super: { # 2020-06-24: Tests are broken in hackage distribution. # See: https://github.com/kowainik/stan/issues/316 stan = dontCheck super.stan; + + # 2020-06-24: Tests are broken in hackage distribution. + # See: https://github.com/robstewart57/rdf4h/issues/39 + rdf4h = dontCheck super.rdf4h; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 9b6a64a317a4caee7fd82efd187830f589d44854 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jun 2020 18:55:48 +0200 Subject: [PATCH 2503/3452] 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 2504/3452] 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 33abace40c7162ab4a60fa94982651cd4ffa54ec Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 24 Jun 2020 20:02:26 +0200 Subject: [PATCH 2505/3452] ledger-live-desktop: 2.3.2 -> 2.6.0 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 1c76ef8df284..656c2d37ae20 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.3.2"; + version = "2.6.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "0xd3w564zij614ajg57n1qlvz0hd9l7219qxx81ai6b02b9a5g9h"; + sha256 = "0c58bx6fgykz0fl2yjbpbg6h5bv31zmjwgd1m3qi8afqryf52m5w"; }; appimageContents = appimageTools.extractType2 { From a0c0a009c37fd5b3c2dadb297925044284e4a863 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Wed, 24 Jun 2020 11:08:34 -0700 Subject: [PATCH 2506/3452] 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 2507/3452] 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 2508/3452] =?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 2509/3452] 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 773595a3b525a3cff80837604635f9ef52d55074 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Wed, 24 Jun 2020 21:11:47 +0100 Subject: [PATCH 2510/3452] nodePackages.purty: init at 6.2.0 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 2613 ++++++++--------- 2 files changed, 1239 insertions(+), 1375 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index d106b8e2efa6..75966cbd348c 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -143,6 +143,7 @@ , "pscid" , "pulp" , "purescript-psa" +, "purty" , "react-native-cli" , "react-tools" , "reveal.js" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 594225a07abc..ea97dab12677 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -22,13 +22,22 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.901.9" = { + "@angular-devkit/architect-0.1000.0" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.901.9"; + version = "0.1000.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.9.tgz"; - sha512 = "Xokyh7bv4qICHpb5Xui1jPTi6ZZvzR5tbTIxT0DFWqw16TEkFgkNubQsW6mFSR3g3CXdySMfOwWExfa/rE1ggA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.0.tgz"; + sha512 = "luzBYe7t994ebq6xIfYJudxOkMBO0bywafk6sQqb+bOaBQAran4orF1R/zEx6f8TJzEoXELjUvxm/ePSqZdpKg=="; + }; + }; + "@angular-devkit/core-10.0.0" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.0.tgz"; + sha512 = "IvX9IMaCjDkN9vDVnYcgWbSBinlUUb7jdFhDGeTtK6rGSnjX1GoLvWneVI2hoccS07fPbnfMoYXBoZLwVxiIxw=="; }; }; "@angular-devkit/core-9.1.7" = { @@ -49,6 +58,15 @@ let sha512 = "SWgBh4an/Vezjw2BZ5S+bKvuK5lH6gOtR8d5YjN9vxpJSZ0GimrGjfnLlWOkwWAsU8jfn4JzofECUHwX/7EW6Q=="; }; }; + "@angular-devkit/schematics-10.0.0" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.0.tgz"; + sha512 = "FJ/dY18M+cnAT9RkVjVRJ0PMFZci3ok0WoOosW25Fk68jwNSbGCeF8k8NcD6YE60+CfF4/0LxQWgFagr/wdEhw=="; + }; + }; "@angular-devkit/schematics-9.1.7" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; @@ -274,31 +292,31 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/code-frame-7.10.1" = { + "@babel/code-frame-7.10.3" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz"; - sha512 = "IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.3.tgz"; + sha512 = "fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg=="; }; }; - "@babel/compat-data-7.10.1" = { + "@babel/compat-data-7.10.3" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.1.tgz"; - sha512 = "CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.3.tgz"; + sha512 = "BDIfJ9uNZuI0LajPfoYV28lX8kyCPMHY6uY4WH1lJdcicmAfxCK5ASzaeV0D/wsUaRH/cLk+amuxtC37sZ8TUg=="; }; }; - "@babel/core-7.10.2" = { + "@babel/core-7.10.3" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.10.2"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.10.2.tgz"; - sha512 = "KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.10.3.tgz"; + sha512 = "5YqWxYE3pyhIi84L84YcwjeEgS+fa7ZjK6IBVGTjDVfm64njkR2lfDhVR5OudLk8x2GK59YoSyVv+L/03k1q9w=="; }; }; "@babel/generator-7.10.2" = { @@ -310,6 +328,15 @@ let sha512 = "AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA=="; }; }; + "@babel/generator-7.10.3" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.10.3.tgz"; + sha512 = "drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA=="; + }; + }; "@babel/helper-annotate-as-pure-7.10.1" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; @@ -319,22 +346,22 @@ let sha512 = "ewp3rvJEwLaHgyWGe4wQssC2vjks3E80WiUe2BpMb0KhreTjMROCbxXcEovTrbeGVdQct5VjQfrv9EgC+xMzCw=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.10.1" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.10.3" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz"; - sha512 = "cQpVq48EkYxUU0xozpGCLla3wlkdRRqLWu1ksFMXA9CM5KQmyyRpSEsYXbao7JUkOw/tAaYKCaYyZq6HOFYtyw=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.3.tgz"; + sha512 = "lo4XXRnBlU6eRM92FkiZxpo1xFLmv3VsPFk61zJKMm7XYJfwqXHsYJTY6agoc4a3L8QPw1HqWehO18coZgbT6A=="; }; }; - "@babel/helper-builder-react-jsx-7.10.1" = { + "@babel/helper-builder-react-jsx-7.10.3" = { name = "_at_babel_slash_helper-builder-react-jsx"; packageName = "@babel/helper-builder-react-jsx"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.1.tgz"; - sha512 = "KXzzpyWhXgzjXIlJU1ZjIXzUPdej1suE6vzqgImZ/cpAsR/CC8gUcX4EWRmDfWz/cs6HOCPMBIJ3nKoXt3BFuw=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.3.tgz"; + sha512 = "vkxmuFvmovtqTZknyMGj9+uQAZzz5Z9mrbnkJnPkaYGfKTaSsYcjQdXP0lgrWLVh8wU6bCjOmXOpx+kqUi+S5Q=="; }; }; "@babel/helper-builder-react-jsx-experimental-7.10.1" = { @@ -355,13 +382,13 @@ let sha512 = "hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA=="; }; }; - "@babel/helper-create-class-features-plugin-7.10.2" = { + "@babel/helper-create-class-features-plugin-7.10.3" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.10.2"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz"; - sha512 = "5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.3.tgz"; + sha512 = "iRT9VwqtdFmv7UheJWthGc/h2s7MqoweBF9RUj77NFZsg9VfISvBTum3k6coAhJ8RWv2tj3yUjA03HxPd0vfpQ=="; }; }; "@babel/helper-create-regexp-features-plugin-7.10.1" = { @@ -373,67 +400,67 @@ let sha512 = "Rx4rHS0pVuJn5pJOqaqcZR4XSgeF9G/pO/79t+4r7380tXFJdzImFnxMU19f83wjSrmKHq6myrM10pFHTGzkUA=="; }; }; - "@babel/helper-define-map-7.10.1" = { + "@babel/helper-define-map-7.10.3" = { name = "_at_babel_slash_helper-define-map"; packageName = "@babel/helper-define-map"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz"; - sha512 = "+5odWpX+OnvkD0Zmq7panrMuAGQBu6aPUgvMzuMGo4R+jUOvealEj2hiqI6WhxgKrTpFoFj0+VdsuA8KDxHBDg=="; + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.3.tgz"; + sha512 = "bxRzDi4Sin/k0drWCczppOhov1sBSdBvXJObM1NLHQzjhXhwRtn7aRWGvLJWCYbuu2qUk3EKs6Ci9C9ps8XokQ=="; }; }; - "@babel/helper-explode-assignable-expression-7.10.1" = { + "@babel/helper-explode-assignable-expression-7.10.3" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz"; - sha512 = "vcUJ3cDjLjvkKzt6rHrl767FeE7pMEYfPanq5L16GRtrXIoznc0HykNW2aEYkcnP76P0isoqJ34dDMFZwzEpJg=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.3.tgz"; + sha512 = "0nKcR64XrOC3lsl+uhD15cwxPvaB6QKUDlD84OT9C3myRbhJqTMYir69/RWItUvHpharv0eJ/wk7fl34ONSwZw=="; }; }; - "@babel/helper-function-name-7.10.1" = { + "@babel/helper-function-name-7.10.3" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz"; - sha512 = "fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.3.tgz"; + sha512 = "FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw=="; }; }; - "@babel/helper-get-function-arity-7.10.1" = { + "@babel/helper-get-function-arity-7.10.3" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz"; - sha512 = "F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.3.tgz"; + sha512 = "iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg=="; }; }; - "@babel/helper-hoist-variables-7.10.1" = { + "@babel/helper-hoist-variables-7.10.3" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz"; - sha512 = "vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.3.tgz"; + sha512 = "9JyafKoBt5h20Yv1+BXQMdcXXavozI1vt401KBiRc2qzUepbVnd7ogVNymY1xkQN9fekGwfxtotH2Yf5xsGzgg=="; }; }; - "@babel/helper-member-expression-to-functions-7.10.1" = { + "@babel/helper-member-expression-to-functions-7.10.3" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz"; - sha512 = "u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.3.tgz"; + sha512 = "q7+37c4EPLSjNb2NmWOjNwj0+BOyYlssuQ58kHEWk1Z78K5i8vTUsteq78HMieRPQSl/NtpQyJfdjt3qZ5V2vw=="; }; }; - "@babel/helper-module-imports-7.10.1" = { + "@babel/helper-module-imports-7.10.3" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz"; - sha512 = "SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.3.tgz"; + sha512 = "Jtqw5M9pahLSUWA+76nhK9OG8nwYXzhQzVIGFoNaHnXF/r4l7kz4Fl0UAW7B6mqC5myoJiBP5/YQlXQTMfHI9w=="; }; }; "@babel/helper-module-transforms-7.10.1" = { @@ -445,22 +472,22 @@ let sha512 = "RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg=="; }; }; - "@babel/helper-optimise-call-expression-7.10.1" = { + "@babel/helper-optimise-call-expression-7.10.3" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz"; - sha512 = "a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.3.tgz"; + sha512 = "kT2R3VBH/cnSz+yChKpaKRJQJWxdGoc6SjioRId2wkeV3bK0wLLioFpJROrX0U4xr/NmxSSAWT/9Ih5snwIIzg=="; }; }; - "@babel/helper-plugin-utils-7.10.1" = { + "@babel/helper-plugin-utils-7.10.3" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz"; - sha512 = "fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz"; + sha512 = "j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g=="; }; }; "@babel/helper-regex-7.10.1" = { @@ -472,13 +499,13 @@ let sha512 = "7isHr19RsIJWWLLFn21ubFt223PjQyg1HY7CZEMRr820HttHPpVvrsIN3bUOo44DEfFV4kBXO7Abbn9KTUZV7g=="; }; }; - "@babel/helper-remap-async-to-generator-7.10.1" = { + "@babel/helper-remap-async-to-generator-7.10.3" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz"; - sha512 = "RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.3.tgz"; + sha512 = "sLB7666ARbJUGDO60ZormmhQOyqMX/shKBXZ7fy937s+3ID8gSrneMvKSSb+8xIM5V7Vn6uNVtOY1vIm26XLtA=="; }; }; "@babel/helper-replace-supers-7.10.1" = { @@ -508,13 +535,13 @@ let sha512 = "UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g=="; }; }; - "@babel/helper-validator-identifier-7.10.1" = { + "@babel/helper-validator-identifier-7.10.3" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz"; - sha512 = "5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz"; + sha512 = "bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw=="; }; }; "@babel/helper-wrap-function-7.10.1" = { @@ -535,22 +562,22 @@ let sha512 = "muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw=="; }; }; - "@babel/highlight-7.10.1" = { + "@babel/highlight-7.10.3" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz"; - sha512 = "8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.3.tgz"; + sha512 = "Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw=="; }; }; - "@babel/parser-7.10.2" = { + "@babel/parser-7.10.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.10.2"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz"; - sha512 = "PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.10.3.tgz"; + sha512 = "oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -562,13 +589,13 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.10.1" = { + "@babel/plugin-proposal-async-generator-functions-7.10.3" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz"; - sha512 = "vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.3.tgz"; + sha512 = "WUUWM7YTOudF4jZBAJIW9D7aViYC/Fn0Pln4RIHlQALyno3sXSjqmTA4Zy1TKC2D49RCR8Y/Pn4OIUtEypK3CA=="; }; }; "@babel/plugin-proposal-class-properties-7.10.1" = { @@ -616,13 +643,13 @@ let sha512 = "jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.10.1" = { + "@babel/plugin-proposal-object-rest-spread-7.10.3" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz"; - sha512 = "Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.3.tgz"; + sha512 = "ZZh5leCIlH9lni5bU/wB/UcjtcVLgR8gc+FAgW2OOY+m9h1II3ItTO1/cewNUcsIDZSYcSaz/rYVls+Fb0ExVQ=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.10.1" = { @@ -634,13 +661,13 @@ let sha512 = "VqExgeE62YBqI3ogkGoOJp1R6u12DFZjqwJhqtKc2o5m1YTUuUWnos7bZQFBhwkxIFpWYJ7uB75U7VAPPiKETA=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.10.1" = { + "@babel/plugin-proposal-optional-chaining-7.10.3" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz"; - sha512 = "dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.3.tgz"; + sha512 = "yyG3n9dJ1vZ6v5sfmIlMMZ8azQoqx/5/nZTSWX1td6L1H1bsjzA8TInDChpafCZiJkeOFzp/PtrfigAQXxI1Ng=="; }; }; "@babel/plugin-proposal-private-methods-7.10.1" = { @@ -841,22 +868,22 @@ let sha512 = "8bpWG6TtF5akdhIm/uWTyjHqENpy13Fx8chg7pFH875aNLwX8JxIxqm08gmAT+Whe6AOmaTeLPe7dpLbXt+xUw=="; }; }; - "@babel/plugin-transform-classes-7.10.1" = { + "@babel/plugin-transform-classes-7.10.3" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz"; - sha512 = "P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.3.tgz"; + sha512 = "irEX0ChJLaZVC7FvvRoSIxJlmk0IczFLcwaRXUArBKYHCHbOhe57aG8q3uw/fJsoSXvZhjRX960hyeAGlVBXZw=="; }; }; - "@babel/plugin-transform-computed-properties-7.10.1" = { + "@babel/plugin-transform-computed-properties-7.10.3" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz"; - sha512 = "mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.3.tgz"; + sha512 = "GWzhaBOsdbjVFav96drOz7FzrcEW6AP5nax0gLIpstiFaI3LOb2tAg06TimaWU6YKOfUACK3FVrxPJ4GSc5TgA=="; }; }; "@babel/plugin-transform-destructuring-7.10.1" = { @@ -958,13 +985,13 @@ let sha512 = "AQG4fc3KOah0vdITwt7Gi6hD9BtQP/8bhem7OjbaMoRNCH5Djx42O2vYMfau7QnAzQCa+RJnhJBmFFMGpQEzrg=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.10.1" = { + "@babel/plugin-transform-modules-systemjs-7.10.3" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz"; - sha512 = "ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.3.tgz"; + sha512 = "GWXWQMmE1GH4ALc7YXW56BTh/AlzvDWhUNn9ArFF0+Cz5G8esYlVbXfdyHa1xaD1j+GnBoCeoQNlwtZTVdiG/A=="; }; }; "@babel/plugin-transform-modules-umd-7.10.1" = { @@ -976,13 +1003,13 @@ let sha512 = "EIuiRNMd6GB6ulcYlETnYYfgv4AxqrswghmBRQbWLHZxN4s7mupxzglnHqk9ZiUpDI4eRWewedJJNj67PWOXKA=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.8.3" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.10.3" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.8.3"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz"; - sha512 = "f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.3.tgz"; + sha512 = "I3EH+RMFyVi8Iy/LekQm948Z4Lz4yKT7rK+vuCAeRm0kTa6Z5W7xuhRxDNJv0FPya/her6AUgrDITb70YHtTvA=="; }; }; "@babel/plugin-transform-new-target-7.10.1" = { @@ -1021,22 +1048,22 @@ let sha512 = "Kr6+mgag8auNrgEpbfIWzdXYOvqDHZOF0+Bx2xh4H2EDNwcbRb9lY6nkZg8oSjsX+DH9Ebxm9hOqtKW+gRDeNA=="; }; }; - "@babel/plugin-transform-react-jsx-7.10.1" = { + "@babel/plugin-transform-react-jsx-7.10.3" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.1.tgz"; - sha512 = "MBVworWiSRBap3Vs39eHt+6pJuLUAaK4oxGc8g+wY+vuSJvLiEQjW1LSTqKb8OUPtDvHCkdPhk7d6sjC19xyFw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.3.tgz"; + sha512 = "Y21E3rZmWICRJnvbGVmDLDZ8HfNDIwjGF3DXYHx1le0v0mIHCs0Gv5SavyW5Z/jgAHLaAoJPiwt+Dr7/zZKcOQ=="; }; }; - "@babel/plugin-transform-regenerator-7.10.1" = { + "@babel/plugin-transform-regenerator-7.10.3" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz"; - sha512 = "B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.3.tgz"; + sha512 = "H5kNeW0u8mbk0qa1jVIVTeJJL6/TJ81ltD4oyPx0P499DhMJrTmmIFCmJ3QloGpQG8K9symccB7S7SJpCKLwtw=="; }; }; "@babel/plugin-transform-reserved-words-7.10.1" = { @@ -1048,13 +1075,13 @@ let sha512 = "qN1OMoE2nuqSPmpTqEM7OvJ1FkMEV+BjVeZZm9V9mq/x1JLKQ4pcv8riZJMNN3u2AUGl0ouOMjRr2siecvHqUQ=="; }; }; - "@babel/plugin-transform-runtime-7.10.1" = { + "@babel/plugin-transform-runtime-7.10.3" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.1.tgz"; - sha512 = "4w2tcglDVEwXJ5qxsY++DgWQdNJcCCsPxfT34wCUwIf2E7dI7pMpH8JczkMBbgBTNzBX62SZlNJ9H+De6Zebaw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.3.tgz"; + sha512 = "b5OzMD1Hi8BBzgQdRHyVVaYrk9zG0wset1it2o3BgonkPadXfOv0aXRqd7864DeOIu3FGKP/h6lr15FE5mahVw=="; }; }; "@babel/plugin-transform-shorthand-properties-7.10.1" = { @@ -1084,13 +1111,13 @@ let sha512 = "j17ojftKjrL7ufX8ajKvwRilwqTok4q+BjkknmQw9VNHnItTyMP5anPFzxFJdCQs7clLcWpCV3ma+6qZWLnGMA=="; }; }; - "@babel/plugin-transform-template-literals-7.10.1" = { + "@babel/plugin-transform-template-literals-7.10.3" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz"; - sha512 = "t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.3.tgz"; + sha512 = "yaBn9OpxQra/bk0/CaA4wr41O0/Whkg6nqjqApcinxM7pro51ojhX6fv1pimAnVjVfDy14K0ULoRL70CA9jWWA=="; }; }; "@babel/plugin-transform-typeof-symbol-7.10.1" = { @@ -1102,13 +1129,13 @@ let sha512 = "qX8KZcmbvA23zDi+lk9s6hC1FM7jgLHYIjuLgULgc8QtYnmB3tAVIYkNoKRQ75qWBeyzcoMoK8ZQmogGtC/w0g=="; }; }; - "@babel/plugin-transform-typescript-7.10.1" = { + "@babel/plugin-transform-typescript-7.10.3" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.1.tgz"; - sha512 = "v+QWKlmCnsaimLeqq9vyCsVRMViZG1k2SZTlcZvB+TqyH570Zsij8nvVUZzOASCRiQFUxkLrn9Wg/kH0zgy5OQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.10.3.tgz"; + sha512 = "qU9Lu7oQyh3PGMQncNjQm8RWkzw6LqsWZQlZPQMgrGt6s3YiBIaQ+3CQV/FA/icGS5XlSWZGwo/l8ErTyelS0Q=="; }; }; "@babel/plugin-transform-unicode-escapes-7.10.1" = { @@ -1138,13 +1165,13 @@ let sha512 = "/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ=="; }; }; - "@babel/preset-env-7.10.2" = { + "@babel/preset-env-7.10.3" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.10.2"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.2.tgz"; - sha512 = "MjqhX0RZaEgK/KueRzh+3yPSk30oqDKJ5HP5tqTSB1e2gzGS3PLy7K0BIpnp78+0anFuSwOeuCf1zZO7RzRvEA=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.3.tgz"; + sha512 = "jHaSUgiewTmly88bJtMHbOd1bJf2ocYxb5BWKSDQIP5tmgFuS/n0gl+nhSrYDhT33m0vPxp+rP8oYYgPgMNQlg=="; }; }; "@babel/preset-flow-7.10.1" = { @@ -1183,13 +1210,13 @@ let sha512 = "m6GV3y1ShiqxnyQj10600ZVOFrSSAa8HQ3qIUk2r+gcGtHTIRw0dJnFLt1WNXpKjtVw7yw1DAPU/6ma2ZvgJuA=="; }; }; - "@babel/register-7.10.1" = { + "@babel/register-7.10.3" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.10.1.tgz"; - sha512 = "sl96+kB3IA2B9EzpwwBmYadOT14vw3KaXOknGDbJaZCOj52GDA4Tivudq9doCJcB+bEIKCEARZYwRgBBsCGXyg=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.10.3.tgz"; + sha512 = "s1il0vdd02HCGwV1iocGJEzcbTNouZqMolSXKXFAiTNJSudPas9jdLQwyPPyAJxdNL6KGJ8pwWIOpKmgO/JWqg=="; }; }; "@babel/runtime-7.10.2" = { @@ -1201,6 +1228,15 @@ let sha512 = "6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg=="; }; }; + "@babel/runtime-7.10.3" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.3.tgz"; + sha512 = "RzGO0RLSdokm9Ipe/YD+7ww8X2Ro79qiXZF3HU9ljrM+qnJmH1Vqth+hbiQZy761LnMJTMitHDuKVYTk3k4dLw=="; + }; + }; "@babel/runtime-7.7.7" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -1210,40 +1246,31 @@ let sha512 = "uCnC2JEVAu8AKB5do1WRIsvrdJ0flYx/A/9f/6chdacnEZ7LmavjdsDXr5ksYBegxtuTPR5Va9/+13QF/kFkCA=="; }; }; - "@babel/runtime-7.9.2" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz"; - sha512 = "NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q=="; - }; - }; - "@babel/runtime-corejs3-7.10.2" = { + "@babel/runtime-corejs3-7.10.3" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.10.2"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.10.2.tgz"; - sha512 = "+a2M/u7r15o3dV1NEizr9bRi+KUVnrs/qYxF0Z06DAPx/4VCWaz1WA7EcbE+uqGgt39lp5akWGmHsTseIkHkHg=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.10.3.tgz"; + sha512 = "HA7RPj5xvJxQl429r5Cxr2trJwOfPjKiqhCXcdQPSqO2G0RHPZpXu4fkYmBaTKCp2c/jRaMK9GB/lN+7zvvFPw=="; }; }; - "@babel/template-7.10.1" = { + "@babel/template-7.10.3" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz"; - sha512 = "OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.10.3.tgz"; + sha512 = "5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA=="; }; }; - "@babel/traverse-7.10.1" = { + "@babel/traverse-7.10.3" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.10.1"; + version = "7.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz"; - sha512 = "C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.3.tgz"; + sha512 = "qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug=="; }; }; "@babel/types-7.10.2" = { @@ -1255,6 +1282,15 @@ let sha512 = "AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng=="; }; }; + "@babel/types-7.10.3" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.10.3.tgz"; + sha512 = "nZxaJhBXBQ8HVoIcGsf9qWep3Oh3jCENK54V4mRF7qaJabVsAYdbTtmSD8WmAp1R6ytPiu5apMwSXyxB1WlaBA=="; + }; + }; "@chemzqm/neovim-5.1.9" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; @@ -1372,13 +1408,13 @@ let sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw=="; }; }; - "@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1" = { + "@endemolshinegroup/cosmiconfig-typescript-loader-1.0.2" = { name = "_at_endemolshinegroup_slash_cosmiconfig-typescript-loader"; packageName = "@endemolshinegroup/cosmiconfig-typescript-loader"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.1.tgz"; - sha512 = "bhUR9035PbgL6A/nfLayjoqKo4W7hCtzxqVxq2cgDB+Ndpsa3dGIr71/ymgY3vCTCQaufkFxAcEeoECyJ498CA=="; + url = "https://registry.npmjs.org/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.2.tgz"; + sha512 = "ZHkXKq2XFFmAUdmSZrmqUSIrRM4O9gtkdpxMmV+LQl7kScUnbo6pMnXu6+FTDgZ12aW6SDoZoOJfS56WD+Eu6A=="; }; }; "@evocateur/libnpmaccess-3.1.2" = { @@ -2650,13 +2686,13 @@ let sha512 = "2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw=="; }; }; - "@octokit/rest-16.43.1" = { + "@octokit/rest-16.43.2" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.43.1"; + version = "16.43.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.1.tgz"; - sha512 = "gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.2.tgz"; + sha512 = "ngDBevLbBTFfrHZeiS7SAMAZ6ssuVmXuya+F/7RaVvlysgGa1JKJkKWY+jV6TCJYcW0OALfJ7nTIGXcBXzycfQ=="; }; }; "@octokit/types-2.16.2" = { @@ -2830,13 +2866,13 @@ let sha512 = "8+mDQt1QUmN+4Y9D3yCG8AJNewuTSLYPJVzKKUZ+lGeQrI+bV12Tc5HCyt2WdlnG6ihIL/DPbKRJlB40DX40mw=="; }; }; - "@rollup/plugin-node-resolve-8.0.1" = { + "@rollup/plugin-node-resolve-8.1.0" = { name = "_at_rollup_slash_plugin-node-resolve"; packageName = "@rollup/plugin-node-resolve"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.0.1.tgz"; - sha512 = "KIeAmueDDaYMqMBnUngLVVZhURwxA12nq/YB6nGm5/JpVyOMwI1fCVU3oL/dAnnLBG7oiPXntO5LHOiMrfNXCA=="; + url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.1.0.tgz"; + sha512 = "ovq7ZM3JJYUUmEjjO+H8tnUdmQmdQudJB7xruX8LFZ1W2q8jXdPUS6SsIYip8ByOApu4RR7729Am9WhCeCMiHA=="; }; }; "@rollup/pluginutils-3.1.0" = { @@ -2866,13 +2902,13 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-9.1.9" = { + "@schematics/angular-10.0.0" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "9.1.9"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.9.tgz"; - sha512 = "c8YGZ6pDfr8IDD1qaOjlEBAkEz14KFSxDj0hCWs0xIM0py513tu5sW8+ziYxGG4bgqpsgVR/KAxuY78iBfUVag=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.0.tgz"; + sha512 = "m7Pxz4guAMbe7NASKCPUNxvUX/LeieDjGsXwIt09tVE4dEi9yqJP5zq8kOnZEiLKKflP7GoB65RNex4dTxsydw=="; }; }; "@schematics/schematics-0.901.9" = { @@ -2884,13 +2920,13 @@ let sha512 = "Nca8Ig/mFFnhLmosbdWysX4N2HiwVOzA4gQj2TZnMCJ98Cftdebs388LstjsJwGtJyvAa2v4yoaPaUMIGVgQ9w=="; }; }; - "@schematics/update-0.901.9" = { + "@schematics/update-0.1000.0" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.901.9"; + version = "0.1000.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.9.tgz"; - sha512 = "VChX0VO/oyfCF3y+HjMTU2qN3vGgJYxEI1V+Q9aAlwl95t3GAufuaFY1CNW3YV4XkYIjD88e3yWl8d5yO4qf4w=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1000.0.tgz"; + sha512 = "snjz7sQCOn4Xi66XQREXZx9K6R/vAnUfdyO5nXekls8+E+MIowlP+gqHM0whi8qJDwCLd9maYmeVsD6XZaGImQ=="; }; }; "@serverless/cli-1.5.1" = { @@ -2911,13 +2947,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.30.20" = { + "@serverless/components-2.31.3" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.30.20"; + version = "2.31.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.20.tgz"; - sha512 = "2g9eLSXgKa0gOt3zu/z7zuI7Ghf1bfWJqLtG5tHVEIv73+l484pD9HoW9zJz3hpeIAXpcSPzkjUk9bug/o6fgw=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-2.31.3.tgz"; + sha512 = "bJs0zuJy334N57706RyXzFb2Z6tQULNa0xTEYoS7ZguAXF18MJOVFEha/tjbSGDRSj+pLRyfZ/fbXbDtF0g6Iw=="; }; }; "@serverless/core-1.1.2" = { @@ -2965,13 +3001,22 @@ let sha512 = "ww5GBt5QEHYppLH8X+gEFiuMoFu9xdXK0bEROYbuxUliiB0IfXTXLzWR5whhi/S94R7pTnJ4O+WUiFj0PcV/tQ=="; }; }; - "@serverless/platform-client-china-1.0.18" = { + "@serverless/platform-client-1.0.1" = { + name = "_at_serverless_slash_platform-client"; + packageName = "@serverless/platform-client"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.0.1.tgz"; + sha512 = "FPFbhLb5nXbHzla8wSQADp+wo3dPAyvkXzGqCwojAWzLwqCczxzEzMpixpLNTbNrDNgYzemvERWj+mnOZ3oNaA=="; + }; + }; + "@serverless/platform-client-china-1.0.20" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.0.18"; + version = "1.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.18.tgz"; - sha512 = "M6bucQXgnHF6M+4D4Wt8KCz1bUxpMtG8CPS/WiOhzwwTdG79aYwNIOIC1xo0wtDmrlTwh8ECD8WclAWSHmfaqg=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.20.tgz"; + sha512 = "KJisy1IKzE4CG86WFzhN5b0tHv6FI9/K9BxvqLZktIeGRf8tr4CqPbU+UE/DnCpDADuBBrFAXbbIv1RZonwhsQ=="; }; }; "@serverless/platform-sdk-2.3.1" = { @@ -3001,13 +3046,13 @@ let sha512 = "MZBLphb8Dz9/mGclFQ53INznSFHZAwS2z4H8RZb6UPCqcRhW0SRrdLwLmn9JIqLWH4Zn95LbNsAjmzJ4Dl3CPQ=="; }; }; - "@serverless/utils-china-0.1.15" = { + "@serverless/utils-china-0.1.17" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.15"; + version = "0.1.17"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.15.tgz"; - sha512 = "f7yPv3fJ2UNfo+w/O+Pt/vlHyCqzR8OAIbPnUi9wJD7AnK+95KK6tEEhDRSE/E+qpa5AbUN3cAJ00ih1HrGYAw=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.17.tgz"; + sha512 = "GhveUbvj32whixPOztLhHJdLZUP5L3Ni+giOyM2vOl00Dnf1oklau2QCiDxvSWj5+ZlBGxyDMRJUXAfO1F6SPA=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -3316,13 +3361,13 @@ let sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; }; }; - "@tencent-sdk/capi-0.2.15-alpha.0" = { + "@tencent-sdk/capi-0.2.17" = { name = "_at_tencent-sdk_slash_capi"; packageName = "@tencent-sdk/capi"; - version = "0.2.15-alpha.0"; + version = "0.2.17"; src = fetchurl { - url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-0.2.15-alpha.0.tgz"; - sha512 = "1P3tlXJgQaQIqphh1jVeyXDOajFUFIU4J7MoU3Pwxdx58dOwS59/suTq4El0Fe12pc3Gmhw+eDeQc35GaHYViw=="; + url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-0.2.17.tgz"; + sha512 = "DIenMFJXrd4yb35BbW/7LiikCQotbm9HEBG9S4HKV47tcKt6e4nZrNPO3R2hHgQ2jdo0xfqmlUlCP0O4Q3b9pw=="; }; }; "@textlint/ast-node-types-4.2.5" = { @@ -3496,13 +3541,13 @@ let sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ=="; }; }; - "@types/babel__core-7.1.8" = { + "@types/babel__core-7.1.9" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; - version = "7.1.8"; + version = "7.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.8.tgz"; - sha512 = "KXBiQG2OXvaPWFPDS1rD8yV9vO0OuWIqAEqLsbfX0oU2REN5KuoMnZ1gClWcBhO5I3n6oTVAmrMufOvRqdmFTQ=="; + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.9.tgz"; + sha512 = "sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw=="; }; }; "@types/babel__generator-7.6.1" = { @@ -3559,6 +3604,24 @@ let sha512 = "ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ=="; }; }; + "@types/caseless-0.12.2" = { + name = "_at_types_slash_caseless"; + packageName = "@types/caseless"; + version = "0.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz"; + sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="; + }; + }; + "@types/chalk-2.2.0" = { + name = "_at_types_slash_chalk"; + packageName = "@types/chalk"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/chalk/-/chalk-2.2.0.tgz"; + sha512 = "1zzPV9FDe1I/WHhRkf9SNgqtRJWZqrBWgu7JGveuHmmyR9CnAPCie2N/x+iHrgnpYBIcCJWHBoMRv2TRWktsvw=="; + }; + }; "@types/color-name-1.1.1" = { name = "_at_types_slash_color-name"; packageName = "@types/color-name"; @@ -3649,6 +3712,15 @@ let sha512 = "iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g=="; }; }; + "@types/estree-0.0.45" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "0.0.45"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.45.tgz"; + sha512 = "jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g=="; + }; + }; "@types/express-4.17.4" = { name = "_at_types_slash_express"; packageName = "@types/express"; @@ -3658,13 +3730,13 @@ let sha512 = "DO1L53rGqIDUEvOjJKmbMEQ5Z+BM2cIEPy/eV3En+s166Gz+FeuzRerxcab757u/U4v4XF4RYrZPmqKa+aY/2w=="; }; }; - "@types/express-serve-static-core-4.17.7" = { + "@types/express-serve-static-core-4.17.8" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.7"; + version = "4.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.7.tgz"; - sha512 = "EMgTj/DF9qpgLXyc+Btimg+XoH7A2liE8uKul8qSmMTHCeNYzydDKFdsJskDvw42UsesCnhO63dO0Grbj8J4Dw=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.8.tgz"; + sha512 = "1SJZ+R3Q/7mLkOD9ewCBDYD2k0WyZQtWYqF/2VvoNN2/uhI49J9CDN4OAm+wGMA0DbArA4ef27xl4+JwMtGggw=="; }; }; "@types/fs-capacitor-2.0.0" = { @@ -3757,13 +3829,13 @@ let sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw=="; }; }; - "@types/jquery-3.3.38" = { + "@types/jquery-3.5.0" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.3.38"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.38.tgz"; - sha512 = "nkDvmx7x/6kDM5guu/YpXkGZ/Xj/IwGiLDdKM99YA5Vag7pjGyTJ8BNUh/6hxEn/sEu5DKtyRgnONJ7EmOoKrA=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.0.tgz"; + sha512 = "C7qQUjpMWDUNYQRTXsP5nbYYwCwwgy84yPgoTT7fPN69NH92wLeCtFaMsWeolJD1AF/6uQw3pYt62rzv83sMmw=="; }; }; "@types/js-yaml-3.12.4" = { @@ -3829,13 +3901,13 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; - "@types/lodash-4.14.155" = { + "@types/lodash-4.14.157" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.155"; + version = "4.14.157"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.155.tgz"; - sha512 = "vEcX7S7aPhsBCivxMwAANQburHBtfN9RdyXFk84IJmu2Z4Hkg1tOFgaslRiEqqvoLtbCBi6ika1EMspE+NZ9Lg=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.157.tgz"; + sha512 = "Ft5BNFmv2pHDgxV5JDsndOWTRJ+56zte0ZpYLowp03tW+K+t8u8YMOzAnpuqPgzX6WO1XpDIUm7u04M8vdDiVQ=="; }; }; "@types/long-4.0.1" = { @@ -3901,13 +3973,13 @@ let sha512 = "zWz/8NEPxoXNT9YyF2osqyA9WjssZukYpgI4UYZpOjcyqwIUqWGkcCionaEb9Ki+FULyPyvNFpg/329Kd2/pbw=="; }; }; - "@types/node-14.0.13" = { + "@types/node-14.0.14" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.0.13"; + version = "14.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.13.tgz"; - sha512 = "rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.0.14.tgz"; + sha512 = "syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ=="; }; }; "@types/node-6.14.10" = { @@ -3937,6 +4009,15 @@ let sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; }; }; + "@types/object-assign-4.0.30" = { + name = "_at_types_slash_object-assign"; + packageName = "@types/object-assign"; + version = "4.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/object-assign/-/object-assign-4.0.30.tgz"; + sha1 = "8949371d5a99f4381ee0f1df0a9b7a187e07e652"; + }; + }; "@types/parse-json-4.0.0" = { name = "_at_types_slash_parse-json"; packageName = "@types/parse-json"; @@ -3973,6 +4054,24 @@ let sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; }; }; + "@types/request-2.48.5" = { + name = "_at_types_slash_request"; + packageName = "@types/request"; + version = "2.48.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz"; + sha512 = "/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ=="; + }; + }; + "@types/request-promise-native-1.0.17" = { + name = "_at_types_slash_request-promise-native"; + packageName = "@types/request-promise-native"; + version = "1.0.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/request-promise-native/-/request-promise-native-1.0.17.tgz"; + sha512 = "05/d0WbmuwjtGMYEdHIBZ0tqMJJQ2AD9LG2F6rKNBGX1SSFR27XveajH//2N/XYtual8T9Axwl+4v7oBtPUZqg=="; + }; + }; "@types/resolve-0.0.8" = { name = "_at_types_slash_resolve"; packageName = "@types/resolve"; @@ -4045,6 +4144,15 @@ let sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA=="; }; }; + "@types/tough-cookie-4.0.0" = { + name = "_at_types_slash_tough-cookie"; + packageName = "@types/tough-cookie"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz"; + sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A=="; + }; + }; "@types/uglify-js-3.9.2" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; @@ -4162,13 +4270,13 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@typescript-eslint/eslint-plugin-3.3.0" = { + "@typescript-eslint/eslint-plugin-3.4.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.3.0.tgz"; - sha512 = "Ybx/wU75Tazz6nU2d7nN6ll0B98odoiYLXwcuwS5WSttGzK46t0n7TPRQ4ozwcTv82UY6TQoIvI+sJfTzqK9dQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.4.0.tgz"; + sha512 = "wfkpiqaEVhZIuQRmudDszc01jC/YR7gMSxa6ulhggAe/Hs0KVIuo9wzvFiDbG3JD5pRFQoqnf4m7REDsUvBnMQ=="; }; }; "@typescript-eslint/experimental-utils-1.13.0" = { @@ -4180,13 +4288,13 @@ let sha512 = "zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg=="; }; }; - "@typescript-eslint/experimental-utils-3.3.0" = { + "@typescript-eslint/experimental-utils-3.4.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.3.0.tgz"; - sha512 = "d4pGIAbu/tYsrPrdHCQ5xfadJGvlkUxbeBB56nO/VGmEDi/sKmfa5fGty5t5veL1OyJBrUmSiRn1R1qfVDydrg=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.4.0.tgz"; + sha512 = "rHPOjL43lOH1Opte4+dhC0a/+ks+8gOBwxXnyrZ/K4OTAChpSjP76fbI8Cglj7V5GouwVAGaK+xVwzqTyE/TPw=="; }; }; "@typescript-eslint/parser-1.13.0" = { @@ -4198,13 +4306,13 @@ let sha512 = "ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ=="; }; }; - "@typescript-eslint/parser-3.3.0" = { + "@typescript-eslint/parser-3.4.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.3.0.tgz"; - sha512 = "a7S0Sqn/+RpOOWTcaLw6RD4obsharzxmgMfdK24l364VxuBODXjuJM7ImCkSXEN7oz52aiZbXSbc76+2EsE91w=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.4.0.tgz"; + sha512 = "ZUGI/de44L5x87uX5zM14UYcbn79HSXUR+kzcqU42gH0AgpdB/TjuJy3m4ezI7Q/jk3wTQd755mxSDLhQP79KA=="; }; }; "@typescript-eslint/typescript-estree-1.13.0" = { @@ -4225,49 +4333,49 @@ let sha512 = "OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg=="; }; }; - "@typescript-eslint/typescript-estree-3.3.0" = { + "@typescript-eslint/typescript-estree-3.4.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.3.0.tgz"; - sha512 = "3SqxylENltEvJsjjMSDCUx/edZNSC7wAqifUU1Ywp//0OWEZwMZJfecJud9XxJ/40rAKEbJMKBOQzeOjrLJFzQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.4.0.tgz"; + sha512 = "zKwLiybtt4uJb4mkG5q2t6+W7BuYx2IISiDNV+IY68VfoGwErDx/RfVI7SWL4gnZ2t1A1ytQQwZ+YOJbHHJ2rw=="; }; }; - "@vue/cli-shared-utils-4.4.4" = { + "@vue/cli-shared-utils-4.4.6" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.4.4"; + version = "4.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.4.tgz"; - sha512 = "ccMZtTMSutR35V5nrU/eyj+zRMomTRGBTLwJPmaJ2sRiW/93MTggQGXDWC8JRAA8yiU1N8xza8mjBxS0O2wIAA=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.4.6.tgz"; + sha512 = "ba+FZZCjiTSu2otnLjY4qXqASe7ZIQ/QBljk5oRPgqrR0p1NUkDPUcZhqa041aOaSW1yAfSfhOD7Q84nMnWhzQ=="; }; }; - "@vue/cli-ui-4.4.4" = { + "@vue/cli-ui-4.4.6" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.4.4"; + version = "4.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.4.4.tgz"; - sha512 = "BKzDvUgy6fsZolrMLBvMLlue7s3dFeIJdxWWJtc8/CjD5VvLG+XawAePx8W+24QZwCZpvoZIz4zU38D341IT9A=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.4.6.tgz"; + sha512 = "9l67vb0J9iubf14Lj6aI8Fg9DPIgB9gCLbwQWVrFtoaDTapdbo0X6cf0zK1RNeN/5CrGa5baIntqsWwC1Iqlcw=="; }; }; - "@vue/cli-ui-addon-webpack-4.4.4" = { + "@vue/cli-ui-addon-webpack-4.4.6" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.4.4"; + version = "4.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.4.4.tgz"; - sha512 = "qx3MnLxk4JeKpkGK2h5ZihuA8Asgu7sbLDagOOaEbF6GpnHSfkrYioE7es8AHm4QHBgn/MWqnkBts5XDN5r4LA=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.4.6.tgz"; + sha512 = "odDx8lo+MNFCnhOB6fsjWJnoWP/YhDhDuCUQC8YQHCtsGRHI8/mJQk1tLI8cPVrY37aAH8Z0loitg4q3klItlQ=="; }; }; - "@vue/cli-ui-addon-widgets-4.4.4" = { + "@vue/cli-ui-addon-widgets-4.4.6" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.4.4"; + version = "4.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.4.4.tgz"; - sha512 = "nOe6LOwZsKCiaH+jrAO2/G90qAkzB1RYivcWGnXirQAH7nec1ZysDNQv1HMDIfWbhCkJMWhGICuWcrn+rtb/8Q=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.4.6.tgz"; + sha512 = "GqtqxFR30LCxiQ+y/8b+XmAaZ983ojYT/6xOeqD0V0bZ3sNrthTxRcTXKJHbw7xdeE7bWHikHKYQ7Jn3J/Dyjw=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -5026,13 +5134,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-1.23.0" = { + "addons-linter-1.26.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "1.23.0"; + version = "1.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.23.0.tgz"; - sha512 = "4ozo5E+KnsU9h94J496WQs6NYSnofxtw5/Sy63PmeB5FJ3KWERx1S9D8A+ixMAIMgaSiexHpp5alp9yjE0t4gg=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.26.0.tgz"; + sha512 = "PKytX6qxbZapc076auO0LBhAGuw2z7eyPnYusMgNBPbY72MAXzUCt3AhSbwGhZ43d5Tn/3At5H0xPi31VXG2Mg=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -5053,13 +5161,13 @@ let sha512 = "fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw=="; }; }; - "adm-zip-0.4.14" = { + "adm-zip-0.4.16" = { name = "adm-zip"; packageName = "adm-zip"; - version = "0.4.14"; + version = "0.4.16"; src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.14.tgz"; - sha512 = "/9aQCnQHF+0IiCl0qhXoK7qs//SwYE7zX8lsr/DNk1BRAHYxeLZPL4pguwK29gUEqasYQjqPtEpDRSWEkdHn9g=="; + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.16.tgz"; + sha512 = "TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg=="; }; }; "adverb-where-0.0.9" = { @@ -7168,13 +7276,13 @@ let sha512 = "Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ=="; }; }; - "autoprefixer-9.8.0" = { + "autoprefixer-9.8.4" = { name = "autoprefixer"; packageName = "autoprefixer"; - version = "9.8.0"; + version = "9.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz"; - sha512 = "D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.4.tgz"; + sha512 = "84aYfXlpUe45lvmS+HoAWKCkirI/sw4JK0/bTeeqgHYco3dcsOn0NqdejISjptsYwNji/21dnkDri9PsYKk89A=="; }; }; "available-typed-arrays-1.0.2" = { @@ -7213,13 +7321,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.700.0" = { + "aws-sdk-2.704.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.700.0"; + version = "2.704.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.700.0.tgz"; - sha512 = "faBkr/D3IavfL2mwst4/thiKsHkN8YCwU9927Mkiushbe7n4UXxlcNf7LnVxFyjr3WIf4KfziSw4bajRAiAjYA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.704.0.tgz"; + sha512 = "Cjkc86+9sKNn34iIiMa4MimHmr1xpNQZaPVHnnQCpBuh0p6VMDPloz3xc+4LEyoNuwIBzTRjZCVUePVyc31+gw=="; }; }; "aws-sign2-0.6.0" = { @@ -8851,13 +8959,13 @@ let sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; }; }; - "browserslist-4.12.0" = { + "browserslist-4.12.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.12.0"; + version = "4.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz"; - sha512 = "UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.12.1.tgz"; + sha512 = "WMjXwFtPskSW1pQUDJRxvRKRkeCr7usN0O/Za76N+F4oadaTdQHotSGcX9jT/Hs7mSKPkyMFNvqawB/1HzYDKQ=="; }; }; "bser-2.1.1" = { @@ -9175,6 +9283,15 @@ let sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797"; }; }; + "bunyan-1.8.13" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.8.13"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.13.tgz"; + sha512 = "4zO4iMxZeCpf+95ERsr83nwQr11o1KY2FLhX4wZ6kPXieIVYL3k9eX+N6vbHhFEK5h5O/qCQpfXt7N9VBAIvCA=="; + }; + }; "bunyan-syslog-udp-0.2.0" = { name = "bunyan-syslog-udp"; packageName = "bunyan-syslog-udp"; @@ -9589,13 +9706,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001084" = { + "caniuse-lite-1.0.30001088" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001084"; + version = "1.0.30001088"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001084.tgz"; - sha512 = "ftdc5oGmhEbLUuMZ/Qp3mOpzfZLCxPYKcvGv6v2dJJ+8EdqcvZRbAGOiLmkM/PV1QGta/uwBs8/nCl6sokDW6w=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001088.tgz"; + sha512 = "6eYUrlShRYveyqKG58HcyOfPgh3zb2xqs7NvT2VVtP3hEUeeWvc3lqhpeMTxYWBBeeaT9A4bKsrtjATm66BTHg=="; }; }; "capture-exit-2.0.0" = { @@ -10129,13 +10246,13 @@ let sha512 = "HqsYJgIc8ljJJOqOzLphjAs79EUuWSX3nzZi2LNkzlw3GIzAeZbaSektC8iT/tKvLqZq8yl1GJu5o6doA4TRbg=="; }; }; - "chrome-launcher-0.13.1" = { + "chrome-launcher-0.13.3" = { name = "chrome-launcher"; packageName = "chrome-launcher"; - version = "0.13.1"; + version = "0.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.1.tgz"; - sha512 = "q8UiCNAknw6kCUvCVBTAEw1BwT0vaxabCrSjN3B/NWohp12YBD9+DalymYElSoKRD4KpVSu4CCl0us4v/J81Sg=="; + url = "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.3.tgz"; + sha512 = "ovrDuFXgXS96lzeDqFPQRsczkxla+6QMvzsF+1u0mKlD1KE8EuhjdLwiDfIFedb0FSLz18RK3y6IbKu8oqA0qw=="; }; }; "chrome-net-3.3.4" = { @@ -11056,6 +11173,15 @@ let sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; }; + "colorette-1.2.0" = { + name = "colorette"; + packageName = "colorette"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/colorette/-/colorette-1.2.0.tgz"; + sha512 = "soRSroY+OF/8OdA3PTQXwaDJeMc7TfknKKrxeSCencL2a4+Tx5zhxmmv7hdpCjhKBjehzp8+bwe/T68K0hpIjw=="; + }; + }; "colornames-1.1.1" = { name = "colornames"; packageName = "colornames"; @@ -11407,13 +11533,13 @@ let sha512 = "Ke1ejo/RZ+Hzku4gcW34uPMOR4Cpq87MAotELgV9mwiAzDN726cu+eWo0zWg1vRIfyf6yK5bW9uIW+c/SksQ5w=="; }; }; - "compare-func-1.3.4" = { + "compare-func-2.0.0" = { name = "compare-func"; packageName = "compare-func"; - version = "1.3.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/compare-func/-/compare-func-1.3.4.tgz"; - sha512 = "sq2sWtrqKPkEXAC8tEJA1+BqAH9GbFkGBtUOqrUX57VSfwp8xyktctk+uLoRy5eccTdxzDcVIztlYDpKs3Jv1Q=="; + url = "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz"; + sha512 = "zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA=="; }; }; "compare-version-0.1.2" = { @@ -11894,13 +12020,13 @@ let sha1 = "3243397ae93a71d655b3026834a51590b958b9e8"; }; }; - "conventional-changelog-angular-5.0.10" = { + "conventional-changelog-angular-5.0.11" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; - version = "5.0.10"; + version = "5.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.10.tgz"; - sha512 = "k7RPPRs0vp8+BtPsM9uDxRl6KcgqtCJmzRD1wRtgqmhQ96g8ifBGo9O/TZBG23jqlXS/rg8BKRDELxfnQQGiaA=="; + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.11.tgz"; + sha512 = "nSLypht/1yEflhuTogC03i7DX7sOrXGsRn14g131Potqi6cbGbGEE9PSDEHKldabB6N76HiSyw9Ph+kLmC04Qw=="; }; }; "conventional-changelog-core-3.2.3" = { @@ -11921,13 +12047,13 @@ let sha512 = "GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g=="; }; }; - "conventional-changelog-writer-4.0.16" = { + "conventional-changelog-writer-4.0.17" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "4.0.16"; + version = "4.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.16.tgz"; - sha512 = "jmU1sDJDZpm/dkuFxBeRXvyNcJQeKhGtVcFFkwTphUAzyYWcwz2j36Wcv+Mv2hU3tpvLMkysOPXJTLO55AUrYQ=="; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.17.tgz"; + sha512 = "IKQuK3bib/n032KWaSb8YlBFds+aLmzENtnKtxJy3+HqDq5kohu3g/UdNbIHeJWygfnEbZjnCKFxAW0y7ArZAw=="; }; }; "conventional-commits-filter-2.0.6" = { @@ -12227,13 +12353,13 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "core_d-1.0.1" = { + "core_d-2.0.0" = { name = "core_d"; packageName = "core_d"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/core_d/-/core_d-1.0.1.tgz"; - sha512 = "Uge+GU4vDha5IEf0PxX/NdBZBMAE69t93OKasRfWlr+tylp5DDhRQSb7QDDFw/EySwgdS0HV9bsN9iFk6SBDHg=="; + url = "https://registry.npmjs.org/core_d/-/core_d-2.0.0.tgz"; + sha512 = "oIb3QJj/ayYNbg2WYTYM1h3d8XvKF/RBUFhNeVVOfXDskeQC43fypCwnvdGqgTK7rbJ/a8tvxeErCr8vJhJ4vA=="; }; }; "cors-2.8.5" = { @@ -12929,13 +13055,13 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "cuss-1.19.0" = { + "cuss-1.20.0" = { name = "cuss"; packageName = "cuss"; - version = "1.19.0"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/cuss/-/cuss-1.19.0.tgz"; - sha512 = "RGVhyJ5/9wfTOsVApjBtAvI8zV8+DZvJ5K72TLfMt+KqtmwlqsYkOVVdtuZkvvIMpx+Ctv4KsIKlhkXWoT1fiQ=="; + url = "https://registry.npmjs.org/cuss/-/cuss-1.20.0.tgz"; + sha512 = "ca6Z5roeWhHgXeDLn0g3SLrG68Cb9922MvHme7Q/dz4XfwuxcBLalW4RqFUyZOiczzAqKc2XVtR2Kof+sIfinQ=="; }; }; "custom-error-instance-2.1.1" = { @@ -14864,15 +14990,6 @@ let sha1 = "34dcf37f50a8e93c2b3bca8bb7fb9155c7da3bee"; }; }; - "dot-prop-3.0.0" = { - name = "dot-prop"; - packageName = "dot-prop"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; - sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; - }; - }; "dot-prop-4.2.0" = { name = "dot-prop"; packageName = "dot-prop"; @@ -15278,13 +15395,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.478" = { + "electron-to-chromium-1.3.481" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.478"; + version = "1.3.481"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.478.tgz"; - sha512 = "pt9GUDD52uEO9ZXWcG4UuW/HwE8T+a8iFP7K2qqWrHB5wUxbbvCIXGBVpQDDQwSR766Nn4AkmLYxOUNd4Ji5Dw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.481.tgz"; + sha512 = "q2PeCP2PQXSYadDo9uNY+uHXjdB9PcsUpCVoGlY8TZOPHGlXdevlqW9PkKeqCxn2QBkGB8b6AcMO++gh8X82bA=="; }; }; "elegant-spinner-1.0.1" = { @@ -15612,6 +15729,15 @@ let sha512 = "S7eiFb/erugyd1rLb6mQ3Vuq+EXHv5cpCkNqqIkYkBgN2QdFnyCZzFBleqwGEx4lgNGYij81BWnCrFNK7vxvjQ=="; }; }; + "enquirer-2.3.5" = { + name = "enquirer"; + packageName = "enquirer"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/enquirer/-/enquirer-2.3.5.tgz"; + sha512 = "BNT1C08P9XD0vNg3J475yIUG+mVdp9T6towYFHUv897X0KoHBjB1shyrNmhmtHWKP17iSWgo7Gqh7BBuzLZMSA=="; + }; + }; "ensure-posix-path-1.1.1" = { name = "ensure-posix-path"; packageName = "ensure-posix-path"; @@ -15918,15 +16044,6 @@ let sha512 = "eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg=="; }; }; - "es6-promisify-6.1.0" = { - name = "es6-promisify"; - packageName = "es6-promisify"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.0.tgz"; - sha512 = "jCsk2fpfEFusVv1MDkF4Uf0hAzIKNDMgR6LyOIw6a3jwkN1sCgWzuwgnsHY9YSQ8n8P31HoncvE0LC44cpWTrw=="; - }; - }; "es6-promisify-6.1.1" = { name = "es6-promisify"; packageName = "es6-promisify"; @@ -15981,6 +16098,15 @@ let sha512 = "VHDcDg9AwFoeQU9ULPCJCw6P95gr9Er65M+bccefEVD/OOb+WMyQIYw58rpm0F+zcfRJNf394I+BMH8JeU97Hw=="; }; }; + "escalade-3.0.1" = { + name = "escalade"; + packageName = "escalade"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escalade/-/escalade-3.0.1.tgz"; + sha512 = "DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA=="; + }; + }; "escape-goat-2.1.1" = { name = "escape-goat"; packageName = "escape-goat"; @@ -16053,13 +16179,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "escodegen-1.14.2" = { + "escodegen-1.14.3" = { name = "escodegen"; packageName = "escodegen"; - version = "1.14.2"; + version = "1.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.14.2.tgz"; - sha512 = "InuOIiKk8wwuOFg6x9BQXbzjrQhtyXh46K9bqVTPzSo2FnyMBaYGBMC6PhQy7yxxil9vIedFBweQBMK74/7o8A=="; + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz"; + sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; }; }; "escodegen-1.3.3" = { @@ -16089,24 +16215,6 @@ let sha1 = "759dce8496c4248fec2d0caaf4108bcf3f1a7f5d"; }; }; - "escope-3.6.0" = { - name = "escope"; - packageName = "escope"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"; - sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; - }; - }; - "eslint-3.19.0" = { - name = "eslint"; - packageName = "eslint"; - version = "3.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz"; - sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; - }; - }; "eslint-4.19.1" = { name = "eslint"; packageName = "eslint"; @@ -16134,22 +16242,22 @@ let sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; }; }; - "eslint-7.2.0" = { + "eslint-7.3.1" = { name = "eslint"; packageName = "eslint"; - version = "7.2.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.2.0.tgz"; - sha512 = "B3BtEyaDKC5MlfDa2Ha8/D6DsS4fju95zs0hjS3HdGazw+LNayai38A25qMppK37wWGWNYSPOR6oYzlz5MHsRQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.3.1.tgz"; + sha512 = "cQC/xj9bhWUcyi/RuMbRtC3I0eW8MH0jhRELSvpKYkWep3C6YZ2OkvcvJVUeO6gcunABmzptbXBuDoXsjHmfTA=="; }; }; - "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { - name = "eslint-plugin-no-unsafe-innerhtml"; - packageName = "eslint-plugin-no-unsafe-innerhtml"; - version = "1.0.16"; + "eslint-plugin-no-unsanitized-3.1.2" = { + name = "eslint-plugin-no-unsanitized"; + packageName = "eslint-plugin-no-unsanitized"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-no-unsafe-innerhtml/-/eslint-plugin-no-unsafe-innerhtml-1.0.16.tgz"; - sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932"; + url = "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-3.1.2.tgz"; + sha512 = "KPShfliA3Uy9qqwQx35P1fwIOeJjZkb0FbMMUFztRYRposzaynsM8JCEb952fqkidROl1kpqY80uSvn+TcWkQQ=="; }; }; "eslint-plugin-vue-6.2.2" = { @@ -16206,15 +16314,6 @@ let sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; }; - "eslint-visitor-keys-1.1.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; - sha512 = "8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="; - }; - }; "eslint-visitor-keys-1.2.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -16224,6 +16323,15 @@ let sha512 = "WFb4ihckKil6hu3Dp798xdzSfddwKKU3+nGniKF6HfeW6OLd2OUDEPP7TcHtB5+QXOKg2s6B2DaMPE1Nn/kxKQ=="; }; }; + "eslint-visitor-keys-1.3.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; + }; + }; "esm-3.2.25" = { name = "esm"; packageName = "esm"; @@ -17430,13 +17538,13 @@ let sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; }; }; - "fecha-2.3.3" = { + "fecha-4.2.0" = { name = "fecha"; packageName = "fecha"; - version = "2.3.3"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz"; - sha512 = "lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="; + url = "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz"; + sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg=="; }; }; "fields-0.1.24" = { @@ -18285,13 +18393,13 @@ let sha512 = "F3E8C9CTPK+uRGdVTMBHGo7mHX+KRtClLzkegR6ux1yy+ByxOziumpTzxajzfhICHfYdnGWY4Bokl8dirYsDeA=="; }; }; - "fork-ts-checker-webpack-plugin-5.0.1" = { + "fork-ts-checker-webpack-plugin-5.0.4" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "5.0.1"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.0.1.tgz"; - sha512 = "bys+hPwlPckrSCzNkg0BSUTsCRZWS6qIRiwk+8AjKitLWTqokda0QVImCx/Vm9cL/OGZZUnrFXazsVc99nijKQ=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.0.4.tgz"; + sha512 = "nSEqM3KhAjTf8VmuZym2k6WadIasvXybJExFegqMJDkTrOBOY8yGjsXG2FGFJls3DOHtXKzrr3Bv0ZD1LaM7cA=="; }; }; "form-data-1.0.0-rc3" = { @@ -18717,15 +18825,6 @@ let sha512 = "oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw=="; }; }; - "fsevents-2.1.2" = { - name = "fsevents"; - packageName = "fsevents"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz"; - sha512 = "R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA=="; - }; - }; "fsevents-2.1.3" = { name = "fsevents"; packageName = "fsevents"; @@ -18834,13 +18933,13 @@ let sha1 = "979e22f9451b4b38f051f7937c919dbacc692958"; }; }; - "fx-runner-1.0.11" = { + "fx-runner-1.0.12" = { name = "fx-runner"; packageName = "fx-runner"; - version = "1.0.11"; + version = "1.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.11.tgz"; - sha512 = "igHogHf5wTqqaPPTOav18MMTVq/eoeTJiw/PvPUuwnzU8vbyZInFPgR66G9ZBwvwxC7e611nbtB4xSMcYVhlvg=="; + url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.12.tgz"; + sha512 = "SLATlfKI2lyIcQsU8Sgfcwrni6PpC1VMTgp3aRomK/6azrzSQ3r63HqoTRliE/6JP8WjqVkIdCOGWk1ZqhfceA=="; }; }; "gauge-1.2.7" = { @@ -19699,15 +19798,6 @@ let sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; }; }; - "globals-9.18.0" = { - name = "globals"; - packageName = "globals"; - version = "9.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; - sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; - }; - }; "globalthis-1.0.1" = { name = "globalthis"; packageName = "globalthis"; @@ -21986,13 +22076,13 @@ let sha512 = "s7lJuQDJEdjqtaIWhp3KYHl6WV3J04U9zoQ6wVc+Xoa06XM27SXUY57qC5DO46xkF0CfgXMKkKNcgvSu/SAEpA=="; }; }; - "ink-text-input-3.2.2" = { + "ink-text-input-3.3.0" = { name = "ink-text-input"; packageName = "ink-text-input"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-3.2.2.tgz"; - sha512 = "h4EEJYOO88uK16U1mhgmJBMYeEy8ZmkrdV6gybyluCbAOQtAyND/WuRQVIKhe7D2dtYd2wwYTC648nuAxwltPQ=="; + url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-3.3.0.tgz"; + sha512 = "gO4wrOf2ie3YuEARTIwGlw37lMjFn3Gk6CKIDrMlHb46WFMagZU7DplohjM24zynlqfnXA5UDEIfC2NBcvD8kg=="; }; }; "inline-source-map-0.6.2" = { @@ -22022,15 +22112,6 @@ let sha1 = "ea25e4ce69ca145e05c99e46dcfec05e4012594a"; }; }; - "inquirer-0.12.0" = { - name = "inquirer"; - packageName = "inquirer"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz"; - sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; - }; - }; "inquirer-0.8.5" = { name = "inquirer"; packageName = "inquirer"; @@ -24146,13 +24227,13 @@ let sha512 = "FHs9cS0phsXFXI1waqK/kY9TnyiWmQp65NFu/vMZky1Tef4zIYD3D5qZcBhBkXhAbIFA+fPfmMUUgGKBQWtKlQ=="; }; }; - "js-base64-2.6.0" = { + "js-base64-2.6.1" = { name = "js-base64"; packageName = "js-base64"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-2.6.0.tgz"; - sha512 = "jmCv6u76N7XtpXoF+aS5tNUQLRAJe1DgN9JXO5csoCkEIAPPLwWy93OQo/RoydkD6vyTf1oKKgto8SH7LM+Ong=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-2.6.1.tgz"; + sha512 = "G5x2saUTupU9D/xBY9snJs3TxvwX8EkpLFiYlPpDt/VmMHOXprnSU1nxiTmFbijCX4BLF/cMRIfAcC5BiMYgFQ=="; }; }; "js-beautify-1.11.0" = { @@ -24281,13 +24362,13 @@ let sha1 = "b01307cb29b618a1ed26ec79e911f803c4da0040"; }; }; - "jscodeshift-0.9.0" = { + "jscodeshift-0.10.0" = { name = "jscodeshift"; packageName = "jscodeshift"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.9.0.tgz"; - sha512 = "SUeXq8dJzj5LR8uy71axgG3bmiHoC0IdHy7n89SqKzkzBWpAds5F9IIGE+lqUSZX9J0ZfEzN8fXWIqQV0dIp2w=="; + url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.10.0.tgz"; + sha512 = "xpH2FVSEepXoNr6+cPlPHzPzBY1W9bPulufhCHOShzk8+CTCzAOQKytuOXT0b/9PvmO4biRi0g/ZIylVew815w=="; }; }; "jsdom-11.12.0" = { @@ -27072,13 +27153,13 @@ let sha512 = "Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw=="; }; }; - "logform-2.1.2" = { + "logform-2.2.0" = { name = "logform"; packageName = "logform"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz"; - sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; + url = "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz"; + sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; }; }; "loglevel-1.6.8" = { @@ -28107,13 +28188,13 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; - "mdn-browser-compat-data-1.0.15" = { + "mdn-browser-compat-data-1.0.25" = { name = "mdn-browser-compat-data"; packageName = "mdn-browser-compat-data"; - version = "1.0.15"; + version = "1.0.25"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.15.tgz"; - sha512 = "0jxT4ZqqCzJJfktX9d4NKgfRENy60kFzhVNV0mXNHvlnw8KrMe2cKOlEKs/Bz+odlgO0rRZAxU0OKiptqVhAXg=="; + url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.25.tgz"; + sha512 = "4klqILpitRnmWRai5Ols/GXP1eGDYMluAcBRoNZnGNkV2OnkDmpA9hUlM+9pTFym5FGDO5TAm3HweVSVc7ziiQ=="; }; }; "mdn-data-2.0.4" = { @@ -29115,15 +29196,6 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mkdirp-1.0.3" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz"; - sha512 = "6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g=="; - }; - }; "mkdirp-1.0.4" = { name = "mkdirp"; packageName = "mkdirp"; @@ -31151,15 +31223,6 @@ let sha512 = "wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw=="; }; }; - "npm-pick-manifest-6.0.0" = { - name = "npm-pick-manifest"; - packageName = "npm-pick-manifest"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.0.0.tgz"; - sha512 = "PdJpXMvjqt4nftNEDpCgjBUF8yI3Q3MyuAmVB9nemnnCg32F4BPL/JFBfdj8DubgHCYUFQhtLWmBPvdsFtjWMg=="; - }; - }; "npm-pick-manifest-6.1.0" = { name = "npm-pick-manifest"; packageName = "npm-pick-manifest"; @@ -31953,15 +32016,6 @@ let sha512 = "K6EKzYqnwQzk+/dzJAQSBORub3xlBTxMz+ntpZpH/LyCa1o6KjXhuN+2npAaI9jaSmU3R1Q8NWf4KUWcyytGsQ=="; }; }; - "open-7.0.3" = { - name = "open"; - packageName = "open"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-7.0.3.tgz"; - sha512 = "sP2ru2v0P290WFfv49Ap8MF6PkzGNnGlAwHweB4WR4mr5d2d0woiCluUeJ218w7/+PmoBy9JmYgD5A4mLcWOFA=="; - }; - }; "open-7.0.4" = { name = "open"; packageName = "open"; @@ -33807,6 +33861,15 @@ let sha512 = "3RfX2L76o7v230FP1fZ3Fo/WX7Su+P1Ld+pvBm2j+MyUjtA/KqDYxMkzBqzcX3R00zbC7Gf/HqIzyuu3tgvi9Q=="; }; }; + "pino-6.3.2" = { + name = "pino"; + packageName = "pino"; + version = "6.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pino/-/pino-6.3.2.tgz"; + sha512 = "EiP3L1hoFw19KPocWimjnfXeysld0ne89ZRQ+bf8nAeA2TyuLoggNlibAi+Kla67GvQBopLdIZOsh1z/Lruo5Q=="; + }; + }; "pino-std-serializers-2.4.2" = { name = "pino-std-serializers"; packageName = "pino-std-serializers"; @@ -34005,15 +34068,6 @@ let sha1 = "7482452c1a0f508e3e344eaec312c91c29dc655a"; }; }; - "pluralize-1.2.1" = { - name = "pluralize"; - packageName = "pluralize"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz"; - sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; - }; - }; "pluralize-2.0.0" = { name = "pluralize"; packageName = "pluralize"; @@ -34123,15 +34177,6 @@ let sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; }; }; - "postcss-7.0.27" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.27"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz"; - sha512 = "WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ=="; - }; - }; "postcss-7.0.32" = { name = "postcss"; packageName = "postcss"; @@ -38299,13 +38344,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.17.1" = { + "rollup-2.18.0" = { name = "rollup"; packageName = "rollup"; - version = "2.17.1"; + version = "2.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.17.1.tgz"; - sha512 = "lVrtCXJ+08Eapa0SfApLmRNWNWm2FsYFnLPIJZJvZz2uI2Gv+dfPyu1zgF7KKF/HYFJDvjxbdCbI8lUVMnG7Sg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.18.0.tgz"; + sha512 = "LhuQQp3WpnHo3HlKCRrdMXpB6jdLsGOoXXSfMjbv74s5VdV3WZhkYJT0Z6w/EH3UgPH+g/S9T4GJrKW/5iD8TA=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -39514,15 +39559,6 @@ let sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1"; }; }; - "shelljs-0.7.8" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz"; - sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; - }; - }; "shelljs-0.8.4" = { name = "shelljs"; packageName = "shelljs"; @@ -40369,6 +40405,15 @@ let sha512 = "o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA=="; }; }; + "socks-2.4.1" = { + name = "socks"; + packageName = "socks"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-2.4.1.tgz"; + sha512 = "8mWHeYC1OA0500qzb+sqwm0Hzi8oBpeuI1JugoBVMEJtJvxSgco8xFSK+NRnZcHeeWjTbF82KUDo5sXH22TY5A=="; + }; + }; "socks-proxy-agent-4.0.2" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; @@ -41080,13 +41125,13 @@ let sha512 = "J3fsWb5nS6PqObZLW2tclEz/bkRQ5pcF9goXanYGVsoH71F6W4f5sOnck9szeubI8srNaiL9pa0kPRv/lojHiw=="; }; }; - "ssb-db-20.1.0" = { + "ssb-db-20.2.0" = { name = "ssb-db"; packageName = "ssb-db"; - version = "20.1.0"; + version = "20.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db/-/ssb-db-20.1.0.tgz"; - sha512 = "oN5bBdnuOv6ZA6DRBeB5iH08VvGEHq5yfHNdtvaOv3IDj6RYSJMd0Z6qOwR9qlNgxtaD/fDo21nxaNcs5Hn/WQ=="; + url = "https://registry.npmjs.org/ssb-db/-/ssb-db-20.2.0.tgz"; + sha512 = "1JMUGGmxfoDNuFG56dfAZnzxtzKDtME/SITE3nlVX684n7zHih46NTFAF721PttQVkS1wcXJXmb3fbY2Rpvy1g=="; }; }; "ssb-ebt-5.6.7" = { @@ -41332,13 +41377,13 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; - "ssb-validate-4.1.0" = { + "ssb-validate-4.1.1" = { name = "ssb-validate"; packageName = "ssb-validate"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.1.0.tgz"; - sha512 = "GszJGLXZdnWSAP5f1evXwRct7qY0T/LFXR41eHIh/N63Z7kKBfBcIMd6mbQ5DgpU+sVHwdhXXloYXoMPZHiJDA=="; + url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.1.1.tgz"; + sha512 = "3OsB6qTYlOMUqy4S1i0NuBtiqRW0s9z1Uf+Yqhjcqt7Zu8LTZk59HyhB1gfYmC3xzR/UnHeI7LkJZOt2+r//gA=="; }; }; "ssb-ws-6.2.3" = { @@ -43070,13 +43115,13 @@ let sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268"; }; }; - "tail-2.0.3" = { + "tail-2.0.4" = { name = "tail"; packageName = "tail"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/tail/-/tail-2.0.3.tgz"; - sha512 = "s9NOGkLqqiDEtBttQZI7acLS8ycYK5sTlDwNjGnpXG9c8AWj0cfAtwEIzo/hVRMMiC5EYz+bXaJWC1u1u0GPpQ=="; + url = "https://registry.npmjs.org/tail/-/tail-2.0.4.tgz"; + sha512 = "xHkZdNWIzO++g+V/rHGqVoHd2LRxz+8t8bj6FGelfb8FHBjg5yjkX7Su/8sQSBo5alIspYkRp/fU0A2SM5h+5A=="; }; }; "taketalk-1.0.0" = { @@ -43367,13 +43412,13 @@ let sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="; }; }; - "terminal-kit-1.35.7" = { + "terminal-kit-1.35.8" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.35.7"; + version = "1.35.8"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.35.7.tgz"; - sha512 = "VrDIbdOb7eXjYoNd9UAm4Q2xKpQcbdi8DbQnCardR4EtcxbptonvVrnBrWKuQUKvV7IvfUgZhekT+kYzbQ3C+Q=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.35.8.tgz"; + sha512 = "/IGjDgbStqJWgbYhNwgmollwYqGNkDmamYLVnoWwaFYnpyEg3tKHRt3XMKuOAJy5k82q9r18dqngsQqL3g/zRw=="; }; }; "terser-3.17.0" = { @@ -43610,13 +43655,13 @@ let sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; - "through2-3.0.1" = { + "through2-3.0.2" = { name = "through2"; packageName = "through2"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz"; - sha512 = "M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww=="; + url = "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz"; + sha512 = "enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ=="; }; }; "through2-filter-3.0.0" = { @@ -44915,15 +44960,6 @@ let sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; }; - "typescript-3.8.3" = { - name = "typescript"; - packageName = "typescript"; - version = "3.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz"; - sha512 = "MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w=="; - }; - }; "typescript-3.9.5" = { name = "typescript"; packageName = "typescript"; @@ -45032,6 +45068,15 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; + "uglify-js-3.10.0" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.0.tgz"; + sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; + }; + }; "uglify-js-3.4.10" = { name = "uglify-js"; packageName = "uglify-js"; @@ -45050,15 +45095,6 @@ let sha512 = "W7KxyzeaQmZvUFbGj4+YFshhVrMBGSg2IbcYAjGWGvx8DHvJMclbTDMpffdxFUGPBHjIytk7KJUR/KUXstUGDw=="; }; }; - "uglify-js-3.9.4" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.9.4"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.4.tgz"; - sha512 = "8RZBJq5smLOa7KslsNsVcSH+KOXf1uDU8yqLeNuVKwmT0T3FA0ZoXlinQfRad7SDcbZZRZE4ov+2v71EnxNyCA=="; - }; - }; "uglify-to-browserify-1.0.2" = { name = "uglify-to-browserify"; packageName = "uglify-to-browserify"; @@ -46355,15 +46391,6 @@ let sha512 = "yqjRXZzSJm9Dbl84H2VDHpM3zMjzSJQ+hn6C4zqd5ilW+7P4ZmLEEqwho9LjP+tGuZlF4xrHQXT0h9QZUS/pWA=="; }; }; - "uuid-7.0.2" = { - name = "uuid"; - packageName = "uuid"; - version = "7.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-7.0.2.tgz"; - sha512 = "vy9V/+pKG+5ZTYKf+VcphF5Oc6EFiu3W8Nv3P3zIh0EqVI80ZxOzuPfe9EHjkFNvf8+xuTHVeei4Drydlx4zjw=="; - }; - }; "uuid-7.0.3" = { name = "uuid"; packageName = "uuid"; @@ -46382,6 +46409,15 @@ let sha512 = "CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="; }; }; + "uuid-8.2.0" = { + name = "uuid"; + packageName = "uuid"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-8.2.0.tgz"; + sha512 = "CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q=="; + }; + }; "v8-compile-cache-2.1.1" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; @@ -47696,13 +47732,13 @@ let sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; }; }; - "whatwg-url-8.0.0" = { + "whatwg-url-8.1.0" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.0.0.tgz"; - sha512 = "41ou2Dugpij8/LPO5Pq64K5q++MnRCBpEHvQr26/mArEKTkCV5aoXIqyhuYtE0pkqScXwhf2JP57rkRTYM29lQ=="; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.1.0.tgz"; + sha512 = "vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw=="; }; }; "whatwg-url-compat-0.6.5" = { @@ -47993,13 +48029,13 @@ let sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; - "winston-2.4.4" = { + "winston-2.4.5" = { name = "winston"; packageName = "winston"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.4.4.tgz"; - sha512 = "NBo2Pepn4hK4V01UfcWcDlmiVTs7VTB1h7bgnB0rgP146bYhMxX0ypCz3lBOfNxCO4Zuek7yeT+y/zM1OfMw4Q=="; + url = "https://registry.npmjs.org/winston/-/winston-2.4.5.tgz"; + sha512 = "TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A=="; }; }; "winston-3.2.1" = { @@ -48011,13 +48047,13 @@ let sha512 = "zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw=="; }; }; - "winston-transport-4.3.0" = { + "winston-transport-4.4.0" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz"; - sha512 = "B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A=="; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz"; + sha512 = "Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw=="; }; }; "with-5.1.1" = { @@ -48894,15 +48930,6 @@ let sha512 = "ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg=="; }; }; - "yargs-15.1.0" = { - name = "yargs"; - packageName = "yargs"; - version = "15.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz"; - sha512 = "T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg=="; - }; - }; "yargs-15.3.1" = { name = "yargs"; packageName = "yargs"; @@ -49002,15 +49029,6 @@ let sha512 = "0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw=="; }; }; - "yargs-parser-16.1.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "16.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz"; - sha512 = "H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg=="; - }; - }; "yargs-parser-18.1.3" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -49287,23 +49305,23 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "9.1.9"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.9.tgz"; - sha512 = "k8C0OY3oHoixd3buCgF8+VFe8YZGSGiprnbVMEF2WJHUUw87lPCu/d7dbID3AtVwdKdAB275rAt6IZEIzXInbw=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-10.0.0.tgz"; + sha512 = "I+2cltQCmThgrnHwsG5AX0hQ9z6rK/8ysRWWeiJXHtEtqupW9eNzXX1QfXWxWB3o6oIKgijvnLlp04BUlWCyXA=="; }; dependencies = [ - sources."@angular-devkit/architect-0.901.9" - sources."@angular-devkit/core-9.1.9" - sources."@angular-devkit/schematics-9.1.9" - sources."@schematics/angular-9.1.9" - sources."@schematics/update-0.901.9" + sources."@angular-devkit/architect-0.1000.0" + sources."@angular-devkit/core-10.0.0" + sources."@angular-devkit/schematics-10.0.0" + sources."@schematics/angular-10.0.0" + sources."@schematics/update-0.1000.0" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" @@ -49475,7 +49493,7 @@ in sources."npm-normalize-package-bin-1.0.1" sources."npm-package-arg-8.0.1" sources."npm-packlist-1.4.8" - sources."npm-pick-manifest-6.0.0" + sources."npm-pick-manifest-6.1.0" (sources."npm-registry-fetch-4.0.4" // { dependencies = [ sources."hosted-git-info-2.8.8" @@ -49490,8 +49508,8 @@ in sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" sources."onetime-5.1.0" - sources."open-7.0.3" - sources."ora-4.0.3" + sources."open-7.0.4" + sources."ora-4.0.4" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" @@ -49540,10 +49558,10 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.5.4" + sources."rxjs-6.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.1.3" + sources."semver-7.3.2" (sources."semver-intersect-1.4.0" // { dependencies = [ sources."semver-5.7.1" @@ -49599,7 +49617,7 @@ in sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."util-promisify-2.1.0" - sources."uuid-7.0.2" + sources."uuid-8.1.0" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" @@ -49724,7 +49742,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."commander-2.20.3" sources."concat-map-0.0.1" (sources."convert-source-map-1.7.0" // { dependencies = [ @@ -49913,7 +49930,7 @@ in sources."stream-shift-1.0.1" sources."string_decoder-1.3.0" sources."through-2.3.8" - sources."through2-3.0.1" + sources."through2-3.0.2" (sources."through2-filter-3.0.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -49934,7 +49951,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.9.4" + sources."uglify-js-3.10.0" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -50019,7 +50036,7 @@ in sources."domexception-1.0.1" sources."ecc-jsbn-0.1.2" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.2" + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -50137,10 +50154,10 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "7.4.0"; + version = "7.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.4.0.tgz"; - sha512 = "SMA9k8DWGeMXUhIJAtitG+l2a9IIH0mnsJX5kGhnI890G4yn3d1mFbUCA9rJ9qKc8MpSOEeSDsHzTykr1kUG1w=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.4.1.tgz"; + sha512 = "90IWWqDIPX3M0vwkmnZ0Ct/EY2b75DYbsw2ZbVxaj57ASdbajhS7Pxhc7MC/L+07nBge+xMRHvQRoKdcfWHd0w=="; }; dependencies = [ sources."@angular-devkit/core-9.1.9" @@ -50154,9 +50171,9 @@ in sources."inquirer-7.1.0" ]; }) - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + (sources."@babel/highlight-7.10.3" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -50172,7 +50189,7 @@ in sources."@types/anymatch-1.3.1" sources."@types/color-name-1.1.1" sources."@types/json5-0.0.29" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -50419,7 +50436,7 @@ in sources."find-up-3.0.0" sources."flush-write-stream-1.1.1" sources."for-in-1.0.2" - (sources."fork-ts-checker-webpack-plugin-5.0.1" // { + (sources."fork-ts-checker-webpack-plugin-5.0.4" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -50855,10 +50872,10 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.4.4"; + version = "4.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.4.4.tgz"; - sha512 = "52pXlikVdBiPlZqEBx+vFQCrTmPrP3aLLxE0Wue00yJacPXt8ph6cb1PhCwYQAY1N9ROQstVJlsrm3GOXpCfyw=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.4.6.tgz"; + sha512 = "IaLrnZ80BrBLPAkBup8bn363S1NHfNf8jfCJLWoXad598cUm6byMqntWtDFeTq0c3KohXcsIbT+nqLc5S9vz0w=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" @@ -50874,52 +50891,107 @@ in sources."@apollographql/graphql-language-service-types-2.0.2" sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.26" - sources."@babel/code-frame-7.10.1" - (sources."@babel/core-7.10.2" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."@babel/generator-7.10.2" - sources."@babel/helper-create-class-features-plugin-7.10.2" - sources."@babel/helper-function-name-7.10.1" - sources."@babel/helper-get-function-arity-7.10.1" - sources."@babel/helper-member-expression-to-functions-7.10.1" - sources."@babel/helper-module-imports-7.10.1" + sources."@babel/code-frame-7.10.3" + sources."@babel/compat-data-7.10.3" + sources."@babel/core-7.10.3" + sources."@babel/generator-7.10.3" + sources."@babel/helper-annotate-as-pure-7.10.1" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.3" + sources."@babel/helper-compilation-targets-7.10.2" + sources."@babel/helper-create-class-features-plugin-7.10.3" + sources."@babel/helper-create-regexp-features-plugin-7.10.1" + sources."@babel/helper-define-map-7.10.3" + sources."@babel/helper-explode-assignable-expression-7.10.3" + sources."@babel/helper-function-name-7.10.3" + sources."@babel/helper-get-function-arity-7.10.3" + sources."@babel/helper-hoist-variables-7.10.3" + sources."@babel/helper-member-expression-to-functions-7.10.3" + sources."@babel/helper-module-imports-7.10.3" sources."@babel/helper-module-transforms-7.10.1" - sources."@babel/helper-optimise-call-expression-7.10.1" - sources."@babel/helper-plugin-utils-7.10.1" + sources."@babel/helper-optimise-call-expression-7.10.3" + sources."@babel/helper-plugin-utils-7.10.3" + sources."@babel/helper-regex-7.10.1" + sources."@babel/helper-remap-async-to-generator-7.10.3" sources."@babel/helper-replace-supers-7.10.1" sources."@babel/helper-simple-access-7.10.1" sources."@babel/helper-split-export-declaration-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" + sources."@babel/helper-validator-identifier-7.10.3" + sources."@babel/helper-wrap-function-7.10.1" sources."@babel/helpers-7.10.1" - sources."@babel/highlight-7.10.1" - sources."@babel/parser-7.10.2" + sources."@babel/highlight-7.10.3" + sources."@babel/parser-7.10.3" + sources."@babel/plugin-proposal-async-generator-functions-7.10.3" sources."@babel/plugin-proposal-class-properties-7.10.1" + sources."@babel/plugin-proposal-dynamic-import-7.10.1" + sources."@babel/plugin-proposal-json-strings-7.10.1" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.1" - sources."@babel/plugin-proposal-optional-chaining-7.10.1" + sources."@babel/plugin-proposal-numeric-separator-7.10.1" + sources."@babel/plugin-proposal-object-rest-spread-7.10.3" + sources."@babel/plugin-proposal-optional-catch-binding-7.10.1" + sources."@babel/plugin-proposal-optional-chaining-7.10.3" + sources."@babel/plugin-proposal-private-methods-7.10.1" + sources."@babel/plugin-proposal-unicode-property-regex-7.10.1" + sources."@babel/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-class-properties-7.10.1" + sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-flow-7.10.1" + sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.10.1" + sources."@babel/plugin-syntax-object-rest-spread-7.8.3" + sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-top-level-await-7.10.1" sources."@babel/plugin-syntax-typescript-7.10.1" + sources."@babel/plugin-transform-arrow-functions-7.10.1" + sources."@babel/plugin-transform-async-to-generator-7.10.1" + sources."@babel/plugin-transform-block-scoped-functions-7.10.1" + sources."@babel/plugin-transform-block-scoping-7.10.1" + sources."@babel/plugin-transform-classes-7.10.3" + sources."@babel/plugin-transform-computed-properties-7.10.3" + sources."@babel/plugin-transform-destructuring-7.10.1" + sources."@babel/plugin-transform-dotall-regex-7.10.1" + sources."@babel/plugin-transform-duplicate-keys-7.10.1" + sources."@babel/plugin-transform-exponentiation-operator-7.10.1" sources."@babel/plugin-transform-flow-strip-types-7.10.1" + sources."@babel/plugin-transform-for-of-7.10.1" + sources."@babel/plugin-transform-function-name-7.10.1" + sources."@babel/plugin-transform-literals-7.10.1" + sources."@babel/plugin-transform-member-expression-literals-7.10.1" + sources."@babel/plugin-transform-modules-amd-7.10.1" sources."@babel/plugin-transform-modules-commonjs-7.10.1" - sources."@babel/plugin-transform-typescript-7.10.1" + sources."@babel/plugin-transform-modules-systemjs-7.10.3" + sources."@babel/plugin-transform-modules-umd-7.10.1" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.3" + sources."@babel/plugin-transform-new-target-7.10.1" + sources."@babel/plugin-transform-object-super-7.10.1" + sources."@babel/plugin-transform-parameters-7.10.1" + sources."@babel/plugin-transform-property-literals-7.10.1" + sources."@babel/plugin-transform-regenerator-7.10.3" + sources."@babel/plugin-transform-reserved-words-7.10.1" + sources."@babel/plugin-transform-shorthand-properties-7.10.1" + sources."@babel/plugin-transform-spread-7.10.1" + sources."@babel/plugin-transform-sticky-regex-7.10.1" + sources."@babel/plugin-transform-template-literals-7.10.3" + sources."@babel/plugin-transform-typeof-symbol-7.10.1" + sources."@babel/plugin-transform-typescript-7.10.3" + sources."@babel/plugin-transform-unicode-escapes-7.10.1" + sources."@babel/plugin-transform-unicode-regex-7.10.1" + sources."@babel/preset-env-7.10.3" sources."@babel/preset-flow-7.10.1" + sources."@babel/preset-modules-0.1.3" sources."@babel/preset-typescript-7.10.1" - (sources."@babel/register-7.10.1" // { + (sources."@babel/register-7.10.3" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" - sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.10.2" - sources."@babel/template-7.10.1" - sources."@babel/traverse-7.10.1" - sources."@babel/types-7.10.2" - sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1" + sources."@babel/runtime-7.10.3" + sources."@babel/template-7.10.3" + sources."@babel/traverse-7.10.3" + sources."@babel/types-7.10.3" + sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.2" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -50944,7 +51016,6 @@ in (sources."@oclif/command-1.6.1" // { dependencies = [ sources."@oclif/plugin-help-3.1.0" - sources."semver-5.7.1" sources."strip-ansi-5.2.0" ]; }) @@ -50968,7 +51039,6 @@ in dependencies = [ sources."cli-ux-4.9.3" sources."indent-string-3.2.0" - sources."semver-5.7.1" sources."strip-ansi-5.2.0" ]; }) @@ -50977,14 +51047,9 @@ in sources."@oclif/color-0.0.0" sources."npm-run-path-3.1.0" sources."path-key-3.1.1" - sources."semver-5.7.1" - ]; - }) - (sources."@oclif/plugin-warn-if-update-available-1.7.0" // { - dependencies = [ - sources."semver-5.7.1" ]; }) + sources."@oclif/plugin-warn-if-update-available-1.7.0" sources."@oclif/screen-1.0.4" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" @@ -51006,7 +51071,7 @@ in sources."@types/cookies-0.7.4" sources."@types/cors-2.8.6" sources."@types/express-4.17.4" - sources."@types/express-serve-static-core-4.17.7" + sources."@types/express-serve-static-core-4.17.8" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.2" sources."@types/graphql-upload-8.0.3" @@ -51017,7 +51082,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -51029,14 +51094,18 @@ in sources."@types/serve-static-1.13.4" sources."@types/ws-7.2.5" sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-4.4.4" - (sources."@vue/cli-ui-4.4.4" // { + (sources."@vue/cli-shared-utils-4.4.6" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."@vue/cli-ui-4.4.6" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.4.4" - sources."@vue/cli-ui-addon-widgets-4.4.4" + sources."@vue/cli-ui-addon-webpack-4.4.6" + sources."@vue/cli-ui-addon-widgets-4.4.6" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" @@ -51071,18 +51140,30 @@ in sources."apollo-client-2.6.10" (sources."apollo-codegen-core-0.37.3" // { dependencies = [ + sources."@babel/generator-7.10.2" + sources."@babel/types-7.10.2" sources."recast-0.19.1" sources."source-map-0.6.1" ]; }) - sources."apollo-codegen-flow-0.35.3" + (sources."apollo-codegen-flow-0.35.3" // { + dependencies = [ + sources."@babel/generator-7.10.2" + sources."@babel/types-7.10.2" + ]; + }) sources."apollo-codegen-scala-0.36.3" sources."apollo-codegen-swift-0.37.3" - sources."apollo-codegen-typescript-0.37.3" + (sources."apollo-codegen-typescript-0.37.3" // { + dependencies = [ + sources."@babel/generator-7.10.2" + sources."@babel/types-7.10.2" + ]; + }) sources."apollo-datasource-0.7.1" (sources."apollo-engine-reporting-2.2.0" // { dependencies = [ - sources."uuid-8.1.0" + sources."uuid-8.2.0" ]; }) sources."apollo-engine-reporting-protobuf-0.5.1" @@ -51190,6 +51271,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" + sources."browserslist-4.12.1" sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -51216,6 +51298,7 @@ in sources."callsites-2.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" + sources."caniuse-lite-1.0.30001088" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -51268,7 +51351,6 @@ in sources."ansi-styles-4.2.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."semver-5.7.1" sources."strip-ansi-5.2.0" sources."type-fest-0.11.0" ]; @@ -51307,6 +51389,11 @@ in sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" sources."core-js-3.6.5" + (sources."core-js-compat-3.6.5" // { + dependencies = [ + sources."semver-7.0.0" + ]; + }) sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cosmiconfig-5.2.1" // { @@ -51315,11 +51402,7 @@ in ]; }) sources."create-error-class-3.0.2" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."cross-spawn-6.0.5" sources."crypto-random-string-1.0.0" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -51398,6 +51481,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" + sources."electron-to-chromium-1.3.481" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -51408,10 +51492,12 @@ in sources."error-ex-1.3.2" sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" + sources."escalade-3.0.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."esm-3.2.25" sources."esprima-4.0.1" + sources."esutils-2.0.3" sources."etag-1.8.1" sources."event-pubsub-4.3.0" sources."eventemitter3-3.1.2" @@ -51477,7 +51563,6 @@ in dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" - sources."semver-5.7.1" ]; }) sources."find-up-3.0.0" @@ -51627,6 +51712,7 @@ in }) sources."interpret-1.4.0" sources."into-stream-2.0.1" + sources."invariant-2.2.4" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" @@ -51684,7 +51770,7 @@ in sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."jsbn-0.1.1" - sources."jscodeshift-0.9.0" + sources."jscodeshift-0.10.0" sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" @@ -51699,6 +51785,7 @@ in sources."latest-version-3.1.0" sources."launch-editor-2.2.1" sources."leven-3.1.0" + sources."levenary-1.1.1" sources."lines-and-columns-1.1.6" sources."listr-0.14.3" sources."listr-silent-renderer-1.1.1" @@ -51749,6 +51836,7 @@ in }) sources."loglevel-1.6.8" sources."long-4.0.0" + sources."loose-envify-1.4.0" sources."lowdb-1.0.0" sources."lower-case-1.1.4" sources."lower-case-first-1.0.2" @@ -51817,21 +51905,18 @@ in (sources."node-notifier-6.0.0" // { dependencies = [ sources."is-wsl-2.2.0" + sources."semver-6.3.0" ]; }) + sources."node-releases-1.1.58" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" - sources."semver-5.7.1" ]; }) sources."nopt-1.0.10" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."npm-conf-1.1.3" @@ -51881,11 +51966,7 @@ in sources."p-map-2.1.0" sources."p-timeout-2.0.1" sources."p-try-2.2.0" - (sources."package-json-4.0.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."package-json-4.0.1" sources."param-case-2.1.1" sources."parse-git-config-2.0.3" sources."parse-json-5.0.0" @@ -51966,21 +52047,29 @@ in }) sources."rechoir-0.6.2" sources."redeyed-2.1.1" + sources."regenerate-1.4.1" + sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.5" + sources."regenerator-transform-0.14.4" (sources."regex-not-1.0.2" // { dependencies = [ sources."extend-shallow-3.0.2" sources."is-extendable-1.0.1" ]; }) + sources."regexpu-core-4.7.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" + sources."regjsgen-0.5.2" + (sources."regjsparser-0.6.4" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."request-2.88.2" - sources."request-promise-core-1.1.3" - sources."request-promise-native-1.0.8" sources."resolve-1.17.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" @@ -52003,12 +52092,8 @@ in ]; }) sources."select-1.1.2" - sources."semver-6.3.0" - (sources."semver-diff-2.1.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."semver-5.7.1" + sources."semver-diff-2.1.0" (sources."send-0.17.1" // { dependencies = [ (sources."debug-2.6.9" // { @@ -52103,7 +52188,6 @@ in ]; }) sources."statuses-1.5.0" - sources."stealthy-require-1.1.1" sources."steno-0.4.4" sources."streamsearch-0.1.2" sources."strict-uri-encode-1.1.0" @@ -52223,6 +52307,10 @@ in sources."debug-2.6.9" ]; }) + sources."unicode-canonical-property-names-ecmascript-1.0.4" + sources."unicode-match-property-ecmascript-1.0.4" + sources."unicode-match-property-value-ecmascript-1.2.0" + sources."unicode-property-aliases-ecmascript-1.1.0" sources."union-value-1.0.1" sources."unique-string-1.0.0" sources."universalify-0.1.2" @@ -52463,13 +52551,13 @@ in sha512 = "O+nGHNGmkxo6g0X8BgsN5pSTi+iaYJ0noo28Vwwqgugdelcy6FNZmGWXR68KDQdnMXSjwD3eQVJTz21PCN9Qng=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/generator-7.10.2" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" - sources."@babel/parser-7.10.2" - sources."@babel/template-7.10.1" - sources."@babel/types-7.10.2" + sources."@babel/code-frame-7.10.3" + sources."@babel/generator-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + sources."@babel/highlight-7.10.3" + sources."@babel/parser-7.10.3" + sources."@babel/template-7.10.3" + sources."@babel/types-7.10.3" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -52548,33 +52636,33 @@ in sha512 = "M+DxWKG35yfUrJj58i6ohTrf8EaRkk9mFj/QSXxUvmqsyYrBmpQT1RnITzk7HY0QVxW1Oiw9zjxGVrQeozJL/w=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - (sources."@babel/core-7.10.2" // { + sources."@babel/code-frame-7.10.3" + (sources."@babel/core-7.10.3" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.10.2" // { + (sources."@babel/generator-7.10.3" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-function-name-7.10.1" - sources."@babel/helper-get-function-arity-7.10.1" - sources."@babel/helper-member-expression-to-functions-7.10.1" - sources."@babel/helper-module-imports-7.10.1" + sources."@babel/helper-function-name-7.10.3" + sources."@babel/helper-get-function-arity-7.10.3" + sources."@babel/helper-member-expression-to-functions-7.10.3" + sources."@babel/helper-module-imports-7.10.3" sources."@babel/helper-module-transforms-7.10.1" - sources."@babel/helper-optimise-call-expression-7.10.1" + sources."@babel/helper-optimise-call-expression-7.10.3" sources."@babel/helper-replace-supers-7.10.1" sources."@babel/helper-simple-access-7.10.1" sources."@babel/helper-split-export-declaration-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" + sources."@babel/helper-validator-identifier-7.10.3" sources."@babel/helpers-7.10.1" - sources."@babel/highlight-7.10.1" - sources."@babel/parser-7.10.2" - sources."@babel/template-7.10.1" - sources."@babel/traverse-7.10.1" - sources."@babel/types-7.10.2" + sources."@babel/highlight-7.10.3" + sources."@babel/parser-7.10.3" + sources."@babel/template-7.10.3" + sources."@babel/traverse-7.10.3" + sources."@babel/types-7.10.3" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -52675,7 +52763,7 @@ in dependencies = [ sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -52745,7 +52833,7 @@ in sources."delayed-stream-1.0.0" sources."domexception-1.0.1" sources."ecc-jsbn-0.1.2" - sources."escodegen-1.14.2" + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -53879,7 +53967,7 @@ in sha512 = "DfDQbgbnau8CvTa1uEkYuZnMSaOqnQDvNxbwRi24q3t8z/DwMwEubon/lITGM02CkQH5PnfhE5fJYxt6/Q1wvA=="; }; dependencies = [ - sources."@babel/runtime-7.10.2" + sources."@babel/runtime-7.10.3" sources."@chemzqm/neovim-5.1.9" sources."async-2.6.3" sources."await-semaphore-0.1.3" @@ -54005,17 +54093,17 @@ in sha512 = "NMc/nWUPigKq4rLAvgEOKxTDFkLbp6waK0K3M2V+oZfsJxUrJ4LPEA6yP/DY1RO7trnVCHsTtjYWT+1PauGqkQ=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + sources."@babel/highlight-7.10.3" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" sources."@types/json-schema-7.0.5" - sources."@typescript-eslint/experimental-utils-3.3.0" - sources."@typescript-eslint/parser-3.3.0" - sources."@typescript-eslint/typescript-estree-3.3.0" + sources."@typescript-eslint/experimental-utils-3.4.0" + sources."@typescript-eslint/parser-3.4.0" + sources."@typescript-eslint/typescript-estree-3.4.0" sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" sources."ajv-6.12.2" @@ -54078,7 +54166,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001084" + sources."caniuse-lite-1.0.30001088" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -54174,7 +54262,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.478" + sources."electron-to-chromium-1.3.481" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -54188,7 +54276,7 @@ in }) sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.2.0" + sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { @@ -54420,7 +54508,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - sources."js-base64-2.6.0" + sources."js-base64-2.6.1" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."json-parse-better-errors-1.0.2" @@ -55004,10 +55092,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.7.4"; + version = "0.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.4.tgz"; - sha512 = "3ApE/UFqUBLW0bhS2dTLp2tBkbGtEByCDrS9Orz1Aaz22QD7mXoeo/ihbByo8HvLp+QOevYrrWbN5dQZ2OJB9A=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.7.tgz"; + sha512 = "63CYZlFNOxo18cQVzA00cAiWLrCWRhAA8Rej36GqLS4venGung+U1XGeWeusNTN49BIFYFz/k8FCFVSCDWNoBQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -55080,30 +55168,30 @@ in sha512 = "+dVV5p9OBXyBGKFPQAS5a1SFvikSbYtYXyzPCkvYqYAqDiJlmFVEyi1aP+FI17Y/094u7mFeDQJlSd7IXVgO7w=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/core-7.10.2" - sources."@babel/generator-7.10.2" - sources."@babel/helper-function-name-7.10.1" - sources."@babel/helper-get-function-arity-7.10.1" - sources."@babel/helper-member-expression-to-functions-7.10.1" - sources."@babel/helper-module-imports-7.10.1" + sources."@babel/code-frame-7.10.3" + sources."@babel/core-7.10.3" + sources."@babel/generator-7.10.3" + sources."@babel/helper-function-name-7.10.3" + sources."@babel/helper-get-function-arity-7.10.3" + sources."@babel/helper-member-expression-to-functions-7.10.3" + sources."@babel/helper-module-imports-7.10.3" sources."@babel/helper-module-transforms-7.10.1" - sources."@babel/helper-optimise-call-expression-7.10.1" + sources."@babel/helper-optimise-call-expression-7.10.3" sources."@babel/helper-replace-supers-7.10.1" sources."@babel/helper-simple-access-7.10.1" sources."@babel/helper-split-export-declaration-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" + sources."@babel/helper-validator-identifier-7.10.3" sources."@babel/helpers-7.10.1" - sources."@babel/highlight-7.10.1" - sources."@babel/parser-7.10.2" - sources."@babel/template-7.10.1" - sources."@babel/traverse-7.10.1" - sources."@babel/types-7.10.2" + sources."@babel/highlight-7.10.3" + sources."@babel/parser-7.10.3" + sources."@babel/template-7.10.3" + sources."@babel/traverse-7.10.3" + sources."@babel/types-7.10.3" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -55128,7 +55216,7 @@ in sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" sources."atob-2.1.2" - (sources."autoprefixer-9.8.0" // { + (sources."autoprefixer-9.8.4" // { dependencies = [ sources."postcss-value-parser-4.1.0" ]; @@ -55146,7 +55234,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.12.0" + sources."browserslist-4.12.1" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -55154,7 +55242,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001084" + sources."caniuse-lite-1.0.30001088" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -55183,6 +55271,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."colorette-1.2.0" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" (sources."convert-source-map-1.7.0" // { @@ -55213,10 +55302,11 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.478" + sources."electron-to-chromium-1.3.481" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" + sources."escalade-3.0.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."execall-2.0.0" @@ -55432,7 +55522,6 @@ in }) sources."picomatch-2.2.2" sources."pify-4.0.1" - sources."pkg-up-2.0.0" sources."posix-character-classes-0.1.1" (sources."postcss-7.0.32" // { dependencies = [ @@ -55673,9 +55762,9 @@ in sha512 = "5Zxv2Adtb6Mlpv2YdKErhf8ntxiBl1UyrbEqo7gR9nFIAfi3o0Ue6TJTpZfOhQViFQxLjJAS65IQVRaNlbhkxw=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + sources."@babel/highlight-7.10.3" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."balanced-match-1.0.0" @@ -55758,13 +55847,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.1.tgz"; - sha512 = "33mkWOHgvB7hS/mfhCt4PfHAepnLQaTMvvsCWN3daks7yYnOdeMFplD5UORRRvvcJoOEdQBtXXu960I/Xe4MCg=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.2.tgz"; + sha512 = "jDmG/yzx5MMCk57o8fyV3G3AHHj274pI2mJMiq5pQWEAvKRa2XNrdav/JgAtvfhD0lYZTELgw9juqiyybSHk9g=="; }; dependencies = [ - sources."typescript-3.8.3" + sources."typescript-3.9.5" ]; buildInputs = globalBuildInputs; meta = { @@ -55785,9 +55874,9 @@ in sha512 = "dMTBF4NbJ2Rqnh2Lj2Jafi9Fl6gJjHH20fNyztA6DvJ9qEOZgpiXIE2yGznszAHBvJyvoVDE4+qE6Qz5sm3FpA=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + sources."@babel/highlight-7.10.3" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" (sources."@nodelib/fs.scandir-2.1.3" // { @@ -55816,7 +55905,7 @@ in sources."@types/json-schema-7.0.5" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -56058,7 +56147,7 @@ in sources."eslint-plugin-vue-6.2.2" sources."eslint-scope-5.1.0" sources."eslint-utils-1.4.3" - sources."eslint-visitor-keys-1.2.0" + sources."eslint-visitor-keys-1.3.0" sources."espree-6.2.1" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { @@ -56992,7 +57081,7 @@ in sources."env-variable-0.0.6" sources."eventemitter3-4.0.4" sources."fast-safe-stringify-2.0.7" - sources."fecha-2.3.3" + sources."fecha-4.2.0" sources."follow-redirects-1.12.1" sources."http-proxy-1.18.1" sources."inherits-2.0.4" @@ -57001,7 +57090,7 @@ in sources."isarray-1.0.0" sources."kuler-1.0.1" sources."lodash-4.17.15" - sources."logform-2.1.2" + sources."logform-2.2.0" sources."lynx-0.2.0" sources."mersenne-0.0.4" sources."ms-2.1.2" @@ -57019,7 +57108,7 @@ in sources."triple-beam-1.3.0" sources."util-deprecate-1.0.2" sources."winston-3.2.1" - (sources."winston-transport-4.3.0" // { + (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -57050,7 +57139,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.12.2" @@ -57654,15 +57743,15 @@ in sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + sources."@babel/highlight-7.10.3" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.0.1" sources."ansi-styles-3.2.1" @@ -58030,7 +58119,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -58306,10 +58395,10 @@ in create-react-native-app = nodeEnv.buildNodePackage { name = "create-react-native-app"; packageName = "create-react-native-app"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.4.0.tgz"; - sha512 = "3a1QgXSl9sCpfgDCHX12ydRQHYMoAd6nYL1rRupeWglbj3YWEWui/unjJBFgpyQPwKvS8w4Hon871mSCcXtGOQ=="; + url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.5.0.tgz"; + sha512 = "Q/V11lyflnkhWEkMImgTvG0iRx9q2K2c1Ko/NnP7XOl63JvQ/hlvaoyxYE85vM0fIJyWXO8qTSf2Uen+8oUTTA=="; }; buildInputs = globalBuildInputs; meta = { @@ -59074,7 +59163,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.700.0" + sources."aws-sdk-2.704.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" sources."base64-js-1.3.1" @@ -59221,35 +59310,35 @@ in sha512 = "ZZfCT5/+XXomHI7O+frUJfKeqEnxXYq8SL45s0uR6KMRZpFlckzMlLpyBFKVUNd+VWjgVwmc9d/fe/YhU1N5Ng=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/core-7.10.2" - sources."@babel/generator-7.10.2" + sources."@babel/code-frame-7.10.3" + sources."@babel/core-7.10.3" + sources."@babel/generator-7.10.3" sources."@babel/helper-annotate-as-pure-7.10.1" - sources."@babel/helper-builder-react-jsx-7.10.1" + sources."@babel/helper-builder-react-jsx-7.10.3" sources."@babel/helper-builder-react-jsx-experimental-7.10.1" - sources."@babel/helper-function-name-7.10.1" - sources."@babel/helper-get-function-arity-7.10.1" - sources."@babel/helper-member-expression-to-functions-7.10.1" - sources."@babel/helper-module-imports-7.10.1" + sources."@babel/helper-function-name-7.10.3" + sources."@babel/helper-get-function-arity-7.10.3" + sources."@babel/helper-member-expression-to-functions-7.10.3" + sources."@babel/helper-module-imports-7.10.3" sources."@babel/helper-module-transforms-7.10.1" - sources."@babel/helper-optimise-call-expression-7.10.1" - sources."@babel/helper-plugin-utils-7.10.1" + sources."@babel/helper-optimise-call-expression-7.10.3" + sources."@babel/helper-plugin-utils-7.10.3" sources."@babel/helper-replace-supers-7.10.1" sources."@babel/helper-simple-access-7.10.1" sources."@babel/helper-split-export-declaration-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" + sources."@babel/helper-validator-identifier-7.10.3" sources."@babel/helpers-7.10.1" - sources."@babel/highlight-7.10.1" - sources."@babel/parser-7.10.2" - sources."@babel/plugin-proposal-object-rest-spread-7.10.1" + sources."@babel/highlight-7.10.3" + sources."@babel/parser-7.10.3" + sources."@babel/plugin-proposal-object-rest-spread-7.10.3" sources."@babel/plugin-syntax-jsx-7.10.1" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.10.1" sources."@babel/plugin-transform-parameters-7.10.1" - sources."@babel/plugin-transform-react-jsx-7.10.1" - sources."@babel/template-7.10.1" - sources."@babel/traverse-7.10.1" - sources."@babel/types-7.10.2" + sources."@babel/plugin-transform-react-jsx-7.10.3" + sources."@babel/template-7.10.3" + sources."@babel/traverse-7.10.3" + sources."@babel/types-7.10.3" sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" @@ -59257,7 +59346,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -59350,7 +59439,7 @@ in sources."supports-color-7.1.0" ]; }) - (sources."ink-text-input-3.2.2" // { + (sources."ink-text-input-3.3.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-3.0.0" @@ -59575,15 +59664,15 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.2.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.2.0.tgz"; - sha512 = "B3BtEyaDKC5MlfDa2Ha8/D6DsS4fju95zs0hjS3HdGazw+LNayai38A25qMppK37wWGWNYSPOR6oYzlz5MHsRQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.3.1.tgz"; + sha512 = "cQC/xj9bhWUcyi/RuMbRtC3I0eW8MH0jhRELSvpKYkWep3C6YZ2OkvcvJVUeO6gcunABmzptbXBuDoXsjHmfTA=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + (sources."@babel/highlight-7.10.3" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -59592,11 +59681,7 @@ in sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" sources."ajv-6.12.2" - (sources."ansi-escapes-4.3.1" // { - dependencies = [ - sources."type-fest-0.11.0" - ]; - }) + sources."ansi-colors-3.2.4" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -59613,9 +59698,6 @@ in sources."supports-color-7.1.0" ]; }) - sources."chardet-0.7.0" - sources."cli-cursor-3.1.0" - sources."cli-width-2.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" @@ -59623,11 +59705,12 @@ in sources."debug-4.2.0" sources."deep-is-0.1.3" sources."doctrine-3.0.0" - sources."emoji-regex-8.0.0" + sources."emoji-regex-7.0.3" + sources."enquirer-2.3.5" sources."escape-string-regexp-1.0.5" sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.2.0" + sources."eslint-visitor-keys-1.3.0" sources."espree-7.1.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { @@ -59638,11 +59721,9 @@ in sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."figures-3.2.0" sources."file-entry-cache-5.0.1" sources."flat-cache-2.0.1" sources."flatted-2.0.2" @@ -59652,24 +59733,13 @@ in sources."glob-parent-5.1.1" sources."globals-12.4.0" sources."has-flag-3.0.0" - sources."iconv-lite-0.4.24" sources."ignore-4.0.6" sources."import-fresh-3.2.1" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-7.2.0" // { - dependencies = [ - sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.1.0" - ]; - }) sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."isexe-2.0.0" sources."js-tokens-4.0.0" @@ -59678,17 +59748,13 @@ in sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" sources."lodash-4.17.15" - sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."mute-stream-0.0.8" sources."natural-compare-1.4.0" sources."once-1.4.0" - sources."onetime-5.1.0" sources."optionator-0.9.1" - sources."os-tmpdir-1.0.2" sources."parent-module-1.0.1" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -59697,38 +59763,23 @@ in sources."punycode-2.1.1" sources."regexpp-3.1.0" sources."resolve-from-4.0.0" - sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."run-async-2.4.1" - sources."rxjs-6.5.5" - sources."safer-buffer-2.1.2" sources."semver-7.3.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" - (sources."slice-ansi-2.1.0" // { - dependencies = [ - sources."is-fullwidth-code-point-2.0.0" - ]; - }) + sources."slice-ansi-2.1.0" sources."sprintf-js-1.0.3" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - sources."strip-json-comments-3.1.0" - sources."supports-color-5.5.0" - (sources."table-5.4.6" // { + (sources."string-width-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) + sources."strip-ansi-6.0.0" + sources."strip-json-comments-3.1.0" + sources."supports-color-5.5.0" + sources."table-5.4.6" sources."text-table-0.2.0" - sources."through-2.3.8" - sources."tmp-0.0.33" - sources."tslib-1.13.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" sources."uri-js-4.2.2" @@ -59751,15 +59802,15 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "9.0.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-9.0.0.tgz"; - sha512 = "yWXSiBvn6u4pLpGrLuebCtSQ8fJ8jUkUdfD6QqqYp7fSuY4+YW6mW1UusY/gCgfByrgU518o6DCeBmPg6HLkcw=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-9.1.1.tgz"; + sha512 = "+y3ULQemuvoxWgfV/VGzlYJS84V9GmvyzIxZFGUA3kgUpaJkuqXn/nm21Z/nYYNmfiySXy6RU1ery0A8cztZRw=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + (sources."@babel/highlight-7.10.3" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -59768,11 +59819,7 @@ in sources."acorn-7.3.1" sources."acorn-jsx-5.2.0" sources."ajv-6.12.2" - (sources."ansi-escapes-4.3.1" // { - dependencies = [ - sources."type-fest-0.11.0" - ]; - }) + sources."ansi-colors-3.2.4" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -59789,23 +59836,21 @@ in sources."supports-color-7.1.0" ]; }) - sources."chardet-0.7.0" - sources."cli-cursor-3.1.0" - sources."cli-width-2.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" - sources."core_d-1.0.1" + sources."core_d-2.0.0" sources."cross-spawn-7.0.3" sources."debug-4.2.0" sources."deep-is-0.1.3" sources."doctrine-3.0.0" - sources."emoji-regex-8.0.0" + sources."emoji-regex-7.0.3" + sources."enquirer-2.3.5" sources."escape-string-regexp-1.0.5" - sources."eslint-7.2.0" + sources."eslint-7.3.1" sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.2.0" + sources."eslint-visitor-keys-1.3.0" sources."espree-7.1.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { @@ -59816,11 +59861,9 @@ in sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."figures-3.2.0" sources."file-entry-cache-5.0.1" sources."flat-cache-2.0.1" sources."flatted-2.0.2" @@ -59830,24 +59873,13 @@ in sources."glob-parent-5.1.1" sources."globals-12.4.0" sources."has-flag-3.0.0" - sources."iconv-lite-0.4.24" sources."ignore-4.0.6" sources."import-fresh-3.2.1" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-7.2.0" // { - dependencies = [ - sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.1.0" - ]; - }) sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."isexe-2.0.0" sources."js-tokens-4.0.0" @@ -59856,60 +59888,39 @@ in sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" sources."lodash-4.17.15" - sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."mute-stream-0.0.8" sources."nanolru-1.0.0" sources."natural-compare-1.4.0" sources."once-1.4.0" - sources."onetime-5.1.0" sources."optionator-0.9.1" - sources."os-tmpdir-1.0.2" sources."parent-module-1.0.1" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-parse-1.0.6" sources."prelude-ls-1.2.1" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.1.0" - sources."resolve-1.17.0" sources."resolve-from-4.0.0" - sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."run-async-2.4.1" - sources."rxjs-6.5.5" - sources."safer-buffer-2.1.2" sources."semver-7.3.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" - (sources."slice-ansi-2.1.0" // { - dependencies = [ - sources."is-fullwidth-code-point-2.0.0" - ]; - }) + sources."slice-ansi-2.1.0" sources."sprintf-js-1.0.3" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - sources."strip-json-comments-3.1.0" - sources."supports-color-5.5.0" - (sources."table-5.4.6" // { + (sources."string-width-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) + sources."strip-ansi-6.0.0" + sources."strip-json-comments-3.1.0" + sources."supports-color-5.5.0" + sources."table-5.4.6" sources."text-table-0.2.0" - sources."through-2.3.8" - sources."tmp-0.0.33" - sources."tslib-1.13.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" sources."uri-js-4.2.2" @@ -60120,9 +60131,9 @@ in sha512 = "eJdNdyHofekXmSGI76E2A4GBJ7FAvuAgLV7rAgL6uZXV9+ZKwNoBjt/2hxHWmDZZ9x0EEWM3wHb2b0J7UNGbBw=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + (sources."@babel/highlight-7.10.3" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -60862,7 +60873,7 @@ in sources."separator-escape-0.0.0" sources."sha.js-2.4.5" sources."smart-buffer-4.1.0" - sources."socks-2.3.3" + sources."socks-2.4.1" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -60949,9 +60960,9 @@ in sha512 = "Mzb3SGlcrFSwVu4R8Y2sGxK+d7VP6CRC6rw3S4mOPbxfW3qNrOLYEPDJM7h1GNUjOL22JQHx1qsn8sRODqAygQ=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + (sources."@babel/highlight-7.10.3" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -61233,9 +61244,9 @@ in sha512 = "O3UHyNJ3nYBNfgC+R5hvJPADiZztZHgWoYfdX0vAtXf0yWyqNgtJQzkcY3RufW1Yi+Bq2Yo8ptyYr2i573GPTQ=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + (sources."@babel/highlight-7.10.3" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -61245,7 +61256,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/runtime-7.10.2" + sources."@babel/runtime-7.10.3" sources."@graphql-cli/common-4.0.0" sources."@graphql-cli/init-4.0.0" sources."@graphql-toolkit/common-0.10.7" @@ -62978,7 +62989,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.9.4" + sources."uglify-js-3.10.0" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -63196,7 +63207,7 @@ in sources."async-0.2.10" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."bunyan-1.8.12" + sources."bunyan-1.8.13" sources."colors-0.6.2" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -63283,7 +63294,7 @@ in sha512 = "l4g7U75E+WgrgNGH774djfTyp5Aw+2jJokYe9iCunSAbi/w+nRGHqTJfwbODLwiJQTnbXkM42FxgPRA29Ce7Bg=="; }; dependencies = [ - sources."@types/jquery-3.3.38" + sources."@types/jquery-3.5.0" sources."@types/sizzle-2.3.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" @@ -63399,7 +63410,7 @@ in sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."escodegen-1.14.2" // { + (sources."escodegen-1.14.3" // { dependencies = [ sources."esprima-4.0.1" ]; @@ -63608,7 +63619,7 @@ in sources."supports-color-7.1.0" sources."tar-4.4.13" sources."through-2.3.8" - sources."through2-3.0.1" + sources."through2-3.0.2" sources."thunkify-2.1.2" sources."tmp-0.0.33" sources."toidentifier-1.0.0" @@ -63735,7 +63746,7 @@ in sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" sources."escape-latex-1.2.0" - sources."escodegen-1.14.2" + sources."escodegen-1.14.3" (sources."escope-1.0.3" // { dependencies = [ sources."estraverse-2.0.0" @@ -64363,7 +64374,7 @@ in sources."entities-1.1.2" sources."es6-promise-pool-2.5.0" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.2" + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -64891,7 +64902,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.35.7" + sources."terminal-kit-1.35.8" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -65063,7 +65074,7 @@ in sha512 = "3G9d37VHv7MFdheviDCjUfQoIjdv4TC5zTTf5G9VODLtOnVS6La1eoYBDlbWfsRT3/Xo+j2MIqki2EV12BZfwA=="; }; dependencies = [ - sources."@babel/parser-7.10.2" + sources."@babel/parser-7.10.3" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -65915,7 +65926,7 @@ in sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.2" + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -66121,9 +66132,9 @@ in sha512 = "vk1lfVRFm+UuEFA7wkLKeSF7Iz13W+N/vFd48aW2yuS7Kv0RbNm2/qcDPV863056LMfkRlsEe+QYOw3palj5Lg=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + sources."@babel/highlight-7.10.3" (sources."@evocateur/libnpmaccess-3.1.2" // { dependencies = [ sources."aproba-2.0.0" @@ -66251,12 +66262,12 @@ in sources."@octokit/types-2.16.2" ]; }) - sources."@octokit/rest-16.43.1" + sources."@octokit/rest-16.43.2" sources."@octokit/types-5.0.1" sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -66357,10 +66368,10 @@ in sources."color-name-1.1.3" sources."columnify-1.5.4" sources."combined-stream-1.0.8" - sources."commander-2.20.3" - (sources."compare-func-1.3.4" // { + (sources."compare-func-2.0.0" // { dependencies = [ - sources."dot-prop-3.0.0" + sources."dot-prop-5.2.0" + sources."is-obj-2.0.0" ]; }) sources."component-emitter-1.3.0" @@ -66368,22 +66379,22 @@ in sources."concat-stream-1.6.2" sources."config-chain-1.1.12" sources."console-control-strings-1.1.0" - sources."conventional-changelog-angular-5.0.10" + sources."conventional-changelog-angular-5.0.11" (sources."conventional-changelog-core-3.2.3" // { dependencies = [ - sources."through2-3.0.1" + sources."through2-3.0.2" ]; }) sources."conventional-changelog-preset-loader-2.3.4" - (sources."conventional-changelog-writer-4.0.16" // { + (sources."conventional-changelog-writer-4.0.17" // { dependencies = [ - sources."through2-3.0.1" + sources."through2-3.0.2" ]; }) sources."conventional-commits-filter-2.0.6" (sources."conventional-commits-parser-3.1.0" // { dependencies = [ - sources."through2-3.0.1" + sources."through2-3.0.2" ]; }) (sources."conventional-recommended-bump-5.0.1" // { @@ -67060,7 +67071,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.9.4" + sources."uglify-js-3.10.0" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -68090,49 +68101,49 @@ in version = "1.10.1"; src = ../interpreters/clojurescript/lumo; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/compat-data-7.10.1" - sources."@babel/core-7.10.2" - sources."@babel/generator-7.10.2" + sources."@babel/code-frame-7.10.3" + sources."@babel/compat-data-7.10.3" + sources."@babel/core-7.10.3" + sources."@babel/generator-7.10.3" sources."@babel/helper-annotate-as-pure-7.10.1" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.1" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.3" sources."@babel/helper-compilation-targets-7.10.2" - sources."@babel/helper-create-class-features-plugin-7.10.2" + sources."@babel/helper-create-class-features-plugin-7.10.3" sources."@babel/helper-create-regexp-features-plugin-7.10.1" - sources."@babel/helper-define-map-7.10.1" - sources."@babel/helper-explode-assignable-expression-7.10.1" - sources."@babel/helper-function-name-7.10.1" - sources."@babel/helper-get-function-arity-7.10.1" - sources."@babel/helper-hoist-variables-7.10.1" - sources."@babel/helper-member-expression-to-functions-7.10.1" - sources."@babel/helper-module-imports-7.10.1" + sources."@babel/helper-define-map-7.10.3" + sources."@babel/helper-explode-assignable-expression-7.10.3" + sources."@babel/helper-function-name-7.10.3" + sources."@babel/helper-get-function-arity-7.10.3" + sources."@babel/helper-hoist-variables-7.10.3" + sources."@babel/helper-member-expression-to-functions-7.10.3" + sources."@babel/helper-module-imports-7.10.3" sources."@babel/helper-module-transforms-7.10.1" - sources."@babel/helper-optimise-call-expression-7.10.1" - sources."@babel/helper-plugin-utils-7.10.1" + sources."@babel/helper-optimise-call-expression-7.10.3" + sources."@babel/helper-plugin-utils-7.10.3" sources."@babel/helper-regex-7.10.1" - sources."@babel/helper-remap-async-to-generator-7.10.1" + sources."@babel/helper-remap-async-to-generator-7.10.3" sources."@babel/helper-replace-supers-7.10.1" sources."@babel/helper-simple-access-7.10.1" sources."@babel/helper-split-export-declaration-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" + sources."@babel/helper-validator-identifier-7.10.3" sources."@babel/helper-wrap-function-7.10.1" sources."@babel/helpers-7.10.1" - (sources."@babel/highlight-7.10.1" // { + (sources."@babel/highlight-7.10.3" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.10.2" + sources."@babel/parser-7.10.3" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.10.1" + sources."@babel/plugin-proposal-async-generator-functions-7.10.3" sources."@babel/plugin-proposal-class-properties-7.10.1" sources."@babel/plugin-proposal-dynamic-import-7.10.1" sources."@babel/plugin-proposal-json-strings-7.10.1" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.1" sources."@babel/plugin-proposal-numeric-separator-7.10.1" - sources."@babel/plugin-proposal-object-rest-spread-7.10.1" + sources."@babel/plugin-proposal-object-rest-spread-7.10.3" sources."@babel/plugin-proposal-optional-catch-binding-7.10.1" - sources."@babel/plugin-proposal-optional-chaining-7.10.1" + sources."@babel/plugin-proposal-optional-chaining-7.10.3" sources."@babel/plugin-proposal-private-methods-7.10.1" sources."@babel/plugin-proposal-unicode-property-regex-7.10.1" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -68152,8 +68163,8 @@ in sources."@babel/plugin-transform-async-to-generator-7.10.1" sources."@babel/plugin-transform-block-scoped-functions-7.10.1" sources."@babel/plugin-transform-block-scoping-7.10.1" - sources."@babel/plugin-transform-classes-7.10.1" - sources."@babel/plugin-transform-computed-properties-7.10.1" + sources."@babel/plugin-transform-classes-7.10.3" + sources."@babel/plugin-transform-computed-properties-7.10.3" sources."@babel/plugin-transform-destructuring-7.10.1" sources."@babel/plugin-transform-dotall-regex-7.10.1" sources."@babel/plugin-transform-duplicate-keys-7.10.1" @@ -68164,42 +68175,33 @@ in sources."@babel/plugin-transform-member-expression-literals-7.10.1" sources."@babel/plugin-transform-modules-amd-7.10.1" sources."@babel/plugin-transform-modules-commonjs-7.10.1" - sources."@babel/plugin-transform-modules-systemjs-7.10.1" + sources."@babel/plugin-transform-modules-systemjs-7.10.3" sources."@babel/plugin-transform-modules-umd-7.10.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.3" sources."@babel/plugin-transform-new-target-7.10.1" sources."@babel/plugin-transform-object-super-7.10.1" sources."@babel/plugin-transform-parameters-7.10.1" sources."@babel/plugin-transform-property-literals-7.10.1" - sources."@babel/plugin-transform-regenerator-7.10.1" + sources."@babel/plugin-transform-regenerator-7.10.3" sources."@babel/plugin-transform-reserved-words-7.10.1" - sources."@babel/plugin-transform-runtime-7.10.1" + sources."@babel/plugin-transform-runtime-7.10.3" sources."@babel/plugin-transform-shorthand-properties-7.10.1" sources."@babel/plugin-transform-spread-7.10.1" sources."@babel/plugin-transform-sticky-regex-7.10.1" - sources."@babel/plugin-transform-template-literals-7.10.1" + sources."@babel/plugin-transform-template-literals-7.10.3" sources."@babel/plugin-transform-typeof-symbol-7.10.1" sources."@babel/plugin-transform-unicode-escapes-7.10.1" sources."@babel/plugin-transform-unicode-regex-7.10.1" - sources."@babel/preset-env-7.10.2" + sources."@babel/preset-env-7.10.3" sources."@babel/preset-modules-0.1.3" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.10.2" - sources."@babel/template-7.10.1" - sources."@babel/traverse-7.10.1" - sources."@babel/types-7.10.2" + sources."@babel/runtime-7.10.3" + sources."@babel/template-7.10.3" + sources."@babel/traverse-7.10.3" + sources."@babel/types-7.10.3" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" - (sources."@istanbuljs/load-nyc-config-1.1.0" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."path-exists-4.0.0" - ]; - }) + sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.2" (sources."@jest/transform-25.5.1" // { dependencies = [ @@ -68207,18 +68209,18 @@ in ]; }) sources."@jest/types-25.5.0" - sources."@types/babel__core-7.1.8" + sources."@types/babel__core-7.1.9" sources."@types/babel__generator-7.6.1" sources."@types/babel__template-7.0.2" sources."@types/babel__traverse-7.0.12" sources."@types/color-name-1.1.1" - sources."@types/estree-0.0.44" + sources."@types/estree-0.0.45" sources."@types/graceful-fs-4.1.3" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.5" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.5" @@ -68384,7 +68386,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.12.0" + sources."browserslist-4.12.1" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" @@ -68399,7 +68401,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001084" + sources."caniuse-lite-1.0.30001088" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -68521,7 +68523,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.478" + sources."electron-to-chromium-1.3.481" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -68537,9 +68539,10 @@ in }) sources."errno-0.1.7" sources."error-ex-1.3.2" + sources."escalade-3.0.1" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.3" - sources."eslint-visitor-keys-1.2.0" + sources."eslint-visitor-keys-1.3.0" sources."esprima-4.0.1" sources."esrecurse-4.2.1" sources."estraverse-4.3.0" @@ -68599,7 +68602,7 @@ in sources."make-dir-2.1.0" ]; }) - sources."find-up-2.1.0" + sources."find-up-4.1.0" (sources."findup-sync-3.0.0" // { dependencies = [ sources."micromatch-3.1.10" @@ -68702,7 +68705,11 @@ in ]; }) sources."is-plain-object-2.0.4" - sources."is-reference-1.2.0" + (sources."is-reference-1.2.0" // { + dependencies = [ + sources."@types/estree-0.0.44" + ]; + }) sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" @@ -68752,7 +68759,7 @@ in sources."json5-1.0.1" ]; }) - sources."locate-path-2.0.0" + sources."locate-path-5.0.0" sources."lodash-4.17.15" sources."lodash.memoize-3.0.4" sources."loose-envify-1.4.0" @@ -68849,9 +68856,9 @@ in sources."once-1.4.0" sources."os-browserify-0.3.0" sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" sources."pako-1.0.11" sources."parallel-transform-1.2.0" sources."paredit.js-0.3.6" @@ -68862,7 +68869,7 @@ in sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.6" @@ -68879,12 +68886,10 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.3.0" sources."p-locate-3.0.0" - sources."p-try-2.2.0" + sources."path-exists-3.0.0" ]; }) - sources."pkg-up-2.0.0" sources."posix-character-classes-0.1.1" sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master" sources."prettier-1.19.1" @@ -69224,9 +69229,8 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.3.0" sources."p-locate-3.0.0" - sources."p-try-2.2.0" + sources."path-exists-3.0.0" ]; }) sources."yargs-parser-13.1.2" @@ -69534,7 +69538,6 @@ in sources."collection-visit-1.0.0" sources."color-support-1.1.3" sources."combined-stream-1.0.8" - sources."commander-2.20.3" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."convert-source-map-1.7.0" @@ -70071,7 +70074,7 @@ in sources."tweetnacl-0.14.5" sources."type-1.2.0" sources."typescript-3.9.5" - sources."uglify-js-3.9.4" + sources."uglify-js-3.10.0" sources."uglify-to-browserify-1.0.2" sources."unc-path-regex-0.1.2" sources."union-value-1.0.1" @@ -70368,7 +70371,7 @@ in sources."enabled-1.0.2" sources."env-variable-0.0.6" sources."fast-safe-stringify-2.0.7" - sources."fecha-2.3.3" + sources."fecha-4.2.0" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" sources."is-stream-1.1.0" @@ -70377,7 +70380,7 @@ in sources."lodash-4.17.15" sources."lodash.defaults-4.2.0" sources."lodash.omit-4.5.0" - sources."logform-2.1.2" + sources."logform-2.2.0" sources."ms-2.1.2" sources."one-time-0.0.4" sources."process-nextick-args-2.0.1" @@ -70391,7 +70394,7 @@ in sources."triple-beam-1.3.0" sources."util-deprecate-1.0.2" sources."winston-3.2.1" - (sources."winston-transport-4.3.0" // { + (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -70956,7 +70959,7 @@ in sha512 = "5K7LKdy232xLSHMo3ZprAEHbLilszSD/qQkt+9PxByJnEMACeHJ7SH4Gpt/1FX+K75gHHNtlnHsWwpQ53lggEA=="; }; dependencies = [ - sources."@babel/runtime-7.10.2" + sources."@babel/runtime-7.10.3" sources."@node-red/editor-api-1.0.6" sources."@node-red/editor-client-1.0.6" (sources."@node-red/nodes-1.0.6" // { @@ -71352,7 +71355,7 @@ in sources."string_decoder-1.3.0" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."tail-2.0.3" + sources."tail-2.0.4" (sources."tar-4.4.13" // { dependencies = [ sources."yallist-3.1.1" @@ -72107,7 +72110,7 @@ in sources."signal-exit-3.0.3" sources."sisteransi-1.0.5" sources."smart-buffer-4.1.0" - sources."socks-2.3.3" + sources."socks-2.4.1" sources."socks-proxy-agent-5.0.0" sources."spawn-please-0.3.0" sources."sprintf-js-1.0.3" @@ -72395,55 +72398,55 @@ in sha512 = "G+iZGGiPEXcRzw0fiRxWYCKxdt/F7l9a0xkiU4XbcVRJCSlBnioWEwJMutOCCpoQmaQtjB4RBHDGIHN85AIhLQ=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/compat-data-7.10.1" - (sources."@babel/core-7.10.2" // { + sources."@babel/code-frame-7.10.3" + sources."@babel/compat-data-7.10.3" + (sources."@babel/core-7.10.3" // { dependencies = [ sources."json5-2.1.3" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.10.2" // { + (sources."@babel/generator-7.10.3" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-annotate-as-pure-7.10.1" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.1" - sources."@babel/helper-builder-react-jsx-7.10.1" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.3" + sources."@babel/helper-builder-react-jsx-7.10.3" sources."@babel/helper-builder-react-jsx-experimental-7.10.1" sources."@babel/helper-compilation-targets-7.10.2" - sources."@babel/helper-create-class-features-plugin-7.10.2" + sources."@babel/helper-create-class-features-plugin-7.10.3" sources."@babel/helper-create-regexp-features-plugin-7.10.1" - sources."@babel/helper-define-map-7.10.1" - sources."@babel/helper-explode-assignable-expression-7.10.1" - sources."@babel/helper-function-name-7.10.1" - sources."@babel/helper-get-function-arity-7.10.1" - sources."@babel/helper-hoist-variables-7.10.1" - sources."@babel/helper-member-expression-to-functions-7.10.1" - sources."@babel/helper-module-imports-7.10.1" + sources."@babel/helper-define-map-7.10.3" + sources."@babel/helper-explode-assignable-expression-7.10.3" + sources."@babel/helper-function-name-7.10.3" + sources."@babel/helper-get-function-arity-7.10.3" + sources."@babel/helper-hoist-variables-7.10.3" + sources."@babel/helper-member-expression-to-functions-7.10.3" + sources."@babel/helper-module-imports-7.10.3" sources."@babel/helper-module-transforms-7.10.1" - sources."@babel/helper-optimise-call-expression-7.10.1" - sources."@babel/helper-plugin-utils-7.10.1" + sources."@babel/helper-optimise-call-expression-7.10.3" + sources."@babel/helper-plugin-utils-7.10.3" sources."@babel/helper-regex-7.10.1" - sources."@babel/helper-remap-async-to-generator-7.10.1" + sources."@babel/helper-remap-async-to-generator-7.10.3" sources."@babel/helper-replace-supers-7.10.1" sources."@babel/helper-simple-access-7.10.1" sources."@babel/helper-split-export-declaration-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" + sources."@babel/helper-validator-identifier-7.10.3" sources."@babel/helper-wrap-function-7.10.1" sources."@babel/helpers-7.10.1" - sources."@babel/highlight-7.10.1" - sources."@babel/parser-7.10.2" - sources."@babel/plugin-proposal-async-generator-functions-7.10.1" + sources."@babel/highlight-7.10.3" + sources."@babel/parser-7.10.3" + sources."@babel/plugin-proposal-async-generator-functions-7.10.3" sources."@babel/plugin-proposal-class-properties-7.10.1" sources."@babel/plugin-proposal-dynamic-import-7.10.1" sources."@babel/plugin-proposal-json-strings-7.10.1" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.1" sources."@babel/plugin-proposal-numeric-separator-7.10.1" - sources."@babel/plugin-proposal-object-rest-spread-7.10.1" + sources."@babel/plugin-proposal-object-rest-spread-7.10.3" sources."@babel/plugin-proposal-optional-catch-binding-7.10.1" - sources."@babel/plugin-proposal-optional-chaining-7.10.1" + sources."@babel/plugin-proposal-optional-chaining-7.10.3" sources."@babel/plugin-proposal-private-methods-7.10.1" sources."@babel/plugin-proposal-unicode-property-regex-7.10.1" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -72462,8 +72465,8 @@ in sources."@babel/plugin-transform-async-to-generator-7.10.1" sources."@babel/plugin-transform-block-scoped-functions-7.10.1" sources."@babel/plugin-transform-block-scoping-7.10.1" - sources."@babel/plugin-transform-classes-7.10.1" - sources."@babel/plugin-transform-computed-properties-7.10.1" + sources."@babel/plugin-transform-classes-7.10.3" + sources."@babel/plugin-transform-computed-properties-7.10.3" sources."@babel/plugin-transform-destructuring-7.10.1" sources."@babel/plugin-transform-dotall-regex-7.10.1" sources."@babel/plugin-transform-duplicate-keys-7.10.1" @@ -72475,29 +72478,29 @@ in sources."@babel/plugin-transform-member-expression-literals-7.10.1" sources."@babel/plugin-transform-modules-amd-7.10.1" sources."@babel/plugin-transform-modules-commonjs-7.10.1" - sources."@babel/plugin-transform-modules-systemjs-7.10.1" + sources."@babel/plugin-transform-modules-systemjs-7.10.3" sources."@babel/plugin-transform-modules-umd-7.10.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.3" sources."@babel/plugin-transform-new-target-7.10.1" sources."@babel/plugin-transform-object-super-7.10.1" sources."@babel/plugin-transform-parameters-7.10.1" sources."@babel/plugin-transform-property-literals-7.10.1" - sources."@babel/plugin-transform-react-jsx-7.10.1" - sources."@babel/plugin-transform-regenerator-7.10.1" + sources."@babel/plugin-transform-react-jsx-7.10.3" + sources."@babel/plugin-transform-regenerator-7.10.3" sources."@babel/plugin-transform-reserved-words-7.10.1" sources."@babel/plugin-transform-shorthand-properties-7.10.1" sources."@babel/plugin-transform-spread-7.10.1" sources."@babel/plugin-transform-sticky-regex-7.10.1" - sources."@babel/plugin-transform-template-literals-7.10.1" + sources."@babel/plugin-transform-template-literals-7.10.3" sources."@babel/plugin-transform-typeof-symbol-7.10.1" sources."@babel/plugin-transform-unicode-escapes-7.10.1" sources."@babel/plugin-transform-unicode-regex-7.10.1" - sources."@babel/preset-env-7.10.2" + sources."@babel/preset-env-7.10.3" sources."@babel/preset-modules-0.1.3" - sources."@babel/runtime-7.10.2" - sources."@babel/template-7.10.1" - sources."@babel/traverse-7.10.1" - sources."@babel/types-7.10.2" + sources."@babel/runtime-7.10.3" + sources."@babel/template-7.10.3" + sources."@babel/traverse-7.10.3" + sources."@babel/types-7.10.3" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -72599,7 +72602,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.12.0" + sources."browserslist-4.12.1" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -72616,7 +72619,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001084" + sources."caniuse-lite-1.0.30001088" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -72757,7 +72760,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.478" + sources."electron-to-chromium-1.3.481" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -72774,6 +72777,7 @@ in ]; }) sources."es-to-primitive-1.2.1" + sources."escalade-3.0.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."escodegen-1.9.1" @@ -72806,7 +72810,7 @@ in sources."file-uri-to-path-1.0.0" sources."filesize-3.6.1" sources."fill-range-4.0.0" - sources."find-up-2.1.0" + sources."find-up-3.0.0" sources."for-in-1.0.2" sources."foreach-2.0.5" sources."forever-agent-0.6.1" @@ -72936,7 +72940,7 @@ in (sources."jsdom-14.1.0" // { dependencies = [ sources."acorn-6.4.1" - sources."escodegen-1.14.2" + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."ws-6.2.1" ]; @@ -72952,7 +72956,7 @@ in sources."leven-3.1.0" sources."levenary-1.1.1" sources."levn-0.3.0" - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.15" sources."lodash.clone-4.5.0" sources."lodash.memoize-4.1.2" @@ -73039,9 +73043,9 @@ in sources."optionator-0.8.3" sources."ora-2.1.0" sources."os-browserify-0.3.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" sources."pako-0.2.9" sources."parse-asn1-5.1.5" sources."parse-json-4.0.0" @@ -73057,7 +73061,6 @@ in sources."pbkdf2-3.1.1" sources."performance-now-2.1.0" sources."physical-cpu-count-2.0.0" - sources."pkg-up-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" (sources."postcss-7.0.32" // { @@ -73249,7 +73252,7 @@ in sources."stable-0.1.8" (sources."static-eval-2.1.0" // { dependencies = [ - sources."escodegen-1.14.2" + sources."escodegen-1.14.3" sources."esprima-4.0.1" ]; }) @@ -73370,15 +73373,7 @@ in sources."xmlchars-2.2.0" sources."xtend-4.0.2" sources."y18n-4.0.0" - (sources."yargs-14.2.3" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - ]; - }) + sources."yargs-14.2.3" sources."yargs-parser-15.0.1" ]; buildInputs = globalBuildInputs; @@ -73430,7 +73425,7 @@ in ]; }) sources."brace-expansion-1.1.11" - sources."bunyan-1.8.12" + sources."bunyan-1.8.13" sources."bunyan-syslog-udp-0.2.0" sources."busboy-0.3.1" sources."bytes-3.0.0" @@ -73442,7 +73437,6 @@ in sources."color-name-1.1.3" sources."colors-1.4.0" sources."combined-stream-1.0.8" - sources."commander-2.20.3" sources."compressible-2.0.18" sources."compression-1.7.4" sources."concat-map-0.0.1" @@ -73635,7 +73629,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.9.4" + sources."uglify-js-3.10.0" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.2.2" @@ -74360,10 +74354,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.2.2"; + version = "5.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.2.2.tgz"; - sha512 = "8SumQnJM4qMSZa17Z8Tj4q/z3Lsa2+ETIf0EK4rtGi+Xrw8Y7zFKpimVWX6imQs9XSNANabs8h+thpb+n0PPDA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.2.6.tgz"; + sha512 = "7PFzPm0l14hzio59fufxpGgWRcMmtC2JZmYbRdkrJmm/f4iExXFhGklB/IrdQidhTi5helNZrBY48/9Ows4naA=="; }; buildInputs = globalBuildInputs; meta = { @@ -74864,6 +74858,24 @@ in bypassCache = true; reconstructLock = true; }; + purty = nodeEnv.buildNodePackage { + name = "purty"; + packageName = "purty"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/purty/-/purty-6.2.0.tgz"; + sha512 = "JfT8kJHSyxuOFQtRiH2x55SiPxXZsSdedQlZap8JehQ7KzB49B5C9cWwVybtSB36BdADQcxPvtw8D52z4EPnBw=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "PureScript pretty printer"; + homepage = "https://gitlab.com/joneshf/purty#README"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; react-native-cli = nodeEnv.buildNodePackage { name = "react-native-cli"; packageName = "react-native-cli"; @@ -75037,10 +75049,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.17.1"; + version = "2.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.17.1.tgz"; - sha512 = "lVrtCXJ+08Eapa0SfApLmRNWNWm2FsYFnLPIJZJvZz2uI2Gv+dfPyu1zgF7KKF/HYFJDvjxbdCbI8lUVMnG7Sg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.18.0.tgz"; + sha512 = "LhuQQp3WpnHo3HlKCRrdMXpB6jdLsGOoXXSfMjbv74s5VdV3WZhkYJT0Z6w/EH3UgPH+g/S9T4GJrKW/5iD8TA=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -75061,15 +75073,15 @@ in version = "0.4.0-dev"; src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + (sources."@babel/highlight-7.10.3" // { dependencies = [ sources."chalk-2.4.2" ]; }) sources."@rollup/plugin-commonjs-12.0.0" - sources."@rollup/plugin-node-resolve-8.0.1" + sources."@rollup/plugin-node-resolve-8.1.0" sources."@rollup/pluginutils-3.1.0" sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" @@ -75078,18 +75090,18 @@ in sources."@types/json-schema-7.0.5" sources."@types/minimatch-3.0.3" sources."@types/mocha-7.0.2" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."@types/node-fetch-2.5.7" sources."@types/resolve-0.0.8" sources."@types/vscode-1.45.0" - (sources."@typescript-eslint/eslint-plugin-3.3.0" // { + (sources."@typescript-eslint/eslint-plugin-3.4.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/experimental-utils-3.3.0" - sources."@typescript-eslint/parser-3.3.0" - (sources."@typescript-eslint/typescript-estree-3.3.0" // { + sources."@typescript-eslint/experimental-utils-3.4.0" + sources."@typescript-eslint/parser-3.4.0" + (sources."@typescript-eslint/typescript-estree-3.4.0" // { dependencies = [ sources."semver-7.3.2" ]; @@ -75098,12 +75110,7 @@ in sources."acorn-jsx-5.2.0" sources."agent-base-4.3.0" sources."ajv-6.12.2" - sources."ansi-colors-3.2.3" - (sources."ansi-escapes-4.3.1" // { - dependencies = [ - sources."type-fest-0.11.0" - ]; - }) + sources."ansi-colors-3.2.4" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" @@ -75130,17 +75137,11 @@ in sources."supports-color-7.1.0" ]; }) - sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.3" sources."chokidar-3.3.0" - sources."cli-cursor-3.1.0" - sources."cli-width-2.2.1" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) @@ -75173,21 +75174,22 @@ in sources."semver-5.7.1" ]; }) - sources."emoji-regex-8.0.0" + sources."emoji-regex-7.0.3" + sources."enquirer-2.3.5" sources."entities-1.1.2" sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.2.0" // { + (sources."eslint-7.3.1" // { dependencies = [ sources."semver-7.3.2" ]; }) sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.2.0" + sources."eslint-visitor-keys-1.3.0" sources."espree-7.1.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { @@ -75199,12 +75201,10 @@ in sources."estraverse-4.3.0" sources."estree-walker-1.0.1" sources."esutils-2.0.3" - sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fd-slicer-1.1.0" - sources."figures-3.2.0" sources."file-entry-cache-5.0.1" sources."fill-range-7.0.1" sources."find-up-3.0.0" @@ -75237,28 +75237,17 @@ in sources."debug-3.2.6" ]; }) - sources."iconv-lite-0.4.24" sources."ignore-4.0.6" sources."import-fresh-3.2.1" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-7.2.0" // { - dependencies = [ - sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.1.0" - ]; - }) sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" sources."is-callable-1.2.0" sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-module-1.0.0" sources."is-number-7.0.0" @@ -75295,12 +75284,12 @@ in sources."mime-1.6.0" sources."mime-db-1.44.0" sources."mime-types-2.1.27" - sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" (sources."mocha-7.2.0" // { dependencies = [ + sources."ansi-colors-3.2.3" sources."debug-3.2.6" sources."glob-7.1.3" sources."js-yaml-3.13.1" @@ -75326,7 +75315,6 @@ in sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" - sources."onetime-5.1.0" sources."optionator-0.9.1" sources."os-0.1.1" sources."os-homedir-1.0.2" @@ -75360,49 +75348,32 @@ in sources."require-main-filename-2.0.0" sources."resolve-1.17.0" sources."resolve-from-4.0.0" - sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."rollup-2.17.1" - sources."run-async-2.4.1" - (sources."rxjs-6.5.5" // { - dependencies = [ - sources."tslib-1.13.0" - ]; - }) + sources."rollup-2.18.0" sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" sources."semver-6.3.0" sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."sigmund-1.0.1" - sources."signal-exit-3.0.3" - (sources."slice-ansi-2.1.0" // { - dependencies = [ - sources."is-fullwidth-code-point-2.0.0" - ]; - }) + sources."slice-ansi-2.1.0" sources."sourcemap-codec-1.4.8" sources."sprintf-js-1.0.3" - sources."string-width-4.2.0" + (sources."string-width-3.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.0" sources."supports-color-5.5.0" - (sources."table-5.4.6" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) + sources."table-5.4.6" sources."text-table-0.2.0" - sources."through-2.3.8" - sources."tmp-0.0.33" + sources."tmp-0.0.29" sources."to-regex-range-5.0.1" sources."tslib-2.0.0" (sources."tsutils-3.17.1" // { @@ -75426,7 +75397,6 @@ in dependencies = [ sources."chalk-2.4.2" sources."semver-5.7.1" - sources."tmp-0.0.29" ]; }) sources."vscode-jsonrpc-5.1.0-next.1" @@ -75439,7 +75409,6 @@ in (sources."wide-align-1.1.3" // { dependencies = [ sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" ]; @@ -75448,9 +75417,6 @@ in (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) @@ -75458,15 +75424,7 @@ in sources."write-1.0.3" sources."y18n-4.0.0" sources."yallist-2.1.2" - (sources."yargs-13.3.2" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) + sources."yargs-13.3.2" sources."yargs-parser-13.1.2" sources."yargs-unparser-1.6.0" sources."yauzl-2.10.0" @@ -75745,7 +75703,7 @@ in }; dependencies = [ sources."2-thenable-1.0.0" - sources."@babel/parser-7.10.2" + sources."@babel/parser-7.10.3" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -75762,7 +75720,7 @@ in sources."@protobufjs/utf8-1.1.0" sources."@serverless/cli-1.5.1" sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-2.30.20" // { + (sources."@serverless/components-2.31.3" // { dependencies = [ sources."globby-10.0.2" sources."semver-7.3.2" @@ -75773,11 +75731,15 @@ in sources."fs-extra-7.0.1" ]; }) - sources."@serverless/enterprise-plugin-3.6.13" + (sources."@serverless/enterprise-plugin-3.6.13" // { + dependencies = [ + sources."@serverless/platform-client-0.25.14" + ]; + }) sources."@serverless/event-mocks-1.1.1" sources."@serverless/inquirer-1.1.2" - sources."@serverless/platform-client-0.25.14" - (sources."@serverless/platform-client-china-1.0.18" // { + sources."@serverless/platform-client-1.0.1" + (sources."@serverless/platform-client-china-1.0.20" // { dependencies = [ sources."archiver-4.0.1" sources."async-2.6.3" @@ -75792,26 +75754,27 @@ in }) sources."@serverless/template-1.1.3" sources."@serverless/utils-1.1.0" - sources."@serverless/utils-china-0.1.15" + sources."@serverless/utils-china-0.1.17" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - (sources."@tencent-sdk/capi-0.2.15-alpha.0" // { - dependencies = [ - sources."chalk-3.0.0" - ]; - }) - sources."@types/color-name-1.1.1" + sources."@tencent-sdk/capi-0.2.17" + sources."@types/caseless-0.12.2" + sources."@types/chalk-2.2.0" sources."@types/glob-7.1.2" - sources."@types/lodash-4.14.155" + sources."@types/lodash-4.14.157" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.12" + sources."@types/node-14.0.14" + sources."@types/object-assign-4.0.30" + sources."@types/request-2.48.5" + sources."@types/request-promise-native-1.0.17" + sources."@types/tough-cookie-4.0.0" (sources."@typescript-eslint/typescript-estree-2.34.0" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."adm-zip-0.4.14" + sources."adm-zip-0.4.16" sources."after-0.8.2" sources."agent-base-5.1.1" sources."ajv-6.12.2" @@ -75822,7 +75785,7 @@ in }) sources."ansi-escapes-4.3.1" sources."ansi-regex-4.1.0" - sources."ansi-styles-4.2.1" + sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" sources."app-module-path-2.2.0" (sources."archive-type-4.0.0" // { @@ -75868,7 +75831,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.700.0" // { + (sources."aws-sdk-2.704.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -75924,10 +75887,6 @@ in sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" sources."supports-color-5.5.0" ]; }) @@ -75968,14 +75927,9 @@ in sources."cli-width-2.2.1" sources."clone-response-1.0.2" sources."collection-visit-1.0.0" - (sources."color-3.0.0" // { - dependencies = [ - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."color-3.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."color-string-1.5.3" sources."colornames-1.1.1" sources."colors-1.3.3" @@ -76128,8 +76082,8 @@ in sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.2" - sources."eslint-visitor-keys-1.2.0" + sources."escodegen-1.14.3" + sources."eslint-visitor-keys-1.3.0" sources."esniff-1.1.0" sources."esprima-4.0.1" sources."essentials-1.1.1" @@ -76187,7 +76141,7 @@ in sources."fast-safe-stringify-2.0.7" sources."fastq-1.8.0" sources."fd-slicer-1.1.0" - sources."fecha-2.3.3" + sources."fecha-4.2.0" sources."figures-3.2.0" sources."file-exists-dazinatorfork-1.0.2" sources."file-type-5.2.0" @@ -76214,7 +76168,7 @@ in }) sources."for-in-1.0.2" sources."forever-agent-0.6.1" - sources."form-data-2.3.3" + sources."form-data-2.5.1" sources."formidable-1.2.2" sources."fragment-cache-0.2.1" (sources."from2-2.3.0" // { @@ -76287,7 +76241,7 @@ in sources."har-validator-5.1.3" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" - sources."has-flag-4.0.0" + sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."has-value-1.0.0" @@ -76435,7 +76389,7 @@ in sources."type-1.2.0" ]; }) - sources."logform-2.1.2" + sources."logform-2.2.0" sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" @@ -76557,12 +76511,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.32" // { - dependencies = [ - sources."has-flag-3.0.0" - sources."supports-color-6.1.0" - ]; - }) + sources."postcss-7.0.32" sources."postcss-values-parser-1.5.0" (sources."precinct-6.3.1" // { dependencies = [ @@ -76575,7 +76524,11 @@ in sources."process-nextick-args-2.0.1" sources."promise-queue-2.2.5" sources."proto-list-1.2.4" - sources."protobufjs-6.9.0" + (sources."protobufjs-6.9.0" // { + dependencies = [ + sources."@types/node-13.13.12" + ]; + }) sources."prr-1.0.1" sources."pseudomap-1.0.2" sources."psl-1.8.0" @@ -76595,7 +76548,11 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."replaceall-0.1.6" - sources."request-2.88.2" + (sources."request-2.88.2" // { + dependencies = [ + sources."form-data-2.3.3" + ]; + }) sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."requirejs-2.3.6" @@ -76739,7 +76696,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."supports-color-7.1.0" + sources."supports-color-6.1.0" sources."tabtab-3.0.2" sources."tapable-1.1.3" sources."tar-stream-2.1.2" @@ -76821,7 +76778,7 @@ in sources."async-2.6.3" ]; }) - (sources."winston-transport-4.3.0" // { + (sources."winston-transport-4.4.0" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" @@ -77483,10 +77440,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.346.0"; + version = "1.348.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.346.0.tgz"; - sha512 = "uwJDC0CRefppngm1J1M+Sja5CVfdmzLYkxGYp3ZYXrzvd912pgzrdYm8ciUL5a8x1/C+2L0iZ09W68daSuObhA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.348.2.tgz"; + sha512 = "we1krlo7ekb3iLIz3gaPw5hWGaWhYzBb90QZfWuvUrHMKB6jlL1imOajsIF6zrlFQ124TYjW0JzCzH2BMw45Mw=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -77537,7 +77494,7 @@ in sources."@types/debug-4.1.5" sources."@types/hosted-git-info-2.7.0" sources."@types/js-yaml-3.12.4" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.5" sources."@yarnpkg/lockfile-1.1.0" @@ -77659,7 +77616,7 @@ in sources."es6-promisify-5.0.0" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.2" + sources."escodegen-1.14.3" sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" @@ -78956,7 +78913,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."socks-2.3.3" + sources."socks-2.4.1" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -78975,9 +78932,10 @@ in sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" sources."ssb-config-3.4.4" - (sources."ssb-db-20.1.0" // { + (sources."ssb-db-20.2.0" // { dependencies = [ sources."glob-7.1.6" + sources."mkdirp-1.0.4" sources."rimraf-3.0.2" ]; }) @@ -79009,7 +78967,7 @@ in sources."ssb-ref-2.14.0" sources."ssb-replicate-1.3.2" sources."ssb-unix-socket-1.0.0" - sources."ssb-validate-4.1.0" + sources."ssb-validate-4.1.1" sources."ssb-ws-6.2.3" sources."stack-0.1.0" (sources."static-extend-0.1.2" // { @@ -79211,7 +79169,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.700.0" // { + (sources."aws-sdk-2.704.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -79252,7 +79210,7 @@ in sources."buffer-from-1.1.1" sources."bufferutil-1.3.0" sources."bufferview-1.0.1" - sources."bunyan-1.8.12" + sources."bunyan-1.8.13" sources."busboy-0.2.14" sources."bytebuffer-3.5.5" sources."bytes-3.1.0" @@ -79480,7 +79438,7 @@ in sources."isstream-0.1.2" sources."jmespath-0.15.0" sources."jpeg-turbo-0.4.0" - sources."js-base64-2.6.0" + sources."js-base64-2.6.1" sources."js-stringify-1.0.2" sources."js-yaml-3.2.7" sources."jsbn-0.1.1" @@ -79898,7 +79856,7 @@ in sources."which-1.3.1" sources."which-module-2.0.0" sources."window-size-0.1.0" - (sources."winston-2.4.4" // { + (sources."winston-2.4.5" // { dependencies = [ sources."async-1.0.0" ]; @@ -80628,7 +80586,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.9.4" + sources."uglify-js-3.10.0" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -81205,7 +81163,7 @@ in sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" - sources."cuss-1.19.0" + sources."cuss-1.20.0" sources."debug-4.2.0" sources."decamelize-1.2.0" sources."deep-extend-0.6.0" @@ -81679,10 +81637,10 @@ in textlint-rule-stop-words = nodeEnv.buildNodePackage { name = "textlint-rule-stop-words"; packageName = "textlint-rule-stop-words"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.4.tgz"; - sha512 = "5J5Ehs1yH2CrW7TMAaTSN5GKwMItCg8TcILRYF3/mZfy9s84SEA17MN5cqwhIv3ftV+mU7GoEc63yJsjZYR+Kw=="; + url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.5.tgz"; + sha512 = "2oEtKX3xLpV+/K3vYiqMVeoCa5XcIylBRVV9swAXz2xTC9sg4qcJTbn4Ts0P1wZ0TZ4GPnaDj4Eb9PLFx7Ypyw=="; }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" @@ -81831,7 +81789,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" @@ -82253,10 +82211,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.117.1"; + version = "0.118.1"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.117.1.tgz"; - sha512 = "t4zeJhlNzUIj9+ub0l6nICVimSuRTZJOqvk3Rmlu+YGdTOJ49Wna8p7aumpkXJakJfITiybfpYE1XN1o1Z34UQ=="; + url = "https://registry.npmjs.org/three/-/three-0.118.1.tgz"; + sha512 = "NYziIWAJg1ON5YJosT4eWCe/kmEOXC9pMJjqwsVtfIMrlP5qqassS0y99zs9INJUYtmxLsrNCdi9FzUWBKE6XQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -82738,14 +82696,11 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.9.4"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.4.tgz"; - sha512 = "8RZBJq5smLOa7KslsNsVcSH+KOXf1uDU8yqLeNuVKwmT0T3FA0ZoXlinQfRad7SDcbZZRZE4ov+2v71EnxNyCA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.0.tgz"; + sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; }; - dependencies = [ - sources."commander-2.20.3" - ]; buildInputs = globalBuildInputs; meta = { description = "JavaScript parser, mangler/compressor and beautifier toolkit"; @@ -82869,7 +82824,7 @@ in ]; }) sources."fast-safe-stringify-2.0.7" - sources."fecha-2.3.3" + sources."fecha-4.2.0" sources."finalhandler-1.1.2" sources."find-up-4.1.0" sources."forwarded-0.1.2" @@ -82914,7 +82869,7 @@ in sources."locate-path-5.0.0" sources."locks-0.2.2" sources."lodash-4.17.15" - (sources."logform-2.1.2" // { + (sources."logform-2.2.0" // { dependencies = [ sources."ms-2.1.2" ]; @@ -83055,7 +83010,7 @@ in sources."vary-1.1.2" sources."which-module-2.0.0" sources."winston-3.2.1" - (sources."winston-transport-4.3.0" // { + (sources."winston-transport-4.4.0" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" @@ -83406,7 +83361,7 @@ in sources."tslib-1.13.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.9.4" + sources."uglify-js-3.10.0" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -83447,9 +83402,9 @@ in sha512 = "/dd2bJLxOmX8Ie0EPTlmU+F8cxAekn/1m8K9OAFoijm4fc8SdHznFUUEKuz2RMMhsaL5+rccj8xLFAJELYNbaA=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + sources."@babel/highlight-7.10.3" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -83465,7 +83420,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -83670,7 +83625,7 @@ in }) sources."eslint-scope-4.0.3" sources."eslint-utils-1.4.3" - sources."eslint-visitor-keys-1.2.0" + sources."eslint-visitor-keys-1.3.0" sources."espree-5.0.1" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { @@ -84389,15 +84344,15 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-4.2.0.tgz"; - sha512 = "WM03BEeC7CVw4PV8lwXKO6ag00MYdwMMe1SAJJfxz0uNMbTu7cYoH6Ia+e2DnAzpeOJLKCeL1IXvgxZSwVp4/Q=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-4.3.0.tgz"; + sha512 = "1BCFeXuMY3QHnlkiUqgCV4ODNN84X3mX4GJk+Gb8tFv0Z8Grj4LneYa4A/0txoxpsz5E05THnKtb31t0XPJ8EQ=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - (sources."@babel/highlight-7.10.1" // { + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + (sources."@babel/highlight-7.10.3" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -84409,36 +84364,31 @@ in }) sources."@babel/polyfill-7.7.0" sources."@babel/runtime-7.7.7" - sources."@babel/runtime-corejs3-7.10.2" + sources."@babel/runtime-corejs3-7.10.3" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."JSONSelect-0.2.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" sources."adbkit-2.11.1" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-1.23.0" // { + (sources."addons-linter-1.26.0" // { dependencies = [ - sources."@babel/runtime-7.9.2" - sources."decamelize-1.2.0" - sources."yargs-15.3.1" + sources."@babel/runtime-7.10.2" ]; }) - sources."adm-zip-0.4.14" - sources."ajv-6.12.0" - sources."ajv-keywords-1.5.1" + sources."adm-zip-0.4.16" + sources."ajv-6.12.2" sources."ajv-merge-patch-4.1.0" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -84485,14 +84435,6 @@ in sources."atomic-sleep-1.0.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" - (sources."babel-code-frame-6.26.0" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."js-tokens-3.0.2" - sources."supports-color-2.0.0" - ]; - }) sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -84519,7 +84461,16 @@ in }) sources."bluebird-2.9.34" sources."boolbase-1.0.0" - sources."boxen-4.2.0" + (sources."boxen-4.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."chalk-3.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -84541,11 +84492,10 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."caller-path-0.1.0" - sources."callsites-0.2.0" + sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."caseless-0.12.0" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.3" (sources."chokidar-2.1.8" // { @@ -84554,14 +84504,13 @@ in sources."normalize-path-3.0.0" ]; }) - (sources."chrome-launcher-0.13.1" // { + (sources."chrome-launcher-0.13.3" // { dependencies = [ sources."mkdirp-0.5.5" sources."rimraf-3.0.2" ]; }) sources."ci-info-2.0.0" - sources."circular-json-0.3.3" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -84585,13 +84534,14 @@ in (sources."cliui-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" sources."strip-ansi-6.0.0" ]; }) sources."clone-1.0.4" sources."clone-response-1.0.2" - sources."co-4.6.0" - sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -84637,7 +84587,6 @@ in sources."crypto-random-string-2.0.0" sources."css-select-1.2.0" sources."css-what-2.1.3" - sources."d-1.0.1" sources."dashdash-1.14.1" sources."debounce-1.2.0" sources."debug-2.6.9" @@ -84657,8 +84606,7 @@ in (sources."dispensary-0.51.2" // { dependencies = [ sources."async-3.2.0" - sources."decamelize-1.2.0" - sources."yargs-15.3.1" + sources."pino-6.0.0" ]; }) sources."doctrine-3.0.0" @@ -84671,27 +84619,16 @@ in sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" - sources."emoji-regex-8.0.0" + sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."error-ex-1.3.2" sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" - sources."es5-ext-0.10.53" sources."es6-error-4.1.1" - sources."es6-iterator-2.0.3" - sources."es6-map-0.1.5" sources."es6-promise-2.3.0" - sources."es6-promisify-6.1.0" - (sources."es6-set-0.1.5" // { - dependencies = [ - sources."es6-symbol-3.1.1" - ]; - }) - sources."es6-symbol-3.1.3" - sources."es6-weak-map-2.0.3" + sources."es6-promisify-6.1.1" sources."escape-string-regexp-1.0.5" - sources."escope-3.6.0" (sources."eslint-5.16.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -84710,53 +84647,10 @@ in sources."supports-color-5.5.0" ]; }) - (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // { - dependencies = [ - sources."acorn-5.7.4" - (sources."acorn-jsx-3.0.1" // { - dependencies = [ - sources."acorn-3.3.0" - ]; - }) - sources."ajv-4.11.8" - sources."ansi-escapes-1.4.0" - sources."ansi-regex-3.0.0" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."cli-cursor-1.0.2" - sources."doctrine-2.1.0" - sources."eslint-3.19.0" - sources."espree-3.5.4" - sources."figures-1.7.0" - sources."file-entry-cache-2.0.0" - sources."flat-cache-1.3.4" - sources."globals-9.18.0" - sources."ignore-3.3.10" - sources."inquirer-0.12.0" - sources."is-fullwidth-code-point-1.0.0" - sources."mkdirp-0.5.5" - sources."onetime-1.1.0" - sources."progress-1.1.8" - sources."restore-cursor-1.0.1" - sources."run-async-0.1.0" - sources."slice-ansi-0.0.4" - sources."string-width-1.0.2" - sources."strip-ansi-4.0.0" - sources."strip-bom-3.0.0" - sources."strip-json-comments-2.0.1" - sources."supports-color-2.0.0" - (sources."table-3.8.3" // { - dependencies = [ - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - ]; - }) - sources."write-0.2.1" - ]; - }) + sources."eslint-plugin-no-unsanitized-3.1.2" sources."eslint-scope-4.0.3" sources."eslint-utils-1.4.3" - sources."eslint-visitor-keys-1.1.0" + sources."eslint-visitor-keys-1.2.0" (sources."espree-6.2.1" // { dependencies = [ sources."acorn-7.3.1" @@ -84771,7 +84665,6 @@ in sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" (sources."execa-4.0.2" // { dependencies = [ @@ -84784,7 +84677,6 @@ in sources."which-2.0.2" ]; }) - sources."exit-hook-1.1.1" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -84804,11 +84696,6 @@ in sources."kind-of-5.1.0" ]; }) - (sources."ext-1.4.0" // { - dependencies = [ - sources."type-2.0.0" - ]; - }) sources."extend-3.0.2" sources."extend-shallow-3.0.2" (sources."external-editor-3.1.0" // { @@ -84862,18 +84749,16 @@ in sources."fs-constants-1.0.0" sources."fs-extra-4.0.3" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - (sources."fx-runner-1.0.11" // { + (sources."fx-runner-1.0.12" // { dependencies = [ sources."commander-2.9.0" sources."isexe-1.1.2" sources."which-1.2.4" ]; }) - sources."generate-function-2.3.1" - sources."generate-object-property-1.2.0" sources."get-caller-file-2.0.5" sources."get-stream-5.1.0" sources."get-value-2.0.6" @@ -84881,7 +84766,6 @@ in (sources."git-rev-sync-2.0.0" // { dependencies = [ sources."graceful-fs-4.1.15" - sources."shelljs-0.7.7" ]; }) sources."glob-7.1.6" @@ -84903,7 +84787,6 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-1.0.3" - sources."has-ansi-2.0.0" sources."has-flag-4.0.0" sources."has-symbols-1.0.1" sources."has-value-1.0.0" @@ -84920,11 +84803,7 @@ in sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" sources."ignore-4.0.6" - (sources."import-fresh-3.2.1" // { - dependencies = [ - sources."resolve-from-4.0.0" - ]; - }) + sources."import-fresh-3.2.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -84932,23 +84811,13 @@ in sources."ini-1.3.5" (sources."inquirer-6.5.2" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."has-flag-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) + sources."strip-ansi-5.2.0" sources."supports-color-5.5.0" ]; }) @@ -84968,12 +84837,10 @@ in sources."is-docker-2.0.0" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" sources."is-mergeable-object-1.1.1" - sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.20.0" sources."is-npm-4.0.0" (sources."is-number-3.0.0" // { dependencies = [ @@ -84983,10 +84850,8 @@ in sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-plain-object-2.0.4" - sources."is-property-1.0.2" sources."is-regex-1.1.0" sources."is-relative-0.1.3" - sources."is-resolvable-1.1.0" sources."is-stream-2.0.0" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" @@ -85009,12 +84874,10 @@ in sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-1.0.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" - sources."jsonpointer-4.0.1" (sources."jsonwebtoken-8.5.1" // { dependencies = [ sources."ms-2.1.2" @@ -85059,7 +84922,7 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."marky-1.2.1" - sources."mdn-browser-compat-data-1.0.15" + sources."mdn-browser-compat-data-1.0.25" (sources."mem-5.1.1" // { dependencies = [ sources."mimic-fn-2.1.0" @@ -85074,7 +84937,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mixin-deep-1.3.2" - sources."mkdirp-1.0.3" + sources."mkdirp-1.0.4" sources."moment-2.27.0" sources."ms-2.0.0" sources."multimatch-4.0.0" @@ -85093,7 +84956,7 @@ in sources."natural-compare-lite-1.4.0" sources."ncp-2.0.0" sources."neo-async-2.6.1" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-forge-0.7.6" (sources."node-notifier-6.0.0" // { @@ -85109,7 +84972,6 @@ in ]; }) sources."nth-check-1.0.2" - sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -85135,7 +84997,6 @@ in sources."onetime-2.0.1" sources."open-7.0.0" sources."optionator-0.8.3" - sources."os-homedir-1.0.2" sources."os-locale-5.0.0" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" @@ -85151,11 +85012,7 @@ in ]; }) sources."pako-1.0.11" - (sources."parent-module-1.0.1" // { - dependencies = [ - sources."callsites-3.1.0" - ]; - }) + sources."parent-module-1.0.1" sources."parse-json-5.0.0" sources."parse5-3.0.3" sources."pascalcase-0.1.1" @@ -85167,11 +85024,10 @@ in sources."path-parse-1.0.6" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."pino-6.0.0" + sources."pino-6.3.2" sources."pino-std-serializers-2.4.2" - sources."pluralize-1.2.1" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.27" // { + (sources."postcss-7.0.32" // { dependencies = [ sources."ansi-styles-3.2.1" (sources."chalk-2.4.2" // { @@ -85208,12 +85064,6 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."readline2-1.0.1" // { - dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."mute-stream-0.0.5" - ]; - }) sources."rechoir-0.6.2" sources."regenerator-runtime-0.13.5" sources."regex-not-1.0.2" @@ -85237,23 +85087,21 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."require-uncached-1.0.3" sources."resolve-1.17.0" - sources."resolve-from-1.0.1" + sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.6.3" sources."run-async-2.4.1" - sources."rx-lite-3.1.2" sources."rxjs-6.5.5" sources."safe-buffer-5.2.1" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-7.1.3" + sources."semver-7.3.2" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -85270,7 +85118,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.6.1" - sources."shelljs-0.7.8" + sources."shelljs-0.7.7" sources."shellwords-0.1.1" (sources."sign-addon-2.0.5" // { dependencies = [ @@ -85278,6 +85126,7 @@ in sources."es6-promisify-6.0.2" sources."punycode-1.4.1" sources."request-2.88.0" + sources."source-map-support-0.5.16" sources."tough-cookie-2.4.3" ]; }) @@ -85287,7 +85136,6 @@ in sources."ansi-styles-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."is-fullwidth-code-point-2.0.0" ]; }) (sources."snapdragon-0.8.2" // { @@ -85323,7 +85171,7 @@ in sources."sonic-boom-1.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.16" + sources."source-map-support-0.5.19" sources."source-map-url-0.4.0" sources."spawn-sync-1.0.15" sources."split-0.3.3" @@ -85355,10 +85203,10 @@ in sources."once-1.3.3" ]; }) - (sources."string-width-4.2.0" // { + (sources."string-width-2.1.1" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" ]; }) sources."string.prototype.trimend-1.0.1" @@ -85374,8 +85222,6 @@ in (sources."table-5.4.6" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -85409,7 +85255,6 @@ in sources."tslib-1.13.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-1.2.0" sources."type-check-0.3.2" sources."type-detect-4.0.8" sources."type-fest-0.8.1" @@ -85433,28 +85278,42 @@ in ]; }) sources."upath-1.2.0" - sources."update-notifier-4.0.0" + (sources."update-notifier-4.0.0" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) sources."uri-js-4.2.2" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."use-3.1.1" - sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" sources."watchpack-1.6.1" sources."wcwidth-1.0.1" sources."webidl-conversions-5.0.0" - sources."whatwg-url-8.0.0" + sources."whatwg-url-8.1.0" sources."when-3.7.7" sources."which-1.3.1" sources."which-module-2.0.0" - sources."widest-line-3.1.0" + (sources."widest-line-3.1.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."winreg-0.0.12" sources."word-wrap-1.2.3" (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" sources."strip-ansi-6.0.0" ]; }) @@ -85472,10 +85331,14 @@ in sources."xregexp-4.3.0" sources."xtend-4.0.2" sources."y18n-4.0.0" - (sources."yargs-15.1.0" // { + (sources."yargs-15.3.1" // { dependencies = [ + sources."ansi-regex-5.0.0" sources."decamelize-1.2.0" - sources."yargs-parser-16.1.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) (sources."yargs-parser-18.1.3" // { @@ -86355,7 +86218,7 @@ in dependencies = [ sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."accepts-1.3.7" sources."ajv-6.12.2" sources."ajv-errors-1.0.1" @@ -87473,17 +87336,17 @@ in sha512 = "GFg4QC1xi3gkbHGGUFme8/8XPg3kDISu/qJfx56X207yuv1FSevGY/eKuym7kh0bniCB4n3rseWW+QZXPH8LIw=="; }; dependencies = [ - sources."@babel/code-frame-7.10.1" - sources."@babel/helper-validator-identifier-7.10.1" - sources."@babel/highlight-7.10.1" - sources."@babel/runtime-7.10.2" + sources."@babel/code-frame-7.10.3" + sources."@babel/helper-validator-identifier-7.10.3" + sources."@babel/highlight-7.10.3" + sources."@babel/runtime-7.10.3" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."@types/color-name-1.1.1" sources."@types/glob-7.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.13" + sources."@types/node-14.0.14" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.0.1" @@ -88230,7 +88093,7 @@ in sources."text-table-0.2.0" sources."textextensions-2.6.0" sources."through-2.3.8" - sources."through2-3.0.1" + sources."through2-3.0.2" sources."timed-out-4.0.1" sources."titleize-1.0.1" sources."tmp-0.0.33" From 8bdbb204d4112532be180d3a3662da1e1acd7c1c Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Wed, 24 Jun 2020 14:58:19 +0200 Subject: [PATCH 2511/3452] 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 2512/3452] 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 2513/3452] 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 2514/3452] 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 2515/3452] 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 2516/3452] 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 2517/3452] 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 2518/3452] 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 2519/3452] 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 2520/3452] 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 2521/3452] 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 2522/3452] 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 2523/3452] 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 2524/3452] 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 2525/3452] 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 2526/3452] 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 756915979e387d169ae39be3fd18fd9067c3683a Mon Sep 17 00:00:00 2001 From: Eric Dallo Date: Wed, 24 Jun 2020 20:06:24 -0300 Subject: [PATCH 2527/3452] material-design-icons: 4.7.95 -> 5.3.45 --- pkgs/data/fonts/material-design-icons/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index 72dc5fe6313c..1bf5c6aa4820 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "4.7.95"; + version = "5.3.45"; in fetchFromGitHub { name = "material-design-icons-${version}"; owner = "Templarian"; @@ -16,10 +16,10 @@ in fetchFromGitHub { cp fonts/*.woff $out/share/fonts/woff/ cp fonts/*.woff2 $out/share/fonts/woff2/ ''; - sha256 = "0da92kz8ryy60kb5xm52md13w28ih4sfap8g3v9b4ziyww66zjhz"; + sha256 = "1nwha6dbj97ybiwlf69la57l3ibmwgnzs0nr104bfqnqxjs471sx"; meta = with lib; { - description = "3200+ Material Design Icons from the Community"; + description = "4600+ Material Design Icons from the Community"; longDescription = '' Material Design Icons' growing icon collection allows designers and developers targeting various platforms to download icons in the format, From 40fb898673b427fbfc2c4a0ebeb821d5aa3531be Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Thu, 25 Jun 2020 00:11:06 +0100 Subject: [PATCH 2528/3452] 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 2529/3452] 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 2530/3452] 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 2531/3452] 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 fbbb1a027e76a378a92fbea2a38f8e26f555b986 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Jun 2020 02:30:26 +0200 Subject: [PATCH 2532/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-5-g7c30584 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/cae7d034d7ddf134f3d0eb99470b272350ac535b. --- .../haskell-modules/hackage-packages.nix | 370 ++++++++++++++---- 1 file changed, 290 insertions(+), 80 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a7bb5a8bb865..78e73464d7d5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -11100,6 +11100,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "IPv6Addr_1_1_5" = callPackage + ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network + , network-info, random, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "IPv6Addr"; + version = "1.1.5"; + sha256 = "0fnh77znfkp0d2i6vdvrsnxcdprqjz43in5k36b3yrrzffdrfka7"; + libraryHaskellDepends = [ + aeson attoparsec base iproute network network-info random text + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + description = "Library to deal with IPv6 address text representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "IPv6DB" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger , hedis, hspec, http-client, http-types, IPv6Addr, mtl @@ -12222,6 +12241,8 @@ self: { pname = "LambdaHack"; version = "0.9.5.0"; sha256 = "1y5345cmwl40p0risziyqlxfa8jv1rm9x6ivv85xhznrsmr0406h"; + revision = "1"; + editedCabalFile = "0qaqfyg7a50yibshq63718iyi4z1v017fzp7kbwrnwqmkmdqfa5a"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -13605,6 +13626,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "MonadRandom_0_5_2" = callPackage + ({ mkDerivation, base, mtl, primitive, random, transformers + , transformers-compat + }: + mkDerivation { + pname = "MonadRandom"; + version = "0.5.2"; + sha256 = "1rjihspfdg2b9bwvbgj36ql595nbza8ddh1bmgz924xmddshcf30"; + libraryHaskellDepends = [ + base mtl primitive random transformers transformers-compat + ]; + description = "Random-number generation monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MonadRandomLazy" = callPackage ({ mkDerivation, base, MonadRandom, mtl, random }: mkDerivation { @@ -24723,8 +24760,8 @@ self: { }: mkDerivation { pname = "aeson-with"; - version = "0.1.0.0"; - sha256 = "17gzgy1mxcgq46bhys33l31x1bi532fj1qaazkapkx6a248fckw2"; + version = "0.1.0.2"; + sha256 = "0iv522v1cq2vnwnics0fas962kfaghvk33awnggd5k078x450wsq"; libraryHaskellDepends = [ aeson base hashmap lens lens-aeson scientific text unordered-containers vector @@ -31977,7 +32014,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "arithmoi_0_11_0_0" = callPackage + "arithmoi_0_11_0_1" = callPackage ({ mkDerivation, array, base, chimera, constraints, containers , deepseq, exact-pi, gauge, integer-gmp, integer-logarithms , integer-roots, mod, QuickCheck, quickcheck-classes, random @@ -31986,8 +32023,8 @@ self: { }: mkDerivation { pname = "arithmoi"; - version = "0.11.0.0"; - sha256 = "14zhrlml6029n21h0ihspydg2zr7f93k4lji0nyi23c5y67pi9sk"; + version = "0.11.0.1"; + sha256 = "1dz6gpwnyw02lff8xh5vmf1vsknnvnd3vh3iix0r6f1hkf03xi8y"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base chimera constraints containers deepseq exact-pi @@ -40948,20 +40985,19 @@ self: { "bip32" = callPackage ({ mkDerivation, base, base16-bytestring, base58-bytestring, binary - , bitcoin-hash, bytestring, hedgehog, secp256k1-haskell, tasty + , bitcoin-hash, bitcoin-keys, bytestring, hedgehog, tasty , tasty-hedgehog, tasty-hunit }: mkDerivation { pname = "bip32"; - version = "0.1.2"; - sha256 = "10nzbiildpa8k0xp9dh7sc0pr8ipwbidc2y826pmhafpy07qvqdi"; + version = "0.2"; + sha256 = "1ji71m6mdnhqscadrmxs4pwb18cc5j91dhlnqs3d76gk32fyy32q"; libraryHaskellDepends = [ - base base58-bytestring binary bitcoin-hash bytestring - secp256k1-haskell + base base58-bytestring binary bitcoin-hash bitcoin-keys bytestring ]; testHaskellDepends = [ - base base16-bytestring base58-bytestring binary bytestring hedgehog - tasty tasty-hedgehog tasty-hunit + base base16-bytestring base58-bytestring binary bitcoin-keys + bytestring hedgehog tasty tasty-hedgehog tasty-hunit ]; description = "BIP-0032: Hierarchical Deterministic Wallets for Bitcoin and other cryptocurrencies"; license = stdenv.lib.licenses.asl20; @@ -40979,8 +41015,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.2.5.0"; - sha256 = "11ijdd4j9yi3k2blzh8rpzix3w1hfsz188xqharwsk3sxqjbws5c"; + version = "0.3.1.0"; + sha256 = "13b2d6nhlgqnx97fp4qjh7672lgmma5dxs0dvhvyvwig4n6cblr1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50713,8 +50749,8 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.3.0"; - sha256 = "1c237awhrr1r0qz7jll1d7803j1khhz1qq4my2dddsgwfsy57ga3"; + version = "0.1.3.1"; + sha256 = "0r8q2i29wb47dkkws6cyy2qgwzgyhcsmx7sixv8n44rxiiv0dhcw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54417,14 +54453,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "climb_0_3_2" = callPackage + "climb_0_3_3" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions , linenoise, mtl, text, unliftio-core }: mkDerivation { pname = "climb"; - version = "0.3.2"; - sha256 = "1ch91ll2sg05fqqlbphhjrmsvnn5a3cjj3ngag29sv60afasll0i"; + version = "0.3.3"; + sha256 = "0d6jscwbjlm21jcdl29c3ix6vd5ly9mjr0ljchzkr6yk7gqk4z24"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69819,6 +69855,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dejafu_2_3_0_1" = callPackage + ({ mkDerivation, base, concurrency, containers, contravariant + , deepseq, exceptions, leancheck, profunctors, random, transformers + }: + mkDerivation { + pname = "dejafu"; + version = "2.3.0.1"; + sha256 = "0klw2knnhqanmfjz2hjrj5sag6bqkh1g6vhgbvyk3d532m748wx1"; + libraryHaskellDepends = [ + base concurrency containers contravariant deepseq exceptions + leancheck profunctors random transformers + ]; + description = "A library for unit-testing concurrent programs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -75204,8 +75257,8 @@ self: { }: mkDerivation { pname = "dobutokO2"; - version = "0.41.0.0"; - sha256 = "1qnlmyxg5qsh63gh7vnjmvshrflfz8ybxcnwdcjr8qwflyfj5kq9"; + version = "0.42.0.0"; + sha256 = "12bjaa9kw1ks9f64zl0lg4447hs1bjjy5g3q3yhmabwzp5yyy014"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75226,8 +75279,8 @@ self: { }: mkDerivation { pname = "dobutokO3"; - version = "0.1.0.0"; - sha256 = "09nd465327fz7li2g9gc50lhsqi2a2sbaznmwxld7jsnzm5i9fbm"; + version = "0.2.1.0"; + sha256 = "0xh6685v01j1r9fg8r7ldd8vqxlir2fylryb0z71ndpdi4ajvkih"; libraryHaskellDepends = [ base bytestring directory dobutokO2 mmsyn2 mmsyn3 mmsyn6ukr mmsyn7l mmsyn7s mmsyn7ukr process vector @@ -75242,8 +75295,8 @@ self: { }: mkDerivation { pname = "dobutokO4"; - version = "0.6.0.0"; - sha256 = "0y06i7q1899ch205mybkmr6rsnjjs4ibsck2s6q5nx1d0kcpn1p7"; + version = "0.7.0.0"; + sha256 = "16im8ki3jbc7jgvr8nwnr4mb19is1vf3pz6pdfrj4q9jfmrv82d2"; libraryHaskellDepends = [ base directory dobutokO2 mmsyn3 mmsyn7l process vector vector-doublezip @@ -76974,6 +77027,21 @@ self: { license = "GPL"; }) {}; + "dsp_0_2_5_1" = callPackage + ({ mkDerivation, array, base, containers, QuickCheck, random }: + mkDerivation { + pname = "dsp"; + version = "0.2.5.1"; + sha256 = "03mhqqnjqjhklmlim6cljq5ik0l4h6lgqffw2i2clqgwj64ky5nf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base containers random ]; + testHaskellDepends = [ array base containers QuickCheck ]; + description = "Haskell Digital Signal Processing"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dstring" = callPackage ({ mkDerivation, base, base-unicode-symbols, dlist }: mkDerivation { @@ -83811,17 +83879,26 @@ self: { }) {inherit (pkgs) exif;}; "exigo-schema" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, persistent - , persistent-template, template-haskell, text, th-lift-instances + ({ mkDerivation, aeson, base, binary, bytestring, directory + , exceptions, hint, hspec, hspec-core, interpolate, persistent + , persistent-template, QuickCheck, quickcheck-text + , template-haskell, temporary, text, th-lift-instances }: mkDerivation { pname = "exigo-schema"; - version = "0.1.0.0"; - sha256 = "1ivpms6vm022jbc859l2vjibvzl6sa8kindkz165c0fk1ii433ph"; + version = "0.2.0.0"; + sha256 = "1p9hss4s6fx59dy92pwnzph29yxprdzs96j7va9ycx31x34g41yx"; + revision = "1"; + editedCabalFile = "1r1sz3b4s6yvg5p7lzy1ir0zl1scy1jfk5bsml4jc78ivl2rssf1"; libraryHaskellDepends = [ aeson base binary bytestring persistent persistent-template template-haskell text th-lift-instances ]; + testHaskellDepends = [ + base directory exceptions hint hspec hspec-core interpolate + persistent persistent-template QuickCheck quickcheck-text + template-haskell temporary + ]; description = "database schema for exigo marking/assessment tools"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -116614,8 +116691,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.32.3"; - sha256 = "18wvxjlfq2rj521ddfk2chkvxc9yvqk2lpm0xychpl9hxcnr8ghq"; + version = "0.34.0"; + sha256 = "0zl17wdd8pxqkgbhxrmclpjn2wcyamm8684wfl8yn5awm67afzzq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116655,8 +116732,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.32.3"; - sha256 = "1f91llj13qv5cmwbsm1sa5lri1ggcb9a3z35d5fyvvfdmb9gmr7a"; + version = "0.34.0"; + sha256 = "1wvhwjn9pk1sdjabpcca7bmyhdq0hdz6k4pydp1183lp647cfn3d"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network @@ -120099,12 +120176,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hedgehog-fakedata_0_0_1_2" = callPackage + "hedgehog-fakedata_0_0_1_3" = callPackage ({ mkDerivation, base, containers, fakedata, hedgehog, random }: mkDerivation { pname = "hedgehog-fakedata"; - version = "0.0.1.2"; - sha256 = "1fzvpicpmm39wiyj3phsdigsq3fh8lax9yjq7a28dhy6qiclp3y0"; + version = "0.0.1.3"; + sha256 = "0h0cf4y25453n52d4y1ximzdc9l04b17byd9kgjvc3c279866f1i"; libraryHaskellDepends = [ base fakedata hedgehog random ]; testHaskellDepends = [ base containers fakedata hedgehog ]; description = "Use 'fakedata' with 'hedgehog'"; @@ -120463,8 +120540,8 @@ self: { pname = "heist"; version = "1.1.0.1"; sha256 = "1j4h9fwny4hl2m5lgsd257lvm9057fb0hmnaqjw8a9k4hyx7hmqq"; - revision = "2"; - editedCabalFile = "1w9iabqa3pm2160275z6mh658zlyp7vkj18ch064ry3y3a6cymbk"; + revision = "3"; + editedCabalFile = "0a456cq72fgdy3wvk6db6yqk3mpib85h7kmwrvdjl7p637dvpxzh"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -124979,8 +125056,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.1.5"; - sha256 = "0mhcch11bph481ph0v2ymp4vxd37phxqm9393bn48i09rx0xbklq"; + version = "3.1.6"; + sha256 = "1kbzj3qw3rr4yb2x50q79abckh6fvadbzqidbzkbydqqm0yhqhnx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -131266,8 +131343,6 @@ self: { doHaddock = false; description = "Extend the import list of a Haskell source file"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hsini" = callPackage @@ -154802,8 +154877,10 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.3.1.0"; - sha256 = "0jvabc8p69wgf20q3mq0nn9kg6x20gym3xl251vnbyl7chkg9can"; + version = "1.3.2.0"; + sha256 = "134f9ijnd1dw2l9k5m1ay643pc4jqmq5kx17cnijb7ff93442s0n"; + revision = "1"; + editedCabalFile = "0i3khfhc2k9wnyb8bb0mkh5vn2p3f6q9n6vy8ndydz1dzaxg56bb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -163705,7 +163782,7 @@ self: { broken = true; }) {}; - "massiv-io_0_3_0_0" = callPackage + "massiv-io_0_3_0_1" = callPackage ({ mkDerivation, base, bytestring, Color, data-default-class , deepseq, doctest, exceptions, filepath, hspec, JuicyPixels , massiv, massiv-test, netpbm, QuickCheck, random, template-haskell @@ -163713,8 +163790,8 @@ self: { }: mkDerivation { pname = "massiv-io"; - version = "0.3.0.0"; - sha256 = "1d0hvhb8im7j3khvx2s8k8gd9y0v83zgyfk8sdvh4icx4bc9nhj6"; + version = "0.3.0.1"; + sha256 = "0r0nkgpdkjwsdxcfys3idk1m7q0paz5c3gx1sx7xwsj7c5gyp5gs"; libraryHaskellDepends = [ base bytestring Color data-default-class deepseq exceptions filepath JuicyPixels massiv netpbm unliftio vector @@ -165221,8 +165298,8 @@ self: { }: mkDerivation { pname = "mega-sdist"; - version = "0.4.0.1"; - sha256 = "191saxmdh3705rhci7lz7qzcdzv2zvw9bwa7f5d62500azi13j8v"; + version = "0.4.1.0"; + sha256 = "124wa7v8vx82gd04brgv3kphyqs0p5x9hp1vlp39bkha9w1yab7w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -168452,8 +168529,8 @@ self: { }: mkDerivation { pname = "mmsyn7h"; - version = "0.7.6.0"; - sha256 = "0z8r6d7my2hbp8g2l3258461f53kx8zm3fzyq605vk4y9z6k6icb"; + version = "0.7.7.0"; + sha256 = "0ayx9mv25f8dvp30bbxm6cnbmxwpdhcpqsh0zgh6xp703vlwrfvc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168474,8 +168551,8 @@ self: { }: mkDerivation { pname = "mmsyn7l"; - version = "0.6.1.0"; - sha256 = "194rzng4akd22lb7azpapwbpmc819scsgj0rq160fs9vvl3ji56d"; + version = "0.7.0.0"; + sha256 = "0mpc782zgv63ax8mfq7ljrdida4vviqhzhiakl42i368f1zavhqm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168492,8 +168569,8 @@ self: { ({ mkDerivation, base, mmsyn2, mmsyn5, mmsyn6ukr, vector }: mkDerivation { pname = "mmsyn7s"; - version = "0.6.7.0"; - sha256 = "14siy618rby0x9s94cqlpn4ymx6d589vb9f3mnqly7ykf53rwbi3"; + version = "0.7.0.0"; + sha256 = "14vbqdhk8f6fa319c6yk57y474bivdmyhj9rmy20cqjjh7bsw229"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ]; @@ -168508,8 +168585,8 @@ self: { }: mkDerivation { pname = "mmsyn7ukr"; - version = "0.15.5.0"; - sha256 = "1bpg1c8mvy51ycg1cx1haskidg3zzpdf29dpm8p2fk4bjc70v0w2"; + version = "0.16.0.0"; + sha256 = "1dmiisbn9v98rf4qa7zw976w3qj6s67j11vvd82f186n9p2id7px"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -179510,6 +179587,30 @@ self: { broken = true; }) {}; + "nom" = callPackage + ({ mkDerivation, algebra, base, base-compat, Cabal, cabal-doctest + , containers, data-default, doctest, extra, finite-typelits, flow + , hspec, hspec-discover, QuickCheck, syb, template-haskell + , TypeCompose, Unique + }: + mkDerivation { + pname = "nom"; + version = "0.1.0.0"; + sha256 = "17vwi6rna2zscw8n34zyx1vmsa0dkl02r1ji362pn1p0v0yclii5"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + algebra base containers data-default extra finite-typelits flow + QuickCheck syb TypeCompose Unique + ]; + testHaskellDepends = [ + base base-compat data-default doctest hspec QuickCheck + template-haskell + ]; + testToolDepends = [ hspec-discover ]; + description = "Name-binding & alpha-equivalence"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nominal" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -180690,6 +180791,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "numeric-prelude_0_4_3_2" = callPackage + ({ mkDerivation, array, base, containers, deepseq, non-negative + , parsec, QuickCheck, random, semigroups, storable-record + , utility-ht + }: + mkDerivation { + pname = "numeric-prelude"; + version = "0.4.3.2"; + sha256 = "1vd777ax2yvxknfxp9isgjk7cabjv3q86dgf3hybv78hc4ji5gmq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers deepseq non-negative parsec QuickCheck random + semigroups storable-record utility-ht + ]; + description = "An experimental alternative hierarchy of numeric type classes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "numeric-qq" = callPackage ({ mkDerivation, base, directory, doctest, filepath, loch-th , placeholders, template-haskell @@ -186600,7 +186721,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pantry_0_5_1_0" = callPackage + "pantry_0_5_1_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers , cryptonite, cryptonite-conduit, digest, exceptions, filelock @@ -186614,8 +186735,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.5.1.0"; - sha256 = "1z6l4qqmlpk21j8vdl81km5iq5bl1qmasyprvmi0q31i59yk4p0f"; + version = "0.5.1.1"; + sha256 = "1q1q8jflhd5r70czsclkj27yqk4v8b1njdw8f4qb3xvf9c3gzl70"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -188587,8 +188708,8 @@ self: { ({ mkDerivation, base, exceptions, path }: mkDerivation { pname = "path-extensions"; - version = "0.0.1.0"; - sha256 = "0pkcvk9c74pjhhkikhi42nazhvff0zxz4ihm1x5p8flckyih7yyn"; + version = "0.1.0.0"; + sha256 = "0maixixhid0xiqpzjjn3b7mj96xx37wyxayfl1lcp7hj1sz96pwl"; libraryHaskellDepends = [ base exceptions path ]; description = "Enumeration of common filetype extensions for use with the path library"; license = stdenv.lib.licenses.bsd3; @@ -188742,6 +188863,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pathtype_0_8_1_1" = callPackage + ({ mkDerivation, base, deepseq, directory, old-time, QuickCheck + , random, semigroups, tagged, time, transformers, utility-ht + }: + mkDerivation { + pname = "pathtype"; + version = "0.8.1.1"; + sha256 = "0322q8wd4mbp7q0cgym6mf2dxg2srp76r38kprxl9ik53s3y3p67"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq directory old-time QuickCheck semigroups tagged time + transformers utility-ht + ]; + testHaskellDepends = [ base random ]; + description = "Type-safe replacement for System.FilePath etc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pathwalk" = callPackage ({ mkDerivation, base, directory, filepath, transformers }: mkDerivation { @@ -201359,8 +201500,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.9.0"; sha256 = "00n5mf7abprhr9xvh3k1mw40jn4l94wwxpc2h0546h0n9v7srb1b"; - revision = "1"; - editedCabalFile = "14lgfxazr83nmbcdprygx2add8233hsq1hpdsiffx5zprgvr78vv"; + revision = "2"; + editedCabalFile = "1njlypxh9p0dfqywgqgyzgx9h822d37jbnnd9zbl0ci99k1247g6"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -204024,6 +204165,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "quickcheck-transformer_0_3_1_1" = callPackage + ({ mkDerivation, base, QuickCheck, random, transformers }: + mkDerivation { + pname = "quickcheck-transformer"; + version = "0.3.1.1"; + sha256 = "0al0p44qi9j829zcnv43kqf4pxaxr6fb48vkq1an15hdk6svx11j"; + libraryHaskellDepends = [ base QuickCheck random transformers ]; + description = "A GenT monad transformer for QuickCheck library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-unicode" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -223464,6 +223617,8 @@ self: { pname = "set-cover"; version = "0.1.1"; sha256 = "04jjcmjll0azz24rx91p0dp5b8ya5jc0qacr21764ri1dbkfflgw"; + revision = "1"; + editedCabalFile = "0x5hn43xcfsygjc048mvzk6g8dx51pr5csvvqr6pns8jmz5awkf8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224463,22 +224618,22 @@ self: { "shakebook" = callPackage ({ mkDerivation, aeson, aeson-with, base, comonad, comonad-extras - , doctemplates, feed, free, lens, lens-aeson, mustache, pandoc - , pandoc-types, path-extensions, relude, rio, shake-plus, slick + , doctemplates, feed, free, ixset, lens, lens-aeson, mustache + , pandoc, pandoc-types, path-extensions, rio, shake-plus, slick , split, tasty, tasty-golden, text-time, zipper-extra }: mkDerivation { pname = "shakebook"; - version = "0.5.1.0"; - sha256 = "1yjk1zayfiisa927gh6rmsh0qvy64gvgw77b1vd4h22alndfchxr"; + version = "0.6.0.0"; + sha256 = "1lhajmf0i4rvwys8xlnsnjz7rim3g1vd1cd9blz7kg7zfbn28kxr"; libraryHaskellDepends = [ aeson aeson-with base comonad comonad-extras doctemplates feed free - lens lens-aeson mustache pandoc pandoc-types path-extensions relude + ixset lens lens-aeson mustache pandoc pandoc-types path-extensions rio shake-plus slick split text-time zipper-extra ]; testHaskellDepends = [ aeson aeson-with base comonad comonad-extras doctemplates feed free - lens lens-aeson mustache pandoc pandoc-types path-extensions relude + ixset lens lens-aeson mustache pandoc pandoc-types path-extensions rio shake-plus slick split tasty tasty-golden text-time zipper-extra ]; @@ -236450,6 +236605,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "storablevector_0_2_13_1" = callPackage + ({ mkDerivation, base, bytestring, deepseq, non-negative + , QuickCheck, random, sample-frame, semigroups, syb, transformers + , unsafe, utility-ht + }: + mkDerivation { + pname = "storablevector"; + version = "0.2.13.1"; + sha256 = "06fgxbnc5vwmiv7dxywj7ncjhmxv0wjs0bys5hza6mrwn3sw5r2w"; + libraryHaskellDepends = [ + base deepseq non-negative QuickCheck semigroups syb transformers + unsafe utility-ht + ]; + testHaskellDepends = [ + base bytestring QuickCheck random utility-ht + ]; + benchmarkHaskellDepends = [ + base deepseq sample-frame unsafe utility-ht + ]; + description = "Fast, packed, strict storable arrays with a list interface like ByteString"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "storablevector-carray" = callPackage ({ mkDerivation, base, carray, storablevector, utility-ht }: mkDerivation { @@ -236626,15 +236805,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_54_0" = callPackage + "stratosphere_0_55_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.54.0"; - sha256 = "1d56fl71qvhzaka3sx1306nwlpmry9q7gykb6fxa7c92279c2nly"; + version = "0.55.0"; + sha256 = "0fs0npxspfg3yj03dzjq1a02z3ca3s82z6v92f3cb1bkn0dsqhq2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -243036,6 +243215,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-dejafu_2_0_0_5" = callPackage + ({ mkDerivation, base, dejafu, random, tagged, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "2.0.0.5"; + sha256 = "0yw4dsy6vcichr76da5rlw6y6g62kiagr9rqxlsxndgckb6bmyzf"; + libraryHaskellDepends = [ base dejafu random tagged tasty ]; + description = "Deja Fu support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-discover" = callPackage ({ mkDerivation, base, containers, directory, filepath, Glob , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit @@ -248637,15 +248828,15 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "tidal_1_6_0" = callPackage + "tidal_1_6_1" = callPackage ({ mkDerivation, base, bifunctors, bytestring, clock, colour , containers, criterion, deepseq, hosc, microspec, network, parsec , primitive, random, text, transformers, vector, weigh }: mkDerivation { pname = "tidal"; - version = "1.6.0"; - sha256 = "0fz2sgy3fjkm3p6lzv0sa71p1madf06qfv05i3vv6zn3qrpfrx1q"; + version = "1.6.1"; + sha256 = "13n9s0s04bddl16xq86anz7a9fqcm7j3xfqn5y1mni5j1h7hn2k2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq hosc @@ -256903,8 +257094,8 @@ self: { pname = "unfoldable"; version = "1.0"; sha256 = "0ilzv4ks76f9fx12ilsam0v232fm2mvvsz6s50p0nllldwgkgm6a"; - revision = "1"; - editedCabalFile = "167jqv6cw9d1c9n0j2sxp5asaaqbh6ay3g8nyg8ndy96jnjb34zb"; + revision = "2"; + editedCabalFile = "0lnqjgh8nyq6w94swn0m7syl0bx6a2ml7s9sqp449inpdb8f8jaj"; libraryHaskellDepends = [ base containers ghc-prim one-liner QuickCheck random transformers ]; @@ -261282,8 +261473,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "vector-doublezip"; - version = "0.1.0.0"; - sha256 = "0s5mmwc0s88cdwhb9m0hrphgkiwff2ipic0cln911qll7bxfprgl"; + version = "0.2.0.0"; + sha256 = "0z98f0fjn90x3azdbsnjpx61r9lna9hb67bjnmmhvil9a7hpd65x"; libraryHaskellDepends = [ base vector ]; description = "Some special functions to work with Vector (with zip)"; license = stdenv.lib.licenses.mit; @@ -268185,6 +268376,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "world-peace_1_0_2_0" = callPackage + ({ mkDerivation, aeson, base, deepseq, doctest, Glob, profunctors + , should-not-typecheck, tagged, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "world-peace"; + version = "1.0.2.0"; + sha256 = "05r4ils0imcv31sx6h82mwcwcrasrfs6kkip3frdsbf0aizgzcdb"; + libraryHaskellDepends = [ aeson base deepseq profunctors tagged ]; + testHaskellDepends = [ + base doctest Glob should-not-typecheck tasty tasty-hunit text + ]; + description = "Open Union and Open Product Types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "worldturtle" = callPackage ({ mkDerivation, base, containers, gloss, lens, matrix, mtl }: mkDerivation { @@ -273502,6 +273710,8 @@ self: { pname = "yesod-core"; version = "1.6.18"; sha256 = "1hm0frswqcj34scvapszdryjfmnrqq5fhf5hv7qcz8sj3qf46zkd"; + revision = "1"; + editedCabalFile = "14n8l28k6gykym9b3m9kw2j1m8dmiajxqgydpnrr7v75a64xqas9"; libraryHaskellDepends = [ aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra From 14ddd784d3421701fbc7a780368295b753747d30 Mon Sep 17 00:00:00 2001 From: Conrad Mearns Date: Thu, 25 Jun 2020 02:36:17 +0200 Subject: [PATCH 2533/3452] maintainers: add conradmearns --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bdc2a1a83bd5..abc645d6b350 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1598,6 +1598,12 @@ githubId = 32609395; name = "B YI"; }; + conradmearns = { + email = "conradmearns+github@pm.me"; + github = "ConradMearns"; + githubId = 5510514; + name = "Conrad Mearns"; + }; couchemar = { email = "couchemar@yandex.ru"; github = "couchemar"; From e4172776e709ffb2732c037597a4f287766342db Mon Sep 17 00:00:00 2001 From: Conrad Mearns Date: Thu, 25 Jun 2020 02:38:06 +0200 Subject: [PATCH 2534/3452] licences: add Obsidian.md EULA --- lib/licenses.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index b799a6ae8a43..e7219492d282 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -545,6 +545,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "Non-Profit Open Software License 3.0"; }; + obsidian = { + fullName = "Obsidian End User Agreement"; + url = "https://obsidian.md/eula"; + free = false; + }; + ocamlpro_nc = { fullName = "OCamlPro Non Commercial license version 1"; url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-2.2.0/OCamlPro-Non-Commercial-License.pdf"; From adb053abdcea6d1ac5c91ab5f40a8fc540bd0ad2 Mon Sep 17 00:00:00 2001 From: Conrad Mearns Date: Thu, 25 Jun 2020 02:38:32 +0200 Subject: [PATCH 2535/3452] obsidian: init at 0.7.3 --- pkgs/applications/misc/obsidian/default.nix | 29 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/misc/obsidian/default.nix diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix new file mode 100644 index 000000000000..76e4e9b2b336 --- /dev/null +++ b/pkgs/applications/misc/obsidian/default.nix @@ -0,0 +1,29 @@ +{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3}: + +let + pname = "obsidian"; + version = "0.7.3"; +in + +appimageTools.wrapType2 rec { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/Obsidian-${version}.AppImage"; + sha256 = "1qiag5szagalik72j8s2dmp7075g48jxgcdy0wgd02kfv90ai0y6"; + }; + + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + meta = with lib; { + description = "Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files."; + homepage = "https://obsidian.md"; + license = licenses.mit; + maintainers = with maintainers; [ conradmearns ]; + platforms = [ "x86_64-linux" ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d88c63bcfb0..8804713c2258 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21455,6 +21455,8 @@ in obs-ndi = callPackage ../applications/video/obs-studio/obs-ndi.nix { }; + obsidian = callPackage ../applications/misc/obsidian { }; + octoprint = callPackage ../applications/misc/octoprint { }; octoprint-plugins = throw ''octoprint-plugins are now part of the octoprint.python.pkgs package set.''; From 16a7ae0d64d1f622ac127128fe2b8e921caa823d Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Wed, 24 Jun 2020 22:08:20 -0400 Subject: [PATCH 2536/3452] corerad: 0.2.6 -> 0.2.7 Signed-off-by: Matt Layher --- pkgs/tools/networking/corerad/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index bbdb98ae4950..1a29e5305e35 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "corerad"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "16rwydvqkzi0jlgwpl3d4f8zd35y4lv4h5xa30ybqmwwp1k5ymf0"; + sha256 = "073hjbwra8ihh11ha5ajqq2r98cc5li4k0xs4p4s055q197zj3aa"; }; - vendorSha256 = "1431fvi9b0id3zhgkxhiampc5avvp998lncyd5l2gn5py3qz6sdl"; + vendorSha256 = "19hp8xqr50v8h9vblihalvkb9ll8c0v4p071j9j1zkbjhnb07rca"; buildFlagsArray = '' -ldflags= - -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1591474872 + -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1593050100 -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} ''; From 09f0d65317f1789b2f74eda1891427efccd90e04 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Wed, 24 Jun 2020 22:09:20 -0400 Subject: [PATCH 2537/3452] nixos/corerad: set systemd unit Type=notify Signed-off-by: Matt Layher --- nixos/modules/services/networking/corerad.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/corerad.nix b/nixos/modules/services/networking/corerad.nix index 5d73c0a0d779..1c414c53a983 100644 --- a/nixos/modules/services/networking/corerad.nix +++ b/nixos/modules/services/networking/corerad.nix @@ -77,6 +77,8 @@ in { AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_RAW"; NoNewPrivileges = true; DynamicUser = true; + Type = "notify"; + NotifyAccess = "main"; ExecStart = "${getBin cfg.package}/bin/corerad -c=${cfg.configFile}"; Restart = "on-failure"; }; 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 2538/3452] 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 10f75b2fed07f417bc7051c725ddba3a9293aba8 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Wed, 24 Jun 2020 22:49:27 -0400 Subject: [PATCH 2539/3452] corerad: add NixOS module test as passthru test Signed-off-by: Matt Layher --- pkgs/tools/networking/corerad/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 1a29e5305e35..85a03e3611be 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "corerad"; @@ -19,6 +19,10 @@ buildGoModule rec { -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} ''; + passthru.tests = { + inherit (nixosTests) corerad; + }; + meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/corerad"; description = "CoreRAD extensible and observable IPv6 NDP RA daemon"; From cd555fdab23426a655746798bd6e253eb8c08bd0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 24 Jun 2020 20:00:00 -0500 Subject: [PATCH 2540/3452] 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 477cf953befbed96cff392f5550db58852e3ca21 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Wed, 24 Jun 2020 23:51:22 -0400 Subject: [PATCH 2541/3452] corerad: set linkTimestamp from file in repository root Signed-off-by: Matt Layher --- pkgs/tools/networking/corerad/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 85a03e3611be..2b1e94d2c19b 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -13,10 +13,16 @@ buildGoModule rec { vendorSha256 = "19hp8xqr50v8h9vblihalvkb9ll8c0v4p071j9j1zkbjhnb07rca"; - buildFlagsArray = '' - -ldflags= - -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1593050100 - -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} + # Since the tarball pulled from GitHub doesn't contain git tag information, + # we fetch the expected tag's timestamp from a file in the root of the + # repository. + preBuild = '' + buildFlagsArray=( + -ldflags=" + -X github.com/mdlayher/corerad/internal/build.linkTimestamp=$(<.gittagtime) + -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} + " + ) ''; passthru.tests = { From 7b95c2781575a1cba57bc5d2f89542e6f36cf12a Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 25 Jun 2020 11:20:35 +0530 Subject: [PATCH 2542/3452] 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 2543/3452] 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 2544/3452] 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 2545/3452] 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 2546/3452] =?UTF-8?q?ocamlPackages.torch:=200.8=20?= =?UTF-8?q?=E2=86=92=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 49c99ca796f5c6f9f94e105040d184e3d3920d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 25 Jun 2020 08:35:05 +0200 Subject: [PATCH 2547/3452] castor: remove verifyCargoDeps This attribute is not used anymore by buildRustPackage. --- pkgs/applications/networking/browsers/castor/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index 6209c3263bcd..6163323fff6b 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "04w49wka1vkb295lk6fzd6c5rwhzrqkp26hd5d94rx7bhcjmmb9w"; - verifyCargoDeps = true; nativeBuildInputs = [ pkg-config From b5b84be95bc0c30d821300b11edb337c884edea8 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Tue, 23 Jun 2020 12:33:55 +0200 Subject: [PATCH 2548/3452] k4dirstat: init at 3.2.1 --- pkgs/applications/misc/k4dirstat/default.nix | 33 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/misc/k4dirstat/default.nix diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix new file mode 100644 index 000000000000..2b4ae320e4e0 --- /dev/null +++ b/pkgs/applications/misc/k4dirstat/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation +, extra-cmake-modules +, fetchFromGitHub +, kdoctools +, kiconthemes +, kio +, kjobwidgets +, kxmlgui +, stdenv +}: + +mkDerivation rec { + pname = "k4dirstat"; + version = "3.2.1"; + + src = fetchFromGitHub { + owner = "jeromerobert"; + repo = pname; + rev = version; + sha256 = "15xjb80jq6vhzvzx4l341f40d8a23w1334qh6cczqm9adfnzycp7"; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kiconthemes kio kjobwidgets kxmlgui ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/jeromerobert/k4dirstat"; + description = "A small utility program that sums up disk usage for directory trees"; + license = licenses.gpl2; + maintainers = [ maintainers.raboof ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b75778322fe..c2d7eebbe9ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20471,6 +20471,8 @@ in okteta = libsForQt5.callPackage ../applications/editors/okteta { }; + k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; + kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; kdecoration-viewer = libsForQt5.callPackage ../tools/misc/kdecoration-viewer { }; From 4b365ae08c211dc798d776e7dec04e9e1cc0d173 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 25 Jun 2020 00:27:15 +0200 Subject: [PATCH 2549/3452] industrializer: init at 0.2.6 --- .../audio/industrializer/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/audio/industrializer/default.nix diff --git a/pkgs/applications/audio/industrializer/default.nix b/pkgs/applications/audio/industrializer/default.nix new file mode 100644 index 000000000000..593458506d8c --- /dev/null +++ b/pkgs/applications/audio/industrializer/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, fetchurl +, alsaLib +, audiofile +, autoconf +, automake +, gnome2 +, gtk2 +, libjack2 +, libtool +, libxml2 +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "industrializer"; + version = "0.2.6"; + src = fetchurl { + url = "mirror://sourceforge/project/${pname}/ps${pname}-${version}.tar.bz2"; + sha256 = "0vls94hqpkk8h17da6fddgqbl5dgm6250av3raimhhzwvm5r1gfi"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + alsaLib + audiofile + autoconf + automake + gnome2.gtkglext + gtk2 + libjack2 + libtool + libxml2 + ]; + + preConfigure = "./autogen.sh"; + + meta = { + description = "This program generates synthesized percussion sounds using physical modelling"; + longDescription = '' + The range of sounds possible include but is not limited to cymbal sounds, metallic noises, bubbly sounds, and chimes. + After a sound is rendered, it can be played and then saved to a .WAV file. + ''; + homepage = "https://sourceforge.net/projects/industrializer/"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e39185f2fa48..f3558d95f9a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4321,6 +4321,8 @@ in incron = callPackage ../tools/system/incron { }; + industrializer = callPackage ../applications/audio/industrializer { }; + inetutils = callPackage ../tools/networking/inetutils { }; inform7 = callPackage ../development/compilers/inform7 { }; From 9409bd0ea644957e943abe3974b82db86bc10e14 Mon Sep 17 00:00:00 2001 From: Corbin Date: Thu, 25 Jun 2020 00:31:54 -0700 Subject: [PATCH 2550/3452] igraph: 0.7.1 -> 0.8.2 Refs #90840. The check phase is now enabled. All tests pass on my machine. I realized while doing this bump that igraph vendors OpenBLAS, ARPACK, and GLPK. We can use our versions instead, and igraph builds successfully, but 34 tests fail. I'm choosing correctness instead of build times. --- pkgs/development/libraries/igraph/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index fcb5e7918d96..6b6924b7d415 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -4,24 +4,28 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.7.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "1wsy0r511gk069il6iqjs27q8cjvqz20gf0a7inybx1bw84845z8"; + sha256 = "015yh9s19lmxm7l1ld8adlsqh1lrmzicl801saixdwl9w05hfva4"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ flex yacc zlib libxml2 ]; - # This file is normally generated by igraph's bootstrap.sh, but we can do it - # ourselves. ~ C. + # Normally, igraph wants us to call bootstrap.sh, which will call + # tools/getversion.sh. Instead, we're going to put the version directly + # where igraph wants, and then let autoreconfHook do the rest of the + # bootstrap. ~ C. postPatch = '' - echo "${version}" > VERSION + echo "${version}" > IGRAPH_VERSION ''; + doCheck = true; + meta = { description = "The network analysis package"; homepage = "https://igraph.org/"; From 93574e51613df32aad8672d0aa36ebe1e957c920 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 25 Jun 2020 02:59:23 +0300 Subject: [PATCH 2551/3452] 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 b8623c53e194561efe02fdcd87c78a9111530d0c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Jun 2020 10:37:42 +0200 Subject: [PATCH 2552/3452] LTS Haskell 16.2 --- .../configuration-hackage2nix.yaml | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 4e9252f9c14b..12532d74cdc7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -74,7 +74,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 16.1 + # LTS Haskell 16.2 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -275,7 +275,7 @@ default-package-overrides: - aws-cloudfront-signed-cookies ==0.2.0.6 - bank-holidays-england ==0.2.0.4 - base16 ==0.2.1.0 - - base16-bytestring ==0.1.1.6 + - base16-bytestring ==0.1.1.7 - base16-lens ==0.1.2.0 - base32 ==0.1.1.2 - base32-lens ==0.1.0.0 @@ -427,7 +427,7 @@ default-package-overrides: - cheapskate ==0.1.1.2 - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 - - checkers ==0.5.5 + - checkers ==0.5.6 - checksum ==0.0 - chimera ==0.3.1.0 - chiphunk ==0.1.2.1 @@ -468,7 +468,7 @@ default-package-overrides: - co-log-core ==0.2.1.1 - co-log-polysemy ==0.0.1.2 - Color ==0.1.4 - - colorful-monoids ==0.2.1.2 + - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 - colour ==2.3.5 - colourista ==0.1.0.0 @@ -498,10 +498,10 @@ default-package-overrides: - conduit-extra ==1.3.5 - conduit-parse ==0.2.1.0 - conduit-zstd ==0.0.2.0 - - conferer ==0.4.1.0 - - conferer-hspec ==0.4.0.0 - - conferer-source-json ==0.4.0.0 - - conferer-warp ==0.4.0.0 + - conferer ==0.4.1.1 + - conferer-hspec ==0.4.0.1 + - conferer-source-json ==0.4.0.1 + - conferer-warp ==0.4.0.1 - ConfigFile ==1.1.4 - config-ini ==0.2.4.0 - configurator ==0.3.0.0 @@ -635,7 +635,7 @@ default-package-overrides: - dhall ==1.32.0 - dhall-bash ==1.0.30 - dhall-json ==1.6.4 - - dhall-lsp-server ==1.0.7 + - dhall-lsp-server ==1.0.8 - dhall-yaml ==1.1.0 - diagrams ==1.4 - diagrams-contrib ==1.4.4 @@ -674,7 +674,7 @@ default-package-overrides: - do-list ==1.0.1 - do-notation ==0.1.0.2 - dotenv ==0.8.0.4 - - dotgen ==0.4.2 + - dotgen ==0.4.3 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 - download ==0.3.2.7 @@ -841,10 +841,12 @@ default-package-overrides: - frontmatter ==0.1.0.2 - fsnotify ==0.3.0.1 - fsnotify-conduit ==0.1.1.1 + - ftp-client ==0.5.1.4 + - ftp-client-conduit ==0.5.0.5 - funcmp ==1.9 - function-builder ==0.3.0.1 - functor-classes-compat ==1 - - fused-effects ==1.0.2.0 + - fused-effects ==1.0.2.2 - fusion-plugin ==0.2.1 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 @@ -1023,7 +1025,7 @@ default-package-overrides: - hebrew-time ==0.1.2 - hedgehog ==1.0.2 - hedgehog-corpus ==0.2.0 - - hedgehog-fakedata ==0.0.1.1 + - hedgehog-fakedata ==0.0.1.2 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - hedis ==0.12.13 @@ -1069,7 +1071,7 @@ default-package-overrides: - hpack ==0.34.2 - hpack-dhall ==0.5.2 - hpc-codecov ==0.2.0.0 - - hpc-lcov ==1.0.0 + - hpc-lcov ==1.0.1 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 - hruby ==0.3.8 @@ -1265,7 +1267,7 @@ default-package-overrides: - json-alt ==1.0.0 - json-feed ==1.0.11 - jsonpath ==0.2.0.0 - - json-rpc ==1.0.2 + - json-rpc ==1.0.3 - json-rpc-generic ==0.2.1.5 - JuicyPixels ==3.3.5 - JuicyPixels-blurhash ==0.1.0.3 @@ -1343,7 +1345,7 @@ default-package-overrides: - lift-generics ==0.1.3 - line ==4.0.1 - linear ==1.21 - - linenoise ==0.3.1 + - linenoise ==0.3.2 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 @@ -1730,7 +1732,7 @@ default-package-overrides: - prettyclass ==1.0.0.0 - pretty-class ==1.0.1.1 - pretty-hex ==1.1 - - prettyprinter ==1.6.1 + - prettyprinter ==1.6.2 - prettyprinter-ansi-terminal ==1.1.1.2 - prettyprinter-compat-annotated-wl-pprint ==1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 @@ -1857,7 +1859,7 @@ default-package-overrides: - regex-posix ==0.96.0.0 - regex-tdfa ==1.3.1.0 - regex-with-pcre ==1.1.0.0 - - registry ==0.1.7.1 + - registry ==0.1.9.0 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.2.3 @@ -1866,8 +1868,8 @@ default-package-overrides: - relational-schemas ==0.1.8.0 - relude ==0.7.0.0 - renderable ==0.2.0.1 - - replace-attoparsec ==1.4.0.0 - - replace-megaparsec ==1.4.1.0 + - replace-attoparsec ==1.4.1.0 + - replace-megaparsec ==1.4.2.0 - repline ==0.2.2.0 - req ==3.2.0 - req-conduit ==1.0.0 @@ -1993,8 +1995,8 @@ default-package-overrides: - setlocale ==1.0.0.9 - sexp-grammar ==2.1.0 - SHA ==1.6.4.4 - - shake-plus ==0.1.6.0 - - shakespeare ==2.0.24 + - shake-plus ==0.1.7.0 + - shakespeare ==2.0.24.1 - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 @@ -2009,7 +2011,7 @@ default-package-overrides: - silently ==1.2.5.1 - simple-affine-space ==0.1.1 - simple-cabal ==0.1.2 - - simple-cmd ==0.2.1 + - simple-cmd ==0.2.2 - simple-cmd-args ==0.1.6 - simple-log ==0.9.12 - simple-reflect ==0.3.3 @@ -2030,8 +2032,8 @@ default-package-overrides: - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.8.4 - - skylighting-core ==0.8.4 + - skylighting ==0.8.5 + - skylighting-core ==0.8.5 - slack-api ==0.12 - slist ==0.1.1.0 - smallcheck ==1.1.7 @@ -2055,7 +2057,7 @@ default-package-overrides: - sox ==0.2.3.1 - soxlib ==0.0.3.1 - sparse-linear-algebra ==0.3.1 - - sparse-tensor ==0.2.1.3 + - sparse-tensor ==0.2.1.4 - spatial-math ==0.5.0.1 - special-values ==0.1.0.0 - speculate ==0.4.2 @@ -2371,7 +2373,7 @@ default-package-overrides: - validity ==0.11.0.0 - validity-aeson ==0.2.0.4 - validity-bytestring ==0.4.1.1 - - validity-containers ==0.5.0.3 + - validity-containers ==0.5.0.4 - validity-path ==0.4.0.1 - validity-primitive ==0.0.0.1 - validity-scientific ==0.2.0.3 From 83b2c329694f608f0d2421da7202f9b0c09cdfbc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Jun 2020 10:38:21 +0200 Subject: [PATCH 2553/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-5-g7c30584 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/711b59b900ee0b267ebb86e41dbc83ad7fb69629. --- .../haskell-modules/hackage-packages.nix | 574 +++--------------- 1 file changed, 95 insertions(+), 479 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 78e73464d7d5..ea0ca92132b8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -37039,17 +37039,6 @@ self: { }) {}; "base16-bytestring" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim }: - mkDerivation { - pname = "base16-bytestring"; - version = "0.1.1.6"; - sha256 = "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs"; - libraryHaskellDepends = [ base bytestring ghc-prim ]; - description = "Fast base16 (hex) encoding and decoding for ByteStrings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "base16-bytestring_0_1_1_7" = callPackage ({ mkDerivation, base, bytestring, ghc-prim }: mkDerivation { pname = "base16-bytestring"; @@ -37059,7 +37048,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Fast base16 (hex) encoding and decoding for ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base16-lens" = callPackage @@ -48635,8 +48623,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.15.0"; - sha256 = "0y7b36nrlwl8jvqw07f66hfr1mx54s76w7hj8yxr83pxb0592pis"; + version = "0.1.16.0"; + sha256 = "1gq8pbb9vag8xcq95a6f332g607mgfb93c5mjaivrqp38m0z3nv0"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers data-default-class data-flags deepseq deque df1 di-polysemy @@ -51991,19 +51979,6 @@ self: { }) {}; "checkers" = callPackage - ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: - mkDerivation { - pname = "checkers"; - version = "0.5.5"; - sha256 = "1g16603803xzz73md1azlcpd6xz7gkwjpy66l638v6lvipdl9hr9"; - libraryHaskellDepends = [ - array base QuickCheck random semigroupoids - ]; - description = "Check properties on standard classes and data structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "checkers_0_5_6" = callPackage ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: mkDerivation { pname = "checkers"; @@ -52014,7 +51989,6 @@ self: { ]; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "checkmate" = callPackage @@ -56459,18 +56433,6 @@ self: { }) {}; "colorful-monoids" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "colorful-monoids"; - version = "0.2.1.2"; - sha256 = "0y35f21n8xh1xq8i0anbfx034m5wnwhp2ka47vvi3w0iw13zyhhb"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; - description = "Styled console text output using ANSI escape sequences"; - license = stdenv.lib.licenses.mit; - }) {}; - - "colorful-monoids_0_2_1_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "colorful-monoids"; @@ -56480,7 +56442,6 @@ self: { testHaskellDepends = [ base ]; description = "Styled console text output using ANSI escape sequences"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "colorize-haskell" = callPackage @@ -59362,24 +59323,6 @@ self: { }) {}; "conferer" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , hspec, text - }: - mkDerivation { - pname = "conferer"; - version = "0.4.1.0"; - sha256 = "10wkzd7418jk6lvjn21h0qyk2lmsx12pvhn5j23b8vim89nb3p1c"; - libraryHaskellDepends = [ - base bytestring containers directory text - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory hspec text - ]; - description = "Configuration management library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "conferer_0_4_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , hspec, text }: @@ -59395,7 +59338,6 @@ self: { ]; description = "Configuration management library"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conferer-hedis" = callPackage @@ -59413,18 +59355,6 @@ self: { }) {}; "conferer-hspec" = callPackage - ({ mkDerivation, base, conferer, hspec, hspec-core, text }: - mkDerivation { - pname = "conferer-hspec"; - version = "0.4.0.0"; - sha256 = "1zj132a0m043lyk8bi9scvpcyhskivn2hrkcyrbms73i800dd59v"; - libraryHaskellDepends = [ base conferer hspec-core text ]; - testHaskellDepends = [ base conferer hspec hspec-core text ]; - description = "conferer's FromConfig instances for hspec Config"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "conferer-hspec_0_4_0_1" = callPackage ({ mkDerivation, base, conferer, hspec, hspec-core, text }: mkDerivation { pname = "conferer-hspec"; @@ -59434,7 +59364,6 @@ self: { testHaskellDepends = [ base conferer hspec hspec-core text ]; description = "conferer's FromConfig instances for hspec Config"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conferer-provider-dhall" = callPackage @@ -59540,26 +59469,6 @@ self: { }) {}; "conferer-source-json" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer - , directory, hspec, text, unordered-containers, vector - }: - mkDerivation { - pname = "conferer-source-json"; - version = "0.4.0.0"; - sha256 = "0dml6xcs3bx3ay1f415k58xdr5xwy2201ibbi2v5lcs9dcb5vnhb"; - libraryHaskellDepends = [ - aeson base bytestring conferer directory text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson aeson-qq base bytestring conferer directory hspec text - unordered-containers vector - ]; - description = "conferer's source for reading json files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "conferer-source-json_0_4_0_1" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer , directory, hspec, text, unordered-containers, vector }: @@ -59577,7 +59486,6 @@ self: { ]; description = "conferer's source for reading json files"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conferer-source-yaml" = callPackage @@ -59598,21 +59506,6 @@ self: { }) {}; "conferer-warp" = callPackage - ({ mkDerivation, base, conferer, hspec, http-types, text, wai, warp - }: - mkDerivation { - pname = "conferer-warp"; - version = "0.4.0.0"; - sha256 = "1xwvk22diwfww82v7q7paq0aqnp5lqqayq4z76lq41zmp1l6nkzc"; - libraryHaskellDepends = [ base conferer http-types text wai warp ]; - testHaskellDepends = [ - base conferer hspec http-types text wai warp - ]; - description = "conferer's FromConfig instances for warp settings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "conferer-warp_0_4_0_1" = callPackage ({ mkDerivation, base, conferer, hspec, http-types, text, wai, warp }: mkDerivation { @@ -59625,7 +59518,6 @@ self: { ]; description = "conferer's FromConfig instances for warp settings"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "confetti" = callPackage @@ -70513,12 +70405,14 @@ self: { }) {}; "derive-lifted-instances" = callPackage - ({ mkDerivation, base, bifunctors, template-haskell }: + ({ mkDerivation, base, bifunctors, reflection, template-haskell }: mkDerivation { pname = "derive-lifted-instances"; - version = "0.1"; - sha256 = "0ybnhz7pxi5i0k8hg9ain1im25hlmz5ra062hpsxyn0imbx3a1vd"; - libraryHaskellDepends = [ base bifunctors template-haskell ]; + version = "0.1.1"; + sha256 = "107nfd2q54whsaagq3wjh43dr0hgncczanw90lyiqirjr4kz07hs"; + libraryHaskellDepends = [ + base bifunctors reflection template-haskell + ]; description = "Derive class instances though various kinds of lifting"; license = stdenv.lib.licenses.asl20; }) {}; @@ -71495,37 +71389,6 @@ self: { }) {}; "dhall-lsp-server" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , data-default, dhall, dhall-json, directory, doctest, filepath - , haskell-lsp, haskell-lsp-types, hslogger, lens, lens-family-core - , lsp-test, megaparsec, mtl, network-uri, optparse-applicative - , prettyprinter, QuickCheck, rope-utf16-splay, tasty, tasty-hspec - , text, transformers, unordered-containers, uri-encode - }: - mkDerivation { - pname = "dhall-lsp-server"; - version = "1.0.7"; - sha256 = "08nyai9y7s8facdjyfxc1z8dp8qd150y5554vxpvfr98xxj5kf41"; - revision = "3"; - editedCabalFile = "1iyad38szy9c6zpfkx37r7d9gl3zzjmiqvnkwfldp48cyr5x2hj9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring containers data-default dhall - dhall-json directory filepath haskell-lsp hslogger lens - lens-family-core megaparsec mtl network-uri prettyprinter - rope-utf16-splay text transformers unordered-containers uri-encode - ]; - executableHaskellDepends = [ base optparse-applicative ]; - testHaskellDepends = [ - base directory doctest filepath haskell-lsp-types lsp-test - QuickCheck tasty tasty-hspec text - ]; - description = "Language Server Protocol (LSP) server for Dhall"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dhall-lsp-server_1_0_8" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , data-default, dhall, dhall-json, directory, doctest, filepath , haskell-lsp, haskell-lsp-types, hslogger, lens, lens-family-core @@ -71552,7 +71415,6 @@ self: { ]; description = "Language Server Protocol (LSP) server for Dhall"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-nix" = callPackage @@ -76160,19 +76022,6 @@ self: { }) {}; "dotgen" = callPackage - ({ mkDerivation, base, containers }: - mkDerivation { - pname = "dotgen"; - version = "0.4.2"; - sha256 = "148q93qsmqgr5pzdwvpjqfd6bdm1pwzcp2rblfwswx2x8c5f43fg"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers ]; - description = "A simple interface for building .dot graph files."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dotgen_0_4_3" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "dotgen"; @@ -76183,7 +76032,6 @@ self: { libraryHaskellDepends = [ base containers ]; description = "A simple interface for building .dot graph files."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dotnet-timespan" = callPackage @@ -93514,26 +93362,6 @@ self: { }) {}; "fused-effects" = callPackage - ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn - , inspection-testing, markdown-unlit, mtl, tasty, tasty-hedgehog - , tasty-hunit, transformers - }: - mkDerivation { - pname = "fused-effects"; - version = "1.0.2.0"; - sha256 = "0dy8m54fm3gndj0bda0savl80w7drj8h113bhbi2439wl3x02y6x"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ - base containers hedgehog hedgehog-fn inspection-testing mtl tasty - tasty-hedgehog tasty-hunit transformers - ]; - testToolDepends = [ markdown-unlit ]; - benchmarkHaskellDepends = [ base gauge ]; - description = "A fast, flexible, fused effect system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fused-effects_1_0_2_2" = callPackage ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn , inspection-testing, markdown-unlit, tasty, tasty-hedgehog , tasty-hunit, transformers @@ -93551,7 +93379,6 @@ self: { benchmarkHaskellDepends = [ base gauge ]; description = "A fast, flexible, fused effect system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fused-effects-exceptions" = callPackage @@ -120168,8 +119995,8 @@ self: { ({ mkDerivation, base, containers, fakedata, hedgehog, random }: mkDerivation { pname = "hedgehog-fakedata"; - version = "0.0.1.1"; - sha256 = "05s48h0cf599x5psllid0szynvqmfgkrv5cymsgy1b5mdnc868aj"; + version = "0.0.1.2"; + sha256 = "1fzvpicpmm39wiyj3phsdigsq3fh8lax9yjq7a28dhy6qiclp3y0"; libraryHaskellDepends = [ base fakedata hedgehog random ]; testHaskellDepends = [ base containers fakedata hedgehog ]; description = "Use 'fakedata' with 'hedgehog'"; @@ -128242,32 +128069,6 @@ self: { }) {}; "hpc-lcov" = callPackage - ({ mkDerivation, aeson, base, containers, hpc, optparse-applicative - , path, path-io, process, tasty, tasty-discover, tasty-golden - , tasty-hunit, text, unordered-containers, yaml - }: - mkDerivation { - pname = "hpc-lcov"; - version = "1.0.0"; - sha256 = "0j2v2dpqj8xrs7z8mn1f71pin1m2arynp8nmai9cd1bqxyrv56a6"; - revision = "1"; - editedCabalFile = "1h73lhmad57xllygx16kqr7q647y0d1m72gxl9d3n0w5hgdrq5sh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers hpc ]; - executableHaskellDepends = [ - aeson base containers hpc optparse-applicative path path-io process - text unordered-containers yaml - ]; - testHaskellDepends = [ - base containers hpc tasty tasty-discover tasty-golden tasty-hunit - ]; - testToolDepends = [ tasty-discover ]; - description = "Convert HPC output into LCOV format"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hpc-lcov_1_0_1" = callPackage ({ mkDerivation, aeson, base, containers, hpc, optparse-applicative , path, path-io, process, tasty, tasty-discover, tasty-golden , tasty-hunit, text, unordered-containers, yaml @@ -128289,7 +128090,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Convert HPC output into LCOV format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpc-strobe" = callPackage @@ -146927,37 +146727,6 @@ self: { }) {}; "json-rpc" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit - , conduit-extra, deepseq, hashable, hspec, monad-logger, mtl - , QuickCheck, stm-conduit, text, time, unliftio - , unordered-containers, vector - }: - mkDerivation { - pname = "json-rpc"; - version = "1.0.2"; - sha256 = "113mclv3dz31chlx5a1py8b1b91jn9lafh8nzpwkf41xv7b757mz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit conduit-extra deepseq - hashable monad-logger mtl QuickCheck stm-conduit text time unliftio - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring conduit conduit-extra monad-logger mtl - QuickCheck stm-conduit text time unliftio unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base bytestring conduit conduit-extra hspec monad-logger mtl - QuickCheck stm-conduit text time unliftio unordered-containers - vector - ]; - description = "Fully-featured JSON-RPC 2.0 library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "json-rpc_1_0_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit , conduit-extra, deepseq, hashable, hspec, monad-logger, mtl , QuickCheck, stm-conduit, text, time, unliftio @@ -146986,7 +146755,6 @@ self: { ]; description = "Fully-featured JSON-RPC 2.0 library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-rpc-client" = callPackage @@ -157108,26 +156876,6 @@ self: { }) {}; "linenoise" = callPackage - ({ mkDerivation, base, bytestring, exceptions, mtl, text - , unliftio-core - }: - mkDerivation { - pname = "linenoise"; - version = "0.3.1"; - sha256 = "1ywz7msb292wzyppb3icy0l144z5mlk0yp8m2yq85ib6w2vzkqv0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring exceptions mtl text unliftio-core - ]; - executableHaskellDepends = [ - base bytestring exceptions mtl text unliftio-core - ]; - description = "A lightweight readline-replacement library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "linenoise_0_3_2" = callPackage ({ mkDerivation, base, bytestring, exceptions, mtl, text , unliftio-core }: @@ -157145,7 +156893,6 @@ self: { ]; description = "A lightweight readline-replacement library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lines-of-action" = callPackage @@ -167325,6 +167072,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "min-max-pqueue_0_1_0_2" = callPackage + ({ mkDerivation, base, containers, criterion, hedgehog + , integer-logarithms, random + }: + mkDerivation { + pname = "min-max-pqueue"; + version = "0.1.0.2"; + sha256 = "0nbvd8w4wj00dbh1zknxqb28wlxi87k3z3snjfqg7zz7j7mvy0jp"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers hedgehog ]; + benchmarkHaskellDepends = [ + base containers criterion integer-logarithms random + ]; + description = "Double-ended priority queues"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "minecraft" = callPackage ({ mkDerivation }: mkDerivation { @@ -188708,8 +188473,8 @@ self: { ({ mkDerivation, base, exceptions, path }: mkDerivation { pname = "path-extensions"; - version = "0.1.0.0"; - sha256 = "0maixixhid0xiqpzjjn3b7mj96xx37wyxayfl1lcp7hj1sz96pwl"; + version = "0.1.0.1"; + sha256 = "1ywirszpmhbq45gbwfvzssy5z06lmlxdhxck7gbjaffyjbkil5va"; libraryHaskellDepends = [ base exceptions path ]; description = "Enumeration of common filetype extensions for use with the path library"; license = stdenv.lib.licenses.bsd3; @@ -198710,7 +198475,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "prettyprinter" = callPackage + "prettyprinter_1_6_1" = callPackage ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring , containers, deepseq, doctest, gauge, mtl, pgp-wordlist , QuickCheck, quickcheck-instances, random, tasty, tasty-hunit @@ -198733,9 +198498,10 @@ self: { ]; description = "A modern, easy to use, well-documented, extensible pretty-printer"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "prettyprinter_1_6_2" = callPackage + "prettyprinter" = callPackage ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring , containers, deepseq, doctest, gauge, mtl, pgp-wordlist , QuickCheck, quickcheck-instances, random, tasty, tasty-hunit @@ -198758,7 +198524,6 @@ self: { ]; description = "A modern, easy to use, well-documented, extensible pretty-printer"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prettyprinter-ansi-terminal" = callPackage @@ -206762,8 +206527,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq text ]; description = "A library for RDF processing in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rdioh" = callPackage @@ -210040,35 +209803,6 @@ self: { }) {}; "registry" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph - , MonadRandom, mtl, multimap, protolude, random, resourcet - , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog - , tasty-th, template-haskell, text, transformers-base, universum - }: - mkDerivation { - pname = "registry"; - version = "0.1.7.1"; - sha256 = "163mkxrd30hxhp4awd05b3qxhqrg18lzl4m9m5r74j82s0yhq7l0"; - libraryHaskellDepends = [ - base containers exceptions hashable mmorph mtl protolude resourcet - semigroupoids semigroups template-haskell text transformers-base - ]; - testHaskellDepends = [ - async base bytestring containers directory exceptions generic-lens - hashable hedgehog io-memoize mmorph MonadRandom mtl multimap - protolude random resourcet semigroupoids semigroups tasty - tasty-discover tasty-hedgehog tasty-th template-haskell text - transformers-base universum - ]; - testToolDepends = [ tasty-discover ]; - description = "data structure for assembling components"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "registry_0_1_9_0" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph , MonadRandom, mtl, multimap, protolude, random, resourcet @@ -211206,21 +210940,6 @@ self: { }) {}; "replace-attoparsec" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, Cabal, parsers, text - }: - mkDerivation { - pname = "replace-attoparsec"; - version = "1.4.0.0"; - sha256 = "1w0dlwfipli94g3fbqh118pmwgyzgrcwp32s60sk7a78cbr5mic4"; - libraryHaskellDepends = [ attoparsec base bytestring text ]; - testHaskellDepends = [ - attoparsec base bytestring Cabal parsers text - ]; - description = "Find, replace, and split string patterns with Attoparsec parsers (instead of regex)"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "replace-attoparsec_1_4_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, parsers, text }: mkDerivation { @@ -211233,22 +210952,9 @@ self: { ]; description = "Find, replace, and split string patterns with Attoparsec parsers (instead of regex)"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "replace-megaparsec" = callPackage - ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }: - mkDerivation { - pname = "replace-megaparsec"; - version = "1.4.1.0"; - sha256 = "0a51fsdmjq3iaamdnwslyrv99psh03qhqk8j0k3ikbjxqj3md3br"; - libraryHaskellDepends = [ base bytestring megaparsec text ]; - testHaskellDepends = [ base bytestring Cabal megaparsec text ]; - description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "replace-megaparsec_1_4_2_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, megaparsec , parser-combinators, text }: @@ -211262,7 +210968,6 @@ self: { testHaskellDepends = [ base bytestring Cabal megaparsec text ]; description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "replica" = callPackage @@ -218780,24 +218485,24 @@ self: { }) {}; "sdr" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, cereal, Chart - , Chart-cairo, colour, containers, criterion, Decimal - , dynamic-graph, fftwRaw, GLFW-b, mwc-random, OpenGL - , optparse-applicative, pango, pipes, pipes-bytestring + ({ mkDerivation, array, base, bytestring, bytestring-to-vector + , cairo, cereal, Chart, Chart-cairo, colour, containers, criterion + , Decimal, dynamic-graph, fftwRaw, GLFW-b, mwc-random, network + , OpenGL, optparse-applicative, pango, pipes, pipes-bytestring , pipes-concurrency, primitive, pulse-simple, QuickCheck, rtlsdr , storable-complex, test-framework, test-framework-quickcheck2 , time, transformers, tuple, vector }: mkDerivation { pname = "sdr"; - version = "0.1.0.12"; - sha256 = "0nikrpcyb5mihc70cfvxy24bl80jjnabc8dc8y056yx54759jkk8"; + version = "0.1.0.13"; + sha256 = "1ip89ddkzzfq2qvpm0ha321hhgx50lphf0s1yd84gw458fsw0ma7"; libraryHaskellDepends = [ - array base bytestring cairo cereal Chart Chart-cairo colour - containers Decimal dynamic-graph fftwRaw GLFW-b mwc-random OpenGL - optparse-applicative pango pipes pipes-bytestring pipes-concurrency - primitive pulse-simple rtlsdr storable-complex time transformers - tuple vector + array base bytestring bytestring-to-vector cairo cereal Chart + Chart-cairo colour containers Decimal dynamic-graph fftwRaw GLFW-b + mwc-random network OpenGL optparse-applicative pango pipes + pipes-bytestring pipes-concurrency primitive pulse-simple rtlsdr + storable-complex time transformers tuple vector ]; testHaskellDepends = [ base primitive QuickCheck storable-complex test-framework @@ -224586,21 +224291,6 @@ self: { }) {}; "shake-plus" = callPackage - ({ mkDerivation, base, comonad, extra, hashable, path, rio, shake - , within - }: - mkDerivation { - pname = "shake-plus"; - version = "0.1.6.0"; - sha256 = "0121lbjfsq0ira5nrz83v2lvm1225m9m806x9rrg2kq9j7nj1zab"; - libraryHaskellDepends = [ - base comonad extra hashable path rio shake within - ]; - description = "Re-export of Shake using well-typed paths and ReaderT"; - license = stdenv.lib.licenses.mit; - }) {}; - - "shake-plus_0_1_7_0" = callPackage ({ mkDerivation, base, comonad, extra, hashable, path, rio, shake , within }: @@ -224613,7 +224303,6 @@ self: { ]; description = "Re-export of Shake using well-typed paths and ReaderT"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shakebook" = callPackage @@ -224688,31 +224377,6 @@ self: { }) {}; "shakespeare" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec - , process, scientific, template-haskell, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; - version = "2.0.24"; - sha256 = "1fpkq5av7xyffsgghj5b85i8pzpnmkfcyjawhfm5lyhqpq1g5wh3"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process scientific template-haskell text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - description = "A toolkit for making compile-time interpolated templates"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "shakespeare_2_0_24_1" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec , process, scientific, template-haskell, text, th-lift, time @@ -224734,7 +224398,6 @@ self: { ]; description = "A toolkit for making compile-time interpolated templates"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -226244,17 +225907,6 @@ self: { }) {}; "simple-cmd" = callPackage - ({ mkDerivation, base, directory, filepath, process, unix }: - mkDerivation { - pname = "simple-cmd"; - version = "0.2.1"; - sha256 = "1b35hsxr63n3nbpjdf7ailsmp4yk6k8nscx8xxv453v0r3v89hss"; - libraryHaskellDepends = [ base directory filepath process unix ]; - description = "Simple String-based process commands"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-cmd_0_2_2" = callPackage ({ mkDerivation, base, directory, extra, filepath, process, unix }: mkDerivation { pname = "simple-cmd"; @@ -226265,7 +225917,6 @@ self: { ]; description = "Simple String-based process commands"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-cmd-args" = callPackage @@ -228036,23 +227687,6 @@ self: { }) {}; "skylighting" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , skylighting-core - }: - mkDerivation { - pname = "skylighting"; - version = "0.8.4"; - sha256 = "08fy9c3ms6xwzxispgksf1cji9mvcyy8swaj3dwvc2dc66h06xky"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers skylighting-core - ]; - description = "syntax highlighting library"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "skylighting_0_8_5" = callPackage ({ mkDerivation, base, binary, bytestring, containers , skylighting-core }: @@ -228067,42 +227701,9 @@ self: { ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting-core" = callPackage - ({ mkDerivation, aeson, ansi-terminal, attoparsec, base - , base64-bytestring, binary, blaze-html, bytestring - , case-insensitive, colour, containers, criterion, Diff, directory - , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random - , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, text, transformers, utf8-string - }: - mkDerivation { - pname = "skylighting-core"; - version = "0.8.4"; - sha256 = "0wyhiark5d1r1hi04xiq14ykikr9yd4dmzqbr7qswl05b0bk7gam"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal attoparsec base base64-bytestring binary - blaze-html bytestring case-insensitive colour containers directory - filepath hxt mtl regex-pcre-builtin safe text transformers - utf8-string - ]; - testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath HUnit - pretty-show QuickCheck random tasty tasty-golden tasty-hunit - tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ - base containers criterion directory filepath text - ]; - description = "syntax highlighting library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "skylighting-core_0_8_5" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -228132,7 +227733,6 @@ self: { ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting-extensions" = callPackage @@ -232220,28 +231820,6 @@ self: { }) {}; "sparse-tensor" = callPackage - ({ mkDerivation, ad, base, bytestring, Cabal, cereal, containers - , deepseq, ghc-typelits-knownnat, ghc-typelits-natnormalise - , hmatrix, parallel, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, tf-random, zlib - }: - mkDerivation { - pname = "sparse-tensor"; - version = "0.2.1.3"; - sha256 = "1fcckwp9k3ky669ai62x26pgz0irir4ngk0m6g1659fsn3f2gdc8"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - ad base bytestring cereal containers deepseq ghc-typelits-knownnat - ghc-typelits-natnormalise hmatrix parallel tf-random zlib - ]; - testHaskellDepends = [ - base hmatrix QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "typesafe tensor algebra library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "sparse-tensor_0_2_1_4" = callPackage ({ mkDerivation, ad, base, bytestring, Cabal, cereal, containers , deepseq, ghc-typelits-knownnat, ghc-typelits-natnormalise , hmatrix, parallel, QuickCheck, tasty, tasty-hunit @@ -232261,7 +231839,6 @@ self: { ]; description = "typesafe tensor algebra library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sparsebit" = callPackage @@ -260620,17 +260197,6 @@ self: { }) {}; "validity-containers" = callPackage - ({ mkDerivation, base, containers, validity }: - mkDerivation { - pname = "validity-containers"; - version = "0.5.0.3"; - sha256 = "064sd52y3cmfz9j1yhfz6wsm3993mnh9xgyzy6jzd4cdfmh19sdd"; - libraryHaskellDepends = [ base containers validity ]; - description = "Validity instances for containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-containers_0_5_0_4" = callPackage ({ mkDerivation, base, containers, validity }: mkDerivation { pname = "validity-containers"; @@ -260639,7 +260205,6 @@ self: { libraryHaskellDepends = [ base containers validity ]; description = "Validity instances for containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-path" = callPackage @@ -265172,6 +264737,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp_3_3_13" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, gauge + , ghc-prim, hashable, hspec, http-client, http-date, http-types + , http2, HUnit, iproute, lifted-base, network, process, QuickCheck + , simple-sendfile, stm, streaming-commons, text, time, time-manager + , unix, unix-compat, vault, wai, word8, x509 + }: + mkDerivation { + pname = "warp"; + version = "3.3.13"; + sha256 = "1yqgfx7bsjk97dxcrqwddfhi8mdw0q6cbgs5abaxqjlxh3rhihdx"; + libraryHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + time-manager unix unix-compat vault wai word8 x509 + ]; + testHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory ghc-prim hashable hspec + http-client http-date http-types http2 HUnit iproute lifted-base + network process QuickCheck simple-sendfile stm streaming-commons + text time time-manager unix unix-compat vault wai word8 x509 + ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network time-manager unix unix-compat x509 + ]; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -265258,6 +264857,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp-tls_3_3_0" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, data-default-class + , network, streaming-commons, tls, tls-session-manager, wai, warp + }: + mkDerivation { + pname = "warp-tls"; + version = "3.3.0"; + sha256 = "03fwwggl6lhxs7swwylgpk9j8g5szq2h871nfbgs6xzr1b5hpas1"; + libraryHaskellDepends = [ + base bytestring cryptonite data-default-class network + streaming-commons tls tls-session-manager wai warp + ]; + description = "HTTP over TLS support for Warp via the TLS package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-tls-uid" = callPackage ({ mkDerivation, base, bytestring, data-default, network , streaming-commons, tls, unix, wai, warp, warp-tls, x509 From 8ffed9635932627ab17e0d177eacab5ce75b68a2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Jun 2020 10:39:36 +0200 Subject: [PATCH 2554/3452] all-cabal-hashes: update to Hackage at 2020-06-25T08:18:20Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index fa4cdf15d9e5..b269042fd06b 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/65a280e01c4f90470959f0423a5450d2831f845a.tar.gz"; - sha256 = "0m5zg7hswch702gprlfsjmp2xk6hs828c1489d1c85w9kxiyqkdq"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/711b59b900ee0b267ebb86e41dbc83ad7fb69629.tar.gz"; + sha256 = "0vfg5pilhqi59826iciz15bmylhfdlxmmkps7samzbilsf21j0sy"; } From b8b74435181a144d14f0c3a5168f9b0c143eeaef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Jun 2020 10:42:25 +0200 Subject: [PATCH 2555/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-5-g7c30584 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/711b59b900ee0b267ebb86e41dbc83ad7fb69629. --- pkgs/development/haskell-modules/hackage-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ea0ca92132b8..7c8ad01277b4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -120915,6 +120915,7 @@ self: { doHaddock = false; description = "Runs Continuous Integration tasks on your machines"; license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;}; "hercules-ci-api-agent" = callPackage @@ -120945,6 +120946,7 @@ self: { ]; description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise"; license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {}; "hercules-ci-api-core" = callPackage @@ -120967,6 +120969,7 @@ self: { ]; description = "Types and convenience modules use across Hercules CI API packages"; license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {}; "here" = callPackage From 913724e47ca73642dd0b62d31f53612fbe45aa31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 25 Jun 2020 10:41:16 +0200 Subject: [PATCH 2556/3452] haskell-repline: update override for ghc-8.10.x to the latest version --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index cdc366335638..2f962c249fc4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -87,7 +87,7 @@ self: super: { # Use the latest version to fix the build. lens = self.lens_4_19_2; optics-core = self.optics-core_0_3; - repline = self.repline_0_3_0_0; + repline = self.repline_0_4_0_0; singletons = self.singletons_2_7; th-desugar = self.th-desugar_1_11; From 0d0906d42b00bcfe157d52ebd908a43a364b67e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 25 Jun 2020 08:58:02 +0000 Subject: [PATCH 2557/3452] 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 6b529db3295b6abd92ba7876ca8ae7974dd818b2 Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Wed, 24 Jun 2020 14:56:34 +0300 Subject: [PATCH 2558/3452] xow: 0.4 -> 0.5 --- pkgs/misc/drivers/xow/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/xow/default.nix b/pkgs/misc/drivers/xow/default.nix index 8702c480457d..785f7f396e9d 100644 --- a/pkgs/misc/drivers/xow/default.nix +++ b/pkgs/misc/drivers/xow/default.nix @@ -1,14 +1,19 @@ -{ stdenv, fetchFromGitHub, libusb1 }: +{ stdenv, cabextract, fetchurl, fetchFromGitHub, libusb1 }: stdenv.mkDerivation rec { pname = "xow"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "medusalix"; repo = "xow"; rev = "v${version}"; - sha256 = "1xkwcx2gqip9v2h3zjmrn7sgcck3midl5alhsmr3zivgdipamynv"; + sha256 = "071r2kx44k1sc49cad3i607xg618mf34ki1ykr5lnfx9y6qyz075"; + }; + + firmware = fetchurl { + url = "http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab"; + sha256 = "013g1zngxffavqrk5jy934q3bdhsv6z05ilfixdn8dj0zy26lwv5"; }; makeFlags = [ @@ -20,7 +25,14 @@ stdenv.mkDerivation rec { "MODPDIR=${placeholder ''out''}/lib/modprobe.d" "SYSDDIR=${placeholder ''out''}/lib/systemd/system" ]; + + postUnpack = '' + cabextract -F FW_ACC_00U.bin ${firmware} + mv FW_ACC_00U.bin source/firmware.bin + ''; + enableParallelBuilding = true; + nativeBuildInputs = [ cabextract ]; buildInputs = [ libusb1 ]; meta = with stdenv.lib; { 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 2559/3452] 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 2560/3452] 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 2561/3452] 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 218c8509c6ce25945c2c253d15e9542033d4de44 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Thu, 25 Jun 2020 12:48:33 +0200 Subject: [PATCH 2562/3452] trytond: 4.8.4 -> 5.6.2 --- pkgs/applications/office/trytond/default.nix | 34 ++++++++++++-------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix index c45562a0c8dd..15d5fa6748ac 100644 --- a/pkgs/applications/office/trytond/default.nix +++ b/pkgs/applications/office/trytond/default.nix @@ -1,40 +1,48 @@ -{ stdenv, python2Packages -, withPostgresql ? true }: +{ stdenv +, python3Packages +, withPostgresql ? true +}: with stdenv.lib; -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "trytond"; - version = "4.8.4"; - src = python2Packages.fetchPypi { + version = "5.6.2"; + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1935045b1b4674de602b4279a9cfd0a14431624a28ccb490234cffecb81fbca7"; + sha256 = "0mlfl34zmmqrwip39mvhkk0h6dsljqwff2mk1ldahm253d4vzflp"; }; # Tells the tests which database to use DB_NAME = ":memory:"; - buildInputs = with python2Packages; [ + buildInputs = with python3Packages; [ mock ]; - propagatedBuildInputs = with python2Packages; ([ - dateutil + propagatedBuildInputs = with python3Packages; [ lxml + relatorio + genshi + dateutil polib python-sql - relatorio werkzeug wrapt - ipaddress + passlib # extra dependencies bcrypt pydot python-Levenshtein simplejson - cdecimal html2text - ] ++ stdenv.lib.optional withPostgresql psycopg2); + ] ++ stdenv.lib.optional withPostgresql psycopg2; + + # If unset, trytond will try to mkdir /homeless-shelter + preCheck = '' + export HOME=$(mktemp -d) + ''; + meta = { description = "The server of the Tryton application platform"; longDescription = '' 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 2563/3452] 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 2564/3452] 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 2565/3452] 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 2566/3452] 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 2567/3452] 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 a38f442552f5de71e338fbc9ba269dab336bcb1a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 22:44:49 +0000 Subject: [PATCH 2568/3452] mtxclient: 0.3.0 -> 0.3.1 --- pkgs/development/libraries/mtxclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 22b664423055..842d144005d7 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "0vf5xmn6yfi5lvskfgrdmnalvclzrapcrml92bj9qaa8vq8mfsf2"; + sha256 = "1dg4dq20g0ah62j5s3gpsxqq4ny7lxkxdxa9q6g54hdwkrb9ms7x"; }; cmakeFlags = [ From dcd48593e845c1565251ca9fd2aa43891f2b3748 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 25 Jun 2020 06:02:59 -0700 Subject: [PATCH 2569/3452] 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 b79c4eca5c5e40f80914a06dd4bf8296ab566c23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Thu, 25 Jun 2020 15:36:07 +0200 Subject: [PATCH 2570/3452] pythonPackages.progressbar2: Fix checkPhase --- pkgs/development/python-modules/progressbar2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index a7671d0356a7..f93669731dd7 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -29,10 +29,10 @@ buildPythonPackage rec { pytest sphinx flake8 pytestpep8 pytest-flakes pytestcov pytestcache freezegun ]; - # ignore tests on the nix wrapped setup.py and don't flake .eggs directory + # ignore tests on the nix wrapped setup.py checkPhase = '' runHook preCheck - ${python.interpreter} setup.py test --addopts "--ignore=.eggs" + ${python.interpreter} setup.py test runHook postCheck ''; @@ -40,6 +40,6 @@ buildPythonPackage rec { homepage = "https://progressbar-2.readthedocs.io/en/latest/"; description = "Text progressbar library for python"; license = licenses.bsd3; - maintainers = with maintainers; [ ashgillman ]; + maintainers = with maintainers; [ ashgillman turion ]; }; } From 1d805c99bd3af1d3b476cba99c2819aceb8aaca4 Mon Sep 17 00:00:00 2001 From: Christian Kauhaus Date: Thu, 25 Jun 2020 15:41:31 +0200 Subject: [PATCH 2571/3452] 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 2572/3452] 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 2573/3452] 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 2574/3452] 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 16c918438d2fe1c732dfeb0d7fd4f77a33904b04 Mon Sep 17 00:00:00 2001 From: Conrad Mearns Date: Thu, 25 Jun 2020 17:05:27 +0200 Subject: [PATCH 2575/3452] obsidian: fix license to use Obsidian EULA --- pkgs/applications/misc/obsidian/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 76e4e9b2b336..747c3fb5a0b2 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -22,7 +22,7 @@ appimageTools.wrapType2 rec { meta = with lib; { description = "Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files."; homepage = "https://obsidian.md"; - license = licenses.mit; + license = licenses.obsidian; maintainers = with maintainers; [ conradmearns ]; platforms = [ "x86_64-linux" ]; }; From 8a3547afe972bffd6bb912bc22940bc8bfa80b12 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Thu, 25 Jun 2020 11:01:07 -0400 Subject: [PATCH 2576/3452] 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 1e5b480e8b9e925e4a6e72c4365f1ae5653c8265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 25 Jun 2020 17:23:04 +0200 Subject: [PATCH 2577/3452] maturin: 0.8.0 -> 0.8.1 - Supports `sdist-include = ["path/**/*"]` to include arbitrary files in source distributions - Fixes Cargo.lock - Updates some dependencies --- .../development/tools/rust/maturin/Cargo.lock.patch | 13 ------------- pkgs/development/tools/rust/maturin/default.nix | 11 +++-------- 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 pkgs/development/tools/rust/maturin/Cargo.lock.patch diff --git a/pkgs/development/tools/rust/maturin/Cargo.lock.patch b/pkgs/development/tools/rust/maturin/Cargo.lock.patch deleted file mode 100644 index 9f7d46d4901f..000000000000 --- a/pkgs/development/tools/rust/maturin/Cargo.lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 09ecb81..c37c646 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -733,7 +733,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "maturin" --version = "0.8.0-beta.1" -+version = "0.8.0" - dependencies = [ - "base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index e4ee97d02427..72b22dba1043 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -5,21 +5,16 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "1fjai0c0j8zzaj4c186dkbvx6cpj0vi3sc1qbjbgn2cm8azsd6m6"; + sha256 = "16bxxa261k2l6mpdd55gyzl1mx756i0zbvqp15glpzlcwhb9bm2m"; }; - # The maturin 0.8.0 lockfile has an incorrect version for maturin - # itself. The upstream lockfiles are normally correct, so this - # should be removed post-0.8.0. - cargoPatches = [ ./Cargo.lock.patch ]; - - cargoSha256 = "01sh523fi46k5xwdslhnmjz128jkdw47gp9bd8gim3ay13zkcn1i"; + cargoSha256 = "1s1brfnhwl42jb37qqz4d8mxpyq2ck60jnmjfllkga3mhwm4r8px"; nativeBuildInputs = [ pkgconfig ]; From 929581c2d32f884822b85d63477c26c3902e0074 Mon Sep 17 00:00:00 2001 From: Conrad Mearns Date: Thu, 25 Jun 2020 17:59:43 +0200 Subject: [PATCH 2578/3452] obsidian: strip version number from binary name --- pkgs/applications/misc/obsidian/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 747c3fb5a0b2..b307112814e4 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -19,6 +19,9 @@ appimageTools.wrapType2 rec { export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ''; + # Strip version from binary name. + extraInstallCommands = "mv $out/bin/${name} $out/bin/${pname}"; + meta = with lib; { description = "Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files."; homepage = "https://obsidian.md"; From 30e812c6c09e1b971dc902399f3dc39d542d89d9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 25 Jun 2020 18:27:57 +0200 Subject: [PATCH 2579/3452] 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 fc120e64369e190b864b816bb46b7e8932aea163 Mon Sep 17 00:00:00 2001 From: Conrad Mearns Date: Thu, 25 Jun 2020 18:33:11 +0200 Subject: [PATCH 2580/3452] obsidian: fix version stripping --- pkgs/applications/misc/obsidian/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index b307112814e4..396a78451128 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -20,7 +20,7 @@ appimageTools.wrapType2 rec { ''; # Strip version from binary name. - extraInstallCommands = "mv $out/bin/${name} $out/bin/${pname}"; + extraInstallCommands = "mv $out/bin/{${name},${pname}}"; meta = with lib; { description = "Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files."; From 5018491e059bae7367263915528a05587b442c15 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Wed, 24 Jun 2020 15:43:54 -0400 Subject: [PATCH 2581/3452] haskellPackages: remove obsolete overrides esqueleto: -dontHaddock blank-canvas: -dontCheck tdigest: -doJailbreak --- .../haskell-modules/configuration-common.nix | 12 ++---------- .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 809e1076effa..bda8caee2ee7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1063,10 +1063,6 @@ self: super: { sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j"; }); - # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73 - blank-canvas = dontCheck super.blank-canvas; - blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2; - # needed because of testing-feat >=0.4.0.2 && <1.1 language-ecmascript = doJailbreak super.language-ecmascript; @@ -1108,7 +1104,7 @@ self: super: { # https://github.com/danfran/cabal-macosx/issues/13 cabal-macosx = dontCheck super.cabal-macosx; - # https://github.com/DanielG/cabal-helper/issues/59 + # https://github.com/DanielG/cabal-helper/pull/123 cabal-helper = doJailbreak super.cabal-helper; # TODO(Profpatsch): factor out local nix store setup from @@ -1128,9 +1124,6 @@ self: super: { # https://github.com/mgajda/json-autotype/issues/25 json-autotype = dontCheck super.json-autotype; - # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 - tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1 - # Requires pg_ctl command during tests beam-postgres = overrideCabal super.beam-postgres (drv: { testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql]; @@ -1161,8 +1154,7 @@ self: super: { xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch; # Some tests depend on a postgresql instance - # Haddock failure: https://github.com/haskell/haddock/issues/979 - esqueleto = dontHaddock (dontCheck super.esqueleto); + esqueleto = dontCheck super.esqueleto; # Requires API keys to run tests algolia = dontCheck super.algolia; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 4d1c4e6058db..f756b612eac3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2548,7 +2548,6 @@ extra-packages: - apply-refact == 0.8.0.0 # works with GHC 8.10.x https://hackage.haskell.org/package/apply-refact/changelog - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - - blank-canvas < 0.6.3 # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.* - Cabal == 2.2.* # required for jailbreak-cabal etc. - Cabal == 2.4.* # required for cabal-install etc. - colour < 2.3.4 # newer versions don't support GHC 7.10.x From 228cd7fbd70d1ad6c17f18273d6e25385fa14c76 Mon Sep 17 00:00:00 2001 From: Tim Zook Date: Wed, 24 Jun 2020 17:47:58 -0500 Subject: [PATCH 2582/3452] 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 8418b3c5a43e38a3d641e9e8a4ccbc50fdd9d519 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Wed, 24 Jun 2020 16:41:23 -0400 Subject: [PATCH 2583/3452] haskellPackages: remove obsolete overrides classy-prelude-yesod: -dontHaddock rank2classes: -dontCheck HaTeX: -dontCheck --- pkgs/development/haskell-modules/configuration-common.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 809e1076effa..c1d3f056046f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -126,7 +126,6 @@ self: super: { feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1 hoodle-core = dontHaddock super.hoodle-core; hsc3-db = dontHaddock super.hsc3-db; - classy-prelude-yesod = dontHaddock super.classy-prelude-yesod; # https://github.com/haskell/haddock/issues/979 # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; @@ -1212,9 +1211,6 @@ self: super: { # https://github.com/erikd/hjsmin/issues/32 hjsmin = dontCheck super.hjsmin; - # https://github.com/blamario/grampa/issues/19 - rank2classes = dontCheck super.rank2classes; - nix-tools = super.nix-tools.overrideScope (self: super: { # Needs https://github.com/peti/hackage-db/pull/9 hackage-db = super.hackage-db.overrideAttrs (old: { @@ -1251,9 +1247,6 @@ self: super: { ]; }); - # https://github.com/Daniel-Diaz/HaTeX/issues/144 - HaTeX = dontCheck super.HaTeX; - # https://github.com/kazu-yamamoto/dns/issues/150 dns = dontCheck super.dns; From cb605536649739792282663e7a4645361b2bb924 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 25 Jun 2020 10:18:25 -0700 Subject: [PATCH 2584/3452] 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 2585/3452] 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; From d1ba7a4b2735404578dbfd02429479f3df32a8c5 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 6 Jun 2020 13:34:35 +0300 Subject: [PATCH 2586/3452] martin: init at 0.5.0 --- pkgs/servers/martin/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/servers/martin/default.nix diff --git a/pkgs/servers/martin/default.nix b/pkgs/servers/martin/default.nix new file mode 100644 index 000000000000..2c506dca6af5 --- /dev/null +++ b/pkgs/servers/martin/default.nix @@ -0,0 +1,27 @@ +{ stdenv, rustPlatform, fetchFromGitHub, Security }: + +rustPlatform.buildRustPackage rec { + pname = "martin"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "urbica"; + repo = pname; + rev = "v${version}"; + sha256 = "1i9zhmjkgid4s90n52wqmrl3lwswcaxd6d47ssycgjl1nv0jla4k"; + }; + + cargoSha256 = "08rr783qvpm1q7s60k7mh3k5npf0lg5s1x74lnxcxdgrlgpn5gcf"; + + buildInputs = with stdenv; lib.optional isDarwin Security; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Blazing fast and lightweight PostGIS vector tiles server"; + homepage = "https://martin.urbica.co/"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 645da5b25132..d36b8cbbbcd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4708,6 +4708,10 @@ in makebootfat = callPackage ../tools/misc/makebootfat { }; + martin = callPackage ../servers/martin { + inherit (darwin.apple_sdk.frameworks) Security; + }; + /* Python 3.8 is currently broken with matrix-synapse since `python38Packages.bleach` fails (https://github.com/NixOS/nixpkgs/issues/76093) */ matrix-synapse = callPackage ../servers/matrix-synapse { /*python3 = python38;*/ }; From 37238ff716b070205dc955454f24b37b0f620397 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Jun 2020 23:08:25 -0700 Subject: [PATCH 2587/3452] lutris-unwrapped: 0.5.5 -> 0.5.6, fix dialouge crashing bug would crash with: ``` GLib-GIO-ERROR **: 06:04:50.903: No GSettings schemas are installed on the system ``` if a dialouge box would open. --- pkgs/applications/misc/lutris/default.nix | 79 +++++++++++++++++++---- 1 file changed, 65 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 2ff2a82dd4fb..fccb6ef49a9a 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -1,9 +1,42 @@ { buildPythonApplication, lib, fetchFromGitHub, fetchpatch -, wrapGAppsHook, gobject-introspection, glib-networking, gnome-desktop, libnotify, libgnome-keyring, pango -, gdk-pixbuf, atk, webkitgtk, gst_all_1 -, dbus-python, evdev, pyyaml, pygobject3, requests, pillow -, xrandr, pciutils, psmisc, glxinfo, vulkan-tools, xboxdrv, pulseaudio, p7zip, xgamma -, libstrangle, wine, fluidsynth, xorgserver + +# build inputs +, atk +, gdk-pixbuf +, glib-networking +, gnome-desktop +, gobject-introspection +, gst_all_1 +, gtk3 +, libgnome-keyring +, libnotify +, pango +, webkitgtk +, wrapGAppsHook + +# python dependencies +, dbus-python +, distro +, evdev +, pillow +, pygobject3 +, pyyaml +, requests + +# commands that lutris needs +, xrandr +, pciutils +, psmisc +, glxinfo +, vulkan-tools +, xboxdrv +, pulseaudio +, p7zip +, xgamma +, libstrangle +, wine +, fluidsynth +, xorgserver }: let @@ -25,34 +58,52 @@ let ]; gstDeps = with gst_all_1; [ - gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer ]; in buildPythonApplication rec { pname = "lutris-original"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - sha256 = "1g093g0difnkjmnm91p20issdsxn9ri4c56zzddj5wfrbmhwdfag"; + sha256 = "1f78qhyy8xqdg0rhxcwkap1bmg5mfxhb8qw1vbpxr6g62ajpwksa"; }; nativeBuildInputs = [ wrapGAppsHook ]; buildInputs = [ - gobject-introspection glib-networking gnome-desktop libnotify libgnome-keyring pango - gdk-pixbuf atk webkitgtk + atk + gdk-pixbuf + glib-networking + gnome-desktop + gobject-introspection + gtk3 + libgnome-keyring + libnotify + pango + webkitgtk ] ++ gstDeps; - makeWrapperArgs = [ - "--prefix PATH : ${binPath}" + propagatedBuildInputs = [ + evdev distro pyyaml pygobject3 requests pillow dbus-python ]; - propagatedBuildInputs = [ - evdev pyyaml pygobject3 requests pillow dbus-python + # avoid double wrapping + dontWrapGApps = true; + makeWrapperArgs = [ + "--prefix PATH : ${binPath}" + ''''${gappsWrapperArgs[@]}'' ]; + # needed for glib-schemas to work correctly (will crash on dialogues otherwise) + # see https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; preCheck = "export HOME=$PWD"; From 16e15a2821cfb6a2c1ae3953decb98fc735f0bed Mon Sep 17 00:00:00 2001 From: Tim Neumann Date: Tue, 28 Jan 2020 10:36:19 +0100 Subject: [PATCH 2588/3452] eclipse: add eclipse-committers --- pkgs/applications/editors/eclipse/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 49fb00706b76..87ac29b58e94 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -99,6 +99,18 @@ in rec { }; }; + ### Eclipse Committers + + eclipse-committers = buildEclipse { + name = "eclipse-committers-${platform_major}.${platform_minor}"; + description = "Eclipse IDE for Eclipse Committers and Eclipse Platform Plugin Developers"; + src = + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; + sha512 = "1l0gc7srpvn3r0yrbrp1pjv1a3n1y7q5fqww5fmzyw1d6j3hjkqj74c9bff16579cpf7z6d4wmj6kr7z89p0ignrx319gc8p0hivi1y"; + }; + }; + ### Environments # Function that assembles a complete Eclipse environment from an From 55da2e32d3a31bd781f9778d41aa48645f5a7568 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Wed, 24 Jun 2020 17:11:27 -0400 Subject: [PATCH 2589/3452] haskellPackages: remove obsolete overrides euler: -dontCheck snappy-framing: -dontHaddock vector: -dontCheck --- pkgs/development/haskell-modules/configuration-common.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bda8caee2ee7..9a2605a14f48 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -132,8 +132,7 @@ self: super: { ABList = dontCheck super.ABList; # sse2 flag due to https://github.com/haskell/vector/issues/47. - # dontCheck due to https://github.com/haskell/vector/issues/138 - vector = dontCheck (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector); + vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector; conduit-extra = if pkgs.stdenv.isDarwin then super.conduit-extra.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; }) @@ -186,7 +185,6 @@ self: super: { # These packages try to execute non-existent external programs. cmaes = dontCheck super.cmaes; # http://hydra.cryp.to/build/498725/log/raw dbmigrations = dontCheck super.dbmigrations; - euler = dontCheck super.euler; # https://github.com/decomputed/euler/issues/1 filestore = dontCheck super.filestore; getopt-generics = dontCheck super.getopt-generics; graceful = dontCheck super.graceful; @@ -391,9 +389,6 @@ self: super: { # https://github.com/bos/snappy/issues/1 snappy = dontCheck super.snappy; - # https://github.com/kim/snappy-framing/issues/3 - snappy-framing = dontHaddock super.snappy-framing; - # https://ghc.haskell.org/trac/ghc/ticket/9625 vty = dontCheck super.vty; From af064a0e12ad8e5a8a2e8d8ad25fc0baf3f8ef54 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 25 Jun 2020 21:21:28 +0200 Subject: [PATCH 2590/3452] php7{2,3}: fix darwin build * Backported patches from `php-7.4` which fixes the env for all `gettext` and `zlib` tests. * Setting `--with-libxml-dir` is still needed for versions 7.2 and 7.3. --- pkgs/development/interpreters/php/default.nix | 10 +++-- .../interpreters/php/zlib-darwin-tests.patch | 44 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 10 +++++ 3 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/interpreters/php/zlib-darwin-tests.patch diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 78a3e91179f9..b930e54fa4cf 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -8,7 +8,7 @@ let { callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool , pkgconfig, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 - , systemd, valgrind + , systemd, valgrind, xcbuild , version , sha256 @@ -143,7 +143,8 @@ let enableParallelBuilding = true; - nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ]; + nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ] + ++ lib.optional stdenv.isDarwin xcbuild; buildInputs = # PCRE extension @@ -177,7 +178,10 @@ let ++ lib.optional (!cliSupport) "--disable-cli" ++ lib.optional fpmSupport "--enable-fpm" ++ lib.optional pearSupport [ "--with-pear=$(out)/lib/php/pear" "--enable-xml" "--with-libxml" ] - ++ lib.optional (pearSupport && (lib.versionOlder version "7.4")) "--enable-libxml" + ++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [ + "--enable-libxml" + "--with-libxml-dir=${libxml2.dev}" + ] ++ lib.optional pharSupport "--enable-phar" ++ lib.optional phpdbgSupport "--enable-phpdbg" diff --git a/pkgs/development/interpreters/php/zlib-darwin-tests.patch b/pkgs/development/interpreters/php/zlib-darwin-tests.patch new file mode 100644 index 000000000000..ef61f0a87845 --- /dev/null +++ b/pkgs/development/interpreters/php/zlib-darwin-tests.patch @@ -0,0 +1,44 @@ +diff --git a/ext/zlib/tests/bug55544.phpt b/ext/zlib/tests/bug55544.phpt +index a0d22f4fcebf4846da6781f424f87821626de5ea..e650fe6909f555d04834f4c08f7fd0d354b783e2 100644 +--- a/ext/zlib/tests/bug55544.phpt ++++ b/ext/zlib/tests/bug55544.phpt +@@ -6,6 +6,9 @@ extension_loaded("zlib") or die("skip"); + if (substr(PHP_OS, 0, 3) == 'WIN') { + die("skip not for windows"); + } ++if (PHP_OS == "Darwin") { ++ die("skip not for darwin"); ++} + ?> + --INI-- + output_handler=ob_gzhandler +diff --git a/ext/zlib/tests/gzencode_variation1.phpt b/ext/zlib/tests/gzencode_variation1.phpt +index c966b2cbc5b7..2f953168fa22 100644 +--- a/ext/zlib/tests/gzencode_variation1.phpt ++++ b/ext/zlib/tests/gzencode_variation1.phpt +@@ -10,6 +10,10 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) { + if (!extension_loaded("zlib")) { + print "skip - ZLIB extension not loaded"; + } ++ ++if (PHP_OS == "Darwin") { ++ print "skip - OS is encoded in headers, tested header is non Darwin"; ++} + ?> + --FILE-- + + --FILE-- + Date: Wed, 24 Jun 2020 10:22:09 +0200 Subject: [PATCH 2591/3452] processing: 3.5.3 -> 3.5.4 --- pkgs/applications/graphics/processing/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index cad6a35ce3f6..de5ae4fcbfd3 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "processing"; - version = "3.5.3"; + version = "3.5.4"; src = fetchFromGitHub { owner = "processing"; repo = "processing"; - rev = "processing-0269-${version}"; - sha256 = "0ajniy3a0i0rx7is46r85yh3ah4zm4ra1gbllmihw9pmnfjgfajn"; + rev = "processing-0270-${version}"; + sha256 = "0cvv8jda9y8qnfcsziasyv3w7h3w22q78ihr23cm4an63ghxci58"; }; nativeBuildInputs = [ ant rsync makeWrapper ]; @@ -22,8 +22,10 @@ stdenv.mkDerivation rec { # do not download a file during build ${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml install -D -m0444 ${fetchurl { - url = "http://download.processing.org/reference.zip"; - sha256 = "198bpk8mzns6w5h0zdf50wr6iv7sgdi6v7jznj5rbsnpgyilxz35"; + # Use archive.org link for reproducibility until the following issue is fixed: + # https://github.com/processing/processing/issues/5711 + url = "https://web.archive.org/web/20200406132357/https://download.processing.org/reference.zip"; + sha256 = "093hc7kc9wfxqgf5dzfmfp68pbsy8x647cj0a25vgjm1swi61zbi"; } } ./java/reference.zip From 3a0933a030decfc053b612a6a0d4a4ccc0c5f5da Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 25 Jun 2020 23:22:21 +0200 Subject: [PATCH 2592/3452] =?UTF-8?q?ocamlPackages.{ipaddr,macaddr}:=203.1?= =?UTF-8?q?.0=20=E2=86=92=205.0.0=20and=20update=20all=20affected=20packag?= =?UTF-8?q?es=20(tuntap,=20conduit,=20cohttp,=20=E2=80=A6)=20(#91350)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ocamlPackages.{ipaddr,macaddr}: 3.1.0 → 5.0.0 * ipaddr-cstruct: new package (since 4.0.0) * ipaddr-sexp: new package (since 4.0.0) * macaddr-cstruct: new package (since 4.0.0) * macaddr-sexp: new package (since 4.0.0) * macaddr: enable tests (don't depend on ipaddr anymore) * ocamlPackages.tuntap: 1.3.0 → 2.0.0 * ocamlPackages.conduit{,-lwt,-lwt-unix}: 1.4.0 → 2.2.2 * ocamlPackages.cohttp{,-lwt,-lwt-unix}: 2.1.3 → 2.5.1 * ocamlPackages: use dune 2 if pkg (indirectly) depends on cohttp-lwt-unix dune refuses to build a package if one of its dependencies uses dune 2. --- .../ocaml-modules/cohttp/default.nix | 20 ++++++------- .../ocaml-modules/cohttp/lwt-unix.nix | 2 ++ pkgs/development/ocaml-modules/cohttp/lwt.nix | 2 ++ .../ocaml-modules/conduit/default.nix | 22 +++++++-------- .../ocaml-modules/conduit/lwt-unix.nix | 20 +++++++------ .../development/ocaml-modules/conduit/lwt.nix | 14 +++++----- .../ocaml-modules/curly/default.nix | 2 ++ .../ocaml-modules/git-unix/default.nix | 2 ++ .../ocaml-modules/graphql/cohttp.nix | 2 ++ .../ocaml-modules/ipaddr/cstruct.nix | 17 +++++++++++ .../ocaml-modules/ipaddr/default.nix | 16 +++++------ .../development/ocaml-modules/ipaddr/sexp.nix | 18 ++++++++++++ pkgs/development/ocaml-modules/irmin/git.nix | 2 ++ .../ocaml-modules/irmin/graphql.nix | 2 ++ pkgs/development/ocaml-modules/irmin/http.nix | 2 ++ pkgs/development/ocaml-modules/irmin/ppx.nix | 2 ++ pkgs/development/ocaml-modules/irmin/unix.nix | 2 ++ .../ocaml-modules/macaddr/cstruct.nix | 17 +++++++++++ .../ocaml-modules/macaddr/default.nix | 11 ++++---- .../ocaml-modules/macaddr/sexp.nix | 18 ++++++++++++ .../ocaml-modules/opium/default.nix | 2 ++ .../ocaml-modules/tuntap/default.nix | 28 ++++++++++--------- pkgs/top-level/ocaml-packages.nix | 8 ++++++ 23 files changed, 166 insertions(+), 65 deletions(-) create mode 100644 pkgs/development/ocaml-modules/ipaddr/cstruct.nix create mode 100644 pkgs/development/ocaml-modules/ipaddr/sexp.nix create mode 100644 pkgs/development/ocaml-modules/macaddr/cstruct.nix create mode 100644 pkgs/development/ocaml-modules/macaddr/sexp.nix diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 22a4e6371a9c..386afe33d7bc 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,27 +1,25 @@ -{ lib, fetchFromGitHub, buildDunePackage -, ppx_fields_conv, ppx_sexp_conv +{ lib, fetchurl, buildDunePackage +, ppx_fields_conv, ppx_sexp_conv, stdlib-shims , base64, fieldslib, jsonm, re, stringext, uri-sexp }: buildDunePackage rec { - pname = "cohttp"; - version = "2.1.3"; + pname = "cohttp"; + version = "2.5.1"; - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-cohttp"; - rev = "v${version}"; - sha256 = "16k4ldmz6ljryhr139adlma130frb5wh13qswkrwc5gxx6d2wh8d"; + src = fetchurl { + url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz"; + sha256 = "0im91mi3nxzqfd7fs5r0zg5gsparfnf5zaz13mpw247hkd3y3396"; }; buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ]; - propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp ]; + propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ]; meta = { description = "HTTP(S) library for Lwt, Async and Mirage"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + homepage = "https://github.com/mirage/ocaml-cohttp"; }; } diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index 588ba6711cb4..3a99ed9536f0 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -11,6 +11,8 @@ buildDunePackage { pname = "cohttp-lwt-unix"; inherit (cohttp-lwt) version src meta; + useDune2 = true; + buildInputs = [ cmdliner ppx_sexp_conv ]; propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ]; diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix index 748b970477ee..1f261be62022 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -2,6 +2,8 @@ if !stdenv.lib.versionAtLeast cohttp.version "0.99" then cohttp +else if !stdenv.lib.versionAtLeast ppx_sexp_conv.version "0.13" +then throw "cohttp-lwt is not available for ppx_sexp_conv version ${ppx_sexp_conv.version}" else buildDunePackage { diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 22538b87f6af..7fbeefb39260 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchFromGitHub, buildDunePackage -, ppx_sexp_conv, sexplib -, astring, ipaddr, macaddr, uri, +{ stdenv, fetchurl, buildDunePackage +, ppx_sexp_conv, sexplib, astring, uri, logs +, ipaddr, ipaddr-sexp }: buildDunePackage rec { pname = "conduit"; - version = "1.4.0"; + version = "2.2.2"; - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-conduit"; - rev = "v${version}"; - sha256 = "1qzamqcmf9ywz04bkwrv17mz9j6zq2w9h1xmnjvp11pnwrs2xq8l"; + minimumOCamlVersion = "4.07"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-conduit/releases/download/v2.2.2/conduit-v2.2.2.tbz"; + sha256 = "1zb83w2pq9c8xrappfxa6y5q93772f5dj22x78camsm77a2c2z55"; }; buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ astring ipaddr macaddr sexplib uri ]; + propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ]; meta = { description = "Network connection library for TCP and SSL"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ]; - inherit (src.meta) homepage; + homepage = "https://github.com/mirage/ocaml-conduit"; }; } diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index 51fb369e66fe..b3c7e7fa86f9 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -1,16 +1,20 @@ -{ stdenv, buildDunePackage, conduit-lwt -, logs, ppx_sexp_conv, lwt_ssl +{ stdenv, buildDunePackage +, conduit-lwt, ppx_sexp_conv, ocaml_lwt, uri, ipaddr, ipaddr-sexp +, lwt_ssl, tls }: -if !stdenv.lib.versionAtLeast conduit-lwt.version "1.0" -then conduit-lwt -else - buildDunePackage { pname = "conduit-lwt-unix"; - inherit (conduit-lwt) version src meta; + inherit (conduit-lwt) version src minimumOCamlVersion; + + useDune2 = true; buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ conduit-lwt logs lwt_ssl ]; + propagatedBuildInputs = + [ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ]; + + meta = conduit-lwt.meta // { + description = "A network connection establishment library for Lwt_unix"; + }; } diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix index 2eb225d88b6e..9bcd98e06a49 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -1,14 +1,14 @@ -{ stdenv, buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt }: - -if !stdenv.lib.versionAtLeast conduit.version "1.0" -then conduit -else +{ stdenv, buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }: buildDunePackage { pname = "conduit-lwt"; - inherit (conduit) version src meta; + inherit (conduit) version src minimumOCamlVersion; buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ conduit ocaml_lwt ]; + propagatedBuildInputs = [ conduit ocaml_lwt sexplib ]; + + meta = conduit.meta // { + description = "A network connection establishment library for Lwt"; + }; } diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix index 1d455582b3b3..a17ea72140ff 100644 --- a/pkgs/development/ocaml-modules/curly/default.nix +++ b/pkgs/development/ocaml-modules/curly/default.nix @@ -7,6 +7,8 @@ buildDunePackage rec { minimumOCamlVersion = "4.02"; + useDune2 = true; + src = fetchFromGitHub { owner = "rgrinberg"; repo = pname; diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix index 50e6f1d3bce9..072d7fdb5cb9 100644 --- a/pkgs/development/ocaml-modules/git-unix/default.nix +++ b/pkgs/development/ocaml-modules/git-unix/default.nix @@ -4,6 +4,8 @@ buildDunePackage { pname = "git-unix"; inherit (git-http) version src; + useDune2 = true; + buildInputs = [ cmdliner mtime ]; propagatedBuildInputs = [ cohttp-lwt-unix git-http tls ]; diff --git a/pkgs/development/ocaml-modules/graphql/cohttp.nix b/pkgs/development/ocaml-modules/graphql/cohttp.nix index c6e85da77f36..09f4757041af 100644 --- a/pkgs/development/ocaml-modules/graphql/cohttp.nix +++ b/pkgs/development/ocaml-modules/graphql/cohttp.nix @@ -8,6 +8,8 @@ buildDunePackage rec { inherit (graphql) version src; + useDune2 = true; + nativeBuildInputs = [ ocaml-crunch ]; propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ]; diff --git a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix new file mode 100644 index 000000000000..b6240d39ebd3 --- /dev/null +++ b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix @@ -0,0 +1,17 @@ +{ lib, buildDunePackage +, ipaddr, cstruct +}: + +buildDunePackage rec { + pname = "ipaddr-cstruct"; + + inherit (ipaddr) version src minimumOCamlVersion; + + propagatedBuildInputs = [ ipaddr cstruct ]; + + doCheck = true; + + meta = ipaddr.meta // { + description = "A library for manipulation of IP address representations using Cstructs"; + }; +} diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index d7009fdf553c..a4a6f9fc7a14 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -1,22 +1,20 @@ { lib, buildDunePackage -, macaddr, ounit +, macaddr, domain-name, stdlib-shims +, ounit, ppx_sexp_conv }: buildDunePackage rec { pname = "ipaddr"; - inherit (macaddr) version src; + inherit (macaddr) version src minimumOCamlVersion; - buildInputs = [ ounit ]; - - propagatedBuildInputs = [ macaddr ]; + propagatedBuildInputs = [ macaddr domain-name stdlib-shims ]; + checkInputs = [ ppx_sexp_conv ounit ]; doCheck = true; - meta = with lib; { - homepage = "https://github.com/mirage/ocaml-ipaddr"; + meta = macaddr.meta // { description = "A library for manipulation of IP (and MAC) address representations "; - license = licenses.isc; - maintainers = with maintainers; [ alexfmpe ericbmerritt ]; + maintainers = with lib.maintainers; [ alexfmpe ericbmerritt ]; }; } diff --git a/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/pkgs/development/ocaml-modules/ipaddr/sexp.nix new file mode 100644 index 000000000000..8d6186d6338f --- /dev/null +++ b/pkgs/development/ocaml-modules/ipaddr/sexp.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage +, ipaddr, ipaddr-cstruct, ounit, ppx_sexp_conv +}: + +buildDunePackage rec { + pname = "ipaddr-sexp"; + + inherit (ipaddr) version src minimumOCamlVersion; + + propagatedBuildInputs = [ ipaddr ]; + + checkInputs = [ ipaddr-cstruct ounit ppx_sexp_conv ]; + doCheck = true; + + meta = ipaddr.meta // { + description = "A library for manipulation of IP address representations usnig sexp"; + }; +} diff --git a/pkgs/development/ocaml-modules/irmin/git.nix b/pkgs/development/ocaml-modules/irmin/git.nix index bb28042a1f66..b222bc53e3a2 100644 --- a/pkgs/development/ocaml-modules/irmin/git.nix +++ b/pkgs/development/ocaml-modules/irmin/git.nix @@ -6,6 +6,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ git irmin ]; checkInputs = lib.optionals doCheck [ git-unix irmin-mem irmin-test ]; diff --git a/pkgs/development/ocaml-modules/irmin/graphql.nix b/pkgs/development/ocaml-modules/irmin/graphql.nix index abcdc3d58dd2..41355fc3986e 100644 --- a/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -6,6 +6,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/irmin/http.nix b/pkgs/development/ocaml-modules/irmin/http.nix index c8db6d563c9d..24e9f52aa086 100644 --- a/pkgs/development/ocaml-modules/irmin/http.nix +++ b/pkgs/development/ocaml-modules/irmin/http.nix @@ -8,6 +8,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ cohttp-lwt irmin webmachine ]; checkInputs = lib.optionals doCheck [ checkseum git-unix irmin-git irmin-mem irmin-test ]; diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index c28532b49a9e..5366a04456d3 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -5,6 +5,8 @@ buildDunePackage { inherit (irmin) version src minimumOCamlVersion; + useDune2 = true; + buildInputs = [ ocaml-syntax-shims ]; propagatedBuildInputs = [ ppxlib ]; diff --git a/pkgs/development/ocaml-modules/irmin/unix.nix b/pkgs/development/ocaml-modules/irmin/unix.nix index 5793678bfcfd..7a09eaabd3ec 100644 --- a/pkgs/development/ocaml-modules/irmin/unix.nix +++ b/pkgs/development/ocaml-modules/irmin/unix.nix @@ -10,6 +10,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ checkseum cmdliner git-unix yaml irmin irmin-fs irmin-git irmin-graphql irmin-http irmin-mem irmin-pack irmin-watcher ]; diff --git a/pkgs/development/ocaml-modules/macaddr/cstruct.nix b/pkgs/development/ocaml-modules/macaddr/cstruct.nix new file mode 100644 index 000000000000..991a77a6ba21 --- /dev/null +++ b/pkgs/development/ocaml-modules/macaddr/cstruct.nix @@ -0,0 +1,17 @@ +{ lib, buildDunePackage +, macaddr, cstruct +}: + +buildDunePackage { + pname = "macaddr-cstruct"; + + inherit (macaddr) version src minimumOCamlVersion; + + propagatedBuildInputs = [ macaddr cstruct ]; + + doCheck = true; + + meta = macaddr.meta // { + description = "A library for manipulation of MAC address representations using Cstructs"; + }; +} diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index 1332c541354d..76ced1d753cd 100644 --- a/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -1,21 +1,20 @@ { lib, fetchurl, buildDunePackage -, ppx_sexp_conv +, ppx_sexp_conv, ounit }: buildDunePackage rec { pname = "macaddr"; - version = "3.1.0"; + version = "5.0.0"; minimumOCamlVersion = "4.04"; src = fetchurl { url = "https://github.com/mirage/ocaml-ipaddr/archive/v${version}.tar.gz"; - sha256 = "1hi3v5dzg6h4qb268ch3h6v61gsc8bv21ajhb35z37v5nsdmyzbh"; + sha256 = "1j2m2v64g3d81sixxq3g57j1iyk6042ivsszml18akrqvwfpxy66"; }; - propagatedBuildInputs = [ ppx_sexp_conv ]; - - doCheck = false; # ipaddr and macaddr tests are together, which requires mutual dependency + checkInputs = [ ppx_sexp_conv ounit ]; + doCheck = true; meta = with lib; { homepage = "https://github.com/mirage/ocaml-ipaddr"; diff --git a/pkgs/development/ocaml-modules/macaddr/sexp.nix b/pkgs/development/ocaml-modules/macaddr/sexp.nix new file mode 100644 index 000000000000..3d0305c4be38 --- /dev/null +++ b/pkgs/development/ocaml-modules/macaddr/sexp.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage +, macaddr, ppx_sexp_conv, macaddr-cstruct, ounit +}: + +buildDunePackage { + pname = "macaddr-sexp"; + + inherit (macaddr) version src minimumOCamlVersion; + + propagatedBuildInputs = [ ppx_sexp_conv ]; + + checkInputs = [ macaddr-cstruct ounit ]; + doCheck = true; + + meta = macaddr.meta // { + description = "A library for manipulation of MAC address representations using sexp"; + }; +} diff --git a/pkgs/development/ocaml-modules/opium/default.nix b/pkgs/development/ocaml-modules/opium/default.nix index cbd3a14541f5..2681cc609d00 100644 --- a/pkgs/development/ocaml-modules/opium/default.nix +++ b/pkgs/development/ocaml-modules/opium/default.nix @@ -17,6 +17,8 @@ buildDunePackage { pname = "opium"; inherit (opium_kernel) version src meta minimumOCamlVersion; + useDune2 = true; + doCheck = true; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/tuntap/default.nix b/pkgs/development/ocaml-modules/tuntap/default.nix index 8e8eaf5fd5e2..a4536316ba41 100644 --- a/pkgs/development/ocaml-modules/tuntap/default.nix +++ b/pkgs/development/ocaml-modules/tuntap/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ipaddr }: +{ lib, buildDunePackage, fetchurl +, ipaddr, macaddr, cmdliner +}: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; +buildDunePackage rec { + pname = "tuntap"; + version = "2.0.0"; -stdenv.mkDerivation { - name = "ocaml-tuntap-1.3.0"; + minimumOCamlVersion = "4.04.2"; - src = fetchzip { - url = "https://github.com/mirage/ocaml-tuntap/archive/v1.3.0.tar.gz"; - sha256 = "1cmd4kky875ks02gm2nb8yr80hmlfcnjdfyc63hvkh49acssy3d5"; + src = fetchurl { + url = "https://github.com/mirage/ocaml-tuntap/releases/download/v${version}/tuntap-v${version}.tbz"; + sha256 = "12wmls28h3jzikwyfw08d5f7ycsc9njwzbhd3qk2l8jnf5rakfsa"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ ipaddr ]; + propagatedBuildInputs = [ ipaddr macaddr cmdliner ]; - createFindlibDestdir = true; + # tests manipulate network devices and use network + # also depend on LWT 5 + doCheck = false; meta = { description = "Bindings to the UNIX tuntap facility"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; homepage = "https://github.com/mirage/ocaml-tuntap"; - inherit (ocaml.meta) platforms; }; - } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 194abc496f25..3294099ca5dd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -324,6 +324,10 @@ let ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; + ipaddr-cstruct = callPackage ../development/ocaml-modules/ipaddr/cstruct.nix { }; + + ipaddr-sexp = callPackage ../development/ocaml-modules/ipaddr/sexp.nix { }; + irmin_1 = callPackage ../development/ocaml-modules/irmin/1.4.nix { }; iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; @@ -477,6 +481,10 @@ let macaddr = callPackage ../development/ocaml-modules/macaddr { }; + macaddr-cstruct = callPackage ../development/ocaml-modules/macaddr/cstruct.nix { }; + + macaddr-sexp = callPackage ../development/ocaml-modules/macaddr/sexp.nix { }; + macaque = callPackage ../development/ocaml-modules/macaque { }; magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; From 8c74f97c15d09cac2012a17e680dcf8086f0ee5e Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Thu, 18 Jun 2020 22:23:16 +0200 Subject: [PATCH 2593/3452] google-cloud-secret-manager: init at 1.0.0 Signed-off-by: Sirio Balmelli --- .../google_cloud_secret_manager/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/google_cloud_secret_manager/default.nix diff --git a/pkgs/development/python-modules/google_cloud_secret_manager/default.nix b/pkgs/development/python-modules/google_cloud_secret_manager/default.nix new file mode 100644 index 000000000000..513b76bafa4a --- /dev/null +++ b/pkgs/development/python-modules/google_cloud_secret_manager/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchPypi +, grpc_google_iam_v1, google_api_core +, pytest, mock +}: + +buildPythonPackage rec { + pname = "google-cloud-secret-manager"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cm3xqacxnbpv2706bd2jl86mvcsphpjlvhzngz2k2p48a0jjx8r"; + }; + + propagatedBuildInputs = [ + google_api_core + grpc_google_iam_v1 + ]; + + checkInputs = [ + mock + pytest + ]; + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Secret Manager API: Stores, manages, and secures access to application secrets"; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + license = licenses.asl20; + maintainers = with maintainers; [ siriobalmelli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c75b84e8ede7..712cb6da9951 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4049,6 +4049,8 @@ in { google_cloud_runtimeconfig = callPackage ../development/python-modules/google_cloud_runtimeconfig { }; + google_cloud_secret_manager = callPackage ../development/python-modules/google_cloud_secret_manager { }; + google_cloud_securitycenter = callPackage ../development/python-modules/google_cloud_securitycenter { }; google_cloud_spanner = callPackage ../development/python-modules/google_cloud_spanner { }; From 74c27221dd28ecc36ecc62da2c635700998fac3c Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Thu, 25 Jun 2020 23:34:02 +0200 Subject: [PATCH 2594/3452] libvncserver: 0.9.12 -> 0.9.13 (security) --- .../libraries/libvncserver/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index c9adad6f6454..c4e82b1c326c 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -7,9 +7,9 @@ let s = # Generated upstream information rec { pname = "libvncserver"; - version = "0.9.12"; + version = "0.9.13"; url = "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz"; - sha256 = "1226hb179l914919f5nm2mlf8rhaarqbf48aa649p4rwmghyx9vm"; # unpacked archive checksum + sha256 = "0zz0hslw8b1p3crnfy3xnmrljik359h83dpk64s697dqdcrzy141"; # unpacked archive checksum }; in stdenv.mkDerivation { @@ -17,18 +17,7 @@ stdenv.mkDerivation { src = fetchzip { inherit (s) url sha256; }; - patches = [ - (fetchpatch { - name = "CVE-2018-20750.patch"; - url = "https://github.com/LibVNC/libvncserver/commit/09e8fc02f59f16e2583b34fe1a270c238bd9ffec.patch"; - sha256 = "004h50786nvjl3y3yazpsi2b767vc9gqrwm1ralj3zgy47kwfhqm"; - }) - (fetchpatch { - name = "CVE-2019-15681.patch"; - url = "https://github.com/LibVNC/libvncserver/commit/d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a.patch"; - sha256 = "0hf0ss7all2m50z2kan4mck51ws44yim4ymn8p0d991y465y6l9s"; - }) - ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ libjpeg openssl libgcrypt libpng From aa1092809faf82575f0a467631f19c65968cf4db Mon Sep 17 00:00:00 2001 From: Eric Dallo Date: Thu, 25 Jun 2020 18:34:47 -0300 Subject: [PATCH 2595/3452] clojure-lsp: 20200624T134144 -> 20200624T142700 --- pkgs/development/tools/misc/clojure-lsp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 487c979c7092..64c6dc1f280f 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20200514T134144"; + version = "20200624T142700"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "1c56k9zxi71gjlrmjk2risx04dzr460vql42pfjwm1cv543kij9r"; + sha256 = "042s4jp2z9if9jxlwgd2ln6dyssjsw6rdy633kp1hprz7ki1n5nf"; }; dontUnpack = true; From 4b972619a3314b04ce13225039ef1d478ef2b886 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Wed, 24 Jun 2020 21:06:35 -0400 Subject: [PATCH 2596/3452] haskellPackages: remove obsolete overrides stm-conduit: -dontCheck asn1-encoding: -dontCheck geodetics: -dontCheck --- .../development/haskell-modules/configuration-common.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bda8caee2ee7..124107dbd9a0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -406,9 +406,6 @@ self: super: { # https://github.com/joeyadams/haskell-stm-delay/issues/3 stm-delay = dontCheck super.stm-delay; - # https://github.com/cgaebel/stm-conduit/issues/33 - stm-conduit = dontCheck super.stm-conduit; - # https://github.com/pixbi/duplo/issues/25 duplo = dontCheck super.duplo; @@ -434,9 +431,6 @@ self: super: { # https://github.com/NixOS/nixpkgs/issues/6350 paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; }); - # https://github.com/vincenthz/hs-asn1/issues/12 - asn1-encoding = dontCheck super.asn1-encoding; - # Avoid "QuickCheck >=2.3 && <2.10" dependency we cannot fulfill in lts-11.x. test-framework = dontCheck super.test-framework; @@ -454,9 +448,6 @@ self: super: { apiary-session = dontCheck super.apiary-session; apiary-websockets = dontCheck super.apiary-websockets; - # https://github.com/PaulJohnson/geodetics/issues/1 - geodetics = dontCheck super.geodetics; - # https://github.com/junjihashimoto/test-sandbox-compose/issues/2 test-sandbox-compose = dontCheck super.test-sandbox-compose; From 14dcc65a13c57ece694d266f1d2fb6a30f70c23d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 25 Jun 2020 23:57:59 +0200 Subject: [PATCH 2597/3452] snapper: 0.8.9 -> 0.8.10 Add passthru.tests.snapper --- pkgs/tools/misc/snapper/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index eed9516d0960..fc834c65a9dc 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 -, lvm2, pam, python, utillinux, fetchpatch, json_c }: +, lvm2, pam, python, utillinux, fetchpatch, json_c, nixosTests }: stdenv.mkDerivation rec { pname = "snapper"; - version = "0.8.9"; + version = "0.8.10"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "1flqhfpx9dipim22wq7wh1590ra4gydwii1jjp99pi03mdhavlbn"; + sha256 = "0bw8aal3a9823zcwini3an9zdxmf7vm912jbyb95rjac0wilqfw7"; }; nativeBuildInputs = [ @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { lvm2 pam python utillinux json_c ]; + passthru.tests.snapper = nixosTests.snapper; + patches = [ # Don't use etc/dbus-1/system.d (fetchpatch { From 5f16eca72b89d85a30d8ae5d5b919ed1cb206da4 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Fri, 26 Jun 2020 00:01:00 +0200 Subject: [PATCH 2598/3452] libtomcrypt: fix CVE-2019-17362 (security) --- pkgs/development/libraries/libtomcrypt/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index d9e9df59324d..4587701011dd 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool }: +{ stdenv, fetchurl, fetchpatch, libtool }: stdenv.mkDerivation rec { pname = "libtomcrypt"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "113vfrgapyv72lalhd3nkw7jnks8az0gcb5wqn9hj19nhcxlrbcn"; }; + patches = [ + (fetchpatch { + name = "CVE-2019-17362.patch"; + url = "https://github.com/libtom/libtomcrypt/pull/508/commits/25c26a3b7a9ad8192ccc923e15cf62bf0108ef94.patch"; + sha256 = "1bwsj0pwffxw648wd713z3xcyrbxc2z646psrzp38ys564fjh5zf"; + }) + ]; + nativeBuildInputs = [ libtool ]; postPatch = '' From 405947fbec51792630ae03128493f0e09a5fda3f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 20 Jun 2020 10:22:33 +1000 Subject: [PATCH 2599/3452] podman: 1.9.3 -> 2.0.1 https://github.com/containers/libpod/releases/tag/v2.0.0 https://github.com/containers/libpod/releases/tag/v2.0.1 --- pkgs/applications/virtualization/podman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 3ed029e55fb4..1593866086e4 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "1.9.3"; + version = "2.0.1"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "0gbp12xn1vliyawkw2w2bpn6b5h2cm41g3nj72vk4jyhis0igq1s"; + sha256 = "11avj4q3xh7qbcbs8h4jis0bdfkvvh193sflwiz8hcp41qjvinz4"; }; vendorSha256 = null; @@ -52,7 +52,7 @@ buildGoModule rec { install -Dm555 bin/podman $out/bin/podman installShellCompletion --bash completions/bash/podman installShellCompletion --zsh completions/zsh/_podman - MANDIR=$man/share/man make install.man + MANDIR=$man/share/man make install.man-nobuild ''; passthru.tests.podman = nixosTests.podman; From 033ba9c73d4fe544db93fbf299cf7a4a0a786ea8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 21 Jun 2020 11:23:34 +1000 Subject: [PATCH 2600/3452] nixos/podman: use cgroupfs for rootless crun test --- nixos/tests/podman.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix index 9134a68ff386..7a83689a49a4 100644 --- a/nixos/tests/podman.nix +++ b/nixos/tests/podman.nix @@ -71,7 +71,7 @@ import ./make-test-python.nix ( podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) podman.succeed( su_cmd( - "podman run --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + "podman run --cgroup-manager=cgroupfs --runtime=crun -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" ) ) podman.succeed(su_cmd("podman ps | grep sleeping")) From e89446656d1edf9fac9e2e3552980e97e86155a5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 14 May 2020 16:28:32 +1000 Subject: [PATCH 2601/3452] nixos/{podman,containers}: libpod.conf -> containers.conf --- nixos/modules/virtualisation/containers.nix | 25 ++++++++++++++++++ nixos/modules/virtualisation/podman.nix | 28 +++------------------ 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 7d184575640b..105f0f2710ec 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -34,6 +34,25 @@ in ''; }; + containersConf = mkOption { + default = {}; + description = "containers.conf configuration"; + type = types.submodule { + options = { + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration that should be put in the containers.conf + configuration file + ''; + + }; + }; + }; + }; + registries = { search = mkOption { type = types.listOf types.str; @@ -93,6 +112,12 @@ in config = lib.mkIf cfg.enable { + environment.etc."containers/containers.conf".text = '' + [network] + cni_plugin_dirs = ["${pkgs.cni-plugins}/bin/"] + + '' + cfg.containersConf.extraConfig; + environment.etc."containers/registries.conf".source = toTOML "registries.conf" { registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries; }; diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 652850bf5006..e0e2f04e24c1 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -28,6 +28,10 @@ let in { + imports = [ + (lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ]) + ]; + meta = { maintainers = lib.teams.podman.members; }; @@ -67,25 +71,6 @@ in ''; }; - libpod = mkOption { - default = {}; - description = "Libpod configuration"; - type = types.submodule { - options = { - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Extra configuration that should be put in the libpod.conf - configuration file - ''; - - }; - }; - }; - }; - package = lib.mkOption { type = types.package; default = podmanPackage; @@ -103,11 +88,6 @@ in environment.systemPackages = [ cfg.package ] ++ lib.optional cfg.dockerCompat dockerCompat; - environment.etc."containers/libpod.conf".text = '' - cni_plugin_dir = ["${pkgs.cni-plugins}/bin/"] - - '' + cfg.libpod.extraConfig; - environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist"; # Enable common /etc/containers configuration From 86de0be3837ebe70f04d8eef66a681803640ce63 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 00:09:21 +0200 Subject: [PATCH 2602/3452] rdma-core: 29.0 -> 30.0 --- pkgs/os-specific/linux/rdma-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index a9cf7fe03b4a..b1770a4d6189 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -4,7 +4,7 @@ } : let - version = "29.0"; + version = "30.0"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "03r7jbhw64siyrna9mz0qzppfzp8ilwi7iqdkxgyy33rndncqqnq"; + sha256 = "1czfh6s0qz2cv2k7ha7nr9qiwcrj5lvwqnvyrvsds463m8ndpg12"; }; nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; From dd284b9758abf0251b334549aacb819a0a137492 Mon Sep 17 00:00:00 2001 From: Corbin Date: Thu, 25 Jun 2020 15:44:45 -0700 Subject: [PATCH 2603/3452] igraph: Only build and test x86_64-linux. aarch64-linux tests fail on the community builder, so don't build there until we have more evidence that failing tests are not a problem. --- pkgs/development/libraries/igraph/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 6b6924b7d415..7f494e8bddc1 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { description = "The network analysis package"; homepage = "https://igraph.org/"; license = lib.licenses.gpl2; + # NB: Known to fail tests on aarch64. + platforms = [ "x86_64-linux" ]; maintainers = [ lib.maintainers.MostAwesomeDude ]; }; } From cf11c3c2cd5a35dd580173139f1ed93cb7ecb1e2 Mon Sep 17 00:00:00 2001 From: Hugo Reeves Date: Fri, 26 Jun 2020 11:12:16 +1200 Subject: [PATCH 2604/3452] cargo-tarpaulin: 0.13.4 -> 0.14.0 --- 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 d564067cfc2d..fd1c2c964a22 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.4"; + version = "0.14.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = "${version}"; - sha256 = "094gkxdlydaqzmdy6a6az09yph102nd1fzwz6b12hg3vb50fxv7r"; + sha256 = "1ilqynjvvczxdvsfszkmrz1casrbsbklw8nbgh5l1nx8kxsp5lx7"; }; nativeBuildInputs = [ @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - cargoSha256 = "0glcc4qmvz25p1zxx1igd37l2pb10i80kj5smafkgbczgn01iwk9"; + cargoSha256 = "0jcn1b4v9glh058sfd270b33g988n672q50f8kyhwl8xip7xzj06"; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; From 769c5947e2ade14423b13c8954d0de1b2b967fa3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 25 Jun 2020 10:24:48 +0000 Subject: [PATCH 2605/3452] python27Packages.lark-parser: 0.8.5 -> 0.8.8 --- pkgs/development/python-modules/lark-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index 41c165480320..a95a8907422a 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.8.5"; + version = "0.8.8"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "1rfybmr0rlljhc0dpd9npbw8x7r6dvnn2wvclz93rmgkzhmd3zah"; + sha256 = "1q2dvkkfx9dvag5v5ps0ki4avh7i003gn9sj30jy1rsv1bg4y2mb"; }; # tests of Nearley support require js2py From c14b616d7335b0032335dff034acfd6f6c9f2dae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 25 Jun 2020 09:05:36 +0000 Subject: [PATCH 2606/3452] python37Packages.hstspreload: 2020.5.19 -> 2020.6.9 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 635ad7a283ee..99612882814f 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.5.19"; + version = "2020.6.9"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "09a5vajzw3f2kpdq9ydzx1f840xmdmzb6br3ns79mnqnsw6nfs6z"; + sha256 = "12js2xcj4979jklc19hjmv5p2b6689p18p4w9swhjc6cgcwm4jy2"; }; # tests require network connection From 0c339237b8b043daa40095eadb43b79d4b1cb2f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 01:35:02 +0000 Subject: [PATCH 2607/3452] act: 0.2.9 -> 0.2.10 --- pkgs/development/tools/misc/act/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 21ad66b62bd1..e10ad15fff7a 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "act"; - version = "0.2.9"; + version = "0.2.10"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "17w7pqpn9pkzc85lrsmyhxy6rip47dxw1hkz4ml3y5n68nysfpb9"; + sha256 = "0xmrb8wbxkb52l2c7fxxy5wa9lsl591fl65zicv0nrbil36q4wfd"; }; vendorSha256 = "0qf26g0a2j1mbzlc7xjackww22w9bl1x0iw3q1x6kq7fp8xiwhdn"; From 4d6876aeef6899ece02f4adc2a9ffbdcdab003d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 01:50:31 +0000 Subject: [PATCH 2608/3452] argo: 2.8.1 -> 2.8.2 --- pkgs/applications/networking/cluster/argo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 3ef2412a9f5c..c8d239f39270 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "193nxc27fh37wf035mclvwwwxjjfc8nnbncg009fg19ycqmvmgvc"; + sha256 = "1di6c8p9bc0g8r5l654sdvpiawp76cp8v97cj227yhznf39f20z9"; }; vendorSha256 = "1p9b2m20gxc7iyq08mvllf5dpi4m06aw233sb45d05d624kw4aps"; From e7ba11b7ecc0697b7c9d2dae7acc2f7538a0e126 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 02:54:40 +0000 Subject: [PATCH 2609/3452] broot: 0.16.0 -> 0.17.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 d0cf1b4e5b8b..3e0a801d7b4b 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.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "1vhwv9yb8acz4iq9zmg1qkf072z1py84lz4ddj8gmg6rq7g8n4mb"; + sha256 = "1d8mqzc98v03nxn498mpyclihs5hmfgazna8z8vgah11jjdryj5k"; }; - cargoSha256 = "19z6d72ssqwm8i7bnfqgsndy1f2wxzkvhs8swy16gnqfqjqdf26d"; + cargoSha256 = "152p3ddxz4d1lkfarcihvaf24rflbr9xnag6v2ynady517n9w80i"; nativeBuildInputs = [ installShellFiles ]; From a7f888e5f3e24d35944c89d3b5212eac1d241ea4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 25 Jun 2020 22:01:51 -0500 Subject: [PATCH 2610/3452] argo: install completions --- pkgs/applications/networking/cluster/argo/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index c8d239f39270..4f05c90cff81 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, buildGoPackage, fetchFromGitHub, installShellFiles }: let # Argo can package a static server in the CLI using the `staticfiles` go module. @@ -32,6 +32,8 @@ buildGoModule rec { subPackages = [ "cmd/argo" ]; + nativeBuildInputs = [ installShellFiles ]; + preBuild = '' mkdir -p ui/dist/app echo "Built without static files" > ui/dist/app/index.html @@ -48,6 +50,13 @@ buildGoModule rec { -X github.com/argoproj/argo.gitTag=${version} ''; + postInstall = '' + for shell in bash zsh; do + $out/bin/argo completion $shell > argo.$shell + installShellCompletion argo.$shell + done + ''; + meta = with lib; { description = "Container native workflow engine for Kubernetes"; homepage = "https://github.com/argoproj/argo"; From ec71e489c8d3bce2342f09f7d3d4ff70f634e6d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 22 Jun 2020 22:09:00 +0200 Subject: [PATCH 2611/3452] pythonPackages.python-rtmidi: init at 1.4.1 --- .../python-modules/python-rtmidi/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/python-rtmidi/default.nix diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix new file mode 100644 index 000000000000..24d86289bf2a --- /dev/null +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, tox, flake8, alabaster +}: + +buildPythonPackage rec { + pname = "python-rtmidi"; + version = "1.4.1"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0b0y3hnjl2fvm3jyfvp1msfikp19vbqqqi7lawgy3azisvdyrgq7"; + }; + + checkInputs = [ + tox + flake8 + alabaster + ]; + + meta = with lib; { + description = "A Python binding for the RtMidi C++ library implemented using Cython"; + homepage = "https://chrisarndt.de/projects/python-rtmidi/"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 712cb6da9951..6a8435e2bcf8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1424,6 +1424,8 @@ in { python-redis-lock = callPackage ../development/python-modules/python-redis-lock { }; + python-rtmidi = callPackage ../development/python-modules/python-rtmidi { }; + python-sql = callPackage ../development/python-modules/python-sql { }; python-snappy = callPackage ../development/python-modules/python-snappy { From 75f5c4381cf5f66f879c57f410fcc44df71cf218 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 22 Jun 2020 22:09:38 +0200 Subject: [PATCH 2612/3452] pythonPackages.rtmidi-python: init at 0.2.2 --- .../python-modules/rtmidi-python/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/rtmidi-python/default.nix diff --git a/pkgs/development/python-modules/rtmidi-python/default.nix b/pkgs/development/python-modules/rtmidi-python/default.nix new file mode 100644 index 000000000000..68927cc9ca03 --- /dev/null +++ b/pkgs/development/python-modules/rtmidi-python/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi +, alsaLib +}: + +buildPythonPackage rec { + pname = "rtmidi-python"; + version = "0.2.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wpcaxfpbmsjc78g8841kpixr0a3v6zn0ak058s3mm25kcysp4m0"; + }; + + buildInputs = [ alsaLib ]; + + # package has no tests + doCheck = false; + + pythonImportsCheck = [ + "rtmidi_python" + ]; + + meta = with lib; { + description = "Python wrapper for RtMidi"; + homepage = "https://github.com/superquadratic/rtmidi-python"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a8435e2bcf8..53731efcfb6c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1480,6 +1480,8 @@ in { rq = callPackage ../development/python-modules/rq { }; + rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; + rx = callPackage ../development/python-modules/rx { }; sabyenc = callPackage ../development/python-modules/sabyenc { }; From 8eb5780cc7ccb3f67438ccff0f97e8745feb6ce9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 22 Jun 2020 22:10:40 +0200 Subject: [PATCH 2613/3452] pythonPackages.mido: init at 1.2.9 --- .../python-modules/mido/default.nix | 39 +++++++++++++++++++ .../mido/libportmidi-cdll.patch | 19 +++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/mido/default.nix create mode 100644 pkgs/development/python-modules/mido/libportmidi-cdll.patch diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix new file mode 100644 index 000000000000..8312ea783cb4 --- /dev/null +++ b/pkgs/development/python-modules/mido/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi, substituteAll +, portmidi, pygame, python-rtmidi, rtmidi-python +, pytest +}: + +buildPythonPackage rec { + pname = "mido"; + version = "1.2.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "1k3sgkxc7j49bapib3b5jnircb1yhyyd8mi0mbfd78zgix9db9y4"; + }; + + patches = [ + (substituteAll { + src = ./libportmidi-cdll.patch; + libportmidi = "${portmidi.out}/lib/libportmidi${stdenv.targetPlatform.extensions.sharedLibrary}"; + }) + ]; + + propagatedBuildInputs = [ + pygame + python-rtmidi + rtmidi-python + ]; + + checkInputs = [ pytest ]; + checkPhase = '' + py.test . -rs -q + ''; + + meta = with lib; { + description = "MIDI Objects for Python"; + homepage = "https://mido.readthedocs.io"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/mido/libportmidi-cdll.patch b/pkgs/development/python-modules/mido/libportmidi-cdll.patch new file mode 100644 index 000000000000..455064f12b9a --- /dev/null +++ b/pkgs/development/python-modules/mido/libportmidi-cdll.patch @@ -0,0 +1,19 @@ +diff --git a/mido/backends/portmidi_init.py b/mido/backends/portmidi_init.py +index 84bb128..5efcdaa 100644 +--- a/mido/backends/portmidi_init.py ++++ b/mido/backends/portmidi_init.py +@@ -10,13 +10,7 @@ from ctypes import (CDLL, CFUNCTYPE, POINTER, Structure, c_char_p, + create_string_buffer, byref) + import ctypes.util + +-dll_name = '' +-if sys.platform == 'darwin': +- dll_name = ctypes.util.find_library('libportmidi.dylib') +-elif sys.platform in ('win32', 'cygwin'): +- dll_name = 'portmidi.dll' +-else: +- dll_name = 'libportmidi.so' ++dll_name = '@libportmidi@' + + lib = CDLL(dll_name) + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53731efcfb6c..6b0ab50d0d92 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3196,6 +3196,8 @@ in { midiutil = callPackage ../development/python-modules/midiutil {}; + mido = callPackage ../development/python-modules/mido { }; + misaka = callPackage ../development/python-modules/misaka {}; mlrose = callPackage ../development/python-modules/mlrose { }; From 51ebd7a00df02cd9423f29e3afadca71979c3838 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 01:07:23 +0000 Subject: [PATCH 2614/3452] AusweisApp2: 1.20.0 -> 1.20.1 --- pkgs/applications/misc/ausweisapp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 953e12a033d0..1dbcdf31ed19 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = "${version}"; - sha256 = "0qkwdaxhig4qjim7h20j6ln6w76ycppfc786nd8l69bd1qv46m40"; + sha256 = "17ify6v4z8i8ps3s8qabnrqfkj0my4yzyqwk3q3nhrqilbnhr40x"; }; nativeBuildInputs = [ cmake pkgconfig ]; From a9ca8a6dfa780651dc9ccf3ef04bb44b35898b38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 22:43:15 +0000 Subject: [PATCH 2615/3452] olm: 3.1.4 -> 3.1.5 --- pkgs/development/libraries/olm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index d5c230862333..66ed41e8eadb 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { url = "https://matrix.org/git/olm/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "0f7azjxc77n4ib9nj3cwyk3vhk8r2dsyf7id6nvqyxqxwxn95a8w"; + sha256 = "15l6cf029ghfk5bf8ii6nyy86gc90ji8n5hspjhj1xmzmk61xb4j"; }; nativeBuildInputs = [ cmake ]; From 4fa38d591cca637592b7ea83f34b9b3ff068f24d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 23 Jun 2020 04:31:32 +0000 Subject: [PATCH 2616/3452] python27Packages.capturer: 2.4 -> 3.0 --- pkgs/development/python-modules/capturer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix index 2dcd075ec0e1..821561c05554 100644 --- a/pkgs/development/python-modules/capturer/default.nix +++ b/pkgs/development/python-modules/capturer/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "capturer"; - version = "2.4"; + version = "3.0"; src = fetchFromGitHub { owner = "xolox"; repo = "python-capturer"; rev = version; - sha256 = "07zy264xd0g7pz9sxjqcpwmrck334xcbb7wfss26lmvgdr5nhcb9"; + sha256 = "0fwrxa049gzin5dck7fvwhdp1856jrn0d7mcjcjsd7ndqvhgvjj1"; }; propagatedBuildInputs = [ humanfriendly ]; From fce7543afae8292ee601a678668b9cd6ebb3b1f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 04:18:44 +0000 Subject: [PATCH 2617/3452] cargo-deny: 0.6.8 -> 0.7.0 --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 70fee45a873c..34126a7713ff 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.6.8"; + version = "0.7.0"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "0nv3min7jyrv4scn7bhizc9vmqhmv6sg0nvfnr0m59pm5806vdpi"; + sha256 = "0mfccjcll7dxrhdi2bhfbggmkqdp8cmq5vf8vbb05qzpvlswvkf7"; }; - cargoSha256 = "1vywm3iqs3qnkrvi7i70sv21hznn3y3hza1i9gvcxfmh03wzhwx0"; + cargoSha256 = "1gp5m432273mr0zwq1kdswdjgp0kajr0imymqyc4yj9i931by1xv"; nativeBuildInputs = [ perl pkgconfig ]; From 401ce516cc879951462444d9737c8029e7910f46 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 04:27:15 +0000 Subject: [PATCH 2618/3452] cava: 0.6.1 -> 0.7.1 --- pkgs/applications/audio/cava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 2bdca386bf45..f4028807ffc4 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "cava"; - version = "0.6.1"; + version = "0.7.1"; buildInputs = [ alsaLib @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "karlstav"; repo = "cava"; rev = version; - sha256 = "1kvhqgijs29909w3sq9m0bslx2zxxn4b3i07kdz4hb0dqkppxpjy"; + sha256 = "0p2g3xxl2n425bghs1qnff30jaj9cba94j2gbhgxmwaxhz26vbk7"; }; nativeBuildInputs = [ autoreconfHook ]; From 7e936b37bbcd11a7ab4b1a799f2b008690ad7bdb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 04:40:34 +0000 Subject: [PATCH 2619/3452] cheat: 3.10.1 -> 4.0.0 --- pkgs/applications/misc/cheat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index ec4d71a0dce8..42b03774749c 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "3.10.1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "0indvycj972wng979mvia8mrb7bwdfay7wxq3lnj05qyxqafj5h2"; + sha256 = "0j9w2rm8imb15njj7334xl6w0fgjvfqnrfvdq4zfsrwzl67ds86l"; }; subPackages = [ "cmd/cheat" ]; From ab7625d93ef1b55a769a82d0265c29d305069799 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Jun 2020 21:49:50 -0700 Subject: [PATCH 2620/3452] python3Packages.mozfile: fix build --- pkgs/development/python-modules/marionette-harness/mozfile.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix index 829e909535a7..2cce0a221244 100644 --- a/pkgs/development/python-modules/marionette-harness/mozfile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozfile.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 , six }: @@ -14,7 +13,7 @@ buildPythonPackage rec { sha256 = "e5dc835582ea150e35ecd57e9d86cb707d3aa3b2505679db7332326dd49fd6b8"; }; - propagatedBuildInputs = lib.optional isPy27 six; + propagatedBuildInputs = [ six ]; # mozhttpd -> moznetwork -> mozinfo -> mozfile doCheck = false; From 4f2febba93697a89118d8a5b1c65e0628bded161 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 05:07:42 +0000 Subject: [PATCH 2621/3452] cli11: 1.9.0 -> 1.9.1 --- pkgs/development/tools/misc/cli11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index f6a4a4d9f6a4..0d058ef1f881 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cli11"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "CLIUtils"; repo = "CLI11"; rev = "v${version}"; - sha256 = "1nqri8ahisi00nwh6cynhq5n9iq9iydkysnxj36r2y20yvbi4bxj"; + sha256 = "0hbch0vk8irgmiaxnfqlqys65v1770rxxdfn3d23m2vqyjh0j9l6"; }; nativeBuildInputs = [ cmake ]; From 7a2ed26f98b2b118b9cf1d7d8b0775fdd77218b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 05:39:48 +0000 Subject: [PATCH 2622/3452] codeql: 2.2.1 -> 2.2.3 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 545cc035c929..40294e3f4c75 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.2.1"; + version = "2.2.3"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "0ijgvp2ifs4wnqmxidinwdcpv41iia74nk0xahasnjm8ljvgnnqh"; + sha256 = "029l4f7d6c6kj2arc2zij4r04y36p537c6qaa6v87dd9piz85k0j"; }; nativeBuildInputs = [ From fcede31c257e57927f9abd58aab714b253015d87 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 25 Jun 2020 22:44:19 -0700 Subject: [PATCH 2623/3452] docker: 19.03.11 -> 19.03.12 --- pkgs/applications/virtualization/docker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index da414cd55464..bb92ebc03697 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -197,9 +197,9 @@ rec { }; docker_19_03 = makeOverridable dockerGen { - version = "19.03.11"; - rev = "42e35e61f352e527082521280d5ea3761f0dee50"; - sha256 = "0q4l4z2bg269hj1dqaq02f84zgp3p8idw1cxczw383cjl0ra8xgq"; + version = "19.03.12"; + rev = "48a66213fe1747e8873f849862ff3fb981899fc6"; + sha256 = "0i5xr8q3yjrz5zsjcq63v4g1mzqpingjr1hbf9amk14484i2wkw7"; runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13 From 99b9f84fdce9d4a220535a69292f5d5ad469458a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 06:00:43 +0000 Subject: [PATCH 2624/3452] conftest: 0.18.2 -> 0.19.0 --- pkgs/development/tools/conftest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index eb55bf5dd4c4..6e14c8eb010a 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "conftest"; - version = "0.18.2"; + version = "0.19.0"; src = fetchFromGitHub { owner = "instrumenta"; repo = "conftest"; rev = "v${version}"; - sha256 = "15xzldcmnpfg1hd5zr5i7x2zjrgkwnp4nylxbn9kfic2dpjp1a38"; + sha256 = "0d6n51p4b8jwkfqympwxkqxssgy462m5pgv5qvm6jy5pm566qa08"; }; - vendorSha256 = "1kay7b5rxypj4i0d2iwdlb1mj0qq3zvlrjp34zzv5kywz5gy4144"; + vendorSha256 = "150fj2c9qll39wiqk41w0qms0sdqiacb2z015j38kg60r8f6i4lm"; buildFlagsArray = '' -ldflags= From a5bff99f88b87461c74d08482c7f07b75ea2cc91 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 06:24:25 +0000 Subject: [PATCH 2625/3452] consul: 1.7.4 -> 1.8.0 --- pkgs/servers/consul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index d550a5cb699e..e97958310499 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.7.4"; + version = "1.8.0"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "0yx0ry8gwgvw1mkz3nv4rn2pwslm0q7jxlk70gaw6386mxxmj0sk"; + sha256 = "1rmybh0piqlbsy5ihqy9cmg0vsgg9pnxiza2kia8ww4qx98nvh6y"; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "1lcpldkssbq6qkkq22bvx9jb5klcxr8422mpx47wz39pry8vy9b6"; + vendorSha256 = "12a2x8j4kc1vi3ip0cz81k6anfwac23iqqyz00wf7wpvgxqzcxn3"; deleteVendor = true; preBuild = '' From dbc5704e3f25b36168356cb9f138db88ab967c6e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 19 Jun 2020 10:25:09 +0200 Subject: [PATCH 2626/3452] =?UTF-8?q?ocamlPackages.odoc:=201.5.0=20?= =?UTF-8?q?=E2=86=92=201.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/odoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix index 3e8ac82add4c..8dde7ba56ffb 100644 --- a/pkgs/development/ocaml-modules/odoc/default.nix +++ b/pkgs/development/ocaml-modules/odoc/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "odoc"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "ocaml"; repo = pname; rev = version; - sha256 = "14ilq2glcvda8mfhj27jqqwx3392q8ssp9bq9agz7k1k6ilp9dai"; + sha256 = "0z2nisg1vb5xlk41hqw8drvj90v52wli7zvnih6a844cg6xsvvj2"; }; buildInputs = [ astring cmdliner cppo fpath result tyxml ]; From 7e72cc5f85376c84d82bf4f6b0ad58572aaf74e7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 06:55:40 +0000 Subject: [PATCH 2627/3452] dbmate: 1.8.0 -> 1.9.0 --- pkgs/development/tools/database/dbmate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index ccf7a699dae8..00babb3c824b 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dbmate"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "16grd03r41n0vj5fs7j6jk395zs2q0i878p9nh1ycicy64nzmxky"; + sha256 = "0v00k658b4ca9bpn2yiiy3gq5gr6hms8mlk31wf8svwsjyzjibzr"; }; - vendorSha256 = "1915h1hi2y2sx5jvx84c1j281zaz100gbhyalvg5jqjr1van5s4d"; + vendorSha256 = "00vp925vf9clk5bkw5fvj34id4v548rlssizh52z9psvdizj8q5p"; meta = with stdenv.lib; { description = "Database migration tool"; From 8b21936654f71c1ad6d3b193fdfe0dcdbc6ebdef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 07:00:58 +0000 Subject: [PATCH 2628/3452] ddcutil: 0.9.8 -> 0.9.9 --- pkgs/tools/misc/ddcutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index c2eed30a70d1..0a2664d6a775 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "1r89cfw3ycqwvpfwwiqg8ykc1vyr1gf3ah30mvrmmalgmi6bnx5w"; + sha256 = "1ppiddnrvkbb9iir28kl9hzpww0hpgb05jfxzf07xsqkdfb4qv71"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 02a712166b1d723725de43725d2a9a8e89b00a0f Mon Sep 17 00:00:00 2001 From: Philipp Date: Thu, 25 Jun 2020 15:01:54 +0200 Subject: [PATCH 2629/3452] nheko: 0.7.1 -> 0.7.2 Signed-off-by: Philipp --- .../instant-messengers/nheko/default.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index f3b304564cbe..2f5316c9fe27 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -24,13 +24,13 @@ mkDerivation rec { pname = "nheko"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "12sxibbrn79sxkf9jrm7jrlj7l5vz15claxrrll7pkv9mv44wady"; + sha256 = "1cbhgaf9klgxdirrxj571fqwspm0byl75c1xc40l727a6qswvp7s"; }; nativeBuildInputs = [ @@ -38,20 +38,6 @@ mkDerivation rec { cmake pkgconfig ]; - cmakeFlags = [ - # Can be removed once either https://github.com/NixOS/nixpkgs/pull/85254 or - # https://github.com/NixOS/nixpkgs/pull/73940 are merged - "-DBoost_NO_BOOST_CMAKE=TRUE" - ]; - # commit missing from latest release and recommended by upstream: - # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619263903 - patches = [ - (fetchpatch { - name = "room-ids-escape-patch"; - url = "https://github.com/Nheko-Reborn/nheko/commit/d94ac86816f9f325cba11f71344a3ca99591130d.patch"; - sha256 = "1p0kj4a60l3jf0rfakc88adld7ccg3vfjhzia5rf2i03h35cxw8c"; - }) - ]; buildInputs = [ nlohmann_json From 5a836e0d48d16bea9de953220ca46242b49643c6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 07:38:22 +0000 Subject: [PATCH 2630/3452] elementary-planner: 2.3.5 -> 2.4.2 --- pkgs/applications/office/elementary-planner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index 28a470162cef..e92d7d643374 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "elementary-planner"; - version = "2.3.5"; + version = "2.4.2"; src = fetchFromGitHub { owner = "alainm23"; repo = "planner"; rev = version; - sha256 = "15d51sqb3k59jjishsw1fq5ib50jmhlk194y3nga329damfv8bmy"; + sha256 = "1q5pf9hnkix68idjd1dari8qlzfniazh8xfszj48d0yibhlr99zx"; }; nativeBuildInputs = [ From 683b181d9ebba75c18937b5e4e1ee707c5e31b41 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 07:50:10 +0000 Subject: [PATCH 2631/3452] emplace: 0.3.3 -> 0.3.5 --- pkgs/tools/package-management/emplace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 0ccad3013100..92407e63994b 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.3.3"; + version = "0.3.5"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "0zw7lbm6ly2c607ha9gbriknzqbgh3hkqb83507hah1hanzp7zq9"; + sha256 = "0l68pcln18hgvqayhdnjv70fcs2y7j3fpiyfm3kl0gpykj7l969r"; }; - cargoSha256 = "166nsk3v3w5ji7k8hflvjylz8hkgbxqrdwb03m7l8ak8wgkycxzx"; + cargoSha256 = "0j953c2h5asvr6fvklbdkk7vkdzdbp9zbzxxiic1gjv953gmw0qq"; meta = with lib; { description = "Mirror installed software on multiple machines"; From 49ed40ca901a721b3544b8715552cdc4e189428c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 07:54:23 +0000 Subject: [PATCH 2632/3452] envsubst: 1.1.0 -> 1.2.0 --- pkgs/tools/misc/envsubst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix index af0fa6a76ba9..5bfbb53c1068 100644 --- a/pkgs/tools/misc/envsubst/default.nix +++ b/pkgs/tools/misc/envsubst/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "envsubst"; - version = "1.1.0"; + version = "1.2.0"; goPackagePath = "github.com/a8m/envsubst"; src = fetchFromGitHub { owner = "a8m"; repo = "envsubst"; rev = "v${version}"; - sha256 = "1d6nipagjn40n6iw1p3r489l2km5xjd5db9gbh1vc5sxc617l7yk"; + sha256 = "0zkgjdlw3d5xh7g45bzxqspxr61ljdli8ng4a1k1gk0dls4sva8n"; }; meta = with lib; { From 5358773f8560b41bb09429bba01884487ceb1cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Fri, 26 Jun 2020 10:01:40 +0200 Subject: [PATCH 2633/3452] pythonPackages.progressbar2: 3.51.3 -> 3.51.4 --- pkgs/development/python-modules/progressbar2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index f93669731dd7..5136cf201041 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.51.3"; + version = "3.51.4"; src = fetchPypi { inherit pname version; - sha256 = "ecf687696dd449067f69ef6730c4d4a0189db1f8d1aad9e376358354631d5b2c"; + sha256 = "0dnfw8mdrz78gck4ibnv64cinbp5f7kw349wjgpwv53z6p7jiwhk"; }; propagatedBuildInputs = [ python-utils ]; From f5fc39452d2f32ff26460b9c3324b45098abdd72 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 08:03:14 +0000 Subject: [PATCH 2634/3452] epubcheck: 4.2.3 -> 4.2.4 --- 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 fe8330e9eb47..b40769e55222 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.3"; + version = "4.2.4"; src = fetchzip { url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip"; - sha256 = "0pqvqjc7vzvygddl8x4y0nqiwca883rh8lfqx0ml1a9gdhq0r5k4"; + sha256 = "02iy62b9wa5shxggflx99kv2q9xkilcsq94s0gbfq4m2aqjgzfwx"; }; nativeBuildInputs = [ makeWrapper ]; From cd8e099ffeee27d229371f4e8cba1a8b155e2a48 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 26 Jun 2020 10:23:52 +0200 Subject: [PATCH 2635/3452] convos: fix eval --- pkgs/applications/networking/irc/convos/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index a4eae497bc9d..5d497fe5139c 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang }: +{ stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang +, nixosTests +}: with stdenv.lib; @@ -15,7 +17,7 @@ perlPackages.buildPerlPackage rec { nativeBuildInputs = [ makeWrapper ] ++ optional stdenv.isDarwin [ shortenPerlShebang ]; - + buildInputs = with perlPackages; [ CryptEksblowfish FileHomeDir FileReadBackwards IOSocketSSL IRCUtils JSONValidator LinkEmbedder ModuleInstall From dfcac3fccd0a6fc45be51d1cfe985ca71ccd2246 Mon Sep 17 00:00:00 2001 From: Corbin Date: Fri, 26 Jun 2020 01:22:00 -0700 Subject: [PATCH 2636/3452] python-igraph: Don't use vendored library. Fixes #70543. --- .../development/python-modules/python-igraph/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index a2bf20188ff1..12a327be2a67 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage, fetchPypi, lib, isPy3k -, pkgconfig, igraph }: +, pkgconfig, igraph +, texttable }: buildPythonPackage rec { pname = "python-igraph"; @@ -7,12 +8,18 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ igraph ]; + propagatedBuildInputs = [ texttable ]; src = fetchPypi { inherit pname version; sha256 = "4601638d7d22eae7608cdf793efac75e6c039770ec4bd2cecf76378c84ce7d72"; }; + # NB: We want to use our igraph, not vendored igraph, but even with + # pkg-config on the PATH, their custom setup.py still needs to be explicitly + # told to do it. ~ C. + setupPyGlobalFlags = [ "--use-pkg-config" ]; + doCheck = !isPy3k; meta = { From 80bd9d38e34b4dfcea06b30f9883e1276880d151 Mon Sep 17 00:00:00 2001 From: Lars Jellema Date: Fri, 26 Jun 2020 10:30:00 +0200 Subject: [PATCH 2637/3452] minecraft-server: 1.15.2 -> 1.16.1 --- pkgs/games/minecraft-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index d0ae0a597176..5ba4b4de2f6a 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.15.2"; + version = "1.16.1"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar"; + url = "https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/server.jar"; # sha1 because that comes from mojang via api - sha1 = "bb2b6b1aefcd70dfd1892149ac3a215f6c636b07"; + sha1 = "a412fd69db1f81db3f511c1463fd304675244077"; }; preferLocalBuild = true; From 61800c4281840be088b736f96b458cbcd347c6e6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 10:43:14 +0200 Subject: [PATCH 2638/3452] foo-yc20: fix licenses --- pkgs/applications/audio/foo-yc20/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 643b648fa88d..4ec69c62b1ae 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation { # remove lv2 until https://github.com/sampov2/foo-yc20/issues/6 is resolved postInstallFixup = "rm -rf $out/lib/lv2"; - meta = { + meta = with stdenv.lib; { broken = true; # see: https://github.com/sampov2/foo-yc20/issues/7 description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; homepage = "https://github.com/sampov2/foo-yc20"; - license = "BSD"; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + license = with licenses; [ bsd3 lgpl21 mpl11 ] ; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; }; } From 7f0fde082286e666b2370b1aec4ad09b470e327a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 10:49:33 +0200 Subject: [PATCH 2639/3452] wavesurfer: fix license --- pkgs/applications/misc/audio/wavesurfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index 0ca01c8d2aed..45746a963b29 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation { --prefix PATH : "${stdenv.lib.makeBinPath [ tcl tk ]}" ''; - meta = { + meta = { description = "Tool for recording, playing, editing, viewing and labeling of audio"; homepage = "http://www.speech.kth.se/wavesurfer/"; - license = "BSD"; + license = stdenv.lib.licenses.bsd0; }; } From 50377df233d5f5aa0c8d59433a9d8b1f2c53d051 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 10:51:01 +0200 Subject: [PATCH 2640/3452] gmrun: fix license --- pkgs/applications/misc/gmrun/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index eaee8fb5fb37..8ca4c6061629 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ./gmrun-0.9.2-xdg.patch ]; - meta = { + meta = with stdenv.lib; { description = "Gnome Completion-Run Utility"; longDescription = '' A simple program which provides a "run program" window, featuring a bash-like TAB completion. @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { Running commands in a terminal with CTRL-Enter. URL handlers. ''; homepage = "https://sourceforge.net/projects/gmrun/"; - license = "GPL"; + license = licenses.gpl2; maintainers = []; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } From f0b4511c81c261238a2525f126f82d98d37c8808 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 10:53:23 +0200 Subject: [PATCH 2641/3452] mrxvt: fix license --- pkgs/applications/misc/mrxvt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix index 6717fc3c97f9..4dc70133ec47 100644 --- a/pkgs/applications/misc/mrxvt/default.nix +++ b/pkgs/applications/misc/mrxvt/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation { sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; }; - meta = { + meta = with stdenv.lib; { description = "Lightweight multitabbed feature-rich X11 terminal emulator"; longDescription = " - Multitabbed lightweight terminal emulator based on rxvt. + Multitabbed lightweight terminal emulator based on rxvt. Supports transparency, backgroundimages, freetype fonts, ... "; homepage = "https://sourceforge.net/projects/materm"; - license = "GPL"; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = platforms.linux; }; } From b30ecf06dee49aca6dce6ab47a80070162ca6ed8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 08:54:06 +0000 Subject: [PATCH 2642/3452] freerdp: 2.1.1 -> 2.1.2 --- pkgs/applications/networking/remote/freerdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 414e9d1b9085..11f97206b6eb 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "1avfsx837rjfk50qv3xjccx2309phn04rq6imadqvqpfnyx4ma66"; + sha256 = "1yvi7zd0ic0rv7njd0wi9q1mfvz4d9qrx3i45dd6hcq465wg8dp7"; }; postPatch = '' From ecc80518a63514f516d5abcd3bec57e1013ccb85 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 11:00:19 +0200 Subject: [PATCH 2643/3452] sbagen: fix license --- pkgs/applications/misc/sbagen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix index 821fbe35ca1a..d7d7dd3ab707 100644 --- a/pkgs/applications/misc/sbagen/default.nix +++ b/pkgs/applications/misc/sbagen/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Binaural sound generator"; homepage = "http://uazu.net/sbagen"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; platforms = [ "i686-linux" ]; }; } From ec38614621f762d525aba4ac64dd524bb78be714 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 11:01:57 +0200 Subject: [PATCH 2644/3452] thinking-rock: fix license --- pkgs/applications/misc/thinking-rock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index fd6065010fb6..2b5c9da4b17a 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -32,10 +32,10 @@ stdenv.mkDerivation { installPhase = ":"; - meta = { + meta = with stdenv.lib; { description = "Task management system"; homepage = "http://www.thinkingrock.com.au/"; - license = "CDDL"; # Common Development and Distribution License - platforms = stdenv.lib.platforms.unix; + license = licenses.cddl; + platforms = platforms.unix; }; } From ce37c5b0b41e03cb330a33ce44283965641a9462 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 11:03:54 +0200 Subject: [PATCH 2645/3452] offrss: fix license --- pkgs/applications/networking/offrss/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index 679e966373b6..03159a61a404 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation { sha256 = "1akw1x84jj2m9z60cvlvmz21qwlaywmw18pl7lgp3bj5nw6250p6"; }; - meta = { + meta = with stdenv.lib; { homepage = "http://vicerveza.homeunix.net/~viric/cgi-bin/offrss"; description = "Offline RSS/Atom reader"; - license="AGPLv3+"; - maintainers = with stdenv.lib.maintainers; [viric]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ viric ]; platforms = stdenv.lib.platforms.linux; }; } From 83dda5708229d17a7a1ad9aed425a4673943ab6b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 11:05:24 +0200 Subject: [PATCH 2646/3452] emboss: fix license --- pkgs/applications/science/biology/emboss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index e2374bcd1e2f..2eeb17520f20 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation { specially developed for the needs of the molecular biology (e.g. EMBnet) user community, including libraries. The software automatically copes with data in a variety of formats and even allows transparent retrieval of - sequence data from the web.''; - license = "GPL2"; + sequence data from the web.''; + license = stdenv.lib.licenses.gpl2; homepage = "http://emboss.sourceforge.net/"; }; } From c317091b5af46a7117375b34908a01f19774cdb6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 26 Jun 2020 11:06:35 +0200 Subject: [PATCH 2647/3452] mrbayes: fix license --- pkgs/applications/science/biology/mrbayes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/applications/science/biology/mrbayes/default.nix index 8ee7bccf075f..0ebd14411216 100644 --- a/pkgs/applications/science/biology/mrbayes/default.nix +++ b/pkgs/applications/science/biology/mrbayes/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { builder = ./builder.sh; buildInputs = [readline]; - meta = { + meta = with stdenv.lib; { description = "Bayesian Inference of Phylogeny"; longDescription = '' Bayesian inference of phylogeny is based upon a @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { MrBayes uses a simulation technique called Markov chain Monte Carlo (or MCMC) to approximate the posterior probabilities of trees. ''; - license = "GPL2"; + license = licenses.gpl2; homepage = "http://mrbayes.csit.fsu.edu/"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } From 1ba10fe5824867d55b727215e5e71705164b17a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 09:14:04 +0000 Subject: [PATCH 2648/3452] gbenchmark: 1.5.0 -> 1.5.1 --- pkgs/development/libraries/gbenchmark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index cafbe116b1ce..e2734c6b1998 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "0r9dbg4cbk47gwmayys31a83m3y67k0kh1f6pl8i869rbd609ndh"; + sha256 = "16xlk8h4mfszl4rig22fgpj9kw312az22981ph6pmkf35xsvvv66"; }; nativeBuildInputs = [ cmake ]; From 335c4876866db69867870f470fb313d52f9b9868 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 22 Jun 2020 13:14:21 +0200 Subject: [PATCH 2649/3452] slurm: remove obsolete dependencies libssh and openssl are not required anymore --- pkgs/servers/computing/slurm/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 1f09c98377f1..4c7e68359a0d 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl -, python, munge, perl, pam, openssl, zlib, shadow, coreutils +, python, munge, perl, pam, zlib, shadow, coreutils , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl -, readline, freeipmi, libssh2, xorg, lz4, rdma-core, nixosTests +, readline, freeipmi, xorg, lz4, rdma-core, nixosTests # enable internal X11 support via libssh2 , enableX11 ? true }: @@ -37,22 +37,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ - curl python munge perl pam openssl zlib + curl python munge perl pam zlib libmysqlclient ncurses gtk2 lz4 rdma-core lua hwloc numactl readline freeipmi shadow.su - ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; + ] ++ stdenv.lib.optionals enableX11 [ xorg.xauth ]; configureFlags = with stdenv.lib; [ "--with-freeipmi=${freeipmi}" "--with-hwloc=${hwloc.dev}" "--with-lz4=${lz4.dev}" "--with-munge=${munge}" - "--with-ssl=${openssl.dev}" "--with-zlib=${zlib}" "--with-ofed=${rdma-core}" "--sysconfdir=/etc/slurm" ] ++ (optional (gtk2 == null) "--disable-gtktest") - ++ (optional enableX11 "--with-libssh2=${libssh2.dev}") ++ (optional (!enableX11) "--disable-x11"); From b8703b4a92980a8fddd65baa3f32ed22f590f8e5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 23 Jun 2020 13:08:55 +0200 Subject: [PATCH 2650/3452] slurm: add patch to allow full path lengths in --get-user-env Fix fallout from https://github.com/NixOS/nixpkgs/pull/90041 and 5d8f61f3bfb8f93751c1e455f51393f10d507e0f, which fixes the crash of slurmd but "sbatch --get-user-env" did not work properly. --- pkgs/servers/computing/slurm/common-env-echo.patch | 13 +++++++++++++ pkgs/servers/computing/slurm/default.nix | 6 ++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/servers/computing/slurm/common-env-echo.patch diff --git a/pkgs/servers/computing/slurm/common-env-echo.patch b/pkgs/servers/computing/slurm/common-env-echo.patch new file mode 100644 index 000000000000..4236421a63d2 --- /dev/null +++ b/pkgs/servers/computing/slurm/common-env-echo.patch @@ -0,0 +1,13 @@ +diff --git a/src/common/env.c b/src/common/env.c +index 987846d..73d3b3b 100644 +--- a/src/common/env.c ++++ b/src/common/env.c +@@ -1941,7 +1941,7 @@ char **env_array_user_default(const char *username, int timeout, int mode, + char **env = NULL; + char *starttoken = "XXXXSLURMSTARTPARSINGHEREXXXX"; + char *stoptoken = "XXXXSLURMSTOPPARSINGHEREXXXXX"; +- char cmdstr[256], *env_loc = NULL; ++ char cmdstr[MAXPATHLEN], *env_loc = NULL; + char *stepd_path = NULL; + int fd1, fd2, fildes[2], found, fval, len, rc, timeleft; + int buf_read, buf_rem, config_timeout; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 4c7e68359a0d..1ec807f0bf82 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -22,6 +22,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ + # increase string length to allow for full + # path of 'echo' in nix store + ./common-env-echo.patch + ]; + prePatch = '' substituteInPlace src/common/env.c \ --replace "/bin/echo" "${coreutils}/bin/echo" From e9ee34c806d085109672f42cdd60ea9635af1028 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 26 Jun 2020 04:20:00 -0500 Subject: [PATCH 2651/3452] starship: install completions --- pkgs/tools/misc/starship/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 3fec20f95bb6..5352b13675f0 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, installShellFiles , libiconv, Security }: rustPlatform.buildRustPackage rec { @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "17wc9f07308a97dsmrkq74w2r639sqms0hwh8gavwxycj7wq7xz2"; }; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -22,6 +22,13 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; + postInstall = '' + for shell in bash fish zsh; do + $out/bin/starship completions $shell > starship.$shell + installShellCompletion starship.$shell + done + ''; + cargoSha256 = "1nvs68qxygi2l43vxw890r40px35dvzbcg6qmrm09g60ykd8pjv2"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; From 10d6387543d1ea442504e670a4440436d4d0020a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 26 Jun 2020 04:20:00 -0500 Subject: [PATCH 2652/3452] starship: add marsam to maintainers --- pkgs/tools/misc/starship/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 5352b13675f0..5ce9898a854c 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { description = "A minimal, blazing fast, and extremely customizable prompt for any shell"; homepage = "https://starship.rs"; license = licenses.isc; - maintainers = with maintainers; [ bbigras davidtwco filalex77 Frostman ]; + maintainers = with maintainers; [ bbigras davidtwco filalex77 Frostman marsam ]; platforms = platforms.all; }; } From d8cab5ba0b95359c89f592ac9cdf5a1d3b600cda Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 09:22:04 +0000 Subject: [PATCH 2653/3452] ghq: 1.1.1 -> 1.1.2 --- .../version-management/git-and-tools/ghq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index 330f81078ea4..288116ce2c7b 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ghq"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "x-motemen"; repo = "ghq"; rev = "v${version}"; - sha256 = "1gfpvaf10kqgxx1clzsn38n9r4p171zf0z1pf0dybihh6g6hgylj"; + sha256 = "1qzrycmd26f4q36z3rblfxp7jngqgmspb9385vpfwv9laiw3sqrg"; }; - vendorSha256 = "0k2hhx3l3cj3lv2y4w8286sbl7d11cssb99jy7hzskbxbhmalvcj"; + vendorSha256 = "0x347ljj9q3zi0zf8x13dhvsydv9vg4qc5l1kc2y56v0w8hlb4p7"; buildFlagsArray = '' -ldflags= From 8dd2ae63bb80056516f769e05a4367a635737c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 26 Jun 2020 11:48:14 +0200 Subject: [PATCH 2654/3452] qutebrowser: 1.12.0 -> 1.13.0 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 773585183515..6256f4039b8e 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.12.0"; + version = "1.13.0"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0pywyhi4v6ymxpn85grrdr1agmcxsnm5jfqf3rlxqx5swbnxbfs1"; + sha256 = "1xq0a0mcssc1ss4fvhhwr75dhlh3nr9w46i2gmqczzh5cynk1sfk"; }; # Needs tox From 11521b72f96e8550ae2f6db38e74b3d4dd7ba45c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 09:51:36 +0000 Subject: [PATCH 2655/3452] gotestsum: 0.4.2 -> 0.5.1 --- pkgs/development/tools/gotestsum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index fba4585155ed..fc9fdee0b39c 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "0zifha3mj7386q2accrdmd8qniingadxz1v8vg4mciwi723msr44"; + sha256 = "079cyk12r662z8njaawdqfjab1giy5xkjhln2rns03j5n67ixhgj"; }; - vendorSha256 = "0d45i8wm35m2cdbk48razkdr49a3hfwnp84inlz7hj054cq6vimi"; + vendorSha256 = "1injixhllv41glb3yz276gjrkiwwkfimrhb367d2pvjpzqmhplan"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From 2366150cab4816c5b15271f60068ff438c8e6489 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 26 Jun 2020 11:48:18 +0200 Subject: [PATCH 2656/3452] mruby: Fix build with bison 3.6 --- .../compilers/mruby/bison-36-compat.patch | 59 +++++++++++++++++++ pkgs/development/compilers/mruby/default.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/compilers/mruby/bison-36-compat.patch diff --git a/pkgs/development/compilers/mruby/bison-36-compat.patch b/pkgs/development/compilers/mruby/bison-36-compat.patch new file mode 100644 index 000000000000..674a88fe4c23 --- /dev/null +++ b/pkgs/development/compilers/mruby/bison-36-compat.patch @@ -0,0 +1,59 @@ +From acab088fd6af0b2ef2df1396aeb93bfc2e020fa5 Mon Sep 17 00:00:00 2001 +From: "Yukihiro \"Matz\" Matsumoto" +Date: Mon, 27 Apr 2020 18:52:43 +0900 +Subject: [PATCH 1/2] Updating `parse.y for recent `bison` (retry). + +--- + mrbgems/mruby-compiler/core/parse.y | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y +index 6a1faf4e..2a4f740e 100644 +--- a/mrbgems/mruby-compiler/core/parse.y ++++ b/mrbgems/mruby-compiler/core/parse.y +@@ -1323,7 +1323,7 @@ heredoc_end(parser_state *p) + + %} + +-%pure-parser ++%define api.pure + %parse-param {parser_state *p} + %lex-param {parser_state *p} + +-- +2.27.0 + +From 3cc682d943b29e84928a847a23f411ddbace74b7 Mon Sep 17 00:00:00 2001 +From: "Yukihiro \"Matz\" Matsumoto" +Date: Fri, 15 May 2020 12:30:13 +0900 +Subject: [PATCH 2/2] Remove `YYERROR_VERBOSE` which no longer supported since + `bison 3.6`. + +Instead we added `%define parse.error verbose`. +--- + mrbgems/mruby-compiler/core/parse.y | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y +index 2a4f740e..eee6a5e5 100644 +--- a/mrbgems/mruby-compiler/core/parse.y ++++ b/mrbgems/mruby-compiler/core/parse.y +@@ -9,7 +9,6 @@ + #ifdef PARSER_DEBUG + # define YYDEBUG 1 + #endif +-#define YYERROR_VERBOSE 1 + #define YYSTACK_USE_ALLOCA 1 + + #include +@@ -1323,6 +1322,7 @@ heredoc_end(parser_state *p) + + %} + ++%define parse.error verbose + %define api.pure + %parse-param {parser_state *p} + %lex-param {parser_state *p} +-- +2.27.0 + diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index f6a7fc2f1433..54bb5cd701cf 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ruby bison ]; + patches = [ ./bison-36-compat.patch ]; + # Necessary so it uses `gcc` instead of `ld` for linking. # https://github.com/mruby/mruby/blob/35be8b252495d92ca811d76996f03c470ee33380/tasks/toolchains/gcc.rake#L25 preBuild = if stdenv.isLinux then "unset LD" else null; From bfe2ba32b8951d1b5799a6594ceb4fac9da0d7ef Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 26 Jun 2020 11:48:35 +0200 Subject: [PATCH 2657/3452] mruby: 2.1.0 -> 2.1.1 --- pkgs/development/compilers/mruby/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index 54bb5cd701cf..2589c47c3bec 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -1,17 +1,17 @@ -{ stdenv, ruby, bison, fetchFromGitHub }: +{ stdenv, ruby, bison, rake, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mruby"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "mruby"; repo = "mruby"; rev = version; - sha256 = "1y072c7dh9jf8xwy7kia6cb4dkpspq4zf24ssn7zm5f46p4waxni"; + sha256 = "gEEb0Vn/G+dNgeY6r0VP8bMSPrEOf5s+0GoOcnIPtEU="; }; - nativeBuildInputs = [ ruby bison ]; + nativeBuildInputs = [ ruby bison rake ]; patches = [ ./bison-36-compat.patch ]; From c532bfcefd9c4ff1754d8509c41a02cb35264c11 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 10:00:41 +0000 Subject: [PATCH 2658/3452] gpodder: 3.10.15 -> 3.10.16 --- pkgs/applications/audio/gpodder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 933c9ac02035..4a21868f0972 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.15"; + version = "3.10.16"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0ghbanj142n0hgydzfjmnkdgri2kswsjal3mn10c723kih4ir4yr"; + sha256 = "0pbpaasd7kj6y25nm45y1qyb9sxd4570f7g6zkfcpf6pa3nx7qkq"; }; patches = [ From 034395d0e57aff1732d5ba8e8d563495e7edd06b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 17 May 2020 12:00:32 +0200 Subject: [PATCH 2659/3452] ocamlPackages.opam-core: init at 2.0.7 --- .../ocaml-modules/opam-core/default.nix | 20 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/ocaml-modules/opam-core/default.nix diff --git a/pkgs/development/ocaml-modules/opam-core/default.nix b/pkgs/development/ocaml-modules/opam-core/default.nix new file mode 100644 index 000000000000..22c1ecdf7032 --- /dev/null +++ b/pkgs/development/ocaml-modules/opam-core/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, unzip +, opam, ocamlgraph, re, cppo }: + +buildDunePackage rec { + pname = "opam-core"; + + inherit (opam) src version; + + nativeBuildInputs = [ unzip cppo ]; + propagatedBuildInputs = [ ocamlgraph re ]; + + # get rid of check for curl at configure time + # opam-core does not call curl at run time + configureFlags = [ "--disable-checks" ]; + + meta = opam.meta // { + description = "Small standard library extensions, and generic system interaction modules used by opam"; + maintainers = with lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3294099ca5dd..41ca0fc3db56 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -676,6 +676,10 @@ let omd = callPackage ../development/ocaml-modules/omd { }; + opam-core = callPackage ../development/ocaml-modules/opam-core { + inherit (pkgs) opam unzip; + }; + opam-file-format = callPackage ../development/ocaml-modules/opam-file-format { }; opium = callPackage ../development/ocaml-modules/opium { }; From ee1ea8609c5475e88dd57888f0e6096e1dfc9557 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 20 May 2020 23:26:32 +0200 Subject: [PATCH 2660/3452] ocamlPackages.opam-format: init at 2.0.7 --- .../ocaml-modules/opam-format/default.nix | 21 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/ocaml-modules/opam-format/default.nix diff --git a/pkgs/development/ocaml-modules/opam-format/default.nix b/pkgs/development/ocaml-modules/opam-format/default.nix new file mode 100644 index 000000000000..422729e6d0df --- /dev/null +++ b/pkgs/development/ocaml-modules/opam-format/default.nix @@ -0,0 +1,21 @@ +{ lib, buildDunePackage, unzip, opam-core, opam-file-format }: + +buildDunePackage rec { + pname = "opam-format"; + + inherit (opam-core) src version; + + minimumOCamlVersion = "4.02.3"; + + # get rid of check for curl at configure time + # opam-format does not call curl at run time + configureFlags = [ "--disable-checks" ]; + + nativeBuildInputs = [ unzip ]; + propagatedBuildInputs = [ opam-core opam-file-format ]; + + meta = opam-core.meta // { + description = "Definition of opam datastructures and its file interface"; + maintainers = with lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 41ca0fc3db56..ac0c5c7afb89 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -682,6 +682,10 @@ let opam-file-format = callPackage ../development/ocaml-modules/opam-file-format { }; + opam-format = callPackage ../development/ocaml-modules/opam-format { + inherit (pkgs) unzip; + }; + opium = callPackage ../development/ocaml-modules/opium { }; opium_kernel = callPackage ../development/ocaml-modules/opium_kernel { }; From b604e4aedde44c2d76b4904d4463e62dc58ef27f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 20 May 2020 23:27:01 +0200 Subject: [PATCH 2661/3452] ocamlPackages.opam-repository: init at 2.0.7 --- .../ocaml-modules/opam-repository/default.nix | 24 +++++++++++++++ .../opam-repository/download-tool.patch | 29 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 +++ 3 files changed, 57 insertions(+) create mode 100644 pkgs/development/ocaml-modules/opam-repository/default.nix create mode 100644 pkgs/development/ocaml-modules/opam-repository/download-tool.patch diff --git a/pkgs/development/ocaml-modules/opam-repository/default.nix b/pkgs/development/ocaml-modules/opam-repository/default.nix new file mode 100644 index 000000000000..1801a9e1c865 --- /dev/null +++ b/pkgs/development/ocaml-modules/opam-repository/default.nix @@ -0,0 +1,24 @@ +{ lib, buildDunePackage, unzip, opam-format, curl }: + +buildDunePackage rec { + pname = "opam-repository"; + + minimumOCamlVersion = "4.02"; + + inherit (opam-format) src version; + + patches = [ ./download-tool.patch ]; + postPatch = '' + substituteInPlace src/repository/opamRepositoryConfig.ml \ + --replace "SUBSTITUTE_NIXOS_CURL_PATH" "\"${curl}/bin/curl\"" + ''; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ curl ]; + propagatedBuildInputs = [ opam-format ]; + + meta = opam-format.meta // { + description = "OPAM repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends"; + maintainers = with lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/opam-repository/download-tool.patch b/pkgs/development/ocaml-modules/opam-repository/download-tool.patch new file mode 100644 index 000000000000..5af720adca91 --- /dev/null +++ b/pkgs/development/ocaml-modules/opam-repository/download-tool.patch @@ -0,0 +1,29 @@ +diff --git a/src/repository/opamRepositoryConfig.ml b/src/repository/opamRepositoryConfig.ml +index c2954c1d..528fc621 100644 +--- a/src/repository/opamRepositoryConfig.ml ++++ b/src/repository/opamRepositoryConfig.ml +@@ -27,23 +27,7 @@ type 'a options_fun = + 'a + + let default = { +- download_tool = lazy ( +- try +- let tools = +- if OpamStd.Sys.(os () = Darwin) +- then ["wget", `Default; "curl", `Curl] +- else ["curl", `Curl; "wget", `Default] +- in +- let cmd, kind = +- List.find (fun (c,_) -> OpamSystem.resolve_command c <> None) tools +- in +- [ CIdent cmd, None ], kind +- with Not_found -> +- OpamConsole.error_and_exit `Configuration_error +- "Could not find a suitable download command. Please make sure you \ +- have either \"curl\" or \"wget\" installed, or specify a custom \ +- command through variable OPAMFETCH." +- ); ++ download_tool = lazy ([ CIdent SUBSTITUTE_NIXOS_CURL_PATH, None ], `Curl); + validation_hook = None; + retries = 3; + force_checksums = None; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ac0c5c7afb89..3eee3175ff9f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -686,6 +686,10 @@ let inherit (pkgs) unzip; }; + opam-repository = callPackage ../development/ocaml-modules/opam-repository { + inherit (pkgs) unzip; + }; + opium = callPackage ../development/ocaml-modules/opium { }; opium_kernel = callPackage ../development/ocaml-modules/opium_kernel { }; From c4636f6101d48eb347f29635d8a46069c6211d7b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 20 May 2020 23:27:46 +0200 Subject: [PATCH 2662/3452] ocamlPackages.opam-state: init at 2.0.7 --- .../ocaml-modules/opam-state/default.nix | 19 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/ocaml-modules/opam-state/default.nix diff --git a/pkgs/development/ocaml-modules/opam-state/default.nix b/pkgs/development/ocaml-modules/opam-state/default.nix new file mode 100644 index 000000000000..156976a4a5ad --- /dev/null +++ b/pkgs/development/ocaml-modules/opam-state/default.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, unzip, opam, opam-repository }: + +buildDunePackage rec { + pname = "opam-state"; + + inherit (opam) src version; + + # get rid of check for curl at configure time + # opam-state does not call curl at run time + configureFlags = [ "--disable-checks" ]; + + nativeBuildInputs = [ unzip ]; + propagatedBuildInputs = [ opam-repository ]; + + meta = opam.meta // { + description = "OPAM development library handling the ~/.opam hierarchy, repository and switch states"; + maintainers = with lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3eee3175ff9f..12441f44e6e1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -690,6 +690,10 @@ let inherit (pkgs) unzip; }; + opam-state = callPackage ../development/ocaml-modules/opam-state { + inherit (pkgs) unzip; + }; + opium = callPackage ../development/ocaml-modules/opium { }; opium_kernel = callPackage ../development/ocaml-modules/opium_kernel { }; From c4ca9ba10d66ca5479d816f60c251b5593536d97 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 20 May 2020 23:51:37 +0200 Subject: [PATCH 2663/3452] dune-release: init at 1.3.3 --- .../tools/ocaml/dune-release/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 4 ++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/ocaml/dune-release/default.nix diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix new file mode 100644 index 000000000000..ba8fa4bba6fc --- /dev/null +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -0,0 +1,48 @@ +{ lib, buildDunePackage, fetchurl, makeWrapper +, curly, fmt, bos, cmdliner, re, rresult, logs +, odoc, opam-format, opam-core, opam-state +, opam, git, findlib, mercurial, bzip2, gnutar, coreutils +, alcotest, mdx +}: + +# don't include dune as runtime dep, so user can +# choose between dune and dune_2 +let runtimeInputs = [ opam findlib git mercurial bzip2 gnutar coreutils ]; +in buildDunePackage rec { + pname = "dune-release"; + version = "1.3.3"; + + minimumOCamlVersion = "4.06"; + + src = fetchurl { + url = "https://github.com/ocamllabs/${pname}/releases/download/${version}/${pname}-${version}.tbz"; + sha256 = "04qmgvjh1233ri878wi5kifdd1070w5pbfkd8yk3nnqnslz35zlb"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core + rresult logs odoc bos ]; + checkInputs = [ alcotest mdx ]; + doCheck = true; + + useDune2 = true; + + # remove check for curl in PATH, since curly is patched + # to have a fixed path to the binary in nix store + postPatch = '' + sed -i '/must_exist (Cmd\.v "curl"/d' lib/github.ml + ''; + + # tool specific env vars have been deprecated, use PATH + preFixup = '' + wrapProgram $out/bin/dune-release \ + --prefix PATH : "${lib.makeBinPath runtimeInputs}" + ''; + + meta = with lib; { + description = "Release dune packages in opam"; + homepage = "https://github.com/ocamllabs/dune-release"; + license = licenses.isc; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfb93600a993..14bc46ccb9d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1739,7 +1739,7 @@ in dua = callPackage ../tools/misc/dua { }; - inherit (ocamlPackages) dune dune_2; + inherit (ocamlPackages) dune dune_2 dune-release; duperemove = callPackage ../tools/filesystems/duperemove { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 12441f44e6e1..ab14c4876a6a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -228,6 +228,10 @@ let dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { }; + dune-release = callPackage ../development/tools/ocaml/dune-release { + inherit (pkgs) opam git mercurial coreutils gnutar bzip2; + }; + duration = callPackage ../development/ocaml-modules/duration { }; earley = callPackage ../development/ocaml-modules/earley { }; From 3dec516b7dad33e390415b3a0c9b86994f39778a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 10:20:47 +0000 Subject: [PATCH 2664/3452] grpcui: 0.2.1 -> 1.0.0 --- pkgs/tools/networking/grpcui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix index 6bae95298fe2..c2a1ca44158d 100644 --- a/pkgs/tools/networking/grpcui/default.nix +++ b/pkgs/tools/networking/grpcui/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpcui"; - version = "0.2.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "fullstorydev"; repo = pname; rev = "v${version}"; - sha256 = "0dcah6bamjqyp9354qrd1cykdr5k5l93hh7qcy5b4nkag9531gl0"; + sha256 = "0b6rc294v8jagk79hcjbaldfi7y7idx8bknsbdi3djym5rspdg6s"; }; - vendorSha256 = "0m9nn8x0ji0n9v3d5w5z3grwv0zh8ijvh92jqjpcfv4bcjr5vsjr"; + vendorSha256 = "0wih9xvpgqqd82v1pxy5rslrsd6wsl0ys1bi1mf373dnfq5vh5a9"; meta = with lib; { description = "An interactive web UI for gRPC, along the lines of postman"; From 63bcf4f4ecd5c75765ef9818d3b2e77d8b0df35c Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Fri, 26 Jun 2020 12:24:42 +0200 Subject: [PATCH 2665/3452] trytond: convert to python package --- .../python-modules}/trytond/default.nix | 27 +++++++++++++++---- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 25 insertions(+), 6 deletions(-) rename pkgs/{applications/office => development/python-modules}/trytond/default.nix (79%) diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix similarity index 79% rename from pkgs/applications/office/trytond/default.nix rename to pkgs/development/python-modules/trytond/default.nix index 15d5fa6748ac..4b8afbddb379 100644 --- a/pkgs/applications/office/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -1,14 +1,31 @@ { stdenv -, python3Packages +, buildPythonApplication +, fetchPypi +, mock +, lxml +, relatorio +, genshi +, dateutil +, polib +, python-sql +, werkzeug +, wrapt +, passlib +, bcrypt +, pydot +, python-Levenshtein +, simplejson +, html2text +, psycopg2 , withPostgresql ? true }: with stdenv.lib; -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "trytond"; version = "5.6.2"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "0mlfl34zmmqrwip39mvhkk0h6dsljqwff2mk1ldahm253d4vzflp"; }; @@ -16,10 +33,10 @@ python3Packages.buildPythonApplication rec { # Tells the tests which database to use DB_NAME = ":memory:"; - buildInputs = with python3Packages; [ + buildInputs = [ mock ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ lxml relatorio genshi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14aed9d373b4..8ca9361eb113 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7193,7 +7193,7 @@ in tryton = callPackage ../applications/office/tryton { }; - trytond = callPackage ../applications/office/trytond { }; + trytond = with python3Packages; toPythonApplication trytond; omapd = callPackage ../tools/security/omapd { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a3cbae305cd..4293d8e0eae3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6056,6 +6056,8 @@ in { tqdm = callPackage ../development/python-modules/tqdm { }; + trytond = callPackage ../development/python-modules/trytond { }; + smmap = callPackage ../development/python-modules/smmap { }; smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 From 0ec0fd373b0589f450b426a484d123b08748a7bc Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Thu, 25 Jun 2020 12:48:52 +0200 Subject: [PATCH 2666/3452] sentry-sdk: add missing dependencies --- pkgs/development/python-modules/sentry-sdk/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index ef2680bc4c6c..9d2a533ecb6e 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -17,6 +17,8 @@ , stdenv , tornado , urllib3 +, trytond +, werkzeug }: buildPythonPackage rec { @@ -28,10 +30,10 @@ buildPythonPackage rec { sha256 = "0e5e947d0f7a969314aa23669a94a9712be5a688ff069ff7b9fc36c66adc160c"; }; - checkInputs = [ django flask tornado bottle rq falcon sqlalchemy ] + checkInputs = [ django flask tornado bottle rq falcon sqlalchemy werkzeug ] ++ stdenv.lib.optionals isPy3k [ celery pyramid sanic aiohttp ]; - propagatedBuildInputs = [ urllib3 certifi ]; + propagatedBuildInputs = [ urllib3 certifi trytond ]; meta = with stdenv.lib; { homepage = "https://github.com/getsentry/sentry-python"; From 4afa2702af1de94fbb86f0997962e0be44aa7757 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Wed, 24 Jun 2020 18:04:53 +0200 Subject: [PATCH 2667/3452] octoprint: freeze dependencies --- pkgs/applications/misc/octoprint/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 7d613f376758..793ea927a01f 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -16,11 +16,17 @@ let py = python3.override { self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ - (mkOverride "flask" "0.12.5" "fac2b9d443e49f7e7358a444a3db5950bdd0324674d92ba67f8f1f15f876b14f") - (mkOverride "flaskbabel" "0.12.2" "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii") - (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") - (mkOverride "psutil" "5.6.7" "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa") - (mkOverride "watchdog" "0.9.0" "07cnvvlpif7a6cg4rav39zq8fxa5pfqawchr46433pij0y6napwn") + (mkOverride "flask" "0.12.5" "fac2b9d443e49f7e7358a444a3db5950bdd0324674d92ba67f8f1f15f876b14f") + (mkOverride "flask_assets" "0.12" "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0") + (mkOverride "flaskbabel" "0.12.2" "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii") + (mkOverride "flask_login" "0.4.1" "1v2j8zd558xfmgn3rfbw0xz4vizjcnk8kqw52q4f4d9ygfnc25f8") + (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") + (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") + (mkOverride "psutil" "5.6.7" "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa") + (mkOverride "watchdog" "0.9.0" "07cnvvlpif7a6cg4rav39zq8fxa5pfqawchr46433pij0y6napwn") + (mkOverride "werkzeug" "0.16.1" "010zmhyfbp4d56c1rgalwi188imjlkv9g7rm25jrvify6xnqalxk") + (mkOverride "websocket_client" "0.56.0" "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z") + (mkOverride "wrapt" "1.11.2" "1q81762dgsgrd12f8qc39zk8s5wll3m5xc32jdmlf6cls4gh4njn") # Octoprint holds back jinja2 to 2.8.1 due to breaking changes. # This old version does not have updated test config for pytest 4, From fdfa609ae995e3bbf1f36a4850910ad116ff221d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 26 Jun 2020 12:48:36 +0200 Subject: [PATCH 2668/3452] signal-desktop: 1.34.2 -> 1.34.3 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index dae1513884ab..d324de811498 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.34.2"; # Please backport all updates to the stable channel. + version = "1.34.3"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0l0i6v6n6iyq1zb2rlgfjnsk37kzjqgglk824vl5kp8qbq0li6b6"; + sha256 = "1723h8fwclv07n5lcsqw3snmfhpigkrj609fayg0aycxgi3321h6"; }; nativeBuildInputs = [ From 3d2c5994587e1df63e94470372211e05a0a7c0a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Jun 2020 12:52:48 +0200 Subject: [PATCH 2669/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-6-g17421b6 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/f94245ebd389a3f37c8c5ade8dd9faf4f288721b. --- .../haskell-modules/hackage-packages.nix | 348 ++++++++++++++---- 1 file changed, 279 insertions(+), 69 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7c8ad01277b4..2b3b0086c26a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3092,6 +3092,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ChasingBottoms_1_3_1_9" = callPackage + ({ mkDerivation, array, base, containers, mtl, QuickCheck, random + , syb + }: + mkDerivation { + pname = "ChasingBottoms"; + version = "1.3.1.9"; + sha256 = "1acsmvdwsgry0i0qhmz0img71gq97wikmn9zgbqppl4n8a1d7bvh"; + libraryHaskellDepends = [ + base containers mtl QuickCheck random syb + ]; + testHaskellDepends = [ + array base containers mtl QuickCheck random syb + ]; + description = "For testing partial and infinite values"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "CheatSheet" = callPackage ({ mkDerivation, base, containers, directory }: mkDerivation { @@ -24806,6 +24825,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-yaml_1_1_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, string-qq, tasty + , tasty-discover, tasty-hunit, text, unordered-containers, vector + , yaml + }: + mkDerivation { + pname = "aeson-yaml"; + version = "1.1.0.0"; + sha256 = "1kyrh2w3qpzwm7kpb4rkrzi22kqqz1vcjw1f59wdkl8a5hffkv6y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring string-qq tasty tasty-discover tasty-hunit + unordered-containers yaml + ]; + testToolDepends = [ tasty-discover ]; + description = "Output any Aeson value as YAML (pure Haskell library)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "affection" = callPackage ({ mkDerivation, base, bytestring, clock, containers, glib, linear , monad-loops, monad-parallel, mtl, OpenGL, sdl2, stm, text, uuid @@ -31045,6 +31088,8 @@ self: { pname = "apply-refact"; version = "0.7.0.0"; sha256 = "1facic5lbc9xih6w1kfr3inwvada6y98n9xgc6iv6r057zr8jfp0"; + revision = "1"; + editedCabalFile = "0ilyhm6nz1mkjdq13pgzgplmmfqrv6b5ailyhvbds362pqjqw72q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -31067,7 +31112,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "apply-refact" = callPackage + "apply-refact_0_8_0_0" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact , silently, syb, tasty, tasty-expected-failure, tasty-golden @@ -31096,6 +31141,37 @@ self: { ]; description = "Perform refactorings specified by the refact library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "apply-refact" = callPackage + ({ mkDerivation, base, containers, directory, extra, filemanip + , filepath, ghc, ghc-boot-th, ghc-exactprint, mtl + , optparse-applicative, process, refact, silently, syb, tasty + , tasty-expected-failure, tasty-golden, transformers, unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.8.1.0"; + sha256 = "1mnp33c8dghgmn62czyrbmw86czhznbhb75ac1ps1is1p1ik6mih"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory extra filemanip ghc ghc-exactprint mtl + process refact syb transformers unix-compat + ]; + executableHaskellDepends = [ + base containers directory extra filemanip filepath ghc ghc-boot-th + ghc-exactprint mtl optparse-applicative process refact syb + transformers unix-compat + ]; + testHaskellDepends = [ + base containers directory extra filemanip filepath ghc ghc-boot-th + ghc-exactprint mtl optparse-applicative process refact silently syb + tasty tasty-expected-failure tasty-golden transformers unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = stdenv.lib.licenses.bsd3; }) {}; "apportionment" = callPackage @@ -35635,8 +35711,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "3.0.0"; - sha256 = "0gvp65w33pak29min2bym0gnhf9c8ciasv1c15xkvrr7cdgsdwhg"; + version = "3.0.1"; + sha256 = "17f41ppgc4irahp1g3ngrdb24kqhdfld11jdmc6cw6mg2r820l8i"; libraryHaskellDepends = [ aeson base bytestring case-insensitive http-client http-types path path-io safe-exceptions-checked template-haskell text @@ -36175,7 +36251,7 @@ self: { "b9" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bifunctors , binary, boxes, bytestring, conduit, conduit-extra, ConfigFile - , directory, exceptions, extensible-effects, filepath, free + , dhall, directory, exceptions, extensible-effects, filepath, free , hashable, hspec, hspec-expectations, lens, monad-control, mtl , optparse-applicative, parallel, parsec, pretty, pretty-show , process, QuickCheck, random, shake, syb, tagged, template, text @@ -36183,17 +36259,18 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.69.0"; - sha256 = "0r2iwv3ykh04d7qq9nskrj4m3xwlhhlyxzh38vij65gx8jiy2nwa"; + version = "1.0.0"; + sha256 = "0bny8pn98yyswhp7xd78d3gjb56ld6c5cpskx38iibjnzrzq3jf7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bifunctors binary boxes - bytestring conduit conduit-extra ConfigFile directory exceptions - extensible-effects filepath free hashable hspec hspec-expectations - lens monad-control mtl parallel parsec pretty pretty-show process - QuickCheck random shake syb tagged template text time transformers - unordered-containers vector yaml + bytestring conduit conduit-extra ConfigFile dhall directory + exceptions extensible-effects filepath free hashable hspec + hspec-expectations lens monad-control mtl optparse-applicative + parallel parsec pretty pretty-show process QuickCheck random shake + syb tagged template text time transformers unordered-containers + vector yaml ]; executableHaskellDepends = [ base bytestring directory extensible-effects hspec @@ -41003,8 +41080,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.3.1.0"; - sha256 = "13b2d6nhlgqnx97fp4qjh7672lgmma5dxs0dvhvyvwig4n6cblr1"; + version = "0.3.1.1"; + sha256 = "0v2202zrnli49z4vw4zc6cgxvfqrv51b6p0svp0fdd2f9add4rvm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42143,34 +42220,6 @@ self: { broken = true; }) {}; - "blank-canvas_0_6_2" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, colour, containers, data-default-class, directory - , http-types, kansas-comet, mime-types, process, scotty, semigroups - , shake, stm, text, text-show, time, transformers, unix, vector - , wai, wai-extra, warp - }: - mkDerivation { - pname = "blank-canvas"; - version = "0.6.2"; - sha256 = "1qhdvxia8wlnv0ss9dsrxdfw3qsf376ypnpsijz7vxkj9dmzyq84"; - revision = "5"; - editedCabalFile = "1csa2lsr4jv9x3867l1nbd1brnvw10q9qla027r19csscx5pg726"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring colour - containers data-default-class http-types kansas-comet mime-types - scotty semigroups stm text text-show transformers vector wai - wai-extra warp - ]; - testHaskellDepends = [ - base containers directory process shake stm text time unix vector - ]; - description = "HTML5 Canvas Graphics Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "blank-canvas" = callPackage ({ mkDerivation, aeson, base, base-compat-batteries , base64-bytestring, bytestring, colour, containers @@ -44546,6 +44595,8 @@ self: { pname = "broadcast-chan"; version = "0.2.1.1"; sha256 = "01r57v2ghfkv37cwh64zs1lrz1rd7is3pa5k7y8h16ws1ddglirg"; + revision = "1"; + editedCabalFile = "1kmnsnyb4gz70bka30l35lgm5k131d8lc1hm4b23aml2yskx3m54"; libraryHaskellDepends = [ base transformers unliftio-core ]; benchmarkHaskellDepends = [ async base criterion deepseq stm ]; description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; @@ -46775,6 +46826,18 @@ self: { broken = true; }) {}; + "c14n" = callPackage + ({ mkDerivation, base, bytestring, libxml2 }: + mkDerivation { + pname = "c14n"; + version = "0.1.0.0"; + sha256 = "0j41nykxsf0900nm69ji5cf55376nprqvns81sjn1na4fvb8fllc"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ libxml2 ]; + description = "Bindings to the c14n implementation in libxml"; + license = stdenv.lib.licenses.mit; + }) {inherit (pkgs) libxml2;}; + "c2ats" = callPackage ({ mkDerivation, base, containers, HUnit, language-c, pretty , regex-posix, test-framework, test-framework-hunit @@ -47350,6 +47413,8 @@ self: { pname = "cabal-helper"; version = "1.1.0.0"; sha256 = "1f4s46l60s1lcdia7nv2r3y71z5c6pg6ljcc0601abl1aklx303p"; + revision = "1"; + editedCabalFile = "08fyxvpqbp0r6hiqxi5wc944phr8zgmkv7hiw71zcavl09c8mvxf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71350,6 +71415,8 @@ self: { pname = "dhall-json"; version = "1.7.0"; sha256 = "1nk2dibdnzm5wmvlsf82n8hc0zab1chqw339pp9q5n2gavj8kvsi"; + revision = "1"; + editedCabalFile = "1xbr4cphc98frf458vsggx5lh3my7ahlz5fl19hnyy876iwb04hm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100737,6 +100804,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gitlab-haskell_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, http-conduit + , http-types, tasty, tasty-hunit, text, time, transformers + , unliftio, unliftio-core + }: + mkDerivation { + pname = "gitlab-haskell"; + version = "0.2"; + sha256 = "147flwysaip40mcqwhskivf196dan0bk9vrjfjjq2fvnx46xg1q5"; + libraryHaskellDepends = [ + aeson base bytestring connection http-conduit http-types text time + transformers unliftio unliftio-core + ]; + testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; + description = "A Haskell library for the GitLab web API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gitlib" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, conduit , conduit-combinators, containers, directory, exceptions, filepath @@ -116518,8 +116604,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.34.0"; - sha256 = "0zl17wdd8pxqkgbhxrmclpjn2wcyamm8684wfl8yn5awm67afzzq"; + version = "0.34.1"; + sha256 = "1i5xpygarb6vbx6l2k34wdj1jy5d9g6wp4ikp2vjkygnr18b7nm9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116559,8 +116645,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.34.0"; - sha256 = "1wvhwjn9pk1sdjabpcca7bmyhdq0hdz6k4pydp1183lp647cfn3d"; + version = "0.34.1"; + sha256 = "0q169kwli4ws3lkiyfb2ln9p9r8d6kv914hh06h8dx3q2ggijnkw"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network @@ -125782,6 +125868,8 @@ self: { pname = "hnix"; version = "0.9.0"; sha256 = "17lj5gaqigkrxchdzkhwxab613zzahgh5d8jpqa9jiz7037wgv2w"; + revision = "1"; + editedCabalFile = "0ccn3a2pp4dnd4ibhankrvi2hg7v1660w68wrmw2gabcwfir53lr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156618,6 +156706,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linear_1_21_1" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq + , distributive, doctest, ghc-prim, hashable, HUnit, lens, random + , reflection, semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , transformers, transformers-compat, unordered-containers, vector + , void + }: + mkDerivation { + pname = "linear"; + version = "1.21.1"; + sha256 = "0rwr8h9ddzbxrfxzdqsy841rj27xbvy73v20r2aml7jqzy0s3gqc"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable lens random reflection + semigroupoids semigroups tagged template-haskell transformers + transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring deepseq doctest HUnit lens reflection + simple-reflect test-framework test-framework-hunit vector + ]; + description = "Linear Algebra"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linear-accelerate" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear @@ -190062,6 +190179,17 @@ self: { broken = true; }) {}; + "periodic-polynomials" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "periodic-polynomials"; + version = "0.2.0.0"; + sha256 = "1y7hj8cjdy5zpp7sg7yfaafcid7ssf23g4az6fwk2hrcrk97sf2i"; + libraryHaskellDepends = [ base vector ]; + description = "A library for working with periodic polynomials (very basic functionality)"; + license = stdenv.lib.licenses.mit; + }) {}; + "perm" = callPackage ({ mkDerivation, base, catch-fd, HUnit, mtl, test-framework , test-framework-hunit, transformers @@ -198402,6 +198530,31 @@ self: { maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; }) {}; + "pretty-simple_3_3_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest + , containers, criterion, doctest, Glob, mtl, QuickCheck + , template-haskell, text, transformers + }: + mkDerivation { + pname = "pretty-simple"; + version = "3.3.0.0"; + sha256 = "0g83958npqscqqz2lh5m0m666qp8ldwps4l5gvfip4b1zgy3f5nh"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal base containers mtl text transformers + ]; + testHaskellDepends = [ + base doctest Glob QuickCheck template-haskell + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "pretty printer for data types with a 'Show' instance"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; + }) {}; + "pretty-sop" = callPackage ({ mkDerivation, base, generics-sop, markdown-unlit, pretty-show }: mkDerivation { @@ -198801,6 +198954,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primitive_0_7_1_0" = callPackage + ({ mkDerivation, base, base-orphans, deepseq, ghc-prim, QuickCheck + , quickcheck-classes-base, semigroups, tagged, tasty + , tasty-quickcheck, transformers, transformers-compat + }: + mkDerivation { + pname = "primitive"; + version = "0.7.1.0"; + sha256 = "1w53i4mk248g58xrffmksznr4nmn2bbbycajzpcqfxx5ybyyrsvb"; + libraryHaskellDepends = [ base deepseq transformers ]; + testHaskellDepends = [ + base base-orphans ghc-prim QuickCheck quickcheck-classes-base + semigroups tagged tasty tasty-quickcheck transformers + transformers-compat + ]; + description = "Primitive memory-related operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "primitive-addr" = callPackage ({ mkDerivation, base, primitive }: mkDerivation { @@ -207106,6 +207279,26 @@ self: { broken = true; }) {}; + "readability" = callPackage + ({ mkDerivation, base, bytestring, containers, html-conduit + , http-conduit, optparse-applicative, text, xml-conduit + }: + mkDerivation { + pname = "readability"; + version = "0.0.1.0"; + sha256 = "1g96fa6h2zayc3icys900sfhvk943gp991667miiv4lk0bdlpkrr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers html-conduit text xml-conduit + ]; + executableHaskellDepends = [ + base http-conduit optparse-applicative text xml-conduit + ]; + description = "Extracts text of main article from HTML document"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "readable" = callPackage ({ mkDerivation, base, bytestring, text }: mkDerivation { @@ -211732,6 +211925,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "resourcet_1_2_4_2" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, mtl + , primitive, transformers, unliftio-core + }: + mkDerivation { + pname = "resourcet"; + version = "1.2.4.2"; + sha256 = "11zb4figcs22hjaq6zsknf70kf9k2bxnw6w03ab9kl9s0i10iwhp"; + libraryHaskellDepends = [ + base containers exceptions mtl primitive transformers unliftio-core + ]; + testHaskellDepends = [ base exceptions hspec transformers ]; + description = "Deterministic allocation and freeing of scarce resources"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "respond" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, containers , data-default-class, exceptions, fast-logger, formatting, HList @@ -226046,8 +226256,8 @@ self: { ({ mkDerivation, base, doctest, integer-gmp }: mkDerivation { pname = "simple-enumeration"; - version = "0.2"; - sha256 = "0792fcn7mxvhdvsqgc335lcyp89zcdk3fbfqyckz9fsmf6382hv4"; + version = "0.2.1"; + sha256 = "16m3i3703yb2921nq1hk4ap3s7yrxsyczw2anziv6wvy4xq252qr"; libraryHaskellDepends = [ base integer-gmp ]; testHaskellDepends = [ base doctest ]; description = "Finite or countably infinite sequences of values"; @@ -228111,17 +228321,18 @@ self: { "slip32" = callPackage ({ mkDerivation, base, base16-bytestring, bech32, binary, bip32 - , bytestring, hedgehog, tasty, tasty-hedgehog, tasty-hunit, text + , bitcoin-keys, bytestring, hedgehog, tasty, tasty-hedgehog + , tasty-hunit, text }: mkDerivation { pname = "slip32"; - version = "0.2"; - sha256 = "1cc83lwclm68ss2pgqznfqrhbnpi5hg46d19gzja1a23a4pmp86i"; + version = "0.2.1"; + sha256 = "00ivmrdw79n543s7rb1bzpp9xn6i1gys8zbad20lams20f7a01fa"; libraryHaskellDepends = [ - base bech32 binary bip32 bytestring text + base bech32 binary bip32 bitcoin-keys bytestring text ]; testHaskellDepends = [ - base base16-bytestring bip32 bytestring hedgehog tasty + base base16-bytestring bip32 bitcoin-keys bytestring hedgehog tasty tasty-hedgehog tasty-hunit text ]; description = "SLIP-0032: Extended serialization format for BIP-32 wallets"; @@ -228933,18 +229144,17 @@ self: { "smtp-mail" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , bytestring, connection, cryptohash, filepath, mime-mail, network - , network-bsd, text + , bytestring, connection, cryptonite, filepath, memory, mime-mail + , network, network-bsd, text }: mkDerivation { pname = "smtp-mail"; - version = "0.2.0.0"; - sha256 = "0qazfkh03rnrijan037bjspskbsma5x04gcavmn0g744f7xldcaz"; - revision = "1"; - editedCabalFile = "1kv84kywyj8f7iypzdq6a32wwkk8318khhy4x3p9q6mlvgv8275r"; + version = "0.2.0.1"; + sha256 = "16qwcwzgzlmfx1f5h6977nkka7x6jlm6kxpkbdsacizh0z96v1kw"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring bytestring - connection cryptohash filepath mime-mail network network-bsd text + connection cryptonite filepath memory mime-mail network network-bsd + text ]; description = "Simple email sending via SMTP"; license = stdenv.lib.licenses.bsd3; @@ -246558,8 +246768,8 @@ self: { pname = "text-show-instances"; version = "3.8.3"; sha256 = "11v335p3wzf9ijqlkls5mk4m16dfak8fckn4gj7mahs8c7l9lm5d"; - revision = "5"; - editedCabalFile = "1czi0gl7kxc64kk8v36xw2ln0vjj2pls3x9nmh754nvdg0616jfj"; + revision = "6"; + editedCabalFile = "1masflbb26zg8l0xiz2pzy6i9sh9pc3hqfd6y3vcvyxg0wg96cxf"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -258403,18 +258613,18 @@ self: { }) {}; "update-nix-fetchgit" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, async, base, bytestring - , data-fix, errors, hnix, process, text, time, transformers - , trifecta, uniplate, utf8-string + ({ mkDerivation, aeson, async, base, bytestring, data-fix, errors + , hnix, prettyprinter, process, text, time, transformers, trifecta + , uniplate, utf8-string }: mkDerivation { pname = "update-nix-fetchgit"; - version = "0.1.0.0"; - sha256 = "1chl1a4vjd9iqyd2kp67f9v8h260c6jlfzcr8m11x0w0h592ly52"; + version = "0.1.1.0"; + sha256 = "0zk4rgpdgn2wa6x4js7sgxpa9gfly2fwd1vws5m73kh61ja7286h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint async base bytestring data-fix errors hnix + aeson async base bytestring data-fix errors hnix prettyprinter process text time transformers trifecta uniplate utf8-string ]; executableHaskellDepends = [ base text ]; @@ -276661,8 +276871,8 @@ self: { }: mkDerivation { pname = "zipper-extra"; - version = "0.1.2.0"; - sha256 = "1734kq6q64ilvxdssjgzyhgm8wpdwbwn59n5v23z40jvqwzy1c62"; + version = "0.1.2.1"; + sha256 = "1ngdhh2g7gjs8fvzk356qzip3g8bpr6sximpijpx3zc9nalnn2jf"; libraryHaskellDepends = [ base comonad comonad-extras exceptions split ]; From 90660f3369b41b0a751e8520f0efb1cecdfb9176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 26 Jun 2020 13:10:20 +0200 Subject: [PATCH 2670/3452] broot: install man page --- pkgs/tools/misc/broot/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 3e0a801d7b4b..afa5a341a389 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -19,6 +19,11 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace src/verb/builtin.rs --replace '"/bin/' '"${coreutils}/bin/' + + # Fill the version stub in the man page. We can't fill the date + # stub reproducibly. + substitute man/page man/broot.1 \ + --replace "#version" "${version}" ''; postInstall = '' @@ -28,6 +33,8 @@ rustPlatform.buildRustPackage rec { installShellCompletion --bash $OUT_DIR/{br,broot}.bash installShellCompletion --fish $OUT_DIR/{br,broot}.fish installShellCompletion --zsh $OUT_DIR/{_br,_broot} + + installManPage man/broot.1 ''; meta = with stdenv.lib; { From f698365bf17aaf6400f6a2c15c13c100b3b56d65 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 11:23:24 +0000 Subject: [PATCH 2671/3452] hcloud: 1.16.2 -> 1.17.0 --- pkgs/development/tools/hcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index ee7ed4766228..fb3c10464633 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hcloud"; - version = "1.16.2"; + version = "1.17.0"; goPackagePath = "github.com/hetznercloud/cli"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "0cxh92df8gdl4bmr22pdvdxdkdjyfy0jv48y0k6awy1xz61r94ap"; + sha256 = "1brqqcyyljkdd24ljx2qbr648ihhhmr8mq6gs90n63r59ci6ksch"; }; - vendorSha256 = "1iiqmdnjnrsqgjisb5j5casa2hmqmafn79157skl5zxawndvc2rj"; + vendorSha256 = "1m96j9cwqz2b67byf53qhgl3s0vfwaklj2pm8364qih0ilvifppj"; buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; From 0377a8469d7e29ae641ad5f7f1e06839d1780c38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 11:28:32 +0000 Subject: [PATCH 2672/3452] hcxdumptool: 6.0.6 -> 6.0.7 --- pkgs/tools/security/hcxdumptool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/hcxdumptool/default.nix b/pkgs/tools/security/hcxdumptool/default.nix index c7a5a9985552..b59cef139428 100644 --- a/pkgs/tools/security/hcxdumptool/default.nix +++ b/pkgs/tools/security/hcxdumptool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxdumptool"; - version = "6.0.6"; + version = "6.0.7"; src = fetchFromGitHub { owner = "ZerBea"; repo = "hcxdumptool"; rev = version; - sha256 = "1b4d543y64ib92w9gcmiyjn5hz2vyjqmxk3f3yr1zk04fhw16gmf"; + sha256 = "14w4f63nrcwhqj753rjif9cgs1xh1r1619827p69dz0v2x3xdvn1"; }; buildInputs = [ openssl ]; From 8f09f750daedce7d9a089240ff122b5603e143ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 11:32:49 +0000 Subject: [PATCH 2673/3452] hcxtools: 6.0.2 -> 6.0.3 --- pkgs/tools/security/hcxtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/tools/security/hcxtools/default.nix index 5634ee6cff06..a81c1ef75cf0 100644 --- a/pkgs/tools/security/hcxtools/default.nix +++ b/pkgs/tools/security/hcxtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "0a36184igdgs2h83zr4zihc5acps91ipmgph37jakvzwrsn64ma6"; + sha256 = "0s9l5mvzcv6hnj7h28piabnm66b09hk2l57vb85ny35w99hzpkc0"; }; buildInputs = [ curl openssl zlib ]; From e4873b913d769040dea81db3a8aa7e9679989cec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 11:39:22 +0000 Subject: [PATCH 2674/3452] helmfile: 0.118.6 -> 0.119.0 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 856fa51437e8..c4a95b47f522 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.118.6"; in +let version = "0.119.0"; in buildGoModule { pname = "helmfile"; @@ -10,12 +10,12 @@ buildGoModule { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "0zbvz8kn52c1q4yn8n9z4rrf761h495fhjw72x9q1nh44hr7npwd"; + sha256 = "067hlzp87g36wgxankrmd2nva1v40pa31acq1hh0jxyxp98sfgk1"; }; goPackagePath = "github.com/roboll/helmfile"; - vendorSha256 = "0xj14f0yx7x9ziijd1yka1n6kbmmhbibsk3ppp8cn1pqrwgqk7pr"; + vendorSha256 = "11bw10s5wifzw2cy1100hyjv4xv7an7b05lcw6sphwyy56gsp2fy"; nativeBuildInputs = [ makeWrapper ]; From 14b83ed1148fb99706ca3fc6f73721b189a0f38a Mon Sep 17 00:00:00 2001 From: Nikola Knezevic Date: Thu, 18 Jun 2020 14:52:03 +0200 Subject: [PATCH 2675/3452] oauth2_proxy: 5.1.0 -> 5.1.1 This update fixes CVE https://nvd.nist.gov/vuln/detail/CVE-2020-11053. In addition, switch to using `buildGoModule` as the project switched to go 1.14 and go modules. --- pkgs/servers/oauth2_proxy/default.nix | 14 +- pkgs/servers/oauth2_proxy/deps.nix | 615 -------------------------- 2 files changed, 6 insertions(+), 623 deletions(-) delete mode 100644 pkgs/servers/oauth2_proxy/deps.nix diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix index 225c221b319e..ee6dafebf749 100644 --- a/pkgs/servers/oauth2_proxy/default.nix +++ b/pkgs/servers/oauth2_proxy/default.nix @@ -1,10 +1,8 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - pname = "oauth2_proxy"; - version = "5.1.0"; - - goPackagePath = "github.com/pusher/${pname}"; +buildGoModule rec { + pname = "oauth2-proxy"; + version = "5.1.1"; src = fetchFromGitHub { repo = pname; @@ -13,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; }; - goDeps = ./deps.nix; + vendorSha256 = "01lf7xbhgn5l42ahym12vr1w00zx1qzy6sgwgcbvvxp48k0b271d"; doCheck = true; @@ -22,7 +20,7 @@ buildGoPackage rec { meta = with lib; { description = "A reverse proxy that provides authentication with Google, Github, or other providers"; - homepage = "https://github.com/pusher/oauth2_proxy/"; + homepage = "https://github.com/oauth2-proxy/oauth2-proxy/"; license = licenses.mit; maintainers = with maintainers; [ yorickvp knl ]; }; diff --git a/pkgs/servers/oauth2_proxy/deps.nix b/pkgs/servers/oauth2_proxy/deps.nix deleted file mode 100644 index 611a07c2fda0..000000000000 --- a/pkgs/servers/oauth2_proxy/deps.nix +++ /dev/null @@ -1,615 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "v0.38.0"; - sha256 = "0n6n13b7lri2fmc4bn4ifszyawj31dpbzvyv0xafsf81440z8cyh"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/alicebob/gopher-json"; - fetch = { - type = "git"; - url = "https://github.com/alicebob/gopher-json"; - rev = "5a6b3ba71ee6"; - sha256 = "0hx6n722zq51p852lv56k39yjy09lw6mnr2c3x0p23rfyyrakj2p"; - }; - } - { - goPackagePath = "github.com/alicebob/miniredis"; - fetch = { - type = "git"; - url = "https://github.com/alicebob/miniredis"; - rev = "v2.11.2"; - sha256 = "1fc6w9n1jznwj8ks2svxmjrv87pk3spjf5z3kcxpgpynp13pd55n"; - }; - } - { - goPackagePath = "github.com/bitly/go-simplejson"; - fetch = { - type = "git"; - url = "https://github.com/bitly/go-simplejson"; - rev = "v0.5.0"; - sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj"; - }; - } - { - goPackagePath = "github.com/bmizerany/assert"; - fetch = { - type = "git"; - url = "https://github.com/bmizerany/assert"; - rev = "b7ed37b82869"; - sha256 = "18hy1wyl9zdi7sgxafrn3m7fadh6in0rhhb8l0cvkxqzdl0jcw2s"; - }; - } - { - goPackagePath = "github.com/census-instrumentation/opencensus-proto"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-proto"; - rev = "v0.2.1"; - sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; - }; - } - { - goPackagePath = "github.com/chzyer/logex"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/logex"; - rev = "v1.1.10"; - sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; - }; - } - { - goPackagePath = "github.com/chzyer/readline"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/readline"; - rev = "2972be24d48e"; - sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; - }; - } - { - goPackagePath = "github.com/chzyer/test"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/test"; - rev = "a1ea475d72b1"; - sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; - }; - } - { - goPackagePath = "github.com/client9/misspell"; - fetch = { - type = "git"; - url = "https://github.com/client9/misspell"; - rev = "v0.3.4"; - sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; - }; - } - { - goPackagePath = "github.com/coreos/go-oidc"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-oidc"; - rev = "v2.2.1"; - sha256 = "11m6slbpi33ynffml7812piq4anhjlf1qszjlsf26f5y7x3qh8n5"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.0"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "v3.2.0"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/envoyproxy/go-control-plane"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/go-control-plane"; - rev = "5f8ba28d4473"; - sha256 = "1f1s764rd41vd9vgk3r14h1m6fz6pdvxj6fd83q58gxifbc4q5w4"; - }; - } - { - goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/protoc-gen-validate"; - rev = "v0.1.0"; - sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/go-redis/redis"; - fetch = { - type = "git"; - url = "https://github.com/go-redis/redis"; - rev = "v6.15.7"; - sha256 = "0fc0sfispyzn652ny05wn6bz18a60n6ryk23ki8j97xx3l24nq2g"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.2.0"; - sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.2"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - goPackagePath = "github.com/gomodule/redigo"; - fetch = { - type = "git"; - url = "https://github.com/gomodule/redigo"; - rev = "v2.0.0"; - sha256 = "1kg7s8027b4g1sfw0v3nh30c15j407kv684s53gg281r807dnfpk"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "4030bb1f1f0c"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.3.0"; - sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; - }; - } - { - goPackagePath = "github.com/google/martian"; - fetch = { - type = "git"; - url = "https://github.com/google/martian"; - rev = "v2.1.0"; - sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; - }; - } - { - goPackagePath = "github.com/google/pprof"; - fetch = { - type = "git"; - url = "https://github.com/google/pprof"; - rev = "3ea8567a2e57"; - sha256 = "09rhjn3ms0a72dw0yzbp237p7yhqma772zspddn6mgkh3gi3kn4c"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "v2.0.5"; - sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.1"; - sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "v1.0.0"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - }; - } - { - goPackagePath = "github.com/jstemmer/go-junit-report"; - fetch = { - type = "git"; - url = "https://github.com/jstemmer/go-junit-report"; - rev = "af01ea7f8024"; - sha256 = "1lp3n94ris12hac02wi31f3whs88lcrzwgdg43a5j6cafg9p1d0s"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.2.0"; - sha256 = "1ywbfzz1h3a3qd8rpkiqwi1dm4w8ls9ijb4x1b7567grns9f0vnp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/mbland/hmacauth"; - fetch = { - type = "git"; - url = "https://github.com/mbland/hmacauth"; - rev = "44256dfd4bfa"; - sha256 = "1d5pbjgc5j8pi3frsjp5gqg7j12bxdbl55nhy01cv4c96hay2ij1"; - }; - } - { - goPackagePath = "github.com/mreiferson/go-options"; - fetch = { - type = "git"; - url = "https://github.com/mreiferson/go-options"; - rev = "v1.0.0"; - sha256 = "1pxs9ybrh196qy14ijn4zn51h2z28lj31y6vxrz2xxhgvpmfmxyl"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "v1.12.0"; - sha256 = "0ly246i0ax53l6dn9f1zlhkd9gs03hvbk7aazxay2dd5fxzh9n65"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "v1.9.0"; - sha256 = "0l69r6nbnz6b3j9zrqn8aql88jjv1pqykzkvqdbhfprss9b2dy46"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/pquerna/cachecontrol"; - fetch = { - type = "git"; - url = "https://github.com/pquerna/cachecontrol"; - rev = "1555304b9b35"; - sha256 = "0nr3p9pms6jmr2s44vy2s22q1d3v6xns2kzsvkq2gg1rkx6c1hc9"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "14fe0d1b01d4"; - sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.5.1"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; - }; - } - { - goPackagePath = "github.com/yhat/wsutil"; - fetch = { - type = "git"; - url = "https://github.com/yhat/wsutil"; - rev = "1d66fa95c997"; - sha256 = "1agh4ss6y1laps8pg4mdl844ivmw2wrb7rnpfyag4gai4693i7bv"; - }; - } - { - goPackagePath = "github.com/yuin/gopher-lua"; - fetch = { - type = "git"; - url = "https://github.com/yuin/gopher-lua"; - rev = "ab39c6098bdb"; - sha256 = "13b0rrpv3988qw8rq6z7npajn1my059ybhafi5mxff9jw09k9sja"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "v0.21.0"; - sha256 = "14s0a12xdzjvad0dgksgv8m3hh7nc585abvjkvyk6r67a29lxj6x"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "2aa609cf4a9d"; - sha256 = "1yvis6fqbsd7f356aqyi18f76vnwj3bry6mxqnkvshq4cwrf92il"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "509febef88a4"; - sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "959b441ac422"; - sha256 = "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "0de0cce0169b"; - sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bf48bf16ab8d"; - sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "bd437916bb0e"; - sha256 = "1i8x26frmlin55k69k936zd1rp5sqnq14y5ms4rkxbfzhasdm2rx"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "85acf8d2951c"; - sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "2c0ae7006135"; - sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "a985d3407aa7"; - sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "v0.19.0"; - sha256 = "0rbwijzl91xmbr9kqhiwx4fydm7r6ci6rxsi9jsy8zap9zy120f6"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.5.0"; - sha256 = "0l7mkdnwhidv8m686x432vmx8z5nqcrr9f46ddgvrxbh4wvyfcll"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "24fa4b261c55"; - sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "v1.27.0"; - sha256 = "1ijrmgrxyabfn51nm3p9l81iaasq5fg237wnr6mdc4dzsfcg8kd7"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/natefinch/lumberjack.v2"; - rev = "v2.0.0"; - sha256 = "1m2sxypk7p805jvc68padvylyx5v7cwkh5klnnxxr0340kgspf08"; - }; - } - { - goPackagePath = "gopkg.in/square/go-jose.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/square/go-jose.v2"; - rev = "v2.4.1"; - sha256 = "1y0angxwryishwd1z0q7fp2xwjjhpw70kqh4ml4ly40akfhf1f5a"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v1"; - rev = "dd632973f1e7"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.4"; - sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "ea95bdfd59fc"; - sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic"; - }; - } -] From 17e4285d9d785226f6415401f4bcb78ff03c6945 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 26 Jun 2020 08:18:47 -0400 Subject: [PATCH 2676/3452] linux: 4.14.185 -> 4.14.186 --- 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 62dac23d72e7..fccbd29777e8 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.185"; + version = "4.14.186"; # 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 = "1iixxwidp53s2i2br58wbx5s69f2jcllb116z73pv7fmd06b2czk"; + sha256 = "0q52fmkiqa9hpdkf0wlpcqnc6wqssqz6cgfk1ix1anq0h5hl4ns4"; }; } // (args.argsOverride or {})) From 57814fdf208158eb89476a55743e9625dcc24e42 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 26 Jun 2020 08:18:59 -0400 Subject: [PATCH 2677/3452] linux: 4.19.129 -> 4.19.130 --- 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 d33038fe5670..ba2a293d1b50 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.129"; + version = "4.19.130"; # 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 = "0p0apfviv699mda5zmqphymfybcm932s5yffhvrpqvy2fpas0yx8"; + sha256 = "03zhsizj53ngwxn7d4mzix9xbxxd5lhbzrvawvbb91f83pkc14m6"; }; } // (args.argsOverride or {})) From fb5cb30fb0d0c96729358eed348d295d56d51f38 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 26 Jun 2020 08:21:02 -0400 Subject: [PATCH 2678/3452] oh-my-zsh: 2020-06-23 -> 2020-06-26 --- 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 e04aac622940..4bea6e2c5f1d 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-23"; + version = "2020-06-26"; pname = "oh-my-zsh"; - rev = "cea89f54391c810198a7ace05f1063dd7e596bb7"; + rev = "6152ac30bede172ba0422a8610dc796948ae1546"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "091ws4q8rgd9gzim9x8v7rgx99lw1d8kym4r1r2jy7fdxfxh6z5k"; + sha256 = "1kadz2c4lwvp37yw95fly4gc5klzajxsi8x9463xiqj2rrcpd1m3"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 9bab6e77801abe167badc5309f385951d9516ae4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 12:27:21 +0000 Subject: [PATCH 2679/3452] intermodal: 0.1.8 -> 0.1.10 --- pkgs/tools/misc/intermodal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix index 2ebaf7cf2586..de52909a8102 100644 --- a/pkgs/tools/misc/intermodal/default.nix +++ b/pkgs/tools/misc/intermodal/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "intermodal"; - version = "0.1.8"; + version = "0.1.10"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "1farcijm5s1836vi7h36yh0i9v48q4l98s4wprmr28z37c3l3n0b"; + sha256 = "0vdla0vhvgj1yrg631jdm3kwdm1q0acw8sh2nz57dp3x7chq6ipx"; }; - cargoSha256 = "1kvrra5i1g1inxpmn4shd8kgkljrk3ymfnpnhwrsnfxrqidi0h2z"; + cargoSha256 = "1yl1chh243ixa9lhkmgi94w6mvnrnr7xmsh4kvj7ax693249pzjv"; # include_hidden test tries to use `chflags` on darwin checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; From 90281884aba647726e7c2860264528e321c44bb8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 12:32:50 +0000 Subject: [PATCH 2680/3452] jdupes: 1.16.0 -> 1.17.0 --- pkgs/tools/misc/jdupes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index ba509d945e16..e30a5e62286a 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "0z8banifsp6325j572grpghf69j92zz9cxdnvb6pqjsknc96mrf6"; + sha256 = "1c81xcjzfp4fd2zbq3jbknkqlrn0l5wkr08sgvcsxxvqa80338xv"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. From 67e481159e836a0ff39b0fa44c97e64cadec9acf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 12:52:12 +0000 Subject: [PATCH 2681/3452] kanboard: 1.2.14 -> 1.2.15 --- pkgs/applications/misc/kanboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index e6193d435639..4f84420330dd 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.14"; + version = "1.2.15"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "11bwajzidnyagdyip7i8rwni1f66acv0k4lybdm0mc4195anivjh"; + sha256 = "0lib2qlc8a59i9dak0g1j5hymwbq9vhflp5srhcjislxypfvrizs"; }; dontBuild = true; From da1b17fd35d544f6902b61d9fcf00c6d0c4e69d0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 26 Jun 2020 14:53:58 +0200 Subject: [PATCH 2682/3452] neomutt: 20200619 -> 20200626 https://github.com/neomutt/neomutt/releases/tag/20200626 --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index a03f559af8a4..5a567863ab51 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "20200619"; + version = "20200626"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "0dhdpd0wdk5bam0q7cvjy4f451ai0mapmyrar7r7m5dnn6lcwvfv"; + sha256 = "0r16fy02z61dbjdxc28yzj5i4f6r7aakh453gaqc8ilm1nsxhmnp"; }; buildInputs = [ From 2101f7361c661648785c738c3b0813213f8e0f16 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 26 Jun 2020 14:54:20 +0200 Subject: [PATCH 2683/3452] cargo-make: 0.31.0 -> 0.31.1 https://github.com/sagiegurari/cargo-make/releases/tag/0.31.1 --- pkgs/development/tools/rust/cargo-make/Cargo.lock | 10 +++++----- pkgs/development/tools/rust/cargo-make/default.nix | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock index 7ba549f28da8..7f240291ae5e 100644 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -104,7 +104,7 @@ checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" [[package]] name = "cargo-make" -version = "0.31.0" +version = "0.31.1" dependencies = [ "ci_info", "clap", @@ -139,9 +139,9 @@ checksum = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311" [[package]] name = "cfg-if" -version = "0.1.10" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" [[package]] name = "ci_info" @@ -222,9 +222,9 @@ dependencies = [ [[package]] name = "dirs" -version = "2.0.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +checksum = "2fddc3610d8f9552384e06ebc87f714e1d0b2b64a99194d2faf36d7ae5f48549" dependencies = [ "cfg-if", "dirs-sys", diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index d4023dcf2549..3ed271e6ed8d 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.31.0"; + version = "0.31.1"; src = let @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "0svb3avmmkgwsv1dvzgzixp5fvcl93hn8xb3zx729jq8a47l2vsi"; + sha256 = "0hxfysbrdc9f20v0nbvb1sxhyr86iwmf70x0xpkpkzp33i7ssdig"; }; in runCommand "source" {} '' @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0yk06kpqjfc39dxk9f67c5qijnm8f8lvrb9da1kn8ql8dv8crsw2"; + cargoSha256 = "1nvhlwssq7igb3bpp9y0lpfila2y6l48365kh8nqcrb189z3xs1q"; # Some tests fail because they need network access. # However, Travis ensures a proper build. From c9343a09ea795443029efaf2d567d6c9ea857ebe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 12:59:41 +0000 Subject: [PATCH 2684/3452] khronos-ocl-icd-loader: 2020.03.13 -> 2020.06.16 --- pkgs/development/libraries/khronos-ocl-icd-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index 3704cbb7794c..a42f1c0a513c 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "khronos-ocl-icd-loader-${version}"; - version = "2020.03.13"; + version = "2020.06.16"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-ICD-Loader"; rev = "v${version}"; - sha256 = "0zk6fyfrklx8a848613rfcx0y4yn0dsxkxzzl9pgdh9i6qdfjj9k"; + sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy"; }; patches = stdenv.lib.lists.optional withTracing ./tracing.patch; From 75c7f58507bba4db3cd6669355acb80efaebc908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Mon, 9 Mar 2020 18:20:08 +0100 Subject: [PATCH 2685/3452] pythonPackages.meshlabxml: init at 2018.3 --- .../python-modules/meshlabxml/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/meshlabxml/default.nix diff --git a/pkgs/development/python-modules/meshlabxml/default.nix b/pkgs/development/python-modules/meshlabxml/default.nix new file mode 100644 index 000000000000..c1091296d2e1 --- /dev/null +++ b/pkgs/development/python-modules/meshlabxml/default.nix @@ -0,0 +1,29 @@ +{ + buildPythonPackage, + fetchPypi, + pythonOlder, + lib, +}: + +buildPythonPackage rec { + pname = "MeshLabXML"; + version = "2018.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1villmg46hqby5jjkkpxr5bxydr72y5b3cbfngwpyxxdljn091w8"; + }; + + propagatedBuildInputs = [ ]; + + doCheck = false; # Upstream not currently have any tests. + + pythonImportsCheck = [ "meshlabxml" ]; + + meta = with lib; { + homepage = "https://github.com/3DLIRIOUS/MeshLabXML"; + description = "Create and run MeshLab XML scripts with Python"; + license = licenses.lgpl21; + maintainers = with maintainers; [ nh2 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 712cb6da9951..dc0a111eccb4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4587,6 +4587,8 @@ in { mesonpep517 = callPackage ../development/python-modules/mesonpep517 { }; + meshlabxml = callPackage ../development/python-modules/meshlabxml { }; + metaphone = callPackage ../development/python-modules/metaphone { }; mezzanine = callPackage ../development/python-modules/mezzanine { }; From 0866700e3b8217f960ba363874a14b23d0138f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 25 Jun 2020 20:54:27 +0200 Subject: [PATCH 2686/3452] LASzip, LASzip2: Rename LASzip -> LASzip2, add LASzip 3. We have to keep the old one because libLAS does not support LASzip 3, see https://github.com/libLAS/libLAS/issues/144. --- pkgs/development/libraries/LASzip/LASzip2.nix | 21 +++++++++++++++++++ pkgs/development/libraries/LASzip/default.nix | 16 ++++++++------ pkgs/development/libraries/libLAS/default.nix | 8 ++++--- pkgs/top-level/all-packages.nix | 1 + 4 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/libraries/LASzip/LASzip2.nix diff --git a/pkgs/development/libraries/LASzip/LASzip2.nix b/pkgs/development/libraries/LASzip/LASzip2.nix new file mode 100644 index 000000000000..418900ddeeb5 --- /dev/null +++ b/pkgs/development/libraries/LASzip/LASzip2.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + version = "2.2.0"; + pname = "LASzip"; + + src = fetchurl { + url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz"; + sha256 = "b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2"; + }; + + buildInputs = [cmake]; + + meta = { + description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; + homepage = https://laszip.org; + license = stdenv.lib.licenses.lgpl2; + maintainers = [ stdenv.lib.maintainers.michelk ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix index fb747dc9f33c..0300aa37f0f9 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/development/libraries/LASzip/default.nix @@ -1,15 +1,19 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "2.2.0"; + version = "3.4.3"; pname = "LASzip"; - src = fetchurl { - url = "https://github.com/LASzip/LASzip/archive/v${version}.tar.gz"; - sha256 = "b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2"; + src = fetchFromGitHub { + owner = "LASzip"; + repo = "LASzip"; + rev = version; + sha256 = "09lcsgxwv0jq50fhsgfhx0npbf1zcwn3hbnq6q78fshqksbxmz7m"; }; - buildInputs = [cmake]; + nativeBuildInputs = [ + cmake + ]; meta = { description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 818e2ad85b00..95569c0a8132 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip, fixDarwinDylibNames }: +{ stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }: stdenv.mkDerivation rec { name = "libLAS-1.8.1"; @@ -9,13 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip ] + buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip2 ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DGDAL_CONFIG=${gdal}/bin/gdal-config" "-DWITH_LASZIP=ON" - "-DLASZIP_INCLUDE_DIR=${LASzip}/include" + # libLAS is currently not compatible with LASzip 3, + # see https://github.com/libLAS/libLAS/issues/144. + "-DLASZIP_INCLUDE_DIR=${LASzip2}/include" "-DCMAKE_EXE_LINKER_FLAGS=-pthread" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d36b8cbbbcd2..d2f70dbf8af2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12612,6 +12612,7 @@ in lasso = callPackage ../development/libraries/lasso { }; LASzip = callPackage ../development/libraries/LASzip { }; + LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { }; lcms = lcms1; From 8f753cb7fb8a6b77df1d5702f06690036f080144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 26 Jun 2020 00:43:15 +0200 Subject: [PATCH 2687/3452] LASzip2: Use `nativeBuildInputs` for `cmake` --- pkgs/development/libraries/LASzip/LASzip2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/LASzip/LASzip2.nix b/pkgs/development/libraries/LASzip/LASzip2.nix index 418900ddeeb5..e49909917c2a 100644 --- a/pkgs/development/libraries/LASzip/LASzip2.nix +++ b/pkgs/development/libraries/LASzip/LASzip2.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2"; }; - buildInputs = [cmake]; + nativeBuildInputs = [ cmake ]; meta = { description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; From a9850760d211701b42bb7c7f5690c7e082cffbbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 26 Jun 2020 00:53:37 +0200 Subject: [PATCH 2688/3452] LASzip2: Refactor: meta style Co-authored-by: Jon --- pkgs/development/libraries/LASzip/LASzip2.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/LASzip/LASzip2.nix b/pkgs/development/libraries/LASzip/LASzip2.nix index e49909917c2a..2eb309631289 100644 --- a/pkgs/development/libraries/LASzip/LASzip2.nix +++ b/pkgs/development/libraries/LASzip/LASzip2.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = { + meta = with stdenv.lib; { description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; - homepage = https://laszip.org; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.michelk ]; - platforms = stdenv.lib.platforms.unix; + homepage = "https://laszip.org"; + license = licenses.lgpl2; + maintainers = [ maintainers.michelk ]; + platforms = platforms.unix; }; } From f924c8b9cea92ac5e7eca7035b3d614afbdd9d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 25 Jun 2020 21:54:21 +0200 Subject: [PATCH 2689/3452] libe57format: init at 2.1 Originally contributed by @chpatrick. --- .../libraries/libe57format/default.nix | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/libraries/libe57format/default.nix diff --git a/pkgs/development/libraries/libe57format/default.nix b/pkgs/development/libraries/libe57format/default.nix new file mode 100644 index 000000000000..6bb48c9530c8 --- /dev/null +++ b/pkgs/development/libraries/libe57format/default.nix @@ -0,0 +1,55 @@ +{ + stdenv, + cmake, + fetchFromGitHub, + boost, + xercesc, + icu, +}: + +stdenv.mkDerivation rec { + pname = "libe57format"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "asmaloney"; + repo = "libE57Format"; + rev = "v${version}"; + sha256 = "05z955q68wjbd9gc5fw32nqg69xc82n2x75j5vchxzkgnn3adcpi"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + boost + icu + xercesc + ]; + + # The build system by default builds ONLY static libraries, and with + # `-DE57_BUILD_SHARED=ON` builds ONLY shared libraries, see: + # https://github.com/asmaloney/libE57Format/issues/48 + # https://github.com/asmaloney/libE57Format/blob/f657d470da5f0d185fe371c4c011683f6e30f0cb/CMakeLists.txt#L82-L89 + # We support building both by building statically and then + # building an .so file here manually. + # The way this is written makes this Linux-only for now. + postInstall = '' + cd $out/lib + g++ -Wl,--no-undefined -shared -o libE57FormatShared.so -L. -Wl,-whole-archive -lE57Format -Wl,-no-whole-archive -lxerces-c + mv libE57FormatShared.so libE57Format.so + + if [ "$dontDisableStatic" -ne "1" ]; then + rm libE57Format.a + fi + ''; + + meta = with stdenv.lib; { + description = "Library for reading & writing the E57 file format (fork of E57RefImpl)"; + homepage = "https://github.com/asmaloney/libE57Format"; + license = licenses.boost; + maintainers = with maintainers; [ chpatrick nh2 ]; + platforms = platforms.linux; # because of the .so buiding in `postInstall` above + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2f70dbf8af2..a804a93e10a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12898,6 +12898,8 @@ in inherit (callPackage ../development/libraries/libdwarf { }) libdwarf dwarfdump; + libe57format = callPackage ../development/libraries/libe57format { }; + libeatmydata = callPackage ../development/libraries/libeatmydata { }; libeb = callPackage ../development/libraries/libeb { }; From 4e8e63f2784d2595cb9d64a57050f982e71926e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 25 Jun 2020 21:02:01 +0200 Subject: [PATCH 2690/3452] pdal: init at 2.1.0 --- pkgs/development/libraries/pdal/default.nix | 98 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 100 insertions(+) create mode 100644 pkgs/development/libraries/pdal/default.nix diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix new file mode 100644 index 000000000000..2059b4db7fbd --- /dev/null +++ b/pkgs/development/libraries/pdal/default.nix @@ -0,0 +1,98 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +# , openscenegraph +, curl +, gdal +, hdf5-cpp +, LASzip +, libe57format +, libgeotiff +, libxml2 +, postgresql +, tiledb +, xercesc +, zlib +, zstd +}: + +stdenv.mkDerivation rec { + pname = "pdal"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "PDAL"; + repo = "PDAL"; + rev = version; + sha256 = "0zb3zjqgmjjryb648c1hmwh1nfa7893bjzbqpmr6shjxvzgnj9p6"; + }; + + patches = [ + # Fix duplicate paths like + # /nix/store/7iafqfmjdlxqim922618wg87cclrpznr-PDAL-2.1.0//nix/store/7iafqfmjdlxqim922618wg87cclrpznr-PDAL-2.1.0/lib + # similar to https://github.com/NixOS/nixpkgs/pull/82654. + # TODO Remove on release > 2.1.0 + (fetchpatch { + name = "pdal-Fixup-install-config.patch"; + url = "https://github.com/PDAL/PDAL/commit/2f887ef624db50c6e20f091f34bb5d3e65b5c5c8.patch"; + sha256 = "0pdw9v5ypq7w9i7qzgal110hjb9nqi386jvy3x2h4vf1dyalzid8"; + }) + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + # openscenegraph + curl + gdal + hdf5-cpp + LASzip + libe57format + libgeotiff + libxml2 + postgresql + tiledb + xercesc + zlib + zstd + ]; + + cmakeFlags = [ + "-DBUILD_PLUGIN_E57=ON" + "-DBUILD_PLUGIN_HDF=ON" + "-DBUILD_PLUGIN_PGPOINTCLOUD=ON" + "-DBUILD_PLUGIN_TILEDB=ON" + + # Plugins that can probably be made working relatively easily: + # As of writing, seems to be incompatible (build error): + # error: no matching function for call to 'osg::TriangleFunctor::operator()(const Vec3&, const Vec3&, const Vec3&)' + "-DBUILD_PLUGIN_OPENSCENEGRAPH=OFF" # requires OpenGL + + # Plugins can probably not be made work easily: + "-DBUILD_PLUGIN_CPD=OFF" + "-DBUILD_PLUGIN_FBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs + "-DBUILD_PLUGIN_GEOWAVE=OFF" + "-DBUILD_PLUGIN_I3S=OFF" + "-DBUILD_PLUGIN_ICEBRIDGE=OFF" + "-DBUILD_PLUGIN_MATLAB=OFF" + "-DBUILD_PLUGIN_MBIO=OFF" + "-DBUILD_PLUGIN_MRSID=OFF" + "-DBUILD_PLUGIN_NITF=OFF" + "-DBUILD_PLUGIN_OCI=OFF" + "-DBUILD_PLUGIN_RDBLIB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs + "-DBUILD_PLUGIN_RIVLIB=OFF" + ]; + + meta = with stdenv.lib; { + description = "PDAL is Point Data Abstraction Library. GDAL for point cloud data."; + homepage = "https://pdal.io"; + license = licenses.bsd3; + maintainers = with maintainers; [ nh2 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a804a93e10a4..3bc95dea6279 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14170,6 +14170,8 @@ in pcre2 = callPackage ../development/libraries/pcre2 { }; + pdal = callPackage ../development/libraries/pdal { } ; + pdf2xml = callPackage ../development/libraries/pdf2xml {} ; inherit (callPackage ../development/libraries/physfs { }) From 254c2fb8d0b429e460813716cc3effd7d6e3a720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 13 Mar 2020 16:27:42 +0100 Subject: [PATCH 2691/3452] cloudcompare: init at 2.11.0 Based on: https://git.computecanada.ca/nix/ccpkgs/commit/6118f8b2757fc436bdd62c6d7f10d36454dda481 --- .../graphics/cloudcompare/default.nix | 83 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 85 insertions(+) create mode 100644 pkgs/applications/graphics/cloudcompare/default.nix diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix new file mode 100644 index 000000000000..848441912350 --- /dev/null +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -0,0 +1,83 @@ +{ stdenv +, fetchFromGitHub +, cmake +, wrapQtAppsHook +, dxflib +, eigen +, flann +, gdal +, LASzip +, libLAS +, pdal +, qtbase +, qtsvg +, qttools +, tbb +, xercesc +}: + +stdenv.mkDerivation rec { + pname = "cloudcompare"; + version = "2.11.0"; + + src = fetchFromGitHub { + owner = "CloudCompare"; + repo = "CloudCompare"; + rev = "v${version}"; + sha256 = "02ahhhivgb9k1aygw1m35wdvhaizag1r98mb0r6zzrs5p4y64wlb"; + # As of writing includes (https://github.com/CloudCompare/CloudCompare/blob/a1c589c006fc325e8b560c77340809b9c7e7247a/.gitmodules): + # * libE57Format + # * PoissonRecon + # In > 2.11 it will also contain + # * CCCoreLib + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + eigen # header-only + wrapQtAppsHook + ]; + + buildInputs = [ + dxflib + flann + gdal + LASzip + libLAS + pdal + qtbase + qtsvg + qttools + tbb + xercesc + ]; + + cmakeFlags = [ + # TODO: This will become -DCCCORELIB_USE_TBB=ON in > 2.11.0, see + # https://github.com/CloudCompare/CloudCompare/commit/f5a0c9fd788da26450f3fa488b2cf0e4a08d255f + "-DCOMPILE_CC_CORE_LIB_WITH_TBB=ON" + "-DOPTION_USE_DXF_LIB=ON" + "-DOPTION_USE_GDAL=ON" + "-DOPTION_USE_SHAPE_LIB=ON" + + "-DPLUGIN_GL_QEDL=ON" + "-DPLUGIN_GL_QSSAO=ON" + "-DPLUGIN_IO_QADDITIONAL=ON" + "-DPLUGIN_IO_QCORE=ON" + "-DPLUGIN_IO_QCSV_MATRIX=ON" + "-DPLUGIN_IO_QE57=ON" + "-DPLUGIN_IO_QFBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs + "-DPLUGIN_IO_QPDAL=ON" # required for .las/.laz support + "-DPLUGIN_IO_QPHOTOSCAN=ON" + "-DPLUGIN_IO_QRDB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs + ]; + + meta = with stdenv.lib; { + description = "3D point cloud and mesh processing software"; + homepage = "https://cloudcompare.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ nh2 ]; + platforms = with platforms; linux; # only tested here; might work on others + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bc95dea6279..fb8b46e57ba1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10249,6 +10249,8 @@ in cloud-nuke = callPackage ../development/tools/cloud-nuke { }; + cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare {}; + cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { }; coan = callPackage ../development/tools/analysis/coan { }; From f76a83c2c6c679722721567ec62cf56d0fc05331 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 26 Jun 2020 14:46:16 +0200 Subject: [PATCH 2692/3452] ceph: apply patch for CVE-2020-10753 Fixes: CVE-2020-10753 --- pkgs/tools/filesystems/ceph/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index c2234404d34a..65cd19df0fa8 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -106,6 +106,12 @@ in rec { patches = [ ./0000-fix-SPDK-build-env.patch + (fetchurl { + # Remove for Ceph > v15.2.3; https://www.openwall.com/lists/oss-security/2020/06/25/5 + name = "CVE-2020-10753.patch"; + url = "https://github.com/ceph/ceph/pull/35773/commits/1524d3c0c5cb11775313ea1e2bb36a93257947f2.patch"; + sha256 = "1c04kirijp4c8a5pgwqx17dzdnzvd29nl2nr3qdvf4fkqwnlf48s"; + }) ]; nativeBuildInputs = [ From 093dba326418e5337e6a8842f7403db672ac659f Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 26 Jun 2020 16:13:27 +0300 Subject: [PATCH 2693/3452] ArchiSteamFarm: 4.2.2.1 -> 4.2.3.3 --- pkgs/applications/misc/ArchiSteamFarm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 6201d881a882..71404e735476 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ArchiSteamFarm"; - version = "4.2.2.1"; + version = "4.2.3.3"; src = fetchurl { url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-generic.zip"; - sha256 = "0pr9rrhi44yl99c2i12rimmc4mhbh0ma9jn17cgsh8p0kbj8sq94"; + sha256 = "0v69rrs5fr1n5llfx42xkiish52al7kb36fjy3ng0j9qfp3g8pj7"; }; nativeBuildInputs = [ unzip makeWrapper jq ]; From c0a750f40a1e2130a7809661f3629ecb7c7341b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 13:14:35 +0000 Subject: [PATCH 2694/3452] ktlint: 0.37.1 -> 0.37.2 --- pkgs/development/tools/ktlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index b8a8dc75158e..fce25903aca9 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.37.1"; + version = "0.37.2"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "0i5frcy3ya1qwq0hl67gq6fgz0c8vgskgha25irsw7j2ndf4qp8i"; + sha256 = "1hhycvvp21gy6g71hwf3pk2jnccpnhcf2z7c85shzffhddy1wc0v"; }; nativeBuildInputs = [ makeWrapper ]; From 6a55be29115d06da1be8a959259747146f458bc0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 13:26:09 +0000 Subject: [PATCH 2695/3452] kubernetes: 1.18.3 -> 1.18.4 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index d1dbac56a1ec..5834aa7689a8 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.18.3"; + version = "1.18.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "01r6yym74x8ysvs4i23082nm8maisg6ipy9h41y4h8glvnpha0h8"; + sha256 = "11hic59ffypyky7g57p712y70nwk4qp9bx5vm0j0077c1i1i3756"; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; From f3c08b34e3dc2cd635482b94a7d9909d473cb019 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 13:38:16 +0000 Subject: [PATCH 2696/3452] libbpf: 0.0.8 -> 0.0.9 --- pkgs/os-specific/linux/libbpf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index aefb5ff6835c..0a98475384d7 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -6,13 +6,13 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "02vbpg9v5sjcw7ihximy63cjmz82q5izkp91i44m1qp6qj5qn4sr"; + sha256 = "18l0gff7nm841mwhr7bc7x863xcyvwh58zl7mc0amnsjqlbrvqg7"; }; nativeBuildInputs = [ pkgconfig ]; From de3c56ffd83f88d988923984d579d23e386c00f9 Mon Sep 17 00:00:00 2001 From: 1000101 Date: Tue, 23 Jun 2020 13:08:46 +0200 Subject: [PATCH 2697/3452] nixos/blockbook-frontend: init --- nixos/modules/module-list.nix | 1 + .../networking/blockbook-frontend.nix | 272 ++++++++++++++++++ 2 files changed, 273 insertions(+) create mode 100644 nixos/modules/services/networking/blockbook-frontend.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0dba92f60c7e..55d0c836d474 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -589,6 +589,7 @@ ./services/networking/autossh.nix ./services/networking/bird.nix ./services/networking/bitlbee.nix + ./services/networking/blockbook-frontend.nix ./services/networking/charybdis.nix ./services/networking/cjdns.nix ./services/networking/cntlm.nix diff --git a/nixos/modules/services/networking/blockbook-frontend.nix b/nixos/modules/services/networking/blockbook-frontend.nix new file mode 100644 index 000000000000..61938e51e063 --- /dev/null +++ b/nixos/modules/services/networking/blockbook-frontend.nix @@ -0,0 +1,272 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + eachBlockbook = config.services.blockbook-frontend; + + blockbookOpts = { config, lib, name, ...}: { + + options = { + + enable = mkEnableOption "blockbook-frontend application."; + + package = mkOption { + type = types.package; + default = pkgs.blockbook; + description = "Which blockbook package to use."; + }; + + user = mkOption { + type = types.str; + default = "blockbook-frontend-${name}"; + description = "The user as which to run blockbook-frontend-${name}."; + }; + + group = mkOption { + type = types.str; + default = "${config.user}"; + description = "The group as which to run blockbook-frontend-${name}."; + }; + + certFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/etc/secrets/blockbook-frontend-${name}/certFile"; + description = '' + To enable SSL, specify path to the name of certificate files without extension. + Expecting certFile.crt and certFile.key. + ''; + }; + + configFile = mkOption { + type = with types; nullOr path; + default = null; + example = "${config.dataDir}/config.json"; + description = "Location of the blockbook configuration file."; + }; + + coinName = mkOption { + type = types.str; + default = "Bitcoin"; + example = "Bitcoin"; + description = '' + See + for current of coins supported in master (Note: may differ from release). + ''; + }; + + cssDir = mkOption { + type = types.path; + default = "${config.package}/share/css/"; + example = "${config.dataDir}/static/css/"; + description = '' + Location of the dir with main.css CSS file. + By default, the one shipped with the package is used. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/blockbook-frontend-${name}"; + description = "Location of blockbook-frontend-${name} data directory."; + }; + + debug = mkOption { + type = types.bool; + default = false; + description = "Debug mode, return more verbose errors, reload templates on each request."; + }; + + internal = mkOption { + type = types.nullOr types.str; + default = ":9030"; + example = ":9030"; + description = "Internal http server binding [address]:port."; + }; + + messageQueueBinding = mkOption { + type = types.str; + default = "tcp://127.0.0.1:38330"; + example = "tcp://127.0.0.1:38330"; + description = "Message Queue Binding address:port."; + }; + + public = mkOption { + type = types.nullOr types.str; + default = ":9130"; + example = ":9130"; + description = "Public http server binding [address]:port."; + }; + + rpc = { + url = mkOption { + type = types.str; + default = "http://127.0.0.1"; + description = "URL for JSON-RPC connections."; + }; + + port = mkOption { + type = types.port; + default = 8030; + description = "Port for JSON-RPC connections."; + }; + + user = mkOption { + type = types.str; + default = "rpc"; + example = "rpc"; + description = "Username for JSON-RPC connections."; + }; + + password = mkOption { + type = types.str; + default = "rpc"; + example = "rpc"; + description = '' + RPC password for JSON-RPC connections. + 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 containing password of the RPC user. + Note: This options is ignored when configFile is used. + ''; + }; + }; + + sync = mkOption { + type = types.bool; + default = true; + description = "Synchronizes until tip, if together with zeromq, keeps index synchronized."; + }; + + templateDir = mkOption { + type = types.path; + default = "${config.package}/share/templates/"; + example = "${config.dataDir}/templates/static/"; + description = "Location of the HTML templates. By default, ones shipped with the package are used."; + }; + + extraConfig = mkOption { + type = types.attrs; + default = {}; + example = literalExample '' { + alternative_estimate_fee = "whatthefee-disabled"; + alternative_estimate_fee_params = "{\"url\": \"https://whatthefee.io/data.json\", \"periodSeconds\": 60}"; + fiat_rates = "coingecko"; + fiat_rates_params = "{\"url\": \"https://api.coingecko.com/api/v3\", \"coin\": \"bitcoin\", \"periodSeconds\": 60}"; + coin_shortcut = "BTC"; + coin_label = "Bitcoin"; + xpub_magic = 76067358; + xpub_magic_segwit_p2sh = 77429938; + xpub_magic_segwit_native = 78792518; + }''; + description = '' + Additional configurations to be appended to coin.conf. + Overrides any already defined configuration options. + See + for current configuration options supported in master (Note: may differ from release). + ''; + }; + + extraCmdLineOptions = mkOption { + type = types.listOf types.str; + default = []; + example = [ "-workers=1" "-dbcache=0" "-logtosderr" ]; + description = '' + Extra command line options to pass to Blockbook. + Run blockbook --help to list all available options. + ''; + }; + }; + }; +in +{ + # interface + + options = { + services.blockbook-frontend = mkOption { + type = types.attrsOf (types.submodule blockbookOpts); + default = {}; + description = "Specification of one or more blockbook-frontend instances."; + }; + }; + + # implementation + + config = mkIf (eachBlockbook != {}) { + + systemd.services = mapAttrs' (blockbookName: cfg: ( + nameValuePair "blockbook-frontend-${blockbookName}" ( + let + configFile = if cfg.configFile != null then cfg.configFile else + pkgs.writeText "config.conf" (builtins.toJSON ( { + coin_name = "${cfg.coinName}"; + rpc_user = "${cfg.rpc.user}"; + rpc_pass = "${cfg.rpc.password}"; + rpc_url = "${cfg.rpc.url}:${toString cfg.rpc.port}"; + message_queue_binding = "${cfg.messageQueueBinding}"; + } // cfg.extraConfig) + ); + in { + description = "blockbook-frontend-${blockbookName} daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + ln -sf ${cfg.templateDir} ${cfg.dataDir}/static/ + ln -sf ${cfg.cssDir} ${cfg.dataDir}/static/ + ${optionalString (cfg.rpc.passwordFile != null && cfg.configFile == null) '' + CONFIGTMP=$(mktemp) + ${pkgs.jq}/bin/jq ".rpc_pass = \"$(cat ${cfg.rpc.passwordFile})\"" ${configFile} > $CONFIGTMP + mv $CONFIGTMP ${cfg.dataDir}/${blockbookName}-config.json + ''} + ''; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = '' + ${cfg.package}/bin/blockbook \ + ${if (cfg.rpc.passwordFile != null && cfg.configFile == null) then + "-blockchaincfg=${cfg.dataDir}/${blockbookName}-config.json" + else + "-blockchaincfg=${configFile}" + } \ + -datadir=${cfg.dataDir} \ + ${optionalString (cfg.sync != false) "-sync"} \ + ${optionalString (cfg.certFile != null) "-certfile=${toString cfg.certFile}"} \ + ${optionalString (cfg.debug != false) "-debug"} \ + ${optionalString (cfg.internal != null) "-internal=${toString cfg.internal}"} \ + ${optionalString (cfg.public != null) "-public=${toString cfg.public}"} \ + ${toString cfg.extraCmdLineOptions} + ''; + Restart = "on-failure"; + WorkingDirectory = cfg.dataDir; + LimitNOFILE = 65536; + }; + } + ) )) eachBlockbook; + + systemd.tmpfiles.rules = flatten (mapAttrsToList (blockbookName: cfg: [ + "d ${cfg.dataDir} 0750 ${cfg.user} ${cfg.group} - -" + "d ${cfg.dataDir}/static 0750 ${cfg.user} ${cfg.group} - -" + ]) eachBlockbook); + + users.users = mapAttrs' (blockbookName: cfg: ( + nameValuePair "blockbook-frontend-${blockbookName}" { + name = cfg.user; + group = cfg.group; + home = cfg.dataDir; + isSystemUser = true; + })) eachBlockbook; + + users.groups = mapAttrs' (instanceName: cfg: ( + nameValuePair "${cfg.group}" { })) eachBlockbook; + }; +} From c6d346b323043cdf84517a4723e358c2fc55011b Mon Sep 17 00:00:00 2001 From: 1000101 Date: Tue, 23 Jun 2020 13:09:03 +0200 Subject: [PATCH 2698/3452] nixos/blockbook-frontend: add tests --- nixos/tests/all-tests.nix | 1 + nixos/tests/blockbook-frontend.nix | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 nixos/tests/blockbook-frontend.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7056d414e9e9..a210a68bfefd 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -33,6 +33,7 @@ in bees = handleTest ./bees.nix {}; bind = handleTest ./bind.nix {}; bittorrent = handleTest ./bittorrent.nix {}; + blockbook-frontend = handleTest ./blockbook-frontend.nix {}; buildkite-agents = handleTest ./buildkite-agents.nix {}; boot = handleTestOn ["x86_64-linux"] ./boot.nix {}; # syslinux is unsupported on aarch64 boot-stage1 = handleTest ./boot-stage1.nix {}; diff --git a/nixos/tests/blockbook-frontend.nix b/nixos/tests/blockbook-frontend.nix new file mode 100644 index 000000000000..67d0fcab9479 --- /dev/null +++ b/nixos/tests/blockbook-frontend.nix @@ -0,0 +1,28 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "blockbook-frontend"; + meta = with pkgs.stdenv.lib; { + maintainers = with maintainers; [ maintainers."1000101" ]; + }; + + machine = { ... }: { + services.blockbook-frontend."test" = { + enable = true; + }; + services.bitcoind = { + enable = true; + rpc = { + port = 8030; + users.rpc.passwordHMAC = "acc2374e5f9ba9e62a5204d3686616cf$53abdba5e67a9005be6a27ca03a93ce09e58854bc2b871523a0d239a72968033"; + }; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("blockbook-frontend-test.service") + + machine.wait_for_open_port(9030) + + machine.succeed("curl -sSfL http://localhost:9030 | grep 'Blockbook'") + ''; +}) From 6c3b36212a0be328caeb95e332847e4129ec2176 Mon Sep 17 00:00:00 2001 From: 1000101 Date: Fri, 12 Jun 2020 12:42:41 +0200 Subject: [PATCH 2699/3452] maintainers: fix previously uncaught name issues --- nixos/tests/dokuwiki.nix | 5 +++-- nixos/tests/trezord.nix | 5 ++--- nixos/tests/trickster.nix | 4 ++-- pkgs/development/python-modules/shamir-mnemonic/default.nix | 2 +- pkgs/servers/web-apps/dokuwiki/default.nix | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 05271919effe..4f00521c2021 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -32,8 +32,9 @@ let in { name = "dokuwiki"; - meta.maintainers = with pkgs.lib.maintainers; [ "1000101" ]; - + meta = with pkgs.stdenv.lib; { + maintainers = with maintainers; [ maintainers."1000101" ]; + }; machine = { ... }: { services.dokuwiki."site1.local" = { aclUse = false; diff --git a/nixos/tests/trezord.nix b/nixos/tests/trezord.nix index 8d908a522492..67646496ff97 100644 --- a/nixos/tests/trezord.nix +++ b/nixos/tests/trezord.nix @@ -1,9 +1,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "trezord"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ mmahut "1000101" ]; + meta = with pkgs.stdenv.lib; { + maintainers = with maintainers; [ mmahut maintainers."1000101" ]; }; - nodes = { machine = { ... }: { services.trezord.enable = true; diff --git a/nixos/tests/trickster.nix b/nixos/tests/trickster.nix index e2ca00980d53..aff4f7eb9125 100644 --- a/nixos/tests/trickster.nix +++ b/nixos/tests/trickster.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "trickster"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ "1000101" ]; + meta = with pkgs.stdenv.lib; { + maintainers = with maintainers; [ maintainers."1000101" ]; }; nodes = { diff --git a/pkgs/development/python-modules/shamir-mnemonic/default.nix b/pkgs/development/python-modules/shamir-mnemonic/default.nix index 13a946aeafd0..099c89803ab3 100644 --- a/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "Reference implementation of SLIP-0039"; homepage = "https://github.com/trezor/python-shamir-mnemonic"; license = licenses.mit; - maintainers = [ maintainers."1000101" ]; + maintainers = with maintainers; [ maintainers."1000101" ]; }; } diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/servers/web-apps/dokuwiki/default.nix index f12a75c8e18b..48eeddd5ea9b 100644 --- a/pkgs/servers/web-apps/dokuwiki/default.nix +++ b/pkgs/servers/web-apps/dokuwiki/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; homepage = "https://www.dokuwiki.org"; platforms = platforms.all; - maintainers = [ maintainers."1000101" ]; + maintainers = with maintainers; [ maintainers."1000101" ]; }; } From 467fdc71e52b492703d8304de8062e310249bf6a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 26 Jun 2020 11:08:51 -0400 Subject: [PATCH 2700/3452] linux: 5.8-rc1 -> 5.8-rc2 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- pkgs/os-specific/linux/kernel/manual-config.nix | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 2a7a1fa93425..382713e5834d 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,15 +3,15 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8-rc1"; - extraMeta.branch = "5.1"; + version = "5.8-rc2"; + extraMeta.branch = "5.8"; # modDirVersion needs to be x.y.z, will always add .0 modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1gb7g2vrgg0zz281lv1ir1r0535spc40j65p0azmdxlk24fkfxfc"; + sha256 = "03y4p5abmcjm3w5m7p868bqzzrrqz461na9h46f3f99g95z66v09"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d73e0a8ac909..3a2682b2cfe8 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio +, libelf, cpio, elfutils , utillinuxMinimal , writeTextFile }: @@ -280,8 +280,10 @@ let }; in -assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null; +assert (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") -> libelf != null; assert stdenv.lib.versionAtLeast version "4.15" -> utillinuxMinimal != null; +assert stdenv.lib.versionAtLeast version "5.8" -> elfutils != null; + stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // { pname = "linux"; inherit version; @@ -291,10 +293,11 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ] ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools - ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf + ++ optional (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") libelf ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinuxMinimal ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio + ++ optional (stdenv.lib.versionAtLeast version "5.8") elfutils ; hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; From c2327fe409ad8806744407a02b122740a194a4ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 13:07:13 +0000 Subject: [PATCH 2701/3452] kristall: 0.2 -> 0.3 --- pkgs/applications/networking/browsers/kristall/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/kristall/default.nix b/pkgs/applications/networking/browsers/kristall/default.nix index 34f23f452388..c9b15b6d4fc8 100644 --- a/pkgs/applications/networking/browsers/kristall/default.nix +++ b/pkgs/applications/networking/browsers/kristall/default.nix @@ -2,12 +2,12 @@ mkDerivation rec { pname = "kristall"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "MasterQ32"; repo = "kristall"; rev = "V" + version; - sha256 = "08k3rg0sa91ra0nzla5rw806nnncnyvq1s7k09k5i74fvcsnpqyp"; + sha256 = "07nf7w6ilzs5g6isnvsmhh4qa1zsprgjyf0zy7rhpx4ikkj8c8zq"; }; buildInputs = [ qtbase qtmultimedia ]; From a16a655811e9cac7b56c88a251fbcf613ca270ce Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 25 Jun 2020 10:43:56 +0100 Subject: [PATCH 2702/3452] pythonPackages.nbclient: init at 0.4.0 --- .../python-modules/nbclient/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/nbclient/default.nix diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix new file mode 100644 index 000000000000..18704eaee08b --- /dev/null +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, + async_generator, traitlets, nbformat, nest-asyncio, jupyter_client, + pytest, xmltodict, nbconvert, ipywidgets +}: + +buildPythonPackage rec { + pname = "nbclient"; + version = "0.4.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1id6m2dllkjpbv2w0yazxhlkhdd9cac6lxv9csf053il9wq322lk"; + }; + + checkInputs = [ pytest xmltodict nbconvert ipywidgets ]; + propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter_client ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/jupyter/nbclient"; + description = "A client library for executing notebooks"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 87a5e756f0fd..a7e32755b2ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4750,6 +4750,8 @@ in { names = callPackage ../development/python-modules/names { }; + nbclient = callPackage ../development/python-modules/nbclient { }; + nbconflux = callPackage ../development/python-modules/nbconflux { }; nbconvert = callPackage ../development/python-modules/nbconvert { }; From cab802740924ee5fc7a8a736c216710416421855 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 25 Jun 2020 10:44:40 +0100 Subject: [PATCH 2703/3452] pythonPackages.papermill: add missing dependencies --- pkgs/development/python-modules/papermill/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 591401be226b..73f72bd2897b 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -7,6 +7,7 @@ , pyyaml , nbformat , nbconvert +, nbclient , six , tqdm , jupyter_client @@ -14,6 +15,7 @@ , entrypoints , tenacity , futures +, black , backports_tempfile , isPy27 , pytest @@ -37,12 +39,14 @@ buildPythonPackage rec { pyyaml nbformat nbconvert + nbclient six tqdm jupyter_client requests entrypoints tenacity + black ] ++ lib.optionals isPy27 [ futures backports_tempfile From 9a5e9d475f695047b2a87945e52b1eac7ff0c0a6 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Fri, 26 Jun 2020 15:49:45 +0000 Subject: [PATCH 2704/3452] netdata: 1.22.1 -> 1.23.0 --- pkgs/tools/system/netdata/default.nix | 4 ++-- pkgs/tools/system/netdata/go.d.plugin.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 5d856e795300..722df46c05f5 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -14,14 +14,14 @@ with stdenv.lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.22.1"; + version = "1.23.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "1hliv4d3pa8c3inz0bcl6nngfmp8vwnvh7smbwqiq7isfjijbpr6"; + sha256 = "04x53hr2d086y4q990h7lazaykaizb5g45nmfvahqzxj72b0hvdf"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 2e397da8a817..3e38b7bfdf9a 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "netdata-go.d.plugin"; - version = "0.18.0"; + version = "0.19.2"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - sha256 = "15h4075lwqh58ssdgyq34jj8r4dga0sz7h18dzy4nir75p8a0s7b"; + sha256 = "03a67kvhickzg96jvzxhg1jih48m96rl4mkg0wgmbi7a676dl7lq"; }; - vendorSha256 = "1pw9pb3rdjzf2dx1p1jiqxs7qhlpjki7fy74nyxza5wzrv4317sj"; + vendorSha256 = "0mmnkkzpv8lmxn11idikddmjinxv1y823ny0wxp271agiinyfpn8"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.gpl3; maintainers = [ maintainers.lethalman ]; }; -} \ No newline at end of file +} From 2dad77e05c5e2b690d3efdae3b73d0c3c9c84e60 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Wed, 24 Jun 2020 23:45:10 -0400 Subject: [PATCH 2705/3452] diskonaut: init at 0.3.0 --- pkgs/tools/misc/diskonaut/default.nix | 28 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/diskonaut/default.nix diff --git a/pkgs/tools/misc/diskonaut/default.nix b/pkgs/tools/misc/diskonaut/default.nix new file mode 100644 index 000000000000..b0a413da8c04 --- /dev/null +++ b/pkgs/tools/misc/diskonaut/default.nix @@ -0,0 +1,28 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "diskonaut"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "imsnif"; + repo = "diskonaut"; + rev = version; + sha256 = "0vnmch2cac0j9b44vlcpqnayqhfdfdwvfa01bn7lwcyrcln5cd0z"; + }; + + cargoSha256 = "03hqdg6pnfxnhwk0xwhwmbrk4dicjpjllbbai56a3391xac5wmi6"; + + # some tests fail due to non-portable (in terms of filesystems) measurements of block sizes + # try to re-enable tests once actual-file-size is added + # see https://github.com/imsnif/diskonaut/issues/50 for more info + doCheck = false; + + meta = with stdenv.lib; { + description = "Terminal disk space navigator"; + homepage = "https://github.com/imsnif/diskonaut"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d88c63bcfb0..0d2a09b79247 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -921,6 +921,8 @@ in detect-secrets = python3Packages.callPackage ../development/tools/detect-secrets { }; + diskonaut = callPackage ../tools/misc/diskonaut { }; + diskus = callPackage ../tools/misc/diskus { inherit (darwin.apple_sdk.frameworks) Security; }; From 15c8a4800e0b0d34f378806df01abf3d0f41de80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Fri, 26 Jun 2020 08:53:58 +0200 Subject: [PATCH 2706/3452] nsd: set passthru.tests --- pkgs/servers/dns/nsd/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 43c2900443e2..67258f176be1 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libevent, openssl +{ stdenv, fetchurl, libevent, openssl, nixosTests , bind8Stats ? false , checking ? false , ipv6 ? true @@ -52,6 +52,10 @@ stdenv.mkDerivation rec { sed 's@$(INSTALL_DATA) nsd.conf.sample $(DESTDIR)$(nsdconfigfile).sample@@g' -i Makefile.in ''; + passthru.tests = { + inherit (nixosTests) nsd; + }; + meta = with stdenv.lib; { homepage = "http://www.nlnetlabs.nl"; description = "Authoritative only, high performance, simple and open source name server"; From 349a264553d310c4809680ea38a8b45b643539c2 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 26 Jun 2020 18:36:14 +0300 Subject: [PATCH 2707/3452] mame: 0.221 -> 0.222 --- pkgs/misc/emulators/mame/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index d72af71f6634..9b09d67e79ea 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -7,7 +7,7 @@ with stdenv; let majorVersion = "0"; - minorVersion = "221"; + minorVersion = "222"; desktopItem = makeDesktopItem { name = "MAME"; @@ -26,7 +26,7 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "1pqwa5qcrk0wgbyns6fkv7j3pn7byf216cixc3phhhgvfidgr8ww"; + sha256 = "1jwc50hmlrkdj204gqcvf7lvgb1r6rhj8hhckykylb1mli04c7gy"; }; hardeningDisable = [ "fortify" ]; From c074da0376c5f19ac5d8e713a37703ee3e7b866f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 16:35:45 +0000 Subject: [PATCH 2708/3452] libdigidocpp: 3.14.2 -> 3.14.3 --- pkgs/development/libraries/libdigidocpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 4052f6e45d72..940093ed4ba4 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.2"; + version = "3.14.3"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "0d3p72gvnj00bxl6lzh6n5x1r37wj54mzzv700gngcvr3m62lkbv"; + sha256 = "1hq1q2frqnm4wxcfr7vn8kqwyfdz3hx22w40kn69zh140pig6jc5"; }; nativeBuildInputs = [ cmake pkgconfig xxd ]; From 053db07ba788d65402d5790f4ecd70667ce4dc51 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 26 Jun 2020 18:54:11 +0200 Subject: [PATCH 2709/3452] linuxPackages.wireguard: 1.0.20200611 -> 1.0.20200623 https://lists.zx2c4.com/pipermail/wireguard/2020-June/005597.html --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 6af465da4731..22db152f59ca 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200611"; + version = "1.0.20200623"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "0a8xsjxp8krmm2px07x9qw8nhvp5ispf4mnc6k59p0qp26qbva5d"; + sha256 = "1siybpd14la9c5diigniwis1q9f5fhq2ris9bvgzhh8g8vr3xmqh"; }; hardeningDisable = [ "pic" ]; From 3b8ab4722bb287074333d9d42bcfd8a8a164bc40 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 17:03:20 +0000 Subject: [PATCH 2710/3452] libxls: 1.5.2 -> 1.5.3 --- pkgs/development/libraries/libxls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 2b28499864a7..d555ecea06df 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libxls"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { url = "https://github.com/libxls/libxls/releases/download/v${version}/libxls-${version}.tar.gz"; - sha256 = "1akadsyl10rp101ccjmrxr7933c3v641k377bn74jv6cdkcm4zld"; + sha256 = "0rl513wpq5qh7wkmdk4g9c68rzffv3mcbz48p4xyg4969zrx8lnm"; }; nativeBuildInputs = [ unzip ]; From e67449831bdc337e62052710a8f5e9a2de902173 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 17:14:03 +0000 Subject: [PATCH 2711/3452] lynis: 2.7.5 -> 3.0.0 --- pkgs/tools/security/lynis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index bbed166d7598..975288d0ab0d 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "2.7.5"; + version = "3.0.0"; src = fetchFromGitHub { owner = "CISOfy"; repo = pname; rev = version; - sha256 = "1lkkbvxm0rgrrlx0szaxmf8ghc3d26wal96sgqk84m37mvs1f7p0"; + sha256 = "05p8h2ww4jcc6lgxrm796cbvlfmw26rxq5fmw0xxavbpadiw752j"; }; nativeBuildInputs = [ makeWrapper ]; From 9483419e7d703891b02795574bbd9516ac270ad7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 17:19:43 +0000 Subject: [PATCH 2712/3452] marisa: 0.2.5 -> 0.2.6 --- pkgs/development/libraries/marisa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/development/libraries/marisa/default.nix index 9a4d178d3d27..99d82970fe06 100644 --- a/pkgs/development/libraries/marisa/default.nix +++ b/pkgs/development/libraries/marisa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "marisa"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "s-yata"; repo = "marisa-trie"; rev = "v${version}"; - sha256 = "0z4bf55np08q3cbi6gvj3cpw3zp8kf2d0jq6k74pjk066m7rapbb"; + sha256 = "1hy8hfksizk1af6kg8z3b9waiz6d5ggd73fiqcvmhfgra36dscyq"; }; enableParallelBuilding = true; From 25342d938fdb5a81685ecbc19d66d74c4c22ff45 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 17:36:11 +0000 Subject: [PATCH 2713/3452] mdbook: 0.3.7 -> 0.4.0 --- pkgs/tools/text/mdbook/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 9ca92a21db1c..7d5020f63b35 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.3.7"; + version = "0.4.0"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "0a5i842aqa5xaii5lfrnks0ldavbhbd3bl4f2d442i1ahbin5b32"; + sha256 = "13m23cky8axi7i4s1bvdjcdfr4v8mbxfvz4fy3q8b8gkd6abm3sf"; }; - cargoSha256 = "1qx3447y684b7y18lgk9cc37if2ld42jnmy1kak191q6rjh5ssh7"; + cargoSha256 = "0q1kf810494njd5ai2v4qsaq9w3b7120yaymhgxjpcmig8s86zhr"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; From 45ecb5b36c78f86c4e11c8c9a98589ea2d77252d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 17:49:05 +0000 Subject: [PATCH 2714/3452] mgba: 0.8.1 -> 0.8.2 --- pkgs/misc/emulators/mgba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 872fdc713836..e67549b208b7 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "mgba"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "1if82mfaak3696w5d5yshynpzywrxgvg3ifdfi2rwlpvq1gpd429"; + sha256 = "0dlwhn3hrpaqnl5hjs53y8j2i16idxrg3gy688gcwrc9z1a6bkn2"; }; enableParallelBuilding = true; From be347401b51f004f356e1cd105496186922ecc09 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 26 Jun 2020 13:50:19 -0400 Subject: [PATCH 2715/3452] broot: 0.17.0 -> 0.18.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 3e0a801d7b4b..54e1b1bf5a41 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.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "1d8mqzc98v03nxn498mpyclihs5hmfgazna8z8vgah11jjdryj5k"; + sha256 = "0b2hggm2ckdzl9f2dn64gdyvd7flpq3szmx69k84f3fimabn7yrm"; }; - cargoSha256 = "152p3ddxz4d1lkfarcihvaf24rflbr9xnag6v2ynady517n9w80i"; + cargoSha256 = "1bl2y7h72vwi2jvnszd8vna4yc71s9n6kgmlq4ib2cjmzsppqdpa"; nativeBuildInputs = [ installShellFiles ]; From 05c54bd0e1626193347bb5bb5713103942d18629 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 26 Jun 2020 19:59:12 +0200 Subject: [PATCH 2716/3452] terraform: 0.12.26 -> 0.12.27 (#91614) --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 080bc832544a..e375970823b8 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -118,8 +118,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.26"; - sha256 = "1f0n2zdk1jyqcmchsprqfkiivmsmdlpsf5b7x5f1dmvms9jw3268"; + version = "0.12.27"; + sha256 = "1m5inlcrqklbb22vqphyq280wqrimxbkk75zp1d2q29wb74awf7h"; patches = [ ./provider-path.patch (fetchpatch { From 7020dc8eac0e709bd69779898106789ec96b4b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Thu, 25 Jun 2020 22:38:40 +0200 Subject: [PATCH 2717/3452] nixos/nsd: symlink conf file to /etc/nsd We remove the configFile build flag override in the NixOS module. Instead of embedding the conf file link to the binaries, we symlink it to /etc/nsd/nsd.nix, the hardcoded config file location for the various CLI nsd utilities. This config file build option override is triggerring a nsd rebuild for each configuration change. This prevent us to use the nixos cache in many cases. Co-authored-by: Erjo --- nixos/modules/services/networking/nsd.nix | 7 ++++--- pkgs/servers/dns/nsd/default.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 6e3eed0c5570..3ecbd06ee416 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -11,8 +11,6 @@ let # build nsd with the options needed for the given config nsdPkg = pkgs.nsd.override { - configFile = "${configFile}/nsd.conf"; - bind8Stats = cfg.bind8Stats; ipv6 = cfg.ipv6; ratelimit = cfg.ratelimit.enable; @@ -897,7 +895,10 @@ in + "want, please enable 'services.nsd.rootServer'."; }; - environment.systemPackages = [ nsdPkg ]; + environment = { + systemPackages = [ nsdPkg ]; + etc."nsd/nsd.conf".source = "${configFile}/nsd.conf"; + }; users.groups.${username}.gid = config.ids.gids.nsd; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 67258f176be1..8d4125b8fa10 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -11,7 +11,7 @@ , rrtypes ? false , zoneStats ? false -, configFile ? "etc/nsd/nsd.conf" +, configFile ? "/etc/nsd/nsd.conf" }: stdenv.mkDerivation rec { From bc726a9f284d499e78517d592c3c19ee877ab723 Mon Sep 17 00:00:00 2001 From: Break Yang Date: Wed, 24 Jun 2020 21:16:46 -0700 Subject: [PATCH 2718/3452] maintainers: add breakds --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 127fff3d6b54..e8e2eff26c88 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1133,6 +1133,12 @@ githubId = 7716744; name = "Berno Strik"; }; + breakds = { + email = "breakds@gmail.com"; + github = "breakds"; + githubId = 1111035; + name = "Break Yang"; + }; brettlyons = { email = "blyons@fastmail.com"; github = "brettlyons"; From 929d7dd492e3a567f22393393265166be8aa8b8d Mon Sep 17 00:00:00 2001 From: Break Yang Date: Wed, 24 Jun 2020 21:20:53 -0700 Subject: [PATCH 2719/3452] pythonPackages.gdown: init at 3.11.1 --- .../python-modules/gdown/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/gdown/default.nix diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix new file mode 100644 index 000000000000..74eb5de4865e --- /dev/null +++ b/pkgs/development/python-modules/gdown/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonApplication +, fetchPypi +, filelock +, requests +, tqdm +, setuptools +}: + +buildPythonApplication rec { + pname = "gdown"; + version = "3.11.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1p023812hh7w7d08njjsfn0xzldl4m73yx8p243yb2q49ypjl6nz"; + }; + + propagatedBuildInputs = [ filelock requests tqdm setuptools ]; + + checkPhase = '' + $out/bin/gdown --help > /dev/null + ''; + + meta = with lib; { + description = "A CLI tool for downloading large files from Google Drive"; + homepage = "https://github.com/wkentaro/gdown"; + license = licenses.mit; + maintainers = with maintainers; [ breakds ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7991c374627..a11116c96b22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3880,6 +3880,8 @@ in google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; + gdown = with python3Packages; toPythonApplication gdown; + gopro = callPackage ../tools/video/gopro { }; gource = callPackage ../applications/version-management/gource { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7e32755b2ec..068132e388da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2963,6 +2963,8 @@ in { googletrans = callPackage ../development/python-modules/googletrans { }; + gdown = callPackage ../development/python-modules/gdown { }; + gpapi = callPackage ../development/python-modules/gpapi { }; gplaycli = callPackage ../development/python-modules/gplaycli { }; From 0b5eea64bffd7c6a3f606501808fbcdc1a074c9c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 18:24:43 +0000 Subject: [PATCH 2720/3452] mullvad-vpn: 2020.4 -> 2020.5 --- pkgs/applications/networking/mullvad-vpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 93a899742b5d..265c8add2785 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -41,11 +41,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2020.4"; + version = "2020.5"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "17xi8g2k89vi4d0j7pr33bx9zjapa2qh4pymbrqvxwli3yhq6zwr"; + sha256 = "131z6qlpjwxcn5a62f1f147f2z1xg185jmr0vbin8h0dwa1182vn"; }; nativeBuildInputs = [ From d14db92fa3f4e25b133aa8ff85e2592b768e5fff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 18:38:38 +0000 Subject: [PATCH 2721/3452] notion: 4.0.0 -> 4.0.1 --- pkgs/applications/window-managers/notion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index c18b2129f098..494bb9ff1b71 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "notion"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "raboof"; repo = pname; rev = version; - sha256 = "0rqfvwkj0j862hf6i4wsmb6185xibsskfj9kwy896qcpcg8w4kk7"; + sha256 = "1s0fyacygvc9iz7b9v3b2cmzzqc02nh4g1p9bfcxbg254iscd502"; }; nativeBuildInputs = [ pkgconfig makeWrapper groff ]; From a85b4663acb069226fca202f2e0594aa7faddb7f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Jun 2020 20:40:45 +0200 Subject: [PATCH 2722/3452] hackage2nix: disable broken packages to fix evaluation errors --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f756b612eac3..80f7f0ca161b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3085,6 +3085,7 @@ broken-packages: - arpa - arpack - array-forth + - array-list - array-primops - arrayfire - arraylist @@ -3399,6 +3400,7 @@ broken-packages: - bisect-binary - bit-array - bit-stream + - bitcoin-address - bitcoin-api - bitcoin-api-extra - bitcoin-block From 9c823ee933cf00f250cb93345ce95d64e79751e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Jun 2020 21:09:44 +0200 Subject: [PATCH 2723/3452] hackage2nix: update list of broken packages @kiwi: please note that matterhorn & Unique are both broken --- .../configuration-hackage2nix.yaml | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 80f7f0ca161b..23e80151e75a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3060,8 +3060,10 @@ broken-packages: - arb-fft - arbb-vm - arbor-datadog + - arbor-monad-counter - arbor-monad-metric - arbor-monad-metric-datadog + - arbor-postgres - arbtt - archive-libarchive - archive-tar-bytestring @@ -3251,6 +3253,8 @@ broken-packages: - base-generics - base-io-access - base32-bytestring + - base62 + - base64-bytes - base64-conduit - baserock-schema - basex-client @@ -3326,6 +3330,7 @@ broken-packages: - binary-protocol-zmq - binary-search - binary-streams + - binary-tagged - binary-typed - bind-marshal - BinderAnn @@ -3397,6 +3402,7 @@ broken-packages: - birch-beer - bird - BirdPP + - birds-of-paradise - bisect-binary - bit-array - bit-stream @@ -3486,6 +3492,7 @@ broken-packages: - bot - botpp - bounded-array + - bowntz - box - braid - brain-bleep @@ -3643,6 +3650,7 @@ broken-packages: - cao - cap - Capabilities + - capability - capnp - capped-list - capri @@ -3978,6 +3986,7 @@ broken-packages: - confcrypt - conferer-hedis - conferer-provider-dhall + - conferer-provider-json - conferer-provider-yaml - conferer-snap - conffmt @@ -4131,6 +4140,7 @@ broken-packages: - crypto-random-effect - crypto-rng - crypto-simple + - crypto-sodium - cryptocipher - cryptocompare - cryptoconditions @@ -4262,6 +4272,7 @@ broken-packages: - datasets - DataTreeView - dataurl + - DataVersion - date-conversions - dates - datetime @@ -4336,6 +4347,7 @@ broken-packages: - delude - demarcate - denominate + - dense - dense-int-set - dependent-hashmap - dependent-monoidal-map @@ -4362,6 +4374,7 @@ broken-packages: - detour-via-uom - deunicode - devil + - devtools - dewdrop - dfinity-radix-tree - Dflow @@ -4435,6 +4448,7 @@ broken-packages: - dirtree - discogs-haskell - discord-gateway + - discord-haskell - discord-hs - discord-rest - discord-types @@ -4736,6 +4750,7 @@ broken-packages: - ethereum-client-haskell - ethereum-merkle-patricia-db - eths-rlp + - euler-tour-tree - euphoria - eurofxref - eve @@ -5032,6 +5047,7 @@ broken-packages: - foscam-filename - foscam-sort - Foster + - fourmolu - fpco-api - fplll - fpnla-examples @@ -5277,6 +5293,7 @@ broken-packages: - gi-gsttag - gi-gtkosxapplication - gi-handy + - gi-ibus - gi-poppler - gi-secret - gi-wnck @@ -5332,6 +5349,7 @@ broken-packages: - glazier-react - glazier-react-examples - glazier-react-widget + - Gleam - GLFW - GLFW-b-demo - GLFW-OGL @@ -5356,6 +5374,7 @@ broken-packages: - gloss-game - gloss-raster - gloss-sodium + - glpk-headers - glpk-hs - glue - GLUtil @@ -5613,6 +5632,7 @@ broken-packages: - hannahci - hans - hans-pcap + - hanspell - haphviz - hapistrano - happindicator @@ -5788,6 +5808,7 @@ broken-packages: - haskelldb-hsql-sqlite3 - haskelldb-th - haskelldb-wx + - haskellish - HaskellLM - HaskellNet - HaskellNet-SSL @@ -5812,6 +5833,7 @@ broken-packages: - haskoin-protocol - haskoin-script - haskoin-store + - haskoin-store-data - haskoin-util - haskoin-wallet - haskoon @@ -5853,6 +5875,7 @@ broken-packages: - hasql-postgres-options - hasql-queue - hasql-simple + - hasql-th - hastache - hastache-aeson - haste @@ -6192,6 +6215,7 @@ broken-packages: - hol - hold-em - hole + - holmes - Holumbus-Searchengine - holy-project - homeomorphic @@ -6328,6 +6352,7 @@ broken-packages: - hsbencher - hsbencher-codespeed - hsbencher-fusion + - hsc3 - hsc3-auditor - hsc3-cairo - hsc3-data @@ -6377,6 +6402,7 @@ broken-packages: - hsI2C - hsignal - hSimpleDB + - hsinspect-lsp - HsJudy - hskeleton - hslackbuilder @@ -6511,6 +6537,7 @@ broken-packages: - http2-client - http2-client-exe - http2-client-grpc + - http2-grpc-proto-lens - http2-grpc-proto3-wire - https-everywhere-rules - https-everywhere-rules-raw @@ -6548,15 +6575,20 @@ broken-packages: - hvega-theme - hVOIDP - hw-all + - hw-balancedparens - hw-ci-assist - hw-dsv + - hw-eliasfano - hw-json - hw-json-lens - hw-json-simd - hw-json-simple-cursor - hw-json-standard-cursor - hw-kafka-avro + - hw-rankselect - hw-simd + - hw-succinct + - hw-xml - hwall-auth-iitk - hweblib - hwhile @@ -6955,6 +6987,7 @@ broken-packages: - katydid - kawaii - kawhi + - kazura-queue - kd-tree - kdesrc-build-extra - keccak @@ -7209,6 +7242,7 @@ broken-packages: - libraft - librandomorg - librato + - libsodium - libssh2 - libssh2-conduit - libsystemd-daemon @@ -7335,6 +7369,7 @@ broken-packages: - log-postgres - log-utils - log2json + - log4hs - logentries - logger - logging-effect-extra @@ -7500,6 +7535,8 @@ broken-packages: - math-grads - math-interpolate - math-metric + - math-programming-glpk + - math-programming-tests - mathblog - mathflow - mathlink @@ -7700,6 +7737,7 @@ broken-packages: - MonadCatchIO-transformers - MonadCatchIO-transformers-foreign - MonadCompose + - monadic-recursion-schemes - monadiccp - monadiccp-gecode - Monadius @@ -7739,6 +7777,7 @@ broken-packages: - morfeusz - morley - morpheus-graphql-cli + - morpheus-graphql-client - morphisms-functors - morphisms-functors-inventory - morphisms-objects @@ -7757,6 +7796,7 @@ broken-packages: - mpi-hs-cereal - mpi-hs-store - mpppc + - mprelude - mpretty - mpris - mprover @@ -7875,6 +7915,7 @@ broken-packages: - n-tuple - n2o-protocols - n2o-web + - NaCl - nagios-plugin-ekg - nakadi-client - named-lock @@ -8020,6 +8061,7 @@ broken-packages: - nofib-analyse - nofib-analyze - noise + - nom - Nomyx - Nomyx-Core - Nomyx-Language @@ -8263,6 +8305,7 @@ broken-packages: - parallel-tasks - parallel-tree-search - parameterized + - parameterized-utils - paranoia - parco - parco-attoparsec @@ -8335,6 +8378,7 @@ broken-packages: - pdf-toolbox-viewer - pdfname - pdfsplit + - pdftotext - pdynload - peakachu - PeanoWitnesses @@ -8519,6 +8563,7 @@ broken-packages: - polydata-core - polynomial - polysemy-RandomFu + - polysemy-webserver - polysemy-zoo - polyseq - polytypeable @@ -8532,6 +8577,7 @@ broken-packages: - pool-conduit - pop3-client - popenhs + - popkey - poppler - porcupine-core - porcupine-http @@ -8560,6 +8606,7 @@ broken-packages: - postgresql-simple-queue - postgresql-simple-sop - postgresql-simple-typed + - postgresql-syntax - postgresql-typed - postgresql-typed-lifted - postgrest-ws @@ -8641,6 +8688,7 @@ broken-packages: - process-qq - process-streaming - processing + - processmemory - procrastinating-variable - procstat - producer @@ -8676,6 +8724,7 @@ broken-packages: - proteome - proto-lens-combinators - proto-lens-descriptors + - proto-lens-jsonpb - proto3-suite - protobuf-native - protocol-buffers @@ -9296,6 +9345,7 @@ broken-packages: - Semantique - semdoc - semi-iso + - semialign-extras - semibounded-lattices - Semigroup - semigroupoids-syntax @@ -9330,6 +9380,7 @@ broken-packages: - servant-auth-token-leveldb - servant-auth-token-persistent - servant-auth-token-rocksdb + - servant-avro - servant-client-namedargs - servant-csharp - servant-db @@ -9412,6 +9463,7 @@ broken-packages: - sgrep - sh2md - sha-streams + - sha1 - shade - shadower - shake-bindist @@ -9533,6 +9585,7 @@ broken-packages: - skeletons - skell - skemmtun + - skews - skulk - skylark-client - skylighting-lucid @@ -9545,11 +9598,13 @@ broken-packages: - slidemews - Slides - slim + - slip32 - sloane - slot-lambda - sloth - slug - slynx + - small-bytearray-builder - smallarray - smallcheck-laws - smallcheck-lens @@ -9580,6 +9635,7 @@ broken-packages: - SMTPClient - smtps-gmail - smuggler + - smuggler2 - snake - snake-game - snap-accept @@ -9798,6 +9854,7 @@ broken-packages: - state-record - stateful-mtl - stateWriter + - static - static-canvas - static-closure - static-tensor @@ -9830,6 +9887,7 @@ broken-packages: - stm-hamt - stm-promise - stm-stats + - stm-supply - STM32-Zombie - stmcontrol - stochastic @@ -9864,6 +9922,7 @@ broken-packages: - streamproc - strelka - strict-data + - strict-tuple-lens - StrictBench - StrictCheck - strictly @@ -10024,6 +10083,7 @@ broken-packages: - tapioca - tar-bytestring - target + - tart - task - task-distribution - taskell @@ -10036,6 +10096,8 @@ broken-packages: - tasty-jenkins-xml - tasty-laws - tasty-lens + - tasty-mgolden + - tasty-quickcheck-laws - tasty-stats - tateti-tateti - Taxonomy @@ -10074,6 +10136,11 @@ broken-packages: - tempus - tensor - tensor-safe + - tensorflow + - tensorflow-core-ops + - tensorflow-logging + - tensorflow-opgen + - tensorflow-ops - termbox - termbox-banana - termbox-bindings @@ -10206,6 +10273,7 @@ broken-packages: - timeseries - timespan - timeutils + - timezone-olson-th - timezone-unix - tintin - tiny-scheduler @@ -10225,6 +10293,7 @@ broken-packages: - tldr - tls-extra - tlynx + - tmp-postgres - tn - to-haskell - to-string-class @@ -10367,6 +10436,7 @@ broken-packages: - twilio - twill - twine + - twirp - twitter - twitter-conduit - twitter-enumerator @@ -10544,6 +10614,7 @@ broken-packages: - uuagc-cabal - uuagc-diagrams - uuid-aeson + - uuid-bytes - uvector - uvector-algorithms - uxadt @@ -10610,6 +10681,7 @@ broken-packages: - verifiable-expressions - verify - verilog + - verismith - versioning - versioning-servant - vflow-types @@ -10829,6 +10901,7 @@ broken-packages: - wsdl - wsedit - wshterm + - wss-client - wstunnel - wtk - wtk-gtk @@ -10909,6 +10982,7 @@ broken-packages: - xmonad-windownames - xmpipe - XMPP + - xor - xorshift-plus - Xorshift128Plus - xournal-builder @@ -10916,6 +10990,7 @@ broken-packages: - xournal-parser - xournal-render - xournal-types + - xrefcheck - xsact - XSaiga - xsd @@ -10963,6 +11038,8 @@ broken-packages: - yarr - yarr-image-io - yavie + - yaya-test + - yaya-unsafe-test - ycextra - yeamer - yeller @@ -11096,6 +11173,7 @@ broken-packages: - zeromq4-conduit - zeromq4-patterns - zeroth + - zettelkast - ZFS - zifter - zifter-cabal From 876952da7d261d7f16cc52ceb775e88717af3b1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Jun 2020 21:31:57 +0200 Subject: [PATCH 2724/3452] hackage2nix: keep repline 0.3.x around for dhall --- .../haskell-modules/configuration-hackage2nix.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 23e80151e75a..cbedd07fa7df 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2539,9 +2539,9 @@ default-package-overrides: extra-packages: - aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier + - aeson-pretty < 0.8 # required by elm compiler - Agda == 2.6.1 # allows the agdaPackage set to be fixed to this version so that it won't break when another agda version is released. - ansi-terminal == 0.10.3 # required by cabal-plan, and policeman in ghc-8.8.x - - aeson-pretty < 0.8 # required by elm compiler - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x - apply-refact == 0.6.0.0 # works with GHC 8.6.x https://hackage.haskell.org/package/apply-refact/changelog - apply-refact == 0.7.0.0 # works with GHC 8.8.x https://hackage.haskell.org/package/apply-refact/changelog @@ -2586,14 +2586,15 @@ extra-packages: - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below - network == 3.0.* # required by network-bsd, HTTP, and many others (2019-04-30) + - pantry == 0.2.0.0 # required by stack-2.1.3.1 - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 - patience ^>= 0.1 # required by chell-0.4.x - - pantry == 0.2.0.0 # required by stack-2.1.3.1 - persistent >=2.5 && <2.8 # pre-lts-11.x versions neeed by git-annex 6.20180227 - persistent-sqlite < 2.7 # pre-lts-11.x versions neeed by git-annex 6.20180227 - prettyprinter == 1.6.1 # required by ghc 8.8.x, and dhall-1.29.0 - primitive == 0.5.1.* # required to build alex with GHC 6.12.3 - QuickCheck < 2 # required by test-framework-quickcheck and its users + - repline == 0.3.* # required by dhall-0.32.x - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x - resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227 - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x From 05530585af932a6798b270c88119df45824b2376 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Jun 2020 21:06:48 +0200 Subject: [PATCH 2725/3452] haskell-policeman: jailbreak with all compilers to fix the overspecified constraint on relude --- pkgs/development/haskell-modules/configuration-common.nix | 5 ++++- .../development/haskell-modules/configuration-ghc-8.10.x.nix | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e8413a596d56..5a5edb3dd20f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1474,9 +1474,12 @@ self: super: { # 2020-06-24: Tests are broken in hackage distribution. # See: https://github.com/kowainik/stan/issues/316 stan = dontCheck super.stan; - + # 2020-06-24: Tests are broken in hackage distribution. # See: https://github.com/robstewart57/rdf4h/issues/39 rdf4h = dontCheck super.rdf4h; + # https://github.com/kowainik/policeman/issues/57 + policeman = doJailbreak super.policeman; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 2f962c249fc4..98e814b79d7d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -105,7 +105,6 @@ self: super: { cborg = doJailbreak super.cborg; cborg-json = doJailbreak super.cborg-json; exact-pi = doJailbreak super.exact-pi; - policeman = doJailbreak super.policeman; relude = dontCheck (doJailbreak super.relude); serialise = doJailbreak super.serialise; setlocale = doJailbreak super.setlocale; From 3b1fa25a6f1da41089d9af02d2e3011a65101980 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Jun 2020 20:42:21 +0200 Subject: [PATCH 2726/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-6-g17421b6-dirty from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/16740bbf7ab121fb84138c94018c4e6efbd7e372. --- .../haskell-modules/hackage-packages.nix | 332 +++++++++++++++++- 1 file changed, 315 insertions(+), 17 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2b3b0086c26a..609090b610cb 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4371,6 +4371,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "Type safe data migrations"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Deadpan-DDP" = callPackage @@ -7232,6 +7234,8 @@ self: { libraryHaskellDepends = [ base mtl split threepenny-gui ]; description = "HTML Canvas graphics, animations and simulations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Glob" = callPackage @@ -14092,6 +14096,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Easy-and-safe-to-use high-level Haskell bindings to NaCl"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "NameGenerator" = callPackage @@ -31397,6 +31403,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Counter library for submitting metrics to a backend such as datadog"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arbor-monad-logger" = callPackage @@ -31488,6 +31496,8 @@ self: { ]; description = "Convenience types and functions for postgresql-simple"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arbtt" = callPackage @@ -32295,6 +32305,8 @@ self: { ]; description = "IsList instances of Array for OverloadedLists extension"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "array-memoize" = callPackage @@ -37300,6 +37312,8 @@ self: { ]; description = "Base62 encoding and decoding"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "base64" = callPackage @@ -37379,6 +37393,8 @@ self: { ]; description = "Base64 encoding of byte sequences"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "base64-bytestring" = callPackage @@ -39782,6 +39798,8 @@ self: { ]; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "binary-tree" = callPackage @@ -41136,6 +41154,8 @@ self: { testHaskellDepends = [ base ]; description = "Birds of Paradise"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bisc" = callPackage @@ -41310,6 +41330,8 @@ self: { ]; description = "Bitcoin address generation and rendering. Parsing coming soon."; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bitcoin-api" = callPackage @@ -44060,6 +44082,8 @@ self: { ]; description = "audio-visual pseudo-physical simulation of colliding circles"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "box" = callPackage @@ -46830,10 +46854,11 @@ self: { ({ mkDerivation, base, bytestring, libxml2 }: mkDerivation { pname = "c14n"; - version = "0.1.0.0"; - sha256 = "0j41nykxsf0900nm69ji5cf55376nprqvns81sjn1na4fvb8fllc"; + version = "0.1.0.1"; + sha256 = "0j5g36sxz6bp2z0z10d47lqh7rmclx3296zafc5vzns8d884sm0n"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ libxml2 ]; + libraryPkgconfigDepends = [ libxml2 ]; description = "Bindings to the c14n implementation in libxml"; license = stdenv.lib.licenses.mit; }) {inherit (pkgs) libxml2;}; @@ -49231,6 +49256,8 @@ self: { ]; description = "Extensional capabilities and deriving combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "capataz" = callPackage @@ -59471,6 +59498,8 @@ self: { ]; description = "conferer's provider for reading json files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "conferer-provider-yaml" = callPackage @@ -63738,6 +63767,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Easy-and-safe-to-use high-level cryptography based on Sodium"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "crypto-token" = callPackage @@ -70059,6 +70090,8 @@ self: { ]; description = "Mutable and immutable dense multidimensional arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dense-int-set" = callPackage @@ -70914,6 +70947,8 @@ self: { ]; description = "Haskell development tool agregate"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dewdrop" = callPackage @@ -73655,6 +73690,8 @@ self: { executableHaskellDepends = [ base text ]; description = "Write bots for Discord in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "discord-hs" = callPackage @@ -82763,6 +82800,8 @@ self: { ]; description = "Euler tour trees"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "euphoria" = callPackage @@ -91088,6 +91127,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fpco-api" = callPackage @@ -99259,6 +99300,8 @@ self: { libraryPkgconfigDepends = [ ibus ]; description = "IBus bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) ibus;}; "gi-javascriptcore" = callPackage @@ -101863,6 +101906,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Low-level Haskell bindings to GLPK"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) glpk;}; "glpk-hs" = callPackage @@ -111618,6 +111663,8 @@ self: { ]; description = "Korean spell checker"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haphviz" = callPackage @@ -116077,6 +116124,8 @@ self: { ]; description = "For parsing Haskell-ish languages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskellscrabble" = callPackage @@ -116660,6 +116709,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Data for Haskoin Store"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "haskoin-util" = callPackage @@ -117894,6 +117945,8 @@ self: { ]; description = "Template Haskell utilities for Hasql"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-transaction" = callPackage @@ -122822,6 +122875,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hie-bios_0_5_1" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , conduit, conduit-extra, containers, cryptohash-sha1, deepseq + , directory, extra, file-embed, filepath, ghc, hslogger, process + , tasty, tasty-hunit, temporary, text, time, transformers + , unix-compat, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hie-bios"; + version = "0.5.1"; + sha256 = "0b6kll3w8g0nb1ijz8kw39dmiksyaq30nk5b5gmdgjdycz5hp9vm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring conduit conduit-extra + containers cryptohash-sha1 deepseq directory extra file-embed + filepath ghc hslogger process temporary text time transformers + unix-compat unordered-containers vector yaml + ]; + executableHaskellDepends = [ base directory filepath ghc ]; + testHaskellDepends = [ + base directory extra filepath ghc tasty tasty-hunit text + unordered-containers yaml + ]; + description = "Set up a GHC API session"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hie-core" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, containers , data-default, deepseq, directory, extra, filepath, ghc, ghc-boot @@ -126504,6 +126586,8 @@ self: { testToolDepends = [ markdown-unlit tasty-discover ]; description = "Tools and combinators for solving constraint problems"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "holy-project" = callPackage @@ -130155,6 +130239,8 @@ self: { ]; description = "Haskell SuperCollider"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsc3-auditor" = callPackage @@ -131302,6 +131388,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "LSP interface over the hsinspect binary"; license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hsinstall" = callPackage @@ -135462,6 +135550,8 @@ self: { ]; description = "Encoders based on `proto-lens` for gRPC over HTTP2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http2-grpc-proto3-wire" = callPackage @@ -136416,6 +136506,8 @@ self: { doHaddock = false; description = "Balanced parentheses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-bits" = callPackage @@ -136632,6 +136724,8 @@ self: { ]; description = "Elias-Fano"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-excess" = callPackage @@ -137195,6 +137289,8 @@ self: { doHaddock = false; description = "Rank-select"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-rankselect-base" = callPackage @@ -137313,6 +137409,8 @@ self: { ]; description = "Succint datastructures"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-uri" = callPackage @@ -137405,6 +137503,8 @@ self: { ]; description = "XML parser based on succinct data structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hwall-auth-iitk" = callPackage @@ -148590,6 +148690,8 @@ self: { ]; description = "Fast concurrent queues much inspired by unagi-chan"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "kbq-gu" = callPackage @@ -155811,6 +155913,8 @@ self: { testPkgconfigDepends = [ libsodium ]; description = "Low-level bindings to the libsodium C library"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libsodium;}; "libssh2" = callPackage @@ -159463,6 +159567,8 @@ self: { ]; description = "A python logging style log library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "logentries" = callPackage @@ -163940,6 +164046,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "A GLPK backend to the math-programming library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) glpk;}; "math-programming-tests" = callPackage @@ -163955,6 +164063,8 @@ self: { ]; description = "Utility functions for testing implementations of the math-programming library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mathblog" = callPackage @@ -167913,6 +168023,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "miso_1_7_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-api-data + , http-types, lucid, network-uri, servant, servant-lucid, text + , transformers, vector + }: + mkDerivation { + pname = "miso"; + version = "1.7.0.0"; + sha256 = "1qww479hwydbazv2jsmrhy9n6v6miyjq5dnld431sav70l9y2y48"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers http-api-data http-types lucid + network-uri servant servant-lucid text transformers vector + ]; + description = "A tasty Haskell front-end framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "miso-action-logger" = callPackage ({ mkDerivation, aeson, base, ghcjs-base, miso }: mkDerivation { @@ -167930,8 +168060,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "miso-examples"; - version = "1.5.2.0"; - sha256 = "0qjppkz1fh5ygjdbjh4mymplxwy3rz01w047hyvx6ysyr4l0vnvg"; + version = "1.7.0.0"; + sha256 = "0k69yqg1qx31cbf8d3kq57yyl19b5q5a7wsa0ab3l5dhc0jdbkwc"; isLibrary = false; isExecutable = true; description = "A tasty Haskell front-end framework"; @@ -170339,6 +170469,8 @@ self: { testHaskellDepends = [ base ]; description = "Recursion Schemes for Monadic version"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monadiccp" = callPackage @@ -171385,6 +171517,8 @@ self: { ]; description = "Morpheus GraphQL Client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "morpheus-graphql-core" = callPackage @@ -171935,6 +172069,8 @@ self: { ]; description = "A minimalish prelude"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mpretty" = callPackage @@ -179494,6 +179630,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Name-binding & alpha-equivalence"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nominal" = callPackage @@ -184762,15 +184900,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ormolu_0_1_1_0" = callPackage + "ormolu_0_1_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, exceptions , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl , optparse-applicative, path, path-io, syb, text }: mkDerivation { pname = "ormolu"; - version = "0.1.1.0"; - sha256 = "0vi26dqraw2qb56z0x6q9m7klpa70r5wlrhwprap2p8nh73m2484"; + version = "0.1.2.0"; + sha256 = "14ndqfcbx0y71d3q5i7d0scbvg9nd5qr5pdn7qvylxlkgpbc77qp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -187329,6 +187467,8 @@ self: { ]; description = "Classes and data structures for working with data-kind indexed types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "paramtree" = callPackage @@ -189512,6 +189652,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Extracts text from PDF using poppler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {poppler-cpp = null;}; "pdynload" = callPackage @@ -195343,6 +195485,8 @@ self: { ]; description = "Start web servers from within a Polysemy effect stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polysemy-zoo" = callPackage @@ -195748,6 +195892,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Static key-value storage backed by poppy"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "poppler" = callPackage @@ -197008,6 +197154,8 @@ self: { ]; description = "PostgreSQL AST parsing and rendering"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-transactional" = callPackage @@ -199732,6 +199880,8 @@ self: { libraryHaskellDepends = [ base binary bytestring process ]; description = "C bindings for the gnu-extension functions process_vm_readv and process_vm_writev"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "processor-creative-kit" = callPackage @@ -200897,6 +201047,8 @@ self: { ]; description = "JSON protobuf encoding for proto-lens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "proto-lens-optparse" = callPackage @@ -211234,6 +211386,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "repline_0_3_0_0" = callPackage + ({ mkDerivation, base, containers, exceptions, haskeline, mtl + , process + }: + mkDerivation { + pname = "repline"; + version = "0.3.0.0"; + sha256 = "0niihfyggg2qisadg7w49cr5k5qyyynia93iip0ng2bbmzwi88g8"; + libraryHaskellDepends = [ + base containers exceptions haskeline mtl process + ]; + testHaskellDepends = [ base containers mtl process ]; + description = "Haskeline wrapper for GHCi-like REPL interfaces"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "repline_0_4_0_0" = callPackage ({ mkDerivation, base, containers, exceptions, haskeline, mtl , process @@ -211433,6 +211602,8 @@ self: { pname = "req"; version = "3.3.0"; sha256 = "1y6zw6j3sk2p3ch636w787zs36i8v3p94gdvbfqgjd16k3hlnaxc"; + revision = "1"; + editedCabalFile = "1lr6s11iyzxfz4ahdnlk54jzqx7z4bw4gf7d2asqkrlqzqr91fjk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -217350,8 +217521,8 @@ self: { pname = "scheduler"; version = "1.4.2.2"; sha256 = "0mzwm7lr089hbv08c58l3ahiid8w1cysvjl9q6vb46x3wpa3fwia"; - revision = "1"; - editedCabalFile = "0a6xcidya383ygzmz76di3dj1c8xm6ra5zb8fp517lk50s3ly3kl"; + revision = "2"; + editedCabalFile = "1rjh1c8m2mmjsxgpqsi1b7y27jpvvwjrlvaa1fsc0lqnrkgmarl3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ atomic-primops base deepseq exceptions primitive unliftio-core @@ -217369,6 +217540,28 @@ self: { broken = true; }) {}; + "scheduler_1_4_2_3" = callPackage + ({ mkDerivation, atomic-primops, base, deepseq, doctest, exceptions + , genvalidity-hspec, hspec, mwc-random, primitive, QuickCheck + , template-haskell, unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "scheduler"; + version = "1.4.2.3"; + sha256 = "0xf5gmla5h0k0a84f7b5xyk98xr72a9mygjlg5c913vc29i31ccx"; + libraryHaskellDepends = [ + atomic-primops base deepseq exceptions primitive unliftio-core + ]; + testHaskellDepends = [ + base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck + template-haskell unliftio vector + ]; + description = "Work stealing scheduler"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "schedyield" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -219464,6 +219657,8 @@ self: { testHaskellDepends = [ base doctest QuickCheck ]; description = "Extra functions for working with Semialigns"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "semialign-indexed" = callPackage @@ -220881,6 +221076,8 @@ self: { ]; description = "Avro content type for Servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-blaze" = callPackage @@ -224094,6 +224291,8 @@ self: { ]; description = "SHA-1 Hash"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shade" = callPackage @@ -224520,24 +224719,24 @@ self: { "shakebook" = callPackage ({ mkDerivation, aeson, aeson-with, base, comonad, comonad-extras - , doctemplates, feed, free, ixset, lens, lens-aeson, mustache + , doctemplates, feed, free, ixset-typed, lens, lens-aeson, mustache , pandoc, pandoc-types, path-extensions, rio, shake-plus, slick , split, tasty, tasty-golden, text-time, zipper-extra }: mkDerivation { pname = "shakebook"; - version = "0.6.0.0"; - sha256 = "1lhajmf0i4rvwys8xlnsnjz7rim3g1vd1cd9blz7kg7zfbn28kxr"; + version = "0.7.0.0"; + sha256 = "09149j3fjsg3904v90dp1kgdhh52czzrxz2bd90mh2jaf5v59c2h"; libraryHaskellDepends = [ aeson aeson-with base comonad comonad-extras doctemplates feed free - ixset lens lens-aeson mustache pandoc pandoc-types path-extensions - rio shake-plus slick split text-time zipper-extra + ixset-typed lens lens-aeson mustache pandoc pandoc-types + path-extensions rio shake-plus slick split text-time zipper-extra ]; testHaskellDepends = [ aeson aeson-with base comonad comonad-extras doctemplates feed free - ixset lens lens-aeson mustache pandoc pandoc-types path-extensions - rio shake-plus slick split tasty tasty-golden text-time - zipper-extra + ixset-typed lens lens-aeson mustache pandoc pandoc-types + path-extensions rio shake-plus slick split tasty tasty-golden + text-time zipper-extra ]; description = "Shake-based technical documentation generator; HTML & PDF"; license = stdenv.lib.licenses.mit; @@ -227833,6 +228032,8 @@ self: { ]; description = "A very quick-and-dirty WebSocket server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "skip-list" = callPackage @@ -228337,6 +228538,8 @@ self: { ]; description = "SLIP-0032: Extended serialization format for BIP-32 wallets"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "slist" = callPackage @@ -228496,6 +228699,8 @@ self: { doHaddock = false; description = "Serialize to bytes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smallarray" = callPackage @@ -229259,6 +229464,8 @@ self: { ]; description = "GHC Source Plugin that helps to minimise imports and generate explicit exports"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "snake" = callPackage @@ -235135,6 +235342,8 @@ self: { ]; description = "Type-safe and interoperable static values and closures"; license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "static-canvas" = callPackage @@ -236148,6 +236357,8 @@ self: { testHaskellDepends = [ async base QuickCheck random Unique ]; description = "STM wrapper around Control.Concurrent.Supply."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-tlist" = callPackage @@ -237344,6 +237555,8 @@ self: { pname = "streamly"; version = "0.7.2"; sha256 = "007i3rfza0v8zy34lq9ipq2biarg82prmd1vxr5f2zz5xln37wrm"; + revision = "1"; + editedCabalFile = "15fyfvf0g2l678426fz91fqf3qgi44dagqdxh6i6am3vh0nvvg1d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237682,6 +237895,8 @@ self: { libraryHaskellDepends = [ base lens strict-tuple ]; description = "Optics for the `strict-tuple` library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "strict-types" = callPackage @@ -242785,6 +243000,8 @@ self: { ]; description = "Terminal Art"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "task" = callPackage @@ -243422,6 +243639,8 @@ self: { ]; description = "Golden testing provider for tasty with muti-line diff output"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-program" = callPackage @@ -243467,6 +243686,8 @@ self: { testHaskellDepends = [ base QuickCheck tasty ]; description = "Pre-built tasty trees for checking lawful class properties using QuickCheck"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tasty-rerun" = callPackage @@ -244775,6 +244996,8 @@ self: { ]; description = "TensorFlow bindings"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {libtensorflow = null;}; "tensorflow-core-ops" = callPackage @@ -244795,6 +245018,8 @@ self: { ]; description = "Haskell wrappers for Core Tensorflow Ops"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tensorflow-logging" = callPackage @@ -244823,6 +245048,8 @@ self: { ]; description = "TensorBoard related functionality"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tensorflow-mnist" = callPackage @@ -244875,6 +245102,8 @@ self: { ]; description = "Code generation for TensorFlow operations"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tensorflow-ops" = callPackage @@ -244904,6 +245133,8 @@ self: { ]; description = "Friendly layer around TensorFlow bindings"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tensorflow-proto" = callPackage @@ -249653,6 +249884,8 @@ self: { ]; description = "Load TimeZoneSeries from an Olson file at compile time"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "timezone-series" = callPackage @@ -250236,6 +250469,8 @@ self: { ]; description = "Start and stop a temporary postgres"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tmpl" = callPackage @@ -254371,6 +254606,8 @@ self: { ]; description = "Haskell twirp foundations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twisty" = callPackage @@ -259870,6 +260107,8 @@ self: { ]; description = "UUID parsing using byteverse packages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uuid-crypto" = callPackage @@ -261811,6 +262050,8 @@ self: { benchmarkHaskellDepends = [ base criterion lens ]; description = "Random verilog generation and simulator testing"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "versioning" = callPackage @@ -268810,6 +269051,8 @@ self: { testHaskellDepends = [ base bytestring envy hspec skews text ]; description = "A-little-higher-level WebSocket client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wstunnel" = callPackage @@ -271180,6 +271423,8 @@ self: { ]; description = "Efficient XOR masking"; license = stdenv.lib.licenses.gpl2Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xorshift" = callPackage @@ -271383,6 +271628,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xsact" = callPackage @@ -272419,6 +272666,29 @@ self: { broken = true; }) {}; + "yapb" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , directory, hashable, json, network, pretty, prettyprinter + , process, regex-tdfa + }: + mkDerivation { + pname = "yapb"; + version = "0.1.0"; + sha256 = "184jrkyijlp644r4zgvicy9xlrx29xmbn7jszpwp3jk5yfavm5w2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory hashable process regex-tdfa + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring containers json network pretty + prettyprinter regex-tdfa + ]; + testHaskellDepends = [ base ]; + description = "Yet Another Parser Builder (YAPB)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yarn-lock" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, either , megaparsec, neat-interpolation, protolude, quickcheck-instances @@ -272593,6 +272863,8 @@ self: { ]; description = "Test suites for `yaya`"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yaya-unsafe" = callPackage @@ -272624,6 +272896,8 @@ self: { ]; description = "Test suites for `yaya-unsafe`"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ycextra" = callPackage @@ -272869,6 +273143,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod_1_6_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit + , data-default-class, directory, fast-logger, monad-logger + , semigroups, shakespeare, streaming-commons, template-haskell + , text, unix, unordered-containers, wai, wai-extra, wai-logger + , warp, yaml, yesod-core, yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod"; + version = "1.6.0.2"; + sha256 = "0dkaa7kzhdnqryfn8sbcbw5i1plkfckz1664gb1734fqadia32gq"; + libraryHaskellDepends = [ + aeson base bytestring conduit data-default-class directory + fast-logger monad-logger semigroups shakespeare streaming-commons + template-haskell text unix unordered-containers wai wai-extra + wai-logger warp yaml yesod-core yesod-form yesod-persistent + ]; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-alerts" = callPackage ({ mkDerivation, alerts, base, blaze-html, blaze-markup, safe, text , yesod-core @@ -276525,6 +276821,8 @@ self: { testHaskellDepends = [ base ]; description = "Command-line utility for working with zettelkast files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zifter" = callPackage From c7cadae1d2bec0b3211109958b01768945326340 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Jun 2020 22:41:47 +0200 Subject: [PATCH 2727/3452] haskell-dhall: fix overrides for the 0.32 version --- pkgs/development/haskell-modules/configuration-common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5a5edb3dd20f..bf1bfc8327d5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1014,8 +1014,10 @@ self: super: { # 2020-06-04: HACK: dontCheck - The test suite attempts to use the network. # Should be solved when: https://github.com/dhall-lang/dhall-haskell/issues/1837 - dhall = generateOptparseApplicativeCompletion "dhall" (dontCheck super.dhall); + dhall = (generateOptparseApplicativeCompletion "dhall" (dontCheck super.dhall)).override { repline = self.repline_0_3_0_0; }; dhall_1_30_0 = dontCheck super.dhall_1_30_0; + repline_0_3_0_0 = super.repline_0_3_0_0.override { haskeline = self.haskeline_0_8_0_0; }; + haskeline_0_8_0_0 = dontCheck super.haskeline_0_8_0_0; dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] From 2ef3794f2ccde4673d39a974c90dea36cee1be39 Mon Sep 17 00:00:00 2001 From: sarahzrf Date: Fri, 26 Jun 2020 16:52:00 -0400 Subject: [PATCH 2728/3452] Fixed syntax errors in ihaskell wrapper --- pkgs/development/tools/haskell/ihaskell/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 9b33d6e06708..60f8c2ecb252 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -9,7 +9,7 @@ let ihaskellSh = writeScriptBin "ihaskell-notebook" '' #! ${stdenv.shell} export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH" - export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}''${PATH:+':'}$PATH + export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}''${PATH:+:}$PATH" ${ihaskellEnv}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook ''; in From afc8bd6a7ba6430ba99c78a382e6641a95e6c477 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Fri, 26 Jun 2020 14:45:19 -0700 Subject: [PATCH 2729/3452] docker: use git tags instead of revs --- nixos/tests/docker.nix | 4 ++-- pkgs/applications/virtualization/docker/default.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index 8fda7c1395ef..a4a61468f33d 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -43,7 +43,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { docker.fail("sudo -u noprivs docker ps") docker.succeed("docker stop sleeping") - # Must match version twice to ensure client and server versions are correct - docker.succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "2" ]') + # Must match version 4 times to ensure client and server git commits and versions are correct + docker.succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "4" ]') ''; }) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index bb92ebc03697..e9fc96986a8e 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -184,9 +184,9 @@ rec { # Get revisions from # https://github.com/docker/docker-ce/tree/${version}/components/engine/hack/dockerfile/install/* - docker_18_09 = makeOverridable dockerGen { + docker_18_09 = makeOverridable dockerGen rec { version = "18.09.9"; - rev = "039a7df9ba8097dd987370782fcdd6ea79b26016"; + rev = "v${version}"; sha256 = "0wqhjx9qs96q2jd091wffn3cyv2aslqn2cvpdpgljk8yr9s0yg7h"; runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657"; runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj"; @@ -196,9 +196,9 @@ rec { tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; - docker_19_03 = makeOverridable dockerGen { + docker_19_03 = makeOverridable dockerGen rec { version = "19.03.12"; - rev = "48a66213fe1747e8873f849862ff3fb981899fc6"; + rev = "v${version}"; sha256 = "0i5xr8q3yjrz5zsjcq63v4g1mzqpingjr1hbf9amk14484i2wkw7"; runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10 runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; From 83f77cfd64d75935cc73b2b9b6a0a4117263e3af Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 00:00:04 +0200 Subject: [PATCH 2730/3452] libxpdf: add license --- pkgs/applications/misc/xpdf/libxpdf.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/xpdf/libxpdf.nix b/pkgs/applications/misc/xpdf/libxpdf.nix index 3b982b1766f9..7b7d9051ada3 100644 --- a/pkgs/applications/misc/xpdf/libxpdf.nix +++ b/pkgs/applications/misc/xpdf/libxpdf.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz"; sha256 = "000zq4ddbwyxiki4vdwpmxbnw5n9hsg9hvwra2p33hslyib7sfmk"; }; - + patches = [ (fetchurl { url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch"; @@ -39,14 +39,15 @@ stdenv.mkDerivation { cp -v goo/libGoo.a $out/lib/goo cp -v fofi/libfofi.a $out/lib/fofi cp -v xpdf/libxpdf.a $out/lib/xpdf - + cp -v *.h $out/include cp -v goo/*.h $out/include cp -v fofi/*.h $out/include cp -v xpdf/*.h $out/include ''; - - meta = { - platforms = stdenv.lib.platforms.unix; + + meta = with stdenv.lib; { + platforms = platforms.unix; + license = licenses.gpl2; }; } From 9967b8036a8c95ee5d6a1f744b8b44a4f8271354 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Fri, 26 Jun 2020 15:06:05 -0700 Subject: [PATCH 2731/3452] prometheus: 2.19.1 -> 2.19.2 --- pkgs/servers/monitoring/prometheus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 0a91677011ab..d4622a21f6cb 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,13 +1,13 @@ { lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }: let - version = "2.19.1"; + version = "2.19.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "1isv66dnn61mm76r577qqafsn6w5msb0a6i9dykg4z7crcpsnq70"; + sha256 = "119csghjmw4lphpnnhaxwimmir5bn455g92rb40j3y9pyv0hlfsh"; }; webui = mkYarnPackage { From 7c883bce76b46fa95f56b907455c86022243d754 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 00:11:06 +0200 Subject: [PATCH 2732/3452] kristall: add license --- pkgs/applications/networking/browsers/kristall/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/kristall/default.nix b/pkgs/applications/networking/browsers/kristall/default.nix index c9b15b6d4fc8..4028f8622c3c 100644 --- a/pkgs/applications/networking/browsers/kristall/default.nix +++ b/pkgs/applications/networking/browsers/kristall/default.nix @@ -25,6 +25,7 @@ mkDerivation rec { "Graphical small-internet client, supports gemini, http, https, gopher, finger"; homepage = "https://random-projects.net/projects/kristall.gemini"; maintainers = with maintainers; [ ehmry ]; + license = licenses.gpl3; inherit (qtmultimedia.meta) platforms; }; } From a65df7777a867895b11eef924ac4a3813ff9a01b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 00:14:33 +0200 Subject: [PATCH 2733/3452] links2: add license --- pkgs/applications/networking/browsers/links2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index d58fc8fd19bf..0312c3b6895e 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { homepage = "http://links.twibright.com/"; description = "A small browser with some graphics support"; maintainers = with maintainers; [ raskin ]; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } From e55c49f5c0ea42f404f178391fc92420b58278ff Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 00:31:44 +0200 Subject: [PATCH 2734/3452] thunderbird: add license --- pkgs/applications/networking/mailreaders/thunderbird/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e9ae6696def9..3b0be4dad191 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -336,5 +336,6 @@ stdenv.mkDerivation rec { pierron ]; platforms = platforms.linux; + license = licenses.mpl20; }; } From 52f9aebe64649c742bf765c7f4ae8e6a8b53465b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 00:37:44 +0200 Subject: [PATCH 2735/3452] qalculate-gtk: add license --- pkgs/applications/science/math/qalculate-gtk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index e393111590a8..213530b60a91 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "The ultimate desktop calculator"; homepage = "http://qalculate.github.io"; maintainers = with maintainers; [ gebner ]; + license = licenses.gpl2Plus; platforms = platforms.all; }; } From 187b4a2e04e285be2eb70a4bcf1edac8e7b83465 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 00:43:21 +0200 Subject: [PATCH 2736/3452] root: add license --- pkgs/applications/science/misc/root/5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 58cc8f8f59ef..cab26577bd0b 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -86,5 +86,6 @@ stdenv.mkDerivation rec { description = "A data analysis framework"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; + license = licenses.lgpl21; }; } From f253fc13eccf42e689e6ec4e5dd846f3e1d97430 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 26 Jun 2020 22:38:19 +1000 Subject: [PATCH 2737/3452] shfmt: 3.1.1 -> 3.1.2 https://github.com/mvdan/sh/releases/tag/v3.1.2 --- pkgs/tools/text/shfmt/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 251f6224b403..43c945ac7697 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -2,17 +2,18 @@ buildGoModule rec { pname = "shfmt"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "0zlk1jjk65jwd9cx0xarz4yg2r2h86kd5g00gcnsav6dp6rx3aw8"; + sha256 = "03zgi0rlra3gz8cbqwmhpjxsg5048anfc6ccd2w50fjhx6farsnv"; }; vendorSha256 = "1jq2x4yxshsy4ahp7nrry8dc9cyjj46mljs447rq57sgix4ndpq8"; - subPackages = ["cmd/shfmt"]; + + subPackages = [ "cmd/shfmt" ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From 3ddeb521d8add1fcbcdd5eef3e9cf2e55234ae92 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 00:53:42 +0200 Subject: [PATCH 2738/3452] nss-cacert: add license --- pkgs/data/misc/cacert/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 27aa60ac09f5..f72431c5a27c 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -65,5 +65,6 @@ stdenv.mkDerivation { description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; + license = licenses.mpl20; }; } From 859de17f15f09be19e8d3736d9e9cbff5a1c83cf Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 01:15:25 +0200 Subject: [PATCH 2739/3452] cgui: add license --- pkgs/development/libraries/cgui/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix index 39ed74d00750..d6c550a8da87 100644 --- a/pkgs/development/libraries/cgui/default.nix +++ b/pkgs/development/libraries/cgui/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { description = "A multiplatform basic GUI library"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = licenses.free; }; } From b212289b9b31f360b1b38d1813b0248a848308f6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 01:17:02 +0200 Subject: [PATCH 2740/3452] cm256cc: add license --- pkgs/development/libraries/cm256cc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/cm256cc/default.nix b/pkgs/development/libraries/cm256cc/default.nix index aaf409981024..eaddcb86f546 100644 --- a/pkgs/development/libraries/cm256cc/default.nix +++ b/pkgs/development/libraries/cm256cc/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/f4exb/cm256cc"; platforms = platforms.linux; maintainers = with maintainers; [ alkeryn ]; + license = licenses.gpl3; }; } From 0467e621a5eb2b61b0d2121f736c017154934df4 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 27 Jun 2020 00:59:28 +0300 Subject: [PATCH 2741/3452] elinks: enable on darwin --- .../networking/browsers/elinks/default.nix | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 985497a095cb..79cb5437b3cb 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, xlibsWrapper, bzip2, zlib, openssl +{ stdenv, fetchurl, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib, openssl , gpm , # Incompatible licenses, LGPLv3 - GPLv2 enableGuile ? false, guile ? null @@ -10,11 +10,12 @@ assert enableGuile -> guile != null; assert enablePython -> python != null; -stdenv.mkDerivation { - name = "elinks-0.12pre6"; +stdenv.mkDerivation rec { + pname = "elinks"; + version = "0.12pre6"; src = fetchurl { - url = "http://elinks.or.cz/download/elinks-0.12pre6.tar.bz2"; + url = "http://elinks.or.cz/download/${pname}-${version}.tar.bz2"; sha256 = "1nnakbi01g7yd3zqwprchh5yp45br8086b0kbbpmnclabcvlcdiq"; }; @@ -23,7 +24,15 @@ stdenv.mkDerivation { ./openssl-1.1.patch ]; - buildInputs = [ ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ] + postPatch = (stdenv.lib.optional stdenv.isDarwin) '' + patch -p0 < ${fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/72bed7749e76b9092ddd8d9fe2d8449c5afb1d71/www/elinks/files/patch-perl.diff"; + sha256 = "14q9hk3kg2n2r5b062hvrladp7b4yzysvhq07903w9kpg4zdbyqh"; + }} + ''; + + buildInputs = [ ncurses xlibsWrapper bzip2 zlib openssl spidermonkey ] + ++ stdenv.lib.optional stdenv.isLinux gpm ++ stdenv.lib.optional enableGuile guile ++ stdenv.lib.optional enablePython python ++ stdenv.lib.optional enablePerl perl @@ -44,10 +53,10 @@ stdenv.mkDerivation { ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey}" ; - meta = { + meta = with stdenv.lib; { description = "Full-featured text-mode web browser"; homepage = "http://elinks.or.cz"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + platforms = with platforms; linux ++ darwin; }; } From 598287fefa238b706667ccc8013714a2c916ccab Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sat, 27 Jun 2020 01:18:35 +0200 Subject: [PATCH 2742/3452] roundcubePlugins.carddav: init at 3.0.3 --- pkgs/servers/roundcube/plugins/carddav/default.nix | 11 +++++++++++ pkgs/servers/roundcube/plugins/plugins.nix | 1 + 2 files changed, 12 insertions(+) create mode 100644 pkgs/servers/roundcube/plugins/carddav/default.nix diff --git a/pkgs/servers/roundcube/plugins/carddav/default.nix b/pkgs/servers/roundcube/plugins/carddav/default.nix new file mode 100644 index 000000000000..c3745c9bcc5e --- /dev/null +++ b/pkgs/servers/roundcube/plugins/carddav/default.nix @@ -0,0 +1,11 @@ +{ roundcubePlugin, fetchzip }: + +roundcubePlugin rec { + pname = "carddav"; + version = "3.0.3"; + + src = fetchzip { + url = "https://github.com/blind-coder/rcmcarddav/releases/download/v${version}/carddav-${version}.tar.bz2"; + sha256 = "0scqxqfwv9r4ggaammmjp51mj50qc5p4jmjliwjvcwyjr36wjq3z"; + }; +} diff --git a/pkgs/servers/roundcube/plugins/plugins.nix b/pkgs/servers/roundcube/plugins/plugins.nix index 4eed1227be68..a9c73874b69e 100644 --- a/pkgs/servers/roundcube/plugins/plugins.nix +++ b/pkgs/servers/roundcube/plugins/plugins.nix @@ -5,5 +5,6 @@ roundcubePlugin = callPackage ./roundcube-plugin.nix { }; + carddav = callPackage ./carddav { }; persistent_login = callPackage ./persistent_login { }; } From 19052cfb377db61bc270fb5d5c8430679b0af817 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 27 Jun 2020 09:58:45 +1000 Subject: [PATCH 2743/3452] podman: fix darwin build --- pkgs/applications/virtualization/podman/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 1593866086e4..6d2775620654 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -44,11 +44,14 @@ buildGoModule rec { buildPhase = '' patchShebangs . ${if stdenv.isDarwin - then "make CGO_ENABLED=0 BUILDTAGS='remoteclient containers_image_openpgp exclude_graphdriver_devicemapper' varlink_generate all" - else "make podman docs"} + then "make podman-remote" + else "make podman"} + make docs ''; - installPhase = '' + installPhase = stdenv.lib.optionalString stdenv.isDarwin '' + mv bin/{podman-remote,podman} + '' + '' install -Dm555 bin/podman $out/bin/podman installShellCompletion --bash completions/bash/podman installShellCompletion --zsh completions/zsh/_podman @@ -63,6 +66,5 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; platforms = platforms.unix; - broken = stdenv.isDarwin; }; } From 50ea9c2bca4dd4961bd1b3cf0a918ae897376d31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 27 Jun 2020 02:30:25 +0200 Subject: [PATCH 2744/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-7-g30d5c33 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/924f7336a7dd572b1e4f10951f6c0562d9d8092d. --- .../haskell-modules/hackage-packages.nix | 108 ++++++++++++++---- 1 file changed, 85 insertions(+), 23 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 609090b610cb..2516f5eb11b6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -24780,15 +24780,15 @@ self: { }) {}; "aeson-with" = callPackage - ({ mkDerivation, aeson, base, hashmap, lens, lens-aeson, scientific - , text, unordered-containers, vector + ({ mkDerivation, aeson, base, hashmap, lens, lens-aeson, mtl + , scientific, text, unordered-containers, vector }: mkDerivation { pname = "aeson-with"; - version = "0.1.0.2"; - sha256 = "0iv522v1cq2vnwnics0fas962kfaghvk33awnggd5k078x450wsq"; + version = "0.1.1.0"; + sha256 = "1w1f3rni01v4scfd2lccx6ijxsy9q54dyad500xm06la1lnw40k6"; libraryHaskellDepends = [ - aeson base hashmap lens lens-aeson scientific text + aeson base hashmap lens lens-aeson mtl scientific text unordered-containers vector ]; description = "withXField combinators for aeson"; @@ -75201,6 +75201,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dobutokO-frequency" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "dobutokO-frequency"; + version = "0.1.0.0"; + sha256 = "0kf52302jp1q7mfxr3520jk6vw06j0k6r3xry6mlx1lryirgq8k4"; + libraryHaskellDepends = [ base ]; + description = "Helps to create experimental music. Working with frequencies and types."; + license = stdenv.lib.licenses.mit; + }) {}; + "dobutokO-poetry" = callPackage ({ mkDerivation, base, mmsyn3, mmsyn6ukr, mmsyn7s, vector }: mkDerivation { @@ -92173,8 +92184,8 @@ self: { pname = "friday"; version = "0.2.3.1"; sha256 = "04wn36249b7mddhp6r8zycdxixm0ryj3jrc6qjjvl5k138n4j9q8"; - revision = "1"; - editedCabalFile = "0n1f4plvrmad6gm8dbsi6g5ghahdwwy2fhgippmnp1ixb65x7d58"; + revision = "2"; + editedCabalFile = "1iy2ywz42mwwr2iy7fzfdif8f0vbyl3w9hgy4rkynsmmqc8mmxba"; libraryHaskellDepends = [ base containers convertible deepseq primitive ratio-int transformers vector @@ -114787,17 +114798,17 @@ self: { "haskell-postgis" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, bytestring-lexing - , cpu, data-binary-ieee754, hspec, mtl, placeholders, text + , cpu, data-binary-ieee754, either, hspec, mtl, placeholders, text , unordered-containers, vector }: mkDerivation { pname = "haskell-postgis"; - version = "0.1.0.2"; - sha256 = "0p3zdrzfsz3qj3rcx3yihg7vffa261ig5lywrfls5qvqihw62m41"; + version = "0.2.0"; + sha256 = "0y3di09hyxr5jhwrdqk2548h09x71pd7f1dhv3g6118pzdfps6nk"; libraryHaskellDepends = [ aeson base binary bytestring bytestring-lexing cpu - data-binary-ieee754 mtl placeholders text unordered-containers - vector + data-binary-ieee754 either mtl placeholders text + unordered-containers vector ]; testHaskellDepends = [ aeson base binary bytestring bytestring-lexing cpu @@ -163728,6 +163739,30 @@ self: { broken = true; }) {}; + "massiv_0_5_3_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, deepseq + , doctest, exceptions, mersenne-random-pure64, primitive + , QuickCheck, random, scheduler, splitmix, template-haskell + , unliftio-core, vector + }: + mkDerivation { + pname = "massiv"; + version = "0.5.3.0"; + sha256 = "0wvrdm442p03qna2146d4fld4ghj1ibrxqgncc1yphzc1hxb3kzi"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions primitive + scheduler unliftio-core vector + ]; + testHaskellDepends = [ + base doctest mersenne-random-pure64 QuickCheck random splitmix + template-haskell + ]; + description = "Massiv (Массив) is an Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, Color , data-default-class, deepseq, doctest, exceptions, filepath, hspec @@ -224725,8 +224760,8 @@ self: { }: mkDerivation { pname = "shakebook"; - version = "0.7.0.0"; - sha256 = "09149j3fjsg3904v90dp1kgdhh52czzrxz2bd90mh2jaf5v59c2h"; + version = "0.7.2.0"; + sha256 = "05idvya18s0d8n1f9xpm9cwb9jrmv9f5635cbz4kr3fhw9ya7dxb"; libraryHaskellDepends = [ aeson aeson-with base comonad comonad-extras doctemplates feed free ixset-typed lens lens-aeson mustache pandoc pandoc-types @@ -240315,6 +240350,32 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {}; + "swish_0_10_0_4" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , HUnit, intern, mtl, network-uri, old-locale, polyparse + , semigroups, test-framework, test-framework-hunit, text, time + }: + mkDerivation { + pname = "swish"; + version = "0.10.0.4"; + sha256 = "0rad5rx8hxh0ay4q0lfbn4jggvl3wf3chhjf34rpppzdd6b7r75m"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory filepath hashable intern mtl network-uri + old-locale polyparse text time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hashable HUnit network-uri old-locale semigroups + test-framework test-framework-hunit text time + ]; + description = "A semantic web toolkit"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sws" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, cryptonite, directory, filepath, hourglass @@ -271083,16 +271144,16 @@ self: { "xmobar" = callPackage ({ mkDerivation, alsa-core, alsa-mixer, async, base, bytestring , containers, dbus, directory, extensible-exceptions, filepath - , hinotify, hspec, http-client-tls, http-conduit, http-types, iwlib - , libmpd, libXpm, libXrandr, libXrender, mtl, old-locale, parsec - , parsec-numbers, process, regex-compat, stm, temporary, time - , timezone-olson, timezone-series, transformers, unix, utf8-string - , wirelesstools, X11, X11-xft + , gauge, hinotify, hspec, http-client-tls, http-conduit, http-types + , iwlib, libmpd, libXpm, libXrandr, libXrender, mtl, old-locale + , parsec, parsec-numbers, process, regex-compat, stm, temporary + , time, timezone-olson, timezone-series, transformers, unix + , utf8-string, wirelesstools, X11, X11-xft }: mkDerivation { pname = "xmobar"; - version = "0.34"; - sha256 = "0x09xbz7y9ay0046j1xpr9jjk5jqivqi06vm3q6mhcrgc4y922rx"; + version = "0.35.1"; + sha256 = "1fizszhij2if9wxwzi728l93j9p5y9kfqnwnxk6nl66g64rsbp5x"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -271119,6 +271180,7 @@ self: { filepath hspec mtl old-locale parsec parsec-numbers process regex-compat stm temporary time transformers unix X11 ]; + benchmarkHaskellDepends = [ base gauge mtl ]; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; @@ -277169,8 +277231,8 @@ self: { }: mkDerivation { pname = "zipper-extra"; - version = "0.1.2.1"; - sha256 = "1ngdhh2g7gjs8fvzk356qzip3g8bpr6sximpijpx3zc9nalnn2jf"; + version = "0.1.3.0"; + sha256 = "069mbsqcb1z238awj934xiqcz2s0pf58mfq1cjr8wg1k7b2wvy0k"; libraryHaskellDepends = [ base comonad comonad-extras exceptions split ]; From 43423a31d3833711fc95a1c99c030396020f99e7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 26 Jun 2020 20:00:00 -0500 Subject: [PATCH 2745/3452] starship: 0.42.0 -> 0.43.0 --- pkgs/tools/misc/starship/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 5ce9898a854c..0112c0ea6869 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "17wc9f07308a97dsmrkq74w2r639sqms0hwh8gavwxycj7wq7xz2"; + sha256 = "16ch3dhwgwmdalif3cyi3x4vrpww546wspcwc4xi0k7lp2zppbwf"; }; nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -29,8 +29,16 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "1nvs68qxygi2l43vxw890r40px35dvzbcg6qmrm09g60ykd8pjv2"; - checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; + cargoSha256 = "09lq9ngnwg5z2l2y2ah8ng4cl8afb4gy4djwiq9yv61sjlqbr1y2"; + + preCheck = '' + substituteInPlace tests/testsuite/common.rs \ + --replace "./target/debug/starship" "./$releaseDir/starship" + substituteInPlace tests/testsuite/python.rs \ + --replace "#[test]" "#[test] #[ignore]" + ''; + + checkFlagsArray = [ "--skip=directory::home_directory" "--skip=directory::directory_in_root" ]; meta = with stdenv.lib; { description = "A minimal, blazing fast, and extremely customizable prompt for any shell"; From 404fa33a10674db71e343de13e26b82789a6543b Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Thu, 25 Jun 2020 00:08:15 -0400 Subject: [PATCH 2746/3452] haskellPackages: remove obsolete overrides aeson: -doJailbreak, -dontCheck lzma: -dontCheck BNFC: -dontCheck --- .../haskell-modules/configuration-common.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bf1bfc8327d5..4f545442b667 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -445,7 +445,7 @@ self: super: { # https://github.com/junjihashimoto/test-sandbox-compose/issues/2 test-sandbox-compose = dontCheck super.test-sandbox-compose; - # https://github.com/tych0/xcffib/issues/37 + # Waiting on language-python 0.5.8 https://github.com/bjpop/language-python/issues/60 xcffib = dontCheck super.xcffib; # https://github.com/afcowie/locators/issues/1 @@ -486,13 +486,7 @@ self: super: { then self.buildHaskellPackages.tasty-discover else dontCheck super.tasty-discover); - # generic-deriving bound is too tight - # aeson 1.4.6.0 needs Diff 0.4.0 to do tests but nixpkgs is still at 0.3.4 - # https://github.com/bos/aeson/issues/740 - aeson = dontCheck (doJailbreak super.aeson); - - # containers >=0.4 && <0.6 is too tight - # https://github.com/RaphaelJ/friday/issues/34 + # Waiting on https://github.com/RaphaelJ/friday/pull/36 friday = doJailbreak super.friday; # Won't compile with recent versions of QuickCheck. @@ -513,12 +507,6 @@ self: super: { # https://github.com/alphaHeavy/lzma-enumerator/issues/3 lzma-enumerator = dontCheck super.lzma-enumerator; - # https://github.com/haskell-hvr/lzma/issues/14 - lzma = dontCheck super.lzma; - - # https://github.com/BNFC/bnfc/issues/140 - BNFC = dontCheck super.BNFC; - # FPCO's fork of Cabal won't succeed its test suite. Cabal-ide-backend = dontCheck super.Cabal-ide-backend; From 6518e3325781b6d79829801fba35f88a6d9f6be4 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Thu, 25 Jun 2020 00:35:10 -0400 Subject: [PATCH 2747/3452] haskellPackages: remove obsolete overrides serversession: -dontCheck mockery: -dontCheck lzma-conduit: -dontCheck --- .../development/haskell-modules/configuration-common.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bf1bfc8327d5..01d97a761ab8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -533,21 +533,12 @@ self: super: { inline-c-win32 = dontDistribute super.inline-c-win32; Southpaw = dontDistribute super.Southpaw; - # https://github.com/yesodweb/serversession/issues/1 - serversession = dontCheck super.serversession; - # Hydra no longer allows building texlive packages. lhs2tex = dontDistribute super.lhs2tex; # https://ghc.haskell.org/trac/ghc/ticket/9825 vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; }); - # https://github.com/hspec/mockery/issues/6 - mockery = overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; }); - - # https://github.com/alphaHeavy/lzma-conduit/issues/5 - lzma-conduit = dontCheck super.lzma-conduit; - # https://github.com/kazu-yamamoto/logger/issues/42 logger = dontCheck super.logger; From a39c1c6ac34fdef721b648594d10f92b9c7a408a Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Thu, 25 Jun 2020 11:36:12 -0400 Subject: [PATCH 2748/3452] haskellPackages: remove obsolete overrides sets: -dontCheck singletons: -dontCheck math-functions: -dontCheck --- .../development/haskell-modules/configuration-common.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bf1bfc8327d5..b40916520041 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -578,9 +578,6 @@ self: super: { sha256 = "13g462qmj8c7if797gnyvf8h0cddmm3xy0pjldw48w8f8sr4qsj0"; }); - # https://github.com/athanclark/sets/issues/2 - sets = dontCheck super.sets; - # Install icons, metadata and cli program. bustle = overrideCabal super.bustle (drv: { buildDepends = [ pkgs.libpcap ]; @@ -664,9 +661,6 @@ self: super: { # https://github.com/pxqr/base32-bytestring/issues/4 base32-bytestring = dontCheck super.base32-bytestring; - # https://github.com/goldfirere/singletons/issues/122 - singletons = dontCheck super.singletons; - # Djinn's last release was 2014, incompatible with Semigroup-Monoid Proposal # https://github.com/augustss/djinn/pull/8 djinn = appendPatch super.djinn (pkgs.fetchpatch { @@ -691,9 +685,6 @@ self: super: { # The standard libraries are compiled separately. idris = generateOptparseApplicativeCompletion "idris" (dontCheck super.idris); - # https://github.com/bos/math-functions/issues/25 - math-functions = dontCheck super.math-functions; - # build servant docs from the repository servant = let From aef8009e129867385d14970a1ecc26909be12b17 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Thu, 25 Jun 2020 12:23:43 -0400 Subject: [PATCH 2749/3452] haskellPackages: remove obsolete overrides terminal-progress-bar: -doJailbreak lifted-base: -doJailbreak case-insensitive: -doJailbreak lens: -disableCabalFlag --- .../haskell-modules/configuration-common.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bf1bfc8327d5..a9448ee29f73 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -731,10 +731,6 @@ self: super: { # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = doJailbreak super.applicative-quoters; - # https://github.com/roelvandijk/terminal-progress-bar/issues/13 - # Still needed because of HUnit < 1.6 - terminal-progress-bar = doJailbreak super.terminal-progress-bar; - # https://hydra.nixos.org/build/42769611/nixlog/1/raw # note: the library is unmaintained, no upstream issue dataenc = doJailbreak super.dataenc; @@ -757,25 +753,14 @@ self: super: { # No upstream issue tracker hspec-expectations-pretty-diff = dontCheck super.hspec-expectations-pretty-diff; - # https://github.com/basvandijk/lifted-base/issues/34 - # Still needed as HUnit < 1.5 - lifted-base = doJailbreak super.lifted-base; - # Don't depend on chell-quickcheck, which doesn't compile due to restricting # QuickCheck to versions ">=2.3 && <2.9". system-filepath = dontCheck super.system-filepath; - # https://github.com/basvandijk/case-insensitive/issues/24 - # Still needed as HUnit < 1.6 - case-insensitive = doJailbreak super.case-insensitive; - # https://github.com/hvr/uuid/issues/28 uuid-types = doJailbreak super.uuid-types; uuid = doJailbreak super.uuid; - # https://github.com/ekmett/lens/issues/713 - lens = disableCabalFlag super.lens "test-doctests"; - # https://github.com/haskell/fgl/issues/60 # Needed for QuickCheck < 2.10 fgl = dontCheck super.fgl; From 56f19490924ac25df63f486759d2e534a1955d39 Mon Sep 17 00:00:00 2001 From: Sukant Hajra Date: Thu, 25 Jun 2020 21:05:37 -0500 Subject: [PATCH 2750/3452] ansifilter: extend build to include Darwin All that was required was to use clang++ instead of g++ when compiling for Darwin. --- pkgs/tools/text/ansifilter/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index 8ebb5cfd059b..00c8c075ed67 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost lua ]; + postPatch = '' + substituteInPlace src/makefile --replace "CC=g++" "CC=c++" + ''; + makeFlags = [ "PREFIX=${placeholder "out"}" "conf_dir=/etc/ansifilter" @@ -26,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "http://www.andre-simon.de/doku/ansifilter/en/ansifilter.php"; license = licenses.gpl3; maintainers = [ maintainers.Adjective-Object ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From bb0ec286725f06a4b257c9dbf1022d62ccab2a0a Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 27 Jun 2020 10:03:27 +0300 Subject: [PATCH 2751/3452] Update pkgs/misc/emulators/mame/default.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix hash Co-authored-by: Daniël de Kok --- pkgs/misc/emulators/mame/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index 9b09d67e79ea..a7bce745984a 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -26,7 +26,7 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "1jwc50hmlrkdj204gqcvf7lvgb1r6rhj8hhckykylb1mli04c7gy"; + sha256 = "1ij08h7cflr76qzyhhj21948275lqkpzi9r4pbc7h2avrlpsijx4"; }; hardeningDisable = [ "fortify" ]; From 37375dabb3222162117407476b007e0ae857cd67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 27 Jun 2020 09:29:45 +0200 Subject: [PATCH 2752/3452] lynis: install man page and Bash shell completion --- pkgs/tools/security/lynis/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index 975288d0ab0d..d7f42479d0b4 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchFromGitHub, gawk }: +{ stdenv, makeWrapper, fetchFromGitHub, gawk, installShellFiles }: stdenv.mkDerivation rec { pname = "lynis"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "05p8h2ww4jcc6lgxrm796cbvlfmw26rxq5fmw0xxavbpadiw752j"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; postPatch = '' grep -rl '/usr/local/lynis' ./ | xargs sed -i "s@/usr/local/lynis@$out/share/lynis@g" @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { cp -r include db default.prf $out/share/lynis/ cp -a lynis $out/bin wrapProgram "$out/bin/lynis" --prefix PATH : ${stdenv.lib.makeBinPath [ gawk ]} + + installManPage lynis.8 + installShellCompletion --bash --name lynis.bash \ + extras/bash_completion.d/lynis ''; meta = with stdenv.lib; { From b2068d36973eb4c6ea84bb4aa2feecc6ba51455f Mon Sep 17 00:00:00 2001 From: dawidsowa Date: Sat, 27 Jun 2020 00:21:00 +0200 Subject: [PATCH 2753/3452] persepolis: add setuptools to propagatedBuildInputs --- pkgs/tools/networking/persepolis/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index 63e2af48c1ea..a9bd2739a8ab 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -6,6 +6,7 @@ , pyqt5 , requests , setproctitle +, setuptools , sound-theme-freedesktop , youtube-dl }: @@ -47,6 +48,7 @@ buildPythonApplication rec { pyqt5 requests setproctitle + setuptools sound-theme-freedesktop youtube-dl ]; From 117909637ca3f7a12023f7736615b889e7cb3f21 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 Jun 2020 04:20:00 -0500 Subject: [PATCH 2754/3452] helmfile: fix sub package --- .../networking/cluster/helmfile/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index c4a95b47f522..b8a636412f6a 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,10 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm }: -let version = "0.119.0"; in - -buildGoModule { +buildGoModule rec { pname = "helmfile"; - inherit version; + version = "0.119.0"; src = fetchFromGitHub { owner = "roboll"; @@ -13,16 +11,13 @@ buildGoModule { sha256 = "067hlzp87g36wgxankrmd2nva1v40pa31acq1hh0jxyxp98sfgk1"; }; - goPackagePath = "github.com/roboll/helmfile"; - vendorSha256 = "11bw10s5wifzw2cy1100hyjv4xv7an7b05lcw6sphwyy56gsp2fy"; nativeBuildInputs = [ makeWrapper ]; - buildFlagsArray = '' - -ldflags= - -X main.Version=${version} - ''; + subPackages = [ "." ]; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ]; postInstall = '' wrapProgram $out/bin/helmfile \ @@ -36,4 +31,4 @@ buildGoModule { maintainers = with lib.maintainers; [ pneumaticat yurrriq ]; platforms = lib.platforms.unix; }; -} \ No newline at end of file +} From a1ab2931295a56e81f9f14155ffe1b176c00c15c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 Jun 2020 04:20:00 -0500 Subject: [PATCH 2755/3452] hcloud: fix completions --- pkgs/development/tools/hcloud/default.nix | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index fb3c10464633..48be7c568d77 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "hcloud"; @@ -13,21 +13,17 @@ buildGoModule rec { sha256 = "1brqqcyyljkdd24ljx2qbr648ihhhmr8mq6gs90n63r59ci6ksch"; }; + nativeBuildInputs = [ installShellFiles ]; + vendorSha256 = "1m96j9cwqz2b67byf53qhgl3s0vfwaklj2pm8364qih0ilvifppj"; - buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; postInstall = '' - mkdir -p \ - $out/etc/bash_completion.d \ - $out/share/zsh/vendor-completions - - # Add bash completions - $out/bin/hcloud completion bash > "$out/etc/bash_completion.d/hcloud" - - # Add zsh completions - echo "#compdef hcloud" > "$out/share/zsh/vendor-completions/_hcloud" - $out/bin/hcloud completion zsh >> "$out/share/zsh/vendor-completions/_hcloud" + for shell in bash zsh; do + $out/bin/hcloud completion $shell > hcloud.$shell + installShellCompletion hcloud.$shell + done ''; meta = { @@ -37,4 +33,4 @@ buildGoModule rec { platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.zauberpony ]; }; -} \ No newline at end of file +} From d121364a213473a611e099f57a036e520d166d51 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 Jun 2020 04:20:00 -0500 Subject: [PATCH 2756/3452] tflint: 0.16.2 -> 0.17.0 Changelog: https://github.com/terraform-linters/tflint/releases/tag/v0.17.0 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index d4d09f7ae26d..88b556bd06ab 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.16.2"; + version = "0.17.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "09s4a7xgzr6qr268j3bqjj18s9gn9xcssfvm6w918m7wd39zgqy0"; + sha256 = "14zsgapc18r0xccld21jalk50i6xa0bgd56a0l8kamffhf0jnifk"; }; - vendorSha256 = "1w833lx52m61dv4aq25946bnfwj8yd2g7w989d66ih39simxsvzr"; + vendorSha256 = "0k14inpxg4qd28kg9n58n1hj40bzzqb1ywhiw9cb9az4j0xaa3hi"; subPackages = [ "." ]; From d263c774e93e3f3ec447abd9666e7736c79e2ba8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 Jun 2020 04:20:00 -0500 Subject: [PATCH 2757/3452] grpcui: add ldflags --- pkgs/tools/networking/grpcui/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix index c2a1ca44158d..2fc95c762101 100644 --- a/pkgs/tools/networking/grpcui/default.nix +++ b/pkgs/tools/networking/grpcui/default.nix @@ -13,6 +13,10 @@ buildGoModule rec { vendorSha256 = "0wih9xvpgqqd82v1pxy5rslrsd6wsl0ys1bi1mf373dnfq5vh5a9"; + subPackages = [ "cmd/grpcui" ]; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + meta = with lib; { description = "An interactive web UI for gRPC, along the lines of postman"; homepage = "https://github.com/fullstorydev/grpcui"; @@ -20,4 +24,4 @@ buildGoModule rec { maintainers = with maintainers; [ pradyuman ]; platforms = platforms.linux ++ platforms.darwin; }; -} \ No newline at end of file +} From 70b8fec143d9e1aaeee03ae014cde4ddbe7aadd7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 Jun 2020 04:21:00 -0500 Subject: [PATCH 2758/3452] helmfile: 0.119.0 -> 0.119.1 --- pkgs/applications/networking/cluster/helmfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index b8a636412f6a..e4a6f63b0149 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmfile"; - version = "0.119.0"; + version = "0.119.1"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "067hlzp87g36wgxankrmd2nva1v40pa31acq1hh0jxyxp98sfgk1"; + sha256 = "1j9b0xw59w5ailwa7dqgbsdigviw8ng5r4jbsk9b80izcig805zz"; }; vendorSha256 = "11bw10s5wifzw2cy1100hyjv4xv7an7b05lcw6sphwyy56gsp2fy"; From 7e51429e6783bd8adcf9622f583d73a729ae1dd1 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 23 Jun 2020 23:57:18 +0200 Subject: [PATCH 2759/3452] cpuminer: 2.5.0 -> 2.5.1 --- pkgs/tools/misc/cpuminer/default.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index 99eb6a52ca0b..d48dc5ec1c9f 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -1,17 +1,25 @@ -{ stdenv, fetchurl, curl, jansson, perl }: +{ stdenv +, fetchFromGitHub +, curl +, jansson +, perl +, autoreconfHook +}: stdenv.mkDerivation rec { pname = "cpuminer"; - version = "2.5.0"; + version = "2.5.1"; - src = fetchurl { - url = "mirror://sourceforge/cpuminer/pooler-${pname}-${version}.tar.gz"; - sha256 = "1xalrfrk5hvh1jh9kbqhib2an82ypd46vl9glaxhz3rbjld7c5pa"; + src = fetchFromGitHub { + owner = "pooler"; + repo = pname; + rev = "v${version}"; + sha256 = "0f44i0z8rid20c2hiyp92xq0q0mjj537r05sa6vdbc0nl0a5q40i"; }; patchPhase = if stdenv.cc.isClang then "${perl}/bin/perl ./nomacro.pl" else null; - buildInputs = [ curl jansson ]; + buildInputs = [ curl jansson autoreconfHook ]; configureFlags = [ "CFLAGS=-O3" ]; From 4c8fd0e2eb9d30ebd6515e9cf41d57d9cc9e6976 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sat, 27 Jun 2020 13:43:12 +0300 Subject: [PATCH 2760/3452] newsboat: 2.19 -> 2.20.1 (#91658) --- .../networking/feedreaders/newsboat/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 74a43f00ca83..18c395887753 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -1,18 +1,18 @@ -{ stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses +{ stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkg-config, libxml2, json_c, ncurses , asciidoctor, libiconv, Security, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.19"; + version = "2.20.1"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - sha256 = "0yyrq8a90l6pkrczm9qvdg75jhsdq0niwp79vrdpm8rsxqpdmfq7"; + sha256 = "1i9dpkdlsm3ya0w2x4c8kplrp3qzd8slbkcqvzfpqggb67gvczvv"; }; - cargoSha256 = "1q3jf3d80c0ik38qk8jgbhfz5jxv0cy3lzmkyh2l002azp9hvv59"; + cargoSha256 = "1ykffx2lhn4w56qm1wypkg9wsqpvzzrz419qkl95w1384xf3f7ix"; postPatch = '' substituteInPlace Makefile --replace "|| true" "" @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { ''; nativeBuildInputs = [ - pkgconfig + pkg-config asciidoctor gettext ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ncurses ]; From bf05411b3f84e3462d554100eb0de8588fa47cfe Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 01:27:15 +0200 Subject: [PATCH 2761/3452] dclib: add license, description, and homepage --- pkgs/development/libraries/dclib/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix index 6b42af05c117..a9929ea2adda 100644 --- a/pkgs/development/libraries/dclib/default.nix +++ b/pkgs/development/libraries/dclib/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation { buildInputs = [libxml2 openssl bzip2]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Peer-to-Peer file sharing client"; + homepage = "http://dcgui.berlios.de"; + platforms = platforms.linux; + license = [ licenses.openssl licenses.gpl2 ]; }; } From f3013dcfe03dcad4b40018acfe6341afba05bc02 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 01:36:33 +0200 Subject: [PATCH 2762/3452] json-c: add license --- pkgs/development/libraries/json-c/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index a3ddfe4c63c5..c7a9b3c4a125 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/json-c/json-c/wiki"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; + license = licenses.mit; longDescription = '' JSON-C implements a reference counting object model that allows you to From 80e616c6ae088a13d7905f0b08dd7097d3971600 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 11:37:16 +0200 Subject: [PATCH 2763/3452] blocksruntime: add meta data --- pkgs/development/libraries/libblocksruntime/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix index 7863e596e1b8..aff56994f498 100644 --- a/pkgs/development/libraries/libblocksruntime/default.nix +++ b/pkgs/development/libraries/libblocksruntime/default.nix @@ -24,4 +24,10 @@ stdenv.mkDerivation { doCheck = false; # hasdescriptor.c test fails, hrm. installPhase = ''prefix="/" DESTDIR=$out ./installlib''; + + meta = with stdenv.lib; { + description = "Installs the BlocksRuntime library from the compiler-rt"; + homepage = "https://github.com/mackyle/blocksruntime"; + license = licenses.mit; + }; } From 59275c790e0e29a861369090c7c72a403a8cd6f7 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 11:38:21 +0200 Subject: [PATCH 2764/3452] nuspell: add license --- pkgs/development/libraries/nuspell/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 57c47c79f843..38f3a1134ee4 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { description = "Free and open source C++ spell checking library"; homepage = "https://nuspell.github.io/"; maintainers = with maintainers; [ fpletz ]; + license = licenses.gpl3; }; } From e075f94f470a739eedb20cb0310ad48a77236050 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 11:44:37 +0200 Subject: [PATCH 2765/3452] pdf2xml: add description + license --- pkgs/development/libraries/pdf2xml/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix index 08d57cda6c18..855df954eb14 100644 --- a/pkgs/development/libraries/pdf2xml/default.nix +++ b/pkgs/development/libraries/pdf2xml/default.nix @@ -32,7 +32,9 @@ stdenv.mkDerivation { cp exe/* $out/bin ''; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "PDF to XML converter"; + platforms = platforms.unix; + license = licenses.gpl2; }; } From ffa20303385c6a47ae3539c2824c2577c4023e9b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 11:46:13 +0200 Subject: [PATCH 2766/3452] servialdv: add license --- pkgs/development/libraries/serialdv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/serialdv/default.nix b/pkgs/development/libraries/serialdv/default.nix index 178cee5e69ac..d711cd9fc80f 100644 --- a/pkgs/development/libraries/serialdv/default.nix +++ b/pkgs/development/libraries/serialdv/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/f4exb/serialdv"; platforms = platforms.linux; maintainers = with maintainers; [ alkeryn ]; + license = licenses.gpl3; }; } From 9143be487b485420ea9722a3cede4da472188e0c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 11:53:54 +0200 Subject: [PATCH 2767/3452] lib/licenses: add SPDX LLVM-exception --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index b799a6ae8a43..641184af639e 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -482,6 +482,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { url = "https://opensource.franz.com/preamble.html"; }; + llvm-exception = spdx { + spdxId = "LLVM-exception"; + fullName = "LLVM Exception"; # LLVM exceptions to the Apache 2.0 License + }; + lppl12 = spdx { spdxId = "LPPL-1.2"; fullName = "LaTeX Project Public License v1.2"; From 5c220d8784fc0af34dbbc7fff3aa028182e289fa Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 27 Jun 2020 11:54:24 +0200 Subject: [PATCH 2768/3452] wasilibc: add license --- pkgs/development/libraries/wasilibc/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index fb8c0e0fa215..bca025d622af 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -20,10 +20,11 @@ stdenv.mkDerivation { ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports ''; - meta = { + meta = with stdenv.lib; { description = "WASI libc implementation for WebAssembly"; homepage = "https://wasi.dev"; - platforms = lib.platforms.wasi; - maintainers = [ lib.maintainers.matthewbauer ]; + platforms = platforms.wasi; + maintainers = [ maintainers.matthewbauer ]; + license = with licenses; [ asl20 mit llvm-exception ]; }; } From a78c7f28fdbb538f6d4d75e1d434572551f0b743 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 27 Jun 2020 13:09:21 +0200 Subject: [PATCH 2769/3452] undervolt: 0.2.11 -> 0.3.0 --- pkgs/os-specific/linux/undervolt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix index 696625761b16..2f03ee8c8201 100644 --- a/pkgs/os-specific/linux/undervolt/default.nix +++ b/pkgs/os-specific/linux/undervolt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.2.11"; + version = "0.3.0"; pname = "undervolt"; src = fetchFromGitHub { owner = "georgewhewell"; repo = "undervolt"; rev = version; - sha256 = "18mnf3x687qal7k8yk2sdxzgbyn3rqchgflbi1sksryznmksqqw5"; + sha256 = "1aybk8vbb4745raz7rvpkk6b98xrdiwjhkpbv3kwsgsr9sj42lp0"; }; meta = with stdenv.lib; { From efe0b7c6aede075c737312d35f481fca6842a3cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 27 Jun 2020 12:52:42 +0100 Subject: [PATCH 2770/3452] python-language-server: 2020-04-24 -> 2020-06-19 (#91469) --- .../python-language-server/default.nix | 6 +- .../python-language-server/deps.nix | 768 +++++++++--------- 2 files changed, 384 insertions(+), 390 deletions(-) diff --git a/pkgs/development/dotnet-modules/python-language-server/default.nix b/pkgs/development/dotnet-modules/python-language-server/default.nix index 77154485118e..286037b2cce2 100644 --- a/pkgs/development/dotnet-modules/python-language-server/default.nix +++ b/pkgs/development/dotnet-modules/python-language-server/default.nix @@ -11,7 +11,7 @@ let deps = import ./deps.nix { inherit fetchurl; }; - version = "2020-04-24"; + version = "2020-06-19"; # Build the nuget source needed for the later build all by itself # since it's a time-consuming step that only depends on ./deps.nix. @@ -49,8 +49,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "microsoft"; repo = "python-language-server"; - rev = "d480cd12649dcff78ed271c92c274fab60c00f2f"; - sha256 = "0p2sw6w6fymdlxn8r5ndvija2l7rd77f5rddq9n71dxj1nicljh3"; + rev = "838ba78e00173d639bd90f54d8610ec16b4ba3a2"; + sha256 = "0nj8l1apcb67gqwy5i49v0f01fs4lvdfmmp4w2hvrpss9if62c1m"; }; buildInputs = [dotnet-sdk_3 openssl icu]; diff --git a/pkgs/development/dotnet-modules/python-language-server/deps.nix b/pkgs/development/dotnet-modules/python-language-server/deps.nix index 803f33f892d5..c47e29b6420e 100644 --- a/pkgs/development/dotnet-modules/python-language-server/deps.nix +++ b/pkgs/development/dotnet-modules/python-language-server/deps.nix @@ -28,24 +28,6 @@ in [ sha256 = "11mpnl6aar2yn7l6b1k4m3rdnl82ydmqbsja4rn84dhz1qdzfp8x"; }) - (fetchNuGet { - name = "LiteDB"; - version = "4.1.4"; - sha256 = "1g9258mv3jm9ps2s5wcxbmszh9nqiiw3d9nrfqis8x72jqiqi6js"; - }) - - (fetchNuGet { - name = "MSTest.TestAdapter"; - version = "2.1.0"; - sha256 = "1g1v8yjnk4nr1c36k3cz116889bnpiw1i1jkmqnpb19wms7sq7cz"; - }) - - (fetchNuGet { - name = "MSTest.TestFramework"; - version = "2.1.0"; - sha256 = "0mac4h7ylw953chclhz0lrn19yks3bab9dn9x9fpjqi7309gid0p"; - }) - (fetchNuGet { name = "MessagePack"; version = "2.1.90"; @@ -100,60 +82,24 @@ in [ sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.0.1"; - sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; - }) - (fetchNuGet { name = "Microsoft.CodeCoverage"; version = "16.5.0"; sha256 = "0610wzn4qyywf9lb4538vwqhprxc4g0g7gjbmnjzvx97jr5nd5mf"; }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.0.1"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }) + (fetchNuGet { name = "Microsoft.Extensions.FileSystemGlobbing"; version = "3.1.2"; sha256 = "1zwvzp0607irs7irfbq8vnclg5nj2jpyggw9agm4a32la5ngg27m"; }) - (fetchNuGet { - name = "Microsoft.NET.Test.Sdk"; - version = "16.5.0"; - sha256 = "19f5bvzci5mmfz81jwc4dax4qdf7w4k67n263383mn8mawf22bfq"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.1"; - sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "2.0.0"; - sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "3.1.0"; - sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; - }) - - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }) - (fetchNuGet { name = "Microsoft.NetCore.App.Host.linux-x64"; version = "3.0.2"; @@ -208,6 +154,42 @@ in [ sha256 = "1ynhzsr8a0hfby2wjhzkdiimj18izgfzp7m2yp3pby2iwb4v3xy9"; }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.1"; + sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "2.0.0"; + sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "3.1.0"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + + (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "16.5.0"; + sha256 = "19f5bvzci5mmfz81jwc4dax4qdf7w4k67n263383mn8mawf22bfq"; + }) + (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; version = "16.5.0"; @@ -269,21 +251,15 @@ in [ }) (fetchNuGet { - name = "NETStandard.Library"; - version = "1.6.1"; - sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + name = "MSTest.TestAdapter"; + version = "2.1.0"; + sha256 = "1g1v8yjnk4nr1c36k3cz116889bnpiw1i1jkmqnpb19wms7sq7cz"; }) (fetchNuGet { - name = "NETStandard.Library"; - version = "2.0.3"; - sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; - }) - - (fetchNuGet { - name = "NSubstitute"; - version = "4.2.1"; - sha256 = "0wgfjh032qds994fmgxvsg88nhgjrx7p9rnv6z678jm62qi14asy"; + name = "MSTest.TestFramework"; + version = "2.1.0"; + sha256 = "0mac4h7ylw953chclhz0lrn19yks3bab9dn9x9fpjqi7309gid0p"; }) (fetchNuGet { @@ -293,9 +269,15 @@ in [ }) (fetchNuGet { - name = "NewtonSoft.Json"; - version = "12.0.3"; - sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + name = "NETStandard.Library"; + version = "1.6.1"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }) + + (fetchNuGet { + name = "NETStandard.Library"; + version = "2.0.3"; + sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) (fetchNuGet { @@ -310,18 +292,342 @@ in [ sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; }) + (fetchNuGet { + name = "NewtonSoft.Json"; + version = "12.0.3"; + sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { + name = "NSubstitute"; + version = "4.2.1"; + sha256 = "0wgfjh032qds994fmgxvsg88nhgjrx7p9rnv6z678jm62qi14asy"; + }) + (fetchNuGet { name = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { + name = "runtime.any.System.Collections"; + version = "4.3.0"; + sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; + }) + + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; + }) + + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; + }) + + (fetchNuGet { + name = "runtime.any.System.Globalization"; + version = "4.3.0"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; + }) + + (fetchNuGet { + name = "runtime.any.System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; + }) + + (fetchNuGet { + name = "runtime.any.System.IO"; + version = "4.3.0"; + sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; + }) + + (fetchNuGet { + name = "runtime.any.System.Reflection"; + version = "4.3.0"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + }) + + (fetchNuGet { + name = "runtime.any.System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; + }) + + (fetchNuGet { + name = "runtime.any.System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; + }) + + (fetchNuGet { + name = "runtime.any.System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; + }) + + (fetchNuGet { + name = "runtime.any.System.Runtime"; + version = "4.3.0"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + }) + + (fetchNuGet { + name = "runtime.any.System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; + }) + + (fetchNuGet { + name = "runtime.any.System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; + }) + + (fetchNuGet { + name = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + }) + + (fetchNuGet { + name = "runtime.any.System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; + }) + + (fetchNuGet { + name = "runtime.any.System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; + }) + + (fetchNuGet { + name = "runtime.any.System.Threading.Timer"; + version = "4.3.0"; + sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; + }) + + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) + + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; + }) + + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) + + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; + }) + + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) + + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; + }) + + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.3.0"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }) + + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.3.0"; + sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; + }) + + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }) + + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; + }) + + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) + + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; + }) + + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; + }) + + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }) + + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; + }) + + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; + }) + + (fetchNuGet { + name = "runtime.unix.Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Console"; + version = "4.3.0"; + sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; + }) + + (fetchNuGet { + name = "runtime.unix.System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Net.Sockets"; + version = "4.3.0"; + sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Private.Uri"; + version = "4.3.0"; + sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; + }) + (fetchNuGet { name = "StreamJsonRpc"; version = "2.3.103"; @@ -1006,316 +1312,4 @@ in [ sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { - name = "runtime.any.System.Collections"; - version = "4.3.0"; - sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; - }) - - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tools"; - version = "4.3.0"; - sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; - }) - - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tracing"; - version = "4.3.0"; - sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; - }) - - (fetchNuGet { - name = "runtime.any.System.Globalization"; - version = "4.3.0"; - sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; - }) - - (fetchNuGet { - name = "runtime.any.System.Globalization.Calendars"; - version = "4.3.0"; - sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; - }) - - (fetchNuGet { - name = "runtime.any.System.IO"; - version = "4.3.0"; - sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; - }) - - (fetchNuGet { - name = "runtime.any.System.Reflection"; - version = "4.3.0"; - sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; - }) - - (fetchNuGet { - name = "runtime.any.System.Reflection.Extensions"; - version = "4.3.0"; - sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; - }) - - (fetchNuGet { - name = "runtime.any.System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; - }) - - (fetchNuGet { - name = "runtime.any.System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; - }) - - (fetchNuGet { - name = "runtime.any.System.Runtime"; - version = "4.3.0"; - sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; - }) - - (fetchNuGet { - name = "runtime.any.System.Runtime.Handles"; - version = "4.3.0"; - sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; - }) - - (fetchNuGet { - name = "runtime.any.System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; - }) - - (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; - version = "4.3.0"; - sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; - }) - - (fetchNuGet { - name = "runtime.any.System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; - }) - - (fetchNuGet { - name = "runtime.any.System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; - }) - - (fetchNuGet { - name = "runtime.any.System.Threading.Timer"; - version = "4.3.0"; - sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; - }) - - (fetchNuGet { - name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; - }) - - (fetchNuGet { - name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; - }) - - (fetchNuGet { - name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; - }) - - (fetchNuGet { - name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; - }) - - (fetchNuGet { - name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; - }) - - (fetchNuGet { - name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; - }) - - (fetchNuGet { - name = "runtime.native.System"; - version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; - }) - - (fetchNuGet { - name = "runtime.native.System.IO.Compression"; - version = "4.3.0"; - sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; - }) - - (fetchNuGet { - name = "runtime.native.System.Net.Http"; - version = "4.3.0"; - sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; - }) - - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.Apple"; - version = "4.3.0"; - sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; - }) - - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; - }) - - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; - }) - - (fetchNuGet { - name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; - }) - - (fetchNuGet { - name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; - }) - - (fetchNuGet { - name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; - }) - - (fetchNuGet { - name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; - }) - - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; - version = "4.3.0"; - sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; - }) - - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; - }) - - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; - }) - - (fetchNuGet { - name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; - }) - - (fetchNuGet { - name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; - }) - - (fetchNuGet { - name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.2"; - sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; - }) - - (fetchNuGet { - name = "runtime.unix.Microsoft.Win32.Primitives"; - version = "4.3.0"; - sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Console"; - version = "4.3.0"; - sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; - }) - - (fetchNuGet { - name = "runtime.unix.System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Net.Primitives"; - version = "4.3.0"; - sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Net.Sockets"; - version = "4.3.0"; - sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Private.Uri"; - version = "4.3.0"; - sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; - }) - - (fetchNuGet { - name = "runtime.unix.System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; - }) - ] From b5d5c9d5680d4e0918754098e35a60cf17c8ec07 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Sat, 27 Jun 2020 14:00:58 +0200 Subject: [PATCH 2771/3452] WiiUse: Init at 0.15.5 (#91425) Co-authored-by: SCOTT-HAMILTON --- pkgs/development/libraries/wiiuse/default.nix | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/wiiuse/default.nix diff --git a/pkgs/development/libraries/wiiuse/default.nix b/pkgs/development/libraries/wiiuse/default.nix new file mode 100644 index 000000000000..4dcc8a47105e --- /dev/null +++ b/pkgs/development/libraries/wiiuse/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, bluez +}: +stdenv.mkDerivation rec { + + pname = "WiiUse"; + version = "0.15.5"; + + src = fetchFromGitHub { + owner = "wiiuse"; + repo = "wiiuse"; + rev = "${version}"; + sha256 = "05gc3s0wxx7ga4g32yyibyxdh46rm9bbslblrc72ynrjxq98sg13"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ (lib.getDev bluez) ]; + + cmakeFlags = [ "-DBUILD_EXAMPLE_SDL=NO" ]; + + meta = with lib; { + description = "Feature complete cross-platform Wii Remote access library"; + license = licenses.gpl3; + homepage = "https://github.com/wiiuse/wiiuse"; + maintainers = with maintainers; [ shamilton ]; + platforms = with platforms; linux; + }; +} From 2c7402b54d3cd67e24174b477b6c9928045a4970 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 27 Jun 2020 14:08:34 +0200 Subject: [PATCH 2772/3452] undervolt: clarify that the service is unofficial The original warning almost made it sound like the service was made by or somehow connected to Intel which is not the case --- nixos/modules/services/hardware/undervolt.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index da627af73bc6..828032dc573a 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -25,8 +25,11 @@ let in { options.services.undervolt = { - enable = mkEnableOption - "Intel CPU undervolting service (WARNING: may permanently damage your hardware!)"; + enable = mkEnableOption '' + Undervolting service for Intel CPUs. + + Warning: This service is not endorsed by Intel and may permanently damage your hardware. Use at your own risk! + ''; verbose = mkOption { type = types.bool; From 344dd8d19399a24b665b1240c280dd55a36c8cee Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Wed, 24 Jun 2020 19:34:02 +0200 Subject: [PATCH 2773/3452] WiiUse: Init at 0.15.5 --- pkgs/development/libraries/wiiuse/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/wiiuse/default.nix diff --git a/pkgs/development/libraries/wiiuse/default.nix b/pkgs/development/libraries/wiiuse/default.nix new file mode 100644 index 000000000000..4dcc8a47105e --- /dev/null +++ b/pkgs/development/libraries/wiiuse/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, bluez +}: +stdenv.mkDerivation rec { + + pname = "WiiUse"; + version = "0.15.5"; + + src = fetchFromGitHub { + owner = "wiiuse"; + repo = "wiiuse"; + rev = "${version}"; + sha256 = "05gc3s0wxx7ga4g32yyibyxdh46rm9bbslblrc72ynrjxq98sg13"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ (lib.getDev bluez) ]; + + cmakeFlags = [ "-DBUILD_EXAMPLE_SDL=NO" ]; + + meta = with lib; { + description = "Feature complete cross-platform Wii Remote access library"; + license = licenses.gpl3; + homepage = "https://github.com/wiiuse/wiiuse"; + maintainers = with maintainers; [ shamilton ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 413bc6de3488..4455f1cbfbff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7691,6 +7691,8 @@ in whsniff = callPackage ../applications/networking/sniffers/whsniff { }; + wiiuse = callPackage ../development/libraries/wiiuse { }; + woeusb = callPackage ../tools/misc/woeusb { }; chase = callPackage ../tools/system/chase { }; From 1c84b0e916a14e4b1b327a0817f7dc0f1452820a Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Sat, 27 Jun 2020 16:55:39 +0200 Subject: [PATCH 2774/3452] kubernetes: 1.18.4 -> 1.18.5 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 5834aa7689a8..7dcff328226c 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.18.4"; + version = "1.18.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "11hic59ffypyky7g57p712y70nwk4qp9bx5vm0j0077c1i1i3756"; + sha256 = "0pl7dzq5giwkzfyg4pzm8y76fnd62gaa6d4hswvgn87czab37lr6"; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; From cfb9d040d35ce1e5f301a3a1047905fa8e88baee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 19:13:43 +0000 Subject: [PATCH 2775/3452] oneDNN: 1.4 -> 1.5 --- pkgs/development/libraries/oneDNN/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 7d9adca074c6..edc48d1d8737 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "162fb0c7klahz2irchhyxympi4fq4yp284apc53cadbss41mzld9"; + sha256 = "0diiy3g4wz5lnz5mdvka5p2nwmrpfldsz83sssr5yiir29m4lqap"; }; outputs = [ "out" "dev" "doc" ]; From b2b28fcad3d80bb27f2e0dc8790197f072a17508 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Wed, 24 Jun 2020 18:54:22 +0200 Subject: [PATCH 2776/3452] SuperTuxKart: Replaced some bundled libraries with system ones --- pkgs/games/super-tux-kart/default.nix | 67 +++++++++++++++++++-------- 1 file changed, 48 insertions(+), 19 deletions(-) diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 70c5657508bd..b3a7966071a7 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig, makeWrapper -, openal, freealut, libGLU, libGL, libvorbis, libogg, gettext, curl, freetype -, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, enet, harfbuzz }: - +{ lib, stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig, makeWrapper +, openal, freealut, libGLU, libGL, libvorbis, libogg, gettext, curl, freetype, glew +, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, harfbuzz +, mcpp, wiiuse, angelscript +}: let dir = "stk-code"; assets = fetchsvn { @@ -11,34 +12,62 @@ let name = "stk-assets"; }; + # List of bundled libraries in stk-code/lib to keep + # Those are the libraries that cannot be replaced + # with system packages. + bundledLibraries = [ + # Bullet 2.87 is incompatible (bullet 2.79 needed whereas 2.87 is packaged) + # The api changed in a lot of classes, too much work to adapt + "bullet" + # Upstream Libenet doesn't yet support IPv6, + # So we will use the bundled libenet which + # has been fixed to support it. + "enet" + # Internal library of STK, nothing to do about it + "graphics_utils" + # This irrlicht is bundled with cmake + # whereas upstream irrlicht still uses + # archaic Makefiles, too complicated to switch to. + "irrlicht" + # Not packaged to this date + "libraqm" + # Not packaged to this date + "libsquish" + ]; in stdenv.mkDerivation rec { + pname = "supertuxkart"; version = "1.1"; - srcs = [ - (fetchFromGitHub { - owner = "supertuxkart"; - repo = "stk-code"; - rev = version; - sha256 = "01vxxl94583ixswzmi4caz8dk64r56pn3zxh7v63zml60yfvxbvp"; - name = dir; - }) - ]; + src = fetchFromGitHub { + owner = "supertuxkart"; + repo = "stk-code"; + rev = version; + sha256 = "01vxxl94583ixswzmi4caz8dk64r56pn3zxh7v63zml60yfvxbvp"; + name = dir; + }; + + # Deletes all bundled libs in stk-code/lib except those + # That couldn't be replaced with system packages + postPatch = '' + find lib -maxdepth 1 -type d | egrep -v "^lib$|${(lib.concatStringsSep "|" bundledLibraries)}" | xargs -n1 -L1 -r -I{} rm -rf {} + ''; nativeBuildInputs = [ cmake gettext libtool pkgconfig makeWrapper ]; buildInputs = [ libX11 libXrandr - openal freealut libGLU libGL libvorbis libogg zlib freetype - curl fribidi bluez libjpeg libpng enet harfbuzz + openal freealut libGLU libGL libvorbis libogg zlib freetype glew + curl fribidi bluez libjpeg libpng harfbuzz + mcpp wiiuse angelscript ]; - enableParallelBuilding = true; - cmakeFlags = [ "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs "-DUSE_SYSTEM_ANGELSCRIPT=OFF" # doesn't work with 2.31.2 or 2.32.0 "-DCHECK_ASSETS=OFF" + "-DUSE_SYSTEM_WIIUSE=ON" + "-DUSE_SYSTEM_ANGELSCRIPT=ON" ]; # Obtain the assets directly from the fetched store path, to avoid duplicating assets across multiple engine builds @@ -46,9 +75,9 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/supertuxkart --set-default SUPERTUXKART_ASSETS_DIR "${assets}" ''; - sourceRoot = dir; + enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A Free 3D kart racing game"; longDescription = '' SuperTuxKart is a Free 3D kart racing game, with many tracks, From 489367777ccfefd9ac9c788e20a81adedb552b84 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sat, 27 Jun 2020 20:06:52 +0000 Subject: [PATCH 2777/3452] deno: 1.1.1 -> 1.1.2 --- 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 95778c2544cc..4a8c3907520b 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.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "0034c2qp8sf6li7d38rnd6h9vhhi82p5rysm0pkrdhlmfqkqdgma"; + sha256 = "1vfvkrwlhixygd9cn05wq28iw8dch04j8d62a54pbyyxlixrjwfx"; fetchSubmodules = true; }; - cargoSha256 = "1wbqxv2mzbs27j617a88gd7z0fjnjr2z1nklqfk49y62v8f1vsm1"; + cargoSha256 = "0ddsks81wdddcd4d8w2xz17l41iiga44xiv74hi2158ykrk8rqdi"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix index 32669a6111bc..61cb967a36b5 100644 --- a/pkgs/development/web/deno/deps.nix +++ b/pkgs/development/web/deno/deps.nix @@ -2,11 +2,11 @@ {}: rec { rustyV8Lib = { - version = "0.5.1"; + version = "0.6.0"; sha256s = { - x86_64-linux = "1gggnbki6b733qfx16gkqpplfsfmg1xv2a3nhh42xiykwsh987xl"; - aarch64-linux = "1an5ylm0w2x0dm34m9z6sld8f067f2rnsndr6mh6smp19jl889ma"; - x86_64-darwin = "1x1f5r8s8n00xag6d36j4h40rfc0r1w4wnmcr02sspzzkpyjxn2l"; + x86_64-linux = "1mpgddlcsfc5jpkqpwpbld9d2pr3dflkbd1w9ryai0aymv8r2rmb"; + aarch64-linux = "0qqr0i6z39fb298azp2rm0ns0bw3il3xj5zy58cn96h624rxkn67"; + x86_64-darwin = "0pj7127cvz01kq6vs91sdxkwkbjx7j3cv7lwvyilifbl01j3vwip"; }; }; } From 9c006cb88a6348bc3602c03aee8b8557ea07e3df Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Sat, 27 Jun 2020 21:10:22 +0100 Subject: [PATCH 2778/3452] deno: simplify buildInputs After suggestions in a previous PR I'm simplifying the buildInputs --- pkgs/development/web/deno/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 4a8c3907520b..d47b029a67ca 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -32,8 +32,7 @@ rustPlatform.buildRustPackage rec { # Install completions post-install nativeBuildInputs = [ installShellFiles ]; - buildInputs = with stdenv.lib; [ ] - ++ optionals stdenv.isDarwin [ Security CoreServices ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security CoreServices ]; # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem # To avoid this we pre-download the file and place it in the locations it will require it in advance From 34f104c1396485e3b4dab872525b7bdafac62851 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Sat, 27 Jun 2020 16:21:18 -0400 Subject: [PATCH 2779/3452] haskellPackages: remove obsolete overrides zeromq4-haskell: -dontCheck bytestring-progress: -dontHaddock simple-sendfile: -dontCheck --- pkgs/development/haskell-modules/configuration-common.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ce616d46a757..8e43b8c54bd8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -62,10 +62,6 @@ self: super: { mysql-simple = dontCheck super.mysql-simple; mysql-haskell = dontCheck super.mysql-haskell; - # Tests failing, fixed once 0.8.0 is in stackage - # https://gitlab.com/twittner/zeromq-haskell/issues/63 - zeromq4-haskell = dontCheck super.zeromq4-haskell; - # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful. # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/ git-annex = (overrideSrc super.git-annex { @@ -121,7 +117,6 @@ self: super: { }); # The Haddock phase fails for one reason or another. - bytestring-progress = dontHaddock super.bytestring-progress; deepseq-magic = dontHaddock super.deepseq-magic; feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1 hoodle-core = dontHaddock super.hoodle-core; @@ -175,9 +170,6 @@ self: super: { # Test suite depends on source code being available simple-affine-space = dontCheck super.simple-affine-space; - # https://github.com/kazu-yamamoto/simple-sendfile/issues/17 - simple-sendfile = dontCheck super.simple-sendfile; - # Fails no apparent reason. Upstream has been notified by e-mail. assertions = dontCheck super.assertions; From ae282943758cabec97101452f028727c4bb1c5cb Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Sat, 27 Jun 2020 16:23:20 -0400 Subject: [PATCH 2780/3452] haskellPackages: remove obsolete overrides getopt-generics: -dontCheck Hclip: -dontCheck lucid: -dontCheck --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ce616d46a757..886f1feb9340 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -185,9 +185,7 @@ self: super: { cmaes = dontCheck super.cmaes; # http://hydra.cryp.to/build/498725/log/raw dbmigrations = dontCheck super.dbmigrations; filestore = dontCheck super.filestore; - getopt-generics = dontCheck super.getopt-generics; graceful = dontCheck super.graceful; - Hclip = dontCheck super.Hclip; HList = dontCheck super.HList; ide-backend = dontCheck super.ide-backend; marquise = dontCheck super.marquise; # https://github.com/anchor/marquise/issues/69 @@ -315,7 +313,6 @@ self: super: { language-slice = dontCheck super.language-slice; ldap-client = dontCheck super.ldap-client; lensref = dontCheck super.lensref; - lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25 lvmrun = disableHardening (dontCheck super.lvmrun) ["format"]; matplotlib = dontCheck super.matplotlib; memcache = dontCheck super.memcache; From 748c9e0e3ebc97ea0b46a06295465eff2fb5ef92 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 27 Jun 2020 23:17:10 +0200 Subject: [PATCH 2781/3452] wine-staging: 5.10 -> 5.11 (#91266) --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index dd3cae339ca1..ffad1e3c9907 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "5.10"; + version = "5.11"; url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; - sha256 = "0g9k094biyjc0ng3vnncdr1psf0ykn36nqirrqdzc5y82s9a1alv"; + sha256 = "1q0sh89xnn6cq3kpqrrq9h316qyzpslj2w6m6vq7pq4y4p727nxk"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "1nnj52g0kp7i38qw85sp5qsf7gph1hh3ywibrdfpjmjpyj30v7sw"; + sha256 = "050npck8mdck8m2rs9xn6mszzj2fv9ql80g08j2ahinf792svrid"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 3569a3863be769ed4337bb801b06dc96918b46ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 26 Jun 2020 19:50:58 +0200 Subject: [PATCH 2782/3452] ddcui: init at 0.1.1 --- pkgs/applications/misc/ddcui/default.nix | 42 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/misc/ddcui/default.nix diff --git a/pkgs/applications/misc/ddcui/default.nix b/pkgs/applications/misc/ddcui/default.nix new file mode 100644 index 000000000000..35c94038efcb --- /dev/null +++ b/pkgs/applications/misc/ddcui/default.nix @@ -0,0 +1,42 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, qtbase +, qttools +, ddcutil +}: + +mkDerivation rec { + pname = "ddcui"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "rockowitz"; + repo = "ddcui"; + rev = "v${version}"; + sha256 = "02qr7i3pdq8p6lnhwihfgd9b7y9zwpdk6gwv626rz32ai6mfrfhl"; + }; + + nativeBuildInputs = [ + # Using cmake instead of the also-supported qmake because ddcui's qmake + # file is not currently written to support PREFIX installations. + cmake + pkg-config + ]; + + buildInputs = [ + qtbase + qttools + ddcutil + ]; + + meta = with lib; { + description = "Graphical user interface for ddcutil - control monitor settings"; + homepage = "https://www.ddcutil.com/ddcui_main/"; + license = licenses.gpl2; + maintainers = with maintainers; [ nh2 ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7991c374627..43239e6c1f6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2895,6 +2895,8 @@ in ddccontrol-db = callPackage ../data/misc/ddccontrol-db { }; + ddcui = libsForQt5.callPackage ../applications/misc/ddcui { }; + ddcutil = callPackage ../tools/misc/ddcutil { }; ddclient = callPackage ../tools/networking/ddclient { }; From 96776d5a2fbda19d00777d7791d69340ef0a69c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 27 Jun 2020 23:50:36 +0200 Subject: [PATCH 2783/3452] cloudcompare: Improve Qt wrapping. As I learned in the review of #91627. --- pkgs/applications/graphics/cloudcompare/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index 848441912350..209a6a4753b1 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib +, mkDerivation , fetchFromGitHub , cmake -, wrapQtAppsHook , dxflib , eigen , flann @@ -16,7 +16,7 @@ , xercesc }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "cloudcompare"; version = "2.11.0"; @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake eigen # header-only - wrapQtAppsHook ]; buildInputs = [ @@ -73,7 +72,7 @@ stdenv.mkDerivation rec { "-DPLUGIN_IO_QRDB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs ]; - meta = with stdenv.lib; { + meta = with lib; { description = "3D point cloud and mesh processing software"; homepage = "https://cloudcompare.org"; license = licenses.gpl2Plus; From e5f0d13a490c5555a816d0ded86883993ed25be5 Mon Sep 17 00:00:00 2001 From: Marco Hennings Date: Sat, 27 Jun 2020 23:54:57 +0200 Subject: [PATCH 2784/3452] gitAndTools.stgit: Fix broken package. (#84198) The stgit package is installing using make, which leaves the application in a state where it can not properly find the installed package stgit. --- File "/run/current-system/sw/bin/stg", line 35, in from stgit.main import main ImportError: No module named stgit.main --- This is fixed by using buildPythonApplication instead of stdenv.mkDerivation. --- .../git-and-tools/stgit/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 2cd4adce9397..36ea373177ac 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -1,11 +1,8 @@ -{ stdenv, fetchFromGitHub, python2, git }: +{ stdenv, python3, python3Packages, fetchFromGitHub, git }: -let - name = "stgit-${version}"; +python3Packages.buildPythonApplication rec { + pname = "stgit"; version = "0.22"; -in -stdenv.mkDerivation { - inherit name; src = fetchFromGitHub { owner = "ctmarinas"; @@ -14,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0xpvs5fa50rrvl2c8naha1nblk5ip2mgg63a9srqqxfx6z8qmrfz"; }; - buildInputs = [ python2 git ]; + nativeBuildInputs = [ git ]; makeFlags = [ "prefix=$$out" ]; From 638d72ff3c74bdbd03c70105f25d4c5c2a0c7cca Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Sat, 27 Jun 2020 16:25:35 -0400 Subject: [PATCH 2785/3452] haskellPackages: remove obsolete overrides fgl: -dontCheck fgl-arbitrary: -doJailbreak http-api-data: -dontCheck --- pkgs/development/haskell-modules/configuration-common.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ce616d46a757..3ab21a236fa2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -740,20 +740,12 @@ self: super: { uuid-types = doJailbreak super.uuid-types; uuid = doJailbreak super.uuid; - # https://github.com/haskell/fgl/issues/60 - # Needed for QuickCheck < 2.10 - fgl = dontCheck super.fgl; - fgl-arbitrary = doJailbreak super.fgl-arbitrary; - # The tests spuriously fail libmpd = dontCheck super.libmpd; # https://github.com/dan-t/cabal-lenses/issues/6 cabal-lenses = doJailbreak super.cabal-lenses; - # https://github.com/fizruk/http-api-data/issues/49 - http-api-data = dontCheck super.http-api-data; - # https://github.com/diagrams/diagrams-lib/issues/288 diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; }); From c673b8f0d1850a19bb84ff69d1182f4abfee2fbe Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 28 Jun 2020 01:43:11 +0200 Subject: [PATCH 2786/3452] =?UTF-8?q?joypixels:=205.5.0=20=E2=86=92=206.0.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/data/fonts/joypixels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix index b54fb3fd128b..1b107f9cb82f 100644 --- a/pkgs/data/fonts/joypixels/default.nix +++ b/pkgs/data/fonts/joypixels/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "joypixels"; - version = "5.5.0"; + version = "6.0.0"; src = fetchurl { url = "https://cdn.joypixels.com/arch-linux/font/${version}/joypixels-android.ttf"; - sha256 = "0w3r50l0knrncwv6zihyx01gs995y76xjcwsysx5bmvc1b43yijb"; + sha256 = "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s"; }; dontUnpack = true; From 1d0a930d27477fc396eea709736fcfdfe0b317d5 Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Sat, 27 Jun 2020 17:45:28 -0600 Subject: [PATCH 2787/3452] file-rename: Fix an incorrect platform test that misidentifies Darwin as Windows This causes the script to be installed as `file-rename` instead of `rename` like it is on other Unix systems. This in turn causes `wrapProgram` to fail when building because it expects the wrapped program to be called `rename`. --- pkgs/tools/filesystems/file-rename/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/pkgs/tools/filesystems/file-rename/default.nix index f9b6a941f68f..588295f77912 100644 --- a/pkgs/tools/filesystems/file-rename/default.nix +++ b/pkgs/tools/filesystems/file-rename/default.nix @@ -11,6 +11,12 @@ perlPackages.buildPerlPackage { nativeBuildInputs = [ makeWrapper ]; + # Fix an incorrect platform test that misidentifies Darwin as Windows + postPatch = '' + substituteInPlace Makefile.PL \ + --replace '/win/i' '/MSWin32/' + ''; + postInstall = '' wrapProgram $out/bin/rename \ --prefix PERL5LIB : $out/${perlPackages.perl.libPrefix} From 47801afc3d342907fc00ea4467d23af636c4a3c4 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 27 Jun 2020 23:28:02 +0000 Subject: [PATCH 2788/3452] ffmpeg-full: add support for libsrt --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 666aafef7f44..1cbcc5471e08 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -118,6 +118,7 @@ #, shine ? null # Fixed-point MP3 encoder , soxr ? null # Resampling via soxr , speex ? null # Speex de/encoder +, srt ? null # Secure Reliable Transport (SRT) protocol #, twolame ? null # MP2 encoder #, utvideo ? null # Ut Video de/encoder , vid-stab ? null # Video stabilization @@ -355,6 +356,7 @@ stdenv.mkDerivation rec { #(enableFeature (libnut != null) "libnut") (enableFeature (libopus != null) "libopus") (enableFeature (librsvg != null) "librsvg") + (enableFeature (srt != null) "libsrt") (enableFeature (libssh != null) "libssh") (enableFeature (libtheora != null) "libtheora") (enableFeature (if isLinux then libv4l != null else false) "libv4l2") @@ -418,7 +420,7 @@ stdenv.mkDerivation rec { libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr - samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore + samba SDL2 soxr speex srt vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optionals openglExtlib [ libGL libGLU ] ++ optionals nonfreeLicensing [ fdk_aac openssl ] From e1dd9eefa1a01d721b95f9882078799be5721986 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 28 Jun 2020 02:30:26 +0200 Subject: [PATCH 2789/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-7-g30d5c33 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/4f5ce94cb8f305d41f823f5c4212b33945b3c411. --- .../haskell-modules/hackage-packages.nix | 256 ++++++++++++++---- 1 file changed, 205 insertions(+), 51 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2516f5eb11b6..59f3d67a031f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6882,15 +6882,13 @@ self: { }: mkDerivation { pname = "Gamgine"; - version = "0.5.3"; - sha256 = "08awl1f1310ifx9gzjrinsv37n7k2yaxvmjaymjh01pawlp3w4gc"; - revision = "1"; - editedCabalFile = "1i14r4r8814l8cilp24ypcsbac284m6pvib5037sypgqv72wn044"; + version = "0.6.0"; + sha256 = "171mfxq7s719j3h2nfsck2qmwrkmlp3731na6nd81b5x3jvl3ma0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base bytestring composition cpphs data-lens directory - filepath GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show - StateVar time unordered-containers utility-ht Vec zlib + array base bytestring composition data-lens directory filepath + GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show StateVar time + unordered-containers utility-ht Vec zlib ]; libraryToolDepends = [ cpphs ]; description = "Some kind of game library or set of utilities"; @@ -39532,13 +39530,17 @@ self: { }) {}; "binary-io" = callPackage - ({ mkDerivation, base, binary, bytestring, hspec, process }: + ({ mkDerivation, async, base, binary, bytestring, deque, hspec + , process, stm + }: mkDerivation { pname = "binary-io"; - version = "0.2.0"; - sha256 = "1m58zjavqcri55diwz6fspbg5qx3qj3b82ch1g740zdr27ly0bwn"; - libraryHaskellDepends = [ base binary bytestring ]; - testHaskellDepends = [ base binary bytestring hspec process ]; + version = "0.3.0"; + sha256 = "1jc362y8ql983fhgcwb8sxgqjnhqd3xis2igcl9dv0zvqmi5jpv6"; + libraryHaskellDepends = [ base binary bytestring deque process ]; + testHaskellDepends = [ + async base binary bytestring hspec process stm + ]; description = "Read and write values of types that implement Binary"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -47050,8 +47052,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "2.2.1"; - sha256 = "13pqdmghs92rwkg8fkky30sqimq54yzw2y1z5czdsmlj46r8i6ij"; + version = "2.3.0"; + sha256 = "106q5imjznbh7x2pvvgfsn8qx1awb00w0mgfrkkzbwnwc3g8jnw3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47062,7 +47064,7 @@ self: { testHaskellDepends = [ base directory filepath Glob process tasty tasty-golden ]; - description = "A command line program for managing the bounds/versions of the dependencies in a cabal file"; + description = "A command line program for managing the dependency versions in a cabal file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -47143,8 +47145,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "1.2.0"; - sha256 = "10dqy2i2rq4hq81v2gar2bsq3glx5yg5mwp9a0h7drap69407ygs"; + version = "1.3.0"; + sha256 = "08n2n0p3m282yx7cf1nzmlfmw0xikqwrj3l1s8jmx18z2gh0x1h4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47610,10 +47612,8 @@ self: { }: mkDerivation { pname = "cabal-lenses"; - version = "0.9.0"; - sha256 = "0rvkwqzz92p85i9xwcxg3ah4imxh46ficg6yk0l6g9687970gfrg"; - revision = "1"; - editedCabalFile = "0snzm6qvalyczmdicff5fsradk3h1bm3cqcax6rmwzr7xa1j43p7"; + version = "0.10.1"; + sha256 = "0pjzz5d2s6b2xaqgb7z3ry5zpba84x3iy2hw3a7xq32ciyl3gnhb"; libraryHaskellDepends = [ base Cabal lens strict system-fileio system-filepath text transformers unordered-containers @@ -68576,6 +68576,34 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "dbus_1_2_16" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.2.16"; + sha256 = "103zxllh7nwbbckjblidr45xa13lrpqh9bwhvirrx24g7hsj1y9c"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers deepseq exceptions + filepath lens network parsec random split template-haskell text + th-lift transformers unix vector xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath network + parsec process QuickCheck random resourcet tasty tasty-hunit + tasty-quickcheck text transformers unix vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + description = "A client library for the D-Bus IPC system"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -73105,6 +73133,18 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "dijkstra-simple" = callPackage + ({ mkDerivation, base, containers, fingertree, hspec }: + mkDerivation { + pname = "dijkstra-simple"; + version = "0.1.0"; + sha256 = "068jfmkk14fmyd8ars13zi8z716d7ak0mxj3zm5f1zyj31901wz8"; + libraryHaskellDepends = [ base containers fingertree ]; + testHaskellDepends = [ base containers fingertree hspec ]; + description = "A simpler Dijkstra shortest paths implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dimensional" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, exact-pi, Glob , hspec, hspec-discover, ieee754, numtype-dk, QuickCheck @@ -75201,6 +75241,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dobutokO-effects" = callPackage + ({ mkDerivation, base, dobutokO-frequency }: + mkDerivation { + pname = "dobutokO-effects"; + version = "0.1.0.0"; + sha256 = "1fyqp3487ygrmdd49nk0wq8q2ldfc71ifmns5c5nisjdbgsjrb5n"; + libraryHaskellDepends = [ base dobutokO-frequency ]; + description = "A library to deal with SoX effects and possibilities"; + license = stdenv.lib.licenses.mit; + }) {}; + "dobutokO-frequency" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -83845,24 +83896,24 @@ self: { "exigo-schema" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, directory - , exceptions, hint, hspec, hspec-core, interpolate, persistent - , persistent-template, QuickCheck, quickcheck-text + , esqueleto, exceptions, hint, hspec, hspec-core, interpolate + , monad-logger, mtl, persistent, persistent-sqlite + , persistent-template, QuickCheck, quickcheck-text, resourcet , template-haskell, temporary, text, th-lift-instances }: mkDerivation { pname = "exigo-schema"; - version = "0.2.0.0"; - sha256 = "1p9hss4s6fx59dy92pwnzph29yxprdzs96j7va9ycx31x34g41yx"; - revision = "1"; - editedCabalFile = "1r1sz3b4s6yvg5p7lzy1ir0zl1scy1jfk5bsml4jc78ivl2rssf1"; + version = "0.2.0.2"; + sha256 = "0kaja735bsgzywhfa16wg5kvjc1c89gvm503gxxyhkakacmp2002"; libraryHaskellDepends = [ aeson base binary bytestring persistent persistent-template template-haskell text th-lift-instances ]; testHaskellDepends = [ - base directory exceptions hint hspec hspec-core interpolate - persistent persistent-template QuickCheck quickcheck-text - template-haskell temporary + aeson base bytestring directory esqueleto exceptions hint hspec + hspec-core interpolate monad-logger mtl persistent + persistent-sqlite persistent-template QuickCheck quickcheck-text + resourcet template-haskell temporary text ]; description = "database schema for exigo marking/assessment tools"; license = stdenv.lib.licenses.bsd2; @@ -131601,15 +131652,15 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; - "hslua_1_1_1" = callPackage + "hslua_1_1_2" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3 , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit , tasty-quickcheck, text }: mkDerivation { pname = "hslua"; - version = "1.1.1"; - sha256 = "10gga18cg03av05rff9dg1yjmcyk16lv66zd4gwpr4g60091snbl"; + version = "1.1.2"; + sha256 = "1cv4lwr91ckscwm2jksrg29ka1z32974xgkcgmna4ibpyjwkslbl"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; libraryHaskellDepends = [ base bytestring containers exceptions mtl text @@ -131633,6 +131684,8 @@ self: { pname = "hslua-aeson"; version = "1.0.2"; sha256 = "1v5saxppbnq62ds00a7diadvqg8dnsx0sjlcanjj15h13j3yw964"; + revision = "1"; + editedCabalFile = "1bikj789x82f4b1pqij1wshkncvlxwjwyxf9z1spfvg8nsb5sd7y"; libraryHaskellDepends = [ aeson base hashable hslua scientific text unordered-containers vector @@ -153312,8 +153365,8 @@ self: { }: mkDerivation { pname = "layers-game"; - version = "0.6.0"; - sha256 = "03a8l2hmirhfnl7s07yq06szmwcr5lz2lapbpp22ryqjr3zpvwf6"; + version = "0.7.0"; + sha256 = "1v55940lpp9p67nnnqslzz175cbzs7sfdyinxws9dhwmjvpm4ix8"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -163724,6 +163777,8 @@ self: { pname = "massiv"; version = "0.5.2.0"; sha256 = "0j44as40bgzjixiga4l06gr3fpgk8vifmz2y12asczxwfv6k0xp1"; + revision = "1"; + editedCabalFile = "0vrfkbnav9vhi896d13yalsrz8d4d1lfwhwl4vc9b6syz6hf2j8y"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive @@ -163739,7 +163794,7 @@ self: { broken = true; }) {}; - "massiv_0_5_3_0" = callPackage + "massiv_0_5_3_1" = callPackage ({ mkDerivation, base, bytestring, data-default-class, deepseq , doctest, exceptions, mersenne-random-pure64, primitive , QuickCheck, random, scheduler, splitmix, template-haskell @@ -163747,8 +163802,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.5.3.0"; - sha256 = "0wvrdm442p03qna2146d4fld4ghj1ibrxqgncc1yphzc1hxb3kzi"; + version = "0.5.3.1"; + sha256 = "0biwxrs1k5jzaxvcpjw7ryzm3w5rpb67vzdn3zgi6azci1kqqs78"; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive scheduler unliftio-core vector @@ -163858,6 +163913,30 @@ self: { broken = true; }) {}; + "massiv-test_0_1_3_1" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec + , massiv, mwc-random, primitive, QuickCheck, scheduler, unliftio + , vector + }: + mkDerivation { + pname = "massiv-test"; + version = "0.1.3.1"; + sha256 = "0nwrfxi77w2xmmy7j7fh6kb06hzhmxl8vagdb856xmr9cbq02nj5"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions hspec massiv + primitive QuickCheck scheduler unliftio vector + ]; + testHaskellDepends = [ + base bytestring containers data-default deepseq genvalidity-hspec + hspec massiv mwc-random primitive QuickCheck scheduler vector + ]; + description = "Library that contains generators, properties and tests for Massiv Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "master-plan" = callPackage ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific , hspec, megaparsec, mtl, optparse-applicative, QuickCheck @@ -188514,6 +188593,8 @@ self: { pname = "password"; version = "2.0.1.1"; sha256 = "1fi39w79p7jaw85i5r8f4flw7s1n2ljxj5ci9gda6a556015w1p8"; + revision = "1"; + editedCabalFile = "1r27scxmkmvw8nbcg4x3k10ibq4qhrmpwgnqbnz32g1fvw7mlxg3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring cryptonite memory text @@ -222562,6 +222643,60 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-rawm_1_0_0_0" = callPackage + ({ mkDerivation, base, servant }: + mkDerivation { + pname = "servant-rawm"; + version = "1.0.0.0"; + sha256 = "05gv21y7vzw7gdbsk0nax47rnn4isjmx7hbbwilsv0cj7l8qm1bk"; + libraryHaskellDepends = [ base servant ]; + description = "Embed a raw 'Application' in a Servant API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "servant-rawm-client" = callPackage + ({ mkDerivation, base, servant-client-core, servant-rawm }: + mkDerivation { + pname = "servant-rawm-client"; + version = "1.0.0.0"; + sha256 = "1ivl8pvk3rfi3bm5nhmx334r5rwi7vdkl3pbg90fzwj7brd2vsyz"; + libraryHaskellDepends = [ base servant-client-core servant-rawm ]; + description = "The client implementation of servant-rawm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-rawm-docs" = callPackage + ({ mkDerivation, base, http-media, http-types, lens, servant-docs + , servant-rawm + }: + mkDerivation { + pname = "servant-rawm-docs"; + version = "1.0.0.0"; + sha256 = "05h6j7vylir41mbhhbwvmj5n2cpwbjr9km4xm9bc5phl9m3qxsn3"; + libraryHaskellDepends = [ + base http-media http-types lens servant-docs servant-rawm + ]; + description = "Documentation generator for 'RawM' endpoints"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-rawm-server" = callPackage + ({ mkDerivation, base, bytestring, filepath, resourcet + , servant-rawm, servant-server, wai, wai-app-static + }: + mkDerivation { + pname = "servant-rawm-server"; + version = "1.0.0.0"; + sha256 = "0ipi5k5zc077146c48rysaqjn37jikmgb10qz11v6728xrvxvrzi"; + libraryHaskellDepends = [ + base bytestring filepath resourcet servant-rawm servant-server wai + wai-app-static + ]; + description = "The server implementation of servant-rawm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-reason" = callPackage ({ mkDerivation, aeson, base, Diff, directory, hspec, HUnit , interpolate, lens, mockery, process, reason-export, servant @@ -223057,16 +223192,16 @@ self: { }) {}; "servant-swagger-tags" = callPackage - ({ mkDerivation, base, containers, lens, servant, servant-mock - , servant-server, servant-swagger, swagger2, text + ({ mkDerivation, base, insert-ordered-containers, lens, servant + , servant-mock, servant-server, servant-swagger, swagger2, text }: mkDerivation { pname = "servant-swagger-tags"; - version = "0.1.0.0"; - sha256 = "1938kr3jcpwy8imias0bk7xqp0v3ijajpdfdpgibyphklfqnck64"; + version = "0.1.0.1"; + sha256 = "1hl0baa739a5kdg274b8cwyd5h5iam9bxj3ql96ljwdp9j2cnv2v"; libraryHaskellDepends = [ - base containers lens servant servant-mock servant-server - servant-swagger swagger2 text + base insert-ordered-containers lens servant servant-mock + servant-server servant-swagger swagger2 text ]; description = "Swagger Tags for Servant"; license = stdenv.lib.licenses.bsd3; @@ -234956,6 +235091,8 @@ self: { pname = "stackcollapse-ghc"; version = "0.0.1.1"; sha256 = "18glq0hkfr02iw8p842hmk4rv5d8sb565lyccklxdmfn708ick23"; + revision = "1"; + editedCabalFile = "14pb8v69idj8dqqm50xigdasqg2jrai6lcl95mw96br70fwb6k15"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -238169,8 +238306,8 @@ self: { }: mkDerivation { pname = "string-random"; - version = "0.1.2.0"; - sha256 = "1jw05cvzzmma28xvak517y8gb7gjsdmr5iafgz5snxikcjzav0l2"; + version = "0.1.3.0"; + sha256 = "18yni8zm51x65i5h1c4sr9msd5fqa3fnh3zm0dck2wk364xz7dsy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245298,13 +245435,12 @@ self: { ({ mkDerivation, array, base, c2hs }: mkDerivation { pname = "termbox"; - version = "0.2.0"; - sha256 = "04y1wj65c6nhv08jd83ihvph45fs5279px4ivm5cinnz5m721jqg"; + version = "0.2.0.1"; + sha256 = "0rqlhinc1vmxnmwxrcv5rb78j3jmp6iwfcabzf95nhclvjhdadr8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base ]; description = "termbox bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -247104,8 +247240,8 @@ self: { }: mkDerivation { pname = "text-time"; - version = "0.2.0"; - sha256 = "14pk5h7mswdr6dpiw7m4z64dadgrdpw77inyq6kmwaskqc1whqng"; + version = "0.3.1"; + sha256 = "1p0vdhvpcz07wiam3hsi7fixknb6shxlhvg624vksacg06qkck41"; libraryHaskellDepends = [ attoparsec base formatting text time ]; testHaskellDepends = [ attoparsec base Cabal formatting hspec QuickCheck text time @@ -264790,6 +264926,24 @@ self: { broken = true; }) {}; + "wai-saml2" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, c14n + , cryptonite, data-default-class, http-types, mtl, text, time + , vault, wai, wai-extra, x509, x509-store, xml-conduit + }: + mkDerivation { + pname = "wai-saml2"; + version = "0.1.0.0"; + sha256 = "06fvpcnznb883xqzi4shs3gk0ih8vix6a6dhv6azk3ca7gblzb84"; + libraryHaskellDepends = [ + base base64-bytestring bytestring c14n cryptonite + data-default-class http-types mtl text time vault wai wai-extra + x509 x509-store xml-conduit + ]; + description = "SAML2 assertion validation as WAI middleware"; + license = stdenv.lib.licenses.mit; + }) {}; + "wai-secure-cookies" = callPackage ({ mkDerivation, base, bytestring, cryptonite, hspec , hspec-expectations, hspec-wai, http-types, memory, protolude From b71423ae389f5b7c548dd4997909cdae5af9d14d Mon Sep 17 00:00:00 2001 From: Colin <486199+c00w@users.noreply.github.com> Date: Sat, 27 Jun 2020 19:50:42 -0500 Subject: [PATCH 2790/3452] go_1_15: init at 1.15beta1 (#91463) --- pkgs/development/compilers/go/1.15.nix | 252 ++++++++++++++++++ .../compilers/go/remove-test-pie-1.15.patch | 34 +++ .../compilers/go/skip-cgo-tests-1.15.patch | 13 + .../go/skip-external-network-tests-1.15.patch | 13 + .../compilers/go/ssl-cert-file-1.15.patch | 76 ++++++ pkgs/top-level/all-packages.nix | 13 + 6 files changed, 401 insertions(+) create mode 100644 pkgs/development/compilers/go/1.15.nix create mode 100644 pkgs/development/compilers/go/remove-test-pie-1.15.patch create mode 100644 pkgs/development/compilers/go/skip-cgo-tests-1.15.patch create mode 100644 pkgs/development/compilers/go/skip-external-network-tests-1.15.patch create mode 100644 pkgs/development/compilers/go/ssl-cert-file-1.15.patch diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix new file mode 100644 index 000000000000..69becebe7706 --- /dev/null +++ b/pkgs/development/compilers/go/1.15.nix @@ -0,0 +1,252 @@ +{ stdenv, fetchurl, tzdata, iana-etc, runCommand +, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +, mailcap, runtimeShell +, buildPackages, pkgsTargetTarget +, fetchpatch +}: + +let + + inherit (stdenv.lib) optionals optionalString; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${buildPackages.go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + + goarch = platform: { + "i686" = "386"; + "x86_64" = "amd64"; + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + +in + +stdenv.mkDerivation rec { + pname = "go"; + version = "1.15beta1"; + + src = fetchurl { + url = "https://dl.google.com/go/go${version}.src.tar.gz"; + sha256 = "1h1sg6j9jac5bw2pjrd13bf4nr18prs89147izdhzbhp896sikbq"; + }; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkgconfig patch procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' + + # Patch the mimetype database location which is missing on NixOS. + # but also allow static binaries built with NixOS to run outside nix + sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Fails on aarch64 + sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go + # Skip this test since ssl patches mess it up. + sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # Disable another PIE test which breaks. + sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go + # Disable the BuildModePie test + sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + optionalString stdenv.isLinux '' + # prepend the nix path to the zoneinfo files but also leave the original value for static binaries + # that run outside a nix server + sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go + + '' + optionalString stdenv.isAarch32 '' + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go + sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + # TestCurrent fails because Current is not implemented on Darwin + sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go + sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.11.patch + ./ssl-cert-file-1.15.patch + ./remove-test-pie-1.15.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ./skip-external-network-tests-1.15.patch + ./skip-nohup-tests.patch + ./skip-cgo-tests-1.15.patch + ] ++ [ + # breaks under load: https://github.com/golang/go/issues/25628 + (if stdenv.isAarch32 + then ./skip-test-extra-files-on-aarch32-1.14.patch + else ./skip-test-extra-files-on-386-1.14.patch) + ]; + + postPatch = '' + find . -name '*.orig' -exec rm {} ';' + ''; + + GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" + else + null; + + GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # Indicate that we are running on build infrastructure + # Some tests assume things like home directories and users exists + GO_BUILDER_NAME = "nix"; + + GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; + + postConfigure = '' + export GOCACHE=$TMPDIR/go-cache + # this is compiled into the binary + export GOROOT_FINAL=$out/share/go + + export PATH=$(pwd)/bin:$PATH + + # Independent from host/target, CC should produce code for the building system. + export CC=${buildPackages.stdenv.cc}/bin/cc + ulimit -a + ''; + + postBuild = '' + (cd src && ./make.bash) + ''; + + doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; + + checkPhase = '' + runHook preCheck + (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) + runHook postCheck + ''; + + preInstall = '' + rm -r pkg/obj + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} + ''} + '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + rm -rf bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} + ''} + '' else ""); + + installPhase = '' + runHook preInstall + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc $GOROOT_FINAL + ln -s $GOROOT_FINAL/bin $out/bin + runHook postInstall + ''; + + disallowedReferences = [ goBootstrap ]; + + meta = with stdenv.lib; { + branch = "1.15"; + homepage = "http://golang.org/"; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = teams.golang.members; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/remove-test-pie-1.15.patch b/pkgs/development/compilers/go/remove-test-pie-1.15.patch new file mode 100644 index 000000000000..f00685feba90 --- /dev/null +++ b/pkgs/development/compilers/go/remove-test-pie-1.15.patch @@ -0,0 +1,34 @@ +diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go +index e1cd4965c3..66bf980fc6 100644 +--- a/src/cmd/dist/test.go ++++ b/src/cmd/dist/test.go +@@ -584,29 +584,6 @@ func (t *tester) registerTests() { + }) + } + +- // Test internal linking of PIE binaries where it is supported. +- if t.internalLinkPIE() { +- t.tests = append(t.tests, distTest{ +- name: "pie_internal", +- heading: "internal linking of -buildmode=pie", +- fn: func(dt *distTest) error { +- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) +- return nil +- }, +- }) +- // Also test a cgo package. +- if t.cgoEnabled && t.internalLink() { +- t.tests = append(t.tests, distTest{ +- name: "pie_internal_cgo", +- heading: "internal linking of -buildmode=pie", +- fn: func(dt *distTest) error { +- t.addCmd(dt, "src", t.goTest(), "os/user", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) +- return nil +- }, +- }) +- } +- } +- + // sync tests + if goos != "js" { // js doesn't support -cpu=10 + t.tests = append(t.tests, distTest{ diff --git a/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch b/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch new file mode 100644 index 000000000000..945d3ef8d126 --- /dev/null +++ b/pkgs/development/compilers/go/skip-cgo-tests-1.15.patch @@ -0,0 +1,13 @@ +diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go +index e1cd4965c3..0980d044df 100644 +--- a/src/cmd/dist/test.go ++++ b/src/cmd/dist/test.go +@@ -1136,7 +1136,7 @@ func (t *tester) cgoTest(dt *distTest) error { + t.addCmd(dt, "misc/cgo/test", t.goTest(), "-buildmode=pie", "-ldflags=-linkmode=internal") + } + t.addCmd(dt, "misc/cgo/testtls", t.goTest(), "-buildmode=pie") +- t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie") ++ //t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie") + } + } + } diff --git a/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch b/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch new file mode 100644 index 000000000000..0ea1050cd8e3 --- /dev/null +++ b/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch @@ -0,0 +1,13 @@ +diff --git a/src/net/dial_test.go b/src/net/dial_test.go +index 01582489de..5b5faa5424 100644 +--- a/src/net/dial_test.go ++++ b/src/net/dial_test.go +@@ -990,6 +990,8 @@ func TestDialerControl(t *testing.T) { + // except that it won't skip testing on non-mobile builders. + func mustHaveExternalNetwork(t *testing.T) { + t.Helper() ++ t.Skipf("Nix sandbox does not have networking") ++ + mobile := runtime.GOOS == "android" || runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" + if testenv.Builder() == "" || mobile { + testenv.MustHaveExternalNetwork(t) diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.15.patch b/pkgs/development/compilers/go/ssl-cert-file-1.15.patch new file mode 100644 index 000000000000..cca48eb5705c --- /dev/null +++ b/pkgs/development/compilers/go/ssl-cert-file-1.15.patch @@ -0,0 +1,76 @@ +diff --git a/src/crypto/x509/root_darwin_amd64.go b/src/crypto/x509/root_darwin_amd64.go +index 8ad5a9607d..1d6091cf83 100644 +--- a/src/crypto/x509/root_darwin_amd64.go ++++ b/src/crypto/x509/root_darwin_amd64.go +@@ -8,6 +8,7 @@ import ( + "bytes" + "crypto/x509/internal/macOS" + "fmt" ++ "io/ioutil" + "os" + "strings" + ) +@@ -23,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + var loadSystemRootsWithCgo func() (*CertPool, error) + + func loadSystemRoots() (*CertPool, error) { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots := NewCertPool() ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + var trustedRoots []*Certificate + untrustedRoots := make(map[string]bool) + +diff --git a/src/crypto/x509/root_darwin_arm64.go b/src/crypto/x509/root_darwin_arm64.go +index 2fb079ba66..6a072f3e78 100644 +--- a/src/crypto/x509/root_darwin_arm64.go ++++ b/src/crypto/x509/root_darwin_arm64.go +@@ -6,6 +6,11 @@ + + package x509 + ++import ( ++ "io/ioutil" ++ "os" ++) ++ + func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { + return nil, nil + } +@@ -14,6 +19,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + var loadSystemRootsWithCgo func() (*CertPool, error) + + func loadSystemRoots() (*CertPool, error) { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots := NewCertPool() ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + p := NewCertPool() + p.AppendCertsFromPEM([]byte(systemRootsPEM)) + return p, nil +diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go +index b48e618a65..195c1ff25a 100644 +--- a/src/crypto/x509/root_unix.go ++++ b/src/crypto/x509/root_unix.go +@@ -42,6 +42,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + files := certFiles + if f := os.Getenv(certFileEnv); f != "" { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0381c8e6cbae..f225920cd488 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8766,6 +8766,13 @@ in buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; }); + go_1_15 = callPackage ../development/compilers/go/1.15.nix ({ + inherit (darwin.apple_sdk.frameworks) Security Foundation; + } // lib.optionalAttrs stdenv.isAarch64 { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); + go = go_1_14; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -15486,6 +15493,9 @@ in buildGo114Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_14; }; + buildGo115Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_15; + }; buildGoPackage = buildGo114Package; @@ -15495,6 +15505,9 @@ in buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; }; + buildGo115Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_15; + }; buildGoModule = buildGo114Module; From 209ab7c8b40393a0454bfd417841a7684eba5e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 18 Jun 2020 07:54:34 +0200 Subject: [PATCH 2791/3452] python3Packages.somajo: 2.0.6 -> 2.1.0 Changelog: https://github.com/tsproisl/SoMaJo/releases/tag/v2.1.0 --- pkgs/development/python-modules/somajo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 958c9ab82662..c9415999262a 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "SoMaJo"; - version = "2.0.6"; + version = "2.1.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "08nicj3nj6pi6djli26gf0kf3s2da9ysn1cpkyw7j88v8vav0p7s"; + sha256 = "17ybm5rgwc6jy3i1c8nm05j7fd418n6hp44zv0q77kzhd66am6pp"; }; propagatedBuildInputs = [ regex ]; From 9c06da093f19b9788c16711d8e6ba1cf053da36c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 21 Jun 2020 11:34:59 +0200 Subject: [PATCH 2792/3452] python3Packages.pkuseg: init at 0.0.25 --- .../python-modules/pkuseg/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/pkuseg/default.nix diff --git a/pkgs/development/python-modules/pkuseg/default.nix b/pkgs/development/python-modules/pkuseg/default.nix new file mode 100644 index 000000000000..3b1c2bd5bce4 --- /dev/null +++ b/pkgs/development/python-modules/pkuseg/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +, cython +, numpy +}: + +buildPythonPackage rec { + pname = "pkuseg"; + version = "0.0.25"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "148yp0l7h8cflxag62pc1iwj5b5liyljnaxwfjaiqwl96vwjn0fx"; + }; + + # Does not seem to have actual tests, but unittest discover + # recognizes some non-tests as tests and fails. + doCheck = false; + + nativeBuildInputs = [ cython ]; + + propagatedBuildInputs = [ numpy ]; + + pythonImportsCheck = [ "pkuseg" ]; + + meta = with stdenv.lib; { + description = "Toolkit for multi-domain Chinese word segmentation"; + homepage = "https://github.com/lancopku/pkuseg-python"; + license = licenses.unfree; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 068132e388da..47e0317a3f99 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7330,6 +7330,8 @@ in { murmurhash = callPackage ../development/python-modules/murmurhash { }; + pkuseg = callPackage ../development/python-modules/pkuseg { }; + plac = callPackage ../development/python-modules/plac { }; preshed = callPackage ../development/python-modules/preshed { }; From d4737c93fc15233cf320d27c39d7241f6e0cabc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 21 Jun 2020 11:49:56 +0200 Subject: [PATCH 2793/3452] licenses: add LGPL For Linguistic Resources --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 4e9ae0346a7b..e24b7e8ec6f1 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -462,6 +462,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "GNU Lesser General Public License v3.0 or later"; }; + lgpllr = spdx { + spdxId = "LGPLLR"; + fullName = "Lesser General Public License For Linguistic Resources"; + }; + libpng = spdx { spdxId = "Libpng"; fullName = "libpng License"; From 4059ac951ba56a397e148088acef372f7208adc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 21 Jun 2020 11:50:21 +0200 Subject: [PATCH 2794/3452] pythonPackages.spacy_models: add more models This change adds the missing language-specific spaCy models: da_core_news_lg, da_core_news_md, da_core_news_sm, de_core_news_lg, el_core_news_lg, es_core_news_lg, fr_core_news_lg, it_core_news_lg, it_core_news_md, lt_core_news_lg, lt_core_news_md, nb_core_news_lg, nb_core_news_md, nl_core_news_lg, nl_core_news_md, pl_core_news_lg, pl_core_news_md, pl_core_news_sm, pt_core_news_lg, pt_core_news_md, ro_core_news_sm, ro_core_news_md, ro_core_news_lg, zh_core_web_lg, zh_core_web_md, zh_core_web_sm I also checked the licenses and fixed them where necessary. --- .../python-modules/spacy/models.json | 182 ++++++++++++++++-- .../python-modules/spacy/models.nix | 10 +- 2 files changed, 176 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index 1c02b05d303e..3a427f8932a5 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,79 +1,145 @@ [{ + "pname": "da_core_news_lg", + "version": "2.3.0", + "sha256": "18y1jany1ha27jkwb9563haxsbylm0axkh5c8009lsfxc8y2w9hr", + "license": "cc-by-sa-40" +}, +{ + "pname": "da_core_news_md", + "version": "2.3.0", + "sha256": "06nm5grj5jdx0rja7vw1f91vvd69p6vhafrwpfr1npqk24j6cacb", + "license": "cc-by-sa-40" +}, +{ + "pname": "da_core_news_sm", + "version": "2.3.0", + "sha256": "00byhlrcbg4wxplr473g9b3126pvk4vwy0q34xg0zx4994qb6rgn", + "license": "cc-by-sa-40" +}, +{ + "pname": "de_core_news_lg", + "version": "2.3.0", + "sha256": "0rixhgdz4z7sq6f2b1w3n5cn1645cr37g40hbd9xzlvdzdf5cg6d", + "license": "mit" +}, +{ "pname": "de_core_news_md", "version": "2.3.0", "sha256": "0kxir1w000r5fn1kpa38m7688xinkn2mk1m82aiwqlck3r72jdi6", - "license": "cc-by-sa-40" + "license": "mit" }, { "pname": "de_core_news_sm", "version": "2.3.0", "sha256": "00cbmrf4njg28laysapdnp4rv4lw4yw03rxkynw1ain5fwb0izl7", - "license": "cc-by-sa-40" + "license": "mit" +}, +{ + "pname": "el_core_news_lg", + "version": "2.3.0", + "sha256": "001c19dd1kirlvzbdv2i89zw8nf6c4icv2w0chm7rd6x9m3i13gd", + "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_md", "version": "2.3.0", "sha256": "170x8bzm5nf02mhkxyxjk58yk2639hsjb5b9prcc69500c0vmnp0", - "license": "cc-by-sa-40" + "license": "cc-by-nc-sa-30" }, { "pname": "el_core_news_sm", "version": "2.3.0", "sha256": "10mh3za4jvr07rawzk8ps642rp11s3smraj9xvrxflik4fqkz18b", - "license": "cc-by-sa-40" + "license": "cc-by-nc-sa-30" }, { "pname": "en_core_web_lg", "version": "2.3.0", "sha256": "0mfa5wz31ya295jhyj489gb4qy806zmpq1zc11bvv5alv2m35if2", - "license": "cc-by-sa-40" + "license": "mit" }, { "pname": "en_core_web_md", "version": "2.3.0", "sha256": "1ys8sqkhiap1mq6mhbkbq8bc07lvl68xngbx725xkwvirzl5gabh", - "license": "cc-by-sa-40" + "license": "mit" }, { "pname": "en_core_web_sm", "version": "2.3.0", "sha256": "04icv9qf4pj53ll8vqxcjl2a723q1k00i7lifk8wx5saif28g37a", - "license": "cc-by-sa-40" + "license": "mit" }, { "pname": "en_vectors_web_lg", "version": "2.3.0", "sha256": "13g012rwh0bcxx3ii5mmygqzyryah1y3zd000zhidnacc1x1g743", - "license": "cc-by-sa-40" + "license": "cc-by-sa-30" +}, +{ + "pname": "es_core_news_lg", + "version": "2.3.0", + "sha256": "1r0pr0lzs3j9w7rd5z9nw87iayjm36v7f7gamvaiiphs6bc5p7ls", + "license": "gpl3" }, { "pname": "es_core_news_md", "version": "2.3.0", "sha256": "0nz33bmpr3rxqbnv6vb1id8pkfsvh8ii8vqplwgb3b8772kmpzy2", - "license": "cc-by-sa-40" + "license": "gpl3" }, { "pname": "es_core_news_sm", "version": "2.3.0", "sha256": "02xqhg4m0gg5r9yibvl02zixkll6w0nsmbdhp07y5yyaqjarc90d", - "license": "cc-by-sa-40" + "license": "gpl3" +}, +{ + "pname": "fr_core_news_lg", + "version": "2.3.0", + "sha256": "1yliamws8nqqjhpk9gr2dzlk0dms2mr958zbj21biv8fimbq60ik", + "license": "lgpllr" }, { "pname": "fr_core_news_md", "version": "2.3.0", "sha256": "04fk212ksac3bp9dj7dmzsdcnbqmbsgymsic6ddcv9zbfdv5d0db", - "license": "cc-by-sa-40" + "license": "lgpllr" }, { "pname": "fr_core_news_sm", "version": "2.3.0", "sha256": "0kldww855z67qfc9maa9z1lsvdf5vj5vc8gj0x3h68kv5n1xr4h0", - "license": "cc-by-sa-40" + "license": "lgpllr" +}, +{ + "pname": "it_core_news_lg", + "version": "2.3.0", + "sha256": "192rdmqnwl3ajxzhnw4r1cqv5bkziv0yc2bbzckmzqss64wk7k70", + "license": "cc-by-nc-sa-30" +}, +{ + "pname": "it_core_news_md", + "version": "2.3.0", + "sha256": "019ih4vwq1w6j38j0wc8pyyg1an6yy37wxq2w4amwppynmmcnd5w", + "license": "cc-by-nc-sa-30" }, { "pname": "it_core_news_sm", "version": "2.3.0", "sha256": "1c3ywqa8li0j7cyvd1xqbb096y61978hd6qv7rc6cxxjdhmkrrds", + "license": "cc-by-nc-sa-40" +}, +{ + "pname": "lt_core_news_lg", + "version": "2.3.0", + "sha256": "0hn5w8n7mgv33i6gvnaxl1j44n9gz4j86gg1a9jjlgdw5z98n0p2", + "license": "cc-by-sa-40" +}, +{ + "pname": "lt_core_news_md", + "version": "2.3.0", + "sha256": "1xya79cz2xd5vgzg6qg0ww5j2bmv7kppdk3mdjf6zpwrlzwdbk5d", "license": "cc-by-sa-40" }, { @@ -82,27 +148,117 @@ "sha256": "0r3rbqgz4897wyhz5jli30lryb45039f4rlvn4q0364cg1pm92g9", "license": "cc-by-sa-40" }, +{ + "pname": "nb_core_news_lg", + "version": "2.3.0", + "sha256": "18mblypw3c82004qz5w1p3262iqwn99wl9b781dq7aqwxskr02d6", + "license": "mit" +}, +{ + "pname": "nb_core_news_md", + "version": "2.3.0", + "sha256": "0iw97k9glxbar8mrpvnmmcb1nffgdhb83akn99p53pwmqbzxy9p3", + "license": "mit" +}, { "pname": "nb_core_news_sm", "version": "2.3.0", "sha256": "07b7xri2q3m7fvn9a2gjc1044a3f14231vr32hrw96h7k6vg95h7", "license": "mit" }, +{ + "pname": "nl_core_news_lg", + "version": "2.3.0", + "sha256": "016166kzpgi0p3m0x3k308a0r60a28yz7npagjvmpl1dfm9lzhnv", + "license": "cc-by-sa-40" +}, +{ + "pname": "nl_core_news_md", + "version": "2.3.0", + "sha256": "1anfhig531k9k14s0cbgsvmvifp3h50qi1h8dhx894kjmq10k2lg", + "license": "cc-by-sa-40" +}, { "pname": "nl_core_news_sm", "version": "2.3.0", "sha256": "0alvz7pn7cj0yax8h5gp71vrdblh3mcsmyhzgiddsd44ry35nxnj", "license": "cc-by-sa-40" }, +{ + "pname": "pl_core_news_lg", + "version": "2.3.0", + "sha256": "1acchp8pv1h4c6cwvxz07lh4ychn6aw809zfg3mbbsxgsgd2ahjr", + "license": "gpl3" +}, +{ + "pname": "pl_core_news_md", + "version": "2.3.0", + "sha256": "19jjjjvbys3ayibkm3cx497b4bh63ll39hfq04wx116rj4ajpwwg", + "license": "gpl3" +}, +{ + "pname": "pl_core_news_sm", + "version": "2.3.0", + "sha256": "166mqlfkgiszcc6hwg2mr6sir9y88y22nd81a1nidq0fiif5lfji", + "license": "gpl3" +}, +{ + "pname": "pt_core_news_lg", + "version": "2.3.0", + "sha256": "18gvdmfwyy2sbq6206imglhghyagd6a4gb6wcfkwhm7lzbnq714d", + "license": "cc-by-sa-40" +}, +{ + "pname": "pt_core_news_md", + "version": "2.3.0", + "sha256": "1yxnpwby2aq6ydvd35lylc4fs141fisfnzlx8pl88pp2b2gxijvl", + "license": "cc-by-sa-40" +}, { "pname": "pt_core_news_sm", "version": "2.3.0", "sha256": "1vcvzdg9f93x0vaafkk9l9xhpmaavfj0cf0l3p06c5kx2d76f9ph", "license": "cc-by-sa-40" }, +{ + "pname": "ro_core_news_sm", + "version": "2.3.0", + "sha256": "0lsmbdwsaczv37y5sa1vvgwszy2hs8jp24a0nvc5qm8vb71rxj8w", + "license": "cc-by-sa-40" +}, +{ + "pname": "ro_core_news_md", + "version": "2.3.0", + "sha256": "1igwkz3yd1117gi2g78yilh9ln8n5yrdimas4prfxjgzwid3q8bc", + "license": "cc-by-sa-40" +}, +{ + "pname": "ro_core_news_lg", + "version": "2.3.0", + "sha256": "0id1y32kjfans7llh1i55rgr4n2x6xn208y4qf6yl3pbc17i0n9z", + "license": "cc-by-sa-40" +}, { "pname": "xx_ent_wiki_sm", "version": "2.3.0", "sha256": "0x3zmmybl5kh4dn5prkfmr4q5j9bh13p40qc3rhdfi0i3jxc11pn", - "license": "cc-by-sa-40" + "license": "mit" +}, +{ + "pname": "zh_core_web_lg", + "version": "2.3.1", + "sha256": "17zxk7cz47k07yb3qaigc3sx4dj4zwilr1lsn2jq6w7jc8k2h1ll", + "license": "mit" +}, +{ + "pname": "zh_core_web_md", + "version": "2.3.1", + "sha256": "1n4iwxyam4ykn0f9jdzwkhczack8r9c3kkbyga3c4h6iwqsflzcj", + "license": "mit" +}, +{ + "pname": "zh_core_web_sm", + "version": "2.3.1", + "sha256": "1lj5nwhx38cpwnvajwxlfkf84dr1xx2h6wwbg3scycsh459i9fpc", + "license": "mit" }] diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index b091c3b7d56c..b83ae5d7ddc6 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -1,6 +1,9 @@ -{ stdenv, buildPythonPackage, fetchurl, spacy }: +{ stdenv, lib, buildPythonPackage, fetchurl, jieba, pkuseg, spacy }: let - buildModelPackage = { pname, version, sha256, license }: buildPythonPackage { + buildModelPackage = { pname, version, sha256, license }: + let + lang = builtins.substring 0 2 pname; + in buildPythonPackage { inherit pname version; src = fetchurl { @@ -8,7 +11,8 @@ let inherit sha256; }; - propagatedBuildInputs = [ spacy ]; + propagatedBuildInputs = [ spacy ] + ++ lib.optionals (lang == "zh") [ jieba pkuseg ]; meta = with stdenv.lib; { description = "Models for the spaCy NLP library"; From 40d120d42503723dc263acf9d5a28eea1bc4dcbb Mon Sep 17 00:00:00 2001 From: "Ying Kanyang (Harry Ying)" Date: Sun, 28 Jun 2020 14:14:00 +0800 Subject: [PATCH 2795/3452] clash: 0.20.0 -> 1.0.0 Simply bump the version as upstream released the new version a few hours ago. --- pkgs/tools/networking/clash/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index af21e9d4fef5..17592ec33699 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "clash"; - version = "0.20.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "1nb4hl9x2lj0hy8byz14c2xn6yhrb6pqmhzl002k83qd3zrc6s3p"; + sha256 = "0qyfv6h6m86m5bwayj0s1pjldnbagy63zc2ygzpnicihmd58khny"; }; goPackagePath = "github.com/Dreamacro/clash"; - vendorSha256 = "0nh3cn31p7yhnhjzqp84dnhzy3hag253bjp70w8q03lw7mkhdgz3"; + vendorSha256 = "0ap6wsx23s4q730s6d5cgc4ginh8zj5sd32k0za49fh50v8k8zbh"; buildFlagsArray = [ "-ldflags=" @@ -26,4 +26,4 @@ buildGoModule rec { maintainers = with maintainers; [ contrun filalex77 ]; platforms = platforms.all; }; -} \ No newline at end of file +} From c4e1a2f9a300de841b27c6c3fb1f481747fcbf19 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 21 Jun 2020 07:33:14 +0200 Subject: [PATCH 2796/3452] ocamlPackages.xtmpl: compatibility with JSoO 3.6.0 --- pkgs/development/ocaml-modules/xtmpl/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix index 2c4cf4928db9..2264f0dedbf9 100644 --- a/pkgs/development/ocaml-modules/xtmpl/default.nix +++ b/pkgs/development/ocaml-modules/xtmpl/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { patches = [ ./jsoo.patch ]; + postPatch = '' + substituteInPlace Makefile --replace js_of_ocaml.ppx js_of_ocaml-ppx + ''; + buildInputs = [ ocaml findlib ppx_tools js_of_ocaml js_of_ocaml-ppx ]; propagatedBuildInputs = [ iri re ]; From 2b8ee31b6d4961a0cd74d2a5ac1b275bb0f549a5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 21 Jun 2020 07:33:19 +0200 Subject: [PATCH 2797/3452] eff: compatibility with JSoO 3.6.0 --- pkgs/development/interpreters/eff/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index c848ebc60479..cfd3bbbda4c3 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation { sha256 = "1fslfj5d7fhj3f7kh558b8mk5wllwyq4rnhfkyd96fpy144sdcka"; }; + postPatch = '' + substituteInPlace setup.ml --replace js_of_ocaml.ocamlbuild js_of_ocaml-ocamlbuild + ''; + buildInputs = [ which ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild menhir js_of_ocaml js_of_ocaml-ocamlbuild ]); From d34bde6ac73f1a9f39382800563c6a0d5390f98a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 21 Jun 2020 07:33:23 +0200 Subject: [PATCH 2798/3452] why3: compatibility with JSoO 3.6.0 --- pkgs/applications/science/logic/why3/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 51cb2a456c19..cd44dadcedce 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -38,6 +38,10 @@ stdenv.mkDerivation { }) ]; + postPatch = '' + substituteInPlace Makefile.in --replace js_of_ocaml.ppx js_of_ocaml-ppx + ''; + configureFlags = [ "--enable-verbose-make" ]; installTargets = [ "install" "install-lib" ]; From 5ac887002411b552330acb80eacd8f555e377d80 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 21 Jun 2020 07:37:56 +0200 Subject: [PATCH 2799/3452] =?UTF-8?q?ocamlPackages.js=5Fof=5Focaml:=203.5.?= =?UTF-8?q?2=20=E2=86=92=203.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocplib-json-typed/browser.nix | 1 + .../tools/ocaml/js_of_ocaml/compiler.nix | 19 +++++++++---------- .../tools/ocaml/js_of_ocaml/default.nix | 4 ++-- .../tools/ocaml/js_of_ocaml/lwt.nix | 4 ++-- .../tools/ocaml/js_of_ocaml/ocamlbuild.nix | 4 ++-- .../tools/ocaml/js_of_ocaml/ppx.nix | 4 ++-- .../ocaml/js_of_ocaml/ppx_deriving_json.nix | 4 ++-- .../tools/ocaml/js_of_ocaml/tyxml.nix | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix index af3341e7e598..8db892f325e2 100644 --- a/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix +++ b/pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix @@ -3,6 +3,7 @@ buildDunePackage { pname = "ocplib-json-typed-browser"; inherit (ocplib-json-typed) version src; + useDune2 = true; propagatedBuildInputs = [ ocplib-json-typed js_of_ocaml ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 90e0a7935de5..888cc51a99db 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -1,19 +1,18 @@ -{ lib, fetchFromGitHub, buildDunePackage -, ocaml, findlib, cmdliner, dune, cppo, yojson, ocaml-migrate-parsetree +{ lib, fetchurl, buildDunePackage +, ocaml, findlib, cmdliner, dune_2, cppo, yojson, ocaml-migrate-parsetree }: buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "3.5.2"; + version = "3.6.0"; + useDune2 = true; - src = fetchFromGitHub { - owner = "ocsigen"; - repo = "js_of_ocaml"; - rev = version; - sha256 = "1fm855iavljx7rf9hii2qb7ky920zv082d9zlcl504by1bxp1yg8"; + src = fetchurl { + url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; + sha256 = "51eaa89c83ef3168ef270bf7997cbc35a747936d3f51aa6fac58fb0323b4cbb0"; }; - nativeBuildInputs = [ ocaml findlib dune cppo ]; + nativeBuildInputs = [ ocaml findlib dune_2 cppo ]; buildInputs = [ cmdliner ]; configurePlatforms = []; @@ -23,6 +22,6 @@ buildDunePackage rec { description = "Compiler from OCaml bytecode to Javascript"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + homepage = "https://ocsigen.org/js_of_ocaml/"; }; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 9ca6ca67421f..666cda592fb0 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler +{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler , ocaml-migrate-parsetree, ppx_tools_versioned, uchar }: @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit (js_of_ocaml-compiler) version src installPhase meta; buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ]; - nativeBuildInputs = [ ocaml findlib dune ]; + nativeBuildInputs = [ ocaml findlib dune_2 ]; postPatch = "patchShebangs lib/generate_stubs.sh"; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index 5c8f4377e8d7..2ad8578894f5 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler, js_of_ocaml-ppx +{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler, js_of_ocaml-ppx , ocaml-migrate-parsetree, ppx_tools_versioned , js_of_ocaml, ocaml_lwt, lwt_log }: @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit (js_of_ocaml-compiler) version src installPhase meta; - buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; + buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index 344352467e9b..50bcd69eb66a 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler +{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler , ocamlbuild }: @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit (js_of_ocaml-compiler) version src installPhase meta; - buildInputs = [ ocaml findlib dune ]; + buildInputs = [ ocaml findlib dune_2 ]; propagatedBuildInputs = [ ocamlbuild ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index 3adad22bd9c3..69783c7eada1 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler +{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler , ocaml-migrate-parsetree, ppx_tools_versioned , js_of_ocaml }: @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit (js_of_ocaml-compiler) version src installPhase meta; - buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ]; + buildInputs = [ ocaml findlib dune_2 ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ]; buildPhase = "dune build -p js_of_ocaml-ppx"; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index 47396829f8a0..d3cc4e08787f 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler +{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler , js_of_ocaml, ppxlib }: @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit (js_of_ocaml-compiler) version src installPhase meta; - buildInputs = [ ocaml findlib dune ]; + buildInputs = [ ocaml findlib dune_2 ]; propagatedBuildInputs = [ js_of_ocaml ppxlib ]; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix index c39c985183ad..fcfeeaf8d99a 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler +{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler , js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned , js_of_ocaml, reactivedata, tyxml }: @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit (js_of_ocaml-compiler) version src installPhase meta; - buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; + buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ]; From a18cc018763c04502dcb9b44337a010c7a645a3f Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Fri, 26 Jun 2020 10:59:52 +0200 Subject: [PATCH 2800/3452] haskellPackages.gcodehs: unbreak --- .../development/haskell-modules/configuration-hackage2nix.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index cbedd07fa7df..54a84bce90c4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2685,7 +2685,7 @@ package-maintainers: sorki: - cayene-lpp - data-stm32 - # - gcodehs + - gcodehs - nix-derivation - nix-narinfo - ttn @@ -5171,7 +5171,6 @@ broken-packages: - gas - gbu - gc-monitoring-wai - - gcodehs - gconf - gdax - gdiff-ig From 9f351f73601f1e0bbc0b2283328e525b5a79f9c7 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Fri, 26 Jun 2020 11:00:13 +0200 Subject: [PATCH 2801/3452] haskellPackages.update-nix-fetchgit: unbreak & maintain --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 54a84bce90c4..d4028fc79297 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2690,6 +2690,7 @@ package-maintainers: - nix-narinfo - ttn # - ttn-client + - update-nix-fetchgit - zre unsupported-platforms: @@ -10563,7 +10564,6 @@ broken-packages: - unused - uom-plugin - up - - update-nix-fetchgit - Updater - uploadcare - upskirt From 99774efb592fe1c34d3721c0a9482b78d6e171da Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Sun, 28 Jun 2020 10:16:21 +0200 Subject: [PATCH 2802/3452] haskellPackages.cabal-lenses: unbreak --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index cbedd07fa7df..5b7ac7487a39 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3594,7 +3594,6 @@ broken-packages: - cabal-install-bundle - cabal-install-ghc72 - cabal-install-ghc74 - - cabal-lenses - cabal-meta - cabal-mon - cabal-nirvana From 9d59dc5394a45ca92e91af00c069162e080c1c3b Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Sun, 28 Jun 2020 10:16:39 +0200 Subject: [PATCH 2803/3452] haskellPackages.cabal-bounds: unbreak --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 5b7ac7487a39..950d32ce0a34 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3577,7 +3577,6 @@ broken-packages: - c10k - c2ats - cabal-audit - - cabal-bounds - cabal-bundle-clib - cabal-cache - cabal-cargs From 7fa0c84c7fa0ce4872773402dd8e714d9fb1c11f Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Sun, 28 Jun 2020 10:16:49 +0200 Subject: [PATCH 2804/3452] haskellPackages.cabal-bounds: drop dontCheck --- pkgs/development/haskell-modules/configuration-common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2c6a0fb9c1e3..7ade5ede29d6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -234,7 +234,6 @@ self: super: { bloodhound = dontCheck super.bloodhound; buildwrapper = dontCheck super.buildwrapper; burst-detection = dontCheck super.burst-detection; # http://hydra.cryp.to/build/496948/log/raw - cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw cabal-meta = dontCheck super.cabal-meta; # http://hydra.cryp.to/build/497892/log/raw camfort = dontCheck super.camfort; cjk = dontCheck super.cjk; From dfcd82a01b9c552c955a5e1ec401d1af00f4b5d8 Mon Sep 17 00:00:00 2001 From: Romanos Skiadas Date: Sun, 28 Jun 2020 12:53:51 +0100 Subject: [PATCH 2805/3452] pylint: fix 1.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It depends on pyenchant, which is disabled on python2. This results in: ``` nix-env -iA unstable.python27Packages.pylint replacing old 'python2.7-pylint-1.9.5' installing 'python2.7-pylint-1.9.5' error: pyenchant-3.1.1 not supported for interpreter python2.7 ``` Remove it, à la https://github.com/NixOS/nixpkgs/commit/eb0d5fc3f076ad8fbac43158e77277066bbe28b9 and now it builds again. --- pkgs/development/python-modules/pylint/1.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix index 568d85b7e1b7..e283cc10d16a 100644 --- a/pkgs/development/python-modules/pylint/1.9.nix +++ b/pkgs/development/python-modules/pylint/1.9.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildPythonPackage, fetchPypi, astroid, six, isort, mccabe, configparser, backports_functools_lru_cache, singledispatch, - pytest, pytestrunner, pyenchant, setuptools }: + pytest, pytestrunner, setuptools }: buildPythonPackage rec { pname = "pylint"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "004kfapkqxqy2s85pmddqv0fabxdxywxrlbi549p0v237pr2v94p"; }; - checkInputs = [ pytest pytestrunner pyenchant ]; + checkInputs = [ pytest pytestrunner ]; propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch setuptools ]; From 2633167c2b10ae2a01dcb4813b48bc5a6779acd5 Mon Sep 17 00:00:00 2001 From: Dmitry Vyal Date: Fri, 4 Jan 2019 11:53:36 +0300 Subject: [PATCH 2806/3452] added akamaus to maintainers-list --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1830d7087e64..a0dda6f5c431 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -283,6 +283,12 @@ githubId = 273837; name = "Mateusz Czapliński"; }; + akamaus = { + email = "dmitryvyal@gmail.com"; + github = "akamaus"; + githubId = 58955; + name = "Dmitry Vyal"; + }; akaWolf = { email = "akawolf0@gmail.com"; github = "akaWolf"; From 9c86c74cd6d9c4d823fee86d5ce5889dd8320897 Mon Sep 17 00:00:00 2001 From: Dmitry Vyal Date: Sat, 5 Jan 2019 00:20:43 +0300 Subject: [PATCH 2807/3452] pythonPackages.tensorboardx: init at 2.0 --- .../python-modules/tensorboardx/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/tensorboardx/default.nix diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix new file mode 100644 index 000000000000..3c9c9f5c8980 --- /dev/null +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -0,0 +1,32 @@ +{ boto3, buildPythonPackage, crc32c, fetchFromGitHub, lib, matplotlib, moto, + numpy, pillow, pytorch, protobuf, six, pytest, + tensorflow-tensorboard, torchvision }: + +buildPythonPackage rec { + pname = "tensorboardx"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "lanpa"; + repo = "tensorboardX"; + rev = "v${version}"; + sha256 = "0qqalq0fhbx0wnd8wdwhyhkkv2brvj9qbk3373vk3wjxbribf5c7"; + }; + + checkInputs = [ boto3 crc32c matplotlib moto pillow pytorch pytest tensorflow-tensorboard torchvision ]; + + propagatedBuildInputs = [ numpy protobuf six ]; + + postPatch = '' + substituteInPlace tests/test_visdom.py --replace test_TorchVis _skip_test_TorchVis + substituteInPlace tests/test_onnx_graph.py --replace test_onnx_graph _skip_test_onnx_graph + ''; + + meta = with lib; { + description = "Library for writing tensorboard-compatible logs"; + homepage = "https://github.com/lanpa/tensorboard-pytorch"; + license = licenses.mit; + maintainers = with maintainers; [ lebastr akamaus ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47e0317a3f99..4c4275911678 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7238,6 +7238,8 @@ in { suseapi = callPackage ../development/python-modules/suseapi { }; + tensorboardx = callPackage ../development/python-modules/tensorboardx { }; + typed-ast = callPackage ../development/python-modules/typed-ast { }; stripe = callPackage ../development/python-modules/stripe { }; From 7706c657b02fc48ca196eaeaef91221a9a25b80c Mon Sep 17 00:00:00 2001 From: David Sawatzke Date: Sun, 28 Jun 2020 15:29:55 +0200 Subject: [PATCH 2808/3452] maintainers: add david-sawatzke --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e8e2eff26c88..7d35d168350b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1782,6 +1782,12 @@ email = "christoph.senjak@googlemail.com"; name = "Christoph-Simon Senjak"; }; + david-sawatzke = { + email = "d-nix@sawatzke.dev"; + github = "david-sawatzke"; + githubId = 11035569; + name = "David Sawatzke"; + }; david50407 = { email = "me@davy.tw"; github = "david50407"; From a531363179acbc449bfa2433b4b775bfb67d62fd Mon Sep 17 00:00:00 2001 From: David Sawatzke Date: Sun, 28 Jun 2020 15:32:34 +0200 Subject: [PATCH 2809/3452] easypdk: init at 1.2 --- .../tools/misc/easypdkprog/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/misc/easypdkprog/default.nix diff --git a/pkgs/development/tools/misc/easypdkprog/default.nix b/pkgs/development/tools/misc/easypdkprog/default.nix new file mode 100644 index 000000000000..eb8ce5d44b03 --- /dev/null +++ b/pkgs/development/tools/misc/easypdkprog/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "easypdkprog"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "free-pdk"; + repo = "easy-pdk-programmer-software"; + rev = version; + sha256 = "06bn86rd57ff567l0ipx38raih0zll3y16lg5fpn7c601a9jldps"; + }; + + installPhase = '' + install -Dm755 -t $out/bin easypdkprog + '' + lib.optionalString stdenv.isLinux '' + install -Dm644 -t $out/etc/udev/rules.d Linux_udevrules/70-stm32vcp.rules + ''; + + meta = with lib; { + description = "Read, write and execute programs on PADAUK microcontroller"; + homepage = "https://github.com/free-pdk/easy-pdk-programmer-software"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ david-sawatzke ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a11116c96b22..3bb64e749511 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10433,6 +10433,8 @@ in drush = callPackage ../development/tools/misc/drush { }; + easypdkprog = callPackage ../development/tools/misc/easypdkprog { }; + editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; From c00e98b968308d278e1fd51f884f3c0c4ccfb2c1 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sun, 28 Jun 2020 16:11:41 +0200 Subject: [PATCH 2810/3452] libosmium: 2.15.5 -> 2.15.6 --- pkgs/development/libraries/libosmium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index 29edf37d80ef..7e185a7bd8bc 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libosmium"; - version = "2.15.5"; + version = "2.15.6"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "1f21dzzkxzi74hv17fs9kb2w6indqvvm4lkxclz4j4x98k8q3n59"; + sha256 = "0rqy18bbakp41f44y5id9ixh0ar2dby46z17p4115z8k1vv9znq2"; }; nativeBuildInputs = [ cmake ]; From 47e52abe8d0f75fb6132f0cd04f7cd681f219211 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sun, 28 Jun 2020 16:17:25 +0200 Subject: [PATCH 2811/3452] osmium-tool 1.12.0 -> 1.12.1 --- pkgs/applications/misc/osmium-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index c0d20c14f7ce..d5beb9bd5258 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "18afn5qzdjpip176kk5pr04mj0p7dv70dbz1n36qmqnq3gyms10q"; + sha256 = "13142hj8gfgj6w51a62hjzfmzic90xgrnnlnb70hpdqjy86bxv7j"; }; nativeBuildInputs = [ cmake ]; From b7571c9058aebf248ada699f495c4e1a9ab6e0a7 Mon Sep 17 00:00:00 2001 From: Michel Weitbrecht Date: Sun, 28 Jun 2020 01:49:46 +0200 Subject: [PATCH 2812/3452] batsignal: Init at 1.0.0 --- pkgs/applications/misc/batsignal/default.nix | 25 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/misc/batsignal/default.nix diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix new file mode 100644 index 000000000000..624349829684 --- /dev/null +++ b/pkgs/applications/misc/batsignal/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libnotify, pkg-config, glib }: + +stdenv.mkDerivation rec { + pname = "batsignal"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "electrickite"; + repo = "batsignal"; + rev = "${version}"; + sha256 = "wy7YhgKfz07u0bp7rWpze+KmSdooOkmU7giaBX3wWkY="; + }; + + buildInputs = [ libnotify glib ]; + nativeBuildInputs = [ pkg-config ]; + installFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/electrickite/batsignal"; + description = "Lightweight battery daemon written in C"; + license = licenses.isc; + maintainers = with maintainers; [ SlothOfAnarchy ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b382a9a9fe28..fd7a918cd9f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18944,6 +18944,8 @@ in batik = callPackage ../applications/graphics/batik { }; + batsignal = callPackage ../applications/misc/batsignal { }; + baudline = callPackage ../applications/audio/baudline { }; bb = callPackage ../applications/misc/bb { }; From c7f29765fe65770c3800210c91eaef644802bc8a Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 28 Jun 2020 16:17:43 +0100 Subject: [PATCH 2813/3452] age: unstable-2020-03-25 -> v1.0.0-beta4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumping to upstream release from 2020-06-28. This skips 1.0.0-beta3, which was released on the same day and contained a bug. Upstream changelog: 189041b6 (tag: v1.0.0-beta4) age: move package from filippo.io/age/age to filippo.io/age 🤦♂ e6093596 (tag: v1.0.0-beta3) age,agessh,armor: unleash public API 💥🦑 33355dcc internal/age: unexport NewX25519Recipient and NewX25519Identity 9a08b7e6 internal/age,internal/armor: add examples 9b83d948 internal/age: surface format.Recipient as type Stanza c9a35c07 internal/agessh: move EncryptedSSHIdentity out of cmd/age 7d608d12 .github/workflows: add rage interop tests trigger (#125) 6782356e internal/age: add some docs and polish API 08546656 internal/format: fix a nasty bufio.Reader nesting bug 292c3aae internal/agessh: new package b32ea4c1 cmd/age: add a TODO about not dumping decrypted binary to the terminal c7c7f187 internal/armor: new package a7c4274d internal/age: remove EncryptWithArmor and armor support in Decrypt 7088a732 internal/age: unexport SSHFingerprint --- pkgs/tools/security/age/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index c3756b545e3e..429a8689a1ff 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "age"; - version = "unstable-2020-03-25"; + version = "1.0.0-beta4"; goPackagePath = "github.com/FiloSottile/age"; vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m"; @@ -14,8 +14,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; - rev = "f0f8092d60bb96737fa096c29ec6d8adb5810390"; - sha256 = "079kfc8d1pr39hr4qnx48kviyzwg4p8m4pz0bdkypns4aq8ppbfk"; + rev = "v${version}"; + sha256 = "0pp6zn4rdypyxn1md9ppisiwiapkfkbh08rzfl3qwn0998wx6gnb"; }; meta = with lib; { @@ -24,4 +24,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ tazjin ]; }; -} \ No newline at end of file +} From 313b2dc427c68f8403bf3da76011dbca0ba65a3c Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sun, 28 Jun 2020 11:53:28 -0400 Subject: [PATCH 2814/3452] broot: 0.18.0 -> 0.18.1 --- 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 891dbad39d68..354c4b4ddf43 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.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "0b2hggm2ckdzl9f2dn64gdyvd7flpq3szmx69k84f3fimabn7yrm"; + sha256 = "0lmcjc08902h4mi6qx3x2v1xa4w980xvmbrbfm59lis856whaqww"; }; - cargoSha256 = "1bl2y7h72vwi2jvnszd8vna4yc71s9n6kgmlq4ib2cjmzsppqdpa"; + cargoSha256 = "1bgrm6a7p7xl95ljk87g4bxv1insl14yxc895yszr0my3ksmpzqh"; nativeBuildInputs = [ installShellFiles ]; From 14feb9126ee2f257ba31db021a251648060e4e0c Mon Sep 17 00:00:00 2001 From: Pawel Kruszewski Date: Sun, 28 Jun 2020 18:21:37 +0200 Subject: [PATCH 2815/3452] jetbrains.*: 2020.1.1/2/3 -> 2020.1.2/3/5 --- .../editors/jetbrains/default.nix | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index a2bf2cbf1de6..7d5a2f79585f 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -268,12 +268,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0136hmknkxrsgbygxqzrq1836kg02p14hmv5mzbpp79yglhv2xml"; /* updated by script */ + sha256 = "0q5bnb0rmsgks7brrdpgah83s2ixa4pyhw8jvg9p2g48b582rmf7"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -281,12 +281,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2020.1.3"; /* updated by script */ + version = "2020.1.5"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0ivnicpn67mfyhmiwbx80pq5l2xa4g1cpp79mh7rgm2c5klmf201"; /* updated by script */ + sha256 = "0605d772156lzlz5904px2spdijc92yz6rjvmpyg6vk5zv5k2wm9"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -294,12 +294,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0v6vi6m94fwzsg5s357ymh8604zkv6q0zhyqfh9sj4ynzi7l4fyv"; /* updated by script */ + sha256 = "0pqwj4gc23gf10xqciwndimb4ml7djmx8m5rh52c07m77y4aniyn"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -307,12 +307,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0q848swfg9mjiini5bbjdj1f0qpd1n4glxdpncjj7mbpvp7s2h5k"; /* updated by script */ + sha256 = "07gfqyp6blbf7v8p106ngpq7c5p0llcjahi205yg2jgzkhshn7ld"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "13khjc7fp28mpcdn74msdw57nzhicg32xrrvj7s7na2qd9gqz0hf"; /* updated by script */ + sha256 = "13qj8n5daz0z0pjizyfsvbbr1gxp5479ar3a68ygi0vrpmbdbssd"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -346,12 +346,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "16gclbczd9czqhply0xb2ykv0bw4bgv85fihy1n2szc4rp643qdw"; /* updated by script */ + sha256 = "00c8vlp125j56v9g9d4rc5g4dhgvl1bhi6qrzvpaf6x77jbq4fv4"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -359,12 +359,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0p2q01yragab7c15aicpmaby075y7mpf6iavdfipi033q4gnlnki"; /* updated by script */ + sha256 = "1s04b9w7sydix1sjqzmby63nwcvzs6iw28wz7441kxgryl9qg0qw"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -372,12 +372,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1lq97aqnibvg483ww7wi8slh302gydd2kdkw6p2516rjcmm6n324"; /* updated by script */ + sha256 = "1ysj00qbn5ik6i5953b9mln4g456fmn3phdln9m5jmcb0126y235"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -385,12 +385,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2020.1.2"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0flwq61p7827f8nmldqgfpxbfl422imclksw6w97mgzqqhcbgksd"; /* updated by script */ + sha256 = "1zzkd3b5j3q6jqrvibxz33a4fcm7pgqfx91bqjs615v3499ncng7"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -398,12 +398,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0xhx3n2xdk0k0qx7hdiyfga16hjf2j95k219wh7mh0cys20hkrg8"; /* updated by script */ + sha256 = "1ycwml7fyhjajjfy1fhggmx0mcdcjidkxll7357rv2z51r0yhc9h"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -411,12 +411,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.1.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0d543g06bxpw4q2p19vmvrxpbhqsvspjbs3sqnw6hxni7wcflhkg"; /* updated by script */ + sha256 = "1szgiccimfk99z9x1k99lgic6ix81fdahf1k3a88rddl8hhncjwv"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; From 619488c664c6471fe269fe7b173b3a705f79040d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 28 Jun 2020 20:01:07 +0200 Subject: [PATCH 2816/3452] libosmium: run tests --- pkgs/development/libraries/libosmium/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index 7e185a7bd8bc..830465fb113c 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -12,8 +12,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; + buildInputs = [ protozero zlib bzip2 expat boost ]; + doCheck = true; meta = with stdenv.lib; { description = "Fast and flexible C++ library for working with OpenStreetMap data"; From 9893f64b578ecd4cf3a47993798aa3a10f9d2f13 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 28 Jun 2020 14:24:14 -0400 Subject: [PATCH 2817/3452] oh-my-zsh: 2020-06-26 -> 2020-06-28 --- 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 4bea6e2c5f1d..169dd1456f30 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-26"; + version = "2020-06-28"; pname = "oh-my-zsh"; - rev = "6152ac30bede172ba0422a8610dc796948ae1546"; + rev = "97cf0bf4bd7655767e9e5ea27ddb6fbe550a305d"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1kadz2c4lwvp37yw95fly4gc5klzajxsi8x9463xiqj2rrcpd1m3"; + sha256 = "1hynii1nvchnlgyiy0phyz5gd83xcbjdj82ddd2dyl1ci1yvpvqb"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From c54a705ab90b1e22c1a973fcdefde0fabcfb72d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 28 Jun 2020 20:29:48 +0200 Subject: [PATCH 2818/3452] osmium-tools: run tests, install man pages and zsh completions --- .../applications/misc/osmium-tool/default.nix | 35 +++++++++++++++++-- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index d5beb9bd5258..892038c252ae 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -1,4 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, libosmium, protozero, boost, bzip2, zlib, expat }: +{ stdenv +, fetchFromGitHub +, cmake +, installShellFiles +, pandoc +, boost +, bzip2 +, expat +, libosmium +, protozero +, zlib +}: stdenv.mkDerivation rec { pname = "osmium-tool"; @@ -11,8 +22,26 @@ stdenv.mkDerivation rec { sha256 = "13142hj8gfgj6w51a62hjzfmzic90xgrnnlnb70hpdqjy86bxv7j"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libosmium protozero boost bzip2 zlib expat ]; + nativeBuildInputs = [ + cmake + installShellFiles + pandoc + ]; + + buildInputs = [ + boost + bzip2 + expat + libosmium + protozero + zlib + ]; + + doCheck = true; + + postInstall = '' + installShellCompletion --zsh ../zsh_completion/_osmium + ''; meta = with stdenv.lib; { description = "Multipurpose command line tool for working with OpenStreetMap data based on the Osmium library"; From 8557402d9348358af429f868164e453245fd8dae Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 28 Jun 2020 13:52:53 -0500 Subject: [PATCH 2819/3452] mcfly: 0.3.6 -> 0.4.0 --- pkgs/tools/misc/mcfly/default.nix | 13 ++++++------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index f206c54a0037..7feb2fce7107 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -1,27 +1,26 @@ -{ stdenv, rustPlatform, fetchFromGitHub, Security }: +{ stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.3.6"; + version = "0.4.0"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "1g3n7ll0yg7w7hb3jgp25mlnqwsdzv0608f41z7q5gmsskdm3v1j"; + sha256 = "01rw7gdvpr2s3yj7wphsm5gfrgzf5jkrci4mpqiw7xp8d5k87nzl"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - preInstall = '' install -Dm644 -t $out/share/mcfly mcfly.bash + install -Dm644 -t $out/share/mcfly mcfly.zsh ''; - cargoSha256 = "0r2zb59rpja9z7q0gsylqaq4vqm5rp57fy56ajjrm6k6z06nq7bv"; + cargoSha256 = "1q1mi69prn9q1nk4021c69vq160ls6md6gpqxk7zyf25r5ckdd98"; meta = with stdenv.lib; { homepage = "https://github.com/cantino/mcfly"; - description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now."; + description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now"; license = licenses.mit; maintainers = [ maintainers.melkor333 ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 105d34b3d18e..8fb582bfb4e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4734,9 +4734,7 @@ in mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; - mcfly = callPackage ../tools/misc/mcfly { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mcfly = callPackage ../tools/misc/mcfly { }; mdbook = callPackage ../tools/text/mdbook { inherit (darwin.apple_sdk.frameworks) CoreServices; From 0f436ea35845b60ab0eadb3831150f4e1129fa75 Mon Sep 17 00:00:00 2001 From: Dominik Michael Rauh Date: Fri, 26 Jun 2020 09:31:09 +0200 Subject: [PATCH 2820/3452] python3Packages.simpy: add missing dependency --- pkgs/development/python-modules/simpy/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index 2ea72441d105..f718b3655f6f 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -1,21 +1,27 @@ -{ buildPythonPackage, fetchPypi, lib, setuptools_scm, pytestCheckHook }: +{ buildPythonPackage, fetchPypi, isPy27, lib, setuptools, setuptools_scm +, pytestCheckHook }: buildPythonPackage rec { pname = "simpy"; version = "4.0.1"; + disabled = isPy27; + src = fetchPypi { inherit pname version; sha256 = "b36542e2faab612f861c5ef4da17220ac1553f5892b3583c67281dbe4faad404"; }; nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ setuptools ]; + checkInputs = [ pytestCheckHook ]; meta = with lib; { - homepage = "https://simpy.readthedocs.io/en/latest/"; - description = "A process-based discrete-event simulation framework based on standard Python."; + homepage = "https://simpy.readthedocs.io/en/${version}/"; + description = "Process-based discrete-event simulation framework based on standard Python"; license = [ licenses.mit ]; - maintainers = with maintainers; [ shlevy ]; + maintainers = with maintainers; [ dmrauh shlevy ]; }; } From 8a3419d70272d7ca6a9c3850f154c3a1f284065c Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sun, 28 Jun 2020 23:06:36 +0200 Subject: [PATCH 2821/3452] osm2pgsql: 1.2.1 -> 1.2.2 --- pkgs/tools/misc/osm2pgsql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 6137abd92939..af4bf80aac2e 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "osm2pgsql"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "openstreetmap"; repo = pname; rev = version; - sha256 = "1ysan01lpqzjxlq3y2kdminfjs5d9zksicpf9vvzpdk3fzq51fc9"; + sha256 = "1j35aa8qinhavliqi5pdm0viyi7lm5xyk402rliaxxs1r2hbsafn"; }; nativeBuildInputs = [ cmake ]; From cd2fe35267dcc70ec71325c2d1e52a0ef1a4810b Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Wed, 24 Jun 2020 21:11:47 +0100 Subject: [PATCH 2822/3452] nodePackages.purescript-language-server: init at 0.12.9 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 490 ++++++++++-------- 2 files changed, 273 insertions(+), 218 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 75966cbd348c..29dc8755edff 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -142,6 +142,7 @@ , "prettier" , "pscid" , "pulp" +, "purescript-language-server" , "purescript-psa" , "purty" , "react-native-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index ea97dab12677..2b30811e84cc 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -274,6 +274,15 @@ let sha512 = "XAwXOIab51QyhBxnxySdK3nuMEUohhDsHQ5Rbco/V1vjlP75zZ0ZLHD9dTpXTN8uxKxopb2lUvJTq+M4g2Q0HQ=="; }; }; + "@ardatan/aggregate-error-0.0.1" = { + name = "_at_ardatan_slash_aggregate-error"; + packageName = "@ardatan/aggregate-error"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ardatan/aggregate-error/-/aggregate-error-0.0.1.tgz"; + sha512 = "UQ9BequOTIavs0pTHLMwQwKQF8tTV1oezY/H2O9chA+JNPFZSua55xpU5dPSjAU9/jLJ1VwU+HJuTVN8u7S6Fg=="; + }; + }; "@azu/format-text-1.0.1" = { name = "_at_azu_slash_format-text"; packageName = "@azu/format-text"; @@ -1525,40 +1534,40 @@ let sha512 = "Ec3T4Zuo63LwG+RfK2ryz8ChPfncBf8fiSJ1xr68FtLDVznDNulvlNKFbfREE5koWejwsnJrjLCv6IX5IbhExg=="; }; }; - "@graphql-tools/load-6.0.10" = { + "@graphql-tools/load-6.0.11" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "6.0.10"; + version = "6.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.0.10.tgz"; - sha512 = "/Q07DuSvhRTu7iYr+iZDXuXLjQJ/0uZEadjC4uKthD4gX6x4bvV49GLdqka+J1zq02C5U5mAOdDT7+lHIrEBFg=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.0.11.tgz"; + sha512 = "1e7B+dtubEwu9aGZiakOneXnS5y7dyx9ewceZ1MNE7osS6QU8XnDUVm2qtNGHhoyeJJbn66qsRSjwCort2pSeQ=="; }; }; - "@graphql-tools/merge-6.0.10" = { + "@graphql-tools/merge-6.0.11" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.0.10"; + version = "6.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.0.10.tgz"; - sha512 = "fnz9h5vdA8LXc9TvmhnRXykwFZWZ4FdBeo4g3R1KqcQCp65ByCMcBuCJtYf4VxPrcgTLGlWtVOHrItCi0kdioA=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.0.11.tgz"; + sha512 = "jNXl5pOdjfTRm+JKMpD47hsafM44Ojt7oi25Cflydw9VaWlQ5twFUSXk2rydP0mx1Twdxozk9ZCj4qiTdzw9ag=="; }; }; - "@graphql-tools/schema-6.0.10" = { + "@graphql-tools/schema-6.0.11" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "6.0.10"; + version = "6.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.0.10.tgz"; - sha512 = "g8iy36dgf/Cpyz7bHSE2axkE8PdM5VYdS2tntmytLvPaN3Krb8IxBpZBJhmiICwyAAkruQE7OjDfYr8vP8jY4A=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.0.11.tgz"; + sha512 = "Zl9LTwOnkMaNtgs1+LJEYtklywtn602kRbxkRFeA7nFGaDmFPFHZnfQqcLsfhaPA8S0jNCQnbucHERCz8pRUYA=="; }; }; - "@graphql-tools/utils-6.0.10" = { + "@graphql-tools/utils-6.0.11" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "6.0.10"; + version = "6.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.0.10.tgz"; - sha512 = "1s3vBnYUIDLBGEaV1VF3lv1Xq54lT8Oz7tNNypv7K7cv3auKX7idRtjP8RM6hKpGod46JNZgu3NNOshMUEyEyA=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.0.11.tgz"; + sha512 = "BK6HO73FbB/Ufac6XX5H0O2q4tEZi//HaQ7DgmHFoda53GZSZ/ZckJ59wh/tUvHykEaSFUSmMBVQxKbXBhGhyg=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -2947,13 +2956,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.31.3" = { + "@serverless/components-2.31.4" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.31.3"; + version = "2.31.4"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.31.3.tgz"; - sha512 = "bJs0zuJy334N57706RyXzFb2Z6tQULNa0xTEYoS7ZguAXF18MJOVFEha/tjbSGDRSj+pLRyfZ/fbXbDtF0g6Iw=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-2.31.4.tgz"; + sha512 = "aXdEK6dF3AuLmwNwTepmPW0o41QIPUmEG3P4ZNj0x0wixJuREhGZarwHlWsqgqjakZ2oRXraQ2RhuVmRijky3g=="; }; }; "@serverless/core-1.1.2" = { @@ -3001,13 +3010,13 @@ let sha512 = "ww5GBt5QEHYppLH8X+gEFiuMoFu9xdXK0bEROYbuxUliiB0IfXTXLzWR5whhi/S94R7pTnJ4O+WUiFj0PcV/tQ=="; }; }; - "@serverless/platform-client-1.0.1" = { + "@serverless/platform-client-1.0.3" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.0.1.tgz"; - sha512 = "FPFbhLb5nXbHzla8wSQADp+wo3dPAyvkXzGqCwojAWzLwqCczxzEzMpixpLNTbNrDNgYzemvERWj+mnOZ3oNaA=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.0.3.tgz"; + sha512 = "c+KJQLmzGqEK52S98cTZsltvyoNVYMxtYF40KVBWCWTEK9hPO7bNIV79WdB90pBKYTh0sIlHmSlf2dUuOiOxlw=="; }; }; "@serverless/platform-client-china-1.0.20" = { @@ -3037,13 +3046,13 @@ let sha512 = "hcMiX523rkp6kHeKnM1x6/dXEY+d1UFSr901yVKeeCgpFy4u33UI9vlKaPweAZCF6Ahzqywf01IsFTuBVadCrQ=="; }; }; - "@serverless/utils-1.1.0" = { + "@serverless/utils-1.2.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-1.1.0.tgz"; - sha512 = "MZBLphb8Dz9/mGclFQ53INznSFHZAwS2z4H8RZb6UPCqcRhW0SRrdLwLmn9JIqLWH4Zn95LbNsAjmzJ4Dl3CPQ=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-1.2.0.tgz"; + sha512 = "aI/cpGVUhWbJUR8QDMtPue28EU4ViG/L4/XKuZDfAN2uNQv3NRjwEFIBi/cxyfQnMTYVtMLe9wDjuwzOT4ENzA=="; }; }; "@serverless/utils-china-0.1.17" = { @@ -3703,15 +3712,6 @@ let sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; }; }; - "@types/estree-0.0.44" = { - name = "_at_types_slash_estree"; - packageName = "@types/estree"; - version = "0.0.44"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.44.tgz"; - sha512 = "iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g=="; - }; - }; "@types/estree-0.0.45" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; @@ -3838,13 +3838,13 @@ let sha512 = "C7qQUjpMWDUNYQRTXsP5nbYYwCwwgy84yPgoTT7fPN69NH92wLeCtFaMsWeolJD1AF/6uQw3pYt62rzv83sMmw=="; }; }; - "@types/js-yaml-3.12.4" = { + "@types/js-yaml-3.12.5" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; - version = "3.12.4"; + version = "3.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.4.tgz"; - sha512 = "fYMgzN+9e28R81weVN49inn/u798ruU91En1ZnGvSZzCRc5jXx9B2EDhlRaWmcO1RIxFHL8AajRXzxDuJu93+A=="; + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.5.tgz"; + sha512 = "JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww=="; }; }; "@types/json-schema-7.0.5" = { @@ -7321,13 +7321,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.704.0" = { + "aws-sdk-2.706.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.704.0"; + version = "2.706.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.704.0.tgz"; - sha512 = "Cjkc86+9sKNn34iIiMa4MimHmr1xpNQZaPVHnnQCpBuh0p6VMDPloz3xc+4LEyoNuwIBzTRjZCVUePVyc31+gw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.706.0.tgz"; + sha512 = "7GT+yrB5Wb/zOReRdv/Pzkb2Qt+hz6B/8FGMVaoysX3NryHvQUdz7EQWi5yhg9CxOjKxdw5lFwYSs69YlSp1KA=="; }; }; "aws-sign2-0.6.0" = { @@ -8212,13 +8212,13 @@ let sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; }; }; - "binary-extensions-2.0.0" = { + "binary-extensions-2.1.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz"; - sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz"; + sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="; }; }; "binary-search-1.3.6" = { @@ -8959,13 +8959,13 @@ let sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; }; }; - "browserslist-4.12.1" = { + "browserslist-4.12.2" = { name = "browserslist"; packageName = "browserslist"; - version = "4.12.1"; + version = "4.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.12.1.tgz"; - sha512 = "WMjXwFtPskSW1pQUDJRxvRKRkeCr7usN0O/Za76N+F4oadaTdQHotSGcX9jT/Hs7mSKPkyMFNvqawB/1HzYDKQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.12.2.tgz"; + sha512 = "MfZaeYqR8StRZdstAK9hCKDd2StvePCYp5rHzQCPicUjfFliDgmuaBNPHYUTpAywBN8+Wc/d7NYVFkO0aqaBUw=="; }; }; "bser-2.1.1" = { @@ -9706,13 +9706,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001088" = { + "caniuse-lite-1.0.30001089" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001088"; + version = "1.0.30001089"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001088.tgz"; - sha512 = "6eYUrlShRYveyqKG58HcyOfPgh3zb2xqs7NvT2VVtP3hEUeeWvc3lqhpeMTxYWBBeeaT9A4bKsrtjATm66BTHg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001089.tgz"; + sha512 = "RnL5dbdqAfQ5oxHjFUU8uiyJMvTKoXfRn0Asp2R5cpRsyiY5+kLl0fcocQijb0V9XAWFEG/2A/vSswRmpYarmA=="; }; }; "capture-exit-2.0.0" = { @@ -14297,13 +14297,13 @@ let sha512 = "JQtNTBgFY6h8uT6pgph5QpV3IyxDv+z3qPk/FZRDT9TlFfm5dnRtpH39WtQEr1khqsUxVqXzKjZHpdoQvQbllg=="; }; }; - "detective-es6-2.1.0" = { + "detective-es6-2.2.0" = { name = "detective-es6"; packageName = "detective-es6"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective-es6/-/detective-es6-2.1.0.tgz"; - sha512 = "QSHqKGOp/YBIfmIqKXaXeq2rlL+bp3bcIQMfZ+0PvKzRlELSOSZxKRvpxVcxlLuocQv4QnOfuWGniGrmPbz8MQ=="; + url = "https://registry.npmjs.org/detective-es6/-/detective-es6-2.2.0.tgz"; + sha512 = "fSpNY0SLER7/sVgQZ1NxJPwmc9uCTzNgdkQDhAaj8NPYwr7Qji9QBcmbNvtMCnuuOGMuKn3O7jv0An+/WRWJZQ=="; }; }; "detective-less-1.0.2" = { @@ -15395,13 +15395,22 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.481" = { + "ejs-3.1.3" = { + name = "ejs"; + packageName = "ejs"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ejs/-/ejs-3.1.3.tgz"; + sha512 = "wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg=="; + }; + }; + "electron-to-chromium-1.3.483" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.481"; + version = "1.3.483"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.481.tgz"; - sha512 = "q2PeCP2PQXSYadDo9uNY+uHXjdB9PcsUpCVoGlY8TZOPHGlXdevlqW9PkKeqCxn2QBkGB8b6AcMO++gh8X82bA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.483.tgz"; + sha512 = "+05RF8S9rk8S0G8eBCqBRBaRq7+UN3lDs2DAvnG8SBSgQO3hjy0+qt4CmRk5eiuGbTcaicgXfPmBi31a+BD3lg=="; }; }; "elegant-spinner-1.0.1" = { @@ -17511,13 +17520,13 @@ let sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg=="; }; }; - "fd-lock-1.0.2" = { + "fd-lock-1.1.0" = { name = "fd-lock"; packageName = "fd-lock"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fd-lock/-/fd-lock-1.0.2.tgz"; - sha512 = "8O4zSv6rlNNghVfzVkj/p7LUIeBm7Xxk6QnhfmR1WJm/W4kwS8IyShy4X1peRnFUYZUYLlcwEMKXF8QWxJCMvg=="; + url = "https://registry.npmjs.org/fd-lock/-/fd-lock-1.1.0.tgz"; + sha512 = "efuHbyOAfahrNtc91KUz+hpptp+HoFHj9aoUuffW8/5/iBua+pAv9se01VppWVAzCqj7D93KpQEoYyqTq2tYZQ=="; }; }; "fd-read-stream-1.1.0" = { @@ -18141,13 +18150,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.127.0" = { + "flow-parser-0.128.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.127.0"; + version = "0.128.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.127.0.tgz"; - sha512 = "T4T92hVeVtrkYYvU01L2KFANsA0TJQrgy46efIU/JBxDhVjxIdS7KzaBEsPJu7RPOM44FCR7wcFQg6rWtGGrLQ=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.128.0.tgz"; + sha512 = "BOqwccrxdGQjR09H9/YvmgrY6xCyhfRqqZ6HOiDuPBYkSVd5rKamCLs2S4D7Yd0ltwBtnP3rp7vzaBTIJK1+Iw=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -23129,13 +23138,13 @@ let sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; }; }; - "is-my-json-valid-2.20.0" = { + "is-my-json-valid-2.20.1" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.20.0"; + version = "2.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz"; - sha512 = "XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA=="; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.1.tgz"; + sha512 = "KWo8x7CYK5goqyYFJM4ZmapN2DvIGKkx5C1WLHyo2Dcr4R9u4Y9ofpZxn5+LF/d0FHR3AeFcYxVlqIA2OOwuJA=="; }; }; "is-natural-number-4.0.1" = { @@ -23336,13 +23345,13 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; - "is-plain-object-3.0.0" = { + "is-plain-object-3.0.1" = { name = "is-plain-object"; packageName = "is-plain-object"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz"; - sha512 = "tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg=="; + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.1.tgz"; + sha512 = "Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g=="; }; }; "is-posix-bracket-0.1.1" = { @@ -23390,13 +23399,13 @@ let sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; }; }; - "is-reference-1.2.0" = { + "is-reference-1.2.1" = { name = "is-reference"; packageName = "is-reference"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-reference/-/is-reference-1.2.0.tgz"; - sha512 = "ZVxq+5TkOx6GQdnoMm2aRdCKADdcrOWXLGzGT+vIA8DMpqEJaRk5AL1bS80zJ2bjHunVmjdzfCt0e4BymIEqKQ=="; + url = "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz"; + sha512 = "U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ=="; }; }; "is-regex-1.0.5" = { @@ -23876,15 +23885,6 @@ let sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; }; }; - "isobject-4.0.0" = { - name = "isobject"; - packageName = "isobject"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz"; - sha512 = "S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA=="; - }; - }; "isomorphic-fetch-2.2.1" = { name = "isomorphic-fetch"; packageName = "isomorphic-fetch"; @@ -24047,6 +24047,15 @@ let sha512 = "xZ9WvZDWLkZFq7SObpLwu1asMCKCgBRNcDxxGSvK+ZQ7OZyJC5xPlU+rJa4+s/P6autPBVwHpqMGbOERFxWuuA=="; }; }; + "jake-10.8.2" = { + name = "jake"; + packageName = "jake"; + version = "10.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz"; + sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A=="; + }; + }; "java-properties-1.0.2" = { name = "java-properties"; packageName = "java-properties"; @@ -24227,13 +24236,13 @@ let sha512 = "FHs9cS0phsXFXI1waqK/kY9TnyiWmQp65NFu/vMZky1Tef4zIYD3D5qZcBhBkXhAbIFA+fPfmMUUgGKBQWtKlQ=="; }; }; - "js-base64-2.6.1" = { + "js-base64-2.6.2" = { name = "js-base64"; packageName = "js-base64"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-2.6.1.tgz"; - sha512 = "G5x2saUTupU9D/xBY9snJs3TxvwX8EkpLFiYlPpDt/VmMHOXprnSU1nxiTmFbijCX4BLF/cMRIfAcC5BiMYgFQ=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-2.6.2.tgz"; + sha512 = "1hgLrLIrmCgZG+ID3VoLNLOSwjGnoZa8tyrUdEteMeIzsT6PH7PMLyUvbDwzNE56P3PNxyvuIOx4Uh2E5rzQIw=="; }; }; "js-beautify-1.11.0" = { @@ -25551,13 +25560,13 @@ let sha1 = "a4b5244bb6a4c2f723d68a1d64e980c53627d9d4"; }; }; - "level-codec-9.0.1" = { + "level-codec-9.0.2" = { name = "level-codec"; packageName = "level-codec"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/level-codec/-/level-codec-9.0.1.tgz"; - sha512 = "ajFP0kJ+nyq4i6kptSM+mAvJKLOg1X5FiFPtLG9M5gCEZyBmgDi3FkDrvlMkEzrUn1cWxtvVmrvoS4ASyO/q+Q=="; + url = "https://registry.npmjs.org/level-codec/-/level-codec-9.0.2.tgz"; + sha512 = "UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ=="; }; }; "level-concat-iterator-2.0.1" = { @@ -28359,6 +28368,15 @@ let sha512 = "e0WfJAMm8Gv1mP5fEq/Blzy6Lt1VbLg7gNnZmZak7nhrBTibs+c6nQ4SKs/ZyJYHS1mFgDJeopsLAv7Ow0FMFg=="; }; }; + "mem-fs-editor-7.0.1" = { + name = "mem-fs-editor"; + packageName = "mem-fs-editor"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-7.0.1.tgz"; + sha512 = "eD8r4/d2ayp9HHIgBPHB6Ds0ggA8F9cf9HxcNtbqrwqJXfIDrOSMG5K4fV3+Ib3B+HIdrWqkeDDDvrO7i9EbvQ=="; + }; + }; "memfs-3.2.0" = { name = "memfs"; packageName = "memfs"; @@ -29997,15 +30015,6 @@ let sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="; }; }; - "napi-macros-1.8.2" = { - name = "napi-macros"; - packageName = "napi-macros"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/napi-macros/-/napi-macros-1.8.2.tgz"; - sha512 = "Tr0DNY4RzTaBG2W2m3l7ZtFuJChTH6VZhXVhkGGjF/4cZTt+i8GcM9ozD+30Lmr4mDoZ5Xx34t2o4GJqYWDGcg=="; - }; - }; "napi-macros-2.0.0" = { name = "napi-macros"; packageName = "napi-macros"; @@ -34708,13 +34717,13 @@ let sha512 = "MbIXTWwAfJ9qET6Zl29UNwJcDJEEz9Zkr5oDhiujitJa7YBJwEpbkX2cmuklCDxubTMoRWpid3q8DrSyGnUUzQ=="; }; }; - "prebuild-install-5.3.4" = { + "prebuild-install-5.3.5" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "5.3.4"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.4.tgz"; - sha512 = "AkKN+pf4fSEihjapLEEj8n85YIw/tN6BQqkhzbDc0RvEZGdkpJBGMUYx66AAMcPG2KzmPQS7Cm16an4HVBRRMA=="; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.5.tgz"; + sha512 = "YmMO7dph9CYKi5IR/BzjOJlRzpxGGVo1EsLSUZ0mt/Mq0HWZIHOKHHcHdT69yG54C9m6i45GpItwRHpk0Py7Uw=="; }; }; "precinct-6.3.1" = { @@ -38344,13 +38353,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.18.0" = { + "rollup-2.18.1" = { name = "rollup"; packageName = "rollup"; - version = "2.18.0"; + version = "2.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.18.0.tgz"; - sha512 = "LhuQQp3WpnHo3HlKCRrdMXpB6jdLsGOoXXSfMjbv74s5VdV3WZhkYJT0Z6w/EH3UgPH+g/S9T4GJrKW/5iD8TA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.18.1.tgz"; + sha512 = "w4X77ADA+WTGlapC8Z6yggdJtODw3SBl6R2LSkA7ZW5MtdkgcB7sfaSD1UWyx8diXbMcGIb0eI9gCx/dyqOgNQ=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -38767,13 +38776,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-formatter-0.4.9" = { + "sass-formatter-0.4.10" = { name = "sass-formatter"; packageName = "sass-formatter"; - version = "0.4.9"; + version = "0.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.9.tgz"; - sha512 = "cLhpDfJA7H/2RNui7lt7Ndz/LqPYKY7TulCYJWSC2UJW3CuMs76Zr8pusN0zxbd9Rgb5uBiSBMMLlfN2OhftUg=="; + url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.10.tgz"; + sha512 = "PGLPkmVH5D88rglknE+safJvtOG4uYhcNVD4opSDX4Ho5l5fkKmEMU526TPOXgfmpOGxi54lb42gzXfRiT6sZw=="; }; }; "sass-lookup-3.0.0" = { @@ -41143,13 +41152,13 @@ let sha512 = "ifPgPNmDE8EKuuoqtXibwgYNtDZNry7sJL1epSUb3XgQr62bUV31N9R5LHKDsI2kx96OgWRwWY2PfZ7vf/hU8Q=="; }; }; - "ssb-friends-4.1.4" = { + "ssb-friends-4.2.0" = { name = "ssb-friends"; packageName = "ssb-friends"; - version = "4.1.4"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.1.4.tgz"; - sha512 = "rjQP2rLocqnUoiI+SSUehLQwMB4H5TKD13hfnweGVIgAWw4mylbl9bPOuXtTU23ubPkdbSNadlp3uivsCkWLxw=="; + url = "https://registry.npmjs.org/ssb-friends/-/ssb-friends-4.2.0.tgz"; + sha512 = "X8UewxMCZImUoYX9eNHdym6oFcfEA610iuyn2cGcHtYZre1J2WiKtCLBB2KIjwWZqlOs1mARE+mkVPYnduZy4Q=="; }; }; "ssb-git-0.5.0" = { @@ -46346,13 +46355,13 @@ let sha512 = "vRAKaS8WcYNgzbxyH2LdheqgL4sQLis8LXl7r/mN+O4mpWlUpoCsTtietxepLrft2q0TFA2gaIvSWN1iRkzW/w=="; }; }; - "utp-native-2.1.10" = { + "utp-native-2.2.0" = { name = "utp-native"; packageName = "utp-native"; - version = "2.1.10"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-2.1.10.tgz"; - sha512 = "VTjBvb/uE9gYqx2NGVPtAWhqv9itieW+wJceJg5G6Cl/2kBCnHDaFafw3fNgCvii7meTpC4AoZfy6OG0pnuQ/Q=="; + url = "https://registry.npmjs.org/utp-native/-/utp-native-2.2.0.tgz"; + sha512 = "Yx7O/vbgBNnsqEdIrVzST/cF8Tj/JaLUeQEdRbCSKDpSnHEf+kioD0Xspau2OAI/jkZaAxc67/HqLc03Ykf4mQ=="; }; }; "uuid-3.3.2" = { @@ -49164,13 +49173,13 @@ let sha512 = "pLIhhU9z/G+kjOXmJ2bPFm3nejfbH+f1fjYRSOteEXDBrv1EoJE/e+kuHixSXfCYfTkxjYsvRaDX+1QykLCnpQ=="; }; }; - "yeoman-generator-4.10.1" = { + "yeoman-generator-4.11.0" = { name = "yeoman-generator"; packageName = "yeoman-generator"; - version = "4.10.1"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.10.1.tgz"; - sha512 = "QgbtHSaqBAkyJJM0heQUhT63ubCt34NBFMEBydOBUdAuy8RBvGSzeqVBSZOjdh1tSLrwWXlU3Ck6y14awinF6Q=="; + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.11.0.tgz"; + sha512 = "++t6t2Z6HjL5F1/UM7+uNvGknKmQdF8tstJx8WKzsUSEpB+19kLVtapSfQIh9uWqm0L59fLWDzUui//WXoynPw=="; }; }; "yn-3.1.1" = { @@ -50260,7 +50269,7 @@ in }) sources."base64-js-1.3.1" sources."big.js-5.2.2" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bn.js-5.1.2" @@ -51271,7 +51280,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.12.1" + sources."browserslist-4.12.2" sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -51298,7 +51307,7 @@ in sources."callsites-2.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001088" + sources."caniuse-lite-1.0.30001089" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -51481,7 +51490,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.481" + sources."electron-to-chromium-1.3.483" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -51567,7 +51576,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.127.0" + sources."flow-parser-0.128.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -54166,7 +54175,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001088" + sources."caniuse-lite-1.0.30001089" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -54262,7 +54271,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.481" + sources."electron-to-chromium-1.3.483" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -54508,7 +54517,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - sources."js-base64-2.6.1" + sources."js-base64-2.6.2" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."json-parse-better-errors-1.0.2" @@ -55092,10 +55101,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.7.7"; + version = "0.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.7.tgz"; - sha512 = "63CYZlFNOxo18cQVzA00cAiWLrCWRhAA8Rej36GqLS4venGung+U1XGeWeusNTN49BIFYFz/k8FCFVSCDWNoBQ=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.8.tgz"; + sha512 = "u+ts1qfvbVASsgC8DMrF6ba1llKrTwMfRd0otwJUG+LT8D452EdJE29w4ECtvB/T0fr766GdGV8n0JffUgFE9g=="; }; buildInputs = globalBuildInputs; meta = { @@ -55234,7 +55243,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.12.1" + sources."browserslist-4.12.2" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -55242,7 +55251,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001088" + sources."caniuse-lite-1.0.30001089" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -55302,7 +55311,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.481" + sources."electron-to-chromium-1.3.483" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -55966,7 +55975,7 @@ in sources."define-property-1.0.0" ]; }) - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."bootstrap-vue-helper-json-1.1.1" (sources."boxen-3.2.0" // { dependencies = [ @@ -56600,7 +56609,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-formatter-0.4.9" + sources."sass-formatter-0.4.10" sources."sax-1.2.4" sources."semver-5.7.1" sources."semver-diff-2.1.0" @@ -58649,9 +58658,9 @@ in sources."fast-bitfield-1.2.2" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - (sources."fd-lock-1.0.2" // { + (sources."fd-lock-1.1.0" // { dependencies = [ - sources."napi-macros-1.8.2" + sources."node-gyp-build-4.2.2" ]; }) sources."fd-read-stream-1.1.0" @@ -59050,7 +59059,7 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - (sources."utp-native-2.1.10" // { + (sources."utp-native-2.2.0" // { dependencies = [ sources."node-gyp-build-4.2.2" sources."readable-stream-3.6.0" @@ -59163,7 +59172,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.704.0" + sources."aws-sdk-2.706.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.0" sources."base64-js-1.3.1" @@ -60781,7 +60790,7 @@ in sources."is-canonical-base64-1.1.1" sources."is-electron-2.2.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.20.0" + sources."is-my-json-valid-2.20.1" sources."is-property-1.0.2" sources."is-valid-domain-0.0.14" sources."json-buffer-2.0.11" @@ -61244,6 +61253,7 @@ in sha512 = "O3UHyNJ3nYBNfgC+R5hvJPADiZztZHgWoYfdX0vAtXf0yWyqNgtJQzkcY3RufW1Yi+Bq2Yo8ptyYr2i573GPTQ=="; }; dependencies = [ + sources."@ardatan/aggregate-error-0.0.1" sources."@babel/code-frame-7.10.3" sources."@babel/helper-validator-identifier-7.10.3" (sources."@babel/highlight-7.10.3" // { @@ -61287,10 +61297,10 @@ in sources."tslib-1.11.2" ]; }) - sources."@graphql-tools/load-6.0.10" - sources."@graphql-tools/merge-6.0.10" - sources."@graphql-tools/schema-6.0.10" - sources."@graphql-tools/utils-6.0.10" + sources."@graphql-tools/load-6.0.11" + sources."@graphql-tools/merge-6.0.11" + sources."@graphql-tools/schema-6.0.11" + sources."@graphql-tools/utils-6.0.11" sources."@kwsites/exec-p-0.4.0" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -63005,10 +63015,10 @@ in htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; packageName = "htmlhint"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.14.0.tgz"; - sha512 = "vP5tWbFQ2G8j42NxDa9Pklxzxp0GGC31/tZacnJWYYsygZj4zbrwLIT4vzsafN8/lsV77rDTn+3CaixpZGOB8w=="; + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.14.1.tgz"; + sha512 = "VWKrljlwF8tEKH48YPfC30zYKhrsMqm70d7vXswivEqd3DSva8ZlIzfeCa3YWFEFRIIhiXKgKurlqEpCtYMCAA=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -64720,7 +64730,7 @@ in sources."pn-1.1.0" sources."pngjs-2.3.1" sources."posix-character-classes-0.1.1" - sources."prebuild-install-5.3.4" + sources."prebuild-install-5.3.5" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" sources."promise-7.3.1" @@ -65588,7 +65598,7 @@ in sources."base64-arraybuffer-0.1.5" sources."base64id-2.0.0" sources."better-assert-1.0.2" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."blob-0.0.5" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" @@ -66232,8 +66242,7 @@ in sources."@octokit/auth-token-2.4.2" (sources."@octokit/endpoint-6.0.3" // { dependencies = [ - sources."is-plain-object-3.0.0" - sources."isobject-4.0.0" + sources."is-plain-object-3.0.1" sources."universal-user-agent-5.0.0" ]; }) @@ -66252,8 +66261,7 @@ in (sources."@octokit/request-5.4.5" // { dependencies = [ sources."@octokit/request-error-2.0.2" - sources."is-plain-object-3.0.0" - sources."isobject-4.0.0" + sources."is-plain-object-3.0.1" sources."universal-user-agent-5.0.0" ]; }) @@ -68343,7 +68351,7 @@ in sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."bindings-1.5.0" (sources."bl-4.0.2" // { dependencies = [ @@ -68386,7 +68394,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.12.1" + sources."browserslist-4.12.2" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" @@ -68401,7 +68409,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001088" + sources."caniuse-lite-1.0.30001089" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -68523,7 +68531,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.481" + sources."electron-to-chromium-1.3.483" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -68705,11 +68713,7 @@ in ]; }) sources."is-plain-object-2.0.4" - (sources."is-reference-1.2.0" // { - dependencies = [ - sources."@types/estree-0.0.44" - ]; - }) + sources."is-reference-1.2.1" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" @@ -70150,7 +70154,7 @@ in sources."argparse-1.0.10" sources."array.prototype.map-1.0.2" sources."balanced-match-1.0.0" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" @@ -71645,7 +71649,7 @@ in sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."balanced-match-1.0.0" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."boxen-4.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -72602,7 +72606,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.12.1" + sources."browserslist-4.12.2" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -72619,7 +72623,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001088" + sources."caniuse-lite-1.0.30001089" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -72760,7 +72764,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.481" + sources."electron-to-chromium-1.3.483" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -74388,7 +74392,7 @@ in sources."argparse-1.0.10" sources."array-union-2.1.0" sources."at-least-node-1.0.0" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."braces-3.0.2" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -74840,6 +74844,37 @@ in bypassCache = true; reconstructLock = true; }; + purescript-language-server = nodeEnv.buildNodePackage { + name = "purescript-language-server"; + packageName = "purescript-language-server"; + version = "0.12.9"; + src = fetchurl { + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.12.9.tgz"; + sha512 = "ZbpfltBmRQYx69Gtpx1FnMhvR7Gl0wJFyMmyvuC6nMJC+ysXFdE/eNqGncODPhQUdMoYwCRFGETAY7UC6qxyTQ=="; + }; + dependencies = [ + sources."isexe-2.0.0" + sources."vscode-jsonrpc-4.0.0" + (sources."vscode-languageserver-5.2.1" // { + dependencies = [ + sources."vscode-uri-1.0.8" + ]; + }) + sources."vscode-languageserver-protocol-3.14.1" + sources."vscode-languageserver-types-3.14.0" + sources."vscode-uri-2.1.2" + sources."which-2.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Language Server Protocol server for PureScript wrapping purs ide server functionality"; + homepage = https://github.com/nwolverson/purescript-language-server; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; purescript-psa = nodeEnv.buildNodePackage { name = "purescript-psa"; packageName = "purescript-psa"; @@ -75049,10 +75084,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.18.0"; + version = "2.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.18.0.tgz"; - sha512 = "LhuQQp3WpnHo3HlKCRrdMXpB6jdLsGOoXXSfMjbv74s5VdV3WZhkYJT0Z6w/EH3UgPH+g/S9T4GJrKW/5iD8TA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.18.1.tgz"; + sha512 = "w4X77ADA+WTGlapC8Z6yggdJtODw3SBl6R2LSkA7ZW5MtdkgcB7sfaSD1UWyx8diXbMcGIb0eI9gCx/dyqOgNQ=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -75119,7 +75154,7 @@ in sources."asynckit-0.4.0" sources."azure-devops-node-api-7.2.0" sources."balanced-match-1.0.0" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -75251,11 +75286,7 @@ in sources."is-glob-4.0.1" sources."is-module-1.0.0" sources."is-number-7.0.0" - (sources."is-reference-1.2.0" // { - dependencies = [ - sources."@types/estree-0.0.44" - ]; - }) + sources."is-reference-1.2.1" sources."is-regex-1.1.0" sources."is-symbol-1.0.3" sources."isexe-2.0.0" @@ -75349,7 +75380,7 @@ in sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.18.0" + sources."rollup-2.18.1" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."set-blocking-2.0.0" @@ -75696,10 +75727,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.73.1"; + version = "1.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.73.1.tgz"; - sha512 = "8cBSUS8uGzI9/mYJqWfLsx/byIfUlpZS2gXpUP5yXu6rRuBpLAsg1V02rzjK+48t+3Sv5+qZCk1XRGbzoUTVGg=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.74.0.tgz"; + sha512 = "aTnGVxGJ3J5hMFlHFUorhqOkshN933ZclRcJe7C9JGJ8ot7KDAmudRgvOB2/jzHL2t6LoutpTmCuyNllxy8ESA=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -75720,7 +75751,7 @@ in sources."@protobufjs/utf8-1.1.0" sources."@serverless/cli-1.5.1" sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-2.31.3" // { + (sources."@serverless/components-2.31.4" // { dependencies = [ sources."globby-10.0.2" sources."semver-7.3.2" @@ -75738,7 +75769,7 @@ in }) sources."@serverless/event-mocks-1.1.1" sources."@serverless/inquirer-1.1.2" - sources."@serverless/platform-client-1.0.1" + sources."@serverless/platform-client-1.0.3" (sources."@serverless/platform-client-china-1.0.20" // { dependencies = [ sources."archiver-4.0.1" @@ -75753,7 +75784,7 @@ in ]; }) sources."@serverless/template-1.1.3" - sources."@serverless/utils-1.1.0" + sources."@serverless/utils-1.2.0" sources."@serverless/utils-china-0.1.17" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -75831,7 +75862,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.704.0" // { + (sources."aws-sdk-2.706.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -75852,7 +75883,7 @@ in sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."bl-4.0.2" sources."blob-0.0.5" sources."bluebird-3.7.2" @@ -76023,7 +76054,7 @@ in sources."dependency-tree-7.2.1" sources."detective-amd-3.0.0" sources."detective-cjs-3.1.1" - sources."detective-es6-2.1.0" + sources."detective-es6-2.2.0" sources."detective-less-1.0.2" sources."detective-postcss-3.0.1" sources."detective-sass-3.0.1" @@ -77440,10 +77471,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.348.2"; + version = "1.349.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.348.2.tgz"; - sha512 = "we1krlo7ekb3iLIz3gaPw5hWGaWhYzBb90QZfWuvUrHMKB6jlL1imOajsIF6zrlFQ124TYjW0JzCzH2BMw45Mw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.349.0.tgz"; + sha512 = "2gE31HJ42H2gYDci9WB+f1GOTNLQXIcO5jm7i8sw+Xpfce3FYYH3s0oCecnrDHV3qOXbr6Qa5MtL0bwWmOA3fg=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -77493,7 +77524,7 @@ in sources."@types/color-name-1.1.1" sources."@types/debug-4.1.5" sources."@types/hosted-git-info-2.7.0" - sources."@types/js-yaml-3.12.4" + sources."@types/js-yaml-3.12.5" sources."@types/node-14.0.14" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.5" @@ -78562,7 +78593,7 @@ in sources."kind-of-3.2.2" sources."layered-graph-1.1.3" sources."level-5.0.1" - sources."level-codec-9.0.1" + sources."level-codec-9.0.2" sources."level-concat-iterator-2.0.1" sources."level-errors-2.0.1" (sources."level-iterator-stream-4.0.2" // { @@ -78940,7 +78971,7 @@ in ]; }) sources."ssb-ebt-5.6.7" - sources."ssb-friends-4.1.4" + sources."ssb-friends-4.2.0" (sources."ssb-gossip-1.1.1" // { dependencies = [ sources."atomic-file-1.1.5" @@ -79169,7 +79200,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.704.0" // { + (sources."aws-sdk-2.706.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -79426,7 +79457,7 @@ in }) sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" - sources."is-my-json-valid-2.20.0" + sources."is-my-json-valid-2.20.1" sources."is-promise-2.2.2" sources."is-property-1.0.2" sources."is-regex-1.1.0" @@ -79438,7 +79469,7 @@ in sources."isstream-0.1.2" sources."jmespath-0.15.0" sources."jpeg-turbo-0.4.0" - sources."js-base64-2.6.1" + sources."js-base64-2.6.2" sources."js-stringify-1.0.2" sources."js-yaml-3.2.7" sources."jsbn-0.1.1" @@ -82211,10 +82242,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.118.1"; + version = "0.118.3"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.118.1.tgz"; - sha512 = "NYziIWAJg1ON5YJosT4eWCe/kmEOXC9pMJjqwsVtfIMrlP5qqassS0y99zs9INJUYtmxLsrNCdi9FzUWBKE6XQ=="; + url = "https://registry.npmjs.org/three/-/three-0.118.3.tgz"; + sha512 = "ijECXrNzDkHieoeh2H69kgawTGH8DiamhR4uBN8jEM7VHSKvfTdEvOoHsA8Aq7dh7PHAxhlqBsN5arBI3KixSw=="; }; buildInputs = globalBuildInputs; meta = { @@ -83472,7 +83503,7 @@ in sources."define-property-1.0.0" ]; }) - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."bootstrap-vue-helper-json-1.1.1" (sources."boxen-3.2.0" // { dependencies = [ @@ -85431,7 +85462,7 @@ in }) sources."base64-js-1.3.1" sources."big.js-5.2.2" - sources."binary-extensions-2.0.0" + sources."binary-extensions-2.1.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bn.js-5.1.2" @@ -87553,6 +87584,7 @@ in sources."fast-glob-2.2.7" sources."fast-json-stable-stringify-2.1.0" sources."figures-2.0.0" + sources."filelist-1.0.1" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -87694,6 +87726,11 @@ in sources."isstream-0.1.2" sources."istextorbinary-2.6.0" sources."isurl-1.0.0" + (sources."jake-10.8.2" // { + dependencies = [ + sources."async-0.9.2" + ]; + }) sources."js-tokens-4.0.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" @@ -88219,25 +88256,42 @@ in sources."which-2.0.2" ]; }) - (sources."yeoman-generator-4.10.1" // { + (sources."yeoman-generator-4.11.0" // { dependencies = [ sources."debug-4.2.0" sources."diff-4.0.2" + sources."dir-glob-2.2.2" + sources."ejs-3.1.3" sources."find-up-3.0.0" + sources."globby-9.2.0" + sources."ignore-4.0.6" sources."locate-path-3.0.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; }) + (sources."mem-fs-editor-7.0.1" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) + sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."parse-json-5.0.0" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."pify-4.0.1" sources."read-pkg-5.2.0" sources."read-pkg-up-5.0.0" sources."semver-7.3.2" + sources."slash-2.0.0" sources."type-fest-0.6.0" ]; }) From 056b0df2b614893b15dd696e74d093f6c58590a0 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Mon, 29 Jun 2020 00:19:38 +0200 Subject: [PATCH 2823/3452] osm2pgsql: reformat with nixpkgs-fmt --- pkgs/tools/misc/osm2pgsql/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 6137abd92939..c7bd00aedbae 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -1,5 +1,16 @@ -{ stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql -, withLuaJIT ? false, lua, luajit }: +{ stdenv +, fetchFromGitHub +, cmake +, expat +, proj +, bzip2 +, zlib +, boost +, postgresql +, withLuaJIT ? false +, lua +, luajit +}: stdenv.mkDerivation rec { pname = "osm2pgsql"; From 293fe13b9edbe1139cff0d79dab75e6bbbb08ded Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Jun 2020 02:30:25 +0200 Subject: [PATCH 2824/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-7-g30d5c33 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/c8cae095dd5a2610f97b359fd1e5e4bc0da5817a. --- .../haskell-modules/hackage-packages.nix | 692 +++++++++++++++--- 1 file changed, 585 insertions(+), 107 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 59f3d67a031f..b0feb383179c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -47066,8 +47066,6 @@ self: { ]; description = "A command line program for managing the dependency versions in a cabal file"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cabal-build-programs" = callPackage @@ -47222,6 +47220,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-debian_5_0_3" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal + , containers, data-default, debian, deepseq, Diff, directory + , exceptions, filepath, hsemail, HUnit, lens, mtl, network-uri + , newtype-generics, optparse-applicative, parsec, pretty, process + , pureMD5, regex-tdfa, syb, text, unix, unliftio, utf8-string + }: + mkDerivation { + pname = "cabal-debian"; + version = "5.0.3"; + sha256 = "11imbizfa65fdqydpxvcdv0a80gsd6szzl33b312myw3il2xr5hi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bifunctors Cabal containers data-default debian + deepseq Diff directory exceptions filepath hsemail HUnit lens mtl + network-uri newtype-generics optparse-applicative parsec pretty + process pureMD5 regex-tdfa syb text unix unliftio utf8-string + ]; + executableHaskellDepends = [ base Cabal debian lens mtl pretty ]; + description = "Create a Debianization for a Cabal package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-dependency-licenses" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { @@ -47620,8 +47643,6 @@ self: { ]; description = "Lenses and traversals for the Cabal library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cabal-macosx" = callPackage @@ -47793,6 +47814,28 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "cabal-rpm_2_0_6" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, extra + , filepath, http-client, http-client-tls, http-conduit + , optparse-applicative, process, simple-cabal, simple-cmd + , simple-cmd-args, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "2.0.6"; + sha256 = "1f27arazgv65ripbcjirs4hl5ywr7a7s0vcr5s7jd7176h8dr35b"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal directory extra filepath http-client + http-client-tls http-conduit optparse-applicative process + simple-cabal simple-cmd simple-cmd-args time unix + ]; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -48705,25 +48748,25 @@ self: { , concurrent-extra, containers, data-default-class, data-flags , deepseq, deque, df1, di-polysemy, exceptions, fmt, focus , generic-lens, generic-override, generic-override-aeson, hashable - , http-date, http-types, lens, lens-aeson, megaparsec, mtl - , polysemy, polysemy-plugin, reflection, safe-exceptions + , http-date, http-types, lens, lens-aeson, megaparsec, mime-types + , mtl, polysemy, polysemy-plugin, reflection, safe-exceptions , scientific, stm, stm-chans, stm-containers, text, text-show, time , typerep-map, unagi-chan, unordered-containers, vector, websockets - , wreq-patchable, wuss + , wreq, wuss }: mkDerivation { pname = "calamity"; - version = "0.1.16.0"; - sha256 = "1gq8pbb9vag8xcq95a6f332g607mgfb93c5mjaivrqp38m0z3nv0"; + version = "0.1.17.0"; + sha256 = "1nnprsc73h6zmmaz49y6msx5fh0qz85mlk3c62y8fqggbhl3xdfs"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers data-default-class data-flags deepseq deque df1 di-polysemy exceptions fmt focus generic-lens generic-override generic-override-aeson hashable http-date http-types lens - lens-aeson megaparsec mtl polysemy polysemy-plugin reflection - safe-exceptions scientific stm stm-chans stm-containers text - text-show time typerep-map unagi-chan unordered-containers vector - websockets wreq-patchable wuss + lens-aeson megaparsec mime-types mtl polysemy polysemy-plugin + reflection safe-exceptions scientific stm stm-chans stm-containers + text text-show time typerep-map unagi-chan unordered-containers + vector websockets wreq wuss ]; description = "A library for writing discord bots in haskell"; license = stdenv.lib.licenses.mit; @@ -52961,6 +53004,8 @@ self: { pname = "cipher-aes128"; version = "0.7.0.5"; sha256 = "1bafr5aa9mjfzdgc6gwapvb9g04pyh4lwhv2x2m1v3ljjglg9d1w"; + revision = "1"; + editedCabalFile = "0miqp8jvgsqkgj5rxb2vjwa24ac5kdyy3b2cwxb9z0wk1ixk5ilm"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; @@ -94513,8 +94558,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "GCode processor"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ sorki ]; }) {}; "gconf" = callPackage @@ -98655,6 +98699,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) atk;}; + "gi-atk_2_0_22" = callPackage + ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers + }: + mkDerivation { + pname = "gi-atk"; + version = "2.0.22"; + sha256 = "1jx0wy3a0vzclqpysks3nllvm2163svll1iakh3ar7njba7ihq2x"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ atk ]; + description = "Atk bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) atk;}; + "gi-cairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -98678,6 +98742,30 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo;}; + "gi-cairo_1_0_24" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-cairo"; + version = "1.0.24"; + sha256 = "1g8dvfhsncigi4xrdydp8bxjrcajk1794xb24wpvqpnnbmmykpwk"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo ]; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + description = "Cairo bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) cairo;}; + "gi-cairo-again" = callPackage ({ mkDerivation, base, cairo-core, haskell-gi-base , template-haskell @@ -98748,6 +98836,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) libdbusmenu;}; + "gi-dbusmenu_0_4_8" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , libdbusmenu, text, transformers + }: + mkDerivation { + pname = "gi-dbusmenu"; + version = "0.4.8"; + sha256 = "15nvfap39ayw34282br4rch1aias0m1sbapc0nkla8h5ip2naqi6"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ libdbusmenu ]; + description = "Dbusmenu bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libdbusmenu;}; + "gi-dbusmenugtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk @@ -98772,6 +98880,31 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; + "gi-dbusmenugtk3_0_4_9" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk + , gtk3, haskell-gi, haskell-gi-base, haskell-gi-overloading + , libdbusmenu-gtk3, text, transformers + }: + mkDerivation { + pname = "gi-dbusmenugtk3"; + version = "0.4.9"; + sha256 = "1cni5368ldyblwh0jr6wva8fhi3574d258xzw49prwbjxngmjiv0"; + setupHaskellDepends = [ + base Cabal gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf gi-glib + gi-gobject gi-gtk haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf + gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; + description = "DbusmenuGtk bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; + "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 @@ -98796,7 +98929,7 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; - "gi-gdk_4_0_1" = callPackage + "gi-gdk_4_0_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk4 , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -98804,8 +98937,8 @@ self: { }: mkDerivation { pname = "gi-gdk"; - version = "4.0.1"; - sha256 = "1b2azv7c3c9ni9f258ag2cxy97sh8ax78v0hym0gpvrky741vqwq"; + version = "4.0.2"; + sha256 = "0271n81jqwcl7g0li4yv6x42jkcmx4cjs2b6b60g1mz0qq8klhbn"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -98842,6 +98975,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gdk-pixbuf;}; + "gi-gdkpixbuf_2_0_24" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf + , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gdkpixbuf"; + version = "2.0.24"; + sha256 = "00hgfyln0pqx4fmffc24mx818y1lladfc288qq0f03345p5dnbna"; + setupHaskellDepends = [ + base Cabal gi-gio gi-glib gi-gobject haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gdk-pixbuf ]; + description = "GdkPixbuf bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gdk-pixbuf;}; + "gi-gdkx11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi @@ -98864,15 +99019,15 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; - "gi-gdkx11_4_0_1" = callPackage + "gi-gdkx11_4_0_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk4-x11, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gdkx11"; - version = "4.0.1"; - sha256 = "1z7d8vs4l1gzm0nbi0ir2q76jcc9s685s2nhbfflyjsvclr91spm"; + version = "4.0.2"; + sha256 = "1z510v5p515i2fyd5kjxcfnyf5lsd0kzgzsnnqw4km186b241fc5"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi ]; @@ -98894,8 +99049,8 @@ self: { }: mkDerivation { pname = "gi-ggit"; - version = "1.0.8"; - sha256 = "151qgcwp2spa957nr3jdb9ac35f1r1gyi2d5vzgxy8xzc3993wmq"; + version = "1.0.9"; + sha256 = "0qvmppdby40ncd9alnnk8ang90qcaj00c0g0nrq0s0m1ynar8ccd"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -98927,6 +99082,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-gio_2_0_27" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, glib, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gio"; + version = "2.0.27"; + sha256 = "08qc0ahj0qmmibf92m48hv8q2x47q83c6j9a49h11dyc8l4nclx6"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "Gio bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-girepository" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base @@ -98934,8 +99109,8 @@ self: { }: mkDerivation { pname = "gi-girepository"; - version = "1.0.22"; - sha256 = "1m7gnam8a46zbbnxgcszv1wn8zgzdrpki6k3fgy5xjnb4gp5pvpj"; + version = "1.0.23"; + sha256 = "0a8sis3zayiywi7mgs1g4p7nr9szv392j7bimq5nvva04lj6sdzc"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -98965,6 +99140,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-glib_2_0_24" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-glib"; + version = "2.0.24"; + sha256 = "0zrajclbjbq6d6pyvz3s0kjq997w7j8nghi3i89l8fjw16gbmjxn"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GLib bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gobject" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -98984,6 +99179,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-gobject_2_0_23" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gobject"; + version = "2.0.23"; + sha256 = "15wkma8akcy50c2xiiwlc4zm5k1v4vnrk3mhn3bbz1rdfbdhvr9v"; + setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GObject bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-graphene" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base @@ -99005,6 +99220,27 @@ self: { broken = true; }) {graphene-gobject = null;}; + "gi-graphene_1_0_2" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-graphene"; + version = "1.0.2"; + sha256 = "1mszvx58mdazy8202s0c05hp800b92n21g4rxwvp5k0ms7qz95nq"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ graphene-gobject ]; + description = "Graphene bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {graphene-gobject = null;}; + "gi-gsk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-glib, gi-gobject, gi-graphene, gi-pango, gtk4 @@ -99013,8 +99249,8 @@ self: { }: mkDerivation { pname = "gi-gsk"; - version = "4.0.1"; - sha256 = "0645dyifg6d3x03zrzf2andfah32s878rcyqzw891prn2dvga3nx"; + version = "4.0.2"; + sha256 = "1jc5jxni87zg475rgjrxv85rpyr20bwxdyfjw060dx4gvnyhxnfs"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdk gi-glib gi-gobject gi-graphene gi-pango haskell-gi @@ -99038,8 +99274,8 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.22"; - sha256 = "0qicgvy9wm1xs5y6fda8sxdilwfg2y6albdqy3jg2n5qn7c9p0f6"; + version = "1.0.23"; + sha256 = "0w4xscgd49d6d00gvsqc210r63c0wj748dqa5ypppr4mzllsm0qv"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -99057,8 +99293,8 @@ self: { }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.21"; - sha256 = "0zrcplkd0hfdfvwq7gbg8wyvsk2an8k5yj342adq1ar0zgfh064n"; + version = "1.0.22"; + sha256 = "17x0nmzawr9mqfjjbgk9s35102y4nsvxym9hwgwhh88ijnbhshhs"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -99078,8 +99314,8 @@ self: { }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.22"; - sha256 = "1y7hf5kcm4kj185glb298zr6x39m61hvqrdwskk9043nrd8ifcxx"; + version = "1.0.23"; + sha256 = "0im25z9pf9j0cxj0b6lbbr3lis9kbvzzvzns65cmargbh1018959"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst haskell-gi ]; @@ -99100,8 +99336,8 @@ self: { }: mkDerivation { pname = "gi-gstpbutils"; - version = "1.0.21"; - sha256 = "15kg01g8cgaw98khf6nrr9sjbfss3a3d43g9zgbbv5h5qnzvjazb"; + version = "1.0.22"; + sha256 = "1kq86zc9rcla6xhgi0vf32y6bs3adi5xgkpknld6zl4dq7s70plk"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstaudio gi-gsttag gi-gstvideo haskell-gi @@ -99125,8 +99361,8 @@ self: { }: mkDerivation { pname = "gi-gsttag"; - version = "1.0.21"; - sha256 = "061xy3vx41pgyyg6mcbc7saj50n5zwfc72l8dw54kgv09vykp7ji"; + version = "1.0.22"; + sha256 = "0jpqj5kggg2ahvbrnmacjk6n9zg31v0klybkygz4i6i4d6absvf6"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -99148,8 +99384,8 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.22"; - sha256 = "0fr9pfcfsjajl5cd6p05a4kp83acmllzzdm0kc2nxnr0kmjifi5v"; + version = "1.0.23"; + sha256 = "1kb09kal08x7nznc0g8c2n9jfijapdndbnsfs5cvz0p9smvd092i"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject gi-gst gi-gstbase haskell-gi ]; @@ -99186,7 +99422,7 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; - "gi-gtk_4_0_1" = callPackage + "gi-gtk_4_0_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-graphene, gi-gsk, gi-pango, gtk4, haskell-gi, haskell-gi-base @@ -99194,8 +99430,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "4.0.1"; - sha256 = "1brn4pyjvnc00bwqwf3d77dhbiknak5yjqs9xyk9mknw2pb98ppv"; + version = "4.0.2"; + sha256 = "1lmbb3q4f73f7yihnl4qjv7qvzrys3jqsh3dg9wwdg9bxg900ghp"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-graphene gi-gsk gi-pango haskell-gi @@ -99270,6 +99506,24 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {}; + "gi-gtk-hs_0_3_9" = callPackage + ({ mkDerivation, base, base-compat, containers, gi-gdk + , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl + , text, transformers + }: + mkDerivation { + pname = "gi-gtk-hs"; + version = "0.3.9"; + sha256 = "1ql14ripivfh1w65wnr6mw64f2vlwi54gz70c8qql9f5szbnjky1"; + libraryHaskellDepends = [ + base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject + gi-gtk haskell-gi-base mtl text transformers + ]; + description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gi-gtkosxapplication" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi @@ -99301,8 +99555,8 @@ self: { }: mkDerivation { pname = "gi-gtksource"; - version = "3.0.22"; - sha256 = "08b3ffjdgyr5xapx37kkwx3z8fsd42ydvdwk3nvh2ysfq9q86cjh"; + version = "3.0.23"; + sha256 = "13rsxjbl62q8zhwqr8jm2fh5njzfa86izqwag4d6aw8xi71wqfrn"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -99319,22 +99573,22 @@ self: { "gi-handy" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, haskell-gi + , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-pango, haskell-gi , haskell-gi-base, haskell-gi-overloading, libhandy, text , transformers }: mkDerivation { pname = "gi-handy"; - version = "0.0.6"; - sha256 = "134dspf2vhwl76g25mjjj3gmdis748qg3rschmypd9w4zr2l651w"; + version = "0.0.7"; + sha256 = "0vdmby4wzxzhy9cbpi6i29r2ywq75ndcjpra3nvkavp91ba1y1c1"; setupHaskellDepends = [ - base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk + base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject - gi-gtk haskell-gi haskell-gi-base haskell-gi-overloading text - transformers + gi-gtk gi-pango haskell-gi haskell-gi-base haskell-gi-overloading + text transformers ]; libraryPkgconfigDepends = [ libhandy ]; description = "libhandy bindings"; @@ -99343,6 +99597,25 @@ self: { broken = true; }) {inherit (pkgs) libhandy;}; + "gi-harfbuzz" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, harfbuzz, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-harfbuzz"; + version = "0.0.1"; + sha256 = "1haxa993mi1x6z2hpbv09ybrfl0i5ha5wb0cfv8wg1v461wajfxp"; + setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ harfbuzz ]; + description = "HarfBuzz bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) harfbuzz;}; + "gi-ibus" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -99350,8 +99623,8 @@ self: { }: mkDerivation { pname = "gi-ibus"; - version = "1.5.1"; - sha256 = "1dvybzgckpqyvh9ivaq22x9i8paafglh3pmr4lk6i7zjlamw8kxv"; + version = "1.5.2"; + sha256 = "14chw0qhzdxixsqsn2ra31z561kn2zclk15b7hfpfzayqr6dqci1"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -99373,8 +99646,8 @@ self: { }: mkDerivation { pname = "gi-javascriptcore"; - version = "4.0.21"; - sha256 = "0zl2lanysqir9qhndai7v4yp6sq671115mi5k9q58rwkmvkm6w04"; + version = "4.0.22"; + sha256 = "191ipwjxn94dxz6saapidvjr8bbnl0y3p4f10s6mj6h6pkb5axjb"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -99393,8 +99666,8 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.21"; - sha256 = "13ifi60jlfm9jypf6gam224s5rgq2kd1cj98wfl1dg9crahghbls"; + version = "0.7.22"; + sha256 = "0j5cxx9dsxh2wafw4xa7yasr6n98h2qwpm1y08nm7m6i0kwrksap"; setupHaskellDepends = [ base Cabal gi-gdkpixbuf gi-glib gi-gobject haskell-gi ]; @@ -99414,8 +99687,8 @@ self: { }: mkDerivation { pname = "gi-ostree"; - version = "1.0.12"; - sha256 = "0j7nd4ylz4whnsdfbn6ra7kvvnx6l6bqv2y57rgk1nnac3cc6201"; + version = "1.0.13"; + sha256 = "07k02mffidw18f104crmhayr5nf3v5xcldc8fbmxdinp7wik5c7f"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -99452,6 +99725,32 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; + "gi-pango_1_0_23" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , gi-glib, gi-gobject, gi-harfbuzz, haskell-gi, haskell-gi-base + , haskell-gi-overloading, pango, text, transformers + }: + mkDerivation { + pname = "gi-pango"; + version = "1.0.23"; + sha256 = "18pp83nzqdxzq15g3rm0xym4hdq3f851m6mshlb4f7liy168vpl9"; + setupHaskellDepends = [ + base Cabal gi-glib gi-gobject gi-harfbuzz haskell-gi + ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject gi-harfbuzz + haskell-gi haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo pango ]; + preCompileBuildDriver = '' + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" + ''; + description = "Pango bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; + "gi-pangocairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi @@ -99460,8 +99759,8 @@ self: { }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.23"; - sha256 = "0la2ga1hprwm4fnia48y0q1cg8il0aq42nwvaj5gndx6id42a1i6"; + version = "1.0.24"; + sha256 = "1yya5gsqrkagmm33rsasshlj691nmax47fqdn1p2rnf4aqx1jcqr"; setupHaskellDepends = [ base Cabal gi-cairo gi-glib gi-gobject gi-pango haskell-gi ]; @@ -99485,8 +99784,8 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.22"; - sha256 = "0bqmkijnmxi4k30nbn8zsx03i9y7mlp06ikmd2dbxj22lyazqjz4"; + version = "0.18.23"; + sha256 = "0dn6qnsrgnvbz9nbv0ig9hyjmswrq6v3z1bcnf0pybcdwr8j1zrw"; setupHaskellDepends = [ base Cabal gi-cairo gi-gio gi-glib gi-gobject haskell-gi ]; @@ -99508,8 +99807,8 @@ self: { }: mkDerivation { pname = "gi-secret"; - version = "0.0.11"; - sha256 = "1s3vwy0aff4m1rvkbcvfa4zwbbalaiz46ij3ymmsx319v2mwwiib"; + version = "0.0.12"; + sha256 = "19mr7mvay2slm5k6afqj0hhy4ddh0advrb5dyzqi75xysx7xagm8"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -99531,8 +99830,8 @@ self: { }: mkDerivation { pname = "gi-soup"; - version = "2.4.22"; - sha256 = "0vgvcq9nysw9xfyjddi1qzngw7pfrfx4g1f3zngf56jcvxf8q6rw"; + version = "2.4.23"; + sha256 = "109n57ff69xmwhm3lvf0ajid3zl0l9sr1qdnvis06bhcddw9i1ap"; setupHaskellDepends = [ base Cabal gi-gio gi-glib gi-gobject haskell-gi ]; @@ -99553,8 +99852,8 @@ self: { }: mkDerivation { pname = "gi-vte"; - version = "2.91.25"; - sha256 = "0h6kqbbdr7zgpq6sfqs2pfx99c7wj1aabpzna9fryn6zhaha8j3c"; + version = "2.91.27"; + sha256 = "0a4n8yah3nirwciw0y1i8vpcjqbbk3pw15nd8av109cyxgl8nzx8"; setupHaskellDepends = [ base Cabal gi-atk gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi @@ -99600,8 +99899,8 @@ self: { }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.25"; - sha256 = "1xg4xy24nnz0ngv46m58jkmaka72nv4954g03f6ixpvwappim0vm"; + version = "4.0.26"; + sha256 = "0vbsc5zd1m1k47zpq620kzsiyg2g25ag6fvkwj0hdlq24xhyiavr"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -99625,8 +99924,8 @@ self: { }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.24"; - sha256 = "0lnf173c6myrswk0kdnwkhs925imvcpyvpmy50krqljnv6f2ksxn"; + version = "4.0.25"; + sha256 = "0vdzhnaj6d03cgxz3i886cahkfhl8xgcrm37wdcxqydkxx2ybh6h"; setupHaskellDepends = [ base Cabal gi-gio gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi @@ -99650,8 +99949,8 @@ self: { }: mkDerivation { pname = "gi-wnck"; - version = "3.0.7"; - sha256 = "02kgbp3h5ny7y0qmddsfng0a1gqpdmadl6yy45hmk98ws02rk9bx"; + version = "3.0.8"; + sha256 = "1zgzxx5v0cc0z9xq1nkbqixa7r0m0m00gzvdypxqddlpzvrxn63c"; setupHaskellDepends = [ base Cabal gi-atk gi-gdk gi-gdkpixbuf gi-gobject gi-gtk haskell-gi ]; @@ -99686,6 +99985,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) xlibsWrapper;}; + "gi-xlib_2_0_9" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers + , xlibsWrapper + }: + mkDerivation { + pname = "gi-xlib"; + version = "2.0.9"; + sha256 = "02n2iz30dkkfqpsc3ngpx0zxrl6fbsafzrjf0im8an783jp3vm80"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ xlibsWrapper ]; + description = "xlib bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) xlibsWrapper;}; + "giak" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers , directory, extra, filemanip, filepath, mtl, process, semigroups @@ -100909,15 +101228,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "gitlab-haskell_0_2" = callPackage + "gitlab-haskell_0_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, http-conduit , http-types, tasty, tasty-hunit, text, time, transformers , unliftio, unliftio-core }: mkDerivation { pname = "gitlab-haskell"; - version = "0.2"; - sha256 = "147flwysaip40mcqwhskivf196dan0bk9vrjfjjq2fvnx46xg1q5"; + version = "0.2.1"; + sha256 = "0s7ar0z2hgkb8qzsyh6j022ks87nxa1fxy99dqrrmcfndcy6by8n"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring connection http-conduit http-types text time transformers unliftio unliftio-core @@ -114310,6 +114630,29 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi_0_24_1" = callPackage + ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, directory, doctest, filepath, glib + , gobject-introspection, haskell-gi-base, mtl, pretty-show, process + , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.24.1"; + sha256 = "1j862byqapw224rkv9xry4nxqszhxsfdny0c5lf4rgykmaxkh777"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal attoparsec base bytestring Cabal containers directory + filepath haskell-gi-base mtl pretty-show process regex-tdfa safe + text transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobject-introspection ]; + testHaskellDepends = [ base doctest process ]; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -114322,6 +114665,19 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "haskell-gi-base_0_24_0" = callPackage + ({ mkDerivation, base, bytestring, containers, glib, text }: + mkDerivation { + pname = "haskell-gi-base"; + version = "0.24.0"; + sha256 = "0xkjfn20xkwqshasydqzc4v141qpd202yjrj1xvasl2j3rkl4m6c"; + libraryHaskellDepends = [ base bytestring containers text ]; + libraryPkgconfigDepends = [ glib ]; + description = "Foundation for libraries generated by haskell-gi"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "haskell-gi-overloading_0_0" = callPackage ({ mkDerivation }: mkDerivation { @@ -119801,6 +120157,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "headroom_0_3_0_0" = callPackage + ({ mkDerivation, aeson, base, data-default-class, doctest, either + , file-embed, hspec, microlens, microlens-th, mustache + , optparse-applicative, pcre-heavy, pcre-light, QuickCheck, rio + , template-haskell, time, yaml + }: + mkDerivation { + pname = "headroom"; + version = "0.3.0.0"; + sha256 = "1d4dcb70vzpn6694d4z52aj12vzicmfyyrbhd6x816ic68db08nc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base data-default-class either file-embed microlens + microlens-th mustache optparse-applicative pcre-heavy pcre-light + rio template-haskell time yaml + ]; + executableHaskellDepends = [ base optparse-applicative rio ]; + testHaskellDepends = [ + aeson base doctest hspec optparse-applicative pcre-light QuickCheck + rio time + ]; + description = "License Header Manager"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "heap" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -183875,20 +184258,22 @@ self: { }) {}; "openweathermap" = callPackage - ({ mkDerivation, aeson, base, directory, http-client - , optparse-applicative, servant, servant-client, xdg-basedir + ({ mkDerivation, aeson, base, directory, http-api-data, http-client + , optparse-applicative, servant, servant-client + , servant-client-core, time, xdg-basedir }: mkDerivation { pname = "openweathermap"; - version = "0.1.0"; - sha256 = "140m5jlbcrz42m5fr7cmq0n7zbdb0gcxwcvlpl0cb6r1vg4xp9qj"; + version = "0.2.0"; + sha256 = "1sd8rflm3zakpgm5va9rwdw9si4cbqyvdmpysw55ly6mzgvfxad1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base http-client servant servant-client + aeson base http-api-data http-client servant servant-client + servant-client-core ]; executableHaskellDepends = [ - base directory optparse-applicative xdg-basedir + base directory optparse-applicative time xdg-basedir ]; description = "Access data at OpenWeatherMap"; license = stdenv.lib.licenses.publicDomain; @@ -211931,6 +212316,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rescue" = callPackage + ({ mkDerivation, base, criterion, directory, directory-tree + , doctest, exceptions, ghc, Glob, hlint, hspec, hspec-core + , hspec-expectations, lens-aeson, mtl, QuickCheck + , quickcheck-instances, rio, tasty, tasty-hspec, tasty-hunit + , tasty-rerun, tasty-smallcheck, text, transformers, world-peace + , yaml + }: + mkDerivation { + pname = "rescue"; + version = "0.2.0"; + sha256 = "09mlamir7n2jjm50qxlws8w9qa5xzrm6fr21vsh9gpwf8pkd98qw"; + libraryHaskellDepends = [ + base exceptions ghc mtl text transformers world-peace + ]; + testHaskellDepends = [ + base directory directory-tree doctest exceptions ghc Glob hlint + hspec hspec-core hspec-expectations lens-aeson mtl QuickCheck + quickcheck-instances rio tasty tasty-hspec tasty-hunit tasty-rerun + tasty-smallcheck text transformers world-peace yaml + ]; + benchmarkHaskellDepends = [ + base criterion exceptions ghc mtl text transformers world-peace + ]; + description = "More understandable exceptions"; + license = stdenv.lib.licenses.asl20; + }) {}; + "reserve" = callPackage ({ mkDerivation, base, base-compat, bytestring, directory, hspec , http-conduit, http-kit, http-types, network, process, QuickCheck @@ -213146,6 +213559,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rhine_0_7_0" = callPackage + ({ mkDerivation, base, containers, deepseq, dunai, free + , MonadRandom, random, simple-affine-space, time, transformers + , vector-sized + }: + mkDerivation { + pname = "rhine"; + version = "0.7.0"; + sha256 = "1qnwz48ji3vsb9f44xvidhq6z1p7q06g3k8v7cnbxc54zav076p2"; + libraryHaskellDepends = [ + base containers deepseq dunai free MonadRandom random + simple-affine-space time transformers vector-sized + ]; + description = "Functional Reactive Programming with type-level clocks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rhine-gloss" = callPackage ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { @@ -213160,6 +213591,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rhine-gloss_0_7_0" = callPackage + ({ mkDerivation, base, dunai, gloss, rhine, transformers }: + mkDerivation { + pname = "rhine-gloss"; + version = "0.7.0"; + sha256 = "1ldaw9ijd9kcn1x5cd5ch9yz95sb671np4aaa6mqa4sf8w4yjl0m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base dunai gloss rhine transformers ]; + executableHaskellDepends = [ base ]; + description = "Gloss backend for Rhine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rhythm-game-tutorial" = callPackage ({ mkDerivation, base, call, containers, lens, mtl, objective , split @@ -214130,18 +214576,25 @@ self: { }) {}; "rock" = callPackage - ({ mkDerivation, base, containers, dependent-map, dependent-sum - , deriving-compat, mtl, protolude, transformers + ({ mkDerivation, base, constraints, constraints-extras + , dependent-hashmap, dependent-sum, deriving-compat, hashable + , hedgehog, lifted-base, monad-control, mtl, transformers + , transformers-base, unordered-containers }: mkDerivation { pname = "rock"; - version = "0.2.0.0"; - sha256 = "0h4z2ss4g9zshxpfallmbqw121jk1dv7q5s3ww39rhglw3j4dj9k"; + version = "0.3.0.0"; + sha256 = "1hssz23kifpmcv0vjnrymr4cj1f3m8z7kvvkyzsfh3ysc493514i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers dependent-map dependent-sum deriving-compat mtl - protolude transformers + base constraints-extras dependent-hashmap dependent-sum + deriving-compat hashable lifted-base monad-control mtl transformers + transformers-base unordered-containers + ]; + testHaskellDepends = [ + base constraints constraints-extras dependent-hashmap dependent-sum + hashable hedgehog mtl unordered-containers ]; description = "A build system for incremental, parallel, and demand-driven computations"; license = stdenv.lib.licenses.bsd3; @@ -224890,23 +225343,25 @@ self: { "shakebook" = callPackage ({ mkDerivation, aeson, aeson-with, base, comonad, comonad-extras , doctemplates, feed, free, ixset-typed, lens, lens-aeson, mustache - , pandoc, pandoc-types, path-extensions, rio, shake-plus, slick - , split, tasty, tasty-golden, text-time, zipper-extra + , pandoc, pandoc-types, path-extensions, rio, shake-plus + , sitemap-gen, slick, split, tasty, tasty-golden, text-time + , zipper-extra }: mkDerivation { pname = "shakebook"; - version = "0.7.2.0"; - sha256 = "05idvya18s0d8n1f9xpm9cwb9jrmv9f5635cbz4kr3fhw9ya7dxb"; + version = "0.7.3.0"; + sha256 = "1dfnnbj7b6f0fcn54p43dp0vqnayinc2knqfimizr999vnblz2z1"; libraryHaskellDepends = [ aeson aeson-with base comonad comonad-extras doctemplates feed free ixset-typed lens lens-aeson mustache pandoc pandoc-types - path-extensions rio shake-plus slick split text-time zipper-extra + path-extensions rio shake-plus sitemap-gen slick split text-time + zipper-extra ]; testHaskellDepends = [ aeson aeson-with base comonad comonad-extras doctemplates feed free ixset-typed lens lens-aeson mustache pandoc pandoc-types - path-extensions rio shake-plus slick split tasty tasty-golden - text-time zipper-extra + path-extensions rio shake-plus sitemap-gen slick split tasty + tasty-golden text-time zipper-extra ]; description = "Shake-based technical documentation generator; HTML & PDF"; license = stdenv.lib.licenses.mit; @@ -250485,6 +250940,31 @@ self: { broken = true; }) {}; + "tldr_0_7_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, cmark, containers + , directory, filepath, optparse-applicative, semigroups, tasty + , tasty-golden, text, typed-process + }: + mkDerivation { + pname = "tldr"; + version = "0.7.0"; + sha256 = "1y0lw65k9kjmqk27hsq3gr40af4jnwksf739ihp2dg4llyrqgvhl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring cmark text + ]; + executableHaskellDepends = [ + base containers directory filepath optparse-applicative semigroups + typed-process + ]; + testHaskellDepends = [ base tasty tasty-golden ]; + description = "Haskell tldr client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "tls" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring , cereal, cryptonite, data-default-class, gauge, hourglass, memory @@ -259064,8 +259544,7 @@ self: { executableHaskellDepends = [ base text ]; description = "A program to update fetchgit values in Nix expressions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ sorki ]; }) {}; "update-repos" = callPackage @@ -265982,18 +266461,17 @@ self: { "web-push" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , cryptonite, exceptions, hspec, http-client, http-types, jose - , memory, mtl, random, text, time, transformers - , unordered-containers + , cryptonite, hspec, http-client, http-types, lens, memory, random + , safe-exceptions, text, time, transformers }: mkDerivation { pname = "web-push"; - version = "0.1.2.0"; - sha256 = "1c9l6fl8fpz4jd9p1m8w42hknnklak8j4gjakcm4qdbw86c4w3kk"; + version = "0.3"; + sha256 = "1l03apm5l0a8p8ir418jzfvgsbrpzbh8ks6rbgjxkyz2wj0if2mi"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring cryptonite - exceptions http-client http-types jose memory mtl random text time - transformers unordered-containers + http-client http-types lens memory random safe-exceptions text time + transformers ]; testHaskellDepends = [ base base64-bytestring binary bytestring hspec @@ -276760,8 +277238,8 @@ self: { }: mkDerivation { pname = "zephyr"; - version = "0.3.1"; - sha256 = "1bzairza82vp7yydw5f4am0nsc1pldqrz6j4fz1c4lmrp045a87h"; + version = "0.3.2"; + sha256 = "0p0n4p4792jdivgqdwf2brbkrw6b5rxfzfq9ph0sjw7h3gkj1was"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From e8f8394fd279242e218e6bdc96cb0285c7b33e1f Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sun, 28 Jun 2020 23:54:28 -0400 Subject: [PATCH 2825/3452] mtail: 3.0.0-rc35 -> 3.0.0-rc36 --- pkgs/servers/monitoring/mtail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index d701a7ca001e..5e51750a795b 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mtail"; - version = "3.0.0-rc35"; + version = "3.0.0-rc36"; src = fetchFromGitHub { owner = "google"; repo = "mtail"; rev = "v${version}"; - sha256 = "04hzr0cw0dq7hmqvp1lhm5wl239yrxmcpsl25sqk74wy06cgrrqd"; + sha256 = "1xdpjzcr143f7430wl9l6zzq9yhbkirr3fbfw60f10zpglrcx8a4"; }; - vendorSha256 = "1km3ldqz35lpkglp9n332vxr38xxfqyij1fi2qq0agyyydbvakj5"; + vendorSha256 = "02fnvy897cygmipc5snza556qihjwrp1lf9qi9f5dzarphd6d0pw"; subPackages = [ "cmd/mtail" ]; preBuild = '' From 5dfcb77a8e259f9fe230e21f4eb0c50d5a9dd760 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 22 Jun 2020 09:21:59 +0200 Subject: [PATCH 2826/3452] =?UTF-8?q?coqPackages.interval:=203.4.1=20?= =?UTF-8?q?=E2=86=92=203.4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/interval/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 9e78a9f38829..d5cfb5a217f8 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -3,9 +3,9 @@ let params = if stdenv.lib.versionAtLeast coq.coq-version "8.7" then { - version = "3.4.1"; - uid = "38104"; - sha256 = "1zklv2w34k866fpwmw8q692mid5n6s75d2mmhhigrzpx5l3d4z6y"; + version = "3.4.2"; + uid = "38288"; + sha256 = "00bgzbji0gkazwxhs4q8gz4ccqsa1y1r0m0ravr18ps2h8a8qva5"; } else { version = "3.3.0"; uid = "37077"; @@ -38,7 +38,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" ]; }; From 03f13ede6114c705564d49672c7580098dbfc9a1 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Mon, 29 Jun 2020 00:21:06 +0200 Subject: [PATCH 2827/3452] osm2pgsql: use libosmium from nixpkgs --- pkgs/tools/misc/osm2pgsql/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index c7bd00aedbae..075eb5f4f78a 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -10,6 +10,7 @@ , withLuaJIT ? false , lua , luajit +, libosmium }: stdenv.mkDerivation rec { @@ -25,11 +26,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ expat proj bzip2 zlib boost postgresql ] + buildInputs = [ expat proj bzip2 zlib boost postgresql libosmium ] ++ stdenv.lib.optional withLuaJIT luajit ++ stdenv.lib.optional (!withLuaJIT) lua; - cmakeFlags = stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; + cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" ] + ++ stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; From f3ee53c7153409d2e87091cd94a49735330f63b9 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Mon, 29 Jun 2020 00:23:21 +0200 Subject: [PATCH 2828/3452] osm2pgsql: use protozero from nixpkgs --- pkgs/tools/misc/osm2pgsql/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 075eb5f4f78a..42e1690a3f66 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -11,6 +11,7 @@ , lua , luajit , libosmium +, protozero }: stdenv.mkDerivation rec { @@ -26,11 +27,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ expat proj bzip2 zlib boost postgresql libosmium ] + buildInputs = [ expat proj bzip2 zlib boost postgresql libosmium protozero ] ++ stdenv.lib.optional withLuaJIT luajit ++ stdenv.lib.optional (!withLuaJIT) lua; - cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" ] + cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" ] ++ stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; From 928faf2b6356599c7bbb862ae8f5a22fb4f5d840 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Mon, 29 Jun 2020 00:35:02 +0200 Subject: [PATCH 2829/3452] osm2pgsql: add myself (das-g) as additional maintainer --- pkgs/tools/misc/osm2pgsql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 42e1690a3f66..87aa58d7dc30 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/openstreetmap/osm2pgsql"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ jglukasik ]; + maintainers = with maintainers; [ jglukasik das-g ]; }; } From 5b8b201e448fa9c6d085972b7b25dea112bc38ca Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 29 Jun 2020 09:34:41 +0200 Subject: [PATCH 2830/3452] Revert "traefik: unify TOML generation" This reverts commit a5e6901702ae08e5bcbe4c7b6574abd559aff6ce. yj doesn't distinguish floats and ints, which breaks some configs. --- nixos/modules/services/web-servers/traefik.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix index 0631a26569c8..4ab7307c3b67 100644 --- a/nixos/modules/services/web-servers/traefik.nix +++ b/nixos/modules/services/web-servers/traefik.nix @@ -20,10 +20,10 @@ let in valueType; dynamicConfigFile = if cfg.dynamicConfigFile == null then pkgs.runCommand "config.toml" { - buildInputs = [ pkgs.yj ]; + buildInputs = [ pkgs.remarshal ]; preferLocalBuild = true; } '' - yj -jt -i \ + remarshal -if json -of toml \ < ${ pkgs.writeText "dynamic_config.json" (builtins.toJSON cfg.dynamicConfigOptions) From 640f422470f83b7587eebe8da20c9628d14d12fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 29 Jun 2020 09:37:00 +0200 Subject: [PATCH 2831/3452] oneDNN: add aarch64-linux to platforms According to https://github.com/oneapi-src/oneDNN/releases/tag/v1.5 AArch64 is now supported. --- pkgs/development/libraries/oneDNN/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index edc48d1d8737..01ce51be18d0 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = "https://01.org/dnnl"; changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; maintainers = with maintainers; [ alexarice bhipple ]; }; } From ac9498f4ec058388a3e1f7c94e079bdc5f3e6cb2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 29 Jun 2020 04:20:00 -0500 Subject: [PATCH 2832/3452] ncspot: 0.1.3 -> 0.1.4 --- pkgs/applications/audio/ncspot/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index bee1065328a7..895e673d453a 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; - rev = "v${version}"; - sha256 = "144a7wn5l64fhvj8vgwl7z4bp8lbq0pb0dl38x9y4wkqmdh6wrli"; + rev = version; + sha256 = "02g2lamabkwayhm56498pfvl9g0xx2vsan2j48ssrwjx6rwmlh7n"; }; - cargoSha256 = "19gn0v7j1ly3ywgflfj27pnrwjiiy17m3g1z0kzagxpjy2xi2qxy"; + cargoSha256 = "07gw2az11lpldwpb792l64b7xlarvx77364rn4i8g6a5271zahz3"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; From e0f4ee72bc08beb30b840d662b2ded5a9b0888a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 29 Jun 2020 11:26:42 +0200 Subject: [PATCH 2833/3452] nixpkgs-unstable channel: don't depend on the metrics job This reverts commit c23e9e12f85c3dc7d5412d9a35d0fbfe59d2ccba. At this moment the benchmarking machine ("t2a") is unreachable from outside due to IPv6 issues. (the "t4a" and "t4b" builders as well) But even generally I can't see why this job should block channels, provided that it won't remain broken over long term. --- pkgs/top-level/release.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index fc317f51ab5a..c11858f09c8f 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -89,7 +89,6 @@ let meta.description = "Release-critical builds for the Nixpkgs unstable channel"; constituents = [ jobs.tarball - jobs.metrics jobs.manual jobs.lib-tests jobs.stdenv.x86_64-linux From 2f5255149abe3a634091912ac63cabbed1cc6c81 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Mon, 29 Jun 2020 21:35:41 +1200 Subject: [PATCH 2834/3452] grahpite-web: recreate patch file --- .../graphite-web/update-django-tagging.patch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/graphite-web/update-django-tagging.patch b/pkgs/development/python-modules/graphite-web/update-django-tagging.patch index 48d16d50f420..9774f7e70a7f 100644 --- a/pkgs/development/python-modules/graphite-web/update-django-tagging.patch +++ b/pkgs/development/python-modules/graphite-web/update-django-tagging.patch @@ -1,12 +1,13 @@ -diff -Nur a/setup.py b/setup.py ---- a/setup.py 2020-03-12 18:45:34.654296302 +0100 -+++ b/setup.py 2020-03-12 18:46:17.476893828 +0100 -@@ -115,7 +115,7 @@ +diff --git a/setup.py b/setup.py +index a1a21f1..f0d1051 100644 +--- a/setup.py ++++ b/setup.py +@@ -117,7 +117,7 @@ try: ['templates/*', 'local_settings.py.example']}, scripts=glob('bin/*'), data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples, -- install_requires=['Django>=1.8,<2.3', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], -+ install_requires=['Django>=1.8,<2.3', 'django-tagging==0.4.6', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], +- install_requires=['Django>=1.8,<3.1', 'django-tagging==0.4.3', 'pytz', ++ install_requires=['Django>=1.8,<3.1', 'django-tagging==0.5.0', 'pytz', + 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], classifiers=[ 'Intended Audience :: Developers', - 'Natural Language :: English', From 3c8762de8e5b3d67b127572cab2e2670b3c563b9 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Mon, 29 Jun 2020 21:38:44 +1200 Subject: [PATCH 2835/3452] nixos/graphite: unmark test as broken --- nixos/tests/graphite.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index 71776a94cbd6..9b97d7b2e25b 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -1,11 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... } : { name = "graphite"; - meta = { - # Fails on dependency `python-2.7-Twisted`'s test suite - # complaining `ImportError: No module named zope.interface`. - broken = true; - }; nodes = { one = { ... }: { From 356cd30269fbb9a378af048fb577328147f0592a Mon Sep 17 00:00:00 2001 From: Guillaume Desforges Date: Thu, 25 Jun 2020 14:23:09 +0200 Subject: [PATCH 2836/3452] haskell-language-server: init at 0.1.0.0 --- .../haskell-modules/configuration-common.nix | 40 +++++++++++++ .../configuration-hackage2nix.yaml | 3 +- .../haskell-modules/hackage-packages.nix | 32 ++++++++-- .../haskell-modules/non-hackage-packages.nix | 5 ++ .../haskell-language-server/default.nix | 49 ++++++++++++++++ .../haskell-language-server/hls-ghcide.nix | 58 +++++++++++++++++++ .../haskell/haskell-language-server/update.sh | 56 ++++++++++++++++++ 7 files changed, 237 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/tools/haskell/haskell-language-server/default.nix create mode 100644 pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix create mode 100755 pkgs/development/tools/haskell/haskell-language-server/update.sh diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7ade5ede29d6..d22eb95ad3b6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1415,6 +1415,46 @@ self: super: { # 2020-06-24: Tests are broken in hackage distribution. # See: https://github.com/robstewart57/rdf4h/issues/39 rdf4h = dontCheck super.rdf4h; + + # hasn't bumped upper bounds + # test fails: "floskell-test: styles/base.md: openBinaryFile: does not exist (No such file or directory)" + # https://github.com/ennocramer/floskell/issues/48 + floskell = dontCheck (doJailbreak super.floskell); + + # hasn't bumped upper bounds + # test fails because of a "Warning: Unused LANGUAGE pragma" + # https://github.com/ennocramer/monad-dijkstra/issues/4 + monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra); + + # haskell-language-server uses its own fork of ghcide + # Test disabled: it seems to freeze (is it just that it takes a long time ?) + hls-ghcide = + dontCheck ( + overrideCabal super.hls-ghcide + (old: { + # The integration test run by lsp-test requires the executable to be in the PATH + preCheck = '' + export PATH=$PATH:dist/build/ghcide + ''; + }) + ); + + haskell-language-server = (overrideCabal super.haskell-language-server + (old: { + # The integration test run by lsp-test requires the executable to be in the PATH + preCheck = '' + export PATH=$PATH:dist/build/haskell-language-server + ''; + + # test needs the git tool + testToolDepends = old.testToolDepends + ++ [ pkgs.git ]; + })).override { + # use a fork of ghcide + ghcide = self.hls-ghcide; + # use specific version + ormolu = super.ormolu_0_0_5_0; + }; # https://github.com/kowainik/policeman/issues/57 policeman = doJailbreak super.policeman; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ce7dfc100c6c..ec1fa04ebfc5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2586,6 +2586,7 @@ extra-packages: - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below - network == 3.0.* # required by network-bsd, HTTP, and many others (2019-04-30) + - ormolu == 0.0.5.0 # required by haskell-language-server - pantry == 0.2.0.0 # required by stack-2.1.3.1 - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 - patience ^>= 0.1 # required by chell-0.4.x @@ -4988,7 +4989,6 @@ broken-packages: - flite - float-binstring - floating-bits - - floskell - flow-er - flow2dot - flowdock @@ -7698,7 +7698,6 @@ broken-packages: - monad-atom - monad-atom-simple - monad-branch - - monad-dijkstra - monad-exception - monad-finally - monad-fork diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b0feb383179c..19c5897362b1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -89490,8 +89490,6 @@ self: { ]; description = "A flexible Haskell source code pretty printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "flow" = callPackage @@ -169912,8 +169910,6 @@ self: { testHaskellDepends = [ base hlint tasty tasty-hspec ]; description = "A monad transformer for weighted graph searches"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "monad-exception" = callPackage @@ -185372,6 +185368,34 @@ self: { broken = true; }) {}; + "ormolu_0_0_5_0" = callPackage + ({ mkDerivation, base, bytestring, containers, dlist, exceptions + , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl + , optparse-applicative, path, path-io, syb, text + }: + mkDerivation { + pname = "ormolu"; + version = "0.0.5.0"; + sha256 = "1sf22silpj89sldd7wanlr34nsv77bq0cf4i0q1x2r20pz7s4w4m"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers dlist exceptions ghc-lib-parser mtl syb + text + ]; + executableHaskellDepends = [ + base ghc-lib-parser gitrev optparse-applicative text + ]; + testHaskellDepends = [ + base containers filepath hspec path path-io text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ormolu" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, exceptions , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 9a2ff6f4a2ad..9b9b61e6c097 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -16,4 +16,9 @@ self: super: { # spago is not released to Hackage. # https://github.com/spacchetti/spago/issues/512 spago = self.callPackage ../tools/purescript/spago/spago.nix { }; + + # HLS and its fork of ghcide that it uses + # both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh + haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { }; + hls-ghcide = self.callPackage ../tools/haskell/haskell-language-server/hls-ghcide.nix { }; } diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix new file mode 100644 index 000000000000..171e87530d2a --- /dev/null +++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -0,0 +1,49 @@ +{ mkDerivation, aeson, async, base, base16-bytestring, binary +, blaze-markup, brittany, bytestring, Cabal, cabal-helper +, containers, cryptohash-sha1, data-default, deepseq, Diff +, directory, extra, fetchgit, filepath, floskell, ghc, ghc-check +, ghc-paths, ghcide, gitrev, hashable, haskell-lsp +, haskell-lsp-types, hie-bios, hslogger, hspec, hspec-core +, hspec-expectations, lens, lsp-test, optparse-applicative +, optparse-simple, ormolu, process, regex-tdfa, safe-exceptions +, shake, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml +, tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun +, text, time, transformers, unix, unordered-containers, yaml +}: +mkDerivation { + pname = "haskell-language-server"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/haskell/haskell-language-server.git"; + sha256 = "092i32kc9dakl6cg1dpckrb87g4k8s4w1nvrs5x85n9ncgkpqk25"; + rev = "2a192db290bfe8640dafb6c1d650a0815e70d966"; + fetchSubmodules = true; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary brittany bytestring Cabal cabal-helper containers + data-default deepseq Diff directory extra filepath floskell ghc + ghcide gitrev hashable haskell-lsp hie-bios hslogger lens + optparse-simple ormolu process regex-tdfa shake stylish-haskell + text transformers unix unordered-containers + ]; + executableHaskellDepends = [ + aeson async base base16-bytestring binary bytestring containers + cryptohash-sha1 data-default deepseq directory extra filepath ghc + ghc-check ghc-paths ghcide gitrev hashable haskell-lsp hie-bios + hslogger optparse-applicative process safe-exceptions shake text + time unordered-containers + ]; + testHaskellDepends = [ + aeson base blaze-markup bytestring containers data-default + directory filepath haskell-lsp haskell-lsp-types hie-bios hslogger + hspec hspec-core hspec-expectations lens lsp-test stm tasty + tasty-ant-xml tasty-expected-failure tasty-golden tasty-hunit + tasty-rerun text unordered-containers yaml + ]; + testToolDepends = [ ghcide ]; + homepage = "https://github.com/haskell/haskell-language-server#readme"; + description = "LSP server for GHC"; + license = stdenv.lib.licenses.asl20; +} diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix new file mode 100644 index 000000000000..8c68c8872951 --- /dev/null +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix @@ -0,0 +1,58 @@ +{ mkDerivation, aeson, array, async, base, base16-bytestring +, binary, bytestring, Chart, Chart-diagrams, containers +, cryptohash-sha1, data-default, deepseq, diagrams, diagrams-svg +, directory, extra, fetchgit, filepath, fuzzy, ghc, ghc-boot +, ghc-boot-th, ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev +, haddock-library, hashable, haskell-lsp, haskell-lsp-types +, hie-bios, hslogger, lens, lsp-test, mtl, network-uri +, opentelemetry, optparse-applicative, parser-combinators +, prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck +, quickcheck-instances, regex-tdfa, rope-utf16-splay +, safe-exceptions, shake, sorted-list, stdenv, stm, syb, tasty +, tasty-expected-failure, tasty-hunit, tasty-quickcheck +, tasty-rerun, text, time, transformers, unix, unordered-containers +, utf8-string, yaml +}: +mkDerivation { + pname = "ghcide"; + version = "0.2.0"; + src = fetchgit { + url = "https://github.com/wz1000/ghcide"; + sha256 = "0rifbrfvbgv7szgwc5apzb0i5fbkr2spzqvwg5kzng5b4zrf9a9d"; + rev = "cc09b6d4cf03efa645c682347c62850c2291be25"; + fetchSubmodules = true; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array async base binary bytestring containers data-default + deepseq directory extra filepath fuzzy ghc ghc-boot ghc-boot-th + haddock-library hashable haskell-lsp haskell-lsp-types hslogger mtl + network-uri opentelemetry prettyprinter prettyprinter-ansi-terminal + regex-tdfa rope-utf16-splay safe-exceptions shake sorted-list stm + syb text time transformers unix unordered-containers utf8-string + ]; + executableHaskellDepends = [ + aeson async base base16-bytestring binary bytestring containers + cryptohash-sha1 data-default deepseq directory extra filepath ghc + ghc-check ghc-paths gitrev hashable haskell-lsp haskell-lsp-types + hie-bios hslogger optparse-applicative safe-exceptions shake text + time unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory extra filepath ghc + ghc-typelits-knownnat haddock-library haskell-lsp haskell-lsp-types + lens lsp-test network-uri optparse-applicative parser-combinators + process QuickCheck quickcheck-instances rope-utf16-splay + safe-exceptions shake tasty tasty-expected-failure tasty-hunit + tasty-quickcheck tasty-rerun text + ]; + benchmarkHaskellDepends = [ + aeson base bytestring Chart Chart-diagrams containers diagrams + diagrams-svg directory extra filepath lsp-test optparse-applicative + parser-combinators process safe-exceptions shake text yaml + ]; + homepage = "https://github.com/digital-asset/ghcide#readme"; + description = "The core of an IDE"; + license = stdenv.lib.licenses.asl20; +} diff --git a/pkgs/development/tools/haskell/haskell-language-server/update.sh b/pkgs/development/tools/haskell/haskell-language-server/update.sh new file mode 100755 index 000000000000..de1d62d7ed7c --- /dev/null +++ b/pkgs/development/tools/haskell/haskell-language-server/update.sh @@ -0,0 +1,56 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p cabal2nix jq curl +# +# This script will update the haskell-language-server derivation to the latest version using +# cabal2nix. +# +# Note that you should always try building haskell-language-server after updating it here, since +# some of the overrides in pkgs/development/haskell/configuration-nix.nix may +# need to be updated/changed. + +set -eo pipefail + +# This is the directory of this update.sh script. +script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + +# =========================== +# ghcide fork on https://github.com/wz1000/ghcide +# =========================== + +# ghcide derivation created with cabal2nix. +ghcide_derivation_file="${script_dir}/hls-ghcide.nix" + +# This is the current revision of hls in Nixpkgs. +ghcide_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$ghcide_derivation_file")" + +# This is the revision of ghcide used by hls on GitHub. +ghcide_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/contents/ghcide" | jq '.sha' --raw-output) + +echo "Updating haskell-language-server from old version $ghcide_old_version to new version $ghcide_new_version." +echo "Running cabal2nix and outputting to ${ghcide_derivation_file}..." + +cabal2nix --revision "$ghcide_new_version" "https://github.com/wz1000/ghcide" > "$ghcide_derivation_file" + + +# =========================== +# HLS +# =========================== + +# hls derivation created with cabal2nix. +hls_derivation_file="${script_dir}/default.nix" + +# This is the current revision of hls in Nixpkgs. +hls_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$hls_derivation_file")" + +# This is the latest release version of hls on GitHub. +hls_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/commits/master" | jq '.sha' --raw-output) + +echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version." +echo "Running cabal2nix and outputting to ${hls_derivation_file}..." + +cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file" + +# TODO: This should ideally also automatically update the docsSearchVersion +# from pkgs/development/haskell/configuration-nix.nix. + +echo "Finished." \ No newline at end of file From 3f31678607f51973cbeb3d72437b950c52510685 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Mon, 29 Jun 2020 22:04:23 +1200 Subject: [PATCH 2837/3452] nixos/graphite: ensure graphite-api is properly tested Until now, it was failing to start in the test, as it was searching for an influxdb database --- nixos/tests/graphite.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index 9b97d7b2e25b..137be2d89c8b 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ... } : api = { enable = true; port = 8082; - finders = [ pkgs.python3Packages.influxgraph ]; + finders = [ ]; }; carbon.enableCache = true; seyren.enable = false; # Implicitely requires openssl-1.0.2u which is marked insecure @@ -36,10 +36,14 @@ import ./make-test-python.nix ({ pkgs, ... } : # even if they're still in preStart (which takes quite long for graphiteWeb). # Wait for ports to open so we're sure the services are up and listening. one.wait_for_open_port(8080) + one.wait_for_open_port(8082) one.wait_for_open_port(2003) one.succeed('echo "foo 1 `date +%s`" | nc -N localhost 2003') one.wait_until_succeeds( "curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2" ) + one.wait_until_succeeds( + "curl 'http://localhost:8082/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2" + ) ''; }) From 75d9ea9671b9277748cc53b9f9551f810c6a3a2c Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 29 Jun 2020 12:27:13 +0200 Subject: [PATCH 2838/3452] shattered-pixel-dungeon: 0.8.0b -> 0.8.1 --- pkgs/games/shattered-pixel-dungeon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index b07402063ce1..4f11665c9a07 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -9,13 +9,13 @@ let pname = "shattered-pixel-dungeon"; - version = "0.8.0b"; + version = "0.8.1"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - sha256 = "1qi90qw2xp56wai4gn39rpwh3gs3kx2zcpbni861f7hl9hnf87bf"; + sha256 = "1n459xdvqf974hs91xfq5fdj29s4w5w83dg3m2vp7gqmrmm2jykf"; }; postPatch = '' From 1d5ed475f5411f8c5cceeb0c8c03474bdf8a114e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Jun 2020 13:38:49 +0200 Subject: [PATCH 2839/3452] LTS Haskell 16.3 --- .../configuration-hackage2nix.yaml | 84 +++++++++---------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ce7dfc100c6c..46c18ad0cc2b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -74,7 +74,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 16.2 + # LTS Haskell 16.3 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -281,7 +281,7 @@ default-package-overrides: - base32-lens ==0.1.0.0 - base32string ==0.9.1 - base58string ==0.10.0 - - base64 ==0.4.2 + - base64 ==0.4.2.1 - base64-bytestring ==1.0.0.3 - base64-bytestring-type ==1.0.1 - base64-lens ==0.3.0 @@ -387,7 +387,7 @@ default-package-overrides: - cabal-appimage ==0.3.0.0 - cabal-debian ==5.0.2 - cabal-doctest ==1.0.8 - - cabal-rpm ==2.0.5.1 + - cabal-rpm ==2.0.6 - cache ==0.1.3.0 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 @@ -423,7 +423,7 @@ default-package-overrides: - Chart ==1.9.3 - Chart-diagrams ==1.9.3 - chaselev-deque ==0.5.0.5 - - ChasingBottoms ==1.3.1.8 + - ChasingBottoms ==1.3.1.9 - cheapskate ==0.1.1.2 - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 @@ -449,7 +449,7 @@ default-package-overrides: - classy-prelude-yesod ==1.5.0 - clay ==0.13.3 - clientsession ==0.9.1.2 - - climb ==0.3.1 + - climb ==0.3.3 - Clipboard ==2.3.2.0 - clock ==0.8 - clock-extras ==0.1.0.2 @@ -612,7 +612,7 @@ default-package-overrides: - dataurl ==0.1.0.0 - DAV ==1.3.4 - DBFunctor ==0.1.1.1 - - dbus ==1.2.15.1 + - dbus ==1.2.16 - dbus-hslogger ==0.1.0.1 - debian ==4.0.2 - debian-build ==0.10.2.0 @@ -623,7 +623,7 @@ default-package-overrides: - deepseq-generics ==0.2.0.0 - deepseq-instances ==0.1.0.1 - deferred-folds ==0.9.10.1 - - dejafu ==2.3.0.0 + - dejafu ==2.3.0.1 - dense-linear-algebra ==0.1.0.0 - depq ==0.4.1.0 - deque ==0.4.3 @@ -679,7 +679,7 @@ default-package-overrides: - double-conversion ==2.0.2.0 - download ==0.3.2.7 - drinkery ==0.4 - - dsp ==0.2.5 + - dsp ==0.2.5.1 - dual ==0.1.1.1 - dual-tree ==0.2.2.1 - dublincore-xml-conduit ==0.1.0.2 @@ -735,7 +735,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.8 - - esqueleto ==3.3.3.0 + - esqueleto ==3.3.3.2 - essence-of-live-coding ==0.1.0.3 - essence-of-live-coding-gloss ==0.1.0.3 - essence-of-live-coding-pulse ==0.1.0.3 @@ -817,7 +817,7 @@ default-package-overrides: - focuslist ==0.1.0.2 - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.9 - - fold-debounce-conduit ==0.2.0.4 + - fold-debounce-conduit ==0.2.0.5 - foldl ==1.4.6 - folds ==0.7.5 - follow-file ==0.0.3 @@ -916,7 +916,7 @@ default-package-overrides: - ghc-typelits-extra ==0.4 - ghc-typelits-knownnat ==0.7.2 - ghc-typelits-natnormalise ==0.7.2 - - ghc-typelits-presburger ==0.3.0.0 + - ghc-typelits-presburger ==0.3.0.1 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.21 - gi-cairo ==1.0.23 @@ -962,9 +962,9 @@ default-package-overrides: - graphviz ==2999.20.0.4 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - - greskell ==1.1.0.2 - - greskell-core ==0.1.3.4 - - greskell-websocket ==0.1.2.3 + - greskell ==1.1.0.3 + - greskell-core ==0.1.3.5 + - greskell-websocket ==0.1.2.4 - groom ==0.1.2.1 - group-by-date ==0.1.0.3 - groups ==0.4.1.0 @@ -1025,7 +1025,7 @@ default-package-overrides: - hebrew-time ==0.1.2 - hedgehog ==1.0.2 - hedgehog-corpus ==0.2.0 - - hedgehog-fakedata ==0.0.1.2 + - hedgehog-fakedata ==0.0.1.3 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - hedis ==0.12.13 @@ -1039,7 +1039,7 @@ default-package-overrides: - hformat ==0.3.3.1 - hfsevents ==0.1.6 - hidapi ==0.1.5 - - hie-bios ==0.5.0 + - hie-bios ==0.5.1 - hi-file-parser ==0.1.0.0 - higher-leveldb ==0.5.0.2 - highlighting-kate ==0.6.4 @@ -1110,7 +1110,7 @@ default-package-overrides: - hspec-leancheck ==0.0.4 - hspec-megaparsec ==2.1.0 - hspec-meta ==2.6.0 - - hspec-need-env ==0.1.0.4 + - hspec-need-env ==0.1.0.5 - hspec-parsec ==0 - hspec-smallcheck ==0.5.2 - hspec-tables ==0.0.1 @@ -1241,7 +1241,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.1.0 - ip6addr ==1.0.1 - iproute ==1.7.9 - - IPv6Addr ==1.1.4 + - IPv6Addr ==1.1.5 - ipynb ==0.1.0.1 - ipython-kernel ==0.10.2.0 - irc ==0.6.1.0 @@ -1344,7 +1344,7 @@ default-package-overrides: - lifted-base ==0.2.3.12 - lift-generics ==0.1.3 - line ==4.0.1 - - linear ==1.21 + - linear ==1.21.1 - linenoise ==0.3.2 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 @@ -1390,9 +1390,9 @@ default-package-overrides: - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.5.2.0 + - massiv ==0.5.3.1 - massiv-io ==0.2.1.0 - - massiv-test ==0.1.3 + - massiv-test ==0.1.3.1 - mathexpr ==0.3.0.0 - math-extras ==0.1.1.0 - math-functions ==0.3.4.0 @@ -1440,7 +1440,7 @@ default-package-overrides: - minimorph ==0.2.2.0 - minio-hs ==1.5.2 - miniutter ==0.5.1.0 - - min-max-pqueue ==0.1.0.1 + - min-max-pqueue ==0.1.0.2 - mintty ==0.1.2 - miso ==1.6.0.0 - missing-foreign ==0.1.1 @@ -1478,7 +1478,7 @@ default-package-overrides: - monad-peel ==0.2.1.2 - monad-products ==4.0.1 - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.5.1.2 + - MonadRandom ==0.5.2 - monad-resumption ==0.1.4.0 - monad-skeleton ==0.1.5 - monad-st ==0.2.4.1 @@ -1570,7 +1570,7 @@ default-package-overrides: - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 - - numeric-prelude ==0.4.3.1 + - numeric-prelude ==0.4.3.2 - numhask ==0.4.0 - NumInstances ==1.4 - numtype-dk ==0.5.0.2 @@ -1616,14 +1616,14 @@ default-package-overrides: - optparse-simple ==0.1.1.2 - optparse-text ==0.1.1.0 - ordered-containers ==0.2.2 - - ormolu ==0.1.0.0 + - ormolu ==0.1.2.0 - overhang ==1.0.0 - packcheck ==0.5.1 - pager ==0.1.1.0 - pagination ==0.2.1 - pagure-cli ==0.2 - pandoc ==2.9.2.1 - - pandoc-citeproc ==0.17 + - pandoc-citeproc ==0.17.0.1 - pandoc-csv2table ==1.0.8 - pandoc-plot ==0.6.1.0 - pandoc-pyplot ==2.3.0.1 @@ -1651,7 +1651,7 @@ default-package-overrides: - path-io ==1.6.0 - path-pieces ==0.2.1 - path-text-utf8 ==0.0.1.6 - - pathtype ==0.8.1 + - pathtype ==0.8.1.1 - pathwalk ==0.3.1.2 - pattern-arrows ==0.0.2 - pcg-random ==0.1.3.6 @@ -1780,7 +1780,7 @@ default-package-overrides: - pureMD5 ==2.1.3 - purescript-bridge ==0.14.0.0 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==1.5.1.13 + - pusher-http-haskell ==1.5.1.14 - pvar ==0.2.0.0 - PyF ==0.9.0.1 - qchas ==1.1.0.1 @@ -1799,7 +1799,7 @@ default-package-overrides: - quickcheck-simple ==0.1.1.1 - quickcheck-special ==0.1.0.6 - quickcheck-text ==0.1.2.1 - - quickcheck-transformer ==0.3.1 + - quickcheck-transformer ==0.3.1.1 - quickcheck-unicode ==1.0.1.0 - quiet ==0.2 - radius ==0.6.1.0 @@ -1876,7 +1876,7 @@ default-package-overrides: - rerebase ==1.6.1 - resolv ==0.1.2.0 - resource-pool ==0.2.3.2 - - resourcet ==1.2.4.1 + - resourcet ==1.2.4.2 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - retry ==0.8.1.2 @@ -1922,7 +1922,7 @@ default-package-overrides: - scalpel-core ==0.6.2 - scanf ==0.1.0.0 - scanner ==0.3.1 - - scheduler ==1.4.2.2 + - scheduler ==1.4.2.3 - scientific ==0.3.6.2 - scotty ==0.11.6 - scrypt ==0.5.0 @@ -2024,7 +2024,7 @@ default-package-overrides: - singleton-bool ==0.1.5 - singleton-nats ==0.4.5 - singletons ==2.6 - - singletons-presburger ==0.3.0.0 + - singletons-presburger ==0.3.0.1 - siphash ==1.0.3 - sitemap-gen ==0.1.0.0 - size-based ==0.1.2.0 @@ -2074,7 +2074,7 @@ default-package-overrides: - squeather ==0.4.0.0 - srcloc ==0.5.1.2 - stache ==2.1.1 - - stackcollapse-ghc ==0.0.1 + - stackcollapse-ghc ==0.0.1.1 - stack-templatizer ==0.1.0.2 - starter ==0.3.0 - stateref ==0.3 @@ -2094,7 +2094,7 @@ default-package-overrides: - storable-complex ==0.2.3.0 - storable-record ==0.0.5 - storable-tuple ==0.0.3.3 - - storablevector ==0.2.13 + - storablevector ==0.2.13.1 - stratosphere ==0.53.0 - streaming ==0.2.3.0 - streaming-bytestring ==0.1.6 @@ -2134,7 +2134,7 @@ default-package-overrides: - svg-tree ==0.6.2.4 - swagger ==0.3.0 - swagger2 ==2.5 - - swish ==0.10.0.3 + - swish ==0.10.0.4 - syb ==0.7.1 - symbol ==0.2.4 - symengine ==0.1.2.0 @@ -2160,7 +2160,7 @@ default-package-overrides: - tardis ==0.4.1.0 - tasty ==1.2.3 - tasty-ant-xml ==1.1.6 - - tasty-dejafu ==2.0.0.4 + - tasty-dejafu ==2.0.0.5 - tasty-discover ==4.2.1 - tasty-expected-failure ==0.11.1.2 - tasty-golden ==2.3.3.2 @@ -2421,7 +2421,7 @@ default-package-overrides: - wai-session ==0.3.3 - wai-slack-middleware ==0.2.0 - wai-websockets ==3.0.1.2 - - warp ==3.3.12 + - warp ==3.3.13 - warp-tls ==3.2.12 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 @@ -2436,8 +2436,8 @@ default-package-overrides: - weigh ==0.0.16 - wide-word ==0.1.1.1 - wikicfp-scraper ==0.1.0.11 - - wild-bind ==0.1.2.5 - - wild-bind-x11 ==0.2.0.9 + - wild-bind ==0.1.2.6 + - wild-bind-x11 ==0.2.0.10 - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 @@ -2454,7 +2454,7 @@ default-package-overrides: - word8 ==0.1.3 - word-trie ==0.3.0 - word-wrap ==0.4.1 - - world-peace ==1.0.1.0 + - world-peace ==1.0.2.0 - wrap ==0.0.0 - wreq ==0.5.3.2 - writer-cps-exceptions ==0.1.0.1 @@ -2499,7 +2499,7 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.4.0 - yamlparse-applicative ==0.1.0.1 - - yesod ==1.6.0.1 + - yesod ==1.6.0.2 - yesod-auth ==1.6.10 - yesod-auth-fb ==1.10.1 - yesod-auth-hashdb ==1.7.1.2 @@ -2514,7 +2514,7 @@ default-package-overrides: - yesod-recaptcha2 ==1.0.0 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.0.1 - - yesod-test ==1.6.9.1 + - yesod-test ==1.6.10 - yesod-websockets ==0.3.0.2 - yes-precure5-command ==5.5.3 - yi-rope ==0.11 From 33c6c405f7a22026ed2eef76a70566cbd0161b0e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 29 Jun 2020 13:39:27 +0200 Subject: [PATCH 2840/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-7-g30d5c33 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/e7f5ef65c72490bb177012c40b5afe254c3c9ef7. --- .../haskell-modules/hackage-packages.nix | 1019 ++--------------- 1 file changed, 75 insertions(+), 944 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b0feb383179c..eabbf13fcca5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3075,24 +3075,6 @@ self: { }) {}; "ChasingBottoms" = callPackage - ({ mkDerivation, array, base, containers, mtl, QuickCheck, random - , syb - }: - mkDerivation { - pname = "ChasingBottoms"; - version = "1.3.1.8"; - sha256 = "1madbhhxi5awh74q0z2mx1la5jbkvx26zvhl4x8237sjzs0k51wx"; - libraryHaskellDepends = [ - base containers mtl QuickCheck random syb - ]; - testHaskellDepends = [ - array base containers mtl QuickCheck random syb - ]; - description = "For testing partial and infinite values"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ChasingBottoms_1_3_1_9" = callPackage ({ mkDerivation, array, base, containers, mtl, QuickCheck, random , syb }: @@ -3108,7 +3090,6 @@ self: { ]; description = "For testing partial and infinite values"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CheatSheet" = callPackage @@ -11104,24 +11085,6 @@ self: { }) {}; "IPv6Addr" = callPackage - ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network - , network-info, random, test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "IPv6Addr"; - version = "1.1.4"; - sha256 = "1bkib3mzbc0lzmi4vqkmihgi9vdcsksgss5rp3czhc893wc3hzah"; - libraryHaskellDepends = [ - aeson attoparsec base iproute network network-info random text - ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit text - ]; - description = "Library to deal with IPv6 address text representations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "IPv6Addr_1_1_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network , network-info, random, test-framework, test-framework-hunit, text }: @@ -11137,7 +11100,6 @@ self: { ]; description = "Library to deal with IPv6 address text representations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "IPv6DB" = callPackage @@ -13633,21 +13595,6 @@ self: { }) {}; "MonadRandom" = callPackage - ({ mkDerivation, base, mtl, primitive, random, transformers - , transformers-compat - }: - mkDerivation { - pname = "MonadRandom"; - version = "0.5.1.2"; - sha256 = "0j1lwg3pp77cf87bk0c1gipzrdvpjcj7bkgi37lcjc7avmlhwvvp"; - libraryHaskellDepends = [ - base mtl primitive random transformers transformers-compat - ]; - description = "Random-number generation monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "MonadRandom_0_5_2" = callPackage ({ mkDerivation, base, mtl, primitive, random, transformers , transformers-compat }: @@ -13660,7 +13607,6 @@ self: { ]; description = "Random-number generation monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MonadRandomLazy" = callPackage @@ -36261,7 +36207,7 @@ self: { "b9" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bifunctors , binary, boxes, bytestring, conduit, conduit-extra, ConfigFile - , dhall, directory, exceptions, extensible-effects, filepath, free + , directory, exceptions, extensible-effects, filepath, free , hashable, hspec, hspec-expectations, lens, monad-control, mtl , optparse-applicative, parallel, parsec, pretty, pretty-show , process, QuickCheck, random, shake, syb, tagged, template, text @@ -36269,18 +36215,17 @@ self: { }: mkDerivation { pname = "b9"; - version = "1.0.0"; - sha256 = "0bny8pn98yyswhp7xd78d3gjb56ld6c5cpskx38iibjnzrzq3jf7"; + version = "1.0.1"; + sha256 = "1g1172d2bxjhxn5p1jxyxr1bf19fkd8yrrp05hvzv9mdiqynji14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bifunctors binary boxes - bytestring conduit conduit-extra ConfigFile dhall directory - exceptions extensible-effects filepath free hashable hspec - hspec-expectations lens monad-control mtl optparse-applicative - parallel parsec pretty pretty-show process QuickCheck random shake - syb tagged template text time transformers unordered-containers - vector yaml + bytestring conduit conduit-extra ConfigFile directory exceptions + extensible-effects filepath free hashable hspec hspec-expectations + lens monad-control mtl optparse-applicative parallel parsec pretty + pretty-show process QuickCheck random shake syb tagged template + text time transformers unordered-containers vector yaml ]; executableHaskellDepends = [ base bytestring directory extensible-effects hspec @@ -37315,34 +37260,6 @@ self: { }) {}; "base64" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, criterion - , deepseq, ghc-byteorder, memory, QuickCheck, quickcheck-instances - , random-bytestring, tasty, tasty-hunit, tasty-quickcheck, text - , text-short - }: - mkDerivation { - pname = "base64"; - version = "0.4.2"; - sha256 = "1q3cz1d2zj2bi57g4yrfk1bbfqrcppl6nh0g5fb5dpmf2wdrfv44"; - revision = "3"; - editedCabalFile = "1vjzv8d8yd18nz3pvm8003h3gnj1d45c6g74vd2qqawypwcwhm6b"; - libraryHaskellDepends = [ - base bytestring ghc-byteorder text text-short - ]; - testHaskellDepends = [ - base base64-bytestring bytestring QuickCheck quickcheck-instances - random-bytestring tasty tasty-hunit tasty-quickcheck text - text-short - ]; - benchmarkHaskellDepends = [ - base base64-bytestring bytestring criterion deepseq memory - random-bytestring text - ]; - description = "A modern RFC 4648-compliant Base64 library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "base64_0_4_2_1" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, criterion , deepseq, ghc-byteorder, QuickCheck, quickcheck-instances , random-bytestring, tasty, tasty-hunit, tasty-quickcheck, text @@ -37366,7 +37283,6 @@ self: { ]; description = "Fast RFC 4648-compliant Base64 encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base64-bytes" = callPackage @@ -47795,26 +47711,6 @@ self: { }) {}; "cabal-rpm" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , http-client, http-client-tls, http-conduit, optparse-applicative - , process, simple-cabal, simple-cmd, simple-cmd-args, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; - version = "2.0.5.1"; - sha256 = "1rpgl7msqr0v3rd11qyp05hv2crgmr59wk4jryx610f6mp7y5rrb"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring Cabal directory filepath http-client - http-client-tls http-conduit optparse-applicative process - simple-cabal simple-cmd simple-cmd-args time unix - ]; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "cabal-rpm_2_0_6" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, extra , filepath, http-client, http-client-tls, http-conduit , optparse-applicative, process, simple-cabal, simple-cmd @@ -47833,7 +47729,6 @@ self: { ]; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-scripts" = callPackage @@ -54543,28 +54438,6 @@ self: { }) {}; "climb" = callPackage - ({ mkDerivation, base, bytestring, containers, exceptions - , linenoise, mtl, text, unliftio-core - }: - mkDerivation { - pname = "climb"; - version = "0.3.1"; - sha256 = "0d9f0h0zk9ga349bvdaq6ch9xi3hynadi6r4mcmy7hcigckk2j7r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers exceptions linenoise mtl text - unliftio-core - ]; - executableHaskellDepends = [ - base bytestring containers exceptions linenoise mtl text - unliftio-core - ]; - description = "Building blocks for a GHCi-like REPL with colon-commands"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "climb_0_3_3" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions , linenoise, mtl, text, unliftio-core }: @@ -54584,7 +54457,6 @@ self: { ]; description = "Building blocks for a GHCi-like REPL with colon-commands"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clingo" = callPackage @@ -68595,33 +68467,6 @@ self: { }) {}; "dbus" = callPackage - ({ mkDerivation, base, bytestring, cereal, conduit, containers - , criterion, deepseq, directory, exceptions, extra, filepath, lens - , network, parsec, process, QuickCheck, random, resourcet, split - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text - , th-lift, transformers, unix, vector, xml-conduit, xml-types - }: - mkDerivation { - pname = "dbus"; - version = "1.2.15.1"; - sha256 = "1fq1ds5lkgysi5cpbwh97233vil6w9djxn6dcp5sjj7r5gb76vj7"; - libraryHaskellDepends = [ - base bytestring cereal conduit containers deepseq exceptions - filepath lens network parsec random split template-haskell text - th-lift transformers unix vector xml-conduit xml-types - ]; - testHaskellDepends = [ - base bytestring cereal containers directory extra filepath network - parsec process QuickCheck random resourcet tasty tasty-hunit - tasty-quickcheck text transformers unix vector - ]; - benchmarkHaskellDepends = [ base criterion ]; - doCheck = false; - description = "A client library for the D-Bus IPC system"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "dbus_1_2_16" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, containers , criterion, deepseq, directory, exceptions, extra, filepath, lens , network, parsec, process, QuickCheck, random, resourcet, split @@ -68646,7 +68491,6 @@ self: { doCheck = false; description = "A client library for the D-Bus IPC system"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbus-client" = callPackage @@ -69901,22 +69745,6 @@ self: { }) {}; "dejafu" = callPackage - ({ mkDerivation, base, concurrency, containers, contravariant - , deepseq, exceptions, leancheck, profunctors, random, transformers - }: - mkDerivation { - pname = "dejafu"; - version = "2.3.0.0"; - sha256 = "09lqniw3gacyykmk23vl4icyhiixdyjps50cwvcmlwd8k4941gwa"; - libraryHaskellDepends = [ - base concurrency containers contravariant deepseq exceptions - leancheck profunctors random transformers - ]; - description = "A library for unit-testing concurrent programs"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dejafu_2_3_0_1" = callPackage ({ mkDerivation, base, concurrency, containers, contravariant , deepseq, exceptions, leancheck, profunctors, random, transformers }: @@ -69930,7 +69758,6 @@ self: { ]; description = "A library for unit-testing concurrent programs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deka" = callPackage @@ -77073,20 +76900,6 @@ self: { }) {}; "dsp" = callPackage - ({ mkDerivation, array, base, containers, QuickCheck, random }: - mkDerivation { - pname = "dsp"; - version = "0.2.5"; - sha256 = "1lka6l0xf3p7cb9ikzvszwgr7pl3gjm0s5v312p6k4w1fqqsycl5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ array base containers random ]; - testHaskellDepends = [ array base containers QuickCheck ]; - description = "Haskell Digital Signal Processing"; - license = "GPL"; - }) {}; - - "dsp_0_2_5_1" = callPackage ({ mkDerivation, array, base, containers, QuickCheck, random }: mkDerivation { pname = "dsp"; @@ -77098,7 +76911,6 @@ self: { testHaskellDepends = [ array base containers QuickCheck ]; description = "Haskell Digital Signal Processing"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dstring" = callPackage @@ -82340,34 +82152,6 @@ self: { }) {}; "esqueleto" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql - , mysql-simple, persistent, persistent-mysql, persistent-postgresql - , persistent-sqlite, persistent-template, postgresql-libpq - , postgresql-simple, resourcet, tagged, text, time, transformers - , unliftio, unordered-containers, vector - }: - mkDerivation { - pname = "esqueleto"; - version = "3.3.3.0"; - sha256 = "19zzqmaciski4ara41djkh1df17nzqw2nfwzc81zv6d3pylaznq1"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - monad-logger persistent resourcet tagged text time transformers - unliftio unordered-containers - ]; - testHaskellDepends = [ - aeson attoparsec base blaze-html bytestring conduit containers - exceptions hspec monad-logger mtl mysql mysql-simple persistent - persistent-mysql persistent-postgresql persistent-sqlite - persistent-template postgresql-libpq postgresql-simple resourcet - tagged text time transformers unliftio unordered-containers vector - ]; - description = "Type-safe EDSL for SQL queries on persistent backends"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "esqueleto_3_3_3_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql , mysql-simple, persistent, persistent-mysql, persistent-postgresql @@ -82393,7 +82177,6 @@ self: { ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ess" = callPackage @@ -90175,25 +89958,6 @@ self: { }) {}; "fold-debounce-conduit" = callPackage - ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet - , stm, transformers, transformers-base - }: - mkDerivation { - pname = "fold-debounce-conduit"; - version = "0.2.0.4"; - sha256 = "0mhnc5j8jnmf4rnb5cj75jlyj9xc4gj3dawywcw26zz189j540fj"; - libraryHaskellDepends = [ - base conduit fold-debounce resourcet stm transformers - transformers-base - ]; - testHaskellDepends = [ - base conduit hspec resourcet stm transformers - ]; - description = "Regulate input traffic from conduit Source with Control.FoldDebounce"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fold-debounce-conduit_0_2_0_5" = callPackage ({ mkDerivation, base, conduit, fold-debounce, hspec, resourcet , stm, transformers, transformers-base }: @@ -90210,7 +89974,6 @@ self: { ]; description = "Regulate input traffic from conduit Source with Control.FoldDebounce"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foldable1" = callPackage @@ -98001,26 +97764,6 @@ self: { }) {}; "ghc-typelits-presburger" = callPackage - ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, mtl - , pretty, reflection, syb, transformers - }: - mkDerivation { - pname = "ghc-typelits-presburger"; - version = "0.3.0.0"; - sha256 = "1jahwmy2cywnnlvrjizak1wqih7pki9r35qazcz7mih68pd9gnhz"; - revision = "1"; - editedCabalFile = "0kh04p9n9q74n84vrzrybkd45alwzhll8m6xwn8nzi1bxpilrhm4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers ghc ghc-tcplugins-extra mtl pretty reflection syb - transformers - ]; - description = "Presburger Arithmetic Solver for GHC Type-level natural numbers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-typelits-presburger_0_3_0_1" = callPackage ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, mtl , pretty, reflection, syb, transformers }: @@ -98036,7 +97779,6 @@ self: { ]; description = "Presburger Arithmetic Solver for GHC Type-level natural numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-usage" = callPackage @@ -99604,8 +99346,8 @@ self: { }: mkDerivation { pname = "gi-harfbuzz"; - version = "0.0.1"; - sha256 = "1haxa993mi1x6z2hpbv09ybrfl0i5ha5wb0cfv8wg1v461wajfxp"; + version = "0.0.2"; + sha256 = "15l5iwnj9awd04626mqagd4rldxi2byr53gvqqnlxljbskb7ch2m"; setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -107023,27 +106765,6 @@ self: { }) {}; "greskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover - , exceptions, greskell-core, hashable, hint, hspec, semigroups - , text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "greskell"; - version = "1.1.0.2"; - sha256 = "0q8grqi9pslpwnh2a8frcvfw0gq71asm6m9748v97h4xqry116jg"; - libraryHaskellDepends = [ - aeson base exceptions greskell-core hashable semigroups text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring doctest doctest-discover greskell-core hint - hspec text unordered-containers - ]; - description = "Haskell binding for Gremlin graph query language"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "greskell_1_1_0_3" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover , exceptions, greskell-core, hashable, hint, hspec, semigroups , text, transformers, unordered-containers, vector @@ -107062,31 +106783,9 @@ self: { ]; description = "Haskell binding for Gremlin graph query language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "greskell-core" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , doctest-discover, hashable, hspec, QuickCheck, scientific - , semigroups, text, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "greskell-core"; - version = "0.1.3.4"; - sha256 = "03w4glzlavj57mak1nn7qxafr937z9afwdaaaj5i8spjpr2vz4hr"; - libraryHaskellDepends = [ - aeson base containers hashable scientific semigroups text - unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson base bytestring doctest doctest-discover hspec QuickCheck - text unordered-containers vector - ]; - description = "Haskell binding for Gremlin graph query language - core data types and tools"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "greskell-core_0_1_3_5" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , doctest-discover, hashable, hspec, QuickCheck, scientific , semigroups, text, unordered-containers, uuid, vector @@ -107105,32 +106804,9 @@ self: { ]; description = "Haskell binding for Gremlin graph query language - core data types and tools"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "greskell-websocket" = callPackage - ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , greskell-core, hashtables, hspec, safe-exceptions, stm, text - , unordered-containers, uuid, vector, websockets - }: - mkDerivation { - pname = "greskell-websocket"; - version = "0.1.2.3"; - sha256 = "0jxckcjpdy1j5bbjdw37rc9sbnyznc7awifmjrcliy2yk1dwdj6w"; - libraryHaskellDepends = [ - aeson async base base64-bytestring bytestring greskell-core - hashtables safe-exceptions stm text unordered-containers uuid - vector websockets - ]; - testHaskellDepends = [ - aeson base bytestring greskell-core hspec unordered-containers uuid - vector - ]; - description = "Haskell client for Gremlin Server using WebSocket serializer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "greskell-websocket_0_1_2_4" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , greskell-core, hashtables, hspec, safe-exceptions, stm, text , unordered-containers, uuid, vector, websockets @@ -107150,7 +106826,6 @@ self: { ]; description = "Haskell client for Gremlin Server using WebSocket serializer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grid" = callPackage @@ -114630,7 +114305,7 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - "haskell-gi_0_24_1" = callPackage + "haskell-gi_0_24_2" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, directory, doctest, filepath, glib , gobject-introspection, haskell-gi-base, mtl, pretty-show, process @@ -114638,8 +114313,8 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.24.1"; - sha256 = "1j862byqapw224rkv9xry4nxqszhxsfdny0c5lf4rgykmaxkh777"; + version = "0.24.2"; + sha256 = "1m7zcmqr9alq6bbq04szxwypvhxv54ns1f2gw9af7k4pv5mwn2p9"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ansi-terminal attoparsec base bytestring Cabal containers directory @@ -114665,12 +114340,12 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; - "haskell-gi-base_0_24_0" = callPackage + "haskell-gi-base_0_24_1" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.24.0"; - sha256 = "0xkjfn20xkwqshasydqzc4v141qpd202yjrj1xvasl2j3rkl4m6c"; + version = "0.24.1"; + sha256 = "0d777sqi1wjhgw1avsp7b1ps2irblvpr0bpnzbw1ybv3yhb49zmr"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -117071,8 +116746,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.34.1"; - sha256 = "1i5xpygarb6vbx6l2k34wdj1jy5d9g6wp4ikp2vjkygnr18b7nm9"; + version = "0.34.2"; + sha256 = "0zfgw30y9yv2nx6rnh7fw44l9a19gr2c9p8xcqhpswllv4jy7w33"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117112,8 +116787,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.34.1"; - sha256 = "0q169kwli4ws3lkiyfb2ln9p9r8d6kv914hh06h8dx3q2ggijnkw"; + version = "0.34.2"; + sha256 = "0bl5kibh7q3awgbiyhw5mvak2jxc4rd3wajb52llfhslrghj6kx1"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network @@ -120512,6 +120187,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedgehog_1_0_3" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring + , concurrent-output, containers, deepseq, directory, erf + , exceptions, fail, lifted-async, mmorph, monad-control, mtl + , pretty-show, primitive, random, resourcet, semigroups, stm + , template-haskell, text, time, transformers, transformers-base + , wl-pprint-annotated + }: + mkDerivation { + pname = "hedgehog"; + version = "1.0.3"; + sha256 = "10lv574491zldqzin433z0vqkq43f0v3shjf78j395y0g1jyky9m"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring concurrent-output containers + deepseq directory erf exceptions fail lifted-async mmorph + monad-control mtl pretty-show primitive random resourcet semigroups + stm template-haskell text time transformers transformers-base + wl-pprint-annotated + ]; + testHaskellDepends = [ + base containers mmorph mtl pretty-show semigroups text transformers + ]; + description = "Release with confidence"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedgehog-checkers" = callPackage ({ mkDerivation, base, containers, either, hedgehog, semigroupoids , semigroups @@ -120576,18 +120278,6 @@ self: { }) {}; "hedgehog-fakedata" = callPackage - ({ mkDerivation, base, containers, fakedata, hedgehog, random }: - mkDerivation { - pname = "hedgehog-fakedata"; - version = "0.0.1.2"; - sha256 = "1fzvpicpmm39wiyj3phsdigsq3fh8lax9yjq7a28dhy6qiclp3y0"; - libraryHaskellDepends = [ base fakedata hedgehog random ]; - testHaskellDepends = [ base containers fakedata hedgehog ]; - description = "Use 'fakedata' with 'hedgehog'"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedgehog-fakedata_0_0_1_3" = callPackage ({ mkDerivation, base, containers, fakedata, hedgehog, random }: mkDerivation { pname = "hedgehog-fakedata"; @@ -120597,7 +120287,6 @@ self: { testHaskellDepends = [ base containers fakedata hedgehog ]; description = "Use 'fakedata' with 'hedgehog'"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedgehog-fn" = callPackage @@ -123293,34 +122982,6 @@ self: { }) {}; "hie-bios" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , conduit, conduit-extra, containers, cryptohash-sha1, deepseq - , directory, extra, file-embed, filepath, ghc, hslogger, process - , tasty, tasty-hunit, temporary, text, time, transformers - , unix-compat, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "hie-bios"; - version = "0.5.0"; - sha256 = "1096d9i4xx1ca9csm2gqi4wnm8q8wya4a5k37qc5ihwix531wx02"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring conduit conduit-extra - containers cryptohash-sha1 deepseq directory extra file-embed - filepath ghc hslogger process temporary text time transformers - unix-compat unordered-containers vector yaml - ]; - executableHaskellDepends = [ base directory filepath ghc ]; - testHaskellDepends = [ - base directory extra filepath ghc tasty tasty-hunit text - unordered-containers yaml - ]; - description = "Set up a GHC API session"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hie-bios_0_5_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, conduit-extra, containers, cryptohash-sha1, deepseq , directory, extra, file-embed, filepath, ghc, hslogger, process @@ -123346,7 +123007,6 @@ self: { ]; description = "Set up a GHC API session"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hie-core" = callPackage @@ -132925,20 +132585,6 @@ self: { }) {}; "hspec-need-env" = callPackage - ({ mkDerivation, base, hspec, hspec-core, hspec-expectations - , setenv, transformers - }: - mkDerivation { - pname = "hspec-need-env"; - version = "0.1.0.4"; - sha256 = "0cb6jr0mqhaylqdky38s8plgs9w8hk1pi135yxggr707bnhwsplg"; - libraryHaskellDepends = [ base hspec-core hspec-expectations ]; - testHaskellDepends = [ base hspec hspec-core setenv transformers ]; - description = "Read environment variables for hspec tests"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hspec-need-env_0_1_0_5" = callPackage ({ mkDerivation, base, hspec, hspec-core, hspec-expectations , setenv, transformers }: @@ -132950,7 +132596,6 @@ self: { testHaskellDepends = [ base hspec hspec-core setenv transformers ]; description = "Read environment variables for hspec tests"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-parsec" = callPackage @@ -157228,36 +156873,6 @@ self: { }) {}; "linear" = callPackage - ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes - , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq - , distributive, doctest, ghc-prim, hashable, HUnit, lens, random - , reflection, semigroupoids, semigroups, simple-reflect, tagged - , template-haskell, test-framework, test-framework-hunit - , transformers, transformers-compat, unordered-containers, vector - , void - }: - mkDerivation { - pname = "linear"; - version = "1.21"; - sha256 = "1i00j740fpxrbdy1kjzwjxqixk975rd0dh6jxk0da622spabym5a"; - revision = "1"; - editedCabalFile = "1ld4165qy07iph2d6pq3rxqn8158bciga7m839rhsd1ay4sjxq2d"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - adjunctions base base-orphans binary bytes cereal containers - deepseq distributive ghc-prim hashable lens random reflection - semigroupoids semigroups tagged template-haskell transformers - transformers-compat unordered-containers vector void - ]; - testHaskellDepends = [ - base binary bytestring deepseq doctest HUnit lens reflection - simple-reflect test-framework test-framework-hunit vector - ]; - description = "Linear Algebra"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "linear_1_21_1" = callPackage ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes , bytestring, Cabal, cabal-doctest, cereal, containers, deepseq , distributive, doctest, ghc-prim, hashable, HUnit, lens, random @@ -157283,7 +156898,6 @@ self: { ]; description = "Linear Algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linear-accelerate" = callPackage @@ -164151,33 +163765,6 @@ self: { }) {}; "massiv" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-doctest - , data-default-class, deepseq, doctest, exceptions - , mersenne-random-pure64, primitive, QuickCheck, random, scheduler - , splitmix, template-haskell, unliftio-core, vector - }: - mkDerivation { - pname = "massiv"; - version = "0.5.2.0"; - sha256 = "0j44as40bgzjixiga4l06gr3fpgk8vifmz2y12asczxwfv6k0xp1"; - revision = "1"; - editedCabalFile = "0vrfkbnav9vhi896d13yalsrz8d4d1lfwhwl4vc9b6syz6hf2j8y"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq exceptions primitive - scheduler unliftio-core vector - ]; - testHaskellDepends = [ - base doctest mersenne-random-pure64 QuickCheck random splitmix - template-haskell - ]; - description = "Massiv (Массив) is an Array Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "massiv_0_5_3_1" = callPackage ({ mkDerivation, base, bytestring, data-default-class, deepseq , doctest, exceptions, mersenne-random-pure64, primitive , QuickCheck, random, scheduler, splitmix, template-haskell @@ -164273,30 +163860,6 @@ self: { }) {}; "massiv-test" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default - , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec - , massiv, mwc-random, primitive, QuickCheck, scheduler, unliftio - , vector - }: - mkDerivation { - pname = "massiv-test"; - version = "0.1.3"; - sha256 = "1pkqaw43vzsh19ycr6pp817wq2k06gpkxqn8i09dkfzddbgymkf6"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq exceptions hspec massiv - primitive QuickCheck scheduler unliftio vector - ]; - testHaskellDepends = [ - base bytestring containers data-default deepseq genvalidity-hspec - hspec massiv mwc-random QuickCheck scheduler vector - ]; - description = "Library that contains generators, properties and tests for Massiv Array Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "massiv-test_0_1_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec , massiv, mwc-random, primitive, QuickCheck, scheduler, unliftio @@ -167783,23 +167346,6 @@ self: { }) {}; "min-max-pqueue" = callPackage - ({ mkDerivation, base, containers, criterion, hedgehog - , integer-logarithms, random - }: - mkDerivation { - pname = "min-max-pqueue"; - version = "0.1.0.1"; - sha256 = "09lby8qvjrcdp7ygy4a4dcw8w3y689qzazbcd55249z7ljjw731s"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ base containers hedgehog ]; - benchmarkHaskellDepends = [ - base containers criterion integer-logarithms random - ]; - description = "Double-ended priority queues"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "min-max-pqueue_0_1_0_2" = callPackage ({ mkDerivation, base, containers, criterion, hedgehog , integer-logarithms, random }: @@ -167814,7 +167360,6 @@ self: { ]; description = "Double-ended priority queues"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "minecraft" = callPackage @@ -168665,24 +168210,25 @@ self: { "miv" = callPackage ({ mkDerivation, aeson, async, base, concurrent-output, directory - , ghc-prim, hashable, hspec, monad-parallel, process, text, time - , unordered-containers, yaml + , filepath, ghc-prim, hashable, hspec, monad-parallel, process + , text, time, unix-compat, unordered-containers, xdg-basedir, yaml }: mkDerivation { pname = "miv"; - version = "0.3.0"; - sha256 = "1s4xkr6mrlwvmxh4v63yzljsz96v5fy9mws8xwmbybqrlpqgc5qy"; + version = "0.4.2"; + sha256 = "0yhfinygsb2fnjspg87fx447kajrbldhddm24vxl41741xmwjl8a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson async base concurrent-output directory ghc-prim hashable - monad-parallel process text time unordered-containers yaml + aeson async base concurrent-output directory filepath ghc-prim + hashable monad-parallel process text time unix-compat + unordered-containers xdg-basedir yaml ]; testHaskellDepends = [ aeson base directory ghc-prim hashable hspec monad-parallel process text time unordered-containers yaml ]; - description = "Manage Vim plugins with command"; + description = "Vim plugin manager written in Haskell"; license = stdenv.lib.licenses.mit; }) {}; @@ -180113,8 +179659,8 @@ self: { }: mkDerivation { pname = "nom"; - version = "0.1.0.0"; - sha256 = "17vwi6rna2zscw8n34zyx1vmsa0dkl02r1ji362pn1p0v0yclii5"; + version = "0.1.0.1"; + sha256 = "01dg6h98pdzhrwryzhcmjrynxv6674pjpklkxkrpaymy29a9c9a0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ algebra base containers data-default extra finite-typelits flow @@ -181293,25 +180839,6 @@ self: { }) {}; "numeric-prelude" = callPackage - ({ mkDerivation, array, base, containers, deepseq, non-negative - , parsec, QuickCheck, random, semigroups, storable-record - , utility-ht - }: - mkDerivation { - pname = "numeric-prelude"; - version = "0.4.3.1"; - sha256 = "0531yjw1rzbv3snv1lc955350frgf8526slsxbx3ias71krbdr69"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base containers deepseq non-negative parsec QuickCheck random - semigroups storable-record utility-ht - ]; - description = "An experimental alternative hierarchy of numeric type classes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "numeric-prelude_0_4_3_2" = callPackage ({ mkDerivation, array, base, containers, deepseq, non-negative , parsec, QuickCheck, random, semigroups, storable-record , utility-ht @@ -181328,7 +180855,6 @@ self: { ]; description = "An experimental alternative hierarchy of numeric type classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numeric-qq" = callPackage @@ -185373,33 +184899,6 @@ self: { }) {}; "ormolu" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, exceptions - , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl - , optparse-applicative, path, path-io, syb, text - }: - mkDerivation { - pname = "ormolu"; - version = "0.1.0.0"; - sha256 = "1wpdj04hpnkk60swhx9d9cyazkgkjn2kkzmix7q1mil7hq23ynnp"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers dlist exceptions ghc-lib-parser mtl syb - text - ]; - executableHaskellDepends = [ - base ghc-lib-parser gitrev optparse-applicative text - ]; - testHaskellDepends = [ - base containers filepath hspec path path-io text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ormolu_0_1_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, exceptions , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl , optparse-applicative, path, path-io, syb, text @@ -185424,7 +184923,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "os-release" = callPackage @@ -186402,41 +185900,6 @@ self: { }) {}; "pandoc-citeproc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , Cabal, containers, data-default, directory, filepath, hs-bibutils - , HsYAML, HsYAML-aeson, libyaml, mtl, network, old-locale, pandoc - , pandoc-types, parsec, process, rfc5051, safe, setenv, split, syb - , tagsoup, temporary, text, time, unordered-containers, vector - , xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.17"; - sha256 = "1cgmv8zdiqcbls7c6rqdd154z5r90p9wxrdy6nwmxma8qfmfgaa7"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils HsYAML HsYAML-aeson mtl network old-locale pandoc - pandoc-types parsec rfc5051 setenv split syb tagsoup text time - unordered-containers vector xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath libyaml - pandoc pandoc-types safe syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath mtl pandoc - pandoc-types process temporary text yaml - ]; - doCheck = false; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-citeproc_0_17_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils , HsYAML, HsYAML-aeson, libyaml, mtl, network, old-locale, pandoc @@ -186469,7 +185932,6 @@ self: { doCheck = false; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-citeproc-preamble" = callPackage @@ -189371,25 +188833,6 @@ self: { }) {}; "pathtype" = callPackage - ({ mkDerivation, base, deepseq, directory, old-time, QuickCheck - , random, semigroups, tagged, time, transformers, utility-ht - }: - mkDerivation { - pname = "pathtype"; - version = "0.8.1"; - sha256 = "03rlj8klzxqimjv44h07xbij0acr63pddxppq9yfjlyggmaxrrnm"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base deepseq directory old-time QuickCheck semigroups tagged time - transformers utility-ht - ]; - testHaskellDepends = [ base random ]; - description = "Type-safe replacement for System.FilePath etc"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pathtype_0_8_1_1" = callPackage ({ mkDerivation, base, deepseq, directory, old-time, QuickCheck , random, semigroups, tagged, time, transformers, utility-ht }: @@ -189406,7 +188849,6 @@ self: { testHaskellDepends = [ base random ]; description = "Type-safe replacement for System.FilePath etc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pathwalk" = callPackage @@ -203135,30 +202577,6 @@ self: { }) {}; "pusher-http-haskell" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , cryptonite, hashable, hspec, http-client, http-types, memory - , QuickCheck, scientific, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "pusher-http-haskell"; - version = "1.5.1.13"; - sha256 = "0hdipa1i5l4d60i70c1li585jc4biq0af6l826rzfhlpwjgzlh7z"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hashable - http-client http-types memory text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring cryptonite hspec - http-client http-types QuickCheck scientific text time transformers - unordered-containers vector - ]; - description = "Haskell client library for the Pusher HTTP API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pusher-http-haskell_1_5_1_14" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, hashable, hspec, http-client, http-types, memory , QuickCheck, scientific, text, time, transformers @@ -203180,7 +202598,6 @@ self: { ]; description = "Haskell client library for the Pusher Channels HTTP API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pusher-ws" = callPackage @@ -204749,17 +204166,6 @@ self: { }) {}; "quickcheck-transformer" = callPackage - ({ mkDerivation, base, QuickCheck, random, transformers }: - mkDerivation { - pname = "quickcheck-transformer"; - version = "0.3.1"; - sha256 = "1jbn17gp2f5ppm83vs2gd3fcbkv3km45qfjgr6qz532ks1a8k0fl"; - libraryHaskellDepends = [ base QuickCheck random transformers ]; - description = "A GenT monad transformer for QuickCheck library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "quickcheck-transformer_0_3_1_1" = callPackage ({ mkDerivation, base, QuickCheck, random, transformers }: mkDerivation { pname = "quickcheck-transformer"; @@ -204768,7 +204174,6 @@ self: { libraryHaskellDepends = [ base QuickCheck random transformers ]; description = "A GenT monad transformer for QuickCheck library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-unicode" = callPackage @@ -212610,22 +212015,6 @@ self: { }) {}; "resourcet" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, mtl - , primitive, transformers, unliftio-core - }: - mkDerivation { - pname = "resourcet"; - version = "1.2.4.1"; - sha256 = "0h67w4x5k4ykyks3ppwfc49n6qgwl3bzzpfcg02l6rmwqqc2zq12"; - libraryHaskellDepends = [ - base containers exceptions mtl primitive transformers unliftio-core - ]; - testHaskellDepends = [ base exceptions hspec transformers ]; - description = "Deterministic allocation and freeing of scarce resources"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "resourcet_1_2_4_2" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, mtl , primitive, transformers, unliftio-core }: @@ -212639,7 +212028,6 @@ self: { testHaskellDepends = [ base exceptions hspec transformers ]; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "respond" = callPackage @@ -218081,35 +217469,6 @@ self: { }) {}; "scheduler" = callPackage - ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest - , criterion, deepseq, doctest, exceptions, genvalidity-hspec, hspec - , monad-par, mwc-random, parallel, primitive, QuickCheck, streamly - , template-haskell, unliftio, unliftio-core, vector - }: - mkDerivation { - pname = "scheduler"; - version = "1.4.2.2"; - sha256 = "0mzwm7lr089hbv08c58l3ahiid8w1cysvjl9q6vb46x3wpa3fwia"; - revision = "2"; - editedCabalFile = "1rjh1c8m2mmjsxgpqsi1b7y27jpvvwjrlvaa1fsc0lqnrkgmarl3"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - atomic-primops base deepseq exceptions primitive unliftio-core - ]; - testHaskellDepends = [ - base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck - template-haskell unliftio vector - ]; - benchmarkHaskellDepends = [ - async base criterion deepseq monad-par parallel streamly unliftio - ]; - description = "Work stealing scheduler"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "scheduler_1_4_2_3" = callPackage ({ mkDerivation, atomic-primops, base, deepseq, doctest, exceptions , genvalidity-hspec, hspec, mwc-random, primitive, QuickCheck , template-haskell, unliftio, unliftio-core, vector @@ -225340,6 +224699,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "shake-plus_0_1_8_0" = callPackage + ({ mkDerivation, base, comonad, extra, hashable, path, rio, shake + , within + }: + mkDerivation { + pname = "shake-plus"; + version = "0.1.8.0"; + sha256 = "1p92f5npf1f75lpmkkhvf8rbz67536rd383dqfjaa05wwr1il696"; + libraryHaskellDepends = [ + base comonad extra hashable path rio shake within + ]; + description = "Re-export of Shake using well-typed paths and ReaderT"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shakebook" = callPackage ({ mkDerivation, aeson, aeson-with, base, comonad, comonad-extras , doctemplates, feed, free, ixset-typed, lens, lens-aeson, mustache @@ -228096,23 +227471,6 @@ self: { }) {}; "singletons-presburger" = callPackage - ({ mkDerivation, base, ghc, ghc-typelits-presburger, reflection - , singletons - }: - mkDerivation { - pname = "singletons-presburger"; - version = "0.3.0.0"; - sha256 = "06djkc6y5clv0q903i04gaq0vri3nkk307znb418y0rfdh6czzwx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base ghc ghc-typelits-presburger reflection singletons - ]; - description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "singletons-presburger_0_3_0_1" = callPackage ({ mkDerivation, base, ghc, ghc-typelits-presburger, reflection , singletons }: @@ -228127,7 +227485,6 @@ self: { ]; description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "singnal" = callPackage @@ -231854,8 +231211,8 @@ self: { }: mkDerivation { pname = "socket"; - version = "0.8.2.0"; - sha256 = "176px9n2f8mnxi3r2sqshrpbp7i11fskch1nkjhgqzq917sz0zgb"; + version = "0.8.3.0"; + sha256 = "0gd0rw6mpzlimvcn3jiw7l0q9h4l3rhfr2n5hhg6k0bkklqp6rbr"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck @@ -235515,29 +234872,6 @@ self: { }) {}; "stackcollapse-ghc" = callPackage - ({ mkDerivation, base, bytestring, containers, extra, foldl, hspec - , hspec-golden, recursion-schemes, rosezipper, safe, text - , transformers, utf8-string - }: - mkDerivation { - pname = "stackcollapse-ghc"; - version = "0.0.1"; - sha256 = "0skpikc7yvdqcdaxqiyav4dk6k0sqng9160dgi4yfx54f5za1a64"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring containers extra foldl recursion-schemes rosezipper - safe text transformers - ]; - testHaskellDepends = [ - base bytestring containers extra foldl hspec hspec-golden - recursion-schemes rosezipper safe text transformers utf8-string - ]; - description = "Program to fold GHC prof files into flamegraph input"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "stackcollapse-ghc_0_0_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, extra, foldl, hspec , hspec-golden, recursion-schemes, rosezipper, safe, text , transformers, utf8-string @@ -235560,7 +234894,6 @@ self: { ]; description = "Program to fold GHC prof files into flamegraph input"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stacked-dag" = callPackage @@ -237211,29 +236544,6 @@ self: { }) {}; "storablevector" = callPackage - ({ mkDerivation, base, bytestring, deepseq, non-negative - , QuickCheck, random, sample-frame, semigroups, syb, transformers - , unsafe, utility-ht - }: - mkDerivation { - pname = "storablevector"; - version = "0.2.13"; - sha256 = "1zmr738vwnhnyxbikayqnaz31ilv2qlmscp6iqgl7adcfbal4dzq"; - libraryHaskellDepends = [ - base deepseq non-negative QuickCheck semigroups syb transformers - unsafe utility-ht - ]; - testHaskellDepends = [ - base bytestring QuickCheck random utility-ht - ]; - benchmarkHaskellDepends = [ - base deepseq sample-frame unsafe utility-ht - ]; - description = "Fast, packed, strict storable arrays with a list interface like ByteString"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "storablevector_0_2_13_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, non-negative , QuickCheck, random, sample-frame, semigroups, syb, transformers , unsafe, utility-ht @@ -237254,7 +236564,6 @@ self: { ]; description = "Fast, packed, strict storable arrays with a list interface like ByteString"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "storablevector-carray" = callPackage @@ -240918,31 +240227,6 @@ self: { }) {}; "swish" = callPackage - ({ mkDerivation, base, containers, directory, filepath, hashable - , HUnit, intern, mtl, network-uri, old-locale, polyparse - , semigroups, test-framework, test-framework-hunit, text, time - }: - mkDerivation { - pname = "swish"; - version = "0.10.0.3"; - sha256 = "0cl34mqbda1k4spv86y8v5x0d89lv80b8dxymc7iw5hpjks1cdx3"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base containers directory filepath hashable intern mtl network-uri - old-locale polyparse text time - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base containers hashable HUnit network-uri old-locale semigroups - test-framework test-framework-hunit text time - ]; - description = "A semantic web toolkit"; - license = stdenv.lib.licenses.lgpl21; - }) {}; - - "swish_0_10_0_4" = callPackage ({ mkDerivation, base, containers, directory, filepath, hashable , HUnit, intern, mtl, network-uri, old-locale, polyparse , semigroups, test-framework, test-framework-hunit, text, time @@ -240965,7 +240249,6 @@ self: { ]; description = "A semantic web toolkit"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sws" = callPackage @@ -243865,17 +243148,6 @@ self: { }) {}; "tasty-dejafu" = callPackage - ({ mkDerivation, base, dejafu, random, tagged, tasty }: - mkDerivation { - pname = "tasty-dejafu"; - version = "2.0.0.4"; - sha256 = "0jryp6kndaaxfjd4vsws18igx9ivd36iqyqdbjpxmxbx34d1h6kn"; - libraryHaskellDepends = [ base dejafu random tagged tasty ]; - description = "Deja Fu support for the Tasty test framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-dejafu_2_0_0_5" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; @@ -243884,7 +243156,6 @@ self: { libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-discover" = callPackage @@ -265853,39 +265124,6 @@ self: { }) {}; "warp" = callPackage - ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, directory, gauge - , ghc-prim, hashable, hspec, http-client, http-date, http-types - , http2, HUnit, iproute, lifted-base, network, process, QuickCheck - , simple-sendfile, stm, streaming-commons, text, time, time-manager - , unix, unix-compat, vault, wai, word8, x509 - }: - mkDerivation { - pname = "warp"; - version = "3.3.12"; - sha256 = "0fgglpgg2m3nfngymwgzvn467nsg2r0ff36v3xi8jdqwy9x9ia49"; - libraryHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers ghc-prim hashable http-date http-types - http2 iproute network simple-sendfile stm streaming-commons text - time-manager unix unix-compat vault wai word8 x509 - ]; - testHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers directory ghc-prim hashable hspec - http-client http-date http-types http2 HUnit iproute lifted-base - network process QuickCheck simple-sendfile stm streaming-commons - text time time-manager unix unix-compat vault wai word8 x509 - ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers gauge hashable http-date - http-types network time-manager unix unix-compat x509 - ]; - description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "warp_3_3_13" = callPackage ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, gauge , ghc-prim, hashable, hspec, http-client, http-date, http-types @@ -265916,7 +265154,6 @@ self: { ]; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -267909,24 +267146,6 @@ self: { }) {}; "wild-bind" = callPackage - ({ mkDerivation, base, containers, hspec, microlens, QuickCheck - , semigroups, stm, text, transformers - }: - mkDerivation { - pname = "wild-bind"; - version = "0.1.2.5"; - sha256 = "14k1y5klxjvkdh0r041sd6a3jzmylb718azfmz45403lrnh96nq9"; - libraryHaskellDepends = [ - base containers semigroups text transformers - ]; - testHaskellDepends = [ - base hspec microlens QuickCheck stm transformers - ]; - description = "Dynamic key binding framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind_0_1_2_6" = callPackage ({ mkDerivation, base, containers, hspec, microlens, QuickCheck , semigroups, stm, text, transformers }: @@ -267942,7 +267161,6 @@ self: { ]; description = "Dynamic key binding framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wild-bind-indicator" = callPackage @@ -267982,25 +267200,6 @@ self: { }) {}; "wild-bind-x11" = callPackage - ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl - , semigroups, stm, text, time, transformers, wild-bind, X11 - }: - mkDerivation { - pname = "wild-bind-x11"; - version = "0.2.0.9"; - sha256 = "1x3qqnampyxi6bg6279xsw38324fs5gndy1mylp6dndlcf6pw30z"; - libraryHaskellDepends = [ - base containers fold-debounce mtl semigroups stm text transformers - wild-bind X11 - ]; - testHaskellDepends = [ - async base hspec text time transformers wild-bind X11 - ]; - description = "X11-specific implementation for WildBind"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wild-bind-x11_0_2_0_10" = callPackage ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl , semigroups, stm, text, time, transformers, wild-bind, X11 }: @@ -268017,7 +267216,6 @@ self: { ]; description = "X11-specific implementation for WildBind"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wilton-ffi" = callPackage @@ -269124,22 +268322,6 @@ self: { }) {}; "world-peace" = callPackage - ({ mkDerivation, aeson, base, deepseq, doctest, Glob, profunctors - , should-not-typecheck, tagged, tasty, tasty-hunit, text - }: - mkDerivation { - pname = "world-peace"; - version = "1.0.1.0"; - sha256 = "1fx7y9h1yyjc5xn1mpbkwas6p6h06rivzndb545z1qnnp583vzwp"; - libraryHaskellDepends = [ aeson base deepseq profunctors tagged ]; - testHaskellDepends = [ - base doctest Glob should-not-typecheck tasty tasty-hunit text - ]; - description = "Open Union and Open Product Types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "world-peace_1_0_2_0" = callPackage ({ mkDerivation, aeson, base, deepseq, doctest, Glob, profunctors , should-not-typecheck, tagged, tasty, tasty-hunit, text }: @@ -269153,7 +268335,6 @@ self: { ]; description = "Open Union and Open Product Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "worldturtle" = callPackage @@ -273817,27 +272998,6 @@ self: { }) {}; "yesod" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit - , data-default-class, directory, fast-logger, monad-logger - , semigroups, shakespeare, streaming-commons, template-haskell - , text, unix, unordered-containers, wai, wai-extra, wai-logger - , warp, yaml, yesod-core, yesod-form, yesod-persistent - }: - mkDerivation { - pname = "yesod"; - version = "1.6.0.1"; - sha256 = "113qm6x4q2s08l5423j1ksc3bdlbf9pxj4y9p8nf36gbz6dy6xqh"; - libraryHaskellDepends = [ - aeson base bytestring conduit data-default-class directory - fast-logger monad-logger semigroups shakespeare streaming-commons - template-haskell text unix unordered-containers wai wai-extra - wai-logger warp yaml yesod-core yesod-form yesod-persistent - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod_1_6_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit , data-default-class, directory, fast-logger, monad-logger , semigroups, shakespeare, streaming-commons, template-haskell @@ -273856,7 +273016,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-alerts" = callPackage @@ -275819,33 +274978,6 @@ self: { }) {}; "yesod-test" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , bytestring, case-insensitive, conduit, containers, cookie, hspec - , hspec-core, html-conduit, http-types, HUnit, memory, network - , pretty-show, semigroups, text, time, transformers, unliftio - , unliftio-core, wai, wai-extra, xml-conduit, xml-types, yesod-core - , yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.6.9.1"; - sha256 = "01dr3p51nxxj8ihhivi3sdrg1xhjj7pvkzgz59ph823hhh9yd3cx"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html bytestring - case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit memory network pretty-show semigroups text time - transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers cookie hspec html-conduit http-types - HUnit text unliftio unliftio-core wai wai-extra xml-conduit - yesod-core yesod-form - ]; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-test_1_6_10" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , bytestring, case-insensitive, conduit, containers, cookie, hspec , hspec-core, html-conduit, http-types, HUnit, memory, network @@ -275870,7 +275002,6 @@ self: { ]; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test-json" = callPackage From df73cc36317106451d7a90dd5733bb5a1fd52460 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 29 Jun 2020 11:03:06 +0200 Subject: [PATCH 2841/3452] haskellPackages.gi-webkit2: Fix build --- .../development/haskell-modules/configuration-common.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7ade5ede29d6..ea086bacf78f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1419,4 +1419,13 @@ self: super: { # https://github.com/kowainik/policeman/issues/57 policeman = doJailbreak super.policeman; + # 2020-06-29: These three packages have bumped their dependencies for haskell-gi and haskell-gi-base beyond stack-lts. + # Choosing a jailbreak, because a version override would rebuild most of the glibverse and the packages still build with the older version. + gi-javascriptcore = + # Remove these jailbreaks, when assert fails. + assert (pkgs.lib.versionOlder super.haskell-gi-base.version "0.24"); + doJailbreak super.gi-javascriptcore; + gi-soup = doJailbreak super.gi-soup; + gi-webkit2 = doJailbreak super.gi-webkit2; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From fc9f994ee5d49a5ecd7602bd90d43752841b816c Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 29 Jun 2020 16:35:21 +0300 Subject: [PATCH 2842/3452] nixos/gitlab-runner: add more global options (#86946) --- .../continuous-integration/gitlab-runner.nix | 83 +++++++++++++++++-- 1 file changed, 77 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index eacfed85ddff..4cff19839a29 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -1,14 +1,16 @@ { config, lib, pkgs, ... }: +with builtins; with lib; let cfg = config.services.gitlab-runner; hasDocker = config.virtualisation.docker.enable; - hashedServices = with builtins; (mapAttrs' (name: service: nameValuePair - "${name}_${config.networking.hostName}_${ + hashedServices = mapAttrs' + (name: service: nameValuePair + "${name}_${config.networking.hostName}_${ substring 0 12 (hashString "md5" (unsafeDiscardStringContext (toJSON service)))}" service) - cfg.services); + cfg.services; configPath = "$HOME/.gitlab-runner/config.toml"; configureScript = pkgs.writeShellScriptBin "gitlab-runner-configure" ( if (cfg.configFile != null) then '' @@ -76,7 +78,7 @@ let ++ map (v: "--docker-allowed-images ${escapeShellArg v}") service.dockerAllowedImages ++ map (v: "--docker-allowed-services ${escapeShellArg v}") service.dockerAllowedServices ) - ))} && sleep 1 + ))} && sleep 1 || exit 1 fi '') hashedServices)} @@ -89,8 +91,17 @@ let # update global options remarshal --if toml --of json ${configPath} \ - | jq -cM '.check_interval = ${toString cfg.checkInterval} | - .concurrent = ${toString cfg.concurrent}' \ + | jq -cM ${escapeShellArg (concatStringsSep " | " [ + ".check_interval = ${toJSON cfg.checkInterval}" + ".concurrent = ${toJSON cfg.concurrent}" + ".sentry_dsn = ${toJSON cfg.sentryDSN}" + ".listen_address = ${toJSON cfg.prometheusListenAddress}" + ".session_server.listen_address = ${toJSON cfg.sessionServer.listenAddress}" + ".session_server.advertise_address = ${toJSON cfg.sessionServer.advertiseAddress}" + ".session_server.session_timeout = ${toJSON cfg.sessionServer.sessionTimeout}" + "del(.[] | nulls)" + "del(.session_server[] | nulls)" + ])} \ | remarshal --if json --of toml \ | sponge ${configPath} @@ -141,6 +152,66 @@ in 0 does not mean unlimited. ''; }; + sentryDSN = mkOption { + type = types.nullOr types.str; + default = null; + example = "https://public:private@host:port/1"; + description = '' + Data Source Name for tracking of all system level errors to Sentry. + ''; + }; + prometheusListenAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "localhost:8080"; + description = '' + Address (<host>:<port>) on which the Prometheus metrics HTTP server + should be listening. + ''; + }; + sessionServer = mkOption { + type = types.submodule { + options = { + listenAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "0.0.0.0:8093"; + description = '' + An internal URL to be used for the session server. + ''; + }; + advertiseAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "runner-host-name.tld:8093"; + description = '' + The URL that the Runner will expose to GitLab to be used + to access the session server. + Fallbacks to if not defined. + ''; + }; + sessionTimeout = mkOption { + type = types.int; + default = 1800; + description = '' + How long in seconds the session can stay active after + the job completes (which will block the job from finishing). + ''; + }; + }; + }; + default = { }; + example = literalExample '' + { + listenAddress = "0.0.0.0:8093"; + } + ''; + description = '' + The session server allows the user to interact with jobs + that the Runner is responsible for. A good example of this is the + interactive web terminal. + ''; + }; gracefulTermination = mkOption { type = types.bool; default = false; From c36b573fab1b559d62da62555193fa32368c482b Mon Sep 17 00:00:00 2001 From: Philipp Riegger Date: Mon, 29 Jun 2020 15:39:41 +0200 Subject: [PATCH 2843/3452] factorio{,-headless}-experimental: 0.18.32 -> 0.18.34 --- pkgs/games/factorio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 3b47cb40ad0f..490b5dff5720 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -53,11 +53,11 @@ let x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { stable = bdist { sha256 = "1fg2wnia6anzya4m53jf2xqwwspvwskz3awdb3j0v3fzijps94wc"; version = "0.17.79"; withAuth = true; }; - experimental = bdist { sha256 = "1h0gv7cdn999hm2fl93kq6g98bzd1x3c8afq8v0a04dqjarjgr86"; version = "0.18.32"; withAuth = true; }; + experimental = bdist { sha256 = "1idhq836xk1qvhlval28rskqkw06x8hh0izfw9vsf06xym2knkyf"; version = "0.18.34"; withAuth = true; }; }; headless = { stable = bdist { sha256 = "1pr39nm23fj83jy272798gbl9003rgi4vgsi33f2iw3dk3x15kls"; version = "0.17.79"; }; - experimental = bdist { sha256 = "017ggrsnhwyfgx99q0wjagafjvk5pb6lcxl72y37gig72bfcapab"; version = "0.18.32"; }; + experimental = bdist { sha256 = "05kvb8al7x0as62q6bwk89lmvnjdvsmcm3ahgghl5zzz38rrzbwd"; version = "0.18.34"; }; }; demo = { stable = bdist { sha256 = "07qknasaqvzl9vy1fglm7xmdi7ynhmslrb0a209fhbfs0s7qqlgi"; version = "0.17.79"; }; From 7b79d72aad221a3dc6dc6ec654b36baf4da00533 Mon Sep 17 00:00:00 2001 From: Philipp Riegger Date: Mon, 29 Jun 2020 15:51:40 +0200 Subject: [PATCH 2844/3452] maintainers: add priegger --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ec34287442ed..44f2382d108b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6314,6 +6314,12 @@ fingerprint = "240B 57DE 4271 2480 7CE3 EAC8 4F74 D536 1C4C A31E"; }]; }; + priegger = { + email = "philipp@riegger.name"; + github = "priegger"; + githubId = 228931; + name = "Philipp Riegger"; + }; prikhi = { email = "pavan.rikhi@gmail.com"; github = "prikhi"; From c596617e404ae190d23b8ce454a6cc25409db9e8 Mon Sep 17 00:00:00 2001 From: Philipp Riegger Date: Mon, 29 Jun 2020 15:52:54 +0200 Subject: [PATCH 2845/3452] factorio*: add priegger to maintainers --- pkgs/games/factorio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 490b5dff5720..79e507e13a88 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -166,7 +166,7 @@ let ''; homepage = "https://www.factorio.com/"; license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ Baughn elitak erictapen ]; + maintainers = with stdenv.lib.maintainers; [ Baughn elitak erictapen priegger ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; }; From 1675eaf9111b77db2e5bab516ea5ed5d265ced68 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Mon, 29 Jun 2020 19:03:49 +1200 Subject: [PATCH 2846/3452] slack-cli: Add missing dependencies --- pkgs/tools/networking/slack-cli/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/slack-cli/default.nix b/pkgs/tools/networking/slack-cli/default.nix index bdd650494b15..25e426dc43e3 100644 --- a/pkgs/tools/networking/slack-cli/default.nix +++ b/pkgs/tools/networking/slack-cli/default.nix @@ -5,7 +5,8 @@ # for token storage, except that it would make the Nix package inconsistent with # upstream and other distributions. -{ stdenv, lib, fetchFromGitHub, curl, jq, runtimeShell }: +{ stdenv, lib, fetchFromGitHub, curl, jq, coreutils, gnugrep, gnused +, runtimeShell }: stdenv.mkDerivation rec { pname = "slack-cli"; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { MESSAGE - export PATH=${lib.makeBinPath [ curl jq ]}:"\$PATH" + export PATH=${lib.makeBinPath [ curl jq coreutils gnugrep gnused ]}:"\$PATH" exec "$out/bin/.slack-wrapped" "\$@" WRAPPER From 15e8fa9f96f227531d9f9cc5cf8e6a0ffcf306d7 Mon Sep 17 00:00:00 2001 From: Calum MacRae Date: Mon, 29 Jun 2020 15:06:55 +0100 Subject: [PATCH 2847/3452] yabai: 3.2.0 -> 3.2.1 (#90717) --- pkgs/os-specific/darwin/yabai/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 5d8c8f60aec6..448e6865e18b 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge }: +{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge, xxd }: stdenv.mkDerivation rec { pname = "yabai"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "koekeishiya"; repo = pname; rev = "v${version}"; - sha256 = "1iq5p4k6klffglxfhmzc2jvlilwn0w97vb5v4b91spiyp39nqcfw"; + sha256 = "11rsi6z2z7ynfqs1xq3bvf187k5xnwm0d45a8ai9hrqdsf3f1j19"; }; - buildInputs = [ Carbon Cocoa ScriptingBridge ]; + buildInputs = [ Carbon Cocoa ScriptingBridge xxd ]; installPhase = '' mkdir -p $out/bin @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/koekeishiya/yabai"; platforms = platforms.darwin; - maintainers = [ maintainers.cmacrae maintainers.shardy ]; + maintainers = with maintainers; [ cmacrae shardy ]; license = licenses.mit; }; } From 22e9cdc790ab3470ed93532c79ab7b456e66cb79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Mon, 29 Jun 2020 14:01:37 +0200 Subject: [PATCH 2848/3452] rpcs3: fix vulkan renderer RPCS3 needs vulkan-headers for building its Vulkan rendering backend. --- pkgs/misc/emulators/rpcs3/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 5e26624d6c7a..f71420674e5c 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,5 +1,6 @@ { mkDerivation, lib, fetchgit, cmake, pkgconfig, git -, qtbase, qtquickcontrols, openal, glew, vulkan-loader, libpng, ffmpeg_3, libevdev, python3 +, qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng +, ffmpeg, libevdev, python3 , pulseaudioSupport ? true, libpulseaudio , waylandSupport ? true, wayland , alsaSupport ? true, alsaLib @@ -15,7 +16,7 @@ mkDerivation { src = fetchgit { url = "https://github.com/RPCS3/rpcs3"; - rev = "341fdf7eb14763fd06e2eab9a4b2b8f1adf9fdbd"; + rev = "v${majorVersion}"; sha256 = "1qx97zkkjl6bmv5rhfyjqynbz0v8h40b2wxqnl59g287wj0yk3y1"; }; @@ -36,7 +37,8 @@ mkDerivation { nativeBuildInputs = [ cmake pkgconfig git ]; buildInputs = [ - qtbase qtquickcontrols openal glew vulkan-loader libpng ffmpeg_3 libevdev python3 + qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg + libevdev python3 ] ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional alsaSupport alsaLib ++ lib.optional waylandSupport wayland; From a3b0864bb0573b571f1eb53127be8003c3ede1b7 Mon Sep 17 00:00:00 2001 From: _ Date: Mon, 29 Jun 2020 19:56:41 +0530 Subject: [PATCH 2849/3452] nixos/onedrive: init --- nixos/modules/module-list.nix | 1 + .../modules/services/networking/onedrive.nix | 72 +++++++++++++++++++ .../modules/services/networking/onedrive.xml | 34 +++++++++ 3 files changed, 107 insertions(+) create mode 100644 nixos/modules/services/networking/onedrive.nix create mode 100644 nixos/modules/services/networking/onedrive.xml diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cf25ae3157e6..cf1ee0f380cb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -686,6 +686,7 @@ ./services/networking/ocserv.nix ./services/networking/ofono.nix ./services/networking/oidentd.nix + ./services/networking/onedrive.nix ./services/networking/openfire.nix ./services/networking/openvpn.nix ./services/networking/ostinato.nix diff --git a/nixos/modules/services/networking/onedrive.nix b/nixos/modules/services/networking/onedrive.nix new file mode 100644 index 000000000000..a945250fa9e6 --- /dev/null +++ b/nixos/modules/services/networking/onedrive.nix @@ -0,0 +1,72 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.onedrive; + + onedriveLauncher = pkgs.writeShellScriptBin + "onedrive-launcher" + '' + # XDG_CONFIG_HOME is not recognized in the environment here. + if [ -f $HOME/.config/onedrive-launcher ] + then + # Hopefully using underscore boundary helps locate variables + for _onedrive_config_dirname_ in $(cat $HOME/.config/onedrive-launcher | grep -v '[ \t]*#' ) + do + systemctl --user start onedrive@$_onedrive_config_dirname_ + done + else + systemctl --user start onedrive@onedrive + fi + '' + ; + +in { + ### Documentation + # meta.doc = ./onedrive.xml; + + ### Interface + + options.services.onedrive = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable OneDrive service"; + }; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.onedrive; + defaultText = "pkgs.onedrive"; + example = lib.literalExample "pkgs.onedrive"; + description = '' + OneDrive package to use. + ''; + }; + }; +### Implementation + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.user.services."onedrive@" = { + description = "Onedrive sync service"; + + serviceConfig = { + Type = "simple"; + ExecStart = '' + ${cfg.package}/bin/onedrive --monitor --verbose --confdir=%h/.config/%i + ''; + Restart="on-failure"; + RestartSec=3; + RestartPreventExitStatus=3; + }; + }; + + systemd.user.services.onedrive-launcher = { + wantedBy = [ "default.target" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${onedriveLauncher}/bin/onedrive-launcher"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/onedrive.xml b/nixos/modules/services/networking/onedrive.xml new file mode 100644 index 000000000000..5a9dcf01aeee --- /dev/null +++ b/nixos/modules/services/networking/onedrive.xml @@ -0,0 +1,34 @@ + + Microsoft OneDrive + + Microsoft Onedrive is a popular cloud file-hosting service, used by 85% of Fortune 500 companies. NixOS uses a popular OneDrive client for Linux maintained by github user abraunegg. The Linux client is excellent and allows customization of which files or paths to download, not much unlike the default Windows OneDrive client by Microsoft itself. The client allows syncing with multiple onedrive accounts at the same time, of any type- OneDrive personal, OneDrive business, Office365 and Sharepoint libraries, without any additional charge. + + + For more information, guides and documentation, see . + + + To enable OneDrive support, add the following to your configuration.nix: + + = true; + + This installs the onedrive package and a service onedriveLauncher which will instantiate a onedrive service for all your OneDrive accounts. Follow the steps in documentation of the onedrive client to setup your accounts. To use the service with multiple accounts, create a file named onedrive-launcher in ~/.config and add the filename of the config directory, relative to ~/.config. For example, if you have two OneDrive accounts with configs in ~/.config/onedrive_bob_work and ~/.config/onedrive_bob_personal, add the following lines: + +onedrive_bob_work +# Not in use: +# onedrive_bob_office365 +onedrive_bob_personal + + No such file needs to be created if you are using only a single OneDrive account with config in the default location ~/.config/onedrive, in the absence of ~/.config/onedrive-launcher, only a single service is instantiated, with default config path. + + + + If you wish to use a custom OneDrive package, say from another channel, add the following line: + + = pkgs.unstable.onedrive; + + + From c2c889ed1112dac03539b80fd688409d462ab369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Mon, 29 Jun 2020 17:27:26 +0200 Subject: [PATCH 2850/3452] ddcui: 0.1.1 -> 0.1.2 --- pkgs/applications/misc/ddcui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ddcui/default.nix b/pkgs/applications/misc/ddcui/default.nix index 35c94038efcb..1ec288c678a2 100644 --- a/pkgs/applications/misc/ddcui/default.nix +++ b/pkgs/applications/misc/ddcui/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "ddcui"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcui"; rev = "v${version}"; - sha256 = "02qr7i3pdq8p6lnhwihfgd9b7y9zwpdk6gwv626rz32ai6mfrfhl"; + sha256 = "0myma1zw6dlygv3xbin662d91zcnwss10syf12q2fppkrd8qdgqf"; }; nativeBuildInputs = [ From 2eb7a440d8c896f40e7ef2a95c478a66cdf28272 Mon Sep 17 00:00:00 2001 From: derped Date: Sun, 28 Jun 2020 19:19:24 +0200 Subject: [PATCH 2851/3452] python3Packages.i3ipc: 2.1.1 -> 2.2.1 --- pkgs/development/python-modules/i3ipc/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index f5a8fc1e46c3..4cc8574c842f 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -1,20 +1,19 @@ { stdenv, buildPythonPackage, fetchFromGitHub -, enum-compat , xorgserver, pytest, pytest-xvfb, pytest-asyncio, i3, python, xlib, xdpyinfo , makeFontsConf, coreutils }: buildPythonPackage rec { pname = "i3ipc"; - version = "2.1.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "i3ipc-python"; rev = "v${version}"; - sha256 = "10zpbiw1gcndn439g1vxcdkxllwp02qcmaal4w7hi2rzgaw1xkdk"; + sha256 = "13bzs9dcv27czpnnbgz7a037lm8h991c8gk0qzzk5mq5yak24715"; }; - propagatedBuildInputs = [ enum-compat xlib ]; + propagatedBuildInputs = [ xlib ]; fontsConf = makeFontsConf { fontDirectories = [ ]; From dc113b96a81a49a0e056990c51f1505a35fb75f7 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sat, 27 Jun 2020 10:40:02 -0700 Subject: [PATCH 2852/3452] powerdevil: fix build with new ddcutil https://hydra.nixos.org/build/123207159 The KDE ISO depends on this package, which blocks nixos-unstable. Upstream bug: https://bugs.kde.org/show_bug.cgi?id=423605 --- pkgs/desktops/plasma-5/powerdevil.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index e53e986060f7..e6b2c472bc8c 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, fetchpatch, extra-cmake-modules, kdoctools, bluez-qt, kactivities, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen, @@ -18,4 +18,14 @@ mkDerivation { cmakeFlags = [ "-DHAVE_DDCUTIL=On" ]; + patches = [ + # This fixes an issue where 'DDCA_Feature_List*' cannot be converted to + # 'DDCA_Feature_List'. + # This can be dropped with the next release. + # https://bugs.kde.org/show_bug.cgi?id=423605 + (fetchpatch { + url = "https://invent.kde.org/plasma/powerdevil/-/commit/fcb26be2fb279e6ad3b7b814d26a5921d16201eb.patch"; + sha256 = "0gdyaa0nd1c1d6x2h0m933lascm8zm5sikd99wxmkf7hhaby6k2s"; + }) + ]; } From 260003b26c2629df6153d70efaab1e5ccff21d86 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 29 Jun 2020 19:36:26 +0200 Subject: [PATCH 2853/3452] riot-web: 1.6.6 -> 1.6.7 https://github.com/vector-im/riot-web/releases/tag/v1.6.7 --- .../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 86aa4c927664..23e17f961686 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.6"; + version = "1.6.7"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0j88wcha5rr6qaxik4m90v9mgfcj3r9nb4gpd2dzi7m1zf7kivkw"; + sha256 = "14g5rbvcw6p0q50slbf0c7s39i54ggv2cjc5iv93yvfrwn3z0f8p"; }; installPhase = '' From 27362a6a66c9f0b9aff404fa055a2e7c5445c5a8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 29 Jun 2020 19:36:48 +0200 Subject: [PATCH 2854/3452] riot-desktop: 1.6.6 -> 1.6.7 https://github.com/vector-im/riot-desktop/releases/tag/v1.6.7 --- .../instant-messengers/riot/riot-desktop-package.json | 2 +- .../networking/instant-messengers/riot/riot-desktop.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 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 6280bfdf4c71..f3e7732686f1 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.6", + "version": "1.6.7", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 72ec6e83ca68..42f8ce60fd3d 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.6"; + version = "1.6.7"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "0yrybi6cv3lj0fq4ab4rzjm9l4flfw97hkwzlp7zzixb3z9h09h8"; + sha256 = "0l1ih7rkb0nnc79607kkg0k69j9kwqrczhgkqzsmvqxjz7pk9kgn"; }; electron = electron_7; From 98841652831c0084b00506424bb808e7a3a51908 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 29 Jun 2020 19:37:32 +0200 Subject: [PATCH 2855/3452] epson-escpr2: 1.1.12 -> 1.1.13 --- pkgs/misc/drivers/epson-escpr2/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 94b840776207..80aa410017da 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { # To find new versions, visit @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { # some printer like for instance "WF-7210" to get to the most recent # version. # NOTE: Don't forget to update the webarchive link too! - urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm" - "https://web.archive.org/web/20200523220202if_/https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm" + urls = [ + "https://download3.ebz.epson.net/dsc/f/03/00/11/33/72/48e6a853e518a1bedaee575113e087c0bd5d6e2e/epson-inkjet-printer-escpr2-1.1.13-1lsb3.2.src.rpm" + "https://web.archive.org/web/20200629154055if_/https://download3.ebz.epson.net/dsc/f/03/00/11/33/72/48e6a853e518a1bedaee575113e087c0bd5d6e2e/epson-inkjet-printer-escpr2-1.1.13-1lsb3.2.src.rpm" ]; - sha256 = "07sq5xlmidqiycv0qwvpk2xf22vbkbk4fclnjlnx7s08d2jl75kv"; + sha256 = "07g62vndn2wh9bablvdl2cxn9wq3hzn16mqji27j20h33cwqmzj1"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; From acd100ff82e990a8e3c88b399c1f12b8f21b00c2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 29 Jun 2020 19:37:42 +0200 Subject: [PATCH 2856/3452] wasm-bindgen-cli: 0.62.0 -> 0.64.0 https://github.com/rustwasm/wasm-bindgen/releases/tag/0.2.63 https://github.com/rustwasm/wasm-bindgen/releases/tag/0.2.64 --- .../0001-Add-cargo.lock.patch | 674 +++++++++--------- .../tools/wasm-bindgen-cli/default.nix | 6 +- 2 files changed, 347 insertions(+), 333 deletions(-) diff --git a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch index 86fbb81de054..12184c7d21e9 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch +++ b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch @@ -1,19 +1,19 @@ -From a13aff157f899a6388b3c9e621680049f329a028 Mon Sep 17 00:00:00 2001 +From b1a7247a9b9bd327c01723cdc9334c0e7ec9a10e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch -Date: Fri, 1 May 2020 23:44:08 +0200 +Date: Mon, 29 Jun 2020 17:33:55 +0200 Subject: [PATCH] Add cargo.lock --- - Cargo.lock | 2527 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 2527 insertions(+) + Cargo.lock | 2541 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 2541 insertions(+) create mode 100644 Cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 00000000..4822cea1 +index 00000000..04bdba9f --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,2527 @@ +@@ -0,0 +1,2541 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] @@ -25,15 +25,15 @@ index 00000000..4822cea1 + +[[package]] +name = "adler32" -+version = "1.0.4" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" ++checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" + +[[package]] +name = "aho-corasick" -+version = "0.7.10" ++version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" ++checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +dependencies = [ + "memchr", +] @@ -49,9 +49,9 @@ index 00000000..4822cea1 + +[[package]] +name = "anyhow" -+version = "1.0.28" ++version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9a60d744a80c30fcb657dfe2c1b22bcb3e814c1a1e3674f32bf5820b570fbff" ++checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f" + +[[package]] +name = "arrayref" @@ -73,49 +73,58 @@ index 00000000..4822cea1 + +[[package]] +name = "askama" -+version = "0.7.2" ++version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eed81479263c8753e06f4981f5a313b3fe6cbff30c3ff8d9ae15ef0c72d93fb5" ++checksum = "10a1fb9e41eb366cbcd267da2094be5b7e62fdbca9f82091e7503e80f885050d" +dependencies = [ + "askama_derive", ++ "askama_escape", + "askama_shared", +] + +[[package]] +name = "askama_derive" -+version = "0.7.2" ++version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46580c08e5520afadc6e9064759e15fc743489a4db78f9c751113e3d32a1e083" ++checksum = "e1012c270085fa35ece6a48a569544fde85b6d9ee41074c7b706cc912a03f939" +dependencies = [ + "askama_shared", -+ "nom 4.2.3", -+ "proc-macro2 0.4.30", -+ "quote 0.6.13", -+ "syn 0.15.44", ++ "nom", ++ "proc-macro2", ++ "quote", ++ "syn", +] + +[[package]] -+name = "askama_shared" -+version = "0.7.2" ++name = "askama_escape" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "64509fd5c2fa767fa7ea973b732c61f0b8d30d1adf084e5164523e51a5e35d71" ++checksum = "7a577aeba5fec1aafb9f195d98cfcc38a78b588e4ebf9b15f62ca1c7aa33795a" ++ ++[[package]] ++name = "askama_shared" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ee517f4e33c27b129928e71d8a044d54c513e72e0b72ec5c4f5f1823e9de353" +dependencies = [ -+ "num-traits 0.2.11", ++ "askama_escape", ++ "humansize", ++ "num-traits 0.2.12", + "serde", -+ "serde_derive", -+ "toml 0.4.10", ++ "toml", +] + +[[package]] +name = "assert_cmd" -+version = "0.11.1" ++version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e" ++checksum = "c88b9ca26f9c16ec830350d309397e74ee9abdfd8eb1f71cb6ecc71a3fc818da" +dependencies = [ -+ "escargot", ++ "doc-comment", + "predicates", + "predicates-core", + "predicates-tree", ++ "wait-timeout", +] + +[[package]] @@ -192,9 +201,9 @@ index 00000000..4822cea1 + +[[package]] +name = "bumpalo" -+version = "3.2.1" ++version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12ae9db68ad7fac5fe51304d20f016c911539251075a214f8e663babefa35187" ++checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" + +[[package]] +name = "byteorder" @@ -213,9 +222,9 @@ index 00000000..4822cea1 + +[[package]] +name = "cc" -+version = "1.0.52" ++version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" ++checksum = "77c1f1d60091c1b73e2b1f4560ab419204b178e625fa945ded7b660becd2bd46" + +[[package]] +name = "cfg-if" @@ -237,7 +246,7 @@ index 00000000..4822cea1 +checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2" +dependencies = [ + "num-integer", -+ "num-traits 0.2.11", ++ "num-traits 0.2.12", + "time", +] + @@ -249,9 +258,9 @@ index 00000000..4822cea1 + +[[package]] +name = "clap" -+version = "2.33.0" ++version = "2.33.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" ++checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" +dependencies = [ + "ansi_term", + "atty", @@ -338,12 +347,13 @@ index 00000000..4822cea1 + +[[package]] +name = "crossbeam-queue" -+version = "0.2.1" ++version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" ++checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +dependencies = [ + "cfg-if", + "crossbeam-utils", ++ "maybe-uninit", +] + +[[package]] @@ -359,9 +369,9 @@ index 00000000..4822cea1 + +[[package]] +name = "curl" -+version = "0.4.29" ++version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "762e34611d2d5233a506a79072be944fddd057db2f18e04c0d6fa79e3fd466fd" ++checksum = "b0447a642435be046540f042950d874a4907f9fee28c0513a0beb3ba89f91eb7" +dependencies = [ + "curl-sys", + "libc", @@ -374,9 +384,9 @@ index 00000000..4822cea1 + +[[package]] +name = "curl-sys" -+version = "0.4.31+curl-7.70.0" ++version = "0.4.32+curl-7.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dcd62757cc4f5ab9404bc6ca9f0ae447e729a1403948ce5106bd588ceac6a3b0" ++checksum = "834425a2f22fdd621434196965bf99fbfd9eaed96348488e27b7ac40736c560b" +dependencies = [ + "cc", + "libc", @@ -398,6 +408,13 @@ index 00000000..4822cea1 +] + +[[package]] ++name = "deno" ++version = "0.1.0" ++dependencies = [ ++ "wasm-bindgen", ++] ++ ++[[package]] +name = "diff" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -421,6 +438,12 @@ index 00000000..4822cea1 +] + +[[package]] ++name = "doc-comment" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" ++ ++[[package]] +name = "docopt" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -462,25 +485,13 @@ index 00000000..4822cea1 +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ + "atty", -+ "humantime", ++ "humantime 1.3.0", + "log 0.4.8", + "regex", + "termcolor", +] + +[[package]] -+name = "escargot" -+version = "0.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597" -+dependencies = [ -+ "lazy_static", -+ "log 0.4.8", -+ "serde", -+ "serde_json", -+] -+ -+[[package]] +name = "fetch" +version = "0.1.0" +dependencies = [ @@ -494,9 +505,9 @@ index 00000000..4822cea1 + +[[package]] +name = "filetime" -+version = "0.2.9" ++version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f59efc38004c988e4201d11d263b8171f49a2e7ec0bdbb71773433f271504a5e" ++checksum = "affc17579b132fc2461adf7c575cc6e8b134ebca52c51f5411388965227dc695" +dependencies = [ + "cfg-if", + "libc", @@ -510,7 +521,7 @@ index 00000000..4822cea1 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da62c4f1b81918835a8c6a484a397775fff5953fe83529afd51b05f5c6a6617d" +dependencies = [ -+ "num-traits 0.2.11", ++ "num-traits 0.2.12", +] + +[[package]] @@ -536,9 +547,9 @@ index 00000000..4822cea1 + +[[package]] +name = "futures" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c329ae8753502fb44ae4fc2b622fa2a94652c41e795143765ba0927f92ab780" ++checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613" +dependencies = [ + "futures-channel", + "futures-core", @@ -551,9 +562,9 @@ index 00000000..4822cea1 + +[[package]] +name = "futures-channel" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8" ++checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" +dependencies = [ + "futures-core", + "futures-sink", @@ -570,9 +581,9 @@ index 00000000..4822cea1 + +[[package]] +name = "futures-core" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a" ++checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399" + +[[package]] +name = "futures-core-preview" @@ -582,9 +593,9 @@ index 00000000..4822cea1 + +[[package]] +name = "futures-executor" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f674f3e1bcb15b37284a90cedf55afdba482ab061c407a9c0ebbd0f3109741ba" ++checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" +dependencies = [ + "futures-core", + "futures-task", @@ -593,39 +604,42 @@ index 00000000..4822cea1 + +[[package]] +name = "futures-io" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6" ++checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" + +[[package]] +name = "futures-macro" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7" ++checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" +dependencies = [ + "proc-macro-hack", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", ++ "proc-macro2", ++ "quote", ++ "syn", +] + +[[package]] +name = "futures-sink" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6" ++checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" + +[[package]] +name = "futures-task" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27" ++checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" ++dependencies = [ ++ "once_cell", ++] + +[[package]] +name = "futures-util" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5" ++checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" +dependencies = [ + "futures-channel", + "futures-core", @@ -634,6 +648,7 @@ index 00000000..4822cea1 + "futures-sink", + "futures-task", + "memchr", ++ "pin-project", + "pin-utils", + "proc-macro-hack", + "proc-macro-nested", @@ -692,9 +707,9 @@ index 00000000..4822cea1 + +[[package]] +name = "hermit-abi" -+version = "0.1.12" ++version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4" ++checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" +dependencies = [ + "libc", +] @@ -706,6 +721,12 @@ index 00000000..4822cea1 +checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" + +[[package]] ++name = "humansize" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e" ++ ++[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -715,6 +736,12 @@ index 00000000..4822cea1 +] + +[[package]] ++name = "humantime" ++version = "2.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" ++ ++[[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -766,9 +793,9 @@ index 00000000..4822cea1 + +[[package]] +name = "itoa" -+version = "0.4.5" ++version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" ++checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" + +[[package]] +name = "jpeg-decoder" @@ -782,7 +809,7 @@ index 00000000..4822cea1 + +[[package]] +name = "js-sys" -+version = "0.3.39" ++version = "0.3.41" +dependencies = [ + "wasm-bindgen", + "wasm-bindgen-futures", @@ -811,9 +838,9 @@ index 00000000..4822cea1 + +[[package]] +name = "libc" -+version = "0.2.69" ++version = "0.2.71" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" ++checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" + +[[package]] +name = "libz-sys" @@ -926,22 +953,12 @@ index 00000000..4822cea1 + +[[package]] +name = "nom" -+version = "4.2.3" ++version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" ++checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +dependencies = [ + "memchr", -+ "version_check 0.1.5", -+] -+ -+[[package]] -+name = "nom" -+version = "5.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6" -+dependencies = [ -+ "memchr", -+ "version_check 0.9.1", ++ "version_check 0.9.2", +] + +[[package]] @@ -952,23 +969,23 @@ index 00000000..4822cea1 + +[[package]] +name = "num-integer" -+version = "0.1.42" ++version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" ++checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +dependencies = [ + "autocfg 1.0.0", -+ "num-traits 0.2.11", ++ "num-traits 0.2.12", +] + +[[package]] +name = "num-iter" -+version = "0.1.40" ++version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00" ++checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" +dependencies = [ + "autocfg 1.0.0", + "num-integer", -+ "num-traits 0.2.11", ++ "num-traits 0.2.12", +] + +[[package]] @@ -978,7 +995,7 @@ index 00000000..4822cea1 +checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" +dependencies = [ + "num-integer", -+ "num-traits 0.2.11", ++ "num-traits 0.2.12", +] + +[[package]] @@ -987,14 +1004,14 @@ index 00000000..4822cea1 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ -+ "num-traits 0.2.11", ++ "num-traits 0.2.12", +] + +[[package]] +name = "num-traits" -+version = "0.2.11" ++version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" ++checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +dependencies = [ + "autocfg 1.0.0", +] @@ -1010,10 +1027,16 @@ index 00000000..4822cea1 +] + +[[package]] -+name = "openssl" -+version = "0.10.29" ++name = "once_cell" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" ++checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" ++ ++[[package]] ++name = "openssl" ++version = "0.10.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" +dependencies = [ + "bitflags 1.2.1", + "cfg-if", @@ -1031,18 +1054,18 @@ index 00000000..4822cea1 + +[[package]] +name = "openssl-src" -+version = "111.9.0+1.1.1g" ++version = "111.10.0+1.1.1g" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a2dbe10ddd1eb335aba3780eb2eaa13e1b7b441d2562fd962398740927f39ec4" ++checksum = "47cd4a96d49c3abf4cac8e8a80cba998a030c75608f158fb1c5f609772f265e6" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" -+version = "0.9.55" ++version = "0.9.58" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8" ++checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" +dependencies = [ + "autocfg 1.0.0", + "cc", @@ -1062,7 +1085,7 @@ index 00000000..4822cea1 +name = "performance" +version = "0.1.0" +dependencies = [ -+ "humantime", ++ "humantime 2.0.1", + "wasm-bindgen", + "web-sys", +] @@ -1107,6 +1130,26 @@ index 00000000..4822cea1 +] + +[[package]] ++name = "pin-project" ++version = "0.4.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17" ++dependencies = [ ++ "pin-project-internal", ++] ++ ++[[package]] ++name = "pin-project-internal" ++version = "0.4.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1132,9 +1175,9 @@ index 00000000..4822cea1 + +[[package]] +name = "ppv-lite86" -+version = "0.2.6" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" ++checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" + +[[package]] +name = "predicates" @@ -1167,58 +1210,49 @@ index 00000000..4822cea1 + +[[package]] +name = "proc-macro-error" -+version = "1.0.2" ++version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678" ++checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880" +dependencies = [ + "proc-macro-error-attr", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", -+ "version_check 0.9.1", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "version_check 0.9.2", +] + +[[package]] +name = "proc-macro-error-attr" -+version = "1.0.2" ++version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" ++checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50" +dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", ++ "proc-macro2", ++ "quote", ++ "syn", + "syn-mid", -+ "version_check 0.9.1", ++ "version_check 0.9.2", +] + +[[package]] +name = "proc-macro-hack" -+version = "0.5.15" ++version = "0.5.16" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0d659fe7c6d27f25e9d80a1a094c223f5246f6a6596453e09d7229bf42750b63" ++checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" + +[[package]] +name = "proc-macro-nested" -+version = "0.1.4" ++version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694" ++checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" + +[[package]] +name = "proc-macro2" -+version = "0.4.30" ++version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" ++checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" +dependencies = [ -+ "unicode-xid 0.1.0", -+] -+ -+[[package]] -+name = "proc-macro2" -+version = "1.0.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3" -+dependencies = [ -+ "unicode-xid 0.2.0", ++ "unicode-xid", +] + +[[package]] @@ -1229,20 +1263,11 @@ index 00000000..4822cea1 + +[[package]] +name = "quote" -+version = "0.6.13" ++version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" ++checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +dependencies = [ -+ "proc-macro2 0.4.30", -+] -+ -+[[package]] -+name = "quote" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7" -+dependencies = [ -+ "proc-macro2 1.0.10", ++ "proc-macro2", +] + +[[package]] @@ -1420,10 +1445,11 @@ index 00000000..4822cea1 + +[[package]] +name = "rayon" -+version = "1.3.0" ++version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" ++checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080" +dependencies = [ ++ "autocfg 1.0.0", + "crossbeam-deque", + "either", + "rayon-core", @@ -1431,9 +1457,9 @@ index 00000000..4822cea1 + +[[package]] +name = "rayon-core" -+version = "1.7.0" ++version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" ++checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280" +dependencies = [ + "crossbeam-deque", + "crossbeam-queue", @@ -1495,9 +1521,9 @@ index 00000000..4822cea1 + +[[package]] +name = "regex" -+version = "1.3.7" ++version = "1.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" ++checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +dependencies = [ + "aho-corasick", + "memchr", @@ -1507,15 +1533,15 @@ index 00000000..4822cea1 + +[[package]] +name = "regex-syntax" -+version = "0.6.17" ++version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" ++checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" + +[[package]] +name = "remove_dir_all" -+version = "0.5.2" ++version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] @@ -1578,9 +1604,9 @@ index 00000000..4822cea1 + +[[package]] +name = "ryu" -+version = "1.0.4" ++version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "safemem" @@ -1600,9 +1626,9 @@ index 00000000..4822cea1 + +[[package]] +name = "schannel" -+version = "0.1.18" ++version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19" ++checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +dependencies = [ + "lazy_static", + "winapi", @@ -1628,29 +1654,29 @@ index 00000000..4822cea1 + +[[package]] +name = "serde" -+version = "1.0.106" ++version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399" ++checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.106" ++version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" ++checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" +dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", ++ "proc-macro2", ++ "quote", ++ "syn", +] + +[[package]] +name = "serde_json" -+version = "1.0.52" ++version = "1.0.55" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7894c8ed05b7a3a279aeb79025fdec1d3158080b75b98a08faf2806bb799edd" ++checksum = "ec2c5d7e739bc07a3e73381a39d61fdb5f671c60c1df26a130690665803d8226" +dependencies = [ + "itoa", + "ryu", @@ -1676,12 +1702,6 @@ index 00000000..4822cea1 +checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" + +[[package]] -+name = "smallvec" -+version = "1.4.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" -+ -+[[package]] +name = "socket2" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1713,9 +1733,9 @@ index 00000000..4822cea1 + +[[package]] +name = "structopt" -+version = "0.3.14" ++version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "863246aaf5ddd0d6928dfeb1a9ca65f505599e4e1b399935ef7e75107516b4ef" ++checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c" +dependencies = [ + "clap", + "lazy_static", @@ -1724,37 +1744,26 @@ index 00000000..4822cea1 + +[[package]] +name = "structopt-derive" -+version = "0.4.7" ++version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d239ca4b13aee7a2142e6795cbd69e457665ff8037aed33b3effdc430d2f927a" ++checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" +dependencies = [ + "heck", + "proc-macro-error", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", ++ "proc-macro2", ++ "quote", ++ "syn", +] + +[[package]] +name = "syn" -+version = "0.15.44" ++version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" ++checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" +dependencies = [ -+ "proc-macro2 0.4.30", -+ "quote 0.6.13", -+ "unicode-xid 0.1.0", -+] -+ -+[[package]] -+name = "syn" -+version = "1.0.18" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213" -+dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "unicode-xid 0.2.0", ++ "proc-macro2", ++ "quote", ++ "unicode-xid", +] + +[[package]] @@ -1763,9 +1772,9 @@ index 00000000..4822cea1 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" +dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", ++ "proc-macro2", ++ "quote", ++ "syn", +] + +[[package]] @@ -1832,9 +1841,9 @@ index 00000000..4822cea1 + +[[package]] +name = "threadpool" -+version = "1.8.0" ++version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e8dae184447c15d5a6916d973c642aec485105a13cd238192a6927ae3e077d66" ++checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] @@ -1863,6 +1872,12 @@ index 00000000..4822cea1 +] + +[[package]] ++name = "tinyvec" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" ++ ++[[package]] +name = "todomvc" +version = "0.1.0" +dependencies = [ @@ -1875,15 +1890,6 @@ index 00000000..4822cea1 + +[[package]] +name = "toml" -+version = "0.4.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" -+dependencies = [ -+ "serde", -+] -+ -+[[package]] -+name = "toml" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" @@ -1899,16 +1905,16 @@ index 00000000..4822cea1 + +[[package]] +name = "trybuild" -+version = "1.0.26" ++version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4e5696e4fd793743fbcc29943fe965ea3993b6c3d2a6a3a35c6680d926fd3a49" ++checksum = "bbe777c4e2060f44d83892be1189f96200be8ed3d99569d5c2d5ee26e62c0ea9" +dependencies = [ + "glob", + "lazy_static", + "serde", + "serde_json", + "termcolor", -+ "toml 0.5.6", ++ "toml", +] + +[[package]] @@ -1949,11 +1955,11 @@ index 00000000..4822cea1 + +[[package]] +name = "unicode-normalization" -+version = "0.1.12" ++version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" ++checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" +dependencies = [ -+ "smallvec", ++ "tinyvec", +] + +[[package]] @@ -1970,15 +1976,9 @@ index 00000000..4822cea1 + +[[package]] +name = "unicode-xid" -+version = "0.1.0" ++version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" -+ -+[[package]] -+name = "unicode-xid" -+version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" + +[[package]] +name = "url" @@ -1993,15 +1993,15 @@ index 00000000..4822cea1 + +[[package]] +name = "vcpkg" -+version = "0.2.8" ++version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" ++checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" + +[[package]] +name = "vec_map" -+version = "0.8.1" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" @@ -2011,15 +2011,24 @@ index 00000000..4822cea1 + +[[package]] +name = "version_check" -+version = "0.9.1" ++version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" ++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" ++ ++[[package]] ++name = "wait-timeout" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" ++dependencies = [ ++ "libc", ++] + +[[package]] +name = "walrus" -+version = "0.14.0" ++version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4d96e9ec3f81fdb3210b12b2b1e9e39369c8050a3a28e692e5247e3ab5196410" ++checksum = "f970863270179a4e0ca2bfb470931f883f7535ae8b9dac4271761fa1b77e253d" +dependencies = [ + "anyhow", + "id-arena", @@ -2027,19 +2036,19 @@ index 00000000..4822cea1 + "log 0.4.8", + "rayon", + "walrus-macro", -+ "wasmparser 0.42.1", ++ "wasmparser", +] + +[[package]] +name = "walrus-macro" -+version = "0.14.0" ++version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2bc16925d405153a91e01cdac2a5549aa25ca9148b5176e25e601f6536344d94" ++checksum = "80927fca8665132b48c7714bcec983d6e761c60b3a9877c6cd7df86417b13573" +dependencies = [ + "heck", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", ++ "proc-macro2", ++ "quote", ++ "syn", +] + +[[package]] @@ -2050,7 +2059,7 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "cfg-if", + "js-sys", @@ -2065,27 +2074,15 @@ index 00000000..4822cea1 +] + +[[package]] -+name = "wasm-bindgen-anyref-xform" -+version = "0.2.62" -+dependencies = [ -+ "anyhow", -+ "rayon", -+ "walrus", -+ "wasmprinter", -+ "wast 3.0.4", -+ "wat", -+] -+ -+[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "bumpalo", + "lazy_static", + "log 0.4.8", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", ++ "proc-macro2", ++ "quote", ++ "syn", + "wasm-bindgen-shared", +] + @@ -2099,7 +2096,7 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen-cli" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "anyhow", + "assert_cmd", @@ -2127,7 +2124,7 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen-cli-support" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "anyhow", + "base64 0.9.3", @@ -2136,7 +2133,7 @@ index 00000000..4822cea1 + "serde_json", + "tempfile", + "walrus", -+ "wasm-bindgen-anyref-xform", ++ "wasm-bindgen-externref-xform", + "wasm-bindgen-multi-value-xform", + "wasm-bindgen-shared", + "wasm-bindgen-threads-xform", @@ -2148,8 +2145,20 @@ index 00000000..4822cea1 +] + +[[package]] ++name = "wasm-bindgen-externref-xform" ++version = "0.2.64" ++dependencies = [ ++ "anyhow", ++ "rayon", ++ "walrus", ++ "wasmprinter", ++ "wast 17.0.0", ++ "wat", ++] ++ ++[[package]] +name = "wasm-bindgen-futures" -+version = "0.4.12" ++version = "0.4.14" +dependencies = [ + "cfg-if", + "futures-channel-preview", @@ -2161,9 +2170,9 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ -+ "quote 1.0.4", ++ "quote", + "trybuild", + "wasm-bindgen", + "wasm-bindgen-futures", @@ -2172,24 +2181,24 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", -+ "syn 1.0.18", ++ "proc-macro2", ++ "quote", ++ "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-multi-value-xform" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "anyhow", + "rayon", + "walrus", + "wasmprinter", -+ "wast 3.0.4", ++ "wast 17.0.0", + "wat", +] + @@ -2204,11 +2213,11 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.62" ++version = "0.2.64" + +[[package]] +name = "wasm-bindgen-test" -+version = "0.3.12" ++version = "0.3.14" +dependencies = [ + "console_error_panic_hook", + "js-sys", @@ -2234,15 +2243,15 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen-test-macro" -+version = "0.3.12" ++version = "0.3.14" +dependencies = [ -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", ++ "proc-macro2", ++ "quote", +] + +[[package]] +name = "wasm-bindgen-threads-xform" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "anyhow", + "walrus", @@ -2251,7 +2260,7 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen-wasm-conventions" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "anyhow", + "walrus", @@ -2259,29 +2268,30 @@ index 00000000..4822cea1 + +[[package]] +name = "wasm-bindgen-wasm-interpreter" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "anyhow", + "log 0.4.8", + "tempfile", + "walrus", ++ "wasm-bindgen-wasm-conventions", + "wat", +] + +[[package]] +name = "wasm-bindgen-webidl" -+version = "0.2.62" ++version = "0.2.64" +dependencies = [ + "anyhow", + "env_logger", + "heck", + "lazy_static", + "log 0.4.8", -+ "proc-macro2 1.0.10", -+ "quote 1.0.4", ++ "proc-macro2", ++ "quote", + "sourcefile", + "structopt", -+ "syn 1.0.18", ++ "syn", + "wasm-bindgen-backend", + "weedle", +] @@ -2304,56 +2314,50 @@ index 00000000..4822cea1 + +[[package]] +name = "wasmparser" -+version = "0.42.1" ++version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1527c84a5bd585215f29c06b0e2a5274e478ad4dfc970d26ffad66fdc6cb311d" -+ -+[[package]] -+name = "wasmparser" -+version = "0.51.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aeb1956b19469d1c5e63e459d29e7b5aa0f558d9f16fcef09736f8a265e6c10a" ++checksum = "af931e2e1960c53f4a28b063fec4cacd036f35acbec8ff3a4739125b17382a87" + +[[package]] +name = "wasmprinter" -+version = "0.2.3" ++version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8bd423d45b95fcee11775472bfdce66c63c45ada23c1b338e0a63d623a6c475b" ++checksum = "c93ba310101ec5ee980db66b47b3d276577c8310df1570e19994347137650454" +dependencies = [ + "anyhow", -+ "wasmparser 0.51.4", ++ "wasmparser", +] + +[[package]] +name = "wast" -+version = "3.0.4" ++version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "233648f540f07fce9b972436f2fbcae8a750c1121b6d32d949e1a44b4d9fc7b1" ++checksum = "5a0e1c36b928fca33dbaf96235188f5fad22ee87100e26cc606bd0fbabdf1932" +dependencies = [ + "leb128", +] + +[[package]] +name = "wast" -+version = "14.0.0" ++version = "21.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "47b11c94c63d5365a76ea287f8e6e5b6050233fae4b2423aea2a1e126a385e17" ++checksum = "0b1844f66a2bc8526d71690104c0e78a8e59ffa1597b7245769d174ebb91deb5" +dependencies = [ + "leb128", +] + +[[package]] +name = "wat" -+version = "1.0.15" ++version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03db18bc33cff3859c296efbefdcc00763a644539feeadca3415a1cee8a2835d" ++checksum = "ce85d72b74242c340e9e3492cfb602652d7bb324c3172dd441b5577e39a2e18c" +dependencies = [ -+ "wast 14.0.0", ++ "wast 21.0.0", +] + +[[package]] +name = "web-sys" -+version = "0.3.39" ++version = "0.3.41" +dependencies = [ + "js-sys", + "wasm-bindgen", @@ -2389,6 +2393,16 @@ index 00000000..4822cea1 +] + +[[package]] ++name = "webrtc_datachannel" ++version = "0.1.0" ++dependencies = [ ++ "js-sys", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "web-sys", ++] ++ ++[[package]] +name = "websockets" +version = "0.1.0" +dependencies = [ @@ -2416,14 +2430,14 @@ index 00000000..4822cea1 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7d4f9feb723a800d8f7b74edc9fa44ff35cb0b2ec64886714362f423427f37" +dependencies = [ -+ "nom 5.1.1", ++ "nom", +] + +[[package]] +name = "winapi" -+version = "0.3.8" ++version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", @@ -2452,9 +2466,9 @@ index 00000000..4822cea1 + +[[package]] +name = "wit-parser" -+version = "0.1.1" ++version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "29a378ab795034efe2c4a6c8a388a2d9b31d360ad441c0bc9859b3d4d37e62a3" ++checksum = "3f5fd97866f4b9c8e1ed57bcf9446f3d0d8ba37e2dd01c3c612c046c053b06f7" +dependencies = [ + "anyhow", + "leb128", @@ -2463,9 +2477,9 @@ index 00000000..4822cea1 + +[[package]] +name = "wit-printer" -+version = "0.1.0" ++version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8c76e17384f4feb766d109a42c309b78de75ea2b3745f663ac3f5f331633f77f" ++checksum = "93f19ca44555a3c14d69acee6447a6e4f52771b0c6e5d8db3e42db3b90f6fce9" +dependencies = [ + "anyhow", + "wasmprinter", @@ -2481,32 +2495,32 @@ index 00000000..4822cea1 + +[[package]] +name = "wit-text" -+version = "0.1.1" ++version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2aa19a002c984e25356af8938a8f4b7f0c9fe3963498e7ae1f90d64da9e563f5" ++checksum = "e9ce51bfa02a5d206998191f63d4f3f3e80696a883dd29194ac4259bb1d57f52" +dependencies = [ + "anyhow", -+ "wast 3.0.4", ++ "wast 17.0.0", + "wit-writer", +] + +[[package]] +name = "wit-validator" -+version = "0.1.2" ++version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2454229f760a433842db154c9bb54da896fdf2352b1d63261f617bcdf20be0bd" ++checksum = "e34e89c07a16b3ea0c3bec5a8b0f20d965796968eb5211d1e3522e8e4a385853" +dependencies = [ + "anyhow", -+ "wasmparser 0.51.4", ++ "wasmparser", + "wit-parser", + "wit-schema-version", +] + +[[package]] +name = "wit-walrus" -+version = "0.1.0" ++version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8e14fbb9453201558c582d227c2b75df5c050409f467e8c220fcd57dc369280a" ++checksum = "75b636bb9de044e181cfe8745256a24e37f482b4d31ea08b9ac330d4a948e702" +dependencies = [ + "anyhow", + "id-arena", @@ -2518,9 +2532,9 @@ index 00000000..4822cea1 + +[[package]] +name = "wit-writer" -+version = "0.1.0" ++version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ebeb128df9e103e61f8ddd8a190259f3c48b73fe86a5932f40f4de526ef357e8" ++checksum = "c2ad01ba5e9cbcff799a0689e56a153776ea694cec777f605938cb9880d41a09" +dependencies = [ + "leb128", + "wit-schema-version", diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 9adabeb573fd..cb4840df4d1e 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.62"; + version = "0.2.64"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - sha256 = "0d3ph3g220nvzwxa71rch03j5c0w06v8z4lmlyp5kky6p86r37hz"; + sha256 = "1h8sxa15v4l6m4b82p0rlg7ilzfjdz2x7lipampapb9yzn9c5dcs"; }; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "13lj2yx2bcwac1b4gpwcgiwqvy178zis6r1pidn4pgwqv7zxa7p2"; + cargoSha256 = "1pynk2yisv6ryj1rlwx8bv6akjm39i3d6sd8f42b5v1w5vsg0nqm"; cargoPatches = [ ./0001-Add-cargo.lock.patch ]; cargoBuildFlags = [ "-p" pname ]; From dca85951889d1b95b1ffa463b213ef9d0ff7be20 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 29 Jun 2020 14:50:15 +0200 Subject: [PATCH 2857/3452] cloud-utils: 0.30 -> 0.31 --- pkgs/tools/misc/cloud-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix index cdd1891fb405..d5c5b0ee783d 100644 --- a/pkgs/tools/misc/cloud-utils/default.nix +++ b/pkgs/tools/misc/cloud-utils/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops # growpart is needed in initrd in nixos/system/boot/grow-partition.nix pname = "cloud-utils"; - version = "0.30"; + version = "0.31"; src = fetchurl { - url = "https://launchpad.net/cloud-utils/trunk/0.3/+download/cloud-utils-${version}.tar.gz"; - sha256 = "19ca9ckwwsvlqrjz19bc93rq4gv3y4ak7551li2qk95caqyxsq3k"; + url = "https://launchpad.net/cloud-utils/trunk/${version}/+download/cloud-utils-${version}.tar.gz"; + sha256 = "07fl3dlqwdzw4xx7mcxhpkks6dnmaxha80zgs9f6wmibgzni8z0r"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ python3 ]; From 249f4ed2c54160191847c10e3a7b10fa7b0caaec Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 29 Jun 2020 13:20:00 -0500 Subject: [PATCH 2858/3452] reviewdog: 0.10.0 -> 0.10.1 Changelog: https://github.com/reviewdog/reviewdog/releases/tag/v0.10.1 --- pkgs/development/tools/misc/reviewdog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index 9e4dbcac5b80..13386fb9e854 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1ag55n3gfwcp6v8v3hha8bdqxw9r4bmz97p00vyqla9gjzn5ka9w"; + sha256 = "05y8683f0r8bf8gn5miiwqkfz550s2c9kmvz0a1g7y99r9n6kzjk"; }; - vendorSha256 = "0lann22hjdcrwyab76hinvbbmg3rf7y3knrxlfg0164gl3y5xb5g"; + vendorSha256 = "0cxi01jxg89lsk91dv782746i8g9ksanx8igmgafq9vq25lld7yg"; subPackages = [ "cmd/reviewdog" ]; From c7705e6339844d68fa4fdde1b4e875a1bdac1ffb Mon Sep 17 00:00:00 2001 From: Casey Ransom Date: Mon, 29 Jun 2020 14:29:37 -0400 Subject: [PATCH 2859/3452] aws_shell: remove It appears to have been broken for the last few releases and has had no upstream updates for the last 2 years. I originally committed this but didn't add myself to maintainers. --- pkgs/tools/admin/aws_shell/default.nix | 44 -------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 46 deletions(-) delete mode 100644 pkgs/tools/admin/aws_shell/default.nix diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix deleted file mode 100644 index 104c2f1e44a9..000000000000 --- a/pkgs/tools/admin/aws_shell/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, awscli -}: - -with awscli.python.pkgs; - -buildPythonPackage rec { - pname = "aws-shell"; - version = "0.2.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "2044b0ef78c7542c392f2cee4b74a4439545c63dda0a3e28b712fff53e8e5823"; - }; - - # Why does it propagate packages that are used for testing? - propagatedBuildInputs = [ - awscli - prompt_toolkit - boto3 - configobj - pygments - pyyaml - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "prompt-toolkit>=1.0.0,<1.1.0" "prompt-toolkit" - ''; - - #Checks are failing due to missing TTY, which won't exist. - doCheck = false; - preCheck = '' - mkdir -p check-phase - export HOME=$(pwd)/check-phase - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/awslabs/aws-shell"; - description = "An integrated shell for working with the AWS CLI"; - license = licenses.asl20; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c6bcecc6459..753090b44cb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -773,8 +773,6 @@ in aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; - aws_shell = callPackage ../tools/admin/aws_shell { }; - aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; }; aws-vault = callPackage ../tools/admin/aws-vault { }; From c0fb6c45c1e743b8d68f0366d909b1aec3e215c3 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Mon, 29 Jun 2020 14:14:05 -0500 Subject: [PATCH 2860/3452] conftest: update src.owner --- pkgs/development/tools/conftest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 6e14c8eb010a..d7ee1c2a51ff 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { version = "0.19.0"; src = fetchFromGitHub { - owner = "instrumenta"; + owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; sha256 = "0d6n51p4b8jwkfqympwxkqxssgy462m5pgv5qvm6jy5pm566qa08"; @@ -20,9 +20,9 @@ buildGoModule rec { meta = with lib; { description = "Write tests against structured configuration data"; - homepage = "https://github.com/instrumenta/conftest"; + inherit (src.meta) homepage; license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; platforms = platforms.all; }; -} \ No newline at end of file +} From 55900f88d63212c3b8d394cd480e47e4545356ff Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Mon, 29 Jun 2020 13:26:21 -0600 Subject: [PATCH 2861/3452] tut: 0.0.9 -> 0.0.10 --- pkgs/applications/misc/tut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 7b9efb6bbe5d..4ff3a06e0b44 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "tut"; - version = "0.0.9"; + version = "0.0.10"; goPackagePath = "github.com/RasmusLindroth/tut"; goDeps = ./deps.nix; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "19y6brw1d6dlp2gnkdpbp261662h5j46rmiqg73cxhrlws0y0kfk"; + sha256 = "09l6dmzrvcpix3wg4djs6zk3ql6b6lfhd8z9aglbi6fix4pm8565"; }; meta = with stdenv.lib; { From a4f0ed59b137b903b6e4f3e548dcb8eedd2b7c00 Mon Sep 17 00:00:00 2001 From: ngerstle Date: Sun, 28 Jun 2020 19:13:52 +0200 Subject: [PATCH 2862/3452] keycloak: 9.0.3 -> 10.0.2 PR #91732 Closes #87230 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index ce24cc7071fe..10b74f6b791c 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "keycloak"; - version = "9.0.3"; + version = "10.0.2"; src = fetchzip { url = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip"; - sha256 = "0nlfa6wwgj04xgg4ps5gpjp4iq2lmas97y5qz61lhns1p42xr4ls"; + sha256 = "1fn8yd02m0bnvwkbrfxrdnxfab30s0wzm3zxpy63wf3vak7nacma"; }; nativeBuildInputs = [ makeWrapper ]; From 5b5932923433d416822f60718eb0015db2c911a4 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 29 Jun 2020 22:28:32 +0200 Subject: [PATCH 2863/3452] nixos/fish: enable man cache generation --- nixos/modules/programs/fish.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 48b324a0fe83..39b92edf2ac2 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -102,6 +102,9 @@ in programs.fish.shellAliases = mapAttrs (name: mkDefault) cfge.shellAliases; + # Required for man completions + documentation.man.generateCaches = true; + environment.etc."fish/foreign-env/shellInit".text = cfge.shellInit; environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit; environment.etc."fish/foreign-env/interactiveShellInit".text = cfge.interactiveShellInit; From 5e99766cfbe758a6a66a566831a0a69fd6b76451 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 29 Jun 2020 20:48:17 +0200 Subject: [PATCH 2864/3452] =?UTF-8?q?ocamlPackages.index:=201.2.0=20?= =?UTF-8?q?=E2=86=92=201.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/index/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index d0857f7ef0a1..f4b1844d684c 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchurl, buildDunePackage, fmt, logs, stdlib-shims }: +{ lib, fetchurl, buildDunePackage, fmt, logs, mtime, stdlib-shims }: buildDunePackage rec { pname = "index"; - version = "1.2.0"; + version = "1.2.1"; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "0d44s1d2mpxvpg0zh57c928wf1w1wd33l1fw5r62al5zmi710ff6"; + sha256 = "1a9b6rsazrjy07syxl9ix5002i95mlvx5vk7nl2x9cs6s0zw906d"; }; buildInputs = [ stdlib-shims ]; - propagatedBuildInputs = [ fmt logs ]; + propagatedBuildInputs = [ fmt logs mtime ]; meta = { homepage = "https://github.com/mirage/index"; From 56f8f6f31fbccd429bb3eced05c4fa46779f1211 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 29 Jun 2020 20:52:49 +0200 Subject: [PATCH 2865/3452] =?UTF-8?q?ocamlPackages.webmachine:=200.6.1=20?= =?UTF-8?q?=E2=86=92=200.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/webmachine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/webmachine/default.nix b/pkgs/development/ocaml-modules/webmachine/default.nix index 79e36b66d117..3bf163607cd2 100644 --- a/pkgs/development/ocaml-modules/webmachine/default.nix +++ b/pkgs/development/ocaml-modules/webmachine/default.nix @@ -5,7 +5,7 @@ buildDunePackage rec { pname = "webmachine"; - version = "0.6.1"; + version = "0.6.2"; minimumOCamlVersion = "4.04"; @@ -13,7 +13,7 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = "ocaml-webmachine"; rev = "${version}"; - sha256 = "0kpbxsvjzylbxmxag77k1c8m8mwn4f4xscqk2i7fc591llgq9fp3"; + sha256 = "1zi1vsm589y2njwzsqkmdbxvs9s4xlgbd62xqw2scp60mccp09nk"; }; propagatedBuildInputs = [ cohttp dispatch ptime ]; From 990d80657d4471ccf05015d99275b41edfd9aa7a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Jun 2020 20:50:09 -0700 Subject: [PATCH 2866/3452] pythonPackages.webcolors: disable python2, abandoned upstream --- pkgs/development/python-modules/webcolors/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix index 4acc5a369b0a..273cd7ac5d18 100644 --- a/pkgs/development/python-modules/webcolors/default.nix +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , python , six }: @@ -8,6 +9,7 @@ buildPythonPackage rec { pname = "webcolors"; version = "1.11.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; From f122c08d932f65eed3fbdfff8039bb5f8634a462 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Jun 2020 21:53:19 -0700 Subject: [PATCH 2867/3452] pythonPackages.imageio: disable python2 ``` Processing ./imageio-2.8.0-py2-none-any.whl ERROR: Package 'imageio' requires a different Python: 2.7.18 not in '>=3.5' ``` --- pkgs/development/python-modules/imageio/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 3497d748575b..4868f3ae371d 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, isPy27 , pathlib , fetchPypi , pillow @@ -16,6 +17,7 @@ buildPythonPackage rec { pname = "imageio"; version = "2.8.0"; + disabled = isPy27; src = fetchPypi { sha256 = "fb5fd6d3d17126bbaac9af29fe340e2c97a196eb9416d4f28c0e543744a152cf"; @@ -25,11 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [ imageio-ffmpeg ffmpeg_3 ]; - propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [ - futures - enum34 - pathlib - ]; + propagatedBuildInputs = [ numpy pillow ]; checkPhase = '' export IMAGEIO_USERDIR="$TMP" From e897fc34b4ce91a0572559864da32f4e590043b2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Jun 2020 21:54:41 -0700 Subject: [PATCH 2868/3452] pythonPackages.pydicom: disable python2, abandoned ``` Processing ./pydicom-2.0.0-py2-none-any.whl ERROR: Package 'pydicom' requires a different Python: 2.7.18 not in '>=3.5' ``` --- pkgs/development/python-modules/pydicom/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index de6f672e27ca..b875674df61b 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , pytest , pytestrunner , numpy @@ -10,6 +11,7 @@ buildPythonPackage rec { version = "2.0.0"; pname = "pydicom"; + disabled = isPy27; src = fetchPypi { inherit pname version; From 279937fcf4533534d05fce89260317f236ca6f0b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Jun 2020 20:39:20 -0700 Subject: [PATCH 2869/3452] python3Packages.pymatgen: fix build --- .../python-modules/pymatgen/default.nix | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 12d9daf5b3d7..2cd0a0a020fb 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas, networkx }: +{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, numpy, pydispatcher, sympy, requests, monty, ruamel_yaml, six, scipy, tabulate, enum34, matplotlib, palettable, spglib, pandas, plotly, networkx }: buildPythonPackage rec { pname = "pymatgen"; @@ -10,7 +10,26 @@ buildPythonPackage rec { }; nativeBuildInputs = [ glibcLocales ]; - propagatedBuildInputs = [ numpy pydispatcher sympy requests monty ruamel_yaml six scipy tabulate enum34 matplotlib palettable spglib pandas networkx ]; + + + propagatedBuildInputs = [ + enum34 + matplotlib + monty + networkx + numpy + palettable + pandas + plotly + pydispatcher + requests + ruamel_yaml + scipy + six + spglib + sympy + tabulate + ]; # No tests in pypi tarball. doCheck = false; From 9a1a4138d3de701849a3de7e52d1d2176e12684b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Jun 2020 18:14:48 -0700 Subject: [PATCH 2870/3452] python3Packages.bidict: fix build --- pkgs/development/python-modules/bidict/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index e29263a6b4f9..ec0440b9e449 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -23,6 +23,12 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ sphinx ]; + # this can be removed >0.19.0 + postPatch = '' + substituteInPlace setup.py \ + --replace "setuptools_scm < 4" "setuptools_scm" + ''; + checkInputs = [ hypothesis py From d323a649edfb3c7ab45e56400aacc91c293e1c64 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Jun 2020 18:25:29 -0700 Subject: [PATCH 2871/3452] python3Packages.tbm-utils: fix build --- pkgs/development/python-modules/tbm-utils/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix index bb3cd9462068..2d0efeceda04 100644 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -20,6 +20,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ]; + # this versioning was done to prevent normal pip users from encountering + # issues with package failing to build from source, but nixpkgs is better + postPatch = '' + substituteInPlace setup.py \ + --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" + ''; + # No tests in archive. doCheck = false; From 64605831eae3dc7cda53bd406abce2b68a70dbf6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Jun 2020 18:31:52 -0700 Subject: [PATCH 2872/3452] python3Packages.audio-metadata: fix build --- pkgs/development/python-modules/audio-metadata/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index f477cbfc0a88..1adee4403b9b 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -19,7 +19,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "bidict>=0.17,<0.18" "bidict" \ - --replace "more-itertools>=4.0,<8.0" "more-itertools" + --replace "more-itertools>=4.0,<8.0" "more-itertools" \ + --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" ''; propagatedBuildInputs = [ From 7986ae5860f10e0e593e4f5dec6fdd7bbce4e7c8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Jun 2020 18:36:21 -0700 Subject: [PATCH 2873/3452] python3Packages.google-music-proto: fix build --- pkgs/development/python-modules/google-music-proto/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix index af57e3209d1e..16363192c81b 100644 --- a/pkgs/development/python-modules/google-music-proto/default.nix +++ b/pkgs/development/python-modules/google-music-proto/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { postPatch = '' sed -i -e "/audio-metadata/c\'audio-metadata'," -e "/marshmallow/c\'marshmallow'," setup.py + substituteInPlace setup.py \ + --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum>=2.0,<=3.0" ''; propagatedBuildInputs = [ From 35006429c27ebf0c7c40d6cec24a84be4321a648 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 22 Jun 2020 12:26:36 +0300 Subject: [PATCH 2874/3452] httpie: 2.1.0 -> 2.2.0 https://github.com/jakubroztocil/httpie/releases/tag/2.2.0 Closes #91275 (original patch in the PR was broken since the hash from `nix-prefetch-url ` was used for `fetchpatch`, however `fetchpatch` internally modifies the patchfile and therefore results in a different output-hash). Co-authored-by: Maximilian Bosch --- pkgs/tools/networking/httpie/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index 01986bf93219..bf80cd48ffa2 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchFromGitHub, python3Packages, docutils, }: +{ stdenv, fetchFromGitHub, python3Packages, docutils, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "httpie"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "jakubroztocil"; repo = "httpie"; rev = version; - sha256 = "1vwjlzx830q4dcm3r7j9cl8yzka37dw42rl1r05m5ysb1081cbj2"; + sha256 = "0caazv24jr0844c4mdx77vzwwi5m869n10wa42cydb08ppx1xxj6"; }; outputs = [ "out" "doc" "man" ]; propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ]; dontUseSetuptoolsCheck = true; - patches = [ ./strip-venv.patch ]; + patches = [ + ./strip-venv.patch + + # Fix `test_ciphers_none_can_be_selected` + # TODO: remove on next release + (fetchpatch { + url = "https://github.com/jakubroztocil/httpie/commit/49e71d252f54871a6bc49cb1cba103d385a543b8.patch"; + sha256 = "13b2faf50gimj7f17dlx4gmd8ph8ipgihpzfqbvmfjlbf1v95fsj"; + }) + ]; checkInputs = with python3Packages; [ mock From e38494a8da0ed7d8fd8660bb88d5e7dd15dace83 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 29 Jun 2020 17:25:40 -0700 Subject: [PATCH 2875/3452] openafs_1_8: 1.8.5 -> 1.8.6 Signed-off-by: Anders Kaseorg --- pkgs/servers/openafs/1.8/module.nix | 16 ---------------- pkgs/servers/openafs/1.8/srcs.nix | 10 +++++----- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index d998784b3faa..db44dbe2200d 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -18,22 +18,6 @@ in stdenv.mkDerivation { buildInputs = [ kerberos ]; - patches = [ - # openafs 5.6 patches, included in the next release - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/34f1689b7288688550119638ee9959e453fde414.patch"; - sha256 = "0rxjqzr8c5ajlk8wrhgjc1qp1934qiriqdi0qxsnk4gj5ibbk4d5"; - }) - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/355ea43f0d1b7feae1b3af58bc33af12838db7c3.patch"; - sha256 = "1f9xn8ql6vnxglpj3dvi30sj8vkncazjab2rc13hbw48nvsvcnhm"; - }) - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/17d38e31e6f2e237a7fb4dfb46841060296310b6.patch"; - sha256 = "14dydxfm0f5fvnj0kmvgm3bgh0ajhh04i3l7l0hr9cpmwl7vrlcg"; - }) - ]; - hardeningDisable = [ "pic" ]; configureFlags = [ diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix index 4a5591ef4646..4df5bdfc3888 100644 --- a/pkgs/servers/openafs/1.8/srcs.nix +++ b/pkgs/servers/openafs/1.8/srcs.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - version = "1.8.5"; + version = "1.8.6"; src = fetchurl { - url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "08w5n803xm75j7daa3mr2ncfmcg0wpm7yasj6zyddqlb4f7xdppf"; + url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; + sha256 = "0i99klrw00v4bwd942n90xqfn16z6337m89xfm9dgv7ih0qrsklb"; }; srcs = [ src (fetchurl { - url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "08mg3n0q2igfas1khj18r9apyrkpbp1jick0ix5nfaal90jbifis"; + url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; + sha256 = "1s91kmxfimhdqrz7l6jgjz72j9pyalghrvg4h384fsz0ks6s4kz3"; })]; } From 54730491f623277ade84cdede0dd49002f49796a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 30 Jun 2020 02:30:21 +0200 Subject: [PATCH 2876/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-7-g30d5c33 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/3a381c3f47acde8211853727f4825e0f7db8fa2f. --- .../haskell-modules/hackage-packages.nix | 176 ++++++++++++++---- 1 file changed, 136 insertions(+), 40 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index eabbf13fcca5..79f93d377ec6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -48651,8 +48651,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.17.0"; - sha256 = "1nnprsc73h6zmmaz49y6msx5fh0qz85mlk3c62y8fqggbhl3xdfs"; + version = "0.1.17.1"; + sha256 = "1nxv3zm48jpdg4a7plnfqvkn314wl7hr8f86b9ih527m7yldv27w"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers data-default-class data-flags deepseq deque df1 di-polysemy @@ -70406,8 +70406,8 @@ self: { ({ mkDerivation, base, bifunctors, reflection, template-haskell }: mkDerivation { pname = "derive-lifted-instances"; - version = "0.1.1"; - sha256 = "107nfd2q54whsaagq3wjh43dr0hgncczanw90lyiqirjr4kz07hs"; + version = "0.2"; + sha256 = "1bms5m5hfrq4qg1gxxc045qms9jqrqgbd0695cxqnx9vyr86fpxf"; libraryHaskellDepends = [ base bifunctors reflection template-haskell ]; @@ -75117,8 +75117,8 @@ self: { ({ mkDerivation, base, dobutokO-frequency }: mkDerivation { pname = "dobutokO-effects"; - version = "0.1.0.0"; - sha256 = "1fyqp3487ygrmdd49nk0wq8q2ldfc71ifmns5c5nisjdbgsjrb5n"; + version = "0.2.0.0"; + sha256 = "1xf5s6phcw2xwwz7qvklzql5hrfz7mr17yzqcm88hc8a4bqj421x"; libraryHaskellDepends = [ base dobutokO-frequency ]; description = "A library to deal with SoX effects and possibilities"; license = stdenv.lib.licenses.mit; @@ -75128,8 +75128,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "dobutokO-frequency"; - version = "0.1.0.0"; - sha256 = "0kf52302jp1q7mfxr3520jk6vw06j0k6r3xry6mlx1lryirgq8k4"; + version = "0.1.1.0"; + sha256 = "11ngz39dqdcv6xkff9b590cbhd94gx1q71v6cz3birmhvbf8qwrm"; libraryHaskellDepends = [ base ]; description = "Helps to create experimental music. Working with frequencies and types."; license = stdenv.lib.licenses.mit; @@ -91440,10 +91440,8 @@ self: { }: mkDerivation { pname = "free-functors"; - version = "1.1.1"; - sha256 = "0bk985q1663rsgmkr08x6zr5yqvf84g0w7450qzccivis4wc5hp2"; - revision = "1"; - editedCabalFile = "0wvqwfvvl82z6jr7zy8f38bbqvjiikric8k7krcrlqix4v7zd6zi"; + version = "1.1.2"; + sha256 = "1qkn7irp1zids0dvi7xn17kk8wmwkqnys78qy5n27dhsgi2l1avs"; libraryHaskellDepends = [ base bifunctors comonad contravariant derive-lifted-instances profunctors template-haskell transformers @@ -104861,8 +104859,8 @@ self: { }: mkDerivation { pname = "goldplate"; - version = "0.1.0"; - sha256 = "0ccy1xcch224b09ka75j11zw6c0lm1rygc3910s7zlq8illlj34s"; + version = "0.1.1"; + sha256 = "0qjqx3yxlyfdj6glych7vwrrh47nrp6xi0vncga2a94hb5sljzzl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -116746,8 +116744,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.34.2"; - sha256 = "0zfgw30y9yv2nx6rnh7fw44l9a19gr2c9p8xcqhpswllv4jy7w33"; + version = "0.34.3"; + sha256 = "1x8gfffqywgm5rmvfgnk628mb9hczp9x1ihd3jap8kh7ip2rgccp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116787,8 +116785,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.34.2"; - sha256 = "0bl5kibh7q3awgbiyhw5mvak2jxc4rd3wajb52llfhslrghj6kx1"; + version = "0.34.3"; + sha256 = "1c40qnqg18jqdzidkl4a9v0pwb9ngzhc1zxa7kw3g61vj8wlhkv2"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network @@ -132414,6 +132412,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-golden_0_1_0_2" = callPackage + ({ mkDerivation, base, directory, hspec, hspec-core + , optparse-applicative, silently + }: + mkDerivation { + pname = "hspec-golden"; + version = "0.1.0.2"; + sha256 = "0yisrx8zjd2dhr0zb1m24sj61fjlkjwavi930rfs1cc7d34ji91i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory hspec-core ]; + executableHaskellDepends = [ base directory optparse-applicative ]; + testHaskellDepends = [ base directory hspec hspec-core silently ]; + description = "Golden tests for hspec"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-golden-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt @@ -151884,6 +151900,41 @@ self: { broken = true; }) {}; + "language-dickinson" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring + , composition-prelude, containers, criterion, deepseq, directory + , filepath, happy, haskeline, microlens, microlens-mtl, mtl + , optparse-applicative, pretty-simple, prettyprinter, random, tasty + , tasty-golden, tasty-hunit, text, transformers, zstd + }: + mkDerivation { + pname = "language-dickinson"; + version = "0.1.0.0"; + sha256 = "0aq948mln0gc3f5ngb1wnykw233fyp4wmaak4mb1rxjbmfhwyvqw"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring composition-prelude containers deepseq + directory filepath microlens microlens-mtl mtl prettyprinter random + text transformers + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + base binary bytestring containers directory filepath haskeline + microlens microlens-mtl mtl optparse-applicative prettyprinter + random text zstd + ]; + testHaskellDepends = [ + base bytestring filepath pretty-simple prettyprinter tasty + tasty-golden tasty-hunit text + ]; + benchmarkHaskellDepends = [ base binary bytestring criterion ]; + doHaddock = false; + description = "A language for generative literature"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "language-docker" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , hspec, HUnit, megaparsec, prettyprinter, QuickCheck, split, text @@ -156394,6 +156445,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lifted-async_0_10_1_1" = callPackage + ({ mkDerivation, async, base, constraints, criterion, deepseq + , HUnit, lifted-base, monad-control, mtl, tasty + , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base + }: + mkDerivation { + pname = "lifted-async"; + version = "0.10.1.1"; + sha256 = "1x02dhcih1diw2076b918r3646xw3vbzg99sqpm6iw8yd5sds20p"; + libraryHaskellDepends = [ + async base constraints lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ + async base HUnit lifted-base monad-control mtl tasty + tasty-expected-failure tasty-hunit tasty-th + ]; + benchmarkHaskellDepends = [ async base criterion deepseq ]; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lifted-base" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel , test-framework, test-framework-hunit, transformers @@ -172004,6 +172077,27 @@ self: { broken = true; }) {inherit (pkgs) mpich;}; + "mpi-hs_0_7_2_0" = callPackage + ({ mkDerivation, base, bytestring, c2hs, monad-loops, mpich }: + mkDerivation { + pname = "mpi-hs"; + version = "0.7.2.0"; + sha256 = "1d68py61h09qshzr3lx66cgs2f2kxzdmy3z35hsf96wi9aqz3fr5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring monad-loops ]; + librarySystemDepends = [ mpich ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base ]; + executableSystemDepends = [ mpich ]; + testHaskellDepends = [ base monad-loops ]; + testSystemDepends = [ mpich ]; + description = "MPI bindings for Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) mpich;}; + "mpi-hs-binary" = callPackage ({ mkDerivation, base, binary, bytestring, monad-loops, mpi-hs }: mkDerivation { @@ -188547,8 +188641,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.8.4.3"; - sha256 = "1zz007l9ap9qlhgwr7jjavr6h5r1cnr9wflyxpvjmdzmn6ch74w4"; + version = "0.8.5.0"; + sha256 = "1b4g5m32dv7905q51p4f23c9d4sfy5jvwbq7wgwsa2mwl8hf5cds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -233779,6 +233873,8 @@ self: { pname = "ssh"; version = "0.3.2"; sha256 = "1gr64sv802n9l72lp608xxi9nbh165dzn22m52s0yc35vf717rq1"; + revision = "1"; + editedCabalFile = "1y5c3z86mi7fc0awlvmq85y40nhws4591njjs85xj0grxrizx5bg"; libraryHaskellDepends = [ asn1-encoding asn1-types base base64-string binary bytestring cereal containers crypto-api crypto-pubkey-types @@ -264683,8 +264779,8 @@ self: { }: mkDerivation { pname = "wai-saml2"; - version = "0.1.0.0"; - sha256 = "06fvpcnznb883xqzi4shs3gk0ih8vix6a6dhv6azk3ca7gblzb84"; + version = "0.2.1.0"; + sha256 = "0yljqfrrp426pn17fq28arw3ygrb3i84fr28r0hns0cv4a4sz4gx"; libraryHaskellDepends = [ base base64-bytestring bytestring c14n cryptonite data-default-class http-types mtl text time vault wai wai-extra @@ -271466,40 +271562,40 @@ self: { ({ mkDerivation, aeson, aeson-options, async, base, bytestring , cmark-gfm, containers, data-default, deepseq, directory , directory-tree, filepath, fmt, Glob, hspec, hspec-discover - , http-client, http-types, lens, mtl, o-clock, optparse-applicative - , pretty-terminal, QuickCheck, req, roman-numerals - , template-haskell, text, text-metrics, th-lift-instances - , th-utilities, universum, with-utf8, yaml + , http-client, http-types, lens, modern-uri, mtl, o-clock + , optparse-applicative, pretty-terminal, QuickCheck, req + , roman-numerals, template-haskell, text, text-metrics + , th-lift-instances, th-utilities, universum, with-utf8, yaml }: mkDerivation { pname = "xrefcheck"; - version = "0.1.1.2"; - sha256 = "177pxga1jylm5kgnx0bj6sf2vsspgy24inpx7sk49hf297fnykll"; + version = "0.1.2"; + sha256 = "0m3cya6rfx7ypq4sp172z9fnnl6n11v98f6bj003phrapl6s0vnn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-options async base bytestring cmark-gfm containers data-default deepseq directory directory-tree filepath fmt Glob - http-client http-types lens mtl o-clock optparse-applicative - pretty-terminal req roman-numerals template-haskell text - text-metrics th-lift-instances th-utilities universum with-utf8 - yaml + http-client http-types lens modern-uri mtl o-clock + optparse-applicative pretty-terminal req roman-numerals + template-haskell text text-metrics th-lift-instances th-utilities + universum with-utf8 yaml ]; executableHaskellDepends = [ aeson aeson-options async base bytestring cmark-gfm containers data-default deepseq directory directory-tree filepath fmt Glob - http-client http-types lens mtl o-clock optparse-applicative - pretty-terminal req roman-numerals template-haskell text - text-metrics th-lift-instances th-utilities universum with-utf8 - yaml + http-client http-types lens modern-uri mtl o-clock + optparse-applicative pretty-terminal req roman-numerals + template-haskell text text-metrics th-lift-instances th-utilities + universum with-utf8 yaml ]; testHaskellDepends = [ aeson aeson-options async base bytestring cmark-gfm containers data-default deepseq directory directory-tree filepath fmt Glob - hspec http-client http-types lens mtl o-clock optparse-applicative - pretty-terminal QuickCheck req roman-numerals template-haskell text - text-metrics th-lift-instances th-utilities universum with-utf8 - yaml + hspec http-client http-types lens modern-uri mtl o-clock + optparse-applicative pretty-terminal QuickCheck req roman-numerals + template-haskell text text-metrics th-lift-instances th-utilities + universum with-utf8 yaml ]; testToolDepends = [ hspec-discover ]; license = stdenv.lib.licenses.mpl20; From f1de63e1731077aa9faf5a84ebe8737558b983f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 01:58:19 +0000 Subject: [PATCH 2877/3452] bitwarden: 1.18.0 -> 1.19.0 --- pkgs/tools/security/bitwarden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 2da8840eee1c..ff55ad6691de 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -16,11 +16,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.18.0"; + x86_64-linux = "1.19.0"; }.${system} or ""; sha256 = { - x86_64-linux = "04rry33jccf65smzpjp1dhcirffdb7y36yn8whqaikhsavsawx3j"; + x86_64-linux = "16qlgnqyi0jwzlz8wg2628jhh83xsk46bl6p4dnwi0ay07lhab9w"; }.${system} or ""; meta = with stdenv.lib; { From 2998bc1f779637fa03d259de2e0f573786b67e1b Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Tue, 30 Jun 2020 11:21:17 +0900 Subject: [PATCH 2878/3452] Update pkgs/development/tools/haskell/haskell-language-server/update.sh --- .../tools/haskell/haskell-language-server/update.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/haskell/haskell-language-server/update.sh b/pkgs/development/tools/haskell/haskell-language-server/update.sh index de1d62d7ed7c..498859843c4d 100755 --- a/pkgs/development/tools/haskell/haskell-language-server/update.sh +++ b/pkgs/development/tools/haskell/haskell-language-server/update.sh @@ -50,7 +50,4 @@ echo "Running cabal2nix and outputting to ${hls_derivation_file}..." cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file" -# TODO: This should ideally also automatically update the docsSearchVersion -# from pkgs/development/haskell/configuration-nix.nix. - -echo "Finished." \ No newline at end of file +echo "Finished." From 7462d78905a971335b175190f016aaf6067c64d4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 03:02:12 +0000 Subject: [PATCH 2879/3452] checkstyle: 8.33 -> 8.34 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 288482ab6f7d..632d3005e7b5 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.33"; + version = "8.34"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "03innxi9f44z2c785a94n3i0adm6mn3jjgqlvgx46nmigvw41mz6"; + sha256 = "0qgldd0rna5y50vflkjnhl4hb4nhh28d0zwsv32872g6hivl7fzb"; }; nativeBuildInputs = [ makeWrapper ]; From dcbd27754a54066065c9c5121c464f8f95a0342d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 03:36:38 +0000 Subject: [PATCH 2880/3452] clightd: 4.1 -> 4.2 --- pkgs/applications/misc/clight/clightd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index c5083f2379c6..c06d00ebb52e 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "0pqnn52nn22k49f5cw4jcr8vcbff28n56i8fizg1mmfshy8pn891"; + sha256 = "07z1m1x7nnczd51sg7m2lb6rb2c37c8glsnbrlq44hx176sj9cmj"; }; # dbus-1.pc has datadir=/etc From 5c67b5ef94dca705d566a945ad841458e52a94d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 03:46:31 +0000 Subject: [PATCH 2881/3452] coturn: 4.5.1.2 -> 4.5.1.3 --- pkgs/servers/coturn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index f50a5afa81e7..c32ddecc7a36 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "coturn"; - version = "4.5.1.2"; + version = "4.5.1.3"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; rev = version; - sha256 = "01y65az8qyv2kjnb4fj7rgl4zq5pc2b286gfn727x3hfhksx9zp2"; + sha256 = "1801931k4qdvc7jvaqxvjyhbh1xsvjz0pjajf6xc222n4ggar1q5"; }; buildInputs = [ openssl libevent ]; From 6f505be9795801e0226c9c4eca850af3cb38910e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 04:20:33 +0000 Subject: [PATCH 2882/3452] doctest: 2.3.8 -> 2.4.0 --- pkgs/development/libraries/doctest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index f3ed36db31c9..5a2561056876 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doctest"; - version = "2.3.8"; + version = "2.4.0"; src = fetchFromGitHub { owner = "onqtam"; repo = "doctest"; rev = version; - sha256 = "16w907750jnp98vdzkn72lzwy1zyryaqvfi80lbdp398pj23rq65"; + sha256 = "1yi95saqv8qb3ix6w8d7ffvs7qbwvqmq6wblckhxhicxxdxk85cd"; }; nativeBuildInputs = [ cmake ]; From c1ab60fc63be85759167a60edccf98bd2c3d518e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 04:26:36 +0000 Subject: [PATCH 2883/3452] dolt: 0.16.3 -> 0.18.0 --- pkgs/servers/sql/dolt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 2af0f149e7d8..265f78af8953 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.16.3"; + version = "0.18.0"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "141wv5av7hms4wa3s4md7mnb77bbyn3854d7gj7fy6f6jvzghdny"; + sha256 = "12kvjq3z9bggfmgci3wql4v8sh491dwp6qr768k8kwncqmp3jjvx"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "1kjh252p91yxq5mi0igamkwlsr50lij24wsp2ilgz6ksv3ijzfr1"; + vendorSha256 = "1lscjp4ih5kxrbqch9164bqrp7lbsir6vg4zcczhvhh0phbcbqjs"; meta = with lib; { description = "Relational database with version control and CLI a-la Git."; From 6f573fbb6638a108744387bd58761def46016717 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 05:15:08 +0000 Subject: [PATCH 2884/3452] flacon: 6.0.0 -> 6.1.0 --- pkgs/applications/audio/flacon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index df563bc38406..aaa0712c42fd 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "flacon"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "0p5z6rwckda0lkljrrvx6i90fazj53cxg9pasfmi8154j1z72dj2"; + sha256 = "04yp3aym7h70xjni9ancqv5lc4zds5a8dgw3fzgqs8k5nmh074gv"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; From d144f2dfda755b8178e04e3d153dbe42f1de786c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 30 Jun 2020 07:56:12 +0200 Subject: [PATCH 2885/3452] python3Packages.pytorch: 1.5.0 -> 1.5.1 Changelog: https://github.com/pytorch/pytorch/tree/v1.5.1 --- pkgs/development/python-modules/pytorch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 80c3c6d72931..057d8dc74f01 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -104,7 +104,7 @@ let "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; in buildPythonPackage rec { - version = "1.5.0"; + version = "1.5.1"; pname = "pytorch"; disabled = !isPy3k; @@ -118,7 +118,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "19qyrjd72mc0llcfn50av8ym05f2iwa38gv068wykji4ph7qjlv2"; + sha256 = "1xjbn4hi96m7xslv3p2jc6qcsng0fx3w1m6isqfah81piljf8wng"; }; preConfigure = lib.optionalString cudaSupport '' From 9287f066edc9531d1b0612d211acc2ae46f84a84 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 05:42:29 +0000 Subject: [PATCH 2886/3452] fuse-overlayfs: 1.1.1 -> 1.1.2 --- 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 c5b02e1bdb8d..ba5f4a3dd7e0 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.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "0zrxq0s3dlgjarn8l519czwffp2s5ibykc00vfrpayg547dgj342"; + sha256 = "1ivz65nnyisha3lkk6ywx175f2sdacjz3q5vy9xddr7dixwd2b18"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 3f3f8099adf463eee3bad7064d78485e79a9108b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 28 Jun 2020 13:49:13 +1000 Subject: [PATCH 2887/3452] umoci: 0.4.5 -> 0.4.6 https://github.com/opencontainers/umoci/releases/tag/v0.4.6 umoci has been adopted by the Open Container Initative as a reference implementation of the OCI Image Specification. --- pkgs/applications/virtualization/umoci/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix index d8a1f36dd5d3..0b9668b701a3 100644 --- a/pkgs/applications/virtualization/umoci/default.nix +++ b/pkgs/applications/virtualization/umoci/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "umoci"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { - owner = "openSUSE"; + owner = "opencontainers"; repo = "umoci"; rev = "v${version}"; - sha256 = "1gzj4nnys73wajdwjn5jsskvnhzh8s2vmyl76ax8drpvw19bd5g3"; + sha256 = "0jaar26l940yh77cs31c3zndiycp85m3fz4zivcibzi68g6n6yzg"; }; vendorSha256 = null; @@ -24,7 +24,7 @@ buildGoModule rec { postInstall = '' sed -i '/SHELL =/d' Makefile - make local-doc + make docs installManPage doc/man/*.[1-9] ''; @@ -33,6 +33,6 @@ buildGoModule rec { homepage = "https://umo.ci"; license = licenses.asl20; maintainers = with maintainers; [ zokrezyl ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 4e0164cbb36d3649abd0477413ddab7fc8666fa7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 23 Jun 2020 07:07:04 +0200 Subject: [PATCH 2888/3452] =?UTF-8?q?coqPackages.equations:=201.2.1=20?= =?UTF-8?q?=E2=86=92=201.2.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/equations/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 060fa3b4c81e..47ab19048ee6 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -33,9 +33,15 @@ let }; "8.11" = { - version = "1.2.1"; - rev = "v1.2.1-8.11"; - sha256 = "06k0h7lansxs479is3vj5ikg8s5k4c6svnqcwmxbni4wx8bhmg17"; + version = "1.2.2"; + rev = "v1.2.2-8.11"; + sha256 = "0g2y0s8kb2imbqyrx9hmvjzpwmicid7shv7ma10fnb8dgk2dqkf9"; + }; + + "8.12" = { + version = "1.2.2"; + rev = "v1.2.2-8.12"; + sha256 = "0fkz78i2gn9x9scfa7n8fl2sq7czppsicy7w5mq919qqfp0w1aj0"; }; }; param = params.${coq.coq-version}; From 5c80cdeb1a0f6c8e32e7990025ec21d00cbdbbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 30 Jun 2020 07:56:38 +0200 Subject: [PATCH 2889/3452] python3Packages.pytorch: fix AArch64 build aarch64-linux builds fail because of the use of opcodes in QNNPACK that the GNU assembpler does not support. This change cherry-picks an upstream patch that fixes this. See: https://github.com/pytorch/pytorch/issues/33124 https://github.com/pytorch/pytorch/pull/40584 --- .../python-modules/pytorch/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 057d8dc74f01..a746d4c7dfb3 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -121,6 +121,21 @@ in buildPythonPackage rec { sha256 = "1xjbn4hi96m7xslv3p2jc6qcsng0fx3w1m6isqfah81piljf8wng"; }; + patches = lib.optionals stdenv.isAarch64 [ + # GNU aarch64 assembler does not support 4s on neon mov: + # https://github.com/pytorch/pytorch/issues/33124 + # + # Fix from: + # https://github.com/pytorch/pytorch/pull/40584 + # + # This patch can be removed with the next major version (1.6.0). + (fetchpatch { + name = "qnnpack-neon-fix.patch"; + url = "https://github.com/pytorch/pytorch/commit/7676682584d0caf9243bce74ea0a88711ec4a807.diff"; + sha256 = "13spncaqlpsp8qk2850yly7xqwmhhfwznhmzkk8jgpslkbx75vgq"; + }) + ]; + preConfigure = lib.optionalString cudaSupport '' export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}" export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ From 3774105f48cf1fd073371f6e3223b671128d9a8c Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Sat, 13 Jun 2020 16:31:36 -0700 Subject: [PATCH 2890/3452] framac: 20.0 -> 21.0 --- pkgs/development/tools/analysis/frama-c/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index c7ac2986fd6c..f8e5cf8b9967 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -23,12 +23,12 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "20.0"; - slang = "Calcium"; + version = "21.0"; + slang = "Scandium"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - sha256 = "03dvn162djylj2skmk6vv75gh87mm4s5cspkzcrlm5x0rlla2yqn"; + sha256 = "0xqkyrvkr31r6443zgf4f749a1mf2360v8f0km071a1za767yvf5"; }; preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; From 0c5e60202961ccea1c8ad8ac1201998e37f0791c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 30 Jun 2020 08:59:39 +0100 Subject: [PATCH 2891/3452] tensorboardx: use pytestCheckHook --- .../python-modules/tensorboardx/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index 3c9c9f5c8980..d2532777d006 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -1,6 +1,6 @@ -{ boto3, buildPythonPackage, crc32c, fetchFromGitHub, lib, matplotlib, moto, - numpy, pillow, pytorch, protobuf, six, pytest, - tensorflow-tensorboard, torchvision }: +{ boto3, buildPythonPackage, crc32c, fetchFromGitHub, lib, matplotlib, moto +, numpy, pillow, pytorch, protobuf, six, pytestCheckHook +, tensorflow-tensorboard, torchvision }: buildPythonPackage rec { pname = "tensorboardx"; @@ -13,18 +13,17 @@ buildPythonPackage rec { sha256 = "0qqalq0fhbx0wnd8wdwhyhkkv2brvj9qbk3373vk3wjxbribf5c7"; }; - checkInputs = [ boto3 crc32c matplotlib moto pillow pytorch pytest tensorflow-tensorboard torchvision ]; + checkInputs = [ + pytestCheckHook boto3 crc32c matplotlib moto pillow pytorch tensorflow-tensorboard torchvision + ]; propagatedBuildInputs = [ numpy protobuf six ]; - postPatch = '' - substituteInPlace tests/test_visdom.py --replace test_TorchVis _skip_test_TorchVis - substituteInPlace tests/test_onnx_graph.py --replace test_onnx_graph _skip_test_onnx_graph - ''; + disabledTests = [ "test_TorchVis" "test_onnx_graph" ]; meta = with lib; { description = "Library for writing tensorboard-compatible logs"; - homepage = "https://github.com/lanpa/tensorboard-pytorch"; + homepage = "https://github.com/lanpa/tensorboardX"; license = licenses.mit; maintainers = with maintainers; [ lebastr akamaus ]; platforms = platforms.all; From 3e75e5113cb342af739e373ecc62869a0fd78f5b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 01:34:16 -0700 Subject: [PATCH 2892/3452] git-quick-stats: 2.1.1 -> 2.1.2 (#91807) --- pkgs/development/tools/git-quick-stats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index 1c5811f7b5ab..587a23f6599d 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "1mdja838jxhcasi251fsc3yig3s5vmfqab1wpm34xinr8blii90f"; + sha256 = "1q0iy732smad1v25da9vmlk8r5iscjrk678pq6mda9sbmiq693r3"; }; PREFIX = builtins.placeholder "out"; meta = with stdenv.lib; { From c442dfe2432b0e1fabf3de79ccc39c5dcbbb06f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 08:54:57 +0000 Subject: [PATCH 2893/3452] navidrome: 0.23.1 -> 0.24.0 --- pkgs/servers/misc/navidrome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index e5597451062a..c07214ce3a50 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.23.1"; + version = "0.24.0"; src = fetchurl { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "0hrnlpaq32f8slgmyl629v5b46ar2mq97q0cgrxy6ahfabfw2vih"; + sha256 = "1lk9fl2h1rsqirqnz4qmapv9hl2axz7j32p9a011h0n90frabski"; }; nativeBuildInputs = [ makeWrapper ]; From 90a9d02538bbac2b7a7e911b2db8a60874dd139d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 30 Jun 2020 11:40:58 +0100 Subject: [PATCH 2894/3452] dpdk: 19.11 -> 20.05 support for newer kernels (5.7) --- pkgs/os-specific/linux/dpdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 8ad703bdd4b6..aacbc3cdfbe2 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "dpdk-${version}" + lib.optionalString mod "-${kernel.version}"; - version = "19.11"; + version = "20.05"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "1aqjn6bm9miv3v2rbqi1rh1c19wa8nip9fvnqaqpnrs3i2b36wa6"; + sha256 = "0h0xv2zwb91b9n29afg5ihn06a8q28in64hag2f112kc19f79jj8"; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { ] ++ lib.optionals mod kernel.moduleBuildDependencies; postPatch = '' - patchShebangs config/arm + patchShebangs config/arm buildtools ''; mesonFlags = [ From 442458ab7c2d551b305d4e4e9e15f012270335bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 11:13:29 +0000 Subject: [PATCH 2895/3452] pdfcpu: 0.3.3 -> 0.3.4 --- pkgs/applications/graphics/pdfcpu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index e667f7c0f1ab..c03f5f8ed890 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "09z4z2csp7ld47q36x2id5zadaihisbnk7bkdvci826hwm8km7sl"; + sha256 = "00c4psgfh4hia144zsdhrq83bw3fqda1ancv2gkn5ymxkbpnpyrn"; }; vendorSha256 = "09alkpfyxapycv6zsaz7prgbr0a1jzd78n7w2mh01mg4hhb2j3k7"; From 46ddbc949ea580f9911c819785bb9e4cf4c3dbf8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 11:19:03 +0000 Subject: [PATCH 2896/3452] pgmetrics: 1.9.1 -> 1.9.2 --- pkgs/tools/misc/pgmetrics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index da2e1a9cbe31..9323ea0b9e46 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "03c4v24ql9p38m0hmgq5ya9cnvhmdhv2zjxxrxpb2338cxajs4mh"; + sha256 = "1prhzmxrvypqdbxjr9c3207w1c88z3kwsrr2rcbh1y7fx5rrspxv"; }; vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5"; From c9c29390c7aa078de103eb6b1e58e0b02e932f49 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Tue, 30 Jun 2020 13:19:13 +0200 Subject: [PATCH 2897/3452] akira-unstable: 2019-10-12 -> 2020-05-01 --- pkgs/applications/graphics/akira/default.nix | 8 +- .../fix-build-with-vala-0-44-or-later.patch | 88 ------------------- 2 files changed, 3 insertions(+), 93 deletions(-) delete mode 100644 pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/applications/graphics/akira/default.nix index adbc1eac3796..262c7b11f980 100644 --- a/pkgs/applications/graphics/akira/default.nix +++ b/pkgs/applications/graphics/akira/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "akira"; - version = "2019-10-12"; + version = "2020-05-01"; src = fetchFromGitHub { owner = "akiraux"; repo = "Akira"; - rev = "cab952dee4591b6bde34d670c1f853f5a3ff6b19"; - sha256 = "1fp3a79hkh6xwwqqdrx4zqq2zhsm236c6fhhl5f2nmi108yxz04q"; + rev = "87c495fa0a686b1e9b84aff7d9c0a9553da2c466"; + sha256 = "0ikz6dyx0z2wqskas628hbrbhx3z5gy7i4acrvspfhhg6rk88aqd"; }; nativeBuildInputs = [ @@ -59,8 +59,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dprofile=default" ]; - patches = [ ./fix-build-with-vala-0-44-or-later.patch ]; - postPatch = '' chmod +x build-aux/meson/post_install.py patchShebangs build-aux/meson/post_install.py diff --git a/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch b/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch deleted file mode 100644 index 3c35900c04f5..000000000000 --- a/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch +++ /dev/null @@ -1,88 +0,0 @@ -From bcda8fd53f6f232db0b6411269ba108af551629f Mon Sep 17 00:00:00 2001 -From: Alberto Fanjul -Date: Tue, 9 Apr 2019 09:45:36 +0200 -Subject: [PATCH] Build on vala >= 0.44.2 - ---- - src/FileFormat/JsonObject.vala | 2 +- - src/FileFormat/JsonObjectArray.vala | 2 +- - src/FileFormat/ZipArchiveHandler.vala | 18 +++++++++++++++++- - 3 files changed, 19 insertions(+), 3 deletions(-) - -diff --git a/src/FileFormat/JsonObject.vala b/src/FileFormat/JsonObject.vala -index 7bfe46f..805fbad 100644 ---- a/src/FileFormat/JsonObject.vala -+++ b/src/FileFormat/JsonObject.vala -@@ -31,7 +31,7 @@ public abstract class Akira.FileFormat.JsonObject : GLib.Object { - - private ObjectClass obj_class; - -- public JsonObject.from_object (Json.Object object) { -+ protected JsonObject.from_object (Json.Object object) { - Object (object: object); - } - -diff --git a/src/FileFormat/JsonObjectArray.vala b/src/FileFormat/JsonObjectArray.vala -index 4f6e573..d0a7dad 100644 ---- a/src/FileFormat/JsonObjectArray.vala -+++ b/src/FileFormat/JsonObjectArray.vala -@@ -31,7 +31,7 @@ public abstract class Akira.FileFormat.JsonObjectArray : Object { - * - * Your JsonObject implementation should have it's own list of items - */ -- public JsonObjectArray (Json.Object object, string property_name) { -+ protected JsonObjectArray (Json.Object object, string property_name) { - Object (object: object, property_name: property_name); - } - -diff --git a/src/FileFormat/ZipArchiveHandler.vala b/src/FileFormat/ZipArchiveHandler.vala -index ca60dd0..5d65aa2 100644 ---- a/src/FileFormat/ZipArchiveHandler.vala -+++ b/src/FileFormat/ZipArchiveHandler.vala -@@ -262,11 +262,17 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object { - continue; - } - -+ Posix.off_t offset; -+#if VALA_0_42 -+ uint8[] buffer; -+ while (archive.read_data_block (out buffer, out offset) == Archive.Result.OK) { -+ if (extractor.write_data_block (buffer, offset) != Archive.Result.OK) { -+#else - void* buffer = null; - size_t buffer_length; -- Posix.off_t offset; - while (archive.read_data_block (out buffer, out buffer_length, out offset) == Archive.Result.OK) { - if (extractor.write_data_block (buffer, buffer_length, offset) != Archive.Result.OK) { -+#endif - break; - } - } -@@ -316,9 +322,15 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object { - // Add an entry to the archive - Archive.Entry entry = new Archive.Entry (); - entry.set_pathname (initial_folder.get_relative_path (current_file)); -+#if VALA_0_42 -+ entry.set_size ((Archive.int64_t) file_info.get_size ()); -+ entry.set_filetype (Archive.FileType.IFREG); -+ entry.set_perm (Archive.FileType.IFREG); -+#else - entry.set_size (file_info.get_size ()); - entry.set_filetype ((uint) Posix.S_IFREG); - entry.set_perm (0644); -+#endif - - if (archive.write_header (entry) != Archive.Result.OK) { - critical ("Error writing '%s': %s (%d)", current_file.get_path (), archive.error_string (), archive.errno ()); -@@ -333,7 +345,11 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object { - break; - } - -+#if VALA_0_42 -+ archive.write_data (buffer[0:bytes_read]); -+#else - archive.write_data (buffer, bytes_read); -+#endif - } - } - } From be2f095cebcabf88c4042aa57a603008ef3a74ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 12:00:07 +0000 Subject: [PATCH 2898/3452] pt2-clone: 1.19 -> 1.20 --- pkgs/applications/audio/pt2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 8121c0caeec8..12eb4a39d53b 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.19"; + version = "1.20"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "0lr8gq4immc5cx1wr5ng6ccxs9afbd2dk6i0n5np25z14dvbvk3k"; + sha256 = "0s4yk8w19qa58n5p558n6m7d5mslr9h9z5q3ayrgqcchdlm8cfky"; }; nativeBuildInputs = [ cmake ]; From 8e162f755f49a41933fdc5034bc74a0c8ab458be Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 12:05:58 +0000 Subject: [PATCH 2899/3452] qbec: 0.12.0 -> 0.12.1 --- pkgs/applications/networking/cluster/qbec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 0689fd096b3b..e2b3a60f207f 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "qbec"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "0vy1cqqyga68qjbvyhsgl281qkbsvhvmwbxc93hygsxzm9kczy4p"; + sha256 = "1g90z155nhcblr48qypw8qw3l8g4dz33iflv4cg4xrhwjp8dfbv9"; }; vendorSha256 = "15hbjghi2ifylg7nr85qlk0alsy97h9zj6hf5w84m76dla2bcjf3"; From b05162b7e803377e49a295f517b4df08b68b5679 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 12:48:16 +0000 Subject: [PATCH 2900/3452] rclone: 1.52.1 -> 1.52.2 --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index b2ad47e9b4be..bfbe32fba48a 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "rclone"; - version = "1.52.1"; + version = "1.52.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1v91c3wydpixi0p0afclp4baxchigy3czlm1mq9hn6cw973z6spf"; + sha256 = "1da6azr4j5sbzb5xpy2xk4vqi6bdpmzlq3pxrmakaskicz64nnld"; }; goPackagePath = "github.com/rclone/rclone"; From ed49c901ddff4677a6ef8ad914c332dfa64af5ae Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 30 Jun 2020 13:42:48 +0200 Subject: [PATCH 2901/3452] nixos-container: Pass through several Nix flags Since nixos-container calls nix-env / nix-build, it's useful to support various evaluation-related options. --- .../nixos-container/nixos-container.pl | 38 +++++++++++++++++-- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index dc05c974bd03..02ad6af90daa 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -5,7 +5,7 @@ use POSIX; use File::Path; use File::Slurp; use Fcntl ':flock'; -use Getopt::Long qw(:config gnu_getopt); +use Getopt::Long qw(:config gnu_getopt no_bundling); use Cwd 'abs_path'; use Time::HiRes; @@ -68,6 +68,22 @@ my $localAddress; my $flake; my $flakeAttr = "container"; +# Nix passthru flags. +my @nixFlags; +my @nixFlags2; + +sub copyNixFlags0 { push @nixFlags, "--$_[0]"; } +sub copyNixFlags1 { push @nixFlags, "--$_[0]", $_[1]; } + +# Ugly hack to handle flags that take two arguments, like --option. +sub copyNixFlags2 { + if (scalar(@nixFlags2) % 3 == 0) { + push @nixFlags2, "--$_[0]", $_[1]; + } else { + push @nixFlags2, $_[1]; + } +} + GetOptions( "help" => sub { showHelp() }, "ensure-unique-name" => \$ensureUniqueName, @@ -82,8 +98,22 @@ GetOptions( "host-address=s" => \$hostAddress, "local-address=s" => \$localAddress, "flake=s" => \$flake, + # Nix passthru options. + "log-format=s" => \©NixFlags1, + "option=s{2}" => \©NixFlags2, + "impure" => \©NixFlags0, + "update-input=s" => \©NixFlags1, + "override-input=s{2}" => \©NixFlags2, + "commit-lock-file" => \©NixFlags0, + "no-registries" => \©NixFlags0, + "no-update-lock-file" => \©NixFlags0, + "no-write-lock-file" => \©NixFlags0, + "no-allow-dirty" => \©NixFlags0, + "recreate-lock-file" => \©NixFlags0, ) or exit 1; +push @nixFlags, @nixFlags2; + if (defined $hostAddress and !defined $localAddress or defined $localAddress and !defined $hostAddress) { die "With --host-address set, --local-address is required as well!"; } @@ -144,7 +174,7 @@ EOF } sub buildFlake { - system("nix", "build", "-o", "$systemPath.tmp", "--", + system("nix", "build", "-o", "$systemPath.tmp", @nixFlags, "--", "$flake#nixosConfigurations.\"$flakeAttr\".config.system.build.toplevel") == 0 or die "$0: failed to build container from flake '$flake'\n"; $systemPath = readlink("$systemPath.tmp") or die; @@ -251,7 +281,7 @@ if ($action eq "create") { system("nix-env", "-p", "$profileDir/system", "-I", "nixos-config=$nixosConfigFile", "-f", "$nixenvF", - "--set", "-A", "system") == 0 + "--set", "-A", "system", @nixFlags) == 0 or do { clearContainerState($profileDir, "$profileDir/$containerName", $root, $confFile); die "$0: failed to build initial container configuration\n" @@ -400,7 +430,7 @@ elsif ($action eq "update") { my $nixenvF = $nixosPath // ""; system("nix-env", "-p", "$profileDir/system", "-I", "nixos-config=$nixosConfigFile", "-f", $nixenvF, - "--set", "-A", "system") == 0 + "--set", "-A", "system", @nixFlags) == 0 or die "$0: failed to build container configuration\n"; } From 038e044c8392df8be9a15834c2b793cd2247198f Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Tue, 23 Jun 2020 11:47:27 +0300 Subject: [PATCH 2902/3452] pythonPackages.hcloud: 1.7.0 -> 1.8.1 --- pkgs/development/python-modules/hcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 672c4b94f36e..d1369b83179b 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.7.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "d249ab784b23026fcde21e4d69b46eaf9f3559ba3612f1d896a4092ecfc06a75"; + sha256 = "1xkds49z4hjyvz170913dz6886lhq4hb2n6dqqpv6q5p1znsx2gj"; }; propagatedBuildInputs = [ future requests python-dateutil ]; From d13d819b894dc837c918c4f0626a483d73d7784e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 12:39:33 +0000 Subject: [PATCH 2903/3452] rabbitmq-server: 3.8.4 -> 3.8.5 --- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index f81fef3cbe86..c4b3070e9f2f 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.8.4"; + version = "3.8.5"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1sa9zfd8hv5mxgnxva9sydqnyzwssxjkbba028pwpml2im97z7j5"; + sha256 = "014pfgfj90scas40lf0yjx14vhx5l5zbi3by2nnb704lg8w2n456"; }; buildInputs = From ea56dbfbc081fa2430d57c9f73fcb15779fa63bb Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 30 Jun 2020 15:29:54 +0200 Subject: [PATCH 2904/3452] pythonPackages.selectors2: fix build by disabling failing test_above_fd_setsize This fixes the following error in the `selectors2` test suite: ``` ====================================================================== ERROR: test_above_fd_setsize (tests.test_selectors2.PollSelectorTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "/private/var/folders/5h/b11m6fxj2tqgbxwz5bgjy42c0000gn/T/nix-build-python3.8-selectors2-2.0.1.drv-0/selectors2-2.0.1/tests/test_selectors2.py", line 530, in test_above_fd_setsize self.assertEqual(limit_nofile // 2, len(s.select())) File "/private/var/folders/5h/b11m6fxj2tqgbxwz5bgjy42c0000gn/T/nix-build-python3.8-selectors2-2.0.1.drv-0/selectors2-2.0.1/selectors2.py", line 402, in select fd_events = _syscall_wrapper(self._wrap_poll, True, timeout=timeout) File "/private/var/folders/5h/b11m6fxj2tqgbxwz5bgjy42c0000gn/T/nix-build-python3.8-selectors2-2.0.1.drv-0/selectors2-2.0.1/selectors2.py", line 662, in _syscall_wrapper return func(*args, **kwargs) File "/private/var/folders/5h/b11m6fxj2tqgbxwz5bgjy42c0000gn/T/nix-build-python3.8-selectors2-2.0.1.drv-0/selectors2-2.0.1/selectors2.py", line 397, in _wrap_poll result = self._poll.poll(timeout) OSError: [Errno 22] Invalid argument ---------------------------------------------------------------------- ``` --- pkgs/development/python-modules/selectors2/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix index 159047eafd7c..96917f45be08 100644 --- a/pkgs/development/python-modules/selectors2/default.nix +++ b/pkgs/development/python-modules/selectors2/default.nix @@ -17,7 +17,8 @@ buildPythonPackage rec { # Trick to disable certain tests that depend on timing which # will always fail on hydra export TRAVIS="" - nosetests tests/test_selectors2.py + nosetests tests/test_selectors2.py \ + --exclude=test_above_fd_setsize ''; meta = with stdenv.lib; { From 2f1c9323acd5784bcaee2c2717359d776304d417 Mon Sep 17 00:00:00 2001 From: Luc Tielen Date: Tue, 30 Jun 2020 15:49:49 +0200 Subject: [PATCH 2905/3452] souffle: 1.7.1 -> 2.0.0 --- pkgs/development/compilers/souffle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 00d1a2f79600..d7fc7b114ab2 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "1.7.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "0px8kh5875q2iyza4ylpa6vxpy6qxg0qvn2idk1j6dcdf5pdryph"; + sha256 = "1azn32x0xbbk8gagipb34qk3y1srm927j5d34w20isgjxir4xsnz"; }; nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; From b9cf52e90746b1e3a75c6629400414a418623ffd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 30 Jun 2020 09:00:00 -0500 Subject: [PATCH 2906/3452] nodejs-12_x: 12.18.1 -> 12.18.2 Changelog: https://github.com/nodejs/node/releases/tag/v12.18.2 --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 214292afbbe1..503461cc4835 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.18.1"; - sha256 = "0yjwd8yilm85wkginvhhchcikjsl8g3l3qagbg0l2y1hg8f0anfa"; + version = "12.18.2"; + sha256 = "1wnxab2shqgs5in0h39qy2fc7f32pcz4gl9i2mj1001pfani1g9q"; } From 1b6854988b436c20f7ff31135c52923c52af196c Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Tue, 30 Jun 2020 16:45:15 +0200 Subject: [PATCH 2907/3452] amdvlk: 2020.Q2.5 -> 2020.Q2.6 --- pkgs/development/libraries/amdvlk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 84b4d53bc56f..893f09809d85 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2020.Q2.5"; + version = "2020.Q2.6"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "008adby8vx12ma155x64n7aj9vp9ygqgij3mm3q20i187db7d1ab"; + sha256 = "1h5j4qaqm4kg5jybkkk6v1mdy0jx0k06mrb8n8jl415z08f0pjgj"; }; buildInputs = [ From 58cbd5ba857b9151f4ad33fced658191264d6c55 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 14:57:54 +0000 Subject: [PATCH 2908/3452] sbt: 1.3.12 -> 1.3.13 --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index ae9d47addddd..2eb364344060 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.3.12"; + version = "1.3.13"; src = fetchurl { urls = [ "https://piccolo.link/sbt-${version}.tgz" "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" ]; - sha256 = "0mwdqn0vk90wdpfzrbbc8l28407z5d62bvsi6jlgds2vbywjprxl"; + sha256 = "08mx84kzpm750zjxm225nh9wqm7js5y2k6hgb8xw3n574zg58hc5"; }; patchPhase = '' From 1c04554e4b737450b8637b25f681f32773af6f3b Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 30 Jun 2020 02:09:13 +0200 Subject: [PATCH 2909/3452] lorri: 1.0 -> 1.1 --- nixos/tests/lorri/default.nix | 2 +- pkgs/tools/misc/lorri/default.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/tests/lorri/default.nix b/nixos/tests/lorri/default.nix index 198171082d88..c33c7503993d 100644 --- a/nixos/tests/lorri/default.nix +++ b/nixos/tests/lorri/default.nix @@ -18,7 +18,7 @@ import ../make-test-python.nix { machine.wait_until_succeeds("grep --fixed-strings 'ready' lorri.stdout") # Ping the daemon - machine.succeed("lorri internal__ping shell.nix") + machine.succeed("lorri internal ping shell.nix") # Wait for the daemon to finish the build machine.wait_until_succeeds("grep --fixed-strings 'Completed' lorri.stdout") diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index 7829a677b431..002a6e2eaec9 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -4,7 +4,7 @@ , rustPlatform # Updater script , runtimeShell -, writeScript +, writers # Tests , nixosTests # Apple dependencies @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { pname = "lorri"; - version = "1.0"; + version = "1.1"; meta = with stdenv.lib; { description = "Your project's nix-env"; @@ -27,11 +27,12 @@ rustPlatform.buildRustPackage rec { owner = "target"; repo = pname; # Run `eval $(nix-build -A lorri.updater)` after updating the revision! - rev = "88c680c9abf0f04f2e294436d20073ccf26f0781"; - sha256 = "1415mhdr0pwvshs04clfz1ys76r5qf9jz8jchm63l6llaj6m7mrv"; + # ALSO don’t forget to update the cargoSha256! + rev = "93d93013217cd9aa09d2bd316d6c3abf827a6601"; + sha256 = "0wbkx8hmikngfp6fp0y65yla22f3k0jszq8a6pas80q0b33llwm5"; }; - cargoSha256 = "1iwd0cad8dp8q5xz2mm7zn1wphr5brkw937dfygc88afj6bv3d68"; + cargoSha256 = "1a3n1ylyp63x6v7b07nnqpfxjzmsgwmgraza23lx8z4gh167gv46"; doCheck = false; BUILD_REV_COUNT = src.revCount or 1; @@ -42,8 +43,7 @@ rustPlatform.buildRustPackage rec { stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; passthru = { - updater = with builtins; writeScript "copy-runtime-nix.sh" '' - #!${runtimeShell} + updater = writers.writeBash "copy-runtime-nix.sh" '' set -euo pipefail cp ${src}/nix/runtime.nix ${toString ./runtime.nix} cp ${src}/nix/runtime-closure.nix.template ${toString ./runtime-closure.nix.template} From e3936ac9c158576485de2a1ef492f436e27bd7dc Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 29 Jun 2020 14:28:45 +0200 Subject: [PATCH 2910/3452] =?UTF-8?q?ocamlPackages.irmin*:=202.1.0=20?= =?UTF-8?q?=E2=86=92=202.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit source now inherit ppx_irmin instead of irmin, since we can test irmin using ppx_irmin and this way we avoid circular dependencies. --- .../ocaml-modules/irmin/default.nix | 23 ++++++------------- pkgs/development/ocaml-modules/irmin/fs.nix | 2 ++ .../ocaml-modules/irmin/graphql.nix | 3 ++- pkgs/development/ocaml-modules/irmin/mem.nix | 2 ++ pkgs/development/ocaml-modules/irmin/pack.nix | 2 ++ pkgs/development/ocaml-modules/irmin/ppx.nix | 21 +++++++++++++---- pkgs/development/ocaml-modules/irmin/test.nix | 2 ++ 7 files changed, 34 insertions(+), 21 deletions(-) diff --git a/pkgs/development/ocaml-modules/irmin/default.nix b/pkgs/development/ocaml-modules/irmin/default.nix index cba677591676..2e3e27df7ffb 100644 --- a/pkgs/development/ocaml-modules/irmin/default.nix +++ b/pkgs/development/ocaml-modules/irmin/default.nix @@ -1,31 +1,22 @@ { lib, fetchurl, buildDunePackage , astring, base64, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri -, alcotest, hex +, alcotest, hex, ppx_irmin }: -buildDunePackage rec { - +buildDunePackage { pname = "irmin"; - version = "2.1.0"; + inherit (ppx_irmin) src version; + + useDune2 = true; minimumOCamlVersion = "4.07"; - src = fetchurl { - url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "1ji8r7zbdmhbk8r8w2hskd9z7pnvirzbhincfxndxgdaxbfkff5g"; - }; - propagatedBuildInputs = [ astring base64 digestif fmt jsonm logs ocaml_lwt ocamlgraph uri ]; - checkInputs = lib.optionals doCheck [ alcotest hex ]; - + checkInputs = [ alcotest hex ppx_irmin ]; doCheck = true; - meta = { - homepage = "https://irmin.org/"; + meta = ppx_irmin.meta // { description = "A distributed database built on the same principles as Git"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; }; - } diff --git a/pkgs/development/ocaml-modules/irmin/fs.nix b/pkgs/development/ocaml-modules/irmin/fs.nix index b1987aa7cbc6..0e9596751b82 100644 --- a/pkgs/development/ocaml-modules/irmin/fs.nix +++ b/pkgs/development/ocaml-modules/irmin/fs.nix @@ -8,6 +8,8 @@ buildDunePackage rec { propagatedBuildInputs = [ irmin ]; + useDune2 = true; + checkInputs = lib.optional doCheck irmin-test; doCheck = true; diff --git a/pkgs/development/ocaml-modules/irmin/graphql.nix b/pkgs/development/ocaml-modules/irmin/graphql.nix index 41355fc3986e..6e4598dd986a 100644 --- a/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -10,7 +10,8 @@ buildDunePackage rec { propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ]; - doCheck = true; + # test requires network + doCheck = false; meta = irmin.meta // { description = "GraphQL server for Irmin"; diff --git a/pkgs/development/ocaml-modules/irmin/mem.nix b/pkgs/development/ocaml-modules/irmin/mem.nix index b7040b9db0d7..1b8947849a92 100644 --- a/pkgs/development/ocaml-modules/irmin/mem.nix +++ b/pkgs/development/ocaml-modules/irmin/mem.nix @@ -6,6 +6,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ irmin ]; checkInputs = lib.optional doCheck irmin-test; diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix index c374b1a22750..b0081eb366e4 100644 --- a/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/pkgs/development/ocaml-modules/irmin/pack.nix @@ -7,6 +7,8 @@ buildDunePackage rec { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ index irmin ocaml_lwt ]; checkInputs = lib.optionals doCheck [ alcotest-lwt irmin-test ]; diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index 5366a04456d3..35aa659fbc8a 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -1,16 +1,29 @@ -{ lib, buildDunePackage, ppxlib, ocaml-syntax-shims, irmin }: +{ lib, fetchurl, buildDunePackage, ppxlib, ocaml-syntax-shims }: -buildDunePackage { +buildDunePackage rec { pname = "ppx_irmin"; + version = "2.2.0"; - inherit (irmin) version src minimumOCamlVersion; + src = fetchurl { + url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; + sha256 = "0gzw918b661qkvd140hilww9jsc49rxsxz1k4iihyvikjn202km4"; + }; + + minimumOCamlVersion = "4.06"; useDune2 = true; buildInputs = [ ocaml-syntax-shims ]; propagatedBuildInputs = [ ppxlib ]; - meta = irmin.meta // { + # tests depend on irmin, would create mutual dependency + # opt to test irmin instead of ppx_irmin + doCheck = false; + + meta = { + homepage = "https://irmin.org/"; description = "PPX deriver for Irmin generics"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/irmin/test.nix b/pkgs/development/ocaml-modules/irmin/test.nix index 57e33e2db8a5..b8a3f3ae2457 100644 --- a/pkgs/development/ocaml-modules/irmin/test.nix +++ b/pkgs/development/ocaml-modules/irmin/test.nix @@ -6,6 +6,8 @@ buildDunePackage { inherit (irmin) version src; + useDune2 = true; + propagatedBuildInputs = [ alcotest cmdliner irmin metrics-unix mtime ]; meta = irmin.meta // { From 2f33b685982bb515860dac39429158c0127a326b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 15:19:46 +0000 Subject: [PATCH 2911/3452] sequeler: 0.7.91 -> 0.8.0 --- pkgs/applications/misc/sequeler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 04ceed635436..6f43774a128a 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "sequeler"; - version = "0.7.91"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; rev = "v${version}"; - sha256 = "071vfx7bdf7hfa4784xz97vrj9x5aipgjbp30r00kg2zhg8wa2ls"; + sha256 = "090plqnby2wxzr1waq5kz89w3269j363mgxwfz9g7qg55lddaahz"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext wrapGAppsHook python3 desktop-file-utils ]; From 27aa4d0d8b559f35d7f892041022f6bda07ebac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 30 Jun 2020 17:28:14 +0200 Subject: [PATCH 2912/3452] python3Packages.somajo: 2.1.0 -> 2.1.1 Changelog: https://github.com/tsproisl/SoMaJo/releases/tag/v2.1.1 --- pkgs/development/python-modules/somajo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index c9415999262a..c0b8aaca24fc 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "SoMaJo"; - version = "2.1.0"; + version = "2.1.1"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "17ybm5rgwc6jy3i1c8nm05j7fd418n6hp44zv0q77kzhd66am6pp"; + sha256 = "0yj3yb0qvfdv4wh7nzcsh9in8nzk7b59dvjj0x02rsmlv4kw9ah1"; }; propagatedBuildInputs = [ regex ]; From 6b4c6b8817c1ac99d58760ecad189b6a6e0be641 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 15:31:23 +0000 Subject: [PATCH 2913/3452] simplenote: 1.17.0 -> 1.19.0 --- pkgs/applications/misc/simplenote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 917e1965e2ea..7cc5bc6eb7fc 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -16,10 +16,10 @@ let pname = "simplenote"; - version = "1.17.0"; + version = "1.19.0"; sha256 = { - x86_64-linux = "14kjx4y3kvw7h8wk8mmkpx1288jscmd8bgl10bw6kcfigcwahpw3"; + x86_64-linux = "1bvg8xlf2y9nz7dzs5jkr5b48hwmvhvb6m4ia1fyvnqqq46nz9wb"; }.${system} or throwSystem; meta = with stdenv.lib; { From 2c4cc0096997c8b63785fb747132dd7a16ab2cb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 30 Jun 2020 17:33:05 +0200 Subject: [PATCH 2914/3452] drawio: 13.3.1 -> 13.3.5 Changelog: https://github.com/jgraph/drawio-desktop/releases/tag/v13.3.5 --- 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 03ecbf3a4327..b23c13f85b85 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.3.1"; + version = "13.3.5"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "0zvxmqqbgfxad1n9pa4h99l8hys486wziw5yyndxbv1v80p55p0p"; + sha256 = "16pds6sip90davrlrk17a7ms5nh1bs8js5i0hbci1l8gsfyx22i7"; }; nativeBuildInputs = [ From a488fb4188364cab2ebb3b2f44dc28b8cf750893 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 08:36:08 -0700 Subject: [PATCH 2915/3452] sensu-go-agent: 5.20.1 -> 5.21.0 (#91847) --- pkgs/servers/monitoring/sensu-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 5f9f3b80f800..c71a07c9e8e0 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,7 +4,7 @@ let generic = { subPackages, pname, postInstall ? "" }: buildGoModule rec { inherit pname; - version = "5.20.1"; + version = "5.21.0"; shortRev = "3a1ac58"; # for internal version info goPackagePath = "github.com/sensu/sensu-go"; @@ -13,12 +13,12 @@ let owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "0wrcchz878sq7zhkb8p0s93k92xppihv5yyvkl363xs6519xzm7m"; + sha256 = "0zkwhr2z8yy8k2lal026i565hxxh51jrgplq83bbisc24xpcfg9s"; }; inherit subPackages postInstall; - vendorSha256 = "03lkra5vf07zicd2aipvmkrda56ys5swwj6lq5hnp324ndajfcya"; + vendorSha256 = "06yfaj9k5n3jw8a142sscaqrvdw2lq51v884lp65wjdwy5c3jbba"; buildFlagsArray = let versionPkg = "github.com/sensu/sensu-go/version"; From e70f10458f27559212459e00c8334f7808d49e66 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 15:54:44 +0000 Subject: [PATCH 2916/3452] spirv-cross: 2020-05-19 -> 2020-06-29 --- pkgs/tools/graphics/spirv-cross/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index 3ca698f1c54a..76d554457d91 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-cross"; - version = "2020-05-19"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = version; - sha256 = "0zyijp9zx9wbd4i5lwjap7n793iz6yjkf27la60dsffxl75yy9pd"; + sha256 = "0mnccmhlqmpdx92v495z39i07hbvjwdr5n4zbarlrr1d7rm99lx4"; }; nativeBuildInputs = [ cmake python3 ]; From cc70a76fca01bcf0e52727b579b10367fc3efc6a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 16:00:02 +0000 Subject: [PATCH 2917/3452] sslyze: 3.0.7 -> 3.0.8 --- pkgs/development/python-modules/sslyze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix index 78824515a45d..c127f6ea2e56 100644 --- a/pkgs/development/python-modules/sslyze/default.nix +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sslyze"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - sha256 = "1ahwldsh3xvagin09dy5q73bdw5k4siqy2qqgxwj4wdyd7pjb4p9"; + sha256 = "06mwzxw6xaqin2gwzcqb9r7qhbyx3k7zcxygxywi2bpxyjv9lq32"; }; patchPhase = '' From 669b2ab244602aca97d135447e35ab8c1817f178 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 16:21:46 +0000 Subject: [PATCH 2918/3452] suitesparse-graphblas: 3.2.2 -> 3.3.0 --- .../libraries/science/math/suitesparse-graphblas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 5a2c28d3c022..5244ccdb2817 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "3.2.2"; + version = "3.3.0"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "04hprrgj0f44ml2f0w4jfwgrvy8l2s6ya0c9xc8gwlbmkc7a4c62"; + sha256 = "1fin9741ild3dv7c9gk07kpizsnnx17ar9cv9lny8vl47pms940h"; }; nativeBuildInputs = [ From cf47dc9f7bce1aece6d90da3b0d71e0edce3423c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 16:35:09 +0000 Subject: [PATCH 2919/3452] targetcli: 2.1.51 -> 2.1.53 --- pkgs/os-specific/linux/targetcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/targetcli/default.nix b/pkgs/os-specific/linux/targetcli/default.nix index 65d46ad34c16..854e06b98a49 100644 --- a/pkgs/os-specific/linux/targetcli/default.nix +++ b/pkgs/os-specific/linux/targetcli/default.nix @@ -2,13 +2,13 @@ python.pkgs.buildPythonApplication rec { pname = "targetcli"; - version = "2.1.51"; + version = "2.1.53"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "${pname}-fb"; rev = "v${version}"; - sha256 = "07i9kyr525hlk32amzgycirwgwykdbjy5fmw6ji0nnhvk2jh4arn"; + sha256 = "1qrq7y5hnghzbxgrxgl153n8jlhw31kqjbr93jsvlvhz5b3ci750"; }; propagatedBuildInputs = with python.pkgs; [ configshell rtslib ]; From 968e1a03eb6557fd8c9ca19af0802495eacece9f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 16:51:53 +0000 Subject: [PATCH 2920/3452] terracognita: 0.4.0 -> 0.5.0 --- pkgs/development/tools/misc/terracognita/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index 70b07dd71cd5..6141b0b9997e 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terracognita"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "0ib0p361sxh2qzxccg32pcml4by4mk45abhljwmljwybs34wh5rh"; + sha256 = "0s6k78n94q13crdlgxb5c8qn708nbzn6nmhkil4s23f0qdskcah2"; }; - vendorSha256 = "0q772i49nyxzs51jrh45n14ljh7qj5wygkn2x32pxi6ykw6la4x8"; + vendorSha256 = "1dmv16v1c9sydbl1g69pgwvrhznd0a133giwrcbqi4cyg1fdb3sr"; subPackages = [ "." ]; From 133d5ae422935c1c2a16c80cfca313391decc083 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 16:58:35 +0000 Subject: [PATCH 2921/3452] terraform-ls: 0.3.2 -> 0.4.0 --- pkgs/development/tools/misc/terraform-ls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index cbbdd416ff8b..f2c8a6c4cdd2 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "terraform-ls"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "11776nq1ixrg791xlmryjxldsc8gn69j1fc0wd6cdywy8yp2lh4w"; + sha256 = "105wk7lzsjl5qa1qnb40msj3wh4awqykkynj5fs0a7nzbcbrpxsj"; }; goPackagePath = "github.com/hashicorp/terraform-ls"; From 0149d368656c08bacbadaa0f6591e4e9948059f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 17:05:08 +0000 Subject: [PATCH 2922/3452] thanos: 0.12.2 -> 0.13.0 --- pkgs/servers/monitoring/thanos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 227085184298..9970fab8ed2f 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "10xscm9h2krha66v96v2q85fynnxfizjcc47h7yz4xhjwvb5dgz2"; + sha256 = "03a964myry84ig8akim6vs6izl15hdpf5ggg4z5179ydbmvnq3lq"; }; - vendorSha256 = "126rghnyjpykvjg9sr4kwpskc13qqafxgfn9ffykwc4jjz8vc07q"; + vendorSha256 = "1jpw7k76li4dlfhhzy175198921zrdm09nnhqpmh7p80z252n936"; subPackages = "cmd/thanos"; From f2615c4c4f02ff72eaccbdde6400700d037ec8cb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 17:13:43 +0000 Subject: [PATCH 2923/3452] tiled: 1.3.5 -> 1.4.1 --- pkgs/applications/editors/tiled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 07a8e7619b1a..20e1427ddef3 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.3.5"; + version = "1.4.1"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "0d1bs909vga1k494xnggq1mcjfxjrwa4acc0mj5rv73xqkc9mb2s"; + sha256 = "1x8jymmc56di1c1wxalsp6qhcban2hahn70ndd097b8mx52gckjr"; }; nativeBuildInputs = [ pkgconfig qmake ]; From 13dbc08770eeff69694f9ab54f94b3316db5fbb3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 17:33:15 +0000 Subject: [PATCH 2924/3452] todoman: 3.7.0 -> 3.8.0 --- pkgs/applications/office/todoman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index e18a11a7448b..092a776ae606 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -5,11 +5,11 @@ let in buildPythonApplication rec { pname = "todoman"; - version = "3.7.0"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "16brw2zhm5vamffin6qjb0lxjlj3ba40vaficl851nw2xh2mrdhy"; + sha256 = "1aq7f63bhs9dnwzp15nfr07f2ki6s3lnqfap3b09rhchn6lfznwb"; }; LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux From 5e8a6e42abfa279440f873761b887f1049d1493a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 17:41:06 +0000 Subject: [PATCH 2925/3452] tokei: 11.2.1 -> 12.0.4 --- pkgs/development/tools/misc/tokei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index dee4c910fb80..fe54aff87c50 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "11.2.1"; + version = "12.0.4"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "1bdq66si9vvvyf5nia8ww77imp0f8jas0yfcvq1rialwm9922dfl"; + sha256 = "0vj6xpp5ss82n1zxljy5893s8l1pdhar5xqay5vvglkp8bzblin6"; }; - cargoSha256 = "17666wh4sfzhgxngymd02892mqpkr8jm6a4w95wwsc9iinzbygrm"; + cargoSha256 = "02c2pdjzd49qznm1yj3rnli48267ajjdklrb1cpj0rhpirw4rh1j"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security From ebe01712cc9763339376596ca26dbd45d58e2b4c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 17:45:19 +0000 Subject: [PATCH 2926/3452] toot: 0.26.0 -> 0.27.0 --- pkgs/applications/misc/toot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 5ce35f3292bd..8f701b20e3e8 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.26.0"; + version = "0.27.0"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = version; - sha256 = "146jj83jixahgxwh12bbkfvci2wrz398h5x01kgppdy59m4pa4pl"; + sha256 = "197g9lvwg8qnsf18kifcqdj3cpfdnxz9vay766rn9bi4nfz0s6j2"; }; checkInputs = with python3Packages; [ pytest ]; From 9822cf71bc7c6c920ae67f06cba98fd017ec41b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 18:01:39 +0000 Subject: [PATCH 2927/3452] ttyd: 1.6.0 -> 1.6.1 --- pkgs/servers/ttyd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index b7fac5fc477c..ef830710c1cf 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -7,12 +7,12 @@ with builtins; stdenv.mkDerivation rec { pname = "ttyd"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "tsl0922"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "08skw3h897jb71sbnglj571h35pcb1mikzlh71sx5imjgi4hfczr"; + sha256 = "1ifgw93g8jaaa6fgfqjnn83n5ccr6l72ynwwwa97hfwjk90r14fg"; }; nativeBuildInputs = [ pkgconfig cmake xxd ]; From ef5757a310ecd99bd9790197660ba783eb744675 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 18:08:53 +0000 Subject: [PATCH 2928/3452] tunnelto: 0.1.6 -> 0.1.9 --- pkgs/tools/networking/tunnelto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/tunnelto/default.nix b/pkgs/tools/networking/tunnelto/default.nix index c61da53c6ad5..c774888d04cd 100644 --- a/pkgs/tools/networking/tunnelto/default.nix +++ b/pkgs/tools/networking/tunnelto/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "tunnelto"; - version = "0.1.6"; + version = "0.1.9"; src = fetchFromGitHub { owner = "agrinman"; repo = pname; rev = version; - sha256 = "0yigjg8kjl8v0636hjr3sg33p4v963vzq7wbfi986ymxfx47jqp7"; + sha256 = "11v06w0mq9l6rcgbm0wx47a5x3n7js8f07g43xfjv0qf0ra4w2xj"; }; - cargoSha256 = "0603b0hn84shl9wdg7zg7kf9050gh33d8ghscwsby1vqanakms9j"; + cargoSha256 = "0pq0ril8lm6y8pz0jj49zwcbb1yw3hjbpk4m9vp1vfbj3hvjcbp3"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] From 01ce5d4488449a07c7585cce11ea63221dc215df Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Sun, 28 Jun 2020 11:28:31 -0400 Subject: [PATCH 2929/3452] haskellPackages: remove obsolete overrides xmobar: -appendPatch data-accessor-template: -overrideCabal cabal-lenses: -doJailbreak spacecookie: -doJailbreak krank: -doJailbreak --- .../haskell-modules/configuration-common.nix | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d22eb95ad3b6..c3e7058b7909 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -722,9 +722,6 @@ self: super: { # The tests spuriously fail libmpd = dontCheck super.libmpd; - # https://github.com/dan-t/cabal-lenses/issues/6 - cabal-lenses = doJailbreak super.cabal-lenses; - # https://github.com/diagrams/diagrams-lib/issues/288 diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; }); @@ -1036,12 +1033,8 @@ self: super: { # }); libnix = dontCheck super.libnix; - # 2020-06-23: NOTE: > 0.33 => rm 464.patch: https://github.com/jaor/xmobar/issues/466 # dontCheck: The test suite tries to mess with ALSA, which doesn't work in the build sandbox. - xmobar = appendPatch (dontCheck super.xmobar) (pkgs.fetchpatch { - url = "https://github.com/jaor/xmobar/pull/464.patch"; - sha256 = "0y1dd878yzy1cx0cjj0ijd3dmywr7jdmk68vxdjimxzblrdw1al6"; - }); + xmobar = dontCheck super.xmobar; # https://github.com/mgajda/json-autotype/issues/25 json-autotype = dontCheck super.json-autotype; @@ -1059,14 +1052,6 @@ self: super: { })]; }); - # Remove unecessary constraint: - # https://github.com/haskell-infra/hackage-trustees/issues/258 - data-accessor-template = overrideCabal super.data-accessor-template (drv: { - postPatch = '' - sed -i 's#template-haskell >=2.11 && <2.15#template-haskell#' data-accessor-template.cabal - ''; - }); - # 2020-06-05: HACK: In Nixpkgs currently this is # old pandoc version 2.7.4 to current 2.9.2.1, # test suite failures: https://github.com/jgm/pandoc/issues/5582 @@ -1165,9 +1150,6 @@ self: super: { # https://github.com/kazu-yamamoto/dns/issues/150 dns = dontCheck super.dns; - # Support recent versions of fast-logger. - spacecookie = doJailbreak super.spacecookie; - # apply patches from https://github.com/snapframework/snap-server/pull/126 # manually until they are accepted upstream snap-server = overrideCabal super.snap-server (drv: { @@ -1189,9 +1171,6 @@ self: super: { # https://github.com/haskell-servant/servant-ekg/issues/15 servant-ekg = doJailbreak super.servant-ekg; - # krank-0.1.0 does not accept PyF-0.9.0.0. - krank = doJailbreak super.krank; - # the test suite has an overly tight restriction on doctest # See https://github.com/ekmett/perhaps/pull/5 perhaps = doJailbreak super.perhaps; From 5f93c0e69d40dc68f94d1b77d9f36fb56f473c51 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Sun, 28 Jun 2020 11:44:56 -0400 Subject: [PATCH 2930/3452] haskellPackages: remove obsolete overrides bitwise-enum: -doJailbreak haskell-ci: -doJailbreak jsaddle: -dontCheck term-rewriting: -doJailbreak pure-zlib: -doJailbreak --- .../haskell-modules/configuration-common.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d22eb95ad3b6..9a732ea75446 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -638,9 +638,6 @@ self: super: { # We cannot build this package w/o the C library from . phash = markBroken super.phash; - # We get lots of strange compiler errors during the test suite run. - jsaddle = dontCheck super.jsaddle; - # https://github.com/Philonous/hs-stun/pull/1 # Remove if a version > 0.1.0.1 ever gets released. stunclient = overrideCabal super.stunclient (drv: { @@ -894,13 +891,6 @@ self: super: { ''; }); - # https://github.com/haskell-rewriting/term-rewriting/pull/15 - # remove on next hackage update - term-rewriting = doJailbreak super.term-rewriting; - - # https://github.com/GaloisInc/pure-zlib/pull/11 - pure-zlib = doJailbreak super.pure-zlib; - # https://github.com/strake/lenz-template.hs/pull/2 lenz-template = doJailbreak super.lenz-template; @@ -1215,9 +1205,6 @@ self: super: { ''; }); - # Unnecessary upper bound on vector <0.12.1 - bitwise-enum = doJailbreak super.bitwise-enum; - # This breaks because of version bounds, but compiles and runs fine. # Last commit is 5 years ago, so we likely won't get upstream fixed soon. # https://bitbucket.org/rvlm/hakyll-contrib-hyphenation/src/master/ @@ -1244,9 +1231,6 @@ self: super: { # gitit is unbroken in the latest release gitit = markUnbroken super.gitit; - # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2. - haskell-ci = doJailbreak super.haskell-ci; - # Test suite requires database persistent-mysql = dontCheck super.persistent-mysql; persistent-postgresql = dontCheck super.persistent-postgresql; From 124d88a5fe66f6eba7067804c78b811689c8feb4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 18:37:43 +0000 Subject: [PATCH 2931/3452] waylandpp: 0.2.7 -> 0.2.8 --- pkgs/development/libraries/waylandpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 5b02ce826add..5fc466cec201 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -16,13 +16,13 @@ assert docSupport -> doxygen != null; with stdenv.lib; stdenv.mkDerivation rec { pname = "waylandpp"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "NilsBrause"; repo = pname; rev = version; - sha256 = "1r4m0xhvwpcqxrqvp3hz1bzlkxqj2jiymd5r6hj8xjzz536hyprz"; + sha256 = "1kxiqab48p0n97pwg8c2zx56wqq32m3rcq7qd2pjj33ipcanb3qq"; }; cmakeFlags = [ From e3761b651c635da192fc44d74cb8d165d653ac89 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 25 Jun 2020 14:24:34 -0700 Subject: [PATCH 2932/3452] onnxruntime: 1.2.0 -> 1.3.1 Co-authored by: @marsam --- pkgs/development/libraries/onnxruntime/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 7d0a9342aa7b..1794d55daaaf 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -4,17 +4,22 @@ stdenv.mkDerivation rec { pname = "onnxruntime"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "microsoft"; repo = "onnxruntime"; rev = "v${version}"; - sha256 = "1alhb7nvlxrr9yf757gs4hkzksbk3mxyv5zcmmpl82ibl65vh55k"; + sha256 = "0rbk1jbfc447x2wybz2hsba6w1ij0fq21996l52cqv39898lvy9d"; # TODO: use nix-versions of grpc, onnx, eigen, googletest, etc. # submodules increase src size and compile times significantly # not currently feasible due to how integrated cmake build is with git fetchSubmodules = true; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + postFetch = '' + rm -rf $out/winml/test/collateral/models/UnicodePath/ + ''; }; # TODO: build server, and move .so's to lib output From 68ec5811d1cfacc0d8d9e280ab67c9691a82e96a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 20:58:30 +0200 Subject: [PATCH 2933/3452] device-tree_rpi: update meta data --- pkgs/os-specific/linux/device-tree/raspberrypi.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/pkgs/os-specific/linux/device-tree/raspberrypi.nix index b5886f6bd116..5a0d5710392b 100644 --- a/pkgs/os-specific/linux/device-tree/raspberrypi.nix +++ b/pkgs/os-specific/linux/device-tree/raspberrypi.nix @@ -31,6 +31,7 @@ stdenvNoCC.mkDerivation { overlays = "${raspberrypifw}/share/raspberrypi/boot/overlays"; }; meta = with stdenvNoCC.lib; { - platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; + inherit (raspberrypifw.meta) platforms homepage license; + description = "DTBs for the Raspberry Pi"; }; } From 1bd4fbc4a4273215e4ca98bf25b4c1af8fdcbb0f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:00:30 +0200 Subject: [PATCH 2934/3452] iptstate: add license --- pkgs/os-specific/linux/iptstate/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/os-specific/linux/iptstate/default.nix index cd290113e00e..529a82e96469 100644 --- a/pkgs/os-specific/linux/iptstate/default.nix +++ b/pkgs/os-specific/linux/iptstate/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ trevorj ]; downloadPage = "https://github.com/jaymzh/iptstate/releases"; + license = licenses.zlib; }; installPhase = '' From 9cf41a84bcf5c48e413eff908b07f63f38f661ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 19:00:55 +0000 Subject: [PATCH 2935/3452] wrangler: 1.9.2 -> 1.10.3 --- pkgs/development/tools/wrangler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index cdbba236922a..6a6d6e39288a 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.9.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "0i3fhdq8v9459mlnazkv9bpkcv01rdy5rk149lhpsan76zlyzzwr"; + sha256 = "0703zlrmv0if575rj1mrgfg1a5qbf98sqjhhj09hab69i96wbrk9"; }; - cargoSha256 = "0c2ss3j53vra1b4m3jsy2w2gdf6k1hw3qf6sd4qlg2ybk4k83g3b"; + cargoSha256 = "0znzyqzvbqcl4mmxpsvaf592xrs968x57czj45jibmafq033dbfa"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; From fc47c7b8835910beb76b6723fda01ca486a3921b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:02:50 +0200 Subject: [PATCH 2936/3452] gpio-utils: add license --- pkgs/os-specific/linux/kernel/gpio-utils.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/gpio-utils.nix b/pkgs/os-specific/linux/kernel/gpio-utils.nix index 447704eedc8d..e28d838efb3f 100644 --- a/pkgs/os-specific/linux/kernel/gpio-utils.nix +++ b/pkgs/os-specific/linux/kernel/gpio-utils.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation { meta = { description = "Linux tools to inspect the gpiochip interface"; - maintainers = with stdenv.lib.maintainers; [ kwohlfahrt ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ kwohlfahrt ]; + platforms = platforms.linux; + license = licenses.gpl2; }; } From 5cd8370d27b6a931ed95dc525fcb22ecc8cc9a7b Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Sun, 28 Jun 2020 12:58:09 -0400 Subject: [PATCH 2937/3452] haskellPackages: remove obsolete overrides web-routes-th: -doJailbreak load-env: -dontCheck servant-swagger: -dontCheck vector-algorithms: -dontCheck graphviz: -dontCheck --- .../haskell-modules/configuration-common.nix | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d22eb95ad3b6..19047a5439a3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -846,12 +846,6 @@ self: super: { in doJailbreak (f super.servant-docs); # jailbreak tasty < 1.2 until servant-docs > 0.11.3 is on hackage. swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; - # requires a release including https://github.com/haskell-servant/servant-swagger/commit/249530d9f85fe76dfb18b100542f75a27e6a3079 - servant-swagger = dontCheck super.servant-swagger; - - # Tries to read a file it is not allowed to in the test suite - load-env = dontCheck super.load-env; - # Copy hledger man pages from data directory into the proper place. This code # should be moved into the cabal2nix generator. hledger = overrideCabal super.hledger (drv: { @@ -924,11 +918,6 @@ self: super: { # Compiles some C++ source which requires these headers VulkanMemoryAllocator = addExtraLibrary super.VulkanMemoryAllocator pkgs.vulkan-headers; - # # Builds only with the latest version of indexed-list-literals. - # vector-sized_1_0_3_0 = super.vector-sized_1_0_3_0.override { - # indexed-list-literals = self.indexed-list-literals_0_2_1_1; - # }; - # https://github.com/dmwit/encoding/pull/3 encoding = doJailbreak (appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch); @@ -944,9 +933,6 @@ self: super: { # https://github.com/haskell-servant/servant-auth/issues/113 servant-auth-client = dontCheck super.servant-auth-client; - # Test has either build errors or fails anyway, depending on the compiler. - vector-algorithms = dontCheck super.vector-algorithms; - # 2020-06-04: HACK: dontCheck - The test suite attempts to use the network. # Should be solved when: https://github.com/dhall-lang/dhall-haskell/issues/1837 dhall = (generateOptparseApplicativeCompletion "dhall" (dontCheck super.dhall)).override { repline = self.repline_0_3_0_0; }; @@ -1104,9 +1090,6 @@ self: super: { # Test suite won't link for no apparent reason. constraints-deriving = dontCheck super.constraints-deriving; - # QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7 - graphviz = dontCheck super.graphviz; - # https://github.com/elliottt/hsopenid/issues/15 openid = markBroken super.openid; @@ -1141,9 +1124,6 @@ self: super: { # upstream issue: https://github.com/vmchale/atspkg/issues/12 language-ats = dontCheck super.language-ats; - # https://github.com/Happstack/web-routes-th/pull/3 - web-routes-th = doJailbreak super.web-routes-th; - # Remove for hail > 0.2.0.0 hail = overrideCabal super.hail (drv: { patches = [ From b2cfe47647b6c8ede89fee25d6e7c7a2937ca7b4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:04:56 +0200 Subject: [PATCH 2938/3452] klibcShrunk: add meta data --- pkgs/os-specific/linux/klibc/shrunk.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/klibc/shrunk.nix b/pkgs/os-specific/linux/klibc/shrunk.nix index b5b9783c6e7d..8b79940ed78c 100644 --- a/pkgs/os-specific/linux/klibc/shrunk.nix +++ b/pkgs/os-specific/linux/klibc/shrunk.nix @@ -22,7 +22,5 @@ stdenv.mkDerivation { ''; # */ allowedReferences = ["out"]; - meta = { - platforms = stdenv.lib.platforms.linux; - }; + inherit (klibc) meta; } From 077cd7210b79fb333ea8c54a72c80b480de12533 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:10:46 +0200 Subject: [PATCH 2939/3452] kmod-blacklist: add license --- pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index e14e190cd7c5..17f34f9bbd79 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -34,5 +34,6 @@ in stdenv.mkDerivation { homepage = "https://packages.ubuntu.com/source/zesty/kmod"; description = "Linux kernel module blacklists from Ubuntu"; platforms = platforms.linux; + license = with licenses; [ gpl2Plus lgpl21Plus ]; }; } From 19211e9a6a0d369a88f30085a959cd1af5db8ba3 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Tue, 30 Jun 2020 09:31:49 -0700 Subject: [PATCH 2940/3452] pidgin: now builds and runs on osx We can now build and run pidgin on OSX. Pidgin requires an X11 server to run. * Build: Differences Linux and OSX now parameterized * Darwin: build against gtk2-x11 instead of gtk * Darwin: disable gtkspell2 (spellcheck) * Darwin: disable farstream (voice and video) Signed-off-by: Frederick F. Kautz IV --- .../instant-messengers/pidgin/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 369ae0693246..eec4b1e18991 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell +{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtk2-x11 +, gtkspell2, aspell , gst_all_1, startupnotification, gettext , perlPackages, libxml2, nss, nspr, farstream , libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn @@ -29,19 +30,26 @@ let unwrapped = stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; buildInputs = [ - gtkspell2 aspell startupnotification + aspell startupnotification gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - libxml2 nss nspr farstream + libxml2 nss nspr libXScrnSaver ncurses python avahi dbus dbus-glib intltool libidn libICE libXext libSM cyrus_sasl ] ++ (lib.optional (openssl != null) openssl) ++ (lib.optional (gnutls != null) gnutls) - ++ (lib.optional (libgcrypt != null) libgcrypt); + ++ (lib.optional (libgcrypt != null) libgcrypt) + ++ (lib.optional (stdenv.isLinux) gtk2) + ++ (lib.optional (stdenv.isLinux) gtkspell2) + ++ (lib.optional (stdenv.isLinux) farstream) + ++ (lib.optional (stdenv.isDarwin) gtk2-x11); - propagatedBuildInputs = [ pkgconfig gtk2 gettext ] - ++ (with perlPackages; [ perl XMLParser ]); + + propagatedBuildInputs = [ pkgconfig gettext ] + ++ (with perlPackages; [ perl XMLParser ]) + ++ (lib.optional (stdenv.isLinux) gtk2) + ++ (lib.optional (stdenv.isDarwin) gtk2-x11); patches = [ ./pidgin-makefile.patch ./add-search-path.patch ]; @@ -54,6 +62,8 @@ let unwrapped = stdenv.mkDerivation rec { "--disable-meanwhile" "--disable-nm" "--disable-tcl" + "--disable-gtkspell" + "--disable-vv" ] ++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ]) ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]); @@ -69,7 +79,7 @@ let unwrapped = stdenv.mkDerivation rec { description = "Multi-protocol instant messaging client"; homepage = "http://pidgin.im"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.vcunat ]; }; }; From 9dcf53102719a3a73d0e42f5176d00144a8e3121 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Sun, 28 Jun 2020 14:21:40 -0400 Subject: [PATCH 2941/3452] haskellPackages: remove obsolete overrides universum: -dontCheck MissingH: -dontCheck, -doJailbreak html-entities: -doJailbreak restless-git: -doJailbreak blaze-markup: -doJailbreak --- .../haskell-modules/configuration-common.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d22eb95ad3b6..7d325883c1d5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -480,9 +480,6 @@ self: super: { # Won't compile with recent versions of QuickCheck. inilist = dontCheck super.inilist; - # Doesn't accept recent versions of 'base' or QuickCheck. - MissingH = dontCheck (doJailbreak super.MissingH); - # https://github.com/yaccz/saturnin/issues/3 Saturnin = dontCheck super.Saturnin; @@ -754,9 +751,6 @@ self: super: { digestive-functors-blaze = doJailbreak super.digestive-functors-blaze; digestive-functors = doJailbreak super.digestive-functors; - # missing dependencies: doctest ==0.12.* - html-entities = doJailbreak super.html-entities; - # https://github.com/takano-akio/filelock/issues/5 filelock = dontCheck super.filelock; @@ -776,8 +770,7 @@ self: super: { grakn = dontCheck (doJailbreak super.grakn); # test suite requires git and does a bunch of git operations - # doJailbreak because of hardcoded time, seems to be fixed upstream - restless-git = dontCheck (doJailbreak super.restless-git); + restless-git = dontCheck super.restless-git; # Depends on broken fluid. fluid-idl-http-client = markBroken super.fluid-idl-http-client; @@ -794,7 +787,6 @@ self: super: { # Needs QuickCheck <2.10, which we don't have. edit-distance = doJailbreak super.edit-distance; - blaze-markup = doJailbreak super.blaze-markup; blaze-html = doJailbreak super.blaze-html; attoparsec = dontCheck super.attoparsec; # 1 out of 67 tests fails int-cast = doJailbreak super.int-cast; @@ -1119,10 +1111,6 @@ self: super: { ''; }); - # The doctests in universum-1.5.0 are broken. The doctests in versions of universum after - # 1.5.0 should be fixed, so this should be able to be removed. - universum = dontCheck super.universum; - # https://github.com/erikd/hjsmin/issues/32 hjsmin = dontCheck super.hjsmin; From 2862ba321addae55fb876dfa1e830d3d6f7ad797 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:11:42 +0200 Subject: [PATCH 2942/3452] kmod-debian-aliases: add license --- pkgs/os-specific/linux/kmod-debian-aliases/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix index f0f413317277..23d323f84b8f 100644 --- a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix +++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix @@ -14,10 +14,11 @@ stdenv.mkDerivation rec { cp aliases.conf $out ''; - meta = { + meta = with lib; { homepage = "https://packages.debian.org/source/sid/kmod"; description = "Linux configuration file for modprobe"; - maintainers = with lib.maintainers; [ mathnerd314 ]; - platforms = with lib.platforms; linux; + maintainers = with maintainers; [ mathnerd314 ]; + platforms = with platforms; linux; + license = with licenses; [ gpl2Plus lgpl21Plus ]; }; } From 2b99f89db32769da3f87a926cb5f18714e55ea4b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:22:31 +0200 Subject: [PATCH 2943/3452] libvolume_id: add license --- pkgs/os-specific/linux/libvolume_id/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix index e54dee10c1d4..98ddc50e2e48 100644 --- a/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/pkgs/os-specific/linux/libvolume_id/default.nix @@ -1,8 +1,8 @@ {stdenv, fetchurl}: - + stdenv.mkDerivation { name = "libvolume_id-0.81.1"; - + src = fetchurl { url = "https://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2"; sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5"; @@ -18,7 +18,8 @@ stdenv.mkDerivation { cp -f libvolume_id.so.0 $out/lib/ "; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.gpl2; }; } From 7e2278e691d83ca972d37798d3f93c6945cb499a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:27:03 +0200 Subject: [PATCH 2944/3452] rfkill-udev: add license --- pkgs/os-specific/linux/rfkill/udev.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix index 3ee112126ac6..a24c947673de 100644 --- a/pkgs/os-specific/linux/rfkill/udev.nix +++ b/pkgs/os-specific/linux/rfkill/udev.nix @@ -47,9 +47,10 @@ in stdenv.mkDerivation { cp ${rfkillHook} "$out/bin/rfkill-hook.sh" ''; - meta = { + meta = with stdenv.lib; { homepage = "http://wireless.kernel.org/en/users/Documentation/rfkill"; description = "Rules+hook for udev to catch rfkill state changes"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.mit; }; } From a61b50f79b2876f39d7d4f79d93482566430ab0f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:29:37 +0200 Subject: [PATCH 2945/3452] sysklogd: add license --- pkgs/os-specific/linux/sysklogd/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index c8378f2a0cbc..f93e9012e05d 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -21,8 +21,9 @@ stdenv.mkDerivation { preInstall = "mkdir -p $out/share/man/man5/ $out/share/man/man8/ $out/sbin"; - meta = { + meta = with stdenv.lib; { description = "A system logging daemon"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.gpl2; }; } From e830f2a0e274ab4de9d46e4da89c98460625c004 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:31:24 +0200 Subject: [PATCH 2946/3452] xf86-video-nested: add license --- pkgs/os-specific/linux/xf86-video-nested/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index c117293d3ad1..f86393cba84d 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -20,10 +20,11 @@ stdenv.mkDerivation { CFLAGS = "-I${pixman}/include/pixman-1"; - meta = { + meta = with stdenv.lib; { homepage = "https://cgit.freedesktop.org/xorg/driver/xf86-video-nested"; description = "A driver to run Xorg on top of Xorg or something else"; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + license = licenses.mit; }; } From b9e6b1d1986481bc7bcba0972d723d55cc55e6a1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:32:23 +0200 Subject: [PATCH 2947/3452] adguardhome: add license --- pkgs/servers/adguardhome/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 54000a81b67d..3260ce4f053a 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { description = "Network-wide ads & trackers blocking DNS server"; platforms = platforms.linux; maintainers = with maintainers; [ numkem ]; + license = licenses.gpl3; }; } From 0a2a353ad533deaa468957fbc22cbe6a3a64ccee Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:34:44 +0200 Subject: [PATCH 2948/3452] resim: add license --- pkgs/misc/emulators/resim/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/misc/emulators/resim/default.nix b/pkgs/misc/emulators/resim/default.nix index 81acdf81f2ec..ba7ac6212576 100644 --- a/pkgs/misc/emulators/resim/default.nix +++ b/pkgs/misc/emulators/resim/default.nix @@ -15,4 +15,6 @@ stdenv.mkDerivation { cp -v libresim/libarmsim.so $out/lib/libarmsim.so cp -v vc4emul/vc4emul $out/bin/vc4emul ''; + + meta.license = stdenv.lib.licenses.mit; } From 19d41f90b44206a8e71d1c331d20725cef199471 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:39:52 +0200 Subject: [PATCH 2949/3452] openmsx: add license --- pkgs/misc/emulators/openmsx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix index 68b464f4d358..f0ab48aa6258 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://openmsx.org"; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + license = with licenses; [ bsd2 boost gpl2 ]; }; } From 1560a465c30b03c052a51d9ca348065f4bf8add4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:41:19 +0200 Subject: [PATCH 2950/3452] fcgiwrap: add license --- pkgs/servers/fcgiwrap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index cd4d3116213f..a15e1c15b15b 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { description = "Simple server for running CGI applications over FastCGI"; maintainers = with maintainers; [ lethalman ]; platforms = with platforms; linux; + license = licenses.mit; }; } From 56f4aa7c9d653552a4743196583fdab4460e5a54 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 30 Jun 2020 21:43:26 +0200 Subject: [PATCH 2951/3452] hashi-ui: add license --- pkgs/servers/hashi-ui/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/hashi-ui/default.nix b/pkgs/servers/hashi-ui/default.nix index 019a8dca3b65..70926e37739a 100644 --- a/pkgs/servers/hashi-ui/default.nix +++ b/pkgs/servers/hashi-ui/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "A modern user interface for hashicorp Consul & Nomad"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ numkem ]; + license = licenses.mit; }; } From f979a8861cc7b98cd9e1703c23b502c2e7027a93 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Tue, 30 Jun 2020 16:08:33 -0400 Subject: [PATCH 2952/3452] haskellPackages: remove obsolete overrides attoparsec: -dontCheck nix-derivation: -doJailbreak cryptohash-sha256: -dontCheck text-short: -doJailbreak genvalidity-property: -doJailbreak --- pkgs/development/haskell-modules/configuration-common.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d22eb95ad3b6..3b2459e2de10 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -796,18 +796,14 @@ self: super: { edit-distance = doJailbreak super.edit-distance; blaze-markup = doJailbreak super.blaze-markup; blaze-html = doJailbreak super.blaze-html; - attoparsec = dontCheck super.attoparsec; # 1 out of 67 tests fails int-cast = doJailbreak super.int-cast; - nix-derivation = doJailbreak super.nix-derivation; # Needs QuickCheck <2.10, HUnit <1.6 and base <4.10 pointfree = doJailbreak super.pointfree; # Needs tasty-quickcheck ==0.8.*, which we don't have. - cryptohash-sha256 = dontCheck super.cryptohash-sha256; cryptohash-sha1 = doJailbreak super.cryptohash-sha1; cryptohash-md5 = doJailbreak super.cryptohash-md5; - text-short = doJailbreak super.text-short; gitHUD = dontCheck super.gitHUD; githud = dontCheck super.githud; @@ -815,7 +811,6 @@ self: super: { config-ini = dontCheck super.config-ini; # doctest >=0.9 && <0.12 - genvalidity-property = doJailbreak super.genvalidity-property; path = dontCheck super.path; # Test suite fails due to trying to create directories From f25079d967bc7a7a8181637cfdb154c39460d3ec Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Tue, 30 Jun 2020 13:24:51 -0700 Subject: [PATCH 2953/3452] pidgin: reenable spellcheck and voice/video in linux builds Signed-off-by: Frederick F. Kautz IV --- .../networking/instant-messengers/pidgin/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index eec4b1e18991..a269eead708a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -40,9 +40,7 @@ let unwrapped = stdenv.mkDerivation rec { ++ (lib.optional (openssl != null) openssl) ++ (lib.optional (gnutls != null) gnutls) ++ (lib.optional (libgcrypt != null) libgcrypt) - ++ (lib.optional (stdenv.isLinux) gtk2) - ++ (lib.optional (stdenv.isLinux) gtkspell2) - ++ (lib.optional (stdenv.isLinux) farstream) + ++ (lib.optionals (stdenv.isLinux) [gtk2 gtkspell2 farstream]) ++ (lib.optional (stdenv.isDarwin) gtk2-x11); @@ -62,11 +60,10 @@ let unwrapped = stdenv.mkDerivation rec { "--disable-meanwhile" "--disable-nm" "--disable-tcl" - "--disable-gtkspell" - "--disable-vv" ] ++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ]) - ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]); + ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]) + ++ (lib.optionals (stdenv.isDarwin) ["--disable-gtkspell" "--disable-vv"]); enableParallelBuilding = true; From 1a7ac5872e7361fc8bb73b5c71a9cb3ef49c1164 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 20:40:10 +0000 Subject: [PATCH 2954/3452] yq-go: 3.3.1 -> 3.3.2 --- pkgs/development/tools/yq-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index fc6fcd234850..e830309381f4 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "mikefarah"; rev = version; repo = "yq"; - sha256 = "0fr6zwnij3r53dqdw43qfmp4nw26gv6zmj066l44fazka4fl25i6"; + sha256 = "1rdpjxnq6cs6gwpp4bijp38b657yzjqcdzf98lhhpbpskjz8k8pp"; }; vendorSha256 = "1bjy3qr26zndr3dhh9gd33rhm5gy779525qgzjw4a4mla0p2q6kl"; From db522fda912d699fcb769cf45287e378c6b3c507 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 20:44:18 +0000 Subject: [PATCH 2955/3452] z-lua: 1.8.4 -> 1.8.7 --- pkgs/tools/misc/z-lua/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix index 7d8e760a8d93..59149506e6c0 100644 --- a/pkgs/tools/misc/z-lua/default.nix +++ b/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.4"; + version = "1.8.7"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "1whh2gzxhx4c24mwh5yifnpah56bzb6v7barp727pjw4whpflg1s"; + sha256 = "14n1abv7gh4zajq471bgzpcv8l1159g00h9x83h719i9kxxsa2ba"; }; dontBuild = true; From 9de27d21eee45a8ad90e0e23c982723243180e6f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 21:02:04 +0000 Subject: [PATCH 2956/3452] zef: 0.8.4 -> 0.8.5 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 5c8fe16408b4..c82053446933 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "02a3awnjr1mgb9275xvp3xms80vcxkq55ffi8sbjzxpwyadj5y5k"; + sha256 = "17a5ns0ph8626q3b4wv9v2n0zqmhqbqyzjzxa387kr19qs933yy6"; }; buildInputs = [ rakudo makeWrapper ]; From adba00e92aead713b067193e7d25ef0df55482bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 21:07:47 +0000 Subject: [PATCH 2957/3452] zlog: 1.2.14 -> 1.2.15 --- pkgs/development/libraries/zlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index 4788613a3dcf..b5662b63327e 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - version = "1.2.14"; + version = "1.2.15"; pname = "zlog"; src = fetchzip { name = "${pname}-${version}-src"; url = "https://github.com/HardySimpson/zlog/archive/${version}.tar.gz"; - sha256 = "1qcrfmh2vbarkx7ij3gwk174qmgmhm2j336bfaakln1ixd9lkxa5"; + sha256 = "10hzifgpml7jm43y6v8c8q0cr9ziyx9qxznafxyw6glhnlqnb7pb"; }; configurePhase = '' From a8edf35af8e8565d9a9614eb4054dfcb66547f7b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 30 Jun 2020 17:13:54 -0400 Subject: [PATCH 2958/3452] minecraft-launcher: 2.1.14947 -> 2.1.15166 Set JAVA_HOME, which can impurely override JRE --- pkgs/games/minecraft/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index f0c35d2a569f..8770ec08b224 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -87,11 +87,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.1.14947"; + version = "2.1.15166"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "1lsc39n1kq08sssnpr6kf4lfpy01a7i7rgvi298mmxsprjmc7a9q"; + sha256 = "14q41zk370zvzz2jbynhfw11r98l9x49142lqf2izfl42fhv8yhw"; }; icon = fetchurl { @@ -134,6 +134,7 @@ stdenv.mkDerivation rec { makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \ --prefix LD_LIBRARY_PATH : ${envLibPath} \ --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \ + --set JAVA_HOME ${stdenv.lib.makeBinPath [ jre ]} \ --run "cd /tmp" \ "''${gappsWrapperArgs[@]}" ''; From a9519841aab432cf465e9cf930ea9764054b375c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 14:42:58 -0700 Subject: [PATCH 2959/3452] giada: 0.16.2.2 -> 0.16.3 (#91580) --- pkgs/applications/audio/giada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index fcf4d0b86520..5934b0746d15 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "giada"; - version = "0.16.2.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; rev = "v${version}"; - sha256 = "0rpg5qmw3b76xcra869shb8fwk5wfzpzw216n96hxa5s6k69cm0p"; + sha256 = "1sysv5d0wq6ib47bqsn3wdzkqzjpzjrgzg15bkllbm67hiz9abhh"; }; configureFlags = [ From 0717ab51321012df4baab5317474c3e4dd891e86 Mon Sep 17 00:00:00 2001 From: Philipp Mildenberger Date: Tue, 30 Jun 2020 23:48:59 +0200 Subject: [PATCH 2960/3452] nushell: 0.15.0 -> 0.16.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index a52cc4621cb2..b56a10a189d4 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1s08shhg826hbpcjzlhwj0r5qqckz8rv2xjg22rz1qvsjyhkmv7r"; + sha256 = "0d298v7rf8lxdavhfad68rq4sgmg6gw6vc7phh1lnhx5pbhkvv22"; }; - cargoSha256 = "0lz7119znpxyaj9ac1skfbx0s0dkh3hwk00g0zjn3r6k8fh9gj4d"; + cargoSha256 = "0xibrdbqfmmkncqpjsllzx1w79crm0v4liwf2aldnafji7jqclb4"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; From 5c62e72f2b6227711cbc788dd37d25cefbfe36bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 30 Jun 2020 15:08:22 +0100 Subject: [PATCH 2961/3452] spdk: 20.01.1 -> 20.04.1 --- pkgs/development/libraries/spdk/default.nix | 44 +++++++++++++++++---- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index e8d4f3eb4e07..1b5abe16f370 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -1,24 +1,54 @@ -{ stdenv, fetchFromGitHub, python, cunit, dpdk, libaio, libbsd, libuuid, numactl, openssl }: +{ stdenv +, fetchurl +, fetchFromGitHub +, fetchpatch +, ncurses +, python3 +, cunit +, dpdk +, libaio +, libbsd +, libuuid +, numactl +, openssl +}: -stdenv.mkDerivation rec { +let + dpdk-compat-patch = fetchurl { + url = "https://review.spdk.io/gerrit/plugins/gitiles/spdk/spdk/+/6acb9a58755856fb9316baf9dbbb7239dc6b9446%5E%21/?format=TEXT"; + sha256 = "18q0956fkjw19r29hp16x4pygkfv01alj9cld2wlqqyfgp41nhn0"; + }; +in stdenv.mkDerivation rec { pname = "spdk"; - version = "20.01.1"; + version = "20.04.1"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "1ci0kj0bv5jp5yipa8g0q0ah71qv6pjvvban1ad0v24f7lq4xh0w"; + sha256 = "ApMyGamPrMalzZLbVkJlcwatiB8dOJmoxesdjkWZElk="; }; - patches = [ ./spdk-dpdk-meson.patch ]; + patches = [ + ./spdk-dpdk-meson.patch + # https://review.spdk.io/gerrit/c/spdk/spdk/+/3134 + (fetchpatch { + url = "https://github.com/spdk/spdk/commit/c954b5b722c5c163774d3598458ff726c48852ab.patch"; + sha256 = "1n149hva5qxmpr0nmav10nya7zklafxi136f809clv8pag84g698"; + }) + ]; - nativeBuildInputs = [ python ]; + nativeBuildInputs = [ + python3 + ]; - buildInputs = [ cunit dpdk libaio libbsd libuuid numactl openssl ]; + buildInputs = [ + cunit dpdk libaio libbsd libuuid numactl openssl ncurses + ]; postPatch = '' patchShebangs . + base64 -d ${dpdk-compat-patch} | patch -p1 ''; configureFlags = [ "--with-dpdk=${dpdk}" ]; From c684398c6afaf90d9dc86466ca36e4ea3263d77f Mon Sep 17 00:00:00 2001 From: CRTified Date: Wed, 1 Jul 2020 00:02:56 +0200 Subject: [PATCH 2962/3452] nixos/system/boot/initrd-openvpn: Add openvpn options for initrd nixos/tests/initrd-openvpn: Add test for openvpn in the initramfs The module in this commit adds new options that allows the integration of an OpenVPN client into the initrd. This can be used e.g. to remotely unlock LUKS devices. This commit also adds two tests for `boot.initrd.network.openvpn`. The first one is a basic test to validate that a failing connection does not prevent the machine from booting. The second test validates that this module actually creates a valid openvpn connection. For this, it spawns three nodes: - The client that uses boot.initrd.network.openvpn - An OpenVPN server that acts as gateway and forwards a port to the client - A node that is external to the OpenVPN network The client connects to the OpenVPN server and spawns a netcat instance that echos a value to every client. Afterwards, the external node checks if it receives this value over the forwarded port on the OpenVPN gateway. --- nixos/modules/module-list.nix | 1 + nixos/modules/system/boot/initrd-openvpn.nix | 81 ++++++++++ nixos/tests/all-tests.nix | 1 + .../tests/initrd-network-openvpn/default.nix | 145 ++++++++++++++++++ .../tests/initrd-network-openvpn/initrd.ovpn | 29 ++++ nixos/tests/initrd-network-openvpn/shared.key | 21 +++ 6 files changed, 278 insertions(+) create mode 100644 nixos/modules/system/boot/initrd-openvpn.nix create mode 100644 nixos/tests/initrd-network-openvpn/default.nix create mode 100644 nixos/tests/initrd-network-openvpn/initrd.ovpn create mode 100644 nixos/tests/initrd-network-openvpn/shared.key diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cf25ae3157e6..2ba034735a33 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -937,6 +937,7 @@ ./system/boot/grow-partition.nix ./system/boot/initrd-network.nix ./system/boot/initrd-ssh.nix + ./system/boot/initrd-openvpn.nix ./system/boot/kernel.nix ./system/boot/kexec.nix ./system/boot/loader/efi.nix diff --git a/nixos/modules/system/boot/initrd-openvpn.nix b/nixos/modules/system/boot/initrd-openvpn.nix new file mode 100644 index 000000000000..7553c2aebb10 --- /dev/null +++ b/nixos/modules/system/boot/initrd-openvpn.nix @@ -0,0 +1,81 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.boot.initrd.network.openvpn; + +in + +{ + + options = { + + boot.initrd.network.openvpn.enable = mkOption { + type = types.bool; + default = false; + description = '' + Starts an OpenVPN client during initrd boot. It can be used to e.g. + remotely accessing the SSH service controlled by + or other network services + included. Service is killed when stage-1 boot is finished. + ''; + }; + + boot.initrd.network.openvpn.configuration = mkOption { + type = types.path; # Same type as boot.initrd.secrets + description = '' + The configuration file for OpenVPN. + + + + Unless your bootloader supports initrd secrets, this configuration + is stored insecurely in the global Nix store. + + + ''; + example = "./configuration.ovpn"; + }; + + }; + + config = mkIf (config.boot.initrd.network.enable && cfg.enable) { + assertions = [ + { + assertion = cfg.configuration != null; + message = "You should specify a configuration for initrd OpenVPN"; + } + ]; + + # Add kernel modules needed for OpenVPN + boot.initrd.kernelModules = [ "tun" "tap" ]; + + # Add openvpn and ip binaries to the initrd + # The shared libraries are required for DNS resolution + boot.initrd.extraUtilsCommands = '' + copy_bin_and_libs ${pkgs.openvpn}/bin/openvpn + copy_bin_and_libs ${pkgs.iproute}/bin/ip + + cp -pv ${pkgs.glibc}/lib/libresolv.so.2 $out/lib + cp -pv ${pkgs.glibc}/lib/libnss_dns.so.2 $out/lib + ''; + + boot.initrd.secrets = { + "/etc/initrd.ovpn" = cfg.configuration; + }; + + # openvpn --version would exit with 1 instead of 0 + boot.initrd.extraUtilsCommandsTest = '' + $out/bin/openvpn --show-gateway + ''; + + # Add `iproute /bin/ip` to the config, to ensure that openvpn + # is able to set the routes + boot.initrd.network.postCommands = '' + (cat /etc/initrd.ovpn; echo -e '\niproute /bin/ip') | \ + openvpn /dev/stdin & + ''; + }; + +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index debc60a21d01..94fba23675df 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -150,6 +150,7 @@ in incron = handleTest ./incron.nix {}; influxdb = handleTest ./influxdb.nix {}; initrd-network-ssh = handleTest ./initrd-network-ssh {}; + initrd-network-openvpn = handleTest ./initrd-network-openvpn {}; initrdNetwork = handleTest ./initrd-network.nix {}; installer = handleTest ./installer.nix {}; iodine = handleTest ./iodine.nix {}; diff --git a/nixos/tests/initrd-network-openvpn/default.nix b/nixos/tests/initrd-network-openvpn/default.nix new file mode 100644 index 000000000000..bb4c41e6d709 --- /dev/null +++ b/nixos/tests/initrd-network-openvpn/default.nix @@ -0,0 +1,145 @@ +import ../make-test-python.nix ({ lib, ...}: + +{ + name = "initrd-network-openvpn"; + + nodes = + let + + # Inlining of the shared secret for the + # OpenVPN server and client + secretblock = '' + secret [inline] + + ${lib.readFile ./shared.key} + + ''; + + in + { + + # Minimal test case to check a successful boot, even with invalid config + minimalboot = + { ... }: + { + boot.initrd.network = { + enable = true; + openvpn = { + enable = true; + configuration = "/dev/null"; + }; + }; + }; + + # initrd VPN client + ovpnclient = + { ... }: + { + virtualisation.useBootLoader = true; + virtualisation.vlans = [ 1 ]; + + boot.initrd = { + # This command does not fork to keep the VM in the state where + # only the initramfs is loaded + preLVMCommands = + '' + /bin/nc -p 1234 -lke /bin/echo TESTVALUE + ''; + + network = { + enable = true; + + # Work around udhcpc only getting a lease on eth0 + postCommands = '' + /bin/ip addr add 192.168.1.2/24 dev eth1 + ''; + + # Example configuration for OpenVPN + # This is the main reason for this test + openvpn = { + enable = true; + configuration = "${./initrd.ovpn}"; + }; + }; + }; + }; + + # VPN server and gateway for ovpnclient between vlan 1 and 2 + ovpnserver = + { ... }: + { + virtualisation.vlans = [ 1 2 ]; + + # Enable NAT and forward port 12345 to port 1234 + networking.nat = { + enable = true; + internalInterfaces = [ "tun0" ]; + externalInterface = "eth2"; + forwardPorts = [ { destination = "10.8.0.2:1234"; + sourcePort = 12345; } ]; + }; + + # Trust tun0 and allow the VPN Server to be reached + networking.firewall = { + trustedInterfaces = [ "tun0" ]; + allowedUDPPorts = [ 1194 ]; + }; + + # Minimal OpenVPN server configuration + services.openvpn.servers.testserver = + { + config = '' + dev tun0 + ifconfig 10.8.0.1 10.8.0.2 + ${secretblock} + ''; + }; + }; + + # Client that resides in the "external" VLAN + testclient = + { ... }: + { + virtualisation.vlans = [ 2 ]; + }; + }; + + + testScript = + '' + # Minimal test case, checks whether enabling (with invalid config) harms + # the boot process + with subtest("Check for successful boot with broken openvpn config"): + minimalboot.start() + # If we get to multi-user.target, we booted successfully + minimalboot.wait_for_unit("multi-user.target") + minimalboot.shutdown() + + # Elaborated test case where the ovpnclient (where this module is used) + # can be reached by testclient only over ovpnserver. + # This is an indirect test for success. + with subtest("Check for connection from initrd VPN client, config as file"): + ovpnserver.start() + testclient.start() + ovpnclient.start() + + # Wait until the OpenVPN Server is available + ovpnserver.wait_for_unit("openvpn-testserver.service") + ovpnserver.succeed("ping -c 1 10.8.0.1") + + # Wait for the client to connect + ovpnserver.wait_until_succeeds("ping -c 1 10.8.0.2") + + # Wait until the testclient has network + testclient.wait_for_unit("network.target") + + # Check that ovpnclient is reachable over vlan 1 + ovpnserver.succeed("nc -w 2 192.168.1.2 1234 | grep -q TESTVALUE") + + # Check that ovpnclient is reachable over tun0 + ovpnserver.succeed("nc -w 2 10.8.0.2 1234 | grep -q TESTVALUE") + + # Check that ovpnclient is reachable from testclient over the gateway + testclient.succeed("nc -w 2 192.168.2.3 12345 | grep -q TESTVALUE") + ''; +}) diff --git a/nixos/tests/initrd-network-openvpn/initrd.ovpn b/nixos/tests/initrd-network-openvpn/initrd.ovpn new file mode 100644 index 000000000000..5926a48af00f --- /dev/null +++ b/nixos/tests/initrd-network-openvpn/initrd.ovpn @@ -0,0 +1,29 @@ +remote 192.168.1.3 +dev tun +ifconfig 10.8.0.2 10.8.0.1 +# Only force VLAN 2 through the VPN +route 192.168.2.0 255.255.255.0 10.8.0.1 +secret [inline] + +# +# 2048 bit OpenVPN static key +# +-----BEGIN OpenVPN Static key V1----- +553aabe853acdfe51cd6fcfea93dcbb0 +c8797deadd1187606b1ea8f2315eb5e6 +67c0d7e830f50df45686063b189d6c6b +aab8bb3430cc78f7bb1f78628d5c3742 +0cef4f53a5acab2894905f4499f95d8e +e69b7b6748b17016f89e19e91481a9fd +bf8c10651f41a1d4fdf5f438925a6733 +13cec8f04701eb47b8f7ffc48bc3d7af +65f07bce766015b87c3db4d668c655ff +be5a69522a8e60ccb217f8521681b45d +27c0b70bdfbfbb426c7646d80adf7482 +3ddac58b25cb1c1bb100de974478b4c6 +8b45a94261a2405e99810cb2b3abd49f +21b3198ada87ff3c4e656a008e540a8d +e7811584363597599cce2040a68ac00e +f2125540e0f7f4adc37cb3f0d922eeb7 +-----END OpenVPN Static key V1----- + \ No newline at end of file diff --git a/nixos/tests/initrd-network-openvpn/shared.key b/nixos/tests/initrd-network-openvpn/shared.key new file mode 100644 index 000000000000..248a91a3e3d5 --- /dev/null +++ b/nixos/tests/initrd-network-openvpn/shared.key @@ -0,0 +1,21 @@ +# +# 2048 bit OpenVPN static key +# +-----BEGIN OpenVPN Static key V1----- +553aabe853acdfe51cd6fcfea93dcbb0 +c8797deadd1187606b1ea8f2315eb5e6 +67c0d7e830f50df45686063b189d6c6b +aab8bb3430cc78f7bb1f78628d5c3742 +0cef4f53a5acab2894905f4499f95d8e +e69b7b6748b17016f89e19e91481a9fd +bf8c10651f41a1d4fdf5f438925a6733 +13cec8f04701eb47b8f7ffc48bc3d7af +65f07bce766015b87c3db4d668c655ff +be5a69522a8e60ccb217f8521681b45d +27c0b70bdfbfbb426c7646d80adf7482 +3ddac58b25cb1c1bb100de974478b4c6 +8b45a94261a2405e99810cb2b3abd49f +21b3198ada87ff3c4e656a008e540a8d +e7811584363597599cce2040a68ac00e +f2125540e0f7f4adc37cb3f0d922eeb7 +-----END OpenVPN Static key V1----- From db1148c4f390ba1de4042a275b2e800c373c8f02 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 22:50:17 +0000 Subject: [PATCH 2963/3452] bctoolbox: 4.3.1 -> 4.4.0 --- pkgs/development/libraries/bctoolbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 22578dad38db..d99ee57ef9e0 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.3.1"; + version = "4.4.0"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1y91jcrma4kjqpm6w5ahlygjsyvx7l8zjrjvq7g2n39jmw175cvs"; + sha256 = "1r3ymwk10ry6mz4zd08q7l5msq7h15931l7f0clw2siqs8r81x7c"; }; # Do not build static libraries From 78083315606959ea002032c81a27f20c4273a9d0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 30 Jun 2020 18:15:49 -0500 Subject: [PATCH 2964/3452] nodejs-14_x: 14.4.0 -> 14.5.0 Changelog: https://github.com/nodejs/node/releases/tag/v14.5.0 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 92cac53c7830..37156b5a966f 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -9,6 +9,6 @@ let in buildNodejs { inherit enableNpm; - version = "14.4.0"; - sha256 = "1fbx1r3fflpsy0s7zknca0xyv2gg0ff5fl8czzsb79imqjlgcy0x"; + version = "14.5.0"; + sha256 = "1d6w7ycdiqbkip7m6m8xly31qgx7ywakzvrnqdq8ini5sricjlgb"; } From 761dbe5ba81eef4fd6b3a1363a96d8a88150bfa5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 30 Jun 2020 18:17:35 -0500 Subject: [PATCH 2965/3452] nodejs: add marsam to maintainers --- pkgs/development/web/nodejs/nodejs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 5eeed80007bf..12754b6d4412 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -141,7 +141,7 @@ in description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = "https://nodejs.org"; license = licenses.mit; - maintainers = with maintainers; [ goibhniu gilligan cko ]; + maintainers = with maintainers; [ goibhniu gilligan cko marsam ]; platforms = platforms.linux ++ platforms.darwin; }; From 8ca6d3801ad85c989759f28270b43fd31ed12e8c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 23:39:50 +0000 Subject: [PATCH 2966/3452] blender: 2.83.0 -> 2.83.1 --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index bf2a89ade559..42152d6e082c 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -17,11 +17,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.83.0"; + version = "2.83.1"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "07rzm4xaj94pjxy2vlqfhi1adsqpshfkrzrq8kljmcbnw22vrqhl"; + sha256 = "1kd74nzqvpcpsb4lghnjj9z3ps93lzqbhkv3lp5p79rqs8y64i23"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; From 9443bd9336982ca64605ff64e20d4187b68ea4c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 23:49:30 +0000 Subject: [PATCH 2967/3452] linuxPackages_hardened.bcc: 0.14.0 -> 0.15.0 --- pkgs/os-specific/linux/bcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 7f95ef47ee9c..98de3ed1b11f 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -5,11 +5,11 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.14.0"; + version = "0.15.0"; src = fetchurl { url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; - sha256 = "1hw02bib06fjyw61as5pmhf0qxy0wv0nw8fff2i8a9d1zcd8xf3p"; + sha256 = "1k00xbhdzdvqp4hfxpgg34bbhnx597jjhpg1x6dz2w80r7xzsj28"; }; format = "other"; From f94188f2a5d42e77a4d099c7eb3fb3282acc7032 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 30 Jun 2020 19:16:30 -0500 Subject: [PATCH 2968/3452] zlog: enable on darwin --- pkgs/development/libraries/zlog/default.nix | 26 +++++++-------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index b5662b63327e..f0ca99b76679 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -1,33 +1,23 @@ -{ stdenv, fetchzip }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { version = "1.2.15"; pname = "zlog"; - src = fetchzip { - name = "${pname}-${version}-src"; - url = "https://github.com/HardySimpson/zlog/archive/${version}.tar.gz"; + src = fetchFromGitHub { + owner = "HardySimpson"; + repo = pname; + rev = version; sha256 = "10hzifgpml7jm43y6v8c8q0cr9ziyx9qxznafxyw6glhnlqnb7pb"; }; - configurePhase = '' - sed -i 's;-Werror;;' src/makefile - ''; - - buildPhase = '' - mkdir -p $out - make PREFIX=$out - ''; - - installPhase = '' - make PREFIX=$out install - ''; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library"; - homepage = "http://hardysimpson.github.com/zlog"; + homepage = "https://hardysimpson.github.io/zlog/"; license = licenses.lgpl21; - platforms = platforms.linux; # cannot test on something else + platforms = platforms.unix; maintainers = [ maintainers.matthiasbeyer ]; }; From 7c83bf4a2e5ab872101801241c54deb392603f6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Jul 2020 02:30:32 +0200 Subject: [PATCH 2969/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-7-g30d5c33 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/17709067c775a695c713cd66a9b00fbd1627b474. --- .../haskell-modules/hackage-packages.nix | 469 ++++++++++++++---- 1 file changed, 369 insertions(+), 100 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5a09b9b8ccda..565e5db9684d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9883,8 +9883,8 @@ self: { }: mkDerivation { pname = "HasCacBDD"; - version = "0.1.0.2"; - sha256 = "1yilx2pl0j4bw3c83kzc1y9wmg67r88gpahbwykff1jjr2xnrsp0"; + version = "0.1.0.3"; + sha256 = "04kczdr702kkqa89pm5lc3glq4xqnjy0rszpq7ms1zlj1gwvgckz"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base process QuickCheck ]; librarySystemDepends = [ CacBDD ]; @@ -41123,8 +41123,8 @@ self: { }: mkDerivation { pname = "bishbosh"; - version = "0.0.0.4"; - sha256 = "0d9mn2jn1iv9x41c1yskfkx9d7papwn863gc1wffcb6aw8wg4mrz"; + version = "0.0.0.5"; + sha256 = "0i05xbld89ws9bzp9ynr9ly2jy0gw3nvikpbj61i669n9yazps90"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -42550,6 +42550,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-markup_0_8_2_7" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.8.2.7"; + sha256 = "1r4fij8qs1z4dfrh6cjzjbnx9f3jyx01zgj15wvy961d8bnqjr4b"; + libraryHaskellDepends = [ base blaze-builder bytestring text ]; + testHaskellDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck tasty + tasty-hunit tasty-quickcheck text + ]; + description = "A blazingly fast markup combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blaze-shields" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg, text }: mkDerivation { @@ -45869,8 +45887,8 @@ self: { }: mkDerivation { pname = "bytebuild"; - version = "0.3.5.0"; - sha256 = "15ccfbhrvb6pj9py99qpbdrrfla83797ywmxjry2c7raaz3kpr73"; + version = "0.3.6.0"; + sha256 = "15nk9r9mx798kmjl04qf01il1csfjyi3jx44yhi4hmgl66p9fdx3"; libraryHaskellDepends = [ base byteslice bytestring integer-logarithms natural-arithmetic primitive primitive-offset primitive-unlifted run-st text-short @@ -50657,8 +50675,8 @@ self: { pname = "cborg"; version = "0.2.3.0"; sha256 = "14y7yckj1xzldadyq8g84dgsdaygf9ss0gd38vjfw62smdjq1in8"; - revision = "1"; - editedCabalFile = "0rwliw9xl6y5ypwcywlmr1adqi4c8zi0vghxxarkwh7s5ny34q9f"; + revision = "2"; + editedCabalFile = "1qphglprccmyvjh3v2asikmwgdim4rndin5vls6iwb71hl703h2r"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim half integer-gmp primitive text @@ -60716,8 +60734,8 @@ self: { }: mkDerivation { pname = "contiguous"; - version = "0.5"; - sha256 = "0nz3ssh0zc8rs67mk8fmc8plvbjac6mlxdmzk9fw8sj2vx2ssisq"; + version = "0.5.1"; + sha256 = "1y02gqgd012zggs7kqxkky0prmbl0k9ji5ynb74i5mym88xrj67h"; libraryHaskellDepends = [ base deepseq primitive primitive-unlifted ]; @@ -65203,8 +65221,8 @@ self: { }: mkDerivation { pname = "curve25519"; - version = "0.2.3"; - sha256 = "0kwn7g479vpmir0vklvj7pw9xav3l463i1apzrqd45paiz88px6k"; + version = "0.2.4"; + sha256 = "1ckwdd9x03y6008ikl757sp7hkqscad144l9djmcm6pq5isjn7jh"; libraryHaskellDepends = [ base bytestring crypto-api ]; testHaskellDepends = [ base bytestring crypto-api DRBG HUnit QuickCheck tagged @@ -69760,6 +69778,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dejafu_2_4_0_0" = callPackage + ({ mkDerivation, base, concurrency, containers, contravariant + , deepseq, exceptions, leancheck, profunctors, random, transformers + }: + mkDerivation { + pname = "dejafu"; + version = "2.4.0.0"; + sha256 = "1kj4ygdbbkr54bqknxk3jqif74jxgpid7cz9vzcm2m15h8q2z9k2"; + libraryHaskellDepends = [ + base concurrency containers contravariant deepseq exceptions + leancheck profunctors random transformers + ]; + description = "A library for unit-testing concurrent programs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -75117,8 +75152,8 @@ self: { ({ mkDerivation, base, dobutokO-frequency }: mkDerivation { pname = "dobutokO-effects"; - version = "0.2.0.0"; - sha256 = "1xf5s6phcw2xwwz7qvklzql5hrfz7mr17yzqcm88hc8a4bqj421x"; + version = "0.3.1.0"; + sha256 = "03xsgbmvbkgqprxq6pkdifjcli7wf9clvyz9k4g5c5p387yj9jh5"; libraryHaskellDepends = [ base dobutokO-frequency ]; description = "A library to deal with SoX effects and possibilities"; license = stdenv.lib.licenses.mit; @@ -84873,8 +84908,8 @@ self: { }: mkDerivation { pname = "factory"; - version = "0.3.2.1"; - sha256 = "1vz273vni9335py69nlc2g92gkvy13rkfa238116g83qjjcx8w1f"; + version = "0.3.2.2"; + sha256 = "00nxadfipy92rpg7d3ypgigr51n4sn9jjh6n1gzxfjl6p7vq6myn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87426,6 +87461,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "filelock_0_1_1_5" = callPackage + ({ mkDerivation, async, base, process, unix }: + mkDerivation { + pname = "filelock"; + version = "0.1.1.5"; + sha256 = "06a44i7a956d7xkk2na4090xj2a7b7a228pk4spmccs4x20ymssh"; + libraryHaskellDepends = [ base unix ]; + testHaskellDepends = [ async base process ]; + description = "Portable interface to file locking (flock / LockFileEx)"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "filemanip" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, mtl , unix-compat @@ -88160,8 +88208,8 @@ self: { }: mkDerivation { pname = "fishfood"; - version = "0.0.1.9"; - sha256 = "128m9zhn57jzz5ijkz54mlw70g0d1byp2gisw7wyrgddi0j3x3i5"; + version = "0.0.1.10"; + sha256 = "075hqpp4jmhl57a6y5vgnmxc3264mby2xpcmskxpcrqf6isbljah"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109799,26 +109847,25 @@ self: { "hackport" = callPackage ({ mkDerivation, array, async, base, base16-bytestring - , base64-bytestring, binary, bytestring, containers, cryptohash - , deepseq, directory, ed25519, extensible-exceptions, filepath - , ghc-prim, hashable, HTTP, HUnit, MissingH, mtl, network - , network-uri, old-locale, old-time, parsec, pretty, process - , random, regex-compat, split, stm, tar, template-haskell, text - , time, transformers, unix, xml, zlib + , base64-bytestring, binary, bytestring, containers + , cryptohash-sha256, deepseq, directory, ed25519 + , extensible-exceptions, filepath, ghc-prim, hashable, HTTP, HUnit + , lukko, mtl, network, network-uri, old-locale, parsec, pretty + , process, random, split, stm, tar, template-haskell, text, time + , transformers, unix, xml, zlib }: mkDerivation { pname = "hackport"; - version = "0.6.4"; - sha256 = "185b2mincqzla8j675lv4ydi8fvsj3ikyq4g8jivygbkcpawi5f5"; + version = "0.6.5"; + sha256 = "1869fkrcapnvvzgqwfaivjgcmbmmg53l335qgb6fw672g4bhkc2x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array async base base16-bytestring base64-bytestring binary - bytestring containers cryptohash deepseq directory ed25519 - extensible-exceptions filepath ghc-prim hashable HTTP MissingH mtl - network network-uri old-locale old-time parsec pretty process - random regex-compat split stm tar template-haskell text time - transformers unix xml zlib + bytestring containers cryptohash-sha256 deepseq directory ed25519 + extensible-exceptions filepath ghc-prim hashable HTTP lukko mtl + network network-uri old-locale parsec pretty process random split + stm tar template-haskell text time transformers unix xml zlib ]; testHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -110646,6 +110693,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) utillinux;}; + "hakyll_4_13_4_0" = callPackage + ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring + , containers, cryptonite, data-default, deepseq, directory + , file-embed, filepath, fsnotify, http-conduit, http-types + , lrucache, memory, mtl, network-uri, optparse-applicative, pandoc + , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa + , resourcet, scientific, tagsoup, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, time + , time-locale-compat, unordered-containers, utillinux, vector, wai + , wai-app-static, warp, yaml + }: + mkDerivation { + pname = "hakyll"; + version = "4.13.4.0"; + sha256 = "0gcs79jmpayndfsmmb40avrgyl4f0f1brprm2l0mvybfah84h2m3"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary blaze-html blaze-markup bytestring containers + cryptonite data-default deepseq directory file-embed filepath + fsnotify http-conduit http-types lrucache memory mtl network-uri + optparse-applicative pandoc pandoc-citeproc parsec process random + regex-tdfa resourcet scientific tagsoup template-haskell text time + time-locale-compat unordered-containers vector wai wai-app-static + warp yaml + ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base bytestring containers filepath QuickCheck tasty tasty-hunit + tasty-quickcheck text unordered-containers yaml + ]; + testToolDepends = [ utillinux ]; + description = "A static website compiler library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) utillinux;}; + "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process }: @@ -136102,6 +136187,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hunit-dejafu_2_0_0_4" = callPackage + ({ mkDerivation, base, dejafu, exceptions, HUnit }: + mkDerivation { + pname = "hunit-dejafu"; + version = "2.0.0.4"; + sha256 = "11d52blw31mcsg7c3w1f7khy3vk2p03h4c5z6ja6wb9k5bg4d004"; + libraryHaskellDepends = [ base dejafu exceptions HUnit ]; + description = "Deja Fu support for the HUnit test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hunit-gui" = callPackage ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }: mkDerivation { @@ -150225,6 +150322,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "krank_0_2_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-expectations, http-client, http-types, lifted-async, mtl + , optparse-applicative, pcre-heavy, pretty-terminal, PyF, req + , safe-exceptions, text, unordered-containers + }: + mkDerivation { + pname = "krank"; + version = "0.2.2"; + sha256 = "10w6vbpcn9n07s99w02izg7nfizpbq5m5mg6zv46f1llm35jpv6w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers http-client http-types + lifted-async mtl pcre-heavy pretty-terminal PyF req safe-exceptions + text unordered-containers + ]; + executableHaskellDepends = [ + base containers mtl optparse-applicative pcre-heavy pretty-terminal + PyF text + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec hspec-expectations + http-client http-types lifted-async mtl pcre-heavy pretty-terminal + PyF req safe-exceptions text unordered-containers + ]; + description = "Krank checks your code source comments for important markers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "krapsh" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base16-bytestring , binary, bytestring, containers, cryptohash-sha256, deepseq @@ -150318,27 +150446,35 @@ self: { }) {egl = null; inherit (pkgs) glew;}; "kubernetes-client" = callPackage - ({ mkDerivation, aeson, base, bytestring, connection, containers - , data-default-class, hspec, http-client, http-client-tls - , kubernetes-client-core, microlens, mtl, pem, safe-exceptions - , streaming-bytestring, text, tls, x509, x509-store, x509-system + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, connection, containers, data-default-class, either + , file-embed, filepath, hoauth2, hspec, hspec-attoparsec + , http-client, http-client-tls, jose-jwt, jsonpath + , kubernetes-client-core, microlens, mtl, oidc-client, pem + , safe-exceptions, stm, streaming-bytestring, text, time, timerep + , tls, typed-process, uri-bytestring, x509, x509-store, x509-system , x509-validation, yaml }: mkDerivation { pname = "kubernetes-client"; - version = "0.1.0.1"; - sha256 = "0fzilm4k7cq3k6vlx01c5gzg4lnrgpfdldbiml4rbiv42f13pr7j"; + version = "0.2.0.0"; + sha256 = "07vvp8yb7jx5cgn3siykkh7jdkkcxapclyp09q4n975fzd01waww"; libraryHaskellDepends = [ - aeson base bytestring connection containers data-default-class - http-client http-client-tls kubernetes-client-core microlens mtl - pem safe-exceptions streaming-bytestring text tls x509 x509-store - x509-system x509-validation + aeson attoparsec base base64-bytestring bytestring connection + containers data-default-class either filepath hoauth2 http-client + http-client-tls jose-jwt jsonpath kubernetes-client-core microlens + mtl oidc-client pem safe-exceptions stm streaming-bytestring text + time timerep tls typed-process uri-bytestring x509 x509-store + x509-system x509-validation yaml ]; testHaskellDepends = [ - aeson base bytestring connection containers data-default-class - hspec http-client http-client-tls kubernetes-client-core microlens - mtl pem safe-exceptions streaming-bytestring text tls x509 - x509-store x509-system x509-validation yaml + aeson attoparsec base base64-bytestring bytestring connection + containers data-default-class either file-embed filepath hoauth2 + hspec hspec-attoparsec http-client http-client-tls jose-jwt + jsonpath kubernetes-client-core microlens mtl oidc-client pem + safe-exceptions stm streaming-bytestring text time timerep tls + typed-process uri-bytestring x509 x509-store x509-system + x509-validation yaml ]; description = "Client library for Kubernetes"; license = stdenv.lib.licenses.asl20; @@ -150356,10 +150492,8 @@ self: { }: mkDerivation { pname = "kubernetes-client-core"; - version = "0.1.0.1"; - sha256 = "08sxsc9a9vdsqp71zxnc309cng75k3c57mcmmryhpwwyscvgfnsk"; - revision = "1"; - editedCabalFile = "0qzh7zq36q57yfccna1izi1gz9fpki9ngnl8dgf3m6halrxwqlc7"; + version = "0.2.0.0"; + sha256 = "03f9h4cb02nj2g49grp3i22djc6zh2bqxl7yxkx1yf70fnqv2zcq"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -151907,8 +152041,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "0.1.0.0"; - sha256 = "0aq948mln0gc3f5ngb1wnykw233fyp4wmaak4mb1rxjbmfhwyvqw"; + version = "0.1.0.1"; + sha256 = "0ry3mkgvabm4hvax8lm7pdm8bsmp1qiaq6kndfj5m95fc0ddd1j4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -184467,14 +184601,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optparse-generic_1_4_0" = callPackage + "optparse-generic_1_4_1" = callPackage ({ mkDerivation, base, bytestring, Only, optparse-applicative , semigroups, system-filepath, text, time, transformers, void }: mkDerivation { pname = "optparse-generic"; - version = "1.4.0"; - sha256 = "1wbakc4lk0pyxij9pg95v4hi4k4l7jd4iai0ya6ncmy5bj21fyvd"; + version = "1.4.1"; + sha256 = "0w9hl8ncw7v7bvzli68czqabxg7h15jn8b9rmgn53dn3xyw0h68y"; libraryHaskellDepends = [ base bytestring Only optparse-applicative semigroups system-filepath text time transformers void @@ -186017,6 +186151,62 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "pandoc_2_10" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , case-insensitive, cmark-gfm, connection, containers, criterion + , data-default, deepseq, Diff, directory, doclayout, doctemplates + , emojis, exceptions, executable-path, filepath, Glob + , haddock-library, hslua, hslua-module-system, hslua-module-text + , HsYAML, HTTP, http-client, http-client-tls, http-types, ipynb + , jira-wiki-markup, JuicyPixels, mtl, network, network-uri + , pandoc-types, parsec, process, QuickCheck, random, safe + , scientific, SHA, skylighting, skylighting-core, split, syb + , tagsoup, tasty, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-transforms, unix, unordered-containers, weigh, xml + , zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.10"; + sha256 = "11jj4pxbbl3b585bcfx641m7bk3hl4vl6fgriv76mach5wljl5j1"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive cmark-gfm + connection containers data-default deepseq directory doclayout + doctemplates emojis exceptions filepath Glob haddock-library hslua + hslua-module-system hslua-module-text HsYAML HTTP http-client + http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mtl + network network-uri pandoc-types parsec process random safe + scientific SHA skylighting skylighting-core split syb tagsoup + temporary texmath text text-conversions time unicode-transforms + unix unordered-containers xml zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base base64-bytestring bytestring containers Diff directory + doctemplates exceptions executable-path filepath Glob hslua mtl + pandoc-types process QuickCheck tasty tasty-golden tasty-hunit + tasty-lua tasty-quickcheck temporary text time xml zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion mtl text time weigh + ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv "man/"*.1 $out/share/man/man1/ + ''; + description = "Conversion between markup formats"; + license = stdenv.lib.licenses.gpl2Plus; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -187790,6 +187980,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parse-gcstats" = callPackage + ({ mkDerivation, attoparsec, base, conduit, conduit-extra, filepath + , tasty, tasty-golden, text, unordered-containers + }: + mkDerivation { + pname = "parse-gcstats"; + version = "0.1.0.0"; + sha256 = "07l2jy59grxqnn90kyj13zg7b5x8j21apcywf6m4yws41j8il0nc"; + libraryHaskellDepends = [ + attoparsec base text unordered-containers + ]; + testHaskellDepends = [ + attoparsec base conduit conduit-extra filepath tasty tasty-golden + text + ]; + description = "Parse machine-readable GHC GC stats"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "parse-help" = callPackage ({ mkDerivation, attoparsec, base, cmdargs, containers , data-default, file-location, template-haskell, text, th-lift @@ -200689,6 +200898,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "prometheus-wai-middleware" = callPackage + ({ mkDerivation, async, base, clock, containers, http-types + , prometheus, text, wai, warp + }: + mkDerivation { + pname = "prometheus-wai-middleware"; + version = "1.0.0.0"; + sha256 = "0ndzhd0ghk9l2avi5agllfj3j1smamwplsnqlg0sav8n54r7n6wv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base clock containers http-types prometheus text wai + ]; + executableHaskellDepends = [ + async base http-types prometheus wai warp + ]; + description = "Instrument a wai application with various metrics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "promise" = callPackage ({ mkDerivation, async, base }: mkDerivation { @@ -209991,8 +210220,8 @@ self: { }: mkDerivation { pname = "regexchar"; - version = "0.9.0.17"; - sha256 = "1vkljfqilk0sfwnww1b907lqsdqxd8fdy64kf4vg26r89rzcd5i9"; + version = "0.9.0.18"; + sha256 = "1xrv67w6pr3jc8rcmzsfr6ga1g3zcsq1qb327c9viqhj40s5rarm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -210015,8 +210244,8 @@ self: { }: mkDerivation { pname = "regexdot"; - version = "0.12.2.1"; - sha256 = "0s8jbkhhlhhdadwf7d8hy1cjs05mlf1r3czc861llwqrshys3c8c"; + version = "0.12.2.2"; + sha256 = "0kaqinn8v6hc67rmj89sl6chagzycz61x5ng8cxxpap0zcxwx4ya"; libraryHaskellDepends = [ base data-default deepseq extra parallel parsec toolshed ]; @@ -217079,19 +217308,19 @@ self: { "sbv" = callPackage ({ mkDerivation, array, async, base, bytestring, containers - , crackNum, criterion, deepseq, directory, doctest, filepath - , generic-deriving, ghc, Glob, hlint, mtl, pretty, process - , QuickCheck, random, syb, tasty, tasty-golden, tasty-hunit + , crackNum, deepseq, directory, doctest, filepath, gauge + , generic-deriving, Glob, hlint, mtl, pretty, process, QuickCheck + , random, silently, syb, tasty, tasty-golden, tasty-hunit , tasty-quickcheck, template-haskell, time, transformers, z3 }: mkDerivation { pname = "sbv"; - version = "8.6"; - sha256 = "01y3dg8gprddn2477cw8k5a9a2gn0330qbpqyc3l2zbnwf3a2yga"; + version = "8.7"; + sha256 = "0iipl3ra0ih6fjxfs4p554va5243rg1ddkllfdbs7y2sj697841l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum deepseq directory filepath - generic-deriving ghc mtl pretty process QuickCheck random syb + generic-deriving mtl pretty process QuickCheck random syb template-haskell time transformers ]; testHaskellDepends = [ @@ -217101,8 +217330,8 @@ self: { ]; testSystemDepends = [ z3 ]; benchmarkHaskellDepends = [ - base containers crackNum criterion deepseq directory filepath mtl - process random syb + base containers crackNum deepseq directory filepath gauge mtl + process random silently syb ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = stdenv.lib.licenses.bsd3; @@ -224817,16 +225046,16 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "shake-plus_0_1_8_0" = callPackage - ({ mkDerivation, base, comonad, extra, hashable, path, rio, shake + "shake-plus_0_1_10_0" = callPackage + ({ mkDerivation, aeson, base, comonad, extra, path, rio, shake , within }: mkDerivation { pname = "shake-plus"; - version = "0.1.8.0"; - sha256 = "1p92f5npf1f75lpmkkhvf8rbz67536rd383dqfjaa05wwr1il696"; + version = "0.1.10.0"; + sha256 = "0jp0b593162y2m9mxrh4fhgvjiwyxx4zk5spmr46aby5hhrgdwcr"; libraryHaskellDepends = [ - base comonad extra hashable path rio shake within + aeson base comonad extra path rio shake within ]; description = "Re-export of Shake using well-typed paths and ReaderT"; license = stdenv.lib.licenses.mit; @@ -224834,27 +225063,27 @@ self: { }) {}; "shakebook" = callPackage - ({ mkDerivation, aeson, aeson-with, base, comonad, comonad-extras - , doctemplates, feed, free, ixset-typed, lens, lens-aeson, mustache - , pandoc, pandoc-types, path-extensions, rio, shake-plus - , sitemap-gen, slick, split, tasty, tasty-golden, text-time - , zipper-extra + ({ mkDerivation, aeson, aeson-with, base, binary-instances, comonad + , comonad-extras, doctemplates, feed, free, http-conduit + , ixset-typed, lens, lens-aeson, mustache, pandoc, pandoc-types + , path-extensions, rio, shake-plus, sitemap-gen, slick, split + , tasty, tasty-golden, text-time, zipper-extra }: mkDerivation { pname = "shakebook"; - version = "0.7.3.0"; - sha256 = "1dfnnbj7b6f0fcn54p43dp0vqnayinc2knqfimizr999vnblz2z1"; + version = "0.8.0.0"; + sha256 = "1c26j95jcljr5qfn54kgvh2mcvgsk0995zij7a23nxmb5529glhd"; libraryHaskellDepends = [ - aeson aeson-with base comonad comonad-extras doctemplates feed free - ixset-typed lens lens-aeson mustache pandoc pandoc-types - path-extensions rio shake-plus sitemap-gen slick split text-time - zipper-extra + aeson aeson-with base binary-instances comonad comonad-extras + doctemplates feed free http-conduit ixset-typed lens lens-aeson + mustache pandoc pandoc-types path-extensions rio shake-plus + sitemap-gen slick split text-time zipper-extra ]; testHaskellDepends = [ - aeson aeson-with base comonad comonad-extras doctemplates feed free - ixset-typed lens lens-aeson mustache pandoc pandoc-types - path-extensions rio shake-plus sitemap-gen slick split tasty - tasty-golden text-time zipper-extra + aeson aeson-with base binary-instances comonad comonad-extras + doctemplates feed free http-conduit ixset-typed lens lens-aeson + mustache pandoc pandoc-types path-extensions rio shake-plus + sitemap-gen slick split tasty tasty-golden text-time zipper-extra ]; description = "Shake-based technical documentation generator; HTML & PDF"; license = stdenv.lib.licenses.mit; @@ -233745,8 +233974,8 @@ self: { }: mkDerivation { pname = "squeeze"; - version = "1.0.4.17"; - sha256 = "10nm5jim5cw7qmkdr1j7665g646kay53w8n5rcsp1jz3lglpymdw"; + version = "1.0.4.18"; + sha256 = "0s10k1fyh8xrsf0cbj32r8f7clcj6pfyc39b9bmgsixg1qngjbdj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -238110,8 +238339,8 @@ self: { pname = "string-interpolate"; version = "0.2.1.0"; sha256 = "0wply8lqfhc1xnqxq88xwygwqxbq86gjrwphygbn7nz66g2abgda"; - revision = "1"; - editedCabalFile = "1xp470mrm3srvmvk6xznx9wim8xwsz93pskpv4hnk2ra3a7lr2lr"; + revision = "2"; + editedCabalFile = "00dsrl53aggn0d45cv3c7w6x82qhz3a059w957s9i3qdqfphbvx9"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta split template-haskell text text-conversions utf8-string @@ -243278,6 +243507,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-dejafu_2_0_0_6" = callPackage + ({ mkDerivation, base, dejafu, random, tagged, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "2.0.0.6"; + sha256 = "0iw7yqb52cxw3fgp9did73wk41c1jxvdxx4vg0rna32bc0d7rwyh"; + libraryHaskellDepends = [ base dejafu random tagged tasty ]; + description = "Deja Fu support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-discover" = callPackage ({ mkDerivation, base, containers, directory, filepath, Glob , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit @@ -251271,8 +251512,8 @@ self: { }: mkDerivation { pname = "toolshed"; - version = "0.18.0.1"; - sha256 = "0sw7fxcqr1pfb7kjzvra56ji6nl02175rscb1s4bvw6rrq7xjb6v"; + version = "0.18.0.2"; + sha256 = "0iaq3fgx67w7jf3qc5rvxsnbc0y159psqd44klhm8lyvdb6rd4kh"; libraryHaskellDepends = [ array base containers data-default deepseq directory filepath QuickCheck random @@ -262525,8 +262766,8 @@ self: { }: mkDerivation { pname = "vinyl"; - version = "0.12.2"; - sha256 = "1h5q5y3ni7vx48rmammf66nzjmbclwh5n1c41gln8fm98n6n96yn"; + version = "0.12.3"; + sha256 = "0vqi8xkbijyjs0z7v08j37rlcjsy5s48b5q2dyj8j4j4z7ghnrcx"; libraryHaskellDepends = [ array base ghc-prim ]; testHaskellDepends = [ aeson base doctest hspec lens lens-aeson microlens mtl @@ -266825,18 +267066,18 @@ self: { "weeder" = callPackage ({ mkDerivation, algebraic-graphs, base, bytestring, containers , dhall, directory, filepath, generic-lens, ghc, lens, mtl - , optparse-applicative, regex-tdfa, transformers + , optparse-applicative, regex-tdfa, text, transformers }: mkDerivation { pname = "weeder"; - version = "2.0.1"; - sha256 = "1x5hgyp3zcwz63wcwh8bqalckcb7baakj39zwymifirxvhkws1xz"; + version = "2.1.0"; + sha256 = "0pplr61bf9b6s5wgji8s5dwpp69164zhh6skpsminf6fcpvwqwcl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ algebraic-graphs base bytestring containers dhall directory filepath generic-lens ghc lens mtl optparse-applicative regex-tdfa - transformers + text transformers ]; executableHaskellDepends = [ base bytestring containers directory filepath ghc @@ -266854,8 +267095,8 @@ self: { }: mkDerivation { pname = "weekdaze"; - version = "0.0.0.1"; - sha256 = "13nxi6gqm4by2y6wd3vwj0rqjircpfng0nz5h2spci2jrbmv52d3"; + version = "0.0.0.2"; + sha256 = "17i8pq4xfc6mxdphc7xiiwlnqw3m70sh7d3pjnql33m1083kbkxb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -273647,6 +273888,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-bin_1_6_0_5" = callPackage + ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, directory, file-embed, filepath + , fsnotify, http-client, http-client-tls, http-reverse-proxy + , http-types, network, optparse-applicative, process + , project-template, say, split, stm, streaming-commons, tar, text + , time, transformers, transformers-compat, unliftio + , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.6.0.5"; + sha256 = "06klixw5qi12bxpll1bvyc5lngpkzd48qvq4r3v4vlppninsj2cd"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal conduit conduit-extra containers + data-default-class directory file-embed filepath fsnotify + http-client http-client-tls http-reverse-proxy http-types network + optparse-applicative process project-template say split stm + streaming-commons tar text time transformers transformers-compat + unliftio unordered-containers wai wai-extra warp warp-tls yaml zlib + ]; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types , shakespeare, text, transformers, yesod-core, yesod-elements From 380c6228be42783fbbcc00cda3bc511d38715a94 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 30 Jun 2020 19:59:48 -0500 Subject: [PATCH 2970/3452] toot: fix license Toot was re-licensed to GPLv3 [1] [1] https://github.com/ihabunek/toot/commit/beb4b744d7da662974be217266bdc22030dd60d1 --- pkgs/applications/misc/toot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 8f701b20e3e8..f46af56ed45f 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Mastodon CLI interface"; homepage = "https://github.com/ihabunek/toot"; - license = licenses.mit; + license = licenses.gpl3; maintainers = [ maintainers.matthiasbeyer ]; }; From 6dedc015e9207b5b3ecb09dc2a47223d9403265e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 1 Jul 2020 04:06:10 +0300 Subject: [PATCH 2971/3452] slack: fix on darwin --- .../networking/instant-messengers/slack/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index ad831eb82a59..f46a293be974 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -158,7 +158,7 @@ let mkdir -p $out/Applications cp -r ./slack-mnt/Slack.app $out/Applications /usr/bin/hdiutil unmount slack-mnt - defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES + /usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES ''; }; in if stdenv.isDarwin From 5760e275f4e9469a18e91d4bca1e956f5e777b66 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 30 Jun 2020 22:27:08 -0400 Subject: [PATCH 2972/3452] blender: don't require python3.7m on darwin python is currently pointing to the python38, so this patches the required version to match python version that is provided to the expression. The m prefix denotes the pymalloc ABI for python 3.7 and older, but is not provided starting python 3.8. --- pkgs/applications/misc/blender/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 42152d6e082c..232ab1b2df02 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -57,6 +57,10 @@ stdenv.mkDerivation rec { --replace '${"$"}{LIBDIR}/python' \ '${python}' substituteInPlace build_files/cmake/platform/platform_apple.cmake \ + --replace 'set(PYTHON_VERSION 3.7)' \ + 'set(PYTHON_VERSION ${python.pythonVersion})' \ + --replace '${"$"}{PYTHON_VERSION}m' \ + '${"$"}{PYTHON_VERSION}' \ --replace '${"$"}{LIBDIR}/python' \ '${python}' \ --replace '${"$"}{LIBDIR}/opencollada' \ From ae56f20b71c70c165c0d2ee9c667eb0ac0bec37f Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 20 Jun 2020 00:36:47 -0400 Subject: [PATCH 2973/3452] anki: update download url The original repo has been transferred on github, so the URL is a redirect to here. --- pkgs/games/anki/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 489e72768ea4..5eaf9f1d332e 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -31,7 +31,7 @@ let # when updating, also update rev-manual to a recent version of - # https://github.com/dae/ankidocs + # https://github.com/ankitects/anki-docs # The manual is distributed independently of the software. version = "2.1.15"; sha256-pkg = "12dvyf3j9df4nrhhnqbzd9b21rpzkh4i6yhhangn2zf7ch0pclss"; @@ -42,8 +42,8 @@ let pname = "anki-manual"; inherit version; src = fetchFromGitHub { - owner = "dae"; - repo = "ankidocs"; + owner = "ankitects"; + repo = "anki-docs"; rev = rev-manual; sha256 = sha256-manual; }; From 0e2d75523115a078d4e76b14015774bac60234d3 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 20 Jun 2020 00:37:43 -0400 Subject: [PATCH 2974/3452] anki: expression cleanup --- pkgs/games/anki/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 5eaf9f1d332e..0d713b1f71e1 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -112,16 +112,10 @@ buildPythonApplication rec { ./no-version-check.patch ]; - buildPhase = '' - # Dummy build phase - # Anki does not use setup.py - ''; + # Anki does not use setup.py + dontBuild = true; postPatch = '' - # Remove unused starter. We'll create our own, minimalistic, - # starter. - # rm anki/anki - # Remove QT translation files. We'll use the standard QT ones. rm "locale/"*.qm @@ -134,10 +128,10 @@ buildPythonApplication rec { # UTF-8 locale needed for testing LC_ALL = "en_US.UTF-8"; + # - Anki writes some files to $HOME during tests + # - Skip tests using network checkPhase = '' - # - Anki writes some files to $HOME during tests - # - Skip tests using network - env HOME=$TMP pytest --ignore tests/test_sync.py + HOME=$TMP pytest --ignore tests/test_sync.py ''; installPhase = '' @@ -170,6 +164,7 @@ buildPythonApplication rec { cp -r ${manual}/share/doc/anki/html $doc/share/doc/anki ''; + # now wrapPythonPrograms from postFixup will add both python and qt env variables dontWrapQtApps = true; preFixup = '' @@ -179,8 +174,6 @@ buildPythonApplication rec { ) ''; - # now wrapPythonPrograms from postFixup will add both python and qt env variables - passthru = { inherit manual; }; From 7735182689d1f2d5cad877389b0720f0ef04ac54 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Jul 2020 02:38:44 +0000 Subject: [PATCH 2975/3452] cockroachdb: 19.1.5 -> 20.1.2 --- pkgs/servers/sql/cockroachdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 2ce8e901e867..25e2b0ae1272 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -14,13 +14,13 @@ let in buildGoPackage rec { pname = "cockroach"; - version = "19.1.5"; + version = "20.1.2"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "1pnzzmxxb7qxiiy8qpl2sifk4qrijjbhmzy47bnjj5ssdsjjjcqy"; + sha256 = "1xmb516xr0bhkzj6yigcrxbghvh0dis85dq7n5hi49mn951ad5yn"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; From a142770da55756605ecc8b2682befa1f60f060a5 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Tue, 30 Jun 2020 22:03:00 -0400 Subject: [PATCH 2976/3452] awscli2: init at 2.0.26 Amazon released v2 of their CLI, but is still actively maintaining v1. - https://github.com/aws/aws-cli/blob/2.0.26/CHANGELOG.rst - https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html - https://docs.aws.amazon.com/cli/latest/userguide/cliv2-migration.html --- maintainers/maintainer-list.nix | 6 ++ pkgs/tools/admin/awscli2/default.nix | 84 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 92 insertions(+) create mode 100644 pkgs/tools/admin/awscli2/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e8e2eff26c88..d41159b1763a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8983,4 +8983,10 @@ github = "cpcloud"; githubId = 417981; }; + davegallant = { + name = "Dave Gallant"; + email = "davegallant@gmail.com"; + github = "davegallant"; + githubId = 4519234; + }; } diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix new file mode 100644 index 000000000000..dc03ac2610fa --- /dev/null +++ b/pkgs/tools/admin/awscli2/default.nix @@ -0,0 +1,84 @@ +{ lib +, python3 +, groff +, less +, fetchFromGitHub +}: +let + py = python3.override { + packageOverrides = self: super: { + botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { + version = "2.0.0dev30"; + src = fetchFromGitHub { + owner = "boto"; + repo = "botocore"; + rev = "7967b9c5fb027c9962e0876f0110425da88b88f2"; + sha256 = "18yn5l1f4nr1pih392qkyidnj7z10bd2cv7yx4qrl7asxxraspr9"; + }; + }); + prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { + version = "2.0.10"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi"; + }; + }); + }; + }; + +in +with py.pkgs; buildPythonApplication rec { + pname = "awscli2"; + version = "2.0.26"; # N.B: if you change this, change botocore to a matching version too + + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-cli"; + rev = version; + hash = "sha256:1ysmr17gbcj6vs9ywzwgvd9caxwxgg9bnfvvkyks4fii34ji5qq8"; + }; + + postPatch = '' + substituteInPlace setup.py --replace ",<0.16" "" + substituteInPlace setup.py --replace "wcwidth<0.2.0" "wcwidth" + substituteInPlace setup.py --replace "cryptography>=2.8.0,<=2.9.0" "cryptography>=2.8.0,<2.10" + ''; + + # No tests included + doCheck = false; + + propagatedBuildInputs = [ + bcdoc + botocore + colorama + cryptography + docutils + groff + less + prompt_toolkit + pyyaml + rsa + ruamel_yaml + s3transfer + six + wcwidth + ]; + + postInstall = '' + mkdir -p $out/etc/bash_completion.d + echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli + mkdir -p $out/share/zsh/site-functions + mv $out/bin/aws_zsh_completer.sh $out/share/zsh/site-functions + rm $out/bin/aws.cmd + ''; + + passthru.python = py; # for aws_shell + + meta = with lib; { + homepage = "https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2.html"; + changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; + description = "Unified tool to manage your AWS services"; + license = licenses.asl20; + maintainers = with maintainers; [ bhipple davegallant ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a11116c96b22..232fe876544e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -759,6 +759,8 @@ in awscli = callPackage ../tools/admin/awscli { }; + awscli2 = callPackage ../tools/admin/awscli2 { }; + awsebcli = callPackage ../tools/virtualization/awsebcli {}; awslogs = callPackage ../tools/admin/awslogs { }; From e10e7d6a8bde4f4a353a86d276226bb92f61afd4 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves <2335822+alexfmpe@users.noreply.github.com> Date: Wed, 1 Jul 2020 04:31:32 +0100 Subject: [PATCH 2977/3452] testing-python: fix typo --- nixos/lib/testing-python.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 123323711a7c..c6939c7d6989 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -114,7 +114,7 @@ rec { imagemagick_tiff = imagemagick_light.override { inherit libtiff; }; - # Generate onvenience wrappers for running the test driver + # Generate convenience wrappers for running the test driver # interactively with the specified network, and for starting the # VMs from the command line. driver = let warn = if skipLint then lib.warn "Linting is disabled!" else lib.id; in warn (runCommand testDriverName From 53bee280a7ced5342eaa35e5a720b24bb96068a8 Mon Sep 17 00:00:00 2001 From: Seabass-Chan <54417615+privateseabass@users.noreply.github.com> Date: Sat, 27 Jun 2020 10:28:58 -0700 Subject: [PATCH 2978/3452] protonvpn-cli-ng: 2.2.2 -> 2.2.4 Changed version number and added Jinja2 to propagatedBuildInputs. --- pkgs/applications/networking/protonvpn-cli-ng/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/protonvpn-cli-ng/default.nix b/pkgs/applications/networking/protonvpn-cli-ng/default.nix index e62bc21ab5b8..e2870c58e971 100644 --- a/pkgs/applications/networking/protonvpn-cli-ng/default.nix +++ b/pkgs/applications/networking/protonvpn-cli-ng/default.nix @@ -2,19 +2,20 @@ python3Packages.buildPythonApplication rec { pname = "protonvpn-cli-ng"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitHub { owner = "protonvpn"; repo = "${pname}"; rev = "v${version}"; - sha256 = "0ixjb02kj4z79whm1izd8mrn2h0rp9cmw4im1qvp93rahqxdd4n8"; + sha256 = "08yca0a0prrnrc7ir7ajd56yxvxpcs4m1k8f5kf273f5whgr7wzw"; }; propagatedBuildInputs = (with python3Packages; [ requests docopt setuptools + jinja2 pythondialog ]) ++ [ dialog From 7b0ad8b59fa614a7c5ddc21b6afb537af1826dfb Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 1 Jul 2020 15:12:22 +0900 Subject: [PATCH 2979/3452] thunderbird-bin: 68.9.0 -> 68.10.0 --- .../thunderbird-bin/release_sources.nix | 490 +++++++++--------- 1 file changed, 245 insertions(+), 245 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 1f14ee3ae404..3a8f6f4b8093 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,615 +1,615 @@ { - version = "68.9.0"; + version = "68.10.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ar/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ar/thunderbird-68.10.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "7e0a07631f2130d2876e020f7f28817cbca343e0666abd156d8f5c48a7f4bb0f4775f6366deeffdcd0676172e3b75c48c02635d018a5f1050f635f334834908d"; + sha512 = "2f49abd71f7542042ef2823cd420e225bb1015684dc258fd7e8eb1104ac9865957b0e6c975043e3611d4d884c085ad670ce21af8c8cab1da80f08aa302078059"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ast/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ast/thunderbird-68.10.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "47ef45548aeb20dc8dbd4f35bf12913b642986cf6071f060611696da99da30a2b10c9c8aaff8974f4fc02403026146b516e84f8f2244932f290202ef2aa59853"; + sha512 = "91043afae8c2f31f6d2aa5b7f6c7f874150c7f8ef0ef7401132b12822bbdde8c7d7f24022f3f5d0cec262100a2b8791f440a55f0ed00c30acb9429290aa290f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/be/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/be/thunderbird-68.10.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "c704c3e4be866d70c098b07bacdd4a1020ec109e92eb85c9c04d20d90db668a36bfef711acbe8bacb897543e3b8d499d35e54875bbe10fb3fc5436f8759828c3"; + sha512 = "6167bd7fe2d980af40a0d5594e67dfc262bb7ab5fb76ea07c919136d967505e84b4d27448d883a31323db7aafd33b4222cff63d27d10ec914354ba4264736459"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/bg/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/bg/thunderbird-68.10.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "ac31e7ceb3042c2f2ac4c833687a9a44b6ec593b2d50da2edf9f11fa9bba378dea192cd472470cb7cdb2a0b708b84de688f2988f6161447cf00e5a13fe6cdd9f"; + sha512 = "885c5ee186933eac265ed530f9b8b3cabc934e1ff4efc50b10381f8e53ddc39fe385e21e22041d93ef987e031ec41c2b98e898bcceacec004542bcaa35d0ccca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/br/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/br/thunderbird-68.10.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "1c3342c2cca3061d07be17f57d967b1e9e478f5ff91cac1df1dbc901e102e2fbeb68375af20ccc0b6922364c62fcc44a6d7715aee43fef0b2165ac091427708c"; + sha512 = "e5c31ab8b32f9f0bd72a03207d4c9a2ca75d0c5f28e497456850bf92f75020784258725942079e52f6b38c0740e7d2ec80ef24bd88aca9fe35e9386f65cf7c1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ca/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ca/thunderbird-68.10.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "2a0bca4b9fe58bb7872265384151ae7d2ed87122a9372ffd52752a11bec29b24a8d28f0e3102c0d6f84e545ccc6004fdace3bba7d68de206a3be5c72962c1a9e"; + sha512 = "2d727f09dd202291cbb908c2e7805ecc7ec29302bb2481b63a5df1f43c29c39d1ae26bcf3b5dea550619391a96982d3d2bb831548a9a2331e986345c64b4b6b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/cak/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/cak/thunderbird-68.10.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "ef27a17f5a44072596b753cd110ed4d24d7355649ddfae988a2d6622871421088d1502866226fc1f18bf8233478b5c00e98f10cf3f920ad6b4a7bad9c5e9cae2"; + sha512 = "1e74db72b4bc0ca3db90b9ae678dea551293dd54eb5cc5e5c124c51e61ef0d4cb074769bf807ba2d680db10f6086bb3bbcf5d082e815bff10fb8c6ae14c5a72a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/cs/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/cs/thunderbird-68.10.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "1a68ecf3ae228078c67b296a1642578d8e5a7808707e8a7eab4cbe8191a6b19057fca8e3c4faa660d6a64732ca3a052579fa652bbe5bb30a85d577f7b702e55e"; + sha512 = "9c89e7328879f82cec0e2c5f7efb2711242cb3f36a4ccf6a014c6ed589f0e02748c997ea98909d546ca33478022bc9143987710945eed1e191517d1348f8a064"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/cy/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/cy/thunderbird-68.10.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "4d3cc4a57f3e210129ba47c2fc0798d852e4369a62dfefaf3b9a8fc77939431a7cc5839c667a062231ccf49e6eeedfc60c5492fdbf5eec080233b851203305f4"; + sha512 = "46e234560ac4a9e7c5b54816bde0f22f2677b6ea117ce5c528260222e940b5e47b12d8b08b24d2ee9bcfc4dd72168faa036207c88f5bc573051fd7eea2281fd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/da/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/da/thunderbird-68.10.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "79e655f62bc95b65640e3556d2690725ff012a16b2cbe656223a118294915c5619563fbdef9b88fd5db3f982cea5e8ad85a9bc389776ea95ab155539d6a4c217"; + sha512 = "8ef4fb0210a21df0be22e1866859ac316890cc90e6b157e0cad2725d59360b06db068aa000627ffa750c05cdc8314cb564c32476dcea3975bb63f66b20873059"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/de/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/de/thunderbird-68.10.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "cad5d0c08e07f6d1247cae9737d0747875b9b35036892093230423d92530fe2de2975174dfd6ec0d2e2d7ddf86027601d37d3fce14343ad4cb89be5d68052785"; + sha512 = "b3c7673728c8af318c0c8e0c3af8e1b7ba457bfd2c5a67bf3df4df6c3c990970d45e1a0884c03aa0a3d973efb12983afea40de55c8831d2b254acfb742c71478"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/dsb/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/dsb/thunderbird-68.10.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "15ca27de99125e4be3f6cf79ebe5e897efea14ea469040ab39ef2e0ab4a6ce61bb22f9afe95a670fcf9e1cf077512b8214226946e4f4a02e7bb04d136390bf6e"; + sha512 = "adeba633f288fff864e7247e36b4d7f49046a3901de0e4f93f12ada6fef275578b494441d01e820400045d5f7d64048684554934be678d1b7259910a162a4ed8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/el/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/el/thunderbird-68.10.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "8fdda97681d04d9247d8030535d15888d24f3462ee8d91ac86ae9b0489ca4a2c759bbbcb151548786febed90de2ff4bf6e77fa55b8bc2b1cd4c8faef374fcc45"; + sha512 = "6ed60a3cb194de3e2bcffbdf1d0c89460b2c2416878f348c913aaaff911f43e9a624a8de87d46df366c8bd608c47f6a6de8b90fec9c0c82e38afe860ca760f65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/en-GB/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/en-GB/thunderbird-68.10.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "51ccb86fc17862c9264823568fb2453318a8b6625f1d51eecaa150358a9efe4a15126c1a132bc57834645ba3d5799f75dd48e7cacc6305970698bdcad85c0bfd"; + sha512 = "a09f578de9b8f23c9b24123092abecedc70e5b48c9c15089505ca049258621f14d8a4f02c8154f7d2c729ed002814af17e08bf211708fc59e5345c92cb259fa2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/en-US/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/en-US/thunderbird-68.10.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "ed6caacf356c6487a489e983275a2c3d00eac3b2282445667a1f26ac9ce217afb8261a929ccc9aa2bdf7a89101a86faee2ef87c16f0677ecf5abcc727397275f"; + sha512 = "3f7d4c844185b0be0ee3354130112ecc034f06cc2335681998e210b79537df7365f251b005387f319b0a2d2dd6a6337fd6287a007fd54ac03c39315c42893dfe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/es-AR/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/es-AR/thunderbird-68.10.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "b8e75f5579740c8d0ae7ef30afb133b827c2e217bf9b0acdc8f117b6ffbd6c2674ff8670db87ede6db3c842af8d6f820bfa4370c0d611b7e74e99e8ad67a31b8"; + sha512 = "a028429230c625b0dcb9e200b2e21c6d4db8e96a93313881701b5965dc25db31a0992d4d6da6072a6ed73eb5891d15ac71f19f343172796db82d6e98355baa75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/es-ES/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/es-ES/thunderbird-68.10.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e51df8034b18c8dc0d7fa024c3e58317a614f4da4d286c837efac3d21c59d1e58a786cc2ae0afae8730f81e96a4f0263e4fa09b552df3b58f915fd0cad133c62"; + sha512 = "58afe4eb60993bae1271fa03a45ce13611a1d83e4defc1f237ed47b243785881c8309f5fa8a5257fa5b343e2dec7595c8ba6143faa63f49749453ad229ee8102"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/et/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/et/thunderbird-68.10.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "a81e2bf12df9ba23b8d330599eb9d32d25cb862d3cbd109183c0164ccfd2036bd327aaba36248e85f738d02d15d59f9fcaa837101b154834b53b04d2925ad666"; + sha512 = "402c33c3fd7194a3f5c0d6afb81f639fd4a0cfebdaa61043858938fb5b2690844ec2fabfe9f73d41f45c26d56adcb121234fb1baa76b2455c87863dd79cf065d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/eu/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/eu/thunderbird-68.10.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "98a3b4e765683a9fdb9f1b128354ddc8f81ffb7bcdfb3ecc04431e84862d65184f220cddf86ba2a3442f87c27ea990a2868ebf68dce7328857718f9e02ecd474"; + sha512 = "ace87496370c17b663971365da8c1f88000b76247aba2a6fd5d29a31b5d4b02bf9b56e101c477d48553ca56416e73209aff7f729ea2b8c044e33b9307009321f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/fi/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/fi/thunderbird-68.10.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "75d0523e83f9f95fdef45fb8b6de632eedb8b274225ac5c6d6d460cc7c129f7e34f735262cbc44e8f99957358e33eb8c8e2ce0cdbbd59d237dde468991139e6f"; + sha512 = "775c937de9d9ed49ec70850a1d8ccbe22c964e12a932c52d3dc360425643f2be5487857caa811556e341d94bc62ed9b8dba5e94039c2cff6de50bdf16e364c89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/fr/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/fr/thunderbird-68.10.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "c7b070e1b5dbb682e6dd119436512c5e2200105294f1c4e84c88fc8326f342196da1abaf8b7b4882397cf797070a524c19b640fc41d532885b9ce867de46d055"; + sha512 = "1ac4d3e23f71bedf77a8d2dd4fe8d02fbd1083977a8892d2c6db394a9d345bcff73a916f34a078ddd0850e8ac1bb0486aec06d6e36875eafcac0dab08bdedde1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/fy-NL/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/fy-NL/thunderbird-68.10.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "bd93c4d482231c0c5444b653c045f4951d73c0c4c1ef9126757c41b30280f0009fddec38d8532af2c2e379a26128fe3b5e8db2857709fd2ed226d2fa73f0d88b"; + sha512 = "b62676e5302cc265a6ee65de7a31585bade7bfd51395bd56257f733fc9a6f4c391e5318aad3b48441464e5d8bcbe3606cca1edcd6fca6517b205814b9e39b635"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ga-IE/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ga-IE/thunderbird-68.10.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "f6da6b1635d44f217b1ffe9e446d4ce8fbc82ecd5fa8a0421abdf83a0bdaf46db35343a5345b009fdf09a8237475b393d2cf0cd3f52fa16cd2cca63b792a546b"; + sha512 = "81ba90087282fdfcd15a534e9065fdd94a859dedd6a85dc9da94de4af698eef6b31a19d3a007eaa27e08944682c9f6108a0d0991f1e394451da881018e5cc70c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/gd/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/gd/thunderbird-68.10.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "d6e4c7e51432c4bc81a9470615349624f2d8eea0d6092e53afb833a2cb4a9e770ea4c373fbef424e9139a1668cb695841fe2cf8c752befb650d0e72185693c5c"; + sha512 = "1db39cc3ea8990ec8d9ff214d554bf95a6f2699e3f1bf625180b7f84ebc3284e1eec8e2cfdcf87b3a31b466ef2f84dd0a56d771078f4cb06962a28531ee085d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/gl/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/gl/thunderbird-68.10.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "763f2dc852ac4ecc4accd7140ea9c1945bc343342a01efe8b09470cc41f76fad4f61ec25c9456b10a16f9db528fc6aed802d949252b12e0d73c89c299ee813be"; + sha512 = "dbaa3cd2341d8ad4834b9db4982b731fbcb1125398cc4a7ce6a9cbc44db7218a165392781e144b68618781ed8d26216f11e1bf172ce4ba9b18515cce0feb9bf4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/he/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/he/thunderbird-68.10.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "82d66c85f843978d9b2e3e0353e831c7779a16cc3a977f225ef93c92cd8eb8ac98afd255e40b1da0c21a356a7f290027b7f2c1c2ecce656524f21d3f8d962a4d"; + sha512 = "547795f844b60b347a10abc8e609f7d311b63ae4cf76b2b0cb0b0605f597ec0e1c7ec3347042161a4b15201f816f99c391851004de9a957754aca6f50a055d7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/hr/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/hr/thunderbird-68.10.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "7c013aff2eb1d4d2330df3ec81dd4e6bc99f4ec9b620fd13cc487a02825669f7fbab84d8f9a2cb76cc34290dc301522505352b0985f75b7f26133cc0987d30e3"; + sha512 = "6c72a46406396578c329b1ba1c47a46c124f22fb5c47eb1f16af7672e4269bb84f62ac4c1d9b61a5e8e46eaa4c91e5169b59e9908ad61606b243ed21ce31d859"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/hsb/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/hsb/thunderbird-68.10.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "707059d39c02b2c95f18817757a4ab5fcdef4eba63645c93a8e1cdb37dd013633aaa7b67628d357e8c530a7d9394448d61fde9fae32befdb351502c27db3cd93"; + sha512 = "e06eeaceffa7b39810faf42640f22b8edef8ad501530f1602a7b13265f5a9b34a1d9304a19a514e3beff2b3c7e8ba92c72aaae6b34cede15e6fa59125344c026"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/hu/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/hu/thunderbird-68.10.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "238047229050a38375a05d9d16514c88c5312d56857b179d7818be4421e3fb6450558f378c18035707d2abbbbb878656f1aeff461fb9f6b0f7a1b9e7e9863b96"; + sha512 = "9ab3e1b47a3120b74adb1f0f0ec657443578203f4c7f7e00804ef61bfeb2c7cd36721256943e8c86e0a62f90c1576e16a9051b33dc9a0006cb7fcf55bc90fc0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/hy-AM/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/hy-AM/thunderbird-68.10.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "871c444b878cdc2c63d96d389ff0ece2773862e825bf00bb4534475130f4b0b684dcad1002bc1d183f6c81b730bb3af1098d29b81dd7d07a5321e01fff3c39c6"; + sha512 = "614da904a59666d5e67852296eb22ea0ee0d137764ba9fc4f60edee2f547b91659147d14849ca83927671e94b32847f748f97df4bcd93569d46f3cfb0f8f372d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/id/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/id/thunderbird-68.10.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "518ce09cb9cedf086549873f6cc868235afa24fd04be3e2af00d92dcce8c1f08c7855c7af9c4cc21d2329187f2a28ddcbcdd46fb5a7f26f2993261e0f2cf7afc"; + sha512 = "13e01f8fe23f10d24b4399da8540c2afdeb762b1068f10984945c0920882b67bdef48f0f26180786a8d944ca1ea601e3c51bbf6f0cb64697fca0c0b0acb08b84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/is/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/is/thunderbird-68.10.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "855c8d301067538bdd1494fb9a6b57e0182e94deab34a9aadc65dbe6a5829023145d88d4233f10702947fbbc7361812fea94b6a1352f687bc006988618781816"; + sha512 = "176492bbf4ac3b2bb4367848f1283c7dbb805b5bfe6c71cab6c8893578f1d0ca1b9edcbc1e736748d04f2d0ca78f4d6edb21671b78379e26d41d9c43e8727075"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/it/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/it/thunderbird-68.10.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "d447dcae327ceab2edc4302235d9055d1b11ff0407dc3a05cb1f16f8a53c6bd71dbaf5c33766f5c343ec357cbf8a8702c637c0748f658aa2083d244de9fff968"; + sha512 = "41d10acbb84fde6556530253ecb5926ba4b5d81a38349a00281a7273669cf37245640f789dae7363c4e1a0224127885fae3dac701926dab6e4512df723d39548"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ja/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ja/thunderbird-68.10.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "1ad5d5c0c7cb04fe7f471ea85557f8c4aac62eb9b7276b53fcc3111d3e37a7eed56e2e4521c1e978acc32c973618d84c05792b4100fbf9175d2a5db0c74eac1c"; + sha512 = "8124ccd221818d37d6d22f204baaf34bd87e7907c50ab380a3a1bf252432b41caa71dc3ba2b575903bfd255f16b702cc89d91903f494437547a7b8fa16469cbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ka/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ka/thunderbird-68.10.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "0d0f376c9a13165978e1b5d77e6b098f17ec552baa9e8e64d32b5d33c5b2d52f78c6e45ff92901f6c94cf9efc1d0349025c3dd7baff9693c9e5ce9f62e0a7c4f"; + sha512 = "464a9e0aebda0fa6412665e4cf2d6f590d44636bc395f8a03f96ffa7e8f5423e51499bd801f9ffb65c0c931960b761d00df3ac8f391b2157ab411ad49c7054b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/kab/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/kab/thunderbird-68.10.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "76927cd9f2630d8aa4b501a8ff49ebdabeaf75ecf5dc166aaccc254d38493a94df7dc6d432bb68511b78b5e31b483859503bf846b4c2e7fee2ea4d40e4506db9"; + sha512 = "d99305c424e0475ed2c1890e2c5cc96d1e4925d329948c33ac0183e3affadd960266e76e380c4fbc017e24538428439888d96f49d73468f9f6162dcb51a358f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/kk/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/kk/thunderbird-68.10.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "1a0d0a328341a7efffb6fa5ebb7bdced15f8202d37520b1e2972a3f82f37053669d52e0a8a815a8a9f2cb439227fba2c6f25a5967f459b1d2d7140e16315cac1"; + sha512 = "9398172a5d2f902256b2b36df5f936a39e5f2d253ee4ee566109f67a49f2e2bd4239b92802475b459d79acb5af7e4839f6f5f0a5db1c7da10fa35873c470003d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ko/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ko/thunderbird-68.10.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d4b654cfc6f0f8be641d844a52eb332c2218b419c7a699852ad693b90958d185ef29c2c1bba5b7b9e397e05fe1572b80b0f0df01e83b65edede368e0c6ad9ead"; + sha512 = "80e7f9929a197ea4b431376f168fcfaf42718b1744bbf0bddf8672346ff08e65c35af5816a21effaac6794d9e55009885037007e87a05571e1d7eaaf7c86f30c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/lt/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/lt/thunderbird-68.10.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "fdedc91f7bffbc4f464682f3a020ab161592015fe5c50180899eecf951e9f775cf5ef3cc6b5baf7faa58221f00e19fe99074f60d292ca258cf44dad2db0d0d69"; + sha512 = "74ca7346f87b078cb9f598e79278ee39498b09370be5517a3893dc4bc2d5efe81f9b9076b27891be0c8d170802a02ac67dabeffa022fe222e95b73455b40ff34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ms/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ms/thunderbird-68.10.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "1ecb61c99626dfbc8386364b747e94de7080facd6434813c8afeca60373d3cf07d2259ba90ed6de01c68a65e8b8408e58647d4e72b62f150f82da4a81e78f861"; + sha512 = "90c71d0b3f598c21026441dd5b34efca7276f34153ffacd327f09d2c78296c9dbc2ae9eb8e1f7635b8e3cafed15f07cc3c19254405de2e6c9e1fd4300b844876"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/nb-NO/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/nb-NO/thunderbird-68.10.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "45ec1f8def3d2b57e29a3fd22bc38f08a9c7b1ebf44e6dfb736ee13d09cb1bcfcd632c2f8594e3c531d35aa7b696d45ffa1bf5c4cad7e1304fa92763f923df43"; + sha512 = "08da0c8a887c820d246559bb7c1394282a68f2971ba2f2943084ebf3cafdd2580477ef5a9ca06c1e5aac353287276aa88aab8346beb95addfa95d5014cd4974a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/nl/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/nl/thunderbird-68.10.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "20dd4c7e946e0fca871fddc3481f2f44b72939de3a7f5064ab8f062981ea717d47f2a3c09af32c9913556e2f5fc01fe1dd78c2d35b5fd44a7f35cdef1e4252d7"; + sha512 = "f846e221c2bf3cebd93961e6af10c24215b698cb8318c6446224f5de5b533e887e76818b6b902adc839a3f7c5ec24e9b13aae63b5d601d6716643f64aa29b7da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/nn-NO/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/nn-NO/thunderbird-68.10.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "c366bdbd0cda3143c7684c1cfd948965c2b80bd5076878cf3e98b9b5fb82baa6df419445ab0da134209a969baa0e36d759297bfda701d2ea4cd8c6720b61f123"; + sha512 = "c33a600e2d64c94cdda74f2a94fc54f05133cc543c795dee70909b00b92eb5a48b183600f328f45fc8c9bdabb59f455a4875e68e6e62ce4f6309cfc0aed24fc0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/pl/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/pl/thunderbird-68.10.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "163130f55ed9e0cbc68b48c41541748aa320d7a8fdb954c38fc25ca7e2dac6fea98b30b2653b6e8b31230ebd8364ca12281551e00375e4dd64b87515f08e6bec"; + sha512 = "555b0fb0c4117521f020f7d9846b19dd18ccbec585cd89282384e0a311dd5bbedab84101bd55064c7ae20ecd811c70f31948da26befcb12abe0937ed2736b9b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/pt-BR/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/pt-BR/thunderbird-68.10.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "5e362e0c53f898d1d156c53415469fe965162047bf5ab55798ece681a33322d677a874b80f9f934067a847da9f2c45a62d63753b866e368585ac5f0844e410df"; + sha512 = "a51b74e5d9394ee2ebc26149e1e01766b9c4cde5815fcd915bbc5307095a851e6242fb007c8e93027ea0a77b3074679041c65a1996528435f30f7f17b06959a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/pt-PT/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/pt-PT/thunderbird-68.10.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "b322096fd6fb0778fc26146b69fa9a63f249e927de6d2ae3fd6093e3e24b4825ed29a1d09cb68de274aebeb06effdec78e6445fa5282dd6a733b2181ead21248"; + sha512 = "4912989c47a3c021a28ed56629e308d2326a07ec99dc00b624889a10013f36445fbfe11a8cdde7ff4f69c965b0d2221c61c246933cc313df9f63ae3ec65db891"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/rm/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/rm/thunderbird-68.10.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "715075dabca54e27001f68b11e6c3c99fc5e20f1fcba637e7613584d84a97520e06fd73761bc6c780ae8abbec3121504fb1b51b615a35c0d8660381d71f94eb0"; + sha512 = "70298a29589b928748d32adcf83b12c006d23cd3a171af1eb790eaa34eae4b1a8e97056fc71f9a795a9b9e07f5d8e2a9f4ffc475eaa4b06b9390976fd6359668"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ro/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ro/thunderbird-68.10.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "fc279090426b3baef609f23228ac11d4665fd805d6118a4ecc2bfd1dd7b36d37004033db4be1095275c677a092026a083199e699b553c6eb82192db0190d844d"; + sha512 = "7c36cefeec21820b90a8acc09856aaedf4cf94215cae71daa8142a1d166de79dd0114495b92d954f978d1be88c06ad5fa269fb33ae0b307ca05f3d7ae90844d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/ru/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/ru/thunderbird-68.10.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "8c575c2749cd719878ffba2c8158597222d1d494f2c3749c6b5253a8d75607f42a45799a288f85042d8390225f74ac55d7497abc76a8fc870f89f8f7b7a3c699"; + sha512 = "b7dbd077b0271818ba33d8651fc60e371f9a89771020113ce2a0785c2d228b90d219fcf944e6ee2645fd683fbc1d597529382c4b808ee4cf81f7123e1de9d583"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/si/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/si/thunderbird-68.10.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b2edb098eea69332528f24a352e2cd318161ab3383cf13f878c7fdbca14f923f74a769fd494b435d0ef2fd760d4b7cfead063c91112fd44dfd3d4a47d4597549"; + sha512 = "b9217a815c7f042bb33e0ea2ef9129e8ef1c825af315d0cddb6c0760bc87f1b8932b6f7cca747d50a29a55ac66a21d8113febc360e5f963566399a38e3b5a2a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/sk/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sk/thunderbird-68.10.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "2dde57c16b15b823a698f7c17d98eadd5528ea29cbc50d22a586c3ad7357289f2c4719edf8ba47c59c3419383c64b8ff948582a58356719990340f5db0be84c9"; + sha512 = "494ffad5906f35f9b3141fb06f6900e0d82553c16c8f3d99b50d6718643cac21fbd6a205af146df54125c009f190285281b09bb42996505a2fc120dd85bde882"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/sl/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sl/thunderbird-68.10.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "0014d8985ee139ec3ffae5ff18bcb8ac6f0921930853bab3ddcdcd6d21b9453aaa0af058068770dacb04bd1521b555945f9bfa7d9f47ba4a2adfd667fb067d78"; + sha512 = "d34836dbf915e4d5157a1f8760dae8d8659ceda2ceb594d737da7384139f245915f01a0b025585c117762f2d3261dffdf1c7efa5c2e1f920fe5a350d85406015"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/sq/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sq/thunderbird-68.10.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "5aa41dfc73adbad839452077b436ff302d0e611fb342998a7f6bffe98fd634d7995a30f49f8640645052b9f68c149c71a6bcdf0fd2df7e3c67783bca3c4ef511"; + sha512 = "909aa9e820cb984459deae17b80488db09718eb428e32a35ecb1723fa3c8d7ed974f6cb17a07db8e642cdb51b885291a3fca518542372fe2c2b3360553b3527b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/sr/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sr/thunderbird-68.10.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "266d0030c7d018dd68d5cd8496eeba061453e1d5a37e99c1645aa9c677492d0da397b2a9e70aed5d927c2e955449ff5b75efbad74d60fea4bb4ef90c36d765ec"; + sha512 = "aa39d12ff81a371722609a4ec401021512f651c4f592159f8ef9bcfcb641b55a8f6ccea970b4d8375cb326e0cfd5fa18097ee3131e7546c53b1e29d14058622f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/sv-SE/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/sv-SE/thunderbird-68.10.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "6ce755bf48a29522e1f0805d6fb37bdbf145f75a4b6fa176c06562bd1b6b272d752a3d638ab66bf66dd6dc67fd817d76e70cc31fdf9b201f56c6bacd058e49df"; + sha512 = "3f373131df39c343579ddd851e8c5eef3147650a5c75a5fc3ce84c2e1a694494cd6e3ab12b3cf86018880384f02ca38a54fcca8cc04f3074699fb89c4ded78e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/tr/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/tr/thunderbird-68.10.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "302b03ab2e23f6c0cac0fff85cfeacfcebabea838fef824b7d1733054fd9a3cb766dcff1dad333b199ea876a16ab7a059fe4e01289aef4ed481126c27011b4c6"; + sha512 = "2c91ad17ddad9db19ff2eb47ff7a10253febd30faee710301dcb96ed0472f81153de5d7d906b3dc706d39ff058eefcdb9210ac274469fcc02a39cdbb99a126f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/uk/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/uk/thunderbird-68.10.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "b3d59d62dd3d3e6e9ce8be3c4c746c41a0a0962d1327d1187b0b2034d0c1691970d181405cc7ab7e2f1fcafec6caaa26863020f5edae4479e453718619b7d02e"; + sha512 = "d98a132e14a5921b6a75a8fe7cf3c1aaf22e83c4c8252dcbd5aa0434b98a7d9d88711b68cc470e6007027e6e588cf9ea00dd78a2d97b48b975adef1cd059e79d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/uz/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/uz/thunderbird-68.10.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "73d36534f000d00a52988825c0145288d8d1eb944065d11231501f6e2906e97b0beb89d59b796d3f2828054ed9393e8f65866cfcaed6eb7f939cf657b6f3d740"; + sha512 = "dac94504203e7862608333f1f84134d7afe0e1f534eec9b91ec48a850e0143b625f4be311c2e6e716a16c941d3c2f5dd2101abfae205c802749ca95428b7e754"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/vi/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/vi/thunderbird-68.10.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "b3ec66f92f5d023933e8dae18f0827f0fc8c5880890f9986b339f06b4e565cbe228bc2b0843924bd2a524a77ded7667e63c2747d2ff6c3789d57c8a68e440714"; + sha512 = "684626eb432e89e85b9d3270198ee20470e675ea7294222755b5b588db7e318c20fd8d2fc9a0c95374e8ed53e792ab0e24e826709aa619fbab059a77e6341213"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/zh-CN/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/zh-CN/thunderbird-68.10.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e61e72c3dcd376d74e732d76c5a49203b47e2ea31c86bcdcaad673583795f5c01549fa2c5526205857e565f2a72b8abf8b2aa4e7ede45a94b218428607662a1e"; + sha512 = "8a25fd27a555b18bc41ae31f024e80adc1b06de064bf2391c1db5510869af8c145780a01a26f6cb465d2c6b53f4ceeb924657eefeb95f7ae2ac584ddfc4a56d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-x86_64/zh-TW/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-x86_64/zh-TW/thunderbird-68.10.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "f47bfe43ec5b570863ed1fc81828a23beb250db24fb77d2df2dfb5ec60a9c750f188cbda1a0f2927688865219f6a36695d87e4a8eb1fd642c4c9650dcf2e9063"; + sha512 = "8f202b1a79ae831bf5a28356a06213586bb2c0f4410516a8121c73a8902d0ce7e54f8e6fd7d2c74b300c9692eb3ad4a9b9290cc93ce3205f73842d93a46cb77c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ar/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ar/thunderbird-68.10.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "83a77d9f39196a8a3ec72469c038c835fb6b50872a2dd611519b178f5e46ef40293bfbdd908b3ce236681205b9b3ed133c845e357abb70285f9920401ad90cd2"; + sha512 = "868f092cc144611611133f50be9317161cb34ba2d0012d238789f2d1124b547c52d2aa02d4daa090322e327a4652808cc882835195f02bbea8e67818d22ca8da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ast/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ast/thunderbird-68.10.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "83084855cf03e66968d20d2caca749a9ff9d47b0cfdecdcedf0320b4bc7e628ff5f3a971ae1f6472c5a44facfcaee419250f55ebb254bff9f344c64772f54791"; + sha512 = "bb077167ec58446aaaaaa7439e04332946d62cc6a35ff00bdda20a03eccf80b09bce70524c3b3351fe0b821dda0762cd666c66b00314751301a67d635c2d37e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/be/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/be/thunderbird-68.10.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "722bcaa29137994e36f70a438fddb5be55355cd85d414fcf70cb8bbaf66a9ab0fc21408cf282272dbe977f46b5aa63575c7504bef8292adbd8d4c6e308655411"; + sha512 = "a8ec19464c57509ccea6f83305d441aa9c61ddf0bfe2af172df24f67d7abaf2e568eeabfdfea9e0a843d42ff9c6d2610b1e1e5c060ccb50bce4045b47586f204"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/bg/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/bg/thunderbird-68.10.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "95464ffd5256fb181599ad795fbfe5d9cfe8ef0c02a7830174ee4732761cd94a2cca75b6a686559e07d996640f5e973a660fc857f0839d6bea5594e61f2f7e4e"; + sha512 = "9c8ef811f0bf04066f3c55e4b02107450d88a1774417ee503027423917bdf16ab9b102eb0f7f4c777ee60039998f8391164f1719bb8abc4d79774664041fa6c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/br/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/br/thunderbird-68.10.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "fe09bb21248975aa60ffd74a970c9dcfbef578c1188bc1c3704c7411c2e94f88976ac7ac5e52a69ac6235723332f2fc76757ef9118092833fe64bf0a05e3ecf3"; + sha512 = "e94fa2e49fca5bd6e6f1139adb86604482deeb1160cc8fe348a1cfab2bb19c8ba694ca5743ed6e5da81c9789521e8b6018db4ecc68ec91c8a277916c6a553521"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ca/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ca/thunderbird-68.10.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "01ac3c0090448f1ffc7c97623df8576a7a3c184a2bc1a2761f0e3451a18dee6d4f6bc37b305dcaea89930a1750a9541116bdf03f613b333ddc47d5f257b3bfc0"; + sha512 = "4dc73850268e885b9791b29573f35704d730e9a9ac833265f47413eadb2e3d359b8b56405ebfa58816b8b2ba390077c14f17a769fec94870652147d2a2915243"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/cak/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/cak/thunderbird-68.10.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "27dad086126a268f2c6700a5f01006c40e911ecbc95dc994da7cd2dadc3f2bd3bc94d5da15a297b2e72e8b20254d40c757456c308b70bae2c1d451ec6ad7d1d8"; + sha512 = "569d8b373efc412180cf01ad9333a1b2f05687f3b8cfc4286c81c9309681d390d9ccc2767248e36db7931e2b941dce6ca209a00e7ba5dbebea6d40c710dc2cdd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/cs/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/cs/thunderbird-68.10.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "b99dc13bf43a9aebd08f13fb113186e6e4a72c68d609895afc8a52c4909a0506f646ba394c705004272d1b91db4efc81a5518bbd06e359a8a24c85f4fbb30102"; + sha512 = "e87eebe5c3486b02f46784209019b5f5dbfbeb36be8914604416c194bfebda2827861172019ca33bf754bc86ad91327ce5e29ecabcc77390d84be80c2f682e29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/cy/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/cy/thunderbird-68.10.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "36c1557a9955e461128929b7be0f679a02592b65e4b401b052ecf1f467a231ba725c92eb96b8118bb75d49ae45f8287bb5fbeb22d94ba11dcf311cdb87170ee0"; + sha512 = "e97bde29c976e200f418b2ec150969459e4e17872184dfef548b08e16286f948259d2fc84d0d07965a5dedae8d5e3268c3a6ac0794cb0c3a739ffc86b2a6f748"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/da/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/da/thunderbird-68.10.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "e81b41e38b322f2eddfd68c07f326ec9d716bdbdf31c3a02d22d9377002fd21b58a68a8ac952fed2ed164a02f8b20e9f6678c52fbaca741a4bcde1079ecbe38a"; + sha512 = "7bfbeb6e8bb427e7e3aee31e897d025e338a4c4da59eb2700b52dd08cd53efaf6dfe1d33e456572c0203fe6927bc069ff297288cc47dec2ef9835e047a5d2938"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/de/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/de/thunderbird-68.10.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "da6a44a2a6545b10bbe12644e433932c4410471f5948278b919baca1c6eb0181366114c1a6f611b897c71bf4091a6734393fd36f997c118f49466faa8dd2264d"; + sha512 = "15da351e919e0b931dfe48f77b9eeeaec40e94c973de507560c62a86e2b106f7d4afa7602186829fad2984f9964ad23792ca88bd5b94976972bc103f0560ee4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/dsb/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/dsb/thunderbird-68.10.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6d19a0010553d1b08bc47a22c0c7f23bf4c86ca79ef3ca26c970cd502e6db003ccf045488f88d68a5b1b0ece4436de55d65592b314126b9b5792be30c9def553"; + sha512 = "1b8c1b12b8d7979a0ce45db282bc2a3b933bda3711c07097533a8a04b38edae3f0bd00298cbd485954ab09fa57b10aca5238e8a7bf4e23ea80ebed2dba1d73e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/el/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/el/thunderbird-68.10.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "67e6382474356c4ff25e6f49a7ee3859eba5bb29a4e795668e1ec52131dbaf0d87b9cfb8ffe1fa855bf8f34e841b8fac90c356545f47a711b533e3593219e957"; + sha512 = "67c5dad2a95ff1b8b3ab2ebcb0c1c4af87c5325e22d43c24f4f1c0df9ac328b43b0b25247408c8c95cb5f98b9396a1714b0cb39cd2e43ecd04b28f8bd1dc43ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/en-GB/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/en-GB/thunderbird-68.10.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "f4e1d9b10ffc96aa7ef4202e73445d98a06082abcb87fb60d951ce491ead7cee4bad5c1009270004540d03aaf383eb5b8203845f84335b523d92bb586ed5932c"; + sha512 = "c9feebac54a357470523029377699fc9c0bca08e4705374dd1b8756cc8461237426cded2d9ee994b7ee529c60d50a555e4e1c2d9ec71ceccb7fccc651e35058c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/en-US/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/en-US/thunderbird-68.10.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "a8fcf918c869e8064c2dd39a03bb768616b1a5e4e1c6121aa544d72626bfb790625e2cc48dc973443b947c6e619f9481cb20239d544b10bdf287b7fa4e05128c"; + sha512 = "9280a58b42f93b38f4c9ab26b8b6c2956ccb135ae959c61799cd3ce3b3419c9642f86418ac53e9c4f69e0430508c0619db4cf856a28d233a8d319e262755f4a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/es-AR/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/es-AR/thunderbird-68.10.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "6b98ed36080e8eba879e305aa34ccc77e1735700d104f592095cf9810545bdf25665dd36a527e19cf12ec4cf782a6387e30f7b4406b76230c08a350f4cfd5fcc"; + sha512 = "9c17d648a2ed9c2b6dc7d403436dc9aad91e10e63579e26e4dafe3d5b3a15633167c87b67924026882a03f1aab05673566a0c5f0d84efb656b6b3d7d4b812e5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/es-ES/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/es-ES/thunderbird-68.10.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "0cf479d98ce943e20871e7073188db3c9162dec8cf2b0abaedbaabfac9b29411dad39fdf44c038680956c42f7f7e303d5e2bf8d7ef9225fa093821ce760e9974"; + sha512 = "d22ba4fbd7e8d22f70950b61354b99ffa6bb1c298504f8f05297cbc20f0c89a9d657c74ab367480906cbc4b699df6c603d6f6b936ccdb4213e178f3eb153a314"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/et/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/et/thunderbird-68.10.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "51584ee5c76710a9b805d4da528d5463f1e51e3efa6ca3b9cf3fc6bb6b953cac6b7919f908975905f619d9be75e4b9ea32980bd5f198f77dae0f75795465fc23"; + sha512 = "107fa0cd997edeba0a88d365c52fe48ea0d355ca8bf8723f5bf2ad4a930711e8fcdad27b457d309a5d4dfc0f29f6988f2b04f153b83384484ed397261c07db7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/eu/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/eu/thunderbird-68.10.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "bbcbd4a91856ebb9418c00feed41f00c93ffc5eed4af7c1c27585c707aa8dbfe4e48b0204cbb236a8205a219f0044811dc43f4cc94b6610f30d38120e3ab4b21"; + sha512 = "ba50b4fed2d682f1c46699f72d86b219a1bb398b1b2180cdfd246bf4eaffd61e34e24222bcd82ebcc68b9cfa9f98f56fe859cc6d5bd744a7223e7264d6d4f261"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/fi/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/fi/thunderbird-68.10.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "f03014cd7a28b4d85c2d896e8e2a5a1db959c7290c98cfd0c12839170956e98e0087685ab4304fbbdae42b06a8ff7b5563e70c9bbe0a787d2d9b4103019cf31a"; + sha512 = "6f4fde19af18845d50f591940786402233bb77f518f1f8f9cda727bd458e21669f692681cc691617a0ce05f8516383ce38b7b51445e3937ff8c1868e84a92ae0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/fr/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/fr/thunderbird-68.10.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "ce7b187a572da6bee677cc7849bd5123545bf437005b16a855d9e4bfcd58a10f3b095a3b0a767d5a67aa113c0a9e0d437827c37fe1c8bf84a3fc8c8d2c702a8d"; + sha512 = "7e9dc42478dae325a51f44781048a55fea3e2bedcbf663c534510404e59dfa10216dfc0df4efd40e0bf1f4fea3abdc9867b6c6b33f199e406ab07d68b68acfe5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/fy-NL/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/fy-NL/thunderbird-68.10.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "2062090196c7b07ce148a2937027637469e7593ac092db0bf7139286faac51d350c786c0bfed6e32903bcb7f2ddc4e3df6e993f8637fc68c1aae1be89ceddc98"; + sha512 = "1b665dce92e8c1de000063f1a12192a2fa5aff2c65db9aa6769ca16604e7e97a602baad9761110124c65dc479fdbce7640020701fb280b3c62e5c78368fb496f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ga-IE/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ga-IE/thunderbird-68.10.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "fb11eadd35e46081a16116843a4a134b8197c4e8e1d1a52981a085f02bbda7ca49dbf1d9a88f4a7fe2542a99ff24f6d35fc661414cef1fb50edecb98c6693f4f"; + sha512 = "42faafcbe85ab995b549bf072942dcc2e87780099b3bcb2974ca3eff6acade40be7bd8ded5cb0db6a02bfdc255c60e252061a767543b2215719a1fc2600fdd81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/gd/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/gd/thunderbird-68.10.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "e9b985732d6619555c24ababbbe38303998750986395c647aadebb0c209467fcdfe5f9dca99ecef0e0b747aa8598f887ef2218140ad1d97e7e3d73b430dad1d6"; + sha512 = "e1455ef926d71ecfdad24ebcf4b3de59d04611bf641ba381534bd1b94c2f7b730687cf2e8412e6910d37e402b58f32588482089f4d12308a7b9cf6af82b66e97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/gl/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/gl/thunderbird-68.10.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "3b8eff0004db222eff3b4f42be4eff168310fd0e17e676ae92fddd9c11e3a6d4826c63a35f9de37095a7fa88f7f4931e36bc17ace548e36f91bd8334fa53799f"; + sha512 = "344d619a5437d0efe2e522680849dd809b07c3aa9cf2831610aaf7ce28e81f16782a4a8174c01cc339914e02a23cb3ce603d04dd0dca8eb4f547e0d0e780d8f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/he/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/he/thunderbird-68.10.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "e3dcd319e08ddb5aef2bc576f136eae7838e3aca3c9160aabdaecc32332f0c250201a80f31724233a77f4dd2857684f2bcd9b194df5ec965d69cc04a9e9b7da9"; + sha512 = "c081d81f3c1a61d2922bdad144a97c8568326e97fe29909d4319ca9019d9bd466dccabc6f2069eadafaa6bf6bb5bd50e8cf0c070dd992cc095411dd909b43f06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/hr/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/hr/thunderbird-68.10.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "84164d00d087e507ab79aa4db6567311bd0cecbde1cb1be7337f4ffc42abc8c7cd0f4fe9a3aae2e35b01683f96e1bfbc816fa96e6fb872157cb473128679e19f"; + sha512 = "2c142b9bed17fc1fef3e4339f0477d3f469923083a37ec3b2dc3d4690a44ee34d5a23faa37876cec2f3bcd02c1048ec343f16bd02a1771296e77cf3f63ca787e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/hsb/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/hsb/thunderbird-68.10.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "a3fac91f5e2fbf739d2f2c164c6d58ea89026c1e8250a41c51ee11640bd7831c73a4c3148cd80ae2b40a2e1a369d47d3832f96a276dae2c80ba2d90d6990d062"; + sha512 = "fcbcc78b1d5620c27b7cfb7ee88463dc81664f5eba679a81920ac6923b0e3f05bc70b99ba7268017b59219872921e76860a113fbba757cebf942641ba0591517"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/hu/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/hu/thunderbird-68.10.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "002c42f700616d2ddcf1753d37de064959965e4504112e96507a8aaf2398fa25f650e1fcb50189aebf3bc3d0c3de795b496d1f8e1550fc0186d74ef312a11d74"; + sha512 = "d59024db516156a89cbcc0148a5bf85059ac2393f41709e224f109abca6fea693b822d7c4a3ce5e360435c8700010aaeb4b26ef9e163827bcc8b6cf1761d3781"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/hy-AM/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/hy-AM/thunderbird-68.10.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "41fe16657886ccde1c6410e3e62ade72d8890a50e77526994e82cb929c8296110d0aa32d8d02dd7d1482d594322325d28cfa54afe113dc69e2520dcfd56516f1"; + sha512 = "17876cefb335375b7884080315690fef116983b7559421f86ad0ef787bdfdf5aed283d84114cc1c1d3cb3119d735f50e975f94ead6fcab6046c207d4c1a8fc8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/id/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/id/thunderbird-68.10.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "8fb8703220a801bb2d29e436d28325a3310b61f6a22d3d8964b98bd9cea9e74f9e53cd41c8c9a501057d1915a6c71f6f5d27fea267b802082488d2690a0ee088"; + sha512 = "0c74ca260ffee635cd556c0710a13ed091a1f2eb63a1b1ac2a745ea0e86d42b52b08b00f648c406356e1e170c77242d43d9a4d2b2f0bb1fb26d4dc83b4179a8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/is/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/is/thunderbird-68.10.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "09c59bca1a0282416aff4043b7d64e5f8ce308792efd35e197b2d91125715453769b482e5815c9f33cd0d9d3809bbe898c40e767c13786868673bc7f041f1c17"; + sha512 = "97fdf5fa7dd6fade8ec7efc179f6a65bda90cfb285341e3e98b9b2ab70ba91ebc8c47bf8948189d4c181566c9ed950fbd0fb6b4d4cd96b2e3329c0085e32771c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/it/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/it/thunderbird-68.10.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c3f09f2681d0aa197084b0935855dba98517d6f5595595385d93dd7a998ff5b0c98f35141091f41ea8e91ea10b25f6464f242218cd7030351347f77f35396ca2"; + sha512 = "3d42b5a8c55519accb3246c5a7f50def9d854ccaffa0e34b20e6e2f51cc07a787a9ab0c0b205e28b40d9ec4f55f1176f391ff9156076327f8a4416a9ff6ea8ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ja/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ja/thunderbird-68.10.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "4bdea34b50edfea5b3dd3bb80935e1148b3ad926c95d84a3d265268f783ff3c487527726b0151643c8f3eb5d061d441742da23f6cb03297894a8076a87275574"; + sha512 = "bf90c9c27abac84ef91a2fe3ceea142ac7041c10d41a0e5a2ee31742f9f64b2b24a331af769e8ae93c7b09bf8645dc4d274524281fbfe69a908fd22aaac7c2d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ka/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ka/thunderbird-68.10.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "ec029d7a58aa502742160e131eab70f50f83851124297fef72214d58f1309f047b9881d824432a8bd3841dd158493ca2b41e41f4f9bf9dc043db9ec4df1a1d24"; + sha512 = "8e2fb192c6776ad702ea7aaa9bc9dd31b20c1c66e2ce4dd91aa10eda5528172680740e28f8a7bab52a7c6eae92578822669d6ad068bbc85a04d97c91a4b7e08b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/kab/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/kab/thunderbird-68.10.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "cf291b9d2924e72b9871a4eadf10118cd0299e2206151c67bf36fe0c766b75c9e67e9b11e8612ca5d95c50c6cd3d90e95210e9625ed8eb1c14ba5a8d45bb997b"; + sha512 = "10b9418db83b328353afb73b7630add081309cc0b55fac8aec38f6e09036968082d3d12386efb6b4347b33977998bbd906501adc45a8c8d27dfd0f8d98288bde"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/kk/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/kk/thunderbird-68.10.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "1031db4a9f0716973fb1ddbc8e12b2252bdb8450617a6c642ad4001c119cd3eb3bad999b861e8204a85699b415fdc5d768b6aafa6fee2c5b9efb7e9a3558eda2"; + sha512 = "7dcfb10ce402c90452815523d5672a1cd60201b33b997c5b769341e904f4840ff57685eab61dc3073f789bf042453f3d144e54bec32afae2dd65367a0f1768a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ko/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ko/thunderbird-68.10.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "bde75ae38856970c4da871cdbd63d96f31021f707869be7517d4c719ecce3f505f886c65e9faad8bcc0ac26885777e070246576fd47f75669b77f0247689954f"; + sha512 = "fddcd08f00cc4f3de59993c8c917e20e77918d87e2c23e989e8e8aaf78c6130f42e546acc17eb6f8c9a24550c596ad201d63f325e7ba078a6c791fc94589e0a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/lt/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/lt/thunderbird-68.10.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "9459b50e1fd01ce742bfe6f13ac26241958ad5307c08e3980ed5a84023a12be009dc6a83085ad52c68e162e6a45f4f430e79e21e4d19f67e470ab07151c40bc8"; + sha512 = "ab221093a0df2876f558ff2e0df090b95872281e1cae8ac23c9753dadd6305608c6e7ec5104d491ca3a3f1c1ebd830b8094080ce99bba49b19b46e617238cc87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ms/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ms/thunderbird-68.10.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "0632af25fd5245ec2a15a09a075db24a64e3020ea6353e88f72fa74f929d8507cb868cc617da8e97f01efff19a9108c9b2b30adc8e58b0e7e6353332219e658d"; + sha512 = "ce6b0e1ba8a1a1bbfd4d2e265a45430c2d931530d13eff67fea4179c4a8e2a204ff35103c921073bc33c3e2a8f8f3f55fb91b3218cab9718df76da696ed09750"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/nb-NO/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/nb-NO/thunderbird-68.10.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b16523b5a40dbe496537df487d72f8cb16ccf338c1a96e6ec3dc7e1a5d3073991c12ada23fc6b31f34d2fb712050334eae145a45420994c607a63799ed42d264"; + sha512 = "07e73fd67e0c1974c5e5b90d74e555b75820b66ae9bca0470b6d291e848e5f28fea680cf09c2167dd56b0765ae0e3682b5f2ab7f33cc5b059e60252236dc24cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/nl/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/nl/thunderbird-68.10.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "82f0ab2e4969323ea8294f732b13144ddd453a613a68b582ff398cb85aee88874a5fb5eb61627f142ce8124b476f49fa6cf68cdaa41fdaf3621519c53c4ac16b"; + sha512 = "a24ed7d30e53058653c0de6b96867fa9621118fa43e109940502eea798a5c7b8688c65bf08d765f3c6dc6e8ab0dabfef98ae005e00c465f847454b384953276f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/nn-NO/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/nn-NO/thunderbird-68.10.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "815d0010de5f6d9144a182a2170c59a502b167f18eec65d23987e4b73e6d5bae46be18d7f55462a3ec8634466639aceca03ad9b772c7e8b232eb874998e6148c"; + sha512 = "4bddbdd0a2353f8c43e65cbce5974911809cf28c3d7ce521d662d782f8858b469575857688a5c674f6d028acd55869c062edf9f55dfa3d387fab8fb60f6f2fad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/pl/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/pl/thunderbird-68.10.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "5be434a54c91097d4f6477767af96f8b862828912783eee48577cc450a14eceee2e067e9c10697633a2833f473b9d10bea33b3c6c6377b898a18d3d7c6568f96"; + sha512 = "953d9e547eb343a0d7f96f501bb87ece71e2f860f8517fb13b76301c7b3e77d7f572a8106fdd43c2b390654457e43703b22566bd3159ace962af2eb1f8bc6ca8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/pt-BR/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/pt-BR/thunderbird-68.10.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b7b3fd6bb8535f2328ceb9259d7517bfd695cc881130720d3857d5a27197deba4fe683e163f49613054ebec2827e805a31a62c9a9e578f4ffb760f421a4ea506"; + sha512 = "b3807897100857c33768478c9dec57024f968a83188b51bd2708b7caf7c53edb39b15cc8dfb5f73ca937c298fa83551edf82d7f43c065bc2fc25467a02343d20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/pt-PT/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/pt-PT/thunderbird-68.10.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "b9561a6f55c25cff2bec9bda78e46204dc85429c52bb42f33b6ae972c0bf16f3a99ccbe3f283ef08cca955d31e5eb6d91ff9d8b50e85bd75443998236d6e08b1"; + sha512 = "e50bf636697714fc4dfd04e1a8d6d7d87239553f01064bb566e218395a2e5d9b16ef22c01509f18f9f562b75eb19a2616d8c7f8a4d212a9a445b1eece17527f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/rm/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/rm/thunderbird-68.10.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "7ff72dc448c9303a70403558ae46cd720e645c24681dabbf265db783ef872e92216f8ee9169e155904d3fcd3288f2ee0ad11ca22bbf041b380884d57b306876e"; + sha512 = "1480eb4c77d88fc461000f423179e5bc693b2f25abe5c6384f4c98494f698c620fdd53e65d75ebd17ce9546c5fb00ef8f40bfffd9b31114417cd10262569a54d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ro/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ro/thunderbird-68.10.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "7f585b942076749269ca86161694ef1b9f4e68e75300d60ea4141b2404be0c79761a2658c123787d67e65992e4b3dd5b7406acfee6084846bdefdb0f82d9baea"; + sha512 = "d9cfc8f03d75f3a58fe103c34eb0fdcb3530f0ebc68c0acae7fe1b783bf11c0585e266556d16fa3db174aaafcc319cef9cfa363361cad7b1053a504101b13880"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/ru/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/ru/thunderbird-68.10.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "e4ef9e081cfdb3567f1823866ffd0e3e5fbe8596fd3a7dbb94869a8d1ebd328938c490669c8f46bc6575d6b8c5c351e387faf8dd2a33db263cb2fb5ddb2974f5"; + sha512 = "d67f550615eb195b80f7338708b7ecf7455203f86aff1682f2e8e654d019fb49c6468eb1c099f7fc78797b97d41c9f42aff5498f27b6cb458f049fd8b6aa3d4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/si/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/si/thunderbird-68.10.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "42db8e43c4bd722102778d4a9cdfb0ba54b0151882b7963e07c0b8cd653d7303eb22a541a8fc3a5b93c9db09c1a24db8f5c3365b5654e997c17d3b4b2c2a5f38"; + sha512 = "6dd9d78a9f2ef4ed28a95e83e76e9779d02c950ba906ca14d8fac0bf7300ad2d7d5ad9cfa3973cc8c861011dc8f1c58a6ea5909206443cd2f24bf5bcfe8c5673"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/sk/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sk/thunderbird-68.10.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "fb025203b739cd89169bc25b36e6d541ebaf8726720c0b51e58a33fd0e71c2a4ae46428fe16547ed5e639e81ce35253a5519a28de9a8baa952a1b1af184b77a3"; + sha512 = "ba40286898a7722533f8a65e1e9bb494bc28212d2fe21c820f64b1a8bcaad6d0ca1d7a870d5289792a79a6c4851931236b13c1ba07b812b591b3d4c6004ff78d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/sl/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sl/thunderbird-68.10.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "ba392d3748b697d323e63c7217ce3c3aa4eaf6b994d798655a1667644733a6f19b23b95df420b2235e9ee000a868485d4f32fbe5d737ef5c7296c085738168bd"; + sha512 = "bc8e926583e92f4cfe3081a1bb618d7c5fbe9e1f93af378040a72820b820a38915ff1c74deb6069bbaf2957adc536b78faf1df853e8ff6390a9396d909ee040e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/sq/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sq/thunderbird-68.10.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "b795928265f2b50a1032ab8fcce954f6d0d35a6dab2b381f11ca1b6b204aa1ae91b0ceb221da5ccadcca303f20792715d0f770c215dc59654df1b325ccc3e42e"; + sha512 = "084bce04b0d83ab24682d04f4c788d61a2a6bfe0777f44f4c9a07d8fd7fef4251464e9a0e523f4e111bd5323ceb398fa09ae3391295047beac3157ce9d2e8905"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/sr/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sr/thunderbird-68.10.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "274c3675cd3d5264c2ce74b101b7c87bfd1703645e4341f6499c25b4905781395f514ed8412b22289ad097994e748ee7b527f1d6081022429292a64155d2df74"; + sha512 = "544ed1f0cb8beeac3ac1b2ed02078c3acc5961d6fe4c3f0722b1a36208740226053236453a215e564371453cc5acb541a6f307d594524081a5f4c96aa077c21f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/sv-SE/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/sv-SE/thunderbird-68.10.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "318ccb06cf2c9f5fdbf25fe70a8c5e65c20e5d7ca375f52f64724410d2afa8a852f9e9e77b673c1f59e26bddd6fde74783a96f69f7bd73a1b7042633b624b310"; + sha512 = "806ea4d93a8cb3e5dba8cbc59dd25adbb19e048306124ffebbf1b2a56d49f236d9a79d0e14b5fc0c15537c266a85408ce1a5568e8e6e4417dd94f1b98d9bf36e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/tr/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/tr/thunderbird-68.10.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "a86a69a8c146a0765e9fb7c835c1cc774a0a7fc309fa7f6627f427bc2cb4bd1b3e18f4aa61288cb68483f267b0be02662250abcdcafcb6619f1b4e3437cbb908"; + sha512 = "cf30e9ebaf5770437415377c9a13d66b44a7de7c85bec9b980d9e2e059db7f3756f2c3a888ebf9185c59451e2473440fe2c1ff28a979e066225719effecb1c38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/uk/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/uk/thunderbird-68.10.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "86407123381e64df9f97190b0df253792582b0ba5296d6663bc0d8faf3004e3ec95cbc0140c9292928a7750cece1cc6887086a9e218f3169bee2246232643685"; + sha512 = "a7f5f6b0f1bc849a3a48a30edc8e408eec0c5e544bb4444a8ade969b1fe7ef1fb9d26a0fea3d4d31bf88eb67570e895fb5d916b9ac88c2a8455abcec60d56ca0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/uz/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/uz/thunderbird-68.10.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "2d31a86952df2f5b339479cc6dabd1cbcc000119514775b07ca086e01e8310fe0d0d2c63cc57cb936588c59a5f72a5d9dae0e0a6e2f9b7cdf6225e400c24bd31"; + sha512 = "716e1c0a7b9b0ea33d1464930b68f3f817ce3310bee9000199f9e6bdc4d0d68dc6098665423ada94d7ede600cb0c965adcbb413068adf1415cbc048a7f847ebf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/vi/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/vi/thunderbird-68.10.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "3c241242e918bb69d811289879323205c070620829e05488e224450e7edb2be32b0f2c36f3182fcab95a1673fd133635e89801feaf6a34fa1553d8fea3b57641"; + sha512 = "1667ab35ed705e739c5192246444eda912ec86a153dd1fc3ed83a5ed61d47d5849270492015198cca82827720bc019fa561e710df5fa77a758864e6cfb09d4aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/zh-CN/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/zh-CN/thunderbird-68.10.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "b4932b43158a5f8627ec951a3cb726863575a81b9d7b93ab35a9168224cd91480ecde55a1e7d4c01b9ed74f92440724475980010f1645db9b2ef0b6c42e92d93"; + sha512 = "4ef6c9933ce8671442aa86f804085b4ce9a73aa4f8cd598b7d41a844be37d54cbd8a2dc39d6ab97f160856435475093f3240f960a206e53d327a4b2e47fac45d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.9.0/linux-i686/zh-TW/thunderbird-68.9.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.10.0/linux-i686/zh-TW/thunderbird-68.10.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "018fff050295932a492433992a97fd01acc36685f7d1f96bba2f41972fdd6cd592c117434d2de81d0d018595c8473427aefe5a7b66194bc18d127c2e7eab5a34"; + sha512 = "ab19d7c1114835a380e035dafc2e30849e8084cdac9175eb5eb3a9fde81d49cb710d9dce21652780a35011d139e070c0f61840275aa8d0e99252bfa5a8aa1735"; } ]; } From e3873d669017223916cfcdf502ef4e2bf8ccb744 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 1 Jul 2020 15:12:53 +0900 Subject: [PATCH 2980/3452] thunderbird: 68.9.0 -> 68.10.0 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 3b0be4dad191..007ac280068b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.9.0"; + version = "68.10.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "3q0dikgkfr72hhz39pxi2f0cljn09lw4940qcn9kzfwfid2h290j7pihx6gs0z6h82fl78f9fl1598d064lwl1i2434dzx6bg4p4549"; + "24jq4wxhk58403ax8jf6p82fyzf0vszz8am5d8jb6j559da3lp6wv4m5xqavvcf9i57rdivzrmqw9agr8mypfxs8zb908aln5iy7d4d"; }; nativeBuildInputs = [ From 6bfe8c6ece57ad549bccd9822b837db799e22837 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 1 Jul 2020 10:05:09 +0300 Subject: [PATCH 2981/3452] languagetool: 4.9.1 -> 5.0 --- pkgs/tools/text/languagetool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index fccd2174a6d6..0dd01d382ed0 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "4.9.1"; + version = "5.0"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "0hvzckb92yijzmp2vphjp1wgql3xqq0xd83v5x6pbhziq9yxc5yh"; + sha256 = "1jyd4z62ldwhqx9r7v4b9k4pl300wr4b7ggj4f0yjf0gpwg7l9p7"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; From 00c6fa607cc564a1b64eaf56d0540607df7eca19 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 1 Jul 2020 13:13:54 +0530 Subject: [PATCH 2982/3452] nim: 1.2.0 -> 1.2.4 --- pkgs/development/compilers/nim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 86518b8db09f..9fa2270b1dde 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "nim"; - version = "1.2.0"; + version = "1.2.4"; src = fetchurl { url = "https://nim-lang.org/download/${pname}-${version}.tar.xz"; - sha256 = "0xf56xb42hc92h4xnvk72q4n3ysjbyhf0rg60lc84r9r6wx5i52f"; + sha256 = "0dnn60slvp3ynlx3zhv3cjkanv8zglljxws0db8g0rdyz8r8zwgf"; }; enableParallelBuilding = true; From fce108ef60c2518fb84cde47fdefc45424aa9ab1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 29 Jun 2020 20:31:47 +0200 Subject: [PATCH 2983/3452] ocamlPackages.bigarray-overlap: init at 0.2.0 --- .../bigarray-overlap/default.nix | 28 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/ocaml-modules/bigarray-overlap/default.nix diff --git a/pkgs/development/ocaml-modules/bigarray-overlap/default.nix b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix new file mode 100644 index 000000000000..e02b1159a9c7 --- /dev/null +++ b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix @@ -0,0 +1,28 @@ +{ lib, buildDunePackage, fetchurl +, bigarray-compat, alcotest, astring, fpath, bos, findlib, pkg-config +}: + +buildDunePackage rec { + pname = "bigarray-overlap"; + version = "0.2.0"; + + src = fetchurl { + url = "https://github.com/dinosaure/overlap/releases/download/v${version}/bigarray-overlap-v${version}.tbz"; + sha256 = "1v86avafsbyxjccy0y9gny31s2jzb0kd42v3mhcalklx5f044lcy"; + }; + + minimumOCamlVersion = "4.07"; + useDune2 = true; + + propagatedBuildInputs = [ bigarray-compat ]; + + checkInputs = [ alcotest astring fpath bos findlib pkg-config ]; + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/dinosaure/overlap"; + description = "A minimal library to know that 2 bigarray share physically the same memory or not"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ab14c4876a6a..6708270f1bd9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -52,6 +52,8 @@ let bigarray-compat = callPackage ../development/ocaml-modules/bigarray-compat { }; + bigarray-overlap = callPackage ../development/ocaml-modules/bigarray-overlap { }; + bigstringaf = callPackage ../development/ocaml-modules/bigstringaf { }; bigstring = callPackage ../development/ocaml-modules/bigstring { }; From b25c98ed29f1dd022d95da1eaf96d139b21a0ed8 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 1 Jul 2020 09:54:33 +0800 Subject: [PATCH 2984/3452] zeal: 0.6.1 -> 0.6.999 --- pkgs/data/documentation/zeal/default.nix | 34 +++++++++++-------- pkgs/data/documentation/zeal/remove_ads.patch | 23 ------------- 2 files changed, 19 insertions(+), 38 deletions(-) delete mode 100644 pkgs/data/documentation/zeal/remove_ads.patch diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 7bfe918030ed..4551dc211792 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -1,40 +1,44 @@ { stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig -, qtbase, qtimageformats, qtwebkit, qtx11extras, mkDerivation +, qtbase, qtimageformats, qtwebengine, qtx11extras, mkDerivation , libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }: mkDerivation rec { pname = "zeal"; - version = "0.6.1"; + version = "0.6.999"; src = fetchFromGitHub { - owner = "zealdocs"; - repo = "zeal"; - rev = "v${version}"; - sha256 = "05qcjpibakv4ibhxgl5ajbkby3w7bkxsv3nfv2a0kppi1z0f8n8v"; + owner = "zealdocs"; + repo = "zeal"; + rev = "1ce0e2e446232e7647c5588c1f603f1dd88e0f67"; + sha256 = "0gj5qcm7ck8m5zfmiabay2f7wbxldmrkw8m3xi7v9i8y8hx0jkxr"; }; - # while ads can be disabled from the user settings, by default they are not so - # we patch it out completely instead - patches = [ ./remove_ads.patch ]; + # we only need this if we are using a version that hasn't been released. We + # could also match on the "VERSION x.y.z" bit but then it would have to be + # updated based on whatever is the latest release, so instead just rewrite the + # line. + postPatch = '' + sed -i CMakeLists.txt \ + -e 's@^project.*@project(Zeal VERSION ${version})@' + ''; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; + buildInputs = [ - qtbase qtimageformats qtwebkit qtx11extras + qtbase qtimageformats qtwebengine qtx11extras libarchive libXdmcp libpthreadstubs xcbutilkeysyms ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A simple offline API documentation browser"; longDescription = '' Zeal is a simple offline API documentation browser inspired by Dash (macOS app), available for Linux and Windows. ''; - homepage = "https://zealdocs.org/"; - license = licenses.gpl3; + homepage = "https://zealdocs.org/"; + license = licenses.gpl3; maintainers = with maintainers; [ skeidel peterhoeg ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/data/documentation/zeal/remove_ads.patch b/pkgs/data/documentation/zeal/remove_ads.patch deleted file mode 100644 index be0cab305eb5..000000000000 --- a/pkgs/data/documentation/zeal/remove_ads.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 1b61397175b6e60f23224db463301c9057830859 -Author: Peter Hoeg -Date: Mon Feb 19 07:38:03 2018 +0800 - - strip container with ads - -diff --git a/src/app/resources/browser/welcome.html b/src/app/resources/browser/welcome.html -index bb3f511..67382b2 100644 ---- a/src/app/resources/browser/welcome.html -+++ b/src/app/resources/browser/welcome.html -@@ -20,12 +20,6 @@ - -

-

Docs for everyone

--
--
-- --
--
- -
-

Customize

From 9ac1ab10c963a86457c2c9b1edf31542ff3737cd Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 16 Mar 2020 11:58:05 +0200 Subject: [PATCH 2985/3452] nixos/lib/make-ext4-fs: use mkfs.ext4 instead of cptofs This fixes image creation on armv7l when image is bigger than 2G. Also fix some reproducibility issues and other cptofs issues. --- nixos/lib/make-ext4-fs.nix | 39 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 516fe3fc673c..74a6c134e64c 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -17,7 +17,7 @@ , e2fsprogs , libfaketime , perl -, lkl +, fakeroot }: let @@ -26,7 +26,7 @@ in pkgs.stdenv.mkDerivation { name = "ext4-fs.img${lib.optionalString compressImage ".zst"}"; - nativeBuildInputs = [ e2fsprogs.bin libfaketime perl lkl ] + nativeBuildInputs = [ e2fsprogs.bin libfaketime perl fakeroot ] ++ lib.optional compressImage zstd; buildCommand = @@ -37,32 +37,31 @@ pkgs.stdenv.mkDerivation { ${populateImageCommands} ) - # Add the closures of the top-level store objects. - storePaths=$(cat ${sdClosureInfo}/store-paths) + echo "Preparing store paths for image..." + + # Create nix/store before copying path + mkdir -p ./rootImage/nix/store + + xargs -I % cp -a --reflink=auto % -t ./rootImage/nix/store/ < ${sdClosureInfo}/store-paths + ( + GLOBIGNORE=".:.." + shopt -u dotglob + cp -a --reflink=auto ./files/* -t ./rootImage/ + ) + + # Also include a manifest of the closures in a format suitable for nix-store --load-db + cp ${sdClosureInfo}/registration ./rootImage/nix-path-registration # 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.10) }') + numInodes=$(find ./rootImage | wc -l) + numDataBlocks=$(du -s -c -B 4096 --apparent-size ./rootImage | 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)" truncate -s $bytes $img - faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $img - # Also include a manifest of the closures in a format suitable for nix-store --load-db. - cp ${sdClosureInfo}/registration nix-path-registration - cptofs -t ext4 -i $img nix-path-registration / - - # Create nix/store before copying paths - faketime -f "1970-01-01 00:00:01" mkdir -p nix/store - cptofs -t ext4 -i $img nix / - - echo "copying store paths to image..." - cptofs -t ext4 -i $img $storePaths /nix/store/ - - echo "copying files to image..." - cptofs -t ext4 -i $img ./files/* / + faketime -f "1970-01-01 00:00:01" fakeroot mkfs.ext4 -L ${volumeLabel} -U ${uuid} -d ./rootImage $img export EXT2FS_NO_MTAB_OK=yes # I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build. From c183d0c1ba4b7d1c56328e06eefcdd2b587b5c3d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 1 Jul 2020 11:35:34 +0300 Subject: [PATCH 2986/3452] gpxsee: 7.30 -> 7.31 --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index b3dbecb56b1b..9ee3b96a5bbf 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.30"; + version = "7.31"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "09gajwqc30r9a2sn972qdx3gx0gki9n0zafq986hn6zsr3z43mfs"; + sha256 = "0y60h66p8ydkinxk9x4sp4cm6gq66nc9jcavy135vmycsiq9gphn"; }; patches = [ From a1f689819274c4defbaf895793ead8d426a17898 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Wed, 1 Jul 2020 10:12:32 +0200 Subject: [PATCH 2987/3452] ceph: 14.2.9 -> 14.2.10 Add new dependency on rdkafka Also removed now-obsolete cve patch as it's integrated already --- pkgs/tools/filesystems/ceph/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 65cd19df0fa8..e553089917e2 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -11,6 +11,7 @@ , rocksdb, makeWrapper , leveldb, oathToolkit , libnl, libcap_ng +, rdkafka # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null @@ -93,7 +94,7 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "14.2.9"; + version = "14.2.10"; in rec { ceph = stdenv.mkDerivation { pname = "ceph"; @@ -101,17 +102,11 @@ in rec { src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "0zkh1a23v8g1fa5flqa2d53lv08ancab3li57gybpqpnja90k7il"; + sha256 = "0bbs3ag8zav283qpxrrndhvh2z01ykm6126fmwrbc1c5f9jfjq39"; }; patches = [ ./0000-fix-SPDK-build-env.patch - (fetchurl { - # Remove for Ceph > v15.2.3; https://www.openwall.com/lists/oss-security/2020/06/25/5 - name = "CVE-2020-10753.patch"; - url = "https://github.com/ceph/ceph/pull/35773/commits/1524d3c0c5cb11775313ea1e2bb36a93257947f2.patch"; - sha256 = "1c04kirijp4c8a5pgwqx17dzdnzvd29nl2nr3qdvf4fkqwnlf48s"; - }) ]; nativeBuildInputs = [ @@ -124,7 +119,7 @@ in rec { buildInputs = cryptoLibsMap.${cryptoStr} ++ [ boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit - snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng + snappy rocksdb lz4 oathToolkit leveldb libnl libcap_ng rdkafka ] ++ optionals stdenv.isLinux [ linuxHeaders utillinux libuuid udev keyutils optLibaio optLibxfs optZfs # ceph 14 From a8a49b4ad3ddc4775ee192e5057e92ae42ba7d91 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Jul 2020 04:20:00 -0500 Subject: [PATCH 2988/3452] heroku: 7.41.1 -> 7.42.2 --- pkgs/development/tools/heroku/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 23e0f5684574..5ef184090606 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.41.1"; + version = "7.42.2"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "12ilk0rkpwx8n9b7dird2jfmwnkqndlwjf5wgdcbl014mkl1411b"; + sha256 = "1fddqqn2nwvniignkq8d5jvh0217zb960s402h57l4wg3djq7phr"; }; nativeBuildInputs = [ makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://cli.heroku.com"; + homepage = "https://devcenter.heroku.com/articles/heroku-cli"; description = "Everything you need to get started using Heroku"; maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg marsam ]; license = lib.licenses.mit; From c323751a71e73cf202086792b3bf3272b7350bf8 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 1 Jul 2020 11:43:31 +0200 Subject: [PATCH 2989/3452] gitlab-runner: remove additional binaries (#91811) Only the gitlab-runner and the helper-images are required. All other binaries that were currently in the derivation were only for testing. --- .../tools/continuous-integration/gitlab-runner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index b788e70a4de2..c75d71f3a119 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -17,6 +17,7 @@ buildGoPackage rec { inherit version; pname = "gitlab-runner"; goPackagePath = "gitlab.com/gitlab-org/gitlab-runner"; + subPackages = [ "." ]; commonPackagePath = "${goPackagePath}/common"; buildFlagsArray = '' -ldflags= @@ -35,7 +36,6 @@ buildGoPackage rec { patches = [ ./fix-shell-path.patch ]; postInstall = '' - touch $out/bin/hello install -d $out/bin/helper-images ln -sf ${docker_x86_64} $out/bin/helper-images/prebuilt-x86_64.tar.xz ln -sf ${docker_arm} $out/bin/helper-images/prebuilt-arm.tar.xz From 480191df6f0c5a3b1c4662f3e8a9f71f1e8e2879 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Jul 2020 04:58:37 -0500 Subject: [PATCH 2990/3452] kbs2: init at 0.1.1 (#91911) --- pkgs/tools/security/kbs2/default.nix | 42 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/security/kbs2/default.nix diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix new file mode 100644 index 000000000000..354b28b9fa2f --- /dev/null +++ b/pkgs/tools/security/kbs2/default.nix @@ -0,0 +1,42 @@ +{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb, AppKit }: + +rustPlatform.buildRustPackage rec { + pname = "kbs2"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "woodruffw"; + repo = pname; + rev = "v${version}"; + sha256 = "0761g8cl9v7jj444vp83zq9f1shrddqq20pd41d5mbl6f8qpk4m5"; + }; + + cargoSha256 = "0vzjkw1g6saz4nwy823dpip02jg2f21rsd8kkpra206b8i6q0mfg"; + + nativeBuildInputs = [ installShellFiles ] + ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; + + buildInputs = [ ] + ++ stdenv.lib.optionals stdenv.isLinux [ libxcb ] + ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + checkFlagsArray = [ "--skip=kbs2::config::tests::test_find_config_dir" ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/kbs2 --completions $shell > kbs2.$shell + installShellCompletion kbs2.$shell + done + ''; + + meta = with stdenv.lib; { + description = "A secret manager backed by age"; + homepage = "https://github.com/woodruffw/kbs2"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0784416273d3..3501d51363f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4537,6 +4537,10 @@ in kbdd = callPackage ../applications/window-managers/kbdd { }; + kbs2 = callPackage ../tools/security/kbs2 { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; + kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { }; keepalived = callPackage ../tools/networking/keepalived { }; From 200cc565b929c4bc3fff6e8e596129abe907ab8d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Jul 2020 03:01:03 -0700 Subject: [PATCH 2991/3452] closurecompiler: 20200517 -> 20200614 (#91912) --- pkgs/development/compilers/closure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index b8b02cb9d68b..2ee1223a53b3 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20200517"; + version = "20200614"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "05bbsrxw2nxjlcfc22w1ympi66jnmzymivg29cvidh5n28jgwba2"; + sha256 = "0a54y2d9nfg60knfv34kf6sdsh065dzam86l3wprf8gvqffxxcli"; }; sourceRoot = "."; From 89421a2cbfc0a0a87a31bbda4b8fd08986bbae48 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Jul 2020 03:02:47 -0700 Subject: [PATCH 2992/3452] cherrytree: 0.39.3 -> 0.39.4 (#91907) --- pkgs/applications/misc/cherrytree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index d2ade055d6fd..c74ac5ffb306 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "cherrytree"; - version = "0.39.3"; + version = "0.39.4"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "1k9i7acpphx0if6ij2p9fkmj638ry6hcyr1rdr039a8zi8hq98gz"; + sha256 = "1wycgn1f3b858qb6kn2bsaabak8n52qkpd24w54xz6fjizlnw7x0"; }; From 81e040854e520e544ecc88bf3000bf4ffe407fb0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Jul 2020 03:03:28 -0700 Subject: [PATCH 2993/3452] asciidoctorj: 2.3.0 -> 2.3.1 (#91905) --- pkgs/tools/typesetting/asciidoctorj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix index ba46d36814ac..0d2e8004f557 100644 --- a/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "asciidoctorj"; - version = "2.3.0"; + version = "2.3.1"; src = fetchzip { url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; - sha256 = "1hmra1pg79hj9kqbj6702y5b03vyvfzqf6hq65jg1vxjqlq7h3xx"; + sha256 = "0gp45vwm0hl8590014qrxlpw2rycxm7ir819d242mh38v3hdjgkz"; }; nativeBuildInputs = [ makeWrapper ]; From 247a1b4851048c98768311d25ac906a34ebb426d Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Wed, 1 Jul 2020 12:30:23 +0200 Subject: [PATCH 2994/3452] mycli: 1.20.1 -> 1.21.1 --- pkgs/tools/admin/mycli/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index 42c790d1adaa..7a7022c91764 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -7,11 +7,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "mycli"; - version = "1.20.1"; + version = "1.21.1"; src = fetchPypi { inherit pname version; - sha256 = "0vhwaqkx4njarm0wy8zg2hvzr2yl92y8gnwipcn7p59sazw4whfl"; + sha256 = "1q9p0yik9cpvpxjs048anvhicfcna84mpl7axv9bwgr48w40lqwg"; }; propagatedBuildInputs = [ @@ -27,6 +27,12 @@ buildPythonApplication rec { py.test ''; + # TODO: remove with next release + postPatch = '' + substituteInPlace setup.py \ + --replace "prompt_toolkit>=2.0.6,<3.0.0" "prompt_toolkit" + ''; + meta = { inherit version; description = "Command-line interface for MySQL"; From 1351ed529dbbd563e34d65194ca31e491627fa62 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Jul 2020 03:47:57 -0700 Subject: [PATCH 2995/3452] abcm2ps: 8.14.7 -> 8.14.9 (#91897) --- pkgs/tools/audio/abcm2ps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 302654f77154..099ccc6f4cb8 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "abcm2ps"; - version = "8.14.7"; + version = "8.14.9"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0k12wf37vl31w2qpj3dsmv8c4ifrsg3qa30gqsx553jw7n0f3ma2"; + sha256 = "0h4qzj9k5ng09nbkfipvr82piq68c576akjwmhsqn05rvgirmhx7"; }; configureFlags = [ From 581660a4d39de56eae0fe5b6a4d3515359d4baa3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 24 Jun 2020 21:49:24 +0200 Subject: [PATCH 2996/3452] =?UTF-8?q?ocamlPackages.camlp5:=207.11=20?= =?UTF-8?q?=E2=86=92=207.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/camlp5/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 9a69f88c8043..7e7c185fbc7a 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { - name = "camlp5-7.11"; + name = "camlp5-7.12"; src = fetchzip { - url = "https://github.com/camlp5/camlp5/archive/rel711.tar.gz"; - sha256 = "1s1f9i0r0czxlbnsaz4kvs2ahknmqxcm5ypl75g7scjcbl0an2x4"; + url = "https://github.com/camlp5/camlp5/archive/rel712.tar.gz"; + sha256 = "12ix5g15bys932hyf9gs637iz76m0ji9075d83jfdmx85q30llgf"; }; buildInputs = [ ocaml ]; From 2c616aa63895f064ac1b1332a8cf9e7ae3ddbb44 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 27 Apr 2020 12:59:18 +0200 Subject: [PATCH 2997/3452] ocamlPackages.angstrom*: 0.13.0 -> 0.14.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.email_message: fix 0.12.0 version for angstrom 0.14 ocamlPackages.encore: 0.3 → 0.5 ocamlPackages.git{,-http,-unix}: 2.1.2 → 2.1.3 --- .../ocaml-modules/angstrom/default.nix | 4 +-- .../ocaml-modules/encore/default.nix | 18 ++++++++----- .../ocaml-modules/git-http/default.nix | 10 +++---- .../ocaml-modules/git-unix/default.nix | 12 ++++++--- .../development/ocaml-modules/git/default.nix | 27 ++++++++++++------- .../ocaml-modules/janestreet/default.nix | 1 + .../email-message-angstrom-0.14.patch | 22 +++++++++++++++ pkgs/top-level/ocaml-packages.nix | 8 ++++-- 8 files changed, 73 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index b05190ed4911..3aecfde8a7d6 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "angstrom"; - version = "0.13.0"; + version = "0.14.1"; minimumOCamlVersion = "4.04"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "0vzbwd8j34iv7n6gwqq2mf25q7rqpnpxnifb9ssxhq55p5dd1kp4"; + sha256 = "1l69y0qspgi7kgrphyh7718hjb2sml1a9lljkp65bkqmmmi6ybly"; }; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/encore/default.nix b/pkgs/development/ocaml-modules/encore/default.nix index ab91117ac082..dd05982c3cab 100644 --- a/pkgs/development/ocaml-modules/encore/default.nix +++ b/pkgs/development/ocaml-modules/encore/default.nix @@ -1,15 +1,21 @@ -{ lib, buildDunePackage, fetchurl, ocaml, alcotest, angstrom, ke }: +{ lib, buildDunePackage, fetchurl, ocaml +, fmt, bigstringaf, bigarray-compat +, bigarray-overlap, angstrom, ke, alcotest }: buildDunePackage rec { pname = "encore"; - version = "0.3"; + version = "0.5"; + src = fetchurl { url = "https://github.com/mirage/encore/releases/download/v${version}/encore-v${version}.tbz"; - sha256 = "05nv6yms5axsmq9cspr7884rz5kirj50izx3vdm89q4yl186qykl"; + sha256 = "15n0dla149k9h7migs76wap08z5402qcvxyqxzl887ha6isj3p9n"; }; - propagatedBuildInputs = [ angstrom ke ]; - checkInputs = lib.optional doCheck alcotest; - doCheck = lib.versions.majorMinor ocaml.version != "4.07"; + + useDune2 = true; + + propagatedBuildInputs = [ angstrom ke fmt bigstringaf bigarray-compat bigarray-overlap ]; + checkInputs = [ alcotest ]; + doCheck = true; meta = { homepage = "https://github.com/mirage/encore"; diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix index 89a1803b5202..3b127c650063 100644 --- a/pkgs/development/ocaml-modules/git-http/default.nix +++ b/pkgs/development/ocaml-modules/git-http/default.nix @@ -1,12 +1,12 @@ -{ buildDunePackage, git, cohttp-lwt, alcotest, mtime, nocrypto }: +{ buildDunePackage, git, cohttp, cohttp-lwt }: buildDunePackage { pname = "git-http"; - inherit (git) version src; + inherit (git) version src minimumOCamlVersion; - buildInputs = [ alcotest mtime nocrypto ]; - propagatedBuildInputs = [ git cohttp-lwt ]; - doCheck = true; + useDune2 = true; + + propagatedBuildInputs = [ git cohttp cohttp-lwt ]; meta = { description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml"; diff --git a/pkgs/development/ocaml-modules/git-unix/default.nix b/pkgs/development/ocaml-modules/git-unix/default.nix index 072d7fdb5cb9..0633b8af8f05 100644 --- a/pkgs/development/ocaml-modules/git-unix/default.nix +++ b/pkgs/development/ocaml-modules/git-unix/default.nix @@ -1,13 +1,17 @@ -{ buildDunePackage, git-http, cohttp-lwt-unix, tls, cmdliner, mtime }: +{ stdenv, buildDunePackage, git-http, cohttp, cohttp-lwt-unix +, mmap, cmdliner, mtime, alcotest, mirage-crypto-rng, tls +, io-page, git-binary +}: buildDunePackage { pname = "git-unix"; - inherit (git-http) version src; + inherit (git-http) version src minimumOCamlVersion; useDune2 = true; - buildInputs = [ cmdliner mtime ]; - propagatedBuildInputs = [ cohttp-lwt-unix git-http tls ]; + propagatedBuildInputs = [ mmap cmdliner git-http cohttp cohttp-lwt-unix mtime ]; + checkInputs = [ alcotest mirage-crypto-rng tls io-page git-binary ]; + doCheck = !stdenv.isAarch64; meta = { description = "Unix backend for the Git protocol(s)"; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 741e004979cf..d28e8ef2e7b4 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -1,23 +1,30 @@ -{ lib, fetchurl, buildDunePackage -, alcotest, git, mtime, nocrypto -, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt +{ stdenv, fetchurl, buildDunePackage +, alcotest, mtime, mirage-crypto-rng, tls, git-binary +, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum , fpath, hex, ke, logs, lru, ocaml_lwt, ocamlgraph, ocplib-endian, uri, rresult +, stdlib-shims }: buildDunePackage rec { - pname = "git"; - version = "2.1.2"; + pname = "git"; + version = "2.1.3"; + + minimumOCamlVersion = "4.07"; + useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - sha256 = "0yyclsh255k7pvc2fcsdi8k2fcrr0by2nz6g3sqnwlimjyp7mz5j"; + sha256 = "1ppllv65vrkfrmx46aiq5879isffcjmg92z9rv2kh92a83h4lqax"; }; - propagatedBuildInputs = [ angstrom astring cstruct decompress digestif encore duff fmt fpath hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult ]; - checkInputs = lib.optionals doCheck [ alcotest git mtime nocrypto ]; - doCheck = true; + propagatedBuildInputs = [ + angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath + hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult stdlib-shims + ]; + checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ]; + doCheck = !stdenv.isAarch64; - meta = { + meta = with stdenv; { description = "Git format and protocol in pure OCaml"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index ff93d65357a8..69f4e6f61d84 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -533,6 +533,7 @@ rec { pname = "email_message"; hash = "131jd72k4s8cdbgg6gyg7w5v8mphdlvdx4fgvh8d9a1m7kkvbxfg"; propagatedBuildInputs = [ async angstrom core_extended cryptokit magic-mime ounit ]; + patches = [ ./email-message-angstrom-0.14.patch ]; meta.description = "E-mail message parser"; }; diff --git a/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch b/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch new file mode 100644 index 000000000000..624a3e5334b2 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch @@ -0,0 +1,22 @@ +diff --git a/email_address/src/email_address.ml b/email_address/src/email_address.ml +index 7470273..d070465 100644 +--- a/email_address/src/email_address.ml ++++ b/email_address/src/email_address.ml +@@ -38,7 +38,7 @@ module Stable = struct + let of_string ?default_domain input_str = + let open Core_kernel in + let open! Int.Replace_polymorphic_compare in +- match Angstrom.parse_string Email_address_parser_stable_v1.email_only input_str with ++ match Angstrom.parse_string ~consume:Prefix Email_address_parser_stable_v1.email_only input_str with + | Error error -> + Or_error.error_s [%message + "Failed to parse email address" +@@ -104,7 +104,7 @@ module T = Stable.V1.With_comparator + include T + + let list_of_string ?default_domain input_str = +- match Angstrom.parse_string Email_address_parser_stable_v1.email_list_only input_str with ++ match Angstrom.parse_string ~consume:Prefix Email_address_parser_stable_v1.email_list_only input_str with + | Error error -> + Or_error.error_s [%message + "Failed to parse email address(es)" diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6708270f1bd9..bc7f1532f782 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -350,11 +350,15 @@ let gg = callPackage ../development/ocaml-modules/gg { }; - git = callPackage ../development/ocaml-modules/git { inherit (pkgs) git; }; + git = callPackage ../development/ocaml-modules/git { + git-binary = pkgs.git; + }; git-http = callPackage ../development/ocaml-modules/git-http { }; - git-unix = callPackage ../development/ocaml-modules/git-unix { }; + git-unix = callPackage ../development/ocaml-modules/git-unix { + git-binary = pkgs.git; + }; gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; From 2b88a4fd2930eeafa77b89302a21ec1e960a1f3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Mon, 29 Jun 2020 23:59:14 +0200 Subject: [PATCH 2998/3452] flightgear: 2019.1.1 -> 2020.1.2, simgear: 2020.1.{1 -> 2} --- pkgs/development/libraries/simgear/default.nix | 4 ++-- pkgs/games/flightgear/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index ab4fd2c7bf27..3a7c0b3c410b 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.1.1"; + version = "2020.1.3"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "1z52r28xg05q6hdlh4szzfjlpgkvbdyn2dpaji9b57y58ccrqsfh"; + sha256 = "1l8kiicm0klbx0b05994vqd8a8wj7k0djbbg41a6i3q5d17jrnk6"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index c16c33666f31..40157372b5e8 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -6,7 +6,7 @@ }: let - version = "2019.1.1"; + version = "2020.1.2"; shortVersion = builtins.substring 0 6 version; data = stdenv.mkDerivation rec { pname = "flightgear-base"; @@ -14,7 +14,7 @@ let src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; - sha256 = "14zm0hzshbca4ych72631hpc4pw2w24zib62ri3lwm8nz6j63qhf"; + sha256 = "0ldsjb54k8nb99h6n4f4x20nawd2pa0a8skkwkrgckdpmdv0zwyk"; }; phases = [ "installPhase" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "189wal08p9lrz757pmazxnf85sfymsqrm3nfvdad95pfp6bg7pyi"; + sha256 = "1770kgwa7z70sx6da9x1q9cszpd3ywz6nn8jrb6xv8ldjqcpqpvb"; }; # Of all the files in the source and data archives, there doesn't seem to be From 637fa6901fdacb8b4abbec416533b7d77dc45010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Wed, 1 Jul 2020 14:57:03 +0200 Subject: [PATCH 2999/3452] Rename flightgear-{base -> data} --- pkgs/games/flightgear/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 40157372b5e8..e32f2e96d4fa 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -9,7 +9,7 @@ let version = "2020.1.2"; shortVersion = builtins.substring 0 6 version; data = stdenv.mkDerivation rec { - pname = "flightgear-base"; + pname = "flightgear-data"; inherit version; src = fetchurl { From 896c5ef4bacb5594eddf12111faee97e695ea181 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 1 Jul 2020 14:25:04 +0200 Subject: [PATCH 3000/3452] cypress: 4.8.0 -> 4.9.0 --- pkgs/development/web/cypress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 3b38d86b45b4..abc07fc3e9f9 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "4.8.0"; + version = "4.9.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "0wivvh3fhyhxx9f6vp0kgqkjj4957hj0b15r2igbxnyqvahwxgx7"; + sha256 = "1lyhwy4rg6gdsj4590ya5v27lmyz6hnn4dhs51dq5i069rsw9qw4"; }; # don't remove runtime deps From 1e807cd25b1fa09e146510cc9458872f17427922 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Tue, 30 Jun 2020 14:55:02 -0400 Subject: [PATCH 3001/3452] haskellPackages: remove obsolete overrides lenz-template: -doJailbreak resolv: -dontCheck cassava: -doJailbreak language-ecmascript: -doJailbreak xmlhtml: -doJailbreak --- .../haskell-modules/configuration-common.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dd2051ef003c..8aceba9d65f9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -869,11 +869,8 @@ self: super: { ''; }); - # https://github.com/strake/lenz-template.hs/pull/2 - lenz-template = doJailbreak super.lenz-template; # https://github.com/haskell-hvr/resolv/pull/6 - resolv = dontCheck super.resolv; resolv_0_1_1_2 = dontCheck super.resolv_0_1_1_2; # spdx 0.2.2.0 needs older tasty @@ -898,9 +895,6 @@ self: super: { # Work around overspecified constraint on github ==0.18. github-backup = doJailbreak super.github-backup; - # Test suite depends on old QuickCheck 2.10.x. - cassava = dontCheck super.cassava; - # Test suite depends on cabal-install doctest = dontCheck super.doctest; @@ -945,9 +939,6 @@ self: super: { sha256 = "056rk58v9h114mjx62f41x971xn9p3nhsazcf9zrcyxh1ymrdm8j"; }); - # needed because of testing-feat >=0.4.0.2 && <1.1 - language-ecmascript = doJailbreak super.language-ecmascript; - # sexpr is old, broken and has no issue-tracker. Let's fix it the best we can. sexpr = appendPatch (overrideCabal super.sexpr (drv: { @@ -958,9 +949,6 @@ self: super: { # https://github.com/haskell/hoopl/issues/50 hoopl = dontCheck super.hoopl; - # https://github.com/snapframework/xmlhtml/pull/37 - xmlhtml = doJailbreak super.xmlhtml; - purescript = let purescriptWithOverrides = super.purescript.override { From 075e8aeecbaf6ac6efca96b7d5cfb0729b0b593a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 1 Jul 2020 11:50:15 +0200 Subject: [PATCH 3002/3452] dns-root-data: switch to new URL There's a redirect in place, so it doesn't really matter. --- pkgs/data/misc/dns-root-data/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix index ee08c07f5a66..aad1fe61c4bf 100644 --- a/pkgs/data/misc/dns-root-data/default.nix +++ b/pkgs/data/misc/dns-root-data/default.nix @@ -7,7 +7,7 @@ let # occasionally suffers from pointless hash changes, # and having stable sources for older versions has advantages, too. urls = map (prefix: prefix + "cc5e14a264912/etc/root.hints") [ - "https://gitlab.labs.nic.cz/knot/knot-resolver/raw/" + "https://gitlab.nic.cz/knot/knot-resolver/raw/" "https://raw.githubusercontent.com/CZ-NIC/knot-resolver/" ]; sha256 = "0vdrff4l8s8grif52dnh091s8qydhh88k25zqd9rj66sf1qwcwxl"; From ec5ef6bd2b0293506a3480b1b28171d4d10ff0fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 1 Jul 2020 16:15:20 +0200 Subject: [PATCH 3003/3452] knot-resolver: 5.1.1 -> 5.1.2 https://gitlab.nic.cz/knot/knot-resolver/-/tags/v5.1.2 I could highlight fixing the garbage collector on 32-bit systems. --- pkgs/servers/dns/knot-resolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index f596934a4298..3466fb776f00 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -16,11 +16,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "f72214046df8aae2b1a5c6d1ad0bc8b166aa060df5b008f6e88b4f6ba79cbf4e"; + sha256 = "caa4f941caf39080184554fb1310f383eba4b30d9c4c2215670d6b0a2de8f836"; }; outputs = [ "out" "dev" ]; From 5f21dfd306093a86f60698d1e49acdf25cce6dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Jul 2020 11:24:01 -0300 Subject: [PATCH 3004/3452] tint2: format with nixpkgs-fmt Also: - use pkg-config instead of pkgconfig - do not explicitly enable parallel building, as its automatically enabled for cmake projects --- pkgs/applications/misc/tint2/default.nix | 56 +++++++++++++++++++----- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index dc991402eec6..242a4e76c05a 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -1,7 +1,25 @@ -{ stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre -, glib, imlib2, gtk2, libXinerama, libXrender, libXcomposite, libXdamage -, libX11, libXrandr, librsvg, libpthreadstubs, libXdmcp -, libstartup_notification, wrapGAppsHook +{ stdenv +, fetchFromGitLab +, pkg-config +, cmake +, gettext +, cairo +, pango +, pcre +, glib +, imlib2 +, gtk2 +, libXinerama +, libXrender +, libXcomposite +, libXdamage +, libX11 +, libXrandr +, librsvg +, libpthreadstubs +, libXdmcp +, libstartup_notification +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -15,13 +33,31 @@ stdenv.mkDerivation rec { sha256 = "1937z0kixb6r82izj12jy4x8z4n96dfq1hx05vcsvsg1sx3wxgb0"; }; - enableParallelBuilding = true; + nativeBuildInputs = [ + pkg-config + cmake + gettext + wrapGAppsHook + ]; - nativeBuildInputs = [ pkgconfig cmake gettext wrapGAppsHook ]; - - buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender - libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs - libXdmcp libstartup_notification ]; + buildInputs = [ + cairo + pango + pcre + glib + imlib2 + gtk2 + libXinerama + libXrender + libXcomposite + libXdamage + libX11 + libXrandr + librsvg + libpthreadstubs + libXdmcp + libstartup_notification + ]; postPatch = '' for f in ./src/launcher/apps-common.c \ From 78898bfe90528c601b0f3b4bd658de68684da14d Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Tue, 30 Jun 2020 20:45:48 -0400 Subject: [PATCH 3005/3452] ghc810x: remove obsolete overrides (2/x) feed: -doJailbreak hashable: -doJailbreak parallel: -doJailbreak regex-base: -doJailbreak regex-compat: -doJailbreak --- .../development/haskell-modules/configuration-ghc-8.10.x.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 98e814b79d7d..d60c728708b7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -66,12 +66,7 @@ self: super: { ChasingBottoms = doJailbreak super.ChasingBottoms; ed25519 = doJailbreak super.ed25519; email-validate = doJailbreak super.email-validate; # https://github.com/Porges/email-validate-hs/issues/51 - feed = doJailbreak super.feed; # https://github.com/bergmark/feed/issues/48 - hashable = doJailbreak super.hashable; pandoc = doJailbreak super.pandoc; - parallel = doJailbreak super.parallel; - regex-base = doJailbreak super.regex-base; - regex-compat = doJailbreak super.regex-compat; regex-pcre-builtin = doJailbreak super.regex-pcre-builtin; regex-posix = doJailbreak super.regex-posix; regex-tdfa = doJailbreak super.regex-tdfa; From 5c021a4bbd813a98de960e2e804425f69f559a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 1 Jul 2020 11:41:44 -0300 Subject: [PATCH 3006/3452] tint2: fix doc directory Documentation files should not be installed directly at $out/share/doc because they may collide with files from other packages when paths are linked in the system environment. --- pkgs/applications/misc/tint2/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 242a4e76c05a..326dd3c0d92a 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -59,6 +59,10 @@ stdenv.mkDerivation rec { libstartup_notification ]; + cmakeFlags = [ + "-Ddocdir=share/doc/${pname}" + ]; + postPatch = '' for f in ./src/launcher/apps-common.c \ ./src/launcher/icon-theme-common.c From 5bb1198cccb1a161e982dce84e18678ccec65529 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 13:14:16 +0000 Subject: [PATCH 3007/3452] robin-map: 0.6.2 -> 0.6.3 --- pkgs/development/libraries/robin-map/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/development/libraries/robin-map/default.nix index 10b7510468ee..9c0774f925bc 100644 --- a/pkgs/development/libraries/robin-map/default.nix +++ b/pkgs/development/libraries/robin-map/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "robin-map"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "Tessil"; repo = pname; rev = "v${version}"; - sha256 = "0y532zg0aaqz3fpv785n2drwpnryaclr53drpqimnbf3cs0jw997"; + sha256 = "1li70vwsksva9c4yly90hjafgqfixi1g6d52qq9p6r60vqc4pkjj"; }; nativeBuildInputs = [ cmake ]; From ac690a78741eb84d024562c9d61206bc85e13e6e Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Tue, 30 Jun 2020 20:58:44 -0400 Subject: [PATCH 3008/3452] ghc810x: remove obsolete overrides (4/x) tasty-expected-failure: -doJailbreak tasty-rerun: -doJailbreak vector: -doJailbreak zlib: -doJailbreak aeson-diff: -doJailbreak --- .../development/haskell-modules/configuration-ghc-8.10.x.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 98e814b79d7d..3662ddc7617c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -78,11 +78,7 @@ self: super: { split = doJailbreak super.split; system-fileio = doJailbreak super.system-fileio; tar = doJailbreak super.tar; - tasty-expected-failure = doJailbreak super.tasty-expected-failure; - tasty-rerun = doJailbreak super.tasty-rerun; # https://github.com/ocharles/tasty-rerun/issues/18 unliftio-core = doJailbreak super.unliftio-core; - vector = doJailbreak super.vector; - zlib = doJailbreak super.zlib; # Use the latest version to fix the build. lens = self.lens_4_19_2; @@ -99,7 +95,6 @@ self: super: { ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = null; }; # Jailbreak to fix the build. - aeson-diff = doJailbreak super.aeson-diff; brick = doJailbreak super.brick; cabal-plan = doJailbreak super.cabal-plan; cborg = doJailbreak super.cborg; From 129b21a4264f07a2dc43112a67fa01f033029397 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Tue, 30 Jun 2020 21:51:43 -0400 Subject: [PATCH 3009/3452] ghc810x: remove obsolete overrides (5/x) cabal-plan: -doJailbreak cborg: -doJailbreak cborg-json: -doJailbreak relude: -dontCheck, -doJailbreak --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 98e814b79d7d..2f18c49bfdc5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -101,11 +101,7 @@ self: super: { # Jailbreak to fix the build. aeson-diff = doJailbreak super.aeson-diff; brick = doJailbreak super.brick; - cabal-plan = doJailbreak super.cabal-plan; - cborg = doJailbreak super.cborg; - cborg-json = doJailbreak super.cborg-json; exact-pi = doJailbreak super.exact-pi; - relude = dontCheck (doJailbreak super.relude); serialise = doJailbreak super.serialise; setlocale = doJailbreak super.setlocale; shellmet = doJailbreak super.shellmet; From c179ae6567dcaeb34453d12dd704a429fe0e71d4 Mon Sep 17 00:00:00 2001 From: Sami Bouhlel Date: Wed, 1 Jul 2020 16:54:22 +0100 Subject: [PATCH 3010/3452] Fix typos in documentation (#91934) --- doc/using/configuration.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/using/configuration.xml b/doc/using/configuration.xml index f19eddb58686..690bb3d34a12 100644 --- a/doc/using/configuration.xml +++ b/doc/using/configuration.xml @@ -85,19 +85,19 @@ Installing packages on unsupported systems - There are also two ways to try compiling a package which has been marked as unsuported for the given system. + There are also two ways to try compiling a package which has been marked as unsupported for the given system. - For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools: + For allowing the build of an unsupported package once, you can use an environment variable for a single invocation of the nix tools: $ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1 - For permanently allowing broken packages to be built, you may add allowUnsupportedSystem = true; to your user's configuration file, like this: + For permanently allowing unsupported packages to be built, you may add allowUnsupportedSystem = true; to your user's configuration file, like this: { allowUnsupportedSystem = true; From a1bea5278d40b55f821a9780bdc9c4a498faf72d Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Thu, 2 Jul 2020 00:58:50 +0900 Subject: [PATCH 3011/3452] luaPackages.readline: init at 2.6-0 (#91854) --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 17 +++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 17 +++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 8cc63963370d..c1eeed4afd5d 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -74,6 +74,7 @@ moonscript,,,,,arobyn nvim-client,,,,, penlight,,,,, rapidjson,,,,, +readline,,,,, say,,,,, std__debug,std._debug,,,, std_normalize,std.normalize,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 7eae27d85c6f..06d917b74c8f 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1407,6 +1407,23 @@ rapidjson = buildLuarocksPackage { license.fullName = "MIT"; }; }; +readline = buildLuarocksPackage { + pname = "readline"; + version = "2.6-0"; + + src = fetchurl { + url = mirror://luarocks/readline-2.6-0.src.rock; + sha256 = "1fvz7nqvkdazp30wn5n62n8i97qrfgznbykdpf8cnflqfpd1shms"; + }; + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua luaposix ]; + + meta = with stdenv.lib; { + homepage = "http://www.pjb.com.au/comp/lua/readline.html"; + description = "Interface to the readline library"; + license.fullName = "MIT/X11"; + }; +}; say = buildLuarocksPackage { pname = "say"; version = "1.3-1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 94edbd0737b7..26260872e18a 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -328,6 +328,23 @@ with super; ''; }); + readline = (super.readline.override ({ + unpackCmd = '' + unzip "$curSrc" + tar xf *.tar.gz + ''; + propagatedBuildInputs = super.readline.propagatedBuildInputs ++ [ pkgs.readline ]; + extraVariables = rec { + READLINE_INCDIR = "${pkgs.readline.dev}/include"; + HISTORY_INCDIR = READLINE_INCDIR; + }; + })).overrideAttrs (old: { + # Without this, source root is wrongly set to ./readline-2.6/doc + setSourceRoot = '' + sourceRoot=./readline-2.6 + ''; + }); + pulseaudio = super.pulseaudio.override({ buildInputs = [ pkgs.libpulseaudio From e68db19e676478c6f6c23540cf5691199cf2938c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Jul 2020 00:55:54 +0000 Subject: [PATCH 3012/3452] baobab: 3.34.0 -> 3.34.1 --- pkgs/desktops/gnome-3/core/baobab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index af39d3a3c053..dce14d6d1de9 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -4,13 +4,13 @@ let pname = "baobab"; - version = "3.34.0"; + version = "3.34.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "01w6m5ylyqs4wslpjn1hg6n6ynwh3rghksak0qs8r9m6dm3dkss6"; + sha256 = "1i90gc1cpw5507zn54k46hj4mjgdxsq8cvpnlgxq0ksy2d7iv63z"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook ]; From 8c2d5d8cceeb78bd76aefc66058e85a9f0407df2 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Wed, 1 Jul 2020 11:52:32 +0200 Subject: [PATCH 3013/3452] pythonPackages.pywebview: 3.2 -> 3.3.1 --- .../python-modules/pywebview/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index f12d943aad7c..545fb2367322 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -1,23 +1,32 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, importlib-resources, pytest, xvfb_run }: buildPythonPackage rec { pname = "pywebview"; - version = "3.2"; + version = "3.3.1"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "r0x0r"; repo = "pywebview"; rev = version; - sha256 = "0anwm6s0pp7xmgylr4m52v7lw825sdby7fajcl929l099n757gq7"; + sha256 = "015z7n0hdgkzn0p7aw1xsv6lwc260p8q67jx0zyd1zghnwyj8k79"; }; - # disabled due to error in loading unittest - # don't know how to make test from: None - doCheck = false; + propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ importlib-resources ]; + + checkInputs = [ pytest xvfb_run ]; + + checkPhase = '' + pushd tests + patchShebangs run.sh + xvfb-run -s '-screen 0 800x600x24' ./run.sh + popd + ''; meta = with lib; { homepage = "https://github.com/r0x0r/pywebview"; - description = "Lightweight cross-platform wrapper around a webview."; + description = "Lightweight cross-platform wrapper around a webview"; license = licenses.bsd3; maintainers = with maintainers; [ jojosch ]; }; From 9962a039b3525561eab348458e55d0a19555a827 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 22 Jun 2020 17:02:13 -0400 Subject: [PATCH 3014/3452] python3Packages.retworkx: 0.3.3 -> 0.3.4 Fix issue with hash lookup that failed on python3.8. --- .../python-modules/qiskit-terra/default.nix | 3 +++ .../python-modules/retworkx/default.nix | 23 +++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 78c28a282cb9..018838cad608 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -94,6 +94,9 @@ buildPythonPackage rec { "qiskit.transpiler.passes.routing.cython.stochastic_swap.swap_trial" ]; + disabledTests = [ + "test_random_clifford_valid" # random test, fails at least once when testing locally. + ]; pytestFlagsArray = [ "--ignore=test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency ]; diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix index 531edab27467..309f3532cfc9 100644 --- a/pkgs/development/python-modules/retworkx/default.nix +++ b/pkgs/development/python-modules/retworkx/default.nix @@ -2,27 +2,30 @@ , buildPythonPackage , pythonOlder , pythonAtLeast -, isPy37 -, isPy38 +, python , fetchFromGitHub , fetchPypi # Check inputs , pytestCheckHook }: - let - rx-version = "0.3.3"; - wheel-args = if isPy37 then - { python = "cp37"; sha256 = "1gbz7sh9i4h41xs9c40lixfdigmvfykkgxgzwsrs8v0smx20dczy"; } - else if isPy38 then - { python = "cp38"; sha256 = "09xxgp4ac4q6mfkj6lsqqfrzz1cb02vxy7wlv0bq3z2hd0jcanxk"; } - else throw "python version & hash not included. Override attribute `wheel-args` with version & hash at https://pypi.org/project/retworkx"; + rx-version = "0.3.4"; + + wheel-hashes = { + "3.7" = { python = "cp37"; sha256 = "1hfrdj8svkfdraa299gcj18a601l4zn646fkgq7m56brpagssf9l"; }; + "3.8" = { python = "cp38"; sha256 = "0jm10ywaqr0b456pcp01pb7035nawlndfi998jv8p1a2f5xwjgiq"; }; + }; + lookup = set: key: default: if (builtins.hasAttr key set) then (builtins.getAttr key set) else default; + wheel-args = lookup + wheel-hashes + python.pythonVersion + (throw "retworkx python version & hash not included. Override attribute `wheel-args` with version & hash at https://pypi.org/project/retworkx"); github-source = fetchFromGitHub { owner = "Qiskit"; repo = "retworkx"; rev = rx-version; - sha256 = "160w5vkzrl5rzcrdwhjq820i5lmc527m6hg0kxx0k6n2bz9qn26g"; + sha256 = "0cd3x64y49q9a3jrkiknlfkiccxkxgl624x5pqk7gm34s1lnzl8h"; }; in buildPythonPackage rec { From 50f9065e309c5c17cdefd3e4768a5f65abc054ff Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 22 Jun 2020 17:04:29 -0400 Subject: [PATCH 3015/3452] python3Packages.qiskit-terra: 0.14.1 -> 0.14.2 --- pkgs/development/python-modules/qiskit-terra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 018838cad608..c1c0dd928378 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.14.1"; + version = "0.14.2"; disabled = pythonOlder "3.5"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "0pd7x2jrqy7q1s38ychqw9bayjn2rvi6rq7c2c0kd160rwj1l2sc"; + sha256 = "0p5wapjvy81pnks100xbb23kbs2wyys9ykyc8z4968wl487lq4g5"; }; nativeBuildInputs = [ cython ]; From 1c8371b488d4182679f09705049b27a7a4abdc5e Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 22 Jun 2020 17:05:07 -0400 Subject: [PATCH 3016/3452] python3Packages.qiskit-aer: 0.5.1 -> 0.5.2 --- .../python-modules/qiskit-aer/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 7c74ddab2b16..3f0439efc7a8 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.5"; @@ -28,7 +28,7 @@ buildPythonPackage rec { repo = "qiskit-aer"; rev = version; fetchSubmodules = true; # fetch muparserx and other required libraries - sha256 = "0pbi8ldz8f1zm7pf2n5229g6kccriq21f24q9cb7bd4j5gdky5sk"; + sha256 = "0vw6b69h8pvzxhaz3k8sg9ac792gz3kklfv0izs6ra83y1dfwhjz"; }; nativeBuildInputs = [ @@ -48,14 +48,6 @@ buildPythonPackage rec { pybind11 ]; - patches = [ - (fetchpatch{ - name = "qiskit-aer-pr-727-fix-random-unitary-test.patch"; - url = "https://github.com/Qiskit/qiskit-aer/commit/09afb3b6b0710042ab65d88e863363f2c843dcb0.patch"; - sha256 = "0521b7i4fpc5brqs08w381g3c655f9cbn6my1740jnk7dv5lhsv9"; - }) - ]; - postPatch = '' # remove dependency on PyPi cmake package, which isn't in Nixpkgs substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'" "" @@ -85,6 +77,11 @@ buildPythonPackage rec { pytestCheckHook ]; dontUseSetuptoolsCheck = true; # Otherwise runs tests twice + disabledTests = [ + # broken with cvxpy >= 1.1.0, see https://github.com/Qiskit/qiskit-aer/issues/779. + # TODO: Remove once resolved, probably next qiskit-aer version + "test_clifford" + ]; preCheck = '' # Tests include a compiled "circuit" which is auto-built in $HOME From 0242e11c53c2f5aa619e88f22096de4280dc420f Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 22 Jun 2020 17:07:48 -0400 Subject: [PATCH 3017/3452] python3Packages.qiskit-ignis: 0.3.0 -> 0.3.3 --- pkgs/development/python-modules/qiskit-ignis/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index 79998a843257..bfd2bffbf470 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "qiskit-ignis"; - version = "0.3.0"; + version = "0.3.3"; disabled = pythonOlder "3.6"; @@ -25,14 +25,9 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-ignis"; rev = version; - sha256 = "16h04n9hxw669nq2ii16l6h75x8afisvp3j062n4c62kcqci0x4x"; + sha256 = "0sy9qpw0jqirsk9y61j5kr18jrw1wa812n7y98fjj6w668rrv560"; }; - # Fixed qiskit-ignis PR #385, figured this is easier than fetchpatch - postPatch = '' - substituteInPlace qiskit/ignis/logging/ignis_logging.py --replace "self.configure_logger" "self._configure_logger" - ''; - propagatedBuildInputs = [ numpy qiskit-terra From d4dd5249483c8b916b83633ab3fa8f224b86db6b Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 22 Jun 2020 17:08:29 -0400 Subject: [PATCH 3018/3452] python3Packages.qiskit-ibmq-provider: 0.7.0 -> 0.7.2 --- .../python-modules/qiskit-ibmq-provider/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 5f8f0d94e4ff..02cdb8397cb1 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.7.0"; + version = "0.7.2"; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "1n13jjx1cx5gswwk8rpxfjqyk97cwx1n2hwsabkcbi7fksw3c5jk"; + sha256 = "11h1ca4v11pajzn1cxqhim1hfziqzj27xzakwln13g8zmiqx3csp"; }; propagatedBuildInputs = [ @@ -57,7 +57,7 @@ buildPythonPackage rec { ]; # websockets seems to be pinned b/c in v8+ it drops py3.5 support. Not an issue here (usually py3.7+, and disabled for older py3.6) - prePatch = '' + postPatch = '' substituteInPlace requirements.txt --replace "websockets>=7,<8" "websockets" substituteInPlace setup.py --replace "websockets>=7,<8" "websockets" ''; From ed69f06e02da3177619432d6919699d237495e2b Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 22 Jun 2020 17:10:11 -0400 Subject: [PATCH 3019/3452] python3Packages.qiskit-aqua: 0.7.0 -> 0.7.3 --- .../python-modules/qiskit-aqua/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix index 8037d28f82cf..fe90ee63e001 100644 --- a/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub # , cplex -, cvxopt +, cvxpy , dlx , docplex , fastdtw @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "qiskit-aqua"; - version = "0.7.0"; + version = "0.7.3"; disabled = pythonOlder "3.5"; @@ -33,13 +33,13 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aqua"; rev = version; - sha256 = "0yykw6k1rb3f2ihcp0y9pb0695mcmy29nyqlj89qs4da0503vxvh"; + sha256 = "04zcnrc0vi6dfjahp1019h2ngdgi7l7jvfs9aw0y306nd9g6qgjc"; }; # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. propagatedBuildInputs = [ # cplex - cvxopt + cvxpy docplex dlx # Python Dancing Links package fastdtw @@ -81,7 +81,6 @@ buildPythonPackage rec { "You must install it yourself via pip or add it to your environment from the Nix User Repository." \ "', ImportWarning)\n" \ >> qiskit/optimization/__init__.py - ''; postInstall = "rm -rf $out/${python.sitePackages}/docs"; # Remove docs dir b/c it can cause conflicts. @@ -106,6 +105,9 @@ buildPythonPackage rec { # Disabled due to missing pyscf "test_validate" # test/chemistry/test_inputparser.py + "test_binary" # in SklearnSVM, seems to have trouble with eigenvectors converging + "test_pauli_expect_single" # fails for unknown reason, 3e-3 out of tolerance + # Disabling slow tests > 10 seconds "TestVQE" "TestVQC" @@ -127,9 +129,15 @@ buildPythonPackage rec { "test_shor_no_factors_1_5" "test_shor_no_factors_2_7" "test_evolve_2___suzuki___1__3_" - "test_delta_4" + "test_delta" "test_swaprz" "test_deprecated_algo_result" + "test_unsorted_grouping" + "test_ad_hoc_data" + "test_nft" + "test_oh" + "test_confidence_intervals_00001" + "test_eoh" ]; meta = with lib; { From 265e567557b520186e141ead12ea6ef77f29c6cf Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 22 Jun 2020 17:14:04 -0400 Subject: [PATCH 3020/3452] python3Packages.qiskit: 0.19.1 -> 0.19.6 --- pkgs/development/python-modules/qiskit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index ded9c68e6fe5..81468da30fbe 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.19.1"; + version = "0.19.6"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; rev = version; - sha256 = "0p1sahgf6qgbkvxb067mnyj6ya8nv7y57yyiiaadhjw242sjkjy5"; + sha256 = "0liby6ffgrla6wr4k742qkg8m80im372p6hmr4gkz47nmc76zy1i"; }; propagatedBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; # following doesn't work b/c they are distributed across different nix sitePackages dirs. Tested with pytest though. - # pythonImportsCheck = [ "qiskit" "qiskit.terra" "qiskit.ignis" "qiskit.aer" "qiskit.aqua" ]; + pythonImportsCheck = [ "qiskit" "qiskit.circuit" "qiskit.ignis" "qiskit.providers.aer" "qiskit.aqua" ]; meta = { description = "Software for developing quantum computing programs"; From 20237cc9e5e274ea246e197f3a1bc6b6ae315a29 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 1 Jul 2020 12:25:38 -0400 Subject: [PATCH 3021/3452] python3Packages.tinycss2: unbreak Newly breaking due to changes in pytest-flake8, resolved with upstream patch. Took the opportunity to clean up the package a little bit too, remove unnecessary patch. --- .../python-modules/tinycss2/default.nix | 24 ++++++++++++++++--- .../remove-redundant-dependency.patch | 12 ---------- 2 files changed, 21 insertions(+), 15 deletions(-) delete mode 100644 pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 2d8581cfb907..6f4eb927f3ad 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -1,6 +1,16 @@ -{ lib, buildPythonPackage, pythonOlder, fetchPypi +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, fetchpatch , webencodings -, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: +# Check inputs +, pytest +, pytestrunner +, pytestcov +, pytest-flake8 +, pytest-isort +}: buildPythonPackage rec { pname = "tinycss2"; @@ -12,7 +22,15 @@ buildPythonPackage rec { sha256 = "1kw84y09lggji4krkc58jyhsfj31w8npwhznr7lf19d0zbix09v4"; }; - patches = [ ./remove-redundant-dependency.patch ]; + patches = [ + ( + fetchpatch { + name = "tinycss2-fix-pytest-flake8-fail.patch"; + url = "https://github.com/Kozea/tinycss2/commit/6556604fb98c2153412384d6f0f705db2da1aa60.patch"; + sha256 = "1srvdzg1bak65fawd611rlskcgn5abmwmyjnk8qrrrasr554bc59"; + } + ) + ]; propagatedBuildInputs = [ webencodings ]; diff --git a/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch b/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch deleted file mode 100644 index 27ec511c55f6..000000000000 --- a/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index b3b3c2d..480f3e6 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -33,7 +33,6 @@ project_urls = - - [options] - packages = find: --setup_requires = pytest-runner - install_requires = - setuptools >= 39.2.0 - webencodings >= 0.4 From 8fb624ceffaa71a002619dd2c7786c786db2912e Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 1 Jul 2020 12:31:53 -0400 Subject: [PATCH 3022/3452] python3Packages.cssselect2: unbreak Imports were out of date. v0.3.0 no longer supports python2. --- .../python-modules/cssselect2/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index 3aa8ab622400..b1969022d962 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -1,8 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, tinycss2, pytest, pytestrunner }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, tinycss2 +, pytest +, pytestrunner +}: buildPythonPackage rec { pname = "cssselect2"; version = "0.3.0"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; @@ -11,12 +19,10 @@ buildPythonPackage rec { # We're not interested in code quality tests postPatch = '' - substituteInPlace setup.py \ + substituteInPlace setup.cfg \ --replace "pytest-cov" "" \ --replace "pytest-flake8" "" \ - --replace "pytest-isort" "" - substituteInPlace setup.cfg \ - --replace "--cov=cssselect2" "" \ + --replace "pytest-isort" "" \ --replace "--flake8" "" \ --replace "--isort" "" ''; From 08df77da32b8adb91f45cbf0dd978fb9d46feaa7 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 1 Jul 2020 12:39:25 -0400 Subject: [PATCH 3023/3452] python3Packages.qasm2image: mark broken Reasons: Last update was Oct 2018 (no activity on GitHub since), failed tests don't error out the build (i.e. failed build can still succeed), and this package has not been kept updated to reflect the changing python3Packages.qiskit API. --- pkgs/development/python-modules/qasm2image/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix index 9748e3e43483..962ba62f509c 100644 --- a/pkgs/development/python-modules/qasm2image/default.nix +++ b/pkgs/development/python-modules/qasm2image/default.nix @@ -48,5 +48,6 @@ buildPythonPackage { maintainers = with lib.maintainers; [ pandaman ]; + broken = true; # last update Oct 2018, failed tests don't error the build, and out-of-date with latest python3Packages.qiskit }; } From f2df7ccaab738960bf9982ed7a1b6a09357a50b7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Sep 2019 19:51:43 -0700 Subject: [PATCH 3024/3452] persepolis: 3.1.0 -> 3.2.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/persepolis/versions --- pkgs/tools/networking/persepolis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index a9bd2739a8ab..26126e090da9 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -13,16 +13,16 @@ buildPythonApplication rec { pname = "persepolis"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "persepolisdm"; repo = "persepolis"; rev = version; - sha256 = "0xngk8wgj5k27mh3bcrf2wwzqr8a3g0d4pc5i5vcavnnaj03j44m"; + sha256 = "1rh7q432ynbysapsd075nif975ync71icpb71x2mb4j8jx1vzs45"; }; - # see: https://github.com/persepolisdm/persepolis/blob/3.1.0/setup.py#L130 + # see: https://github.com/persepolisdm/persepolis/blob/3.2.0/setup.py#L130 doCheck = false; preBuild='' From 35f530f9e8519984cb2629f8b9e71a1379faf82f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 1 Jul 2020 10:58:36 -0700 Subject: [PATCH 3025/3452] persepolis: fix qt wrapping --- pkgs/tools/networking/persepolis/default.nix | 12 ++++++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index 26126e090da9..ecceed216607 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -8,6 +8,7 @@ , setproctitle , setuptools , sound-theme-freedesktop +, wrapQtAppsHook , youtube-dl }: @@ -37,10 +38,17 @@ buildPythonApplication rec { postInstall = '' mkdir -p $out/share/applications cp $src/xdg/com.github.persepolisdm.persepolis.desktop $out/share/applications - wrapProgram $out/bin/persepolis --prefix PATH : "${lib.makeBinPath [aria libnotify ]}" ''; - buildInputs = [ makeWrapper ]; + # prevent double wrapping + dontWrapQtApps = true; + nativeBuildInputs = [ wrapQtAppsHook ]; + + # feed args to wrapPythonApp + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [aria libnotify ]}" + ''''${qtWrapperArgs[@]}'' + ]; propagatedBuildInputs = [ pulseaudio diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3501d51363f9..ced7d0cfbcd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2150,7 +2150,9 @@ in pbzx = callPackage ../tools/compression/pbzx { }; - persepolis = python3Packages.callPackage ../tools/networking/persepolis { }; + persepolis = python3Packages.callPackage ../tools/networking/persepolis { + wrapQtAppsHook = qt5.wrapQtAppsHook; + }; pev = callPackage ../development/tools/analysis/pev { }; From 85c56369387195837078c3d6c47b7d2ad2c83fd1 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sat, 20 Jun 2020 17:50:43 -0700 Subject: [PATCH 3026/3452] pythonPackages.html-sanitizer init at 1.9.1 --- .../python-modules/html-sanitizer/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/html-sanitizer/default.nix diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix new file mode 100644 index 000000000000..17783f38d1f1 --- /dev/null +++ b/pkgs/development/python-modules/html-sanitizer/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchFromGitHub, lxml, beautifulsoup4, pytest, pytestrunner }: + +buildPythonPackage rec { + pname = "html-sanitizer"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "matthiask"; + repo = pname; + rev = version; + sha256 = "0nnv34924r0yn01rwlk749j5ijy7yxyj302s1i57yjrkqr3zlvas"; + }; + + propagatedBuildInputs = [ lxml beautifulsoup4 ]; + + meta = with lib; { + description = "An allowlist-based and very opinionated HTML sanitizer that can be used both for untrusted and trusted sources."; + homepage = "https://github.com/matthiask/html-sanitizer"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c4275911678..dc40a0668a7c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4153,6 +4153,8 @@ in { htmllaundry = callPackage ../development/python-modules/htmllaundry { }; + html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; + html5lib = callPackage ../development/python-modules/html5lib { }; httmock = callPackage ../development/python-modules/httmock { }; From 55668eb671b915b49bcaaeec4518cc49d8de0a99 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 1 Jul 2020 20:06:23 +0200 Subject: [PATCH 3027/3452] inxi: 3.1.03-1 -> 3.1.04-1 --- pkgs/tools/system/inxi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index bb3ba6ec3713..8842c97902e9 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.1.03-1"; + version = "3.1.04-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "0539hvlq021wxhbwzdp7qliiq1jgw60mxlwrwx0z2x8qi1zqdzg6"; + sha256 = "1mirnrrqfjyl2r7fwnpjlk37i5hf8f7lxv2yxcbdfjf2b3dfbpvl"; }; buildInputs = [ perl makeWrapper ]; From 6450f9e162c915fa762e4dc557b65f0c4741be4e Mon Sep 17 00:00:00 2001 From: devhell Date: Wed, 1 Jul 2020 19:27:05 +0100 Subject: [PATCH 3028/3452] teams: 1.3.00.5152 -> 1.3.00.16851 Microsoft finally released a new version for Linux. --- .../networking/instant-messengers/teams/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 6b5acd8344a8..e3b664e5fc23 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "teams"; - version = "1.3.00.5153"; + version = "1.3.00.16851"; src = fetchurl { url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; - sha256 = "13c7fmij0gcg6mrjjj2mhs21q7fzdssscwhihzyrmbmj64cd0a69"; + sha256 = "1mp4xq224nwv2ckb5zd7iv3yvkg3gv6mk9dvx3f60jgain7qr0r3"; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ]; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { # Includes runtimeDependencies in the RPATH of the included Node modules # so that dynamic loading works. We cannot use directly runtimeDependencies - # here, since the libraries from runtimeDependencies are not propagated + # here, since the libraries from runtimeDependencies are not propagated # to the dynamically loadable node modules because of a condition in - # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) + # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) # instead of EXEC or INTERP it expects. # Fixes: https://github.com/NixOS/nixpkgs/issues/85449 postFixup = '' From e002920d8c9875f21e69e97960f897ac00fdf318 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 1 Jul 2020 20:58:30 +0200 Subject: [PATCH 3029/3452] libwebsockets: fix clang build --- pkgs/development/libraries/libwebsockets/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index ddafc9bc6594..ff6fdeb53838 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -17,7 +17,7 @@ let nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; meta = with stdenv.lib; { description = "Light, portable C library for websockets"; From 3ddf576767cdda9dca9eade2c0ebac6ad2995dd6 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sat, 20 Jun 2020 17:51:11 -0700 Subject: [PATCH 3030/3452] pythonPackages.tinycss2: remove failing lint test --- pkgs/development/python-modules/tinycss2/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 6f4eb927f3ad..7504df7a4de0 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -35,6 +35,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ webencodings ]; checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; + preCheck = '' + # this fails a flake lint-type check, so just remove it + rm tinycss2/css-parsing-tests/make_color3_hsl.py + ''; meta = with lib; { description = "Low-level CSS parser for Python"; From ea5a79c4a33a154fd18bcd42be3a88928f0c37b2 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 1 Jul 2020 15:09:04 -0400 Subject: [PATCH 3031/3452] conan: enable pythonPackages.six > 1.14.0 --- pkgs/development/tools/build-managers/conan/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index d7aec3527b3b..9ad9ac74fb28 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -91,7 +91,8 @@ in newPython.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace conans/requirements.txt \ --replace "PyYAML>=3.11, <3.14.0" "PyYAML" \ - --replace "deprecation>=2.0, <2.1" "deprecation" + --replace "deprecation>=2.0, <2.1" "deprecation" \ + --replace "six>=1.10.0,<=1.14.0" "six" ''; meta = with lib; { From 2396eb646d75875722a939688ba808a495893e20 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 1 Jul 2020 15:11:14 -0400 Subject: [PATCH 3032/3452] conan: 1.25.0 -> 1.27.0 Switch to fetching source from GitHub vs PyPi, which will enable running packaging tests in the future. --- .../tools/build-managers/conan/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 9ad9ac74fb28..e09277e498d2 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, git, pkgconfig }: +{ lib, python3, fetchFromGitHub, git, pkgconfig }: # Note: # Conan has specific dependency demands; check @@ -39,12 +39,14 @@ let newPython = python3.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.25.0"; + version = "1.27.0"; pname = "conan"; - src = newPython.pkgs.fetchPypi { - inherit pname version; - sha256 = "1wgmx6s4h5m6zixb3wlaicy56rsqcy2srzmvii80xdx9g5wvi9pv"; + src = fetchFromGitHub { + owner = "conan-io"; + repo = "conan"; + rev = version; + sha256 = "0ncqs1p4g23fmzgdmwppgxr8w275h38hgjdzs456cgivz8xs9rjl"; }; propagatedBuildInputs = with newPython.pkgs; [ @@ -75,17 +77,13 @@ in newPython.pkgs.buildPythonApplication rec { ] ++ (with newPython.pkgs; [ codecov mock - pytest - node-semver nose parameterized webtest ]); - # Conan 1.14.0 has removed all tests from the Pypi source dist: - # https://github.com/conan-io/conan/pull/4713 - # We have recommended they be added back: - # https://github.com/conan-io/conan/issues/4563#issuecomment-602225083 + # TODO: reenable tests now that we fetch tests w/ the source from GitHub. + # Not enabled right now due to time constraints/failing tests that I didn't have time to track down doCheck = false; postPatch = '' From c0122d335b9a596a1617aee276a0e492bcd8517a Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 1 Jul 2020 19:11:00 +0100 Subject: [PATCH 3033/3452] nixos/openldap: add option for configuring OpenLDAP package to use In certain cases, for example when custom OpenLDAP modules are compiled into the binary, users may want to override the package used for OpenLDAP. This is especially common in setups where LDAP is the primary authentication source, as good password hashing mechanisms need to be enabled as extra modules. --- nixos/modules/services/databases/openldap.nix | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 9b4d9a98b745..7472538b887e 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -5,14 +5,14 @@ with lib; let cfg = config.services.openldap; - openldap = pkgs.openldap; + openldap = cfg.package; dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents; configFile = pkgs.writeText "slapd.conf" ((optionalString cfg.defaultSchemas '' - include ${pkgs.openldap.out}/etc/schema/core.schema - include ${pkgs.openldap.out}/etc/schema/cosine.schema - include ${pkgs.openldap.out}/etc/schema/inetorgperson.schema - include ${pkgs.openldap.out}/etc/schema/nis.schema + include ${openldap.out}/etc/schema/core.schema + include ${openldap.out}/etc/schema/cosine.schema + include ${openldap.out}/etc/schema/inetorgperson.schema + include ${openldap.out}/etc/schema/nis.schema '') + '' ${cfg.extraConfig} database ${cfg.database} @@ -46,6 +46,18 @@ in "; }; + package = mkOption { + type = types.package; + default = pkgs.openldap; + description = '' + OpenLDAP package to use. + + This can be used to, for example, set an OpenLDAP package + with custom overrides to enable modules or other + functionality. + ''; + }; + user = mkOption { type = types.str; default = "openldap"; @@ -152,10 +164,10 @@ in "; example = literalExample '' ''' - include ${pkgs.openldap.out}/etc/schema/core.schema - include ${pkgs.openldap.out}/etc/schema/cosine.schema - include ${pkgs.openldap.out}/etc/schema/inetorgperson.schema - include ${pkgs.openldap.out}/etc/schema/nis.schema + include ${openldap.out}/etc/schema/core.schema + include ${openldap.out}/etc/schema/cosine.schema + include ${openldap.out}/etc/schema/inetorgperson.schema + include ${openldap.out}/etc/schema/nis.schema database bdb suffix dc=example,dc=org From 22fd414ffc4e82bd20ba5080f8d8ae12e88abb70 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 1 Jul 2020 16:26:12 -0400 Subject: [PATCH 3034/3452] linux: 4.14.186 -> 4.14.187 --- 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 fccbd29777e8..8970f51203a0 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.186"; + version = "4.14.187"; # 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 = "0q52fmkiqa9hpdkf0wlpcqnc6wqssqz6cgfk1ix1anq0h5hl4ns4"; + sha256 = "1gal2kfyrq8c4dswlwnwmzc3ap6a7cjkyz8jgsm9d8gfx9sk88jv"; }; } // (args.argsOverride or {})) From 80558c5924d9f639e8b3f1a7c18d82707e7fe62b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 1 Jul 2020 16:26:38 -0400 Subject: [PATCH 3035/3452] linux: 4.19.130 -> 4.19.131 --- 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 ba2a293d1b50..fef01ec0868a 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.130"; + version = "4.19.131"; # 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 = "03zhsizj53ngwxn7d4mzix9xbxxd5lhbzrvawvbb91f83pkc14m6"; + sha256 = "1fk4i7lkbblfbxyp8rmkihcax920hbbygk2xnq2038sbrkvbkpqr"; }; } // (args.argsOverride or {})) From 1363090d3cddeacfb47f583753e3eb8b0ee2d4d8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 1 Jul 2020 16:26:53 -0400 Subject: [PATCH 3036/3452] linux: 4.4.228 -> 4.4.229 --- 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 59c86a5e1415..ec60490c56bf 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.228"; + version = "4.4.229"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0y1xc5lk8j3p5maarksmh18wy921rgcngzsih7q1a82rah1fsjxr"; + sha256 = "0crrawivri5i0ks7pg3snfjlxily4aimw5xzbzr5nlnsz0rjwhbq"; }; } // (args.argsOverride or {})) From 28c9ea7f2ef584335492c04e5b2250f2c1f06ffb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 1 Jul 2020 16:27:15 -0400 Subject: [PATCH 3037/3452] linux: 4.9.228 -> 4.9.229 --- 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 9afd8686c193..f1e927f3cf06 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.228"; + version = "4.9.229"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0d7w2zzs79ywxzfrh4bmk5lw318qbkcb8mcsyyh3cc25qqlz9gwg"; + sha256 = "1p0g6zya8bdk2fds37x3fg7c5sk3sc18prq3jrrilnnrby1w4mij"; }; } // (args.argsOverride or {})) From 69bd11221114aa0a893e10675e0ff3ecf1c3731b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 1 Jul 2020 16:27:41 -0400 Subject: [PATCH 3038/3452] linux: 5.4.49 -> 5.4.50 --- 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 a20f401b80d6..2ce82c45c4fd 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.49"; + version = "5.4.50"; # 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 = "0g2psjf2q10mfc3vv6brjn6s2nkg73ll1s04gpshw907d9irpn2m"; + sha256 = "1qm6m3ww7cxr0mqzma9swq6jax6anjy5vdh397my7x00x70z845d"; }; } // (args.argsOverride or {})) From 6c024d5814db46d303d7a3a261dc4fadf530f262 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 1 Jul 2020 16:28:16 -0400 Subject: [PATCH 3039/3452] linux: 5.7.6 -> 5.7.7 --- 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 e06a193be4cb..82243169b7d6 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.6"; + version = "5.7.7"; # 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 = "1rhhys2fvfrfsc6lk0qkq59p83qhwvns4jhk0jlyylyzqqywkm4z"; + sha256 = "0zzff78fjn0a87lr1j11hx97gcpbf0q5qn0nalb3qd43j9kvjh7q"; }; } // (args.argsOverride or {})) From a59fad3e35e70927ecc7af22cbf6d899c603a64c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 1 Jul 2020 16:36:28 -0400 Subject: [PATCH 3040/3452] zoom-us: 5.1.412382.0614 -> 5.1.418436.0628 --- .../networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index e82fbc7bebce..6b00ebc3444a 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.1.412382.0614"; + version = "5.1.418436.0628"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "07xb3v5i08wq0a3my9id91gizsxj5ppqvxmcbdy04j7yn4i1jm9x"; + sha256 = "0qgjsc6880i5zn4ck57haidcq40w37sjpdrix4gf09986qcc8gmm"; }; }; From d540649847ce06cb61e1382315dd56433b6ee45a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 1 Jul 2020 16:36:46 -0400 Subject: [PATCH 3041/3452] oh-my-zsh: 2020-06-28 -> 2020-07-01 --- 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 169dd1456f30..31e0275d96a3 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-28"; + version = "2020-07-01"; pname = "oh-my-zsh"; - rev = "97cf0bf4bd7655767e9e5ea27ddb6fbe550a305d"; + rev = "62648d71bb05116287206d83181f9daa5a59ba67"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1hynii1nvchnlgyiy0phyz5gd83xcbjdj82ddd2dyl1ci1yvpvqb"; + sha256 = "0pj73hvjzmp9x1b4b3zi9mlihzb9g04kfz230hmwz3kxpymw879q"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From cda852a528824f8169eb8a48e9f44dc3a3637ab3 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Wed, 1 Jul 2020 11:49:35 +0200 Subject: [PATCH 3042/3452] bazel: 3.3.0 -> 3.3.1 --- pkgs/applications/virtualization/gvisor/default.nix | 2 +- .../development/python-modules/dm-sonnet/default.nix | 2 +- .../tensorflow-probability/default.nix | 2 +- pkgs/development/tools/bazel-watcher/default.nix | 2 +- .../build-managers/bazel/bazel-remote/default.nix | 2 +- .../tools/build-managers/bazel/bazel_3/default.nix | 6 +++--- .../tools/build-managers/bazel/bazel_3/src-deps.json | 12 ++++++------ 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 7d3b80212292..576f2d9e6f23 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 = "0mkgbw08f6kgklvjmlfpyld35q7dvxm9pvrhaf7m7nx69sich6jq"; + sha256 = "0myffqywbvqhax995z55jymwnwyxmp13r27kpbc7wb5fk9s4skvr"; }; buildAttrs = { diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index 1f9c61e4ed40..627f8eedaeb1 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 = "1gag2xghik68zblhwbdd206hs8nxp2sclw182x2qi78jqgfnq5ci"; + sha256 = "1dka5nap3d28n18pn3wp5xsi4x3z02h1j8rcjdvi3y6dbqjwdw0v"; }; bazelFlags = [ diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 9466b85a6a4a..763679190592 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 = "1bh6lsi0732fzhrfs6p33qg2qfvq73r6qmijbpnv592aq8yiy1h5"; + sha256 = "1qw7vkwnxy45z4vm94isq5m96xiz35sigag7vjg1xb2sklbymxh8"; }; buildAttrs = { diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 1d86b80a50bd..fae1310bd589 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 = "17vdqs3dpaqc4llmzh4rd8mkm19q192w5gp90jlry3dpwj6b4kdf"; + sha256 = "0rfdwss8aahydiybwhi3j0qw12j1l91k9lbn1vaip0bmnq5qfwh9"; }; 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 5a8094af48af..9910256afc0a 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 = "04wbimzjxxmm8kh57q11zvyardb6ilyffc4nkdp6mb87p1l8fmww"; + sha256 = "1m7fmb03lirffxx04ck73bn5zwaji7zdwhlqq8s1c6pgp755d3vi"; }; 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 85492033e391..c867ed7a85d1 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.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "09p8xv8ni4g4wcyaapxsx8gjc3x3l3c6lxn575c7gm89vrh3k805"; + sha256 = "0ir796kl8r9hpr3li26qsdy1z2lx2bv82zmk4a2s7q64clyg9wg0"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -53,7 +53,7 @@ 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.17.0.tar.gz" + srcs."android_tools_pkg-0.19.0rc1.tar.gz" srcs."bazel-toolchains-3.1.0.tar.gz" srcs.rules_pkg srcs.rules_cc 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 49269bbde5bc..4007a77b0652 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 @@ -65,14 +65,14 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "8d0bf8ab83c9e38ec6ed5ce7bf425dbdc6469cec9e078559d4e8da42b705410f", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.17.0.tar.gz" + "sha256": "761e997a9055fe5e2b70aba8d64e78d4c2113feafaa8ac81909cb63e403f3087", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc1.tar.gz" }, - "android_tools_pkg-0.17.0.tar.gz": { - "name": "android_tools_pkg-0.17.0.tar.gz", - "sha256": "8d0bf8ab83c9e38ec6ed5ce7bf425dbdc6469cec9e078559d4e8da42b705410f", + "android_tools_pkg-0.19.0rc1.tar.gz": { + "name": "android_tools_pkg-0.19.0rc1.tar.gz", + "sha256": "761e997a9055fe5e2b70aba8d64e78d4c2113feafaa8ac81909cb63e403f3087", "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.17.0.tar.gz" + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc1.tar.gz" ] }, "bazel-toolchains-3.1.0.tar.gz": { From 18094dbdc215319cc015a5e4478607da7dae7e82 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 30 Jun 2020 08:27:40 +0200 Subject: [PATCH 3043/3452] =?UTF-8?q?frama-c:=2021.0=20(Scandium)=20?= =?UTF-8?q?=E2=86=92=2021.1=20(Scandium)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/analysis/frama-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index f8e5cf8b9967..179a74c56d50 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -23,12 +23,12 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "21.0"; + version = "21.1"; slang = "Scandium"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - sha256 = "0xqkyrvkr31r6443zgf4f749a1mf2360v8f0km071a1za767yvf5"; + sha256 = "0qq0d08dzr0dmdjysiimdqmwlzgnn932vp5kf8lfn3nl45ai09dy"; }; preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; From ae16459305068291997368743853410cce56d276 Mon Sep 17 00:00:00 2001 From: Federico Rampazzo Date: Wed, 1 Jul 2020 23:26:18 +0100 Subject: [PATCH 3044/3452] PerconaToolkit: use shortenPerlShebang (#91921) --- pkgs/development/perl-modules/Percona-Toolkit/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix index 58ccd2bc8be2..85feee36b508 100644 --- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix +++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPerlPackage, DBDmysql, DBI, IOSocketSSL, TermReadKey }: +{ lib, fetchFromGitHub, buildPerlPackage, DBDmysql, DBI, IOSocketSSL, TermReadKey, shortenPerlShebang }: buildPerlPackage { pname = "Percona-Toolkit"; @@ -10,7 +10,11 @@ buildPerlPackage { sha256 = "0xk4h4dzl80kf97lbx0nznx9ajrb6kkg7k3iwca3rj6f3rqggv9y"; }; outputs = [ "out" ]; + nativeBuildInputs = [ shortenPerlShebang ]; buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey ]; + postInstall = '' + shortenPerlShebang $(grep -l "/bin/env perl" $out/bin/*) + ''; meta = { description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.''; homepage = "http://www.percona.com/software/percona-toolkit"; From daf8824df97d9b24c1201a3be1615210afc26094 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Jul 2020 02:30:31 +0200 Subject: [PATCH 3045/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-7-g30d5c33 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/9c9208cdf38e01bbf01c5ee250e2e53453d3a362. --- .../haskell-modules/hackage-packages.nix | 267 ++++++++++++++++-- 1 file changed, 248 insertions(+), 19 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 565e5db9684d..ab0526edd961 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -36333,8 +36333,8 @@ self: { }: mkDerivation { pname = "backprop"; - version = "0.2.6.3"; - sha256 = "0zk3k20c100iwqcvg1xw2vdysn01w4h9jypz08xs849n1a3bp7di"; + version = "0.2.6.4"; + sha256 = "0wc71r6l5qgkspl5v76f1d75xwir9jp5kzdl83rq5sviggd458v9"; libraryHaskellDepends = [ base containers deepseq microlens primitive reflection transformers vector vinyl @@ -46055,15 +46055,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bytestring_0_10_10_0" = callPackage + "bytestring_0_10_10_1" = callPackage ({ mkDerivation, base, byteorder, deepseq, directory, dlist , ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "bytestring"; - version = "0.10.10.0"; - sha256 = "1h94lyyn4fpklm25dsazj9za08m0vz9irafpza90h9j5wx4qpndq"; + version = "0.10.10.1"; + sha256 = "1imcy8yw5jag91qncvi1s9n0lldmf2pjkja6qq4mfqyh02f7arvq"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; testHaskellDepends = [ base byteorder deepseq directory dlist ghc-prim HUnit mtl @@ -116827,8 +116827,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.34.3"; - sha256 = "1x8gfffqywgm5rmvfgnk628mb9hczp9x1ihd3jap8kh7ip2rgccp"; + version = "0.34.5"; + sha256 = "1ha9jz8zq2sxsm0557x5qy4ckjcmzsfn2qfl5mrq1vihfn3frdsl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116868,8 +116868,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.34.3"; - sha256 = "1c40qnqg18jqdzidkl4a9v0pwb9ngzhc1zxa7kw3g61vj8wlhkv2"; + version = "0.34.5"; + sha256 = "0m6wvcagdi8bfb2g6cih0j729sk5h2vl0p3pgvqy6qfqys1rv5z2"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network @@ -135663,6 +135663,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http2_2_0_5" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base + , base16-bytestring, bytestring, case-insensitive, containers + , directory, doctest, filepath, gauge, Glob, heaps, hspec + , http-types, mwc-random, network, network-byte-order, psqueues + , stm, text, time-manager, unordered-containers, vector + }: + mkDerivation { + pname = "http2"; + version = "2.0.5"; + sha256 = "1rg6dnkx2yxcdp87r1vdpyxacqv7jgxiq3bb1hjz45v5jk1xj676"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring case-insensitive containers http-types + network network-byte-order psqueues stm time-manager + ]; + testHaskellDepends = [ + aeson aeson-pretty array base base16-bytestring bytestring + case-insensitive containers directory doctest filepath Glob hspec + http-types network network-byte-order psqueues stm text + time-manager unordered-containers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers gauge heaps + mwc-random network-byte-order psqueues stm + ]; + description = "HTTP/2 library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , http2, lifted-async, lifted-base, mtl, network, stm, time, tls @@ -143229,6 +143261,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "invertible_0_2_0_6" = callPackage + ({ mkDerivation, base, haskell-src-meta, invariant, lens + , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell + , transformers + }: + mkDerivation { + pname = "invertible"; + version = "0.2.0.6"; + sha256 = "1z53i81i8w3hxq0869l2i74s7k6sizbc3i4z0j5s7m412i119amd"; + libraryHaskellDepends = [ + base haskell-src-meta invariant lens partial-isomorphisms + semigroupoids template-haskell transformers + ]; + testHaskellDepends = [ base QuickCheck transformers ]; + description = "bidirectional arrows, bijective functions, and invariant functors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "invertible-grammar" = callPackage ({ mkDerivation, base, bifunctors, containers, mtl, prettyprinter , profunctors, semigroups, tagged, template-haskell, text @@ -152043,6 +152094,8 @@ self: { pname = "language-dickinson"; version = "0.1.0.1"; sha256 = "0ry3mkgvabm4hvax8lm7pdm8bsmp1qiaq6kndfj5m95fc0ddd1j4"; + revision = "1"; + editedCabalFile = "16ys3vfs2cdifvmij9qxa8sgvkvhfhvk47bha865zx78iml6cy58"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -155489,6 +155542,21 @@ self: { broken = true; }) {}; + "libBF" = callPackage + ({ mkDerivation, base, deepseq }: + mkDerivation { + pname = "libBF"; + version = "0.5.1"; + sha256 = "0iwbkfbp26z1zmnk28mnkvyh8k0i0bx56wl2jwygdnqvl5lmfv6i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base deepseq ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "A binding to the libBF library"; + license = stdenv.lib.licenses.mit; + }) {}; + "libGenI" = callPackage ({ mkDerivation, base, binary, containers, HUnit, mtl, parsec , process, QuickCheck @@ -169903,6 +169971,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_33" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , exceptions, fast-logger, lifted-base, monad-control, monad-loops + , mtl, resourcet, stm, stm-chans, template-haskell, text + , transformers, transformers-base, transformers-compat + , unliftio-core + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.33"; + sha256 = "0529blrs6883cw71h2rhw35dlm68rmp5hwr32kkmmzrhxcvdnkjc"; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra exceptions fast-logger + lifted-base monad-control monad-loops mtl resourcet stm stm-chans + template-haskell text transformers transformers-base + transformers-compat unliftio-core + ]; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -183658,6 +183748,21 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "opentelemetry_0_5_0" = callPackage + ({ mkDerivation, base, bytestring, exceptions, ghc-trace-events + , hashable + }: + mkDerivation { + pname = "opentelemetry"; + version = "0.5.0"; + sha256 = "1v58p4i32ix33a8fxx9m5b2nxj9zcdn906whbgkk6il22q4pik9k"; + libraryHaskellDepends = [ + base bytestring exceptions ghc-trace-events hashable + ]; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opentelemetry-extra" = callPackage ({ mkDerivation, aeson, async, base, bytestring, clock, containers , directory, exceptions, filepath, ghc-events, hashable @@ -183694,6 +183799,44 @@ self: { broken = true; }) {}; + "opentelemetry-extra_0_5_0" = callPackage + ({ mkDerivation, aeson, async, base, binary, bytestring, clock + , containers, directory, exceptions, filepath, gauge + , generic-arbitrary, ghc-events, hashable, hashtables, http-client + , http-client-tls, http-types, hvega, opentelemetry, process + , QuickCheck, random, scientific, splitmix, stm, tasty + , tasty-discover, tasty-hunit, tasty-quickcheck, text, text-show + , typed-process, unordered-containers + }: + mkDerivation { + pname = "opentelemetry-extra"; + version = "0.5.0"; + sha256 = "0m47rs86s3mrvayipdhm5awhlnkf7r8binvs094c7vsswfvwf5mv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base binary bytestring clock containers directory + exceptions filepath ghc-events hashable http-client http-client-tls + http-types opentelemetry random scientific splitmix stm text + text-show unordered-containers + ]; + executableHaskellDepends = [ + async base clock containers directory exceptions filepath + hashtables http-client http-client-tls hvega opentelemetry process + text typed-process + ]; + testHaskellDepends = [ + base bytestring generic-arbitrary ghc-events hashable opentelemetry + QuickCheck tasty tasty-discover tasty-hunit tasty-quickcheck text + text-show unordered-containers + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ base gauge opentelemetry ]; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "opentelemetry-http-client" = callPackage ({ mkDerivation, base, http-client, http-types, opentelemetry, text }: @@ -183737,6 +183880,34 @@ self: { broken = true; }) {}; + "opentelemetry-lightstep_0_5_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, clock, containers + , exceptions, filepath, ghc-events, http-client, http-client-tls + , http-types, network, opentelemetry, opentelemetry-extra + , scientific, splitmix, stm, text, typed-process + , unordered-containers + }: + mkDerivation { + pname = "opentelemetry-lightstep"; + version = "0.5.0"; + sha256 = "1qh7534453smipvc3blwvfqnywn165if51zdkyxva84izi6r8rfy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring exceptions http-client http-client-tls + http-types network opentelemetry opentelemetry-extra scientific stm + text unordered-containers + ]; + executableHaskellDepends = [ + async base bytestring clock containers exceptions filepath + ghc-events http-client http-types opentelemetry opentelemetry-extra + splitmix text typed-process unordered-containers + ]; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "opentelemetry-wai" = callPackage ({ mkDerivation, base, bytestring, http-types, opentelemetry, text , wai @@ -183753,6 +183924,22 @@ self: { broken = true; }) {}; + "opentelemetry-wai_0_5_0" = callPackage + ({ mkDerivation, base, bytestring, http-types, opentelemetry, text + , wai + }: + mkDerivation { + pname = "opentelemetry-wai"; + version = "0.5.0"; + sha256 = "1prqkwj2j0vpshiaz4f61f4l8jyiqnyjaqmsylaqwbpyinp8afbk"; + libraryHaskellDepends = [ + base bytestring http-types opentelemetry text wai + ]; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "opentheory" = callPackage ({ mkDerivation, base, opentheory-primitive, QuickCheck }: mkDerivation { @@ -186041,8 +186228,8 @@ self: { ({ mkDerivation, base, c2hs, pam }: mkDerivation { pname = "pam"; - version = "0.1"; - sha256 = "1lmkq12p18qavx2c7xrnha56017y0f21ri4l3cqal4fb8zy0g5nj"; + version = "0.2.0.0"; + sha256 = "0j4hm7ph0iszf8wyqpy5jiplr14jj37z2yvgcgy7p5ab5p5r38gx"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ pam ]; libraryToolDepends = [ c2hs ]; @@ -197450,8 +197637,8 @@ self: { }: mkDerivation { pname = "postgresql-typed"; - version = "0.6.1.0"; - sha256 = "1p7bcwbjb0pi96d9zad8kmlb2w3g06g4xra33xmmskynmsdyc0r9"; + version = "0.6.1.1"; + sha256 = "002bqsvsig6232d4di811rpjyjg7r45xsywb34i9l98imh51mia1"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers cryptonite data-default haskell-src-meta HDBC memory network old-locale @@ -225073,6 +225260,8 @@ self: { pname = "shakebook"; version = "0.8.0.0"; sha256 = "1c26j95jcljr5qfn54kgvh2mcvgsk0995zij7a23nxmb5529glhd"; + revision = "1"; + editedCabalFile = "06b8inqz14zalfj5z0pfxbb7da8qblqxpq4r0z29z89mpjxz0961"; libraryHaskellDepends = [ aeson aeson-with base binary-instances comonad comonad-extras doctemplates feed free http-conduit ixset-typed lens lens-aeson @@ -233436,6 +233625,17 @@ self: { broken = true; }) {}; + "spork" = callPackage + ({ mkDerivation, base, deepseq }: + mkDerivation { + pname = "spork"; + version = "0.4.0"; + sha256 = "1mkcb9qi9d3izf3nhn0bmiiwfhvak6ky71wq7qnrq3imsarrni6s"; + libraryHaskellDepends = [ base deepseq ]; + description = "Catch errors from pure computations in a Maybe/Either"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "spoty" = callPackage ({ mkDerivation, aeson, base, bytestring, lens, lens-aeson, pipes , text, unordered-containers, wreq @@ -238358,6 +238558,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "string-interpolate_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, formatting + , haskell-src-exts, haskell-src-meta, hspec, hspec-core + , interpolate, neat-interpolation, QuickCheck, quickcheck-instances + , quickcheck-text, quickcheck-unicode, split, template-haskell + , text, text-conversions, unordered-containers, utf8-string + }: + mkDerivation { + pname = "string-interpolate"; + version = "0.3.0.0"; + sha256 = "0h7lqr5g11pr9ikzg7j26fgj9m8659j1vpcwggvndv6k71sh281a"; + libraryHaskellDepends = [ + base bytestring haskell-src-exts haskell-src-meta split + template-haskell text text-conversions utf8-string + ]; + testHaskellDepends = [ + base bytestring hspec hspec-core QuickCheck quickcheck-instances + quickcheck-text quickcheck-unicode template-haskell text + unordered-containers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq formatting interpolate + neat-interpolation QuickCheck text + ]; + description = "Haskell string/text/bytestring interpolation that just works"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "string-isos" = callPackage ({ mkDerivation, base, bytestring, mono-traversable, safe, text , type-iso @@ -243650,8 +243879,8 @@ self: { pname = "tasty-hedgehog"; version = "1.0.0.2"; sha256 = "1vsv3m6brhshpqm8qixz97m7h0nx67cj6ira4cngbk7mf5rqylv5"; - revision = "2"; - editedCabalFile = "1v4jp3xk5ikik638vkyf2jxkhaf2n6fsw8zxqxxjv65x60082kl7"; + revision = "3"; + editedCabalFile = "0vjr63nsc3z2jzc80clx2pzhcx1l53bqscwflvwwgjy0gmsshakd"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -265971,8 +266200,8 @@ self: { }: mkDerivation { pname = "web-inv-route"; - version = "0.1.2.2"; - sha256 = "0cbf46d1a55y7j2d84crhfdsgy0c2x0rfmvhhwxxh5pigg846cd2"; + version = "0.1.2.3"; + sha256 = "1xk6f3z7pcn5bmr2259yvv9l9wbfyycb7990dffz4b802ahxf1xv"; libraryHaskellDepends = [ base bytestring case-insensitive containers happstack-server hashable http-types invertible network-uri snap-core text @@ -277873,8 +278102,8 @@ self: { pname = "ztail"; version = "1.2.0.2"; sha256 = "05vpq3kiv1xrby2k1qn41s42cxxxblcgxpnw1sgyznx63pal2hx1"; - revision = "1"; - editedCabalFile = "0d0cpgb0v849zxl12c2gkm3x4nmyfycka1pcfix43lawx62rky8s"; + revision = "2"; + editedCabalFile = "16w0hgjvj45azdgkzvykiznds5sa38mq9xf5022r7qfhpvps65y0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ From e9062ea2389751f1f0d9e3f46cb2d037ea498b9b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 01:05:31 +0000 Subject: [PATCH 3046/3452] afl: 2.56b -> 2.57b --- pkgs/tools/security/afl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index e32aa0348747..091b52bfcf04 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -9,13 +9,13 @@ let else throw "afl: no support for ${stdenv.hostPlatform.system}!"; afl = stdenv.mkDerivation rec { pname = "afl"; - version = "2.56b"; + version = "2.57b"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1q1g59gkm48aa4cg9h70jx4i2gapmypgp5rzs156b2avd95vwkn1"; + sha256 = "0fqj3g6ds1f21kxz7m9mc1fspi9r4jg9jcmi60inwxijrc5ncvr6"; }; enableParallelBuilding = true; From 581865484774ecf2c7c6e6af828b1a4381b4caf7 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 1 Jul 2020 22:51:41 -0400 Subject: [PATCH 3047/3452] pythonPackages.semver: 2.8.1 -> 2.10.2 --- .../python-modules/semver/default.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index bc0262a89c93..5aca34b52f11 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -1,24 +1,27 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, pytest }: +{ stdenv +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +, pytestcov +}: -buildPythonPackage { +buildPythonPackage rec { pname = "semver"; - version = "2.8.1"; + version = "2.10.2"; src = fetchFromGitHub { - owner = "k-bx"; + owner = "python-semver"; repo = "python-semver"; - rev = "41775dd5f143dfa6ca94885056c9ef5b3ed4e6e1"; # not tagged in repository - sha256 = "1rqaakha4sw06k9h0h4g1wmk66zkmhpq92y2rw0kyfpp6xk1zbk2"; + rev = version; + sha256 = "0yxjmcgk5iwp53l9z1cg0ajrj18i09ircs11ifpdrggzm8n1blf3"; }; - checkInputs = [ pytest ]; - checkPhase = '' - py.test - ''; + preCheck = "rm -rf dist"; # confuses source vs dist imports in pytest + checkInputs = [ pytestCheckHook pytestcov ]; meta = with stdenv.lib; { description = "Python package to work with Semantic Versioning (http://semver.org/)"; - homepage = "https://github.com/k-bx/python-semver"; + homepage = "https://python-semver.readthedocs.io/en/latest/"; license = licenses.bsd3; maintainers = with maintainers; [ np ]; }; From 8ec02758c086152e21894861e058874d707626f9 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 1 Jul 2020 23:24:46 -0400 Subject: [PATCH 3048/3452] pythonPackages.flask-appbuilder: unpin flask-login --- pkgs/development/python-modules/flask-appbuilder/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 01bd180a5ae4..5119d3c39ac1 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -66,7 +66,8 @@ buildPythonPackage rec { --replace "marshmallow>=2.18.0, <4.0.0" "marshmallow" \ --replace "PyJWT>=1.7.1" "PyJWT" \ --replace "Flask-SQLAlchemy>=2.4, <3" "Flask-SQLAlchemy" \ - --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended" + --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended" \ + --replace "Flask-Login>=0.3, <0.5" "Flask-Login" ''; # majority of tests require network access or mongo From 4ab1c2b03293b055df0237c4d12391d3f4866e01 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 1 Jul 2020 23:25:12 -0400 Subject: [PATCH 3049/3452] apache-airflow: unbreak Unpins some dependencies to unbreak. Removes unused python dependencies, and corrects some dependency replacements --- .../python-modules/apache-airflow/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index f8ef6b9492a3..ca2cb03f9672 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -46,7 +46,6 @@ , thrift , tzlocal , unicodecsv -, werkzeug , zope_deprecation , enum34 , typing @@ -127,7 +126,6 @@ buildPythonPackage rec { thrift tzlocal unicodecsv - werkzeug zope_deprecation ]; @@ -143,24 +141,25 @@ buildPythonPackage rec { --replace "pandas>=0.17.1, <1.0.0" "pandas" \ --replace "flask-caching>=1.3.3, <1.4.0" "flask-caching" \ --replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \ + --replace "flask-admin==1.5.3" "flask-admin" \ + --replace "flask-login>=0.3, <0.5" "flask-login" \ --replace "pendulum==1.4.4" "pendulum" \ --replace "cached_property~=1.5" "cached_property" \ --replace "dill>=0.2.2, <0.3" "dill" \ --replace "configparser>=3.5.0, <3.6.0" "configparser" \ - --replace "jinja2>=2.7.3, <=2.10.0" "jinja2" \ + --replace "jinja2>=2.10.1, <2.11.0" "jinja2" \ --replace "colorlog==4.0.2" "colorlog" \ --replace "funcsigs==1.0.0" "funcsigs" \ --replace "flask-swagger==0.2.13" "flask-swagger" \ --replace "python-daemon>=2.1.1, <2.2" "python-daemon" \ - --replace "alembic>=0.9, <1.0" "alembic" \ + --replace "alembic>=1.0, <2.0" "alembic" \ --replace "markdown>=2.5.2, <3.0" "markdown" \ --replace "future>=0.16.0, <0.17" "future" \ --replace "tenacity==4.12.0" "tenacity" \ --replace "text-unidecode==1.2" "text-unidecode" \ --replace "tzlocal>=1.4,<2.0.0" "tzlocal" \ --replace "sqlalchemy~=1.3" "sqlalchemy" \ - --replace "gunicorn>=19.5.0, <20.0" "gunicorn" \ - --replace "werkzeug>=0.14.1, <0.15.0" "werkzeug" + --replace "gunicorn>=19.5.0, <20.0" "gunicorn" # dumb-init is only needed for CI and Docker, not relevant for NixOS. substituteInPlace setup.py \ From 2f817d5c77bdf2366e45fbdd75880024472676d2 Mon Sep 17 00:00:00 2001 From: Diego Rodriguez Date: Wed, 1 Jul 2020 22:28:36 -0600 Subject: [PATCH 3050/3452] kubectx: 0.9.0 -> 0.9.1 New release of Go implementation of Kubectx: https://github.com/ahmetb/kubectx/releases/tag/v0.9.1 --- pkgs/development/tools/kubectx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index b4cbb3cee634..c11c7fcbc97f 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubectx"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ahmetb"; repo = pname; rev = "v${version}"; - sha256 = "1b22jk8zl944w5zn3s7ybkkbmzp9519x32pfqwd1malfly7dzf55"; + sha256 = "1c7y5hj4w72bm6y3riw0acayn4w9x7bbf1vykqcprbyw3a3dvcsw"; }; vendorSha256 = "168hfdc2rfwpz2ls607bz5vsm1aw4brhwm8hmbiq1n1l2dn2dj0y"; From e1a87078ad22d7679dbeff55d985699ea1705fdb Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Thu, 2 Jul 2020 07:01:32 +0200 Subject: [PATCH 3051/3452] ceph: Add srhb to maintainers --- pkgs/tools/filesystems/ceph/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index e553089917e2..fc8ac971da72 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -177,7 +177,7 @@ in rec { homepage = "https://ceph.com/"; description = "Distributed storage system"; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; - maintainers = with maintainers; [ adev ak krav johanot ]; + maintainers = with maintainers; [ adev ak krav johanot srhb ]; platforms = [ "x86_64-linux" ]; }; From 092cf65e99b42ceb5a7e746b85107fbfc965cadc Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 2 Jul 2020 09:42:32 +1000 Subject: [PATCH 3052/3452] gitAndTools.delta: 0.1.1 -> 0.2.0 https://github.com/dandavison/delta/releases/tag/0.2.0 --- .../git-and-tools/default.nix | 4 +++- .../git-and-tools/delta/default.nix | 23 ++++++++++++------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index f9ebbabd11b2..b2511a7f2b3a 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -26,7 +26,9 @@ let darcs-to-git = callPackage ./darcs-to-git { }; - delta = callPackage ./delta { }; + delta = callPackage ./delta { + inherit (darwin.apple_sdk.frameworks) Security; + }; diff-so-fancy = callPackage ./diff-so-fancy { }; diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 60950dc0465c..d987fd3ebe6e 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -1,25 +1,32 @@ -{ lib, fetchFromGitHub, rustPlatform, llvmPackages, installShellFiles }: +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, installShellFiles +, libiconv +, Security +}: rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "1b5ap468d0gvgwkx6wqxvayzda2xw95lymd0kl38nq1fc0ica6hk"; + sha256 = "15c7rsmiinnpxh12520jz3wr0j86vgzjq1ss5pf30fa7lcgicb32"; }; - LLVM_CONFIG_PATH = "${llvmPackages.llvm}/bin/llvm-config"; - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - - cargoSha256 = "07mjl751r9d88fnmnan0ip0m3vxqf51vq2y7k3g3yywcgasj9jgr"; + cargoSha256 = "0lzz32qh80s4dxr0d4pg0qagkn549lr4vbqknl2l0cmlq1bvvq6g"; nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + postInstall = '' - installShellCompletion --bash --name delta.bash completion/bash/completion.sh + installShellCompletion --bash --name delta.bash completion/completion.bash + installShellCompletion --zsh --name _delta completion/completion.zsh ''; meta = with lib; { From 26c7b538cc9dfb0c5477e22963f9c70bbb99e9f2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 2 Jul 2020 09:43:24 +1000 Subject: [PATCH 3053/3452] gitAndTools.delta: add maintainer --- .../version-management/git-and-tools/delta/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index d987fd3ebe6e..0cc184e2cfe1 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec { description = "A syntax-highlighting pager for git"; changelog = "https://github.com/dandavison/delta/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam ma27 ]; + maintainers = with maintainers; [ marsam ma27 zowoq ]; }; } From 885fb1406d623a8696b339b973b055849f5d435d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 25 Jun 2020 07:49:44 +0200 Subject: [PATCH 3054/3452] ocamlPackages.buildOasis: fix handling of installation prefix --- pkgs/build-support/ocaml/oasis.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix index 74977486f2fb..c1d1d699765b 100644 --- a/pkgs/build-support/ocaml/oasis.nix +++ b/pkgs/build-support/ocaml/oasis.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (args // { buildPhase = '' runHook preBuild oasis setup - ocaml setup.ml -configure + ocaml setup.ml -configure --prefix $OCAMLFIND_DESTDIR --exec-prefix $out ocaml setup.ml -build runHook postBuild ''; @@ -37,9 +37,7 @@ stdenv.mkDerivation (args // { installPhase = '' runHook preInstall mkdir -p $out - sed -i s+/usr/local+$out+g setup.ml - sed -i s+/usr/local+$out+g setup.data - prefix=$OCAMLFIND_DESTDIR ocaml setup.ml -install + ocaml setup.ml -install runHook postInstall ''; From 246baa92766a4e6da6fc530c6866d70c4c95d61b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 05:15:59 +0000 Subject: [PATCH 3055/3452] amass: 3.7.2 -> 3.7.3 --- pkgs/tools/networking/amass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index e2bc592f7a8f..99376cc58ac3 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "amass"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1acjqpa9xg9ji2mzxag57yq589cdq3rh78a8vz8wnkkkp7b8why8"; + sha256 = "083c59yig9z0ksvcm9dvy0mv13k79rgnvqrr5qhbhzjz3bgzy1dq"; }; vendorSha256 = "1s8g0qqg3m6hdvc5v3s86l3ba5grmyhx0lf2ymi39k5dpcg8l19s"; From 772ce9d8702e79d31c4dbadac047006fd4451a3a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 24 Jun 2020 08:49:07 +0800 Subject: [PATCH 3056/3452] bully: 1.1 -> 1.4-00 New maintained upstream. --- pkgs/tools/networking/bully/default.nix | 29 ++++++++++++------------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix index c9512392347e..4117932550f4 100644 --- a/pkgs/tools/networking/bully/default.nix +++ b/pkgs/tools/networking/bully/default.nix @@ -1,33 +1,32 @@ -{ stdenv, fetchFromGitHub, openssl, libpcap }: +{ stdenv, fetchFromGitHub, libpcap }: stdenv.mkDerivation rec { - pname = "bully"; - version = "1.1"; + version = "1.4-00"; src = fetchFromGitHub { - sha256 = "1qvbbf72ryd85bp4v62fk93ag2sn25rj7kipgagbv22hnq8yl3zd"; - rev = version; + owner = "kimocoder"; repo = "bully"; - owner = "aanarchyy"; + rev = version; + sha256 = "1n2754a5z44g414a0hj3cmi9q5lwnzyvmvzskrj2nci8c8m2kgnf"; }; - buildInputs = [ openssl libpcap ]; - buildPhase = '' - cd src - make - ''; + buildInputs = [ libpcap ]; + + enableParallelBuilding = true; + + sourceRoot = "./source/src"; installPhase = '' - mkdir -p $out/bin - mv bully $out/bin + install -Dm555 -t $out/bin bully + install -Dm444 -t $out/share/doc/${pname} ../*.md ''; meta = with stdenv.lib; { description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point"; - homepage = "https://github.com/aanarchyy/bully"; - maintainers = with maintainers; [ edwtjo ]; + homepage = "https://github.com/kimocoder/bully"; license = licenses.gpl3; + maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14a494a164f5..b806c977f9aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5934,9 +5934,7 @@ in brickd = callPackage ../servers/brickd { }; - bully = callPackage ../tools/networking/bully { - openssl = openssl_1_0_2; - }; + bully = callPackage ../tools/networking/bully { }; pcapc = callPackage ../tools/networking/pcapc { }; From 35b867131330817efd2e94dbe326101d9bc4b4ea Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Mon, 22 Jun 2020 17:16:56 +0100 Subject: [PATCH 3057/3452] quartus-prime-lite: 19.1 -> 20.1 --- .../editors/quartus-prime/default.nix | 21 ++++++++----------- .../editors/quartus-prime/vsim.patch | 11 ---------- 2 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 pkgs/applications/editors/quartus-prime/vsim.patch diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 093635b10e42..7ad2a3247df2 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -24,7 +24,7 @@ let ) deviceIds; quartus = stdenv.mkDerivation rec { - version = "19.1.0.670"; + version = "20.1.0.711"; pname = "quartus-prime-lite-unwrapped"; src = let @@ -34,12 +34,12 @@ let }; hashes = { - "arria_lite" = "1flj9w0vb2p9f9zll136izr6qvmxn0lg72bvaqxs3sxc9vj06wm1"; - "cyclonev" = "0bqxpvjgph0y6slk0jq75mcqzglmqkm0jsx10y9xz5llm6zxzqab"; - "cyclone" = "0pzs8y4s3snxg4g6lrb21qi88abm48g279xzd98qv17qxb2z82rr"; - "cyclone10lp" = "1ccxq8n20y40y47zddkijcv41w3cddvydddr3m4844q31in3nxha"; - "max" = "1cxzbqscxvlcy74dpqmvlnxjyyxfwcx3spygpvpwi6dfj3ipgm2z"; - "max10" = "14k83javivbk65mpb17wdwsyb8xk7x9gzj9x0wnd24mmijrvdy9s"; + "arria_lite" = "09g2knq23h3vj0s5y7hsdnqbbkr3pnv53dzpqcw2lq9mb5zfs9r0"; + "cyclonev" = "05hrpysasyfb7xhxg68spdffxyvxcx0iagibd5jz643b7n6aalpa"; + "cyclone" = "1x3rnwsvzrb5kwdz35sbcabxmcvj8xxpnjlpcjwfc69ybiyr6sgz"; + "cyclone10lp" = "1x6d4hm697mjgzaxixrw5va8anr6ihhx96x2524r6axpwqf6wcja"; + "max" = "060b7v0xh86kkjyiix7akfkzhx2kl1b3q117kp7xibnz6yrzwmy3"; + "max10" = "05840l9pmqa4i1b3ajfaxkqz1hppls556vbq16a42acz2qs2g578"; }; devicePackages = map (id: { @@ -48,10 +48,10 @@ let }) (lib.attrValues supportedDeviceIds); in map require ([{ name = "QuartusLiteSetup-${version}-linux.run"; - sha256 = "15vxvqxqdk29ahlw3lkm1nzxyhzy4626wb9s5f2h6sjgq64r8m7f"; + sha256 = "07ssrv8p8kacal6xd80n4h7l5xz13aw1m1gfqqaxig0ivsj971z5"; } { name = "ModelSimSetup-${version}-linux.run"; - sha256 = "0j1vfr91jclv88nam2plx68arxmz4g50sqb840i60wqd5b0l3y6r"; + sha256 = "0smxasrmr1c8k6hy378knskpjmz4cgpgb35v5jclns0kx68y3c42"; }] ++ devicePackages); nativeBuildInputs = [ unstick ]; @@ -81,9 +81,6 @@ let --disable-components ${lib.concatStringsSep "," disabledComponents} \ --mode unattended --installdir $out --accept_eula 1 - # This patch is from https://wiki.archlinux.org/index.php/Altera_Design_Software - patch --force --strip 0 --directory $out < ${./vsim.patch} - rm -r $out/uninstall $out/logs ''; diff --git a/pkgs/applications/editors/quartus-prime/vsim.patch b/pkgs/applications/editors/quartus-prime/vsim.patch deleted file mode 100644 index 36dc41b7ef14..000000000000 --- a/pkgs/applications/editors/quartus-prime/vsim.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- modelsim_ase/vco 1970-01-01 01:00:01.000000000 +0100 -+++ modelsim_ase/vco 1970-01-01 01:00:01.000000000 +0100 -@@ -207,7 +207,7 @@ - 2.[5-9]*) vco="linux" ;; - 2.[1-9][0-9]*) vco="linux" ;; - 3.[0-9]*) vco="linux" ;; -- *) vco="linux_rh60" ;; -+ *) vco="linux" ;; - esac - if [ ! -x "$dir/$vco/vsim" ]; then - if [ -x "$dir/linuxle/vsim" ]; then From 7ec38adfdcbbc4c7ace087c8a7e89f4a92ae26bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konrad=20F=C3=B6rstner?= Date: Sun, 28 Jun 2020 13:30:16 +0200 Subject: [PATCH 3058/3452] nixos/doc/manual: Fix parted's set subcommand for esp partition With 'set 3 boot on' the error 'file system "/boot" is not a FAT EFI system partition (ESP) file system' occurs when running "nixos-install" during the basic installation (tested in in a VirtualBox VM). --- nixos/doc/manual/installation/installing.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 673df8f2e4c4..48307ca24694 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -146,7 +146,7 @@ partition. It uses the initially reserved 512MiB at the start of the disk. # parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB -# parted /dev/sda -- set 3 boot on +# parted /dev/sda -- set 3 esp on @@ -513,7 +513,7 @@ Retype new UNIX password: *** # parted /dev/sda -- mkpart primary 512MiB -8GiB # parted /dev/sda -- mkpart primary linux-swap -8GiB 100% # parted /dev/sda -- mkpart ESP fat32 1MiB 512MiB -# parted /dev/sda -- set 3 boot on +# parted /dev/sda -- set 3 esp on From 57568628beff33868e38ef7d17387a5a70075960 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 27 Jun 2020 17:38:04 +0200 Subject: [PATCH 3059/3452] syslinux: make reproducible --- pkgs/os-specific/linux/syslinux/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index edb951dae3da..28681aed5640 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -22,9 +22,15 @@ stdenv.mkDerivation { url = mkURL "fa1349f1" "0002-gfxboot-menu-label.patch"; sha256 = "06ifgzbpjj4picpj17zgprsfi501zf4pp85qjjgn29i5rs291zni"; }) - (fetchpatch { - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0005-gnu-efi-version-compatibility.patch?h=packages/syslinux"; - sha256 = "0fbqz56hj8az8ws26m39hyp3l5fvcbzvzdddqz3x6n56hzdpz1p6"; + (fetchurl { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0005-gnu-efi-version-compatibility.patch?id=821c3da473d1399d930d5b4a086e46a4179eaa45"; + name = "0005-gnu-efi-version-compatibility.patch"; + sha256 = "1mz2idg8cwn0mvd3jixxynhkn7rhmi5fp8cc8zznh5f0ysfra446"; + }) + (fetchurl { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0025-reproducible-build.patch?id=821c3da473d1399d930d5b4a086e46a4179eaa45"; + name = "0025-reproducible-build.patch"; + sha256 = "0qk6wc6z3648828y3961pn4pi7xhd20a6fqn6z1mnj22bbvzcxls"; }) (fetchurl { # mbr.bin: too big (452 > 440) @@ -70,6 +76,7 @@ stdenv.mkDerivation { "DATADIR=$(out)/share" "MANDIR=$(out)/share/man" "PERL=perl" + "HEXDATE=0x00000000" ] ++ stdenv.lib.optionals stdenv.hostPlatform.isi686 [ "bios" "efi32" ]; From 17eed4416a8634cabbe1c5ea00489ed92b885b26 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 06:55:27 +0000 Subject: [PATCH 3060/3452] chezmoi: 1.8.2 -> 1.8.3 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index eb372b6b5671..6ff736167be6 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "0s2a0q3lgrdz7w69sacn23k4dybw6wrk63xxnylj88wss7mqnpj8"; + sha256 = "01px0nj2llas835g1hf8lvhigip4jm4innjacz18c7nf1ddwn7ss"; }; - vendorSha256 = "0hpjvpai2i9jn8hlxhx4pvvawjh6lfmlz7ffi320pp7vanzqhch1"; + vendorSha256 = "1gzg73lrx73rhb9yj6yakv95m8rz1rhjgqjl1a78c8nvaii27a9x"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" From 55948dff7471054fb69c8a3775ef7f4843b332ea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 07:03:20 +0000 Subject: [PATCH 3061/3452] circleci-cli: 0.1.8302 -> 0.1.8599 --- pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 5b641a3ec5c0..6dcf7ed46cfa 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.8302"; + version = "0.1.8599"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "1rq1x6893n4siljn2jizrnz8b8qlic1y087gikh5p5140zpcbhnx"; + sha256 = "1brv38mzc2i6mg4rk9ichjsv5w0gr6xrf6qmhnal12cll2krn9k3"; }; vendorSha256 = "0y35ps2pw9z7gi4z50byd1py87bf2jdvj7l7w2gxpppmhi83myc9"; From ae5f94e5659b1aad96e8ed024561ea15d696b3a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 07:19:28 +0000 Subject: [PATCH 3062/3452] cni: 0.7.1 -> 0.8.0 --- pkgs/applications/networking/cluster/cni/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 49d3aaa298de..5bbd10141259 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cni"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "containernetworking"; repo = pname; rev = "v${version}"; - sha256 = "02qn1br8164d99978acalisy1sx294g1axnii4yh1wji0fc735xz"; + sha256 = "16i59dhiq7pc7qs32cdk4yv4w9rjx4vvlw7fb6a6jhq6hxxjrgiw"; }; goPackagePath = "github.com/containernetworking/cni"; From d53c085d0e5d0351752c50650ab83aaaa48e1d00 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 07:59:42 +0000 Subject: [PATCH 3063/3452] dua: 2.6.1 -> 2.8.1 --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index a79059dff071..91ab681b2a0a 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.6.1"; + version = "2.8.1"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "0wq6cqznbpkiy9vz3slpcnxlsxff6gx5x7fsbd67q6jv5zhkn881"; + sha256 = "0z0aqasi42wv1np2a6b0qc14a64r2h8xh025411jdxfs6vjr15am"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "096c6i1hqyygaifnm2kg53x22a8hhfxfz22qlssh1rw79bj82q0x"; + cargoSha256 = "1g9248kqwrc46abwx6fakzfxf745jfvkywi49z7mvd4p99ysh2ir"; doCheck = false; From 238343fcafa09e96b9ab5b05b40bc650b31631de Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 08:27:02 +0000 Subject: [PATCH 3064/3452] ergo: 3.2.6 -> 3.2.7 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 29990dae4049..e7a83d7496b6 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "1a38j7dy6ax9xvcjbdkiz0z33ln4rlmgrxznvqhdf11j70g1sr6x"; + sha256 = "1ng2q9yp03j8p2xh7rlqad5h4p82ks1l00401pq7m0y02q90szr8"; }; nativeBuildInputs = [ makeWrapper ]; From ee7835ed54c3372a7fa5ccbde03671b073a2d3c2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 29 May 2020 00:09:20 +1000 Subject: [PATCH 3065/3452] runc: 1.0.0-rc90 -> 1.0.0-rc91 https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc91 --- pkgs/applications/virtualization/runc/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 58c3ef4f61b3..a8d63a0ca40c 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -14,13 +14,13 @@ buildGoPackage rec { pname = "runc"; - version = "1.0.0-rc90"; + version = "1.0.0-rc91"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; + sha256 = "1hg3hbbjsz76q1piz86q8la6dym86d65xd7h6q12krfmwd2lbhkw"; }; goPackagePath = "github.com/opencontainers/runc"; @@ -30,7 +30,6 @@ buildGoPackage rec { buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ]; - # these will be the default in the next release makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" "BUILDTAGS+=selinux" ]; buildPhase = '' From 648277451c1f191c0f88fc6313f9abd73aa66cf9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 2 Jul 2020 04:20:00 -0500 Subject: [PATCH 3066/3452] cozette: 1.5.1 -> 1.8.3 --- pkgs/data/fonts/cozette/default.nix | 55 ++++++++--------------------- 1 file changed, 14 insertions(+), 41 deletions(-) diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index a5d9f9055624..032284fcf03d 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -1,51 +1,24 @@ -{ stdenv, fetchurl, mkfontscale }: +{ lib, fetchzip }: let - version = "1.5.1"; - releaseUrl = - "https://github.com/slavfox/Cozette/releases/download/v.${version}"; -in stdenv.mkDerivation rec { - pname = "Cozette"; - inherit version; + version = "1.8.3"; +in +fetchzip rec { + name = "Cozette-${version}"; - srcs = map fetchurl [ - { - url = "${releaseUrl}/cozette.otb"; - sha256 = "05k45n7jar11gnng2awpmc7zk9jdlzd6wz87xx49cp75jm4z9xm8"; - } - { - url = "${releaseUrl}/CozetteVector.otf"; - sha256 = "1sqhnjpizn1wi26lc7z2zml7yr7zkcpa72mh1drvd74rlcs1ip30"; - } - { - url = "${releaseUrl}/CozetteVector.ttf"; - sha256 = "1q4ml8shv9lmyc6bwhffwvbvl92s73j7xkb0rkqvci4f0zbz7mcy"; - } - ]; + url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; - nativeBuildInputs = [ mkfontscale ]; + sha256 = "1nc4zk6n7cbv9vwlhpm3ady5lc4d4ic1klyywwfg27w8j0jv57hx"; - sourceRoot = "./"; - - unpackCmd = '' - otName=$(stripHash "$curSrc") - cp $curSrc ./$otName + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.bdf -d $out/share/fonts/misc + unzip -j $downloadedFile \*.otb -d $out/share/fonts/misc ''; - installPhase = '' - - install -D -m 644 *.otf -t "$out/share/fonts/opentype" - install -D -m 644 *.ttf -t "$out/share/fonts/truetype" - install -D -m 644 *.otb -t "$out/share/fonts/misc" - - mkfontdir "$out/share/fonts/misc" - mkfontscale "$out/share/fonts/truetype" - mkfontscale "$out/share/fonts/opentype" - ''; - - outputs = [ "out" ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "A bitmap programming font optimized for coziness."; homepage = "https://github.com/slavfox/cozette"; license = licenses.mit; From c2007a94c6cf71e04d5f133870107537fcad841f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 2 Jul 2020 04:20:00 -0500 Subject: [PATCH 3067/3452] cozette: add marsam to maintainers --- pkgs/data/fonts/cozette/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index 032284fcf03d..a5bc752c4caf 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -23,6 +23,6 @@ fetchzip rec { homepage = "https://github.com/slavfox/cozette"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ brettlyons ]; + maintainers = with maintainers; [ brettlyons marsam ]; }; } From e2c742329f5d9d91c0bfd059452af92be3bb9016 Mon Sep 17 00:00:00 2001 From: Henk Kalkwater Date: Wed, 1 Jul 2020 18:51:27 +0200 Subject: [PATCH 3068/3452] telepathy-qt: 0.9.7 -> 0.9.8 * telepathy 0.9.8 no longer supports Qt 4, so telepathy-qt and telepathy_qt now throw an error suggesting to use the Qt 5 packages instead. * telepathy 0.9.8 uses Python 3 instead of Python 2, so that has been corrected in the package. * telepathy 0.9.8 includes the patch that was previously manually added, so therefore it is removed from the package. --- .../libraries/telepathy/qt/default.nix | 16 ++++------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index b8e438819db3..2addb86246dd 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python2Packages, dbus-glib, dbus +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python3Packages, dbus-glib, dbus , telepathy-farstream, telepathy-glib, fetchpatch }: let - inherit (python2Packages) python dbus-python; + inherit (python3Packages) python dbus-python; in stdenv.mkDerivation rec { - name = "telepathy-qt-0.9.7"; + name = "telepathy-qt-0.9.8"; src = fetchurl { url = "https://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; - sha256 = "0krxd4hhfx6r0ja19wh3848j7gn1rv8jrnakgmkbmi7bww5x7fi1"; + sha256 = "bf8e2a09060addb80475a4938105b9b41d9e6837999b7a00e5351783857e18ad"; }; nativeBuildInputs = [ cmake pkgconfig python ]; @@ -16,14 +16,6 @@ in stdenv.mkDerivation rec { buildInputs = [ dbus-glib ]; checkInputs = [ dbus.daemon dbus-python ]; - patches = [ - # https://github.com/TelepathyIM/telepathy-qt/issues/25 - (fetchpatch { - url = "https://github.com/TelepathyIM/telepathy-qt/commit/d654dc70dbec7097e96e6d96ca74ab1b5b00ef8c.patch"; - sha256 = "1jzd9b9rqh3c8xlq8dr7c0r8aabzf5ywv2gpkk6phh3xwngzrfbh"; - }) - ]; - # No point in building tests if they are not run # On 0.9.7, they do not even build with QT4 cmakeFlags = stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f9487820bafd..a68232fef04a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -566,6 +566,7 @@ mapAliases ({ telepathy_idle = telepathy-idle; # added 2018-02-25 telepathy_logger = telepathy-logger; # added 2018-02-25 telepathy_mission_control = telepathy-mission-control; # added 2018-02-25 + telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead."; # added 2020-07-02 telepathy_qt = telepathy-qt; # added 2018-02-25 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 telepathy_salut = telepathy-salut; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3501d51363f9..c6c04137367d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14985,8 +14985,6 @@ in telepathy-farstream = callPackage ../development/libraries/telepathy/farstream {}; - telepathy-qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; }; - termbox = callPackage ../development/libraries/termbox { }; tevent = callPackage ../development/libraries/tevent { }; From 5b846f1c113b365382ed5732e153e586d90d521b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 10:29:08 +0000 Subject: [PATCH 3069/3452] flow: 0.127.0 -> 0.128.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index aed991dab30a..ce60cf1392a7 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.127.0"; + version = "0.128.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0daacbb4il3mm8fkbk5qlpvzp3pmrqagq2hr1gsjaf8vnmissvvm"; + sha256 = "1psplmqd1l6mxw0rbji2h73fvqhpp1zf9clzgc8khmkh0bbhc5ss"; }; installPhase = '' From 2ba13fea0b1fa61d25ecb33a2d34f61de3d35082 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 10:34:17 +0000 Subject: [PATCH 3070/3452] flyctl: 0.0.131 -> 0.0.135 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 1a7a3d6607f4..2437962191ef 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.131"; + version = "0.0.135"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "0b9qrraydihw4wglif3rjmjlqdsgxh873023z3rgrvf7dwrhc9y0"; + sha256 = "0gxd32pb901hlr493gp736rjd5fpwgqvmlir6b5r0fzyv22f8x2d"; }; preBuild = '' From 9b64b11b04d4266fda3532556eff49cbaf8f785f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 10:51:26 +0000 Subject: [PATCH 3071/3452] ft2-clone: 1.25_fix -> 1.26 --- pkgs/applications/audio/ft2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index acf373fc41af..60040119d64f 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.25_fix"; + version = "1.26"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "0q2mcp3xpgwilmiwzr9nnxlyg9c1kynh6cxzlyd95n520j00s6i7"; + sha256 = "0fqb4415qy2nwjz7ahi43nk795ifswb2b37sc7p5n9m4yc8h53wv"; }; nativeBuildInputs = [ cmake ]; From 20a50f3405832f9d816201f1da461c87a27939ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 11:43:31 +0000 Subject: [PATCH 3072/3452] heimer: 1.17.0 -> 1.18.0 --- pkgs/applications/misc/heimer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 7709a42baee1..1626fc440e93 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "1sxdi1an9x62q9vwv7r2761my4dva6nc63n9861swxjjk18hmmar"; + sha256 = "16p18svfcp201gd624wzmf0gpdvywybxp8539igin6s70k6rpc97"; }; nativeBuildInputs = [ cmake ]; From 37c2304dbc8d1c46a265504cf1d20268fd550270 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 11:48:11 +0000 Subject: [PATCH 3073/3452] helmsman: 3.4.3 -> 3.4.4 --- pkgs/applications/networking/cluster/helmsman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index 5fb0b3658851..840a46ebf663 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmsman"; - version = "3.4.3"; + version = "3.4.4"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "0jbinnzdw32l7zh02k81gnw9rnqi8f5k5sp2qv8p9l9kgziaycvn"; + sha256 = "01vjghak2szif0p82kall5jw7mbfh4fg7fcjkblmic7l0vlqhfac"; }; vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl"; From 426bf48c48e5ab456b2b778f6e802fd70b0f790b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 12:23:08 +0000 Subject: [PATCH 3074/3452] janet: 1.10.0 -> 1.10.1 --- pkgs/development/interpreters/janet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 32312401f963..52d0b371915b 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "0kx3c4v0481b4xx239w10ajwp8ngq8smxzh3m77dazd89r997n1g"; + sha256 = "18k6dzxzr149p0bby4r0z6kybylig87rwj7gk3z6a98zf6k4xmsw"; }; nativeBuildInputs = [ meson ninja ]; From 743c02322e973a9ec7759a0e490266ab1bd70aa8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 13:01:37 +0000 Subject: [PATCH 3075/3452] kube-router: 0.4.0 -> 1.0.0 --- pkgs/applications/networking/cluster/kube-router/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index cd946284fa77..c51e62b30b9b 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kube-router"; - version = "0.4.0"; + version = "1.0.0"; goPackagePath = "github.com/cloudnativelabs/kube-router"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "1g1y3l87a4il9g2yrl1ryx8xfd4x220azxhr3rxm5l9vhnnjwswa"; + sha256 = "0b6rsiq3pwp7wknmblgd8kszh9bd7nhvlsnyyamqnhlfjl97929x"; }; buildFlagsArray = '' From 338ab5ce07c1634a56f378a2fffaf85d55de0289 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 13:06:20 +0000 Subject: [PATCH 3076/3452] kubeless: 1.0.6 -> 1.0.7 --- pkgs/applications/networking/cluster/kubeless/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix index 5b1f12452469..400ebf66dde8 100644 --- a/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "kubeless"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "kubeless"; repo = "kubeless"; rev = "v${version}"; - sha256 = "1fcdyd1jf0yibfx9jc16m0vmazm2jymps92llh3vh5zqd36bxbyd"; + sha256 = "0x2hydywnnlh6arzz71p7gg9yzq5z2y2lppn1jszvkbgh11kkqfr"; }; goPackagePath = "github.com/kubeless/kubeless"; From 39ee2ab9c0936574ea4814a8c766e0bf658d7b0b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 13:12:58 +0000 Subject: [PATCH 3077/3452] lean: 3.16.2 -> 3.16.5 --- pkgs/applications/science/logic/lean/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 7fcc4cdd062e..886ecdb76ceb 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.16.2"; + version = "3.16.5"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0fvm7gvbr5kn258sqpnxa7dvzz84iv1dx1n066vih5gz80plz4lh"; + sha256 = "0s1ay6qgpkxhygfbfrl1cw2pd8bpgw2dw71rzhza20ndqwk8nqs5"; }; nativeBuildInputs = [ cmake ]; From e9f72106c788685e01ff84ea7f28623563f97b44 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 13:59:52 +0000 Subject: [PATCH 3078/3452] libvmaf: 1.5.1 -> 1.5.2 --- pkgs/development/libraries/libvmaf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index fb494909c838..9d4cf5c924f4 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libvmaf"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; rev = "v${version}"; - sha256 = "10fw53k9k4aq4p2qi5qkfjfnhldw4p5bbmxggf8220gfa95nvyl3"; + sha256 = "18w0z3w90fdbzsqaa4diwvq0xmvg0aiw4hi3aaa4pq0zgnb8g3mk"; }; sourceRoot = "source/libvmaf"; From 3c543a19d2b18df4a1a4bef6ae2ac1773a122b58 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 2 Jul 2020 09:07:31 -0500 Subject: [PATCH 3079/3452] kubeless: install completion --- .../networking/cluster/kubeless/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix index 400ebf66dde8..6f6c8dc338bf 100644 --- a/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "kubeless"; @@ -13,10 +13,19 @@ buildGoPackage rec { goPackagePath = "github.com/kubeless/kubeless"; + nativeBuildInputs = [ installShellFiles ]; + subPackages = [ "cmd/kubeless" ]; buildFlagsArray = '' - -ldflags=-X github.com/kubeless/kubeless/pkg/version.Version=${version} + -ldflags=-s -w -X github.com/kubeless/kubeless/pkg/version.Version=${version} + ''; + + postInstall = '' + for shell in bash; do + $out/bin/kubeless completion $shell > kubeless.$shell + installShellCompletion kubeless.$shell + done ''; meta = with stdenv.lib; { From f1cf202dbbe3de6ee8f4fd8b40a5c61654aaa19d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 3 Jul 2020 00:17:15 +1000 Subject: [PATCH 3080/3452] nixos/podman: restrict test to x86_64-linux --- nixos/tests/all-tests.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8f6e76b51c89..8cfddc7694c6 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -266,7 +266,7 @@ in php = handleTest ./php {}; plasma5 = handleTest ./plasma5.nix {}; plotinus = handleTest ./plotinus.nix {}; - podman = handleTest ./podman.nix {}; + podman = handleTestOn ["x86_64-linux"] ./podman.nix {}; postgis = handleTest ./postgis.nix {}; postgresql = handleTest ./postgresql.nix {}; postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {}; From 1387b40d0391279c5b529c47c83ff40446ed17e2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 14:48:41 +0000 Subject: [PATCH 3081/3452] minder: 1.8.0 -> 1.9.0 --- pkgs/applications/misc/minder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index 28157d615377..f391c3621a1f 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "13klasvrndwsmpcxkgy7kvsl2jqmp2cl52vb4i0hk18lr004scgy"; + sha256 = "1j3jk76rd0sc9sd9zrd24q3636559wd809yfnb9bv5jmvn9s1bkz"; }; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; From a40b8a6869bfb47bb0fe258dca02968be594aaac Mon Sep 17 00:00:00 2001 From: Travis CI Date: Thu, 2 Jul 2020 15:26:15 +0000 Subject: [PATCH 3082/3452] gitAndTools.git-machete: 2.14.0 -> 2.15.2 ###### Motivation for this change Update to latest upstream version ###### Things done * [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux) * Built on platform(s) * [x] NixOS * [ ] macOS * [ ] other Linux distributions * [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) * [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"` * [x] Tested execution of all binary files (usually in `./result/bin/`) * [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after) * [ ] Ensured that relevant documentation is up to date * [x] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). ###### Notify maintainers cc @blitz @Ma27 @tfc @worldofpeace --- .../version-management/git-and-tools/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 1ca0ad27de71..9cdec7464a63 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "2.14.0"; + version = "2.15.2"; src = fetchPypi { inherit pname version; - sha256 = "01ch4d0r3bi9nl5nknp3dyizc2rl9w46gm1ydnvqbrzhgw65lpp0"; + sha256 = "0qv08a6xsdmcm8l69m4103vn4crb0ilzx94334xjbdl0sykm55q0"; }; nativeBuildInputs = [ installShellFiles pbr ]; From 79d6d2f8e799bf9749643d57d140742a7626d063 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 15:29:06 +0000 Subject: [PATCH 3083/3452] nuspell: 3.1.1 -> 3.1.2 --- pkgs/development/libraries/nuspell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 57c47c79f843..02c1798ce232 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "18zz3rdzlb3knzsd98vw8cfyb3iq0ilipnlz7rz10zgb5ail73s2"; + sha256 = "0wbb6dwmzlsyy224y0liis0azgzwbjdvcyzc31pw1aw6vbp36na6"; }; nativeBuildInputs = [ cmake pkgconfig ronn ]; From 0a9d9946ed3e1ec526848db2f77f2dc978b46bb5 Mon Sep 17 00:00:00 2001 From: fomichevmi <59839128+fomichevmi@users.noreply.github.com> Date: Mon, 15 Jun 2020 12:06:03 +0200 Subject: [PATCH 3084/3452] tremor: fix src link --- pkgs/development/libraries/tremor/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index c2cb8a836bfa..722094f859c5 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, libogg }: +{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, libogg }: stdenv.mkDerivation { name = "tremor-unstable-2018-03-16"; - src = fetchgit { - url = "https://git.xiph.org/tremor.git"; + src = fetchFromGitLab { + owner = "xiph"; + repo = "tremor"; + domain = "gitlab.xiph.org"; rev = "562307a4a7082e24553f3d2c55dab397a17c4b4f"; sha256 = "0m07gq4zfgigsiz8b518xyb19v7qqp76qmp7lb262825vkqzl3zq"; }; From e522cf0cd7d8c603f976996560f8574d88c6ae05 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Tue, 30 Jun 2020 19:58:13 -0400 Subject: [PATCH 3085/3452] ghc810x: remove obsolete overrides (1/x) async: -doJailbreak ChasingBottoms: -doJailbreak ed25519: -doJailbreak email-validate: -doJailbreak --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 100de850de9d..8299fbae7a2d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -61,11 +61,7 @@ self: super: { haddock-library = self.haddock-library_1_9_0; # Jailbreak to fix the build. - async = doJailbreak super.async; base-noprelude = doJailbreak super.base-noprelude; - ChasingBottoms = doJailbreak super.ChasingBottoms; - ed25519 = doJailbreak super.ed25519; - email-validate = doJailbreak super.email-validate; # https://github.com/Porges/email-validate-hs/issues/51 pandoc = doJailbreak super.pandoc; regex-pcre-builtin = doJailbreak super.regex-pcre-builtin; regex-posix = doJailbreak super.regex-posix; From ccd560128a3e3f07ee6d39a712ad67ba031c0626 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 15:56:29 +0000 Subject: [PATCH 3086/3452] opendht: 2.1.3 -> 2.1.4 --- pkgs/development/libraries/opendht/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index c8b1205bc91b..f9b2e07fb423 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "0qz9mdkanz4vd38bdpwvcwvbpzf19i6019rmqw3k1vh5mh22ljhr"; + sha256 = "1ax26ri1ifb6s8ppd28jmanka9yf8mw3np65q2h4djhhik0phhal"; }; nativeBuildInputs = From 104c8b5e0307062728fe692bb2216153d77dab33 Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Thu, 18 Jun 2020 10:39:03 +0200 Subject: [PATCH 3087/3452] kdenlive: fix core dump on file open --- pkgs/applications/kde/kdenlive.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index 95496f90e043..e011a5652c56 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -31,6 +31,7 @@ , rttr , kpurpose , kdeclarative +, wrapGAppsHook }: mkDerivation { @@ -69,6 +70,7 @@ mkDerivation { rttr kpurpose kdeclarative + wrapGAppsHook ]; # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it # doesn't find them. See: From a00f91f733e706985c9d375a07d0c1044c6bac08 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Thu, 2 Jul 2020 18:56:29 +0200 Subject: [PATCH 3088/3452] perlPackages.MathCalcParser: init at 1.005 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 102db43bc327..6520ee88a616 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11302,6 +11302,22 @@ let }; }; + MathCalcParser = buildPerlPackage { + pname = "Math-Calc-Parser"; + version = "1.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DB/DBOOK/Math-Calc-Parser-1.005.tar.gz"; + sha256 = "afc3eb496ab3a3a301b3437af07e197eb743c06090f0101dacf820302f2b7f75"; + }; + buildInputs = [ TestNeeds ]; + meta = { + homepage = "https://github.com/Grinnz/Math-Calc-Parser"; + description = "Parse and evaluate mathematical expressions"; + license = stdenv.lib.licenses.artistic2; + maintainers = with maintainers; [ sgo ]; + }; + }; + MathCalcUnits = buildPerlPackage { pname = "Math-Calc-Units"; version = "1.07"; From 4ab0be845d510be0a46b91c5d048fbdb3b168509 Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Thu, 2 Jul 2020 12:59:59 -0400 Subject: [PATCH 3089/3452] texlive.bin: fix poppler compatibility patch urls (#91890) --- pkgs/tools/typesetting/tex/texlive/bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index c0ae6b8e187b..1a71ae04d49a 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -46,7 +46,7 @@ let }; in fetchurl { name = "pdftoepdf-poppler${popplerVersion}.cc"; - url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf-poppler${popplerVersion}.cc?revision=52959&view=co"; + url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf-poppler${popplerVersion}.cc?revision=52959&view=co&pathrev=52959"; sha256 = "0pngvw1jgnm4cqskrzf5a3z8rj4ssl10007n3wbblj50hvvzjph3"; postFetch = '' # The trunk added some extra arguments to certain functions so we need to revert that @@ -56,7 +56,7 @@ let }; pdftosrc = fetchurl { name = "pdftosrc-poppler${popplerVersion}.cc"; - url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler${popplerVersion}.cc?revision=52959&view=co"; + url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler${popplerVersion}.cc?revision=52959&view=co&pathrev=52959"; sha256 = "0iq2cmwvf2lxy32sygrafwqgcwvvbdnvxm5l3mrg9cb2a1g06380"; }; in '' From 22ae4633c710533f676686a5a9e71c6b77e4e321 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 16:42:43 +0000 Subject: [PATCH 3090/3452] tcpreplay: 4.3.2 -> 4.3.3 --- pkgs/tools/networking/tcpreplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index d6d7b45364a3..b40df721c83e 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpreplay"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; - sha256 = "0ld9v88g5xs2rykimksmhlkwbv2r97575c4aqmqdxbvc37crnisg"; + sha256 = "1plgjm3dr9rr5q71s7paqk2wgrvkihbk2yrf9g3zaks3m750497d"; }; buildInputs = [ libpcap ]; From a07fe7164b5c3011b519360e8c58b6b4dc891a80 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 18:53:26 +0000 Subject: [PATCH 3091/3452] workcraft: 3.2.6 -> 3.3.0 --- pkgs/applications/science/logic/workcraft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index 685d6ee48619..4038db17f938 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.2.6"; + version = "3.3.0"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "1sfbxmk71gp7paw4l5azqr0lsgsyp4308gx2jz8w4k3nasfshz25"; + sha256 = "072i7kan2c9f4s9jxwqr4ccsi9979c12xhwr385sbq06rwyrna85"; }; buildInputs = [ makeWrapper ]; From 56b6c6d3a7aa1848755398f6299eb306262201ea Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 21:20:40 +0000 Subject: [PATCH 3092/3452] aeolus: 0.9.8 -> 0.9.9 --- pkgs/applications/audio/aeolus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index bfd75b4e75cf..c4982025999f 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "aeolus"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1zfr3567mwbqsfybkhg03n5dvmhllk88c9ayb10qzz2nh6d7g2qn"; + sha256 = "04y1j36y7vc93bv299vfiawbww4ym6q7avfx8vw6rmxr817zrch3"; }; buildInputs = [ From 359139ee3ed538fb5f082cfe2dd2b537adf29586 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 18:19:39 +0000 Subject: [PATCH 3093/3452] ulauncher: 5.7.3 -> 5.8.0 --- pkgs/applications/misc/ulauncher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 34ca82b8d04c..a9713ffed38a 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -19,13 +19,13 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.7.3"; + version = "5.8.0"; disabled = python3Packages.isPy27; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "0wq2zsq3496fjfg89q01dsm7sb7kv92sycvqm6ad8z1z2kpisrbh"; + sha256 = "1czxzcxix9iwv1sir1q64j5aavc7lzjjwqpisgdc1kidkwnk05zp"; }; nativeBuildInputs = with python3Packages; [ From 89b91f73de82b07ad0a11a807c62a5d5bcefdae0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 13:07:27 +0000 Subject: [PATCH 3094/3452] rmapi: 0.0.11 -> 0.0.12 --- pkgs/applications/misc/remarkable/rmapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index 0fe0e03060a8..90e99b5adf83 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rmapi"; - version = "0.0.11"; + version = "0.0.12"; src = fetchFromGitHub { owner = "juruen"; repo = "rmapi"; rev = "v${version}"; - sha256 = "0zks1pcj2s2pqkmw0hhm41vgdhfgj2r6dmvpsagbmf64578ww349"; + sha256 = "049m0p4wbsl822iym8xmc938d4k90iw7wjdzcxfyy8d27hv9mp45"; }; vendorSha256 = "077s13pcql5w2m6wzls1q06r7p501kazbwzxgfh6akwza15kb4is"; From 8f09c8061f0f86b9d07bc25c90042986f099732b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 19:17:35 +0000 Subject: [PATCH 3095/3452] xxHash: 0.7.3 -> 0.7.4 --- pkgs/development/libraries/xxHash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix index 9d2ed44cb4bb..58bf562b0809 100644 --- a/pkgs/development/libraries/xxHash/default.nix +++ b/pkgs/development/libraries/xxHash/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xxHash"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Cyan4973"; repo = "xxHash"; rev = "v${version}"; - sha256 = "0bin0jch6lbzl4f8y052a7azfgq2n7iwqihzgqmcccv5vq4vcx5a"; + sha256 = "08j7wxshhzpyrnyilfnvhyv5ycm0yv5m7jf6q4kxcd7j4dcbhmpb"; }; outputs = [ "out" "dev" ]; From dc5a3f9f138fd115c83f822cfc50233073bc9c45 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 13:36:45 +0000 Subject: [PATCH 3096/3452] rust-cbindgen: 0.14.2 -> 0.14.3 --- pkgs/development/tools/rust/cbindgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index bc0ae5d33fe2..655d726e66ec 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "15mk7q89rs723c7i9wwq4rrvakwh834wvrsmsnayji5k1kwaj351"; + sha256 = "0pw55334i10k75qkig8bgcnlsy613zw2p5j4xyz8v71s4vh1a58j"; }; - cargoSha256 = "03irndd48ck62chm4vmlcnfm98gwd86xm1ssq9glw3b3y0n6x845"; + cargoSha256 = "0088ijnjhqfvdb1wxy9jc7hq8c0yxgj5brlg68n9vws1mz9rilpy"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; From 83ec61c486bd219e9941046557d4cfa7a2de3065 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Jul 2020 03:11:38 +0000 Subject: [PATCH 3097/3452] calibre: 4.17.0 -> 4.19.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index ff39eccf4f84..a6bfc04c3084 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -30,11 +30,11 @@ let in mkDerivation rec { pname = "calibre"; - version = "4.17.0"; + version = "4.19.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "1qgzx2q8a5g102z311ibz4aw1ipn2j1lbndgadig7xvy6zdhknma"; + sha256 = "1kpj65spwr9m88vshsljpdrw5jy7bbpqgqcrvqb17abh7fnnrb4x"; }; patches = [ From 4ec15456b333c87a2ccfffeb6d2c9b96ba579a4a Mon Sep 17 00:00:00 2001 From: Matthias Treydte Date: Thu, 28 May 2020 15:54:44 +0200 Subject: [PATCH 3098/3452] ccache: 3.4.1 -> 3.7.10 The fix-debug-prefix-map-suite patch became obsolete with upstream commit: https://github.com/ccache/ccache/commit/82010e0eb9cb629f61ea516542daf05a53010716 The skip-fs-dependent-test patch with PR: https://github.com/ccache/ccache/pull/444 --- .../development/tools/misc/ccache/default.nix | 28 +++++-------- .../ccache/fix-debug-prefix-map-suite.patch | 42 ------------------- .../misc/ccache/skip-fs-dependent-test.patch | 26 ------------ 3 files changed, 10 insertions(+), 86 deletions(-) delete mode 100644 pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch delete mode 100644 pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 61ed3825bd93..ead30a56e274 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,30 +1,22 @@ -{ stdenv, fetchurl, perl, zlib, makeWrapper }: +{ stdenv, fetchFromGitHub, asciidoc-full, gperf, perl, autoreconfHook, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "3.4.1"; + version = "3.7.10"; - src = fetchurl { - sha256 = "1pppi4jbkkj641cdynmc35jaj40jjicw7gj75ran5qs5886jcblc"; - url = "mirror://samba/ccache/${pname}-${version}.tar.xz"; + src = fetchFromGitHub { + owner = "ccache"; + repo = "ccache"; + rev = "v${version}"; + sha256 = "0v6pvj50y18fxh2f6cx6xyg545xcpxfmrcg9bzbc6lc5acrvvjm7"; }; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ asciidoc-full autoreconfHook gperf perl ]; buildInputs = [ zlib ]; outputs = [ "out" "man" ]; - # non to be fail on filesystems with unconventional blocksizes (zfs on Hydra?) - patches = [ - ./fix-debug-prefix-map-suite.patch - ./skip-fs-dependent-test.patch - ]; - - postPatch = '' - substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)' - ''; - doCheck = !stdenv.isDarwin; passthru = { @@ -71,8 +63,8 @@ let ccache = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compiler cache for fast recompilation of C/C++ code"; - homepage = "http://ccache.samba.org/"; - downloadPage = "https://ccache.samba.org/download.html"; + homepage = "https://ccache.dev/"; + downloadPage = "https://ccache.dev/download.html"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch b/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch deleted file mode 100644 index 98a6fbf10bf1..000000000000 --- a/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/test/suites/debug_prefix_map.bash -+++ b/test/suites/debug_prefix_map.bash -@@ -29,7 +29,7 @@ - expect_stat 'cache hit (preprocessed)' 0 - expect_stat 'cache miss' 1 - expect_stat 'files in cache' 2 -- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then -+ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then - test_failed "Source dir (`pwd`) found in test.o" - fi - -@@ -39,7 +39,7 @@ - expect_stat 'cache hit (preprocessed)' 0 - expect_stat 'cache miss' 1 - expect_stat 'files in cache' 2 -- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then -+ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then - test_failed "Source dir (`pwd`) found in test.o" - fi - -@@ -52,10 +52,10 @@ - expect_stat 'cache hit (preprocessed)' 0 - expect_stat 'cache miss' 1 - expect_stat 'files in cache' 2 -- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then -+ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then - test_failed "Source dir (`pwd`) found in test.o" - fi -- if ! grep "name" test.o >/dev/null 2>&1; then -+ if ! objdump -g test.o | grep ": name$" >/dev/null 2>&1; then - test_failed "Relocation (name) not found in test.o" - fi - -@@ -65,7 +65,7 @@ - expect_stat 'cache hit (preprocessed)' 0 - expect_stat 'cache miss' 1 - expect_stat 'files in cache' 2 -- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then -+ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then - test_failed "Source dir (`pwd`) found in test.o" - fi - } diff --git a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch deleted file mode 100644 index 7b233df6531b..000000000000 --- a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/test/suites/cleanup.bash -+++ b/test/suites/cleanup.bash -@@ -94,23 +94,6 @@ - - $CCACHE -F 0 -M 256K >/dev/null - CCACHE_LOGFILE=/tmp/foo $CCACHE -c >/dev/null -- expect_file_count 3 '*.o' $CCACHE_DIR -- expect_file_count 3 '*.d' $CCACHE_DIR -- expect_file_count 3 '*.stderr' $CCACHE_DIR -- expect_stat 'files in cache' 9 -- expect_stat 'cleanups performed' 1 -- for i in 3 4 5; do -- file=$CCACHE_DIR/a/result$i-4017.o -- if [ ! -f $file ]; then -- test_failed "File $file removed when it shouldn't" -- fi -- done -- for i in 0 1 2 6 7 8 9; do -- file=$CCACHE_DIR/a/result$i-4017.o -- if [ -f $file ]; then -- test_failed "File $file not removed when it should" -- fi -- done - - # ------------------------------------------------------------------------- - TEST "Automatic cache cleanup, limit_multiple 0.9" From 09e40bf5d1401d7448ecba7f14f36ee18fd54586 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 17:45:41 +0000 Subject: [PATCH 3099/3452] pueue: 0.6.0 -> 0.6.1 --- pkgs/applications/misc/pueue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index db84f5fbb9bf..1294ca6dcf4a 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "06jxj89ya91grrwxfs7l1ahy46y993kxsc8gpkxajc0j5ihax2al"; + sha256 = "0x8slqxpnk4pis834g11wzp8fqsxwhdf0xnssz1pkkww4dqzali0"; }; - cargoSha256 = "191j3lpd24ycissw0y2hv65i1cjzf24draamq3sxv7hv0sxcjw4d"; + cargoSha256 = "0r110zlzpzg0j5cq9zg0kk46qigp6bzd0kzmpx3ddvhblhxvq5m5"; nativeBuildInputs = [ installShellFiles ]; From c128229dcea2936080974f5d00341c59deab69fa Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 23 Jun 2020 06:09:29 -0400 Subject: [PATCH 3100/3452] plymouth: Enable systemd-ask-password-plymouth --- nixos/modules/system/boot/plymouth.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 23fce22366d8..55e5b07ed615 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -102,6 +102,8 @@ in systemd.services.plymouth-poweroff.wantedBy = [ "poweroff.target" ]; systemd.services.plymouth-reboot.wantedBy = [ "reboot.target" ]; systemd.services.plymouth-read-write.wantedBy = [ "sysinit.target" ]; + systemd.services.systemd-ask-password-plymouth.wantedBy = ["multi-user.target"]; + systemd.paths.systemd-ask-password-plymouth.wantedBy = ["multi-user.target"]; boot.initrd.extraUtilsCommands = '' copy_bin_and_libs ${pkgs.plymouth}/bin/plymouthd @@ -146,6 +148,7 @@ in # We use `mkAfter` to ensure that LUKS password prompt would be shown earlier than the splash screen. boot.initrd.preLVMCommands = mkAfter '' mkdir -p /etc/plymouth + mkdir -p /run/plymouth ln -s ${configFile} /etc/plymouth/plymouthd.conf ln -s $extraUtils/share/plymouth/plymouthd.defaults /etc/plymouth/plymouthd.defaults ln -s $extraUtils/share/plymouth/logo.png /etc/plymouth/logo.png From 05f8cba1b63629737749d8c6f34c6456fb3b105d Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 30 Jun 2020 21:35:35 -0400 Subject: [PATCH 3101/3452] ZFS: Pipe /dev/null into the stage 2 load-key script Just in case something reads stdin, so that `while read ds kl` doesn't miss anything --- nixos/modules/tasks/filesystems/zfs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 3cdfcebe1b0a..0d2f624a4559 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -521,7 +521,7 @@ in if poolImported "${pool}"; then ${optionalString cfgZfs.requestEncryptionCredentials '' ${packages.zfsUser}/sbin/zfs list -rHo name,keylocation ${pool} | while read ds kl; do - case "$kl" in + (case "$kl" in none ) ;; prompt ) @@ -530,7 +530,7 @@ in * ) ${packages.zfsUser}/sbin/zfs load-key "$ds" ;; - esac + esac) < /dev/null # To protect while read ds kl in case anything reads stdin done ''} echo "Successfully imported ${pool}" From e2f1594695c3795c09f40ed7556af2bbc49b8fdc Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 2 Jul 2020 13:35:05 -0400 Subject: [PATCH 3102/3452] ZFS: Set IFS=$'\t' for the read command in stage 2 load-key Co-authored-by: Graham Christensen --- nixos/modules/tasks/filesystems/zfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 0d2f624a4559..cb8947fd9865 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -520,7 +520,7 @@ in poolImported "${pool}" || poolImport "${pool}" # Try one last time, e.g. to import a degraded pool. if poolImported "${pool}"; then ${optionalString cfgZfs.requestEncryptionCredentials '' - ${packages.zfsUser}/sbin/zfs list -rHo name,keylocation ${pool} | while read ds kl; do + ${packages.zfsUser}/sbin/zfs list -rHo name,keylocation ${pool} | while IFS=$'\t' read ds kl; do (case "$kl" in none ) ;; From f32a8650fd3f1e40675159ca963e381035db8012 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Tue, 16 Jun 2020 10:01:37 +0200 Subject: [PATCH 3103/3452] pythonPackages.canopen: 0.5.1 -> 1.1.0 Bump version for the python canopen module, move to fetchPypi and re-enable tests. --- .../python-modules/canopen/default.nix | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index 83dd1f006fc6..c064fd62fd93 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -1,33 +1,19 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , nose , can , canmatrix }: -buildPythonPackage { +buildPythonPackage rec { pname = "canopen"; - version = "0.5.1"; + version = "1.1.0"; - # use fetchFromGitHub until version containing test/sample.eds - # is available on PyPi - # https://github.com/christiansandberg/canopen/pull/57 - - src = fetchFromGitHub { - owner = "christiansandberg"; - repo = "canopen"; - rev = "b20575d84c3aef790fe7c38c5fc77601bade0ea4"; - sha256 = "1qg47qrkyvyxiwi13sickrkk89jp9s91sly2y90bz0jhws2bxh64"; + src = fetchPypi { + inherit pname version; + sha256 = "0fqa4p3qg7800fykib1x264gizhhmb6dz2hajgwr0hxf5xa19wdl"; }; - #src = fetchPypi { - # inherit pname version; - # sha256 = "0806cykarpjb9ili3mf82hsd9gdydbks8532nxgz93qzg4zdbv2g"; - #}; - - # test_pdo failure https://github.com/christiansandberg/canopen/issues/58 - doCheck = false; - propagatedBuildInputs = [ can canmatrix From e63a9450171af2e2b6211325096908660b465e38 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 2 Jul 2020 11:40:52 -0700 Subject: [PATCH 3104/3452] python3Packages.canmatrix: 0.8.0 -> 0.9.1 --- .../python-modules/canmatrix/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index b9a61af8b489..6e487b58cff7 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -4,6 +4,7 @@ , pythonOlder , attrs , bitstruct +, click , future , pathlib2 , typing @@ -17,20 +18,21 @@ buildPythonPackage rec { pname = "canmatrix"; - version = "0.8"; + version = "0.9.1"; # uses fetchFromGitHub as PyPi release misses test/ dir src = fetchFromGitHub { owner = "ebroecker"; repo = pname; rev = version; - sha256 = "1wzflapyj2j4xsi7d7gfmznmxbgr658n092xyq9nac46rbhpcphg"; + sha256 = "129lcchq45h8wqjvvn0rwpbmih4m0igass2cx7a21z94li97hcia"; }; propagatedBuildInputs = [ # required attrs bitstruct + click future pathlib2 # optional @@ -41,12 +43,18 @@ buildPythonPackage rec { pyyaml ] ++ lib.optional (pythonOlder "3.5") typing; + postPatch = '' + substituteInPlace setup.py \ + --replace "version = versioneer.get_version()" "version = \"${version}\"" + ''; + checkInputs = [ pytest ]; + # long_envvar_name_imports requires stable key value pair ordering checkPhase = '' - pytest -s src/canmatrix + pytest -s src/canmatrix -k 'not long_envvar_name_imports' ''; meta = with lib; { From 8223e99e83b163b9816cf7571b27e0a44b4085db Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 18:48:42 +0000 Subject: [PATCH 3105/3452] saml2aws: 2.26.1 -> 2.26.2 --- pkgs/tools/security/saml2aws/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index d3157529215b..144ac3a95c85 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.26.1"; + version = "2.26.2"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "09b217x10mn3y244rwym0fcqr4ly6n83wnykb77488kn960b0pqb"; + sha256 = "0y5gvdrdr6i9spdwsxvzs1bxs32icxpkqxnglp1bf4gglc580d87"; }; hid = fetchFromGitHub { @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "0xc7b8mwha64j7l2fr2g5zy8pz7cqi0vrxx60gii52b6ii31xncx"; }; - vendorSha256 = "0mns5clykvj33krf29yjh8lkf05nih42ka5ji7miq0iaikqyyc78"; + vendorSha256 = "0f81nrg8v3xh2hcx7g77p3ahr4gyj042bwr1knf2phpahgz9n9rn"; overrideModAttrs = (_: { postBuild = '' cp -r --reflink=auto ${hid}/libusb vendor/github.com/karalabe/hid From 6eb63fc2e57249d60cb3856adcc28da69c08ffcd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 1 Jul 2020 12:30:31 -0700 Subject: [PATCH 3106/3452] pmd: 6.17.0 -> 6.25.0, fix runtime --- pkgs/development/tools/analysis/pmd/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 3f3731e2ac83..f80483e0e123 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip, makeWrapper, openjdk }: stdenv.mkDerivation rec { pname = "pmd"; - version = "6.17.0"; - - nativeBuildInputs = [ unzip ]; + version = "6.25.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "0000w28dg5z8gs7cxhx7d0fv10ry0yxamk5my28ncqqsg7a4qy8w"; + sha256 = "0ykg0wylyfiwjlhkbfjqfam34174paihrw7x1dwfq9anyn5bjf0k"; }; + nativeBuildInputs = [ unzip makeWrapper ]; + installPhase = '' runHook preInstall mkdir -p $out cp -R {bin,lib} $out + wrapProgram $out/bin/run.sh --prefix PATH : ${openjdk.jre}/bin runHook postInstall ''; From 52c87393ea5c6895931be57b9bfac12555400808 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 19:14:01 +0000 Subject: [PATCH 3107/3452] skaffold: 1.11.0 -> 1.12.0 --- pkgs/development/tools/skaffold/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index e104784fbe8f..331f9528a010 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.11.0"; + version = "1.12.0"; # rev is the ${version} commit, mainly for skaffold version command output rev = "931a70a6334436735bfc4ff7633232dd5fc73cc1"; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "035xp34m8kzb75mivgf3kw026n2h6g2a7j2mi32nxl1a794w36zi"; + sha256 = "12m2yqlngxvyyiqa58fmdwi752bz3mkk8fi312dvakr5kysnvn1l"; }; nativeBuildInputs = [ installShellFiles ]; From 3b4df94aeb6e215085d08e3d5b0edc1313b9f584 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 2 Jul 2020 21:34:20 +0200 Subject: [PATCH 3108/3452] python.pkgs.zstandard: use libzstd instead of python zstd --- pkgs/development/python-modules/zstandard/default.nix | 3 ++- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index bcac246e8f62..75c847624315 100755 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -15,7 +15,8 @@ buildPythonPackage rec { sha256 = "e5cbd8b751bd498f275b0582f449f92f14e64f4e03b5bf51c571240d40d43561"; }; - propagatedBuildInputs = [ cffi zstd ]; + buildInputs = [ zstd ]; + propagatedBuildInputs = [ cffi ]; checkInputs = [ hypothesis ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dc40a0668a7c..f272c88315f4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7298,7 +7298,9 @@ in { inherit (pkgs) zstd pkgconfig; }; - zstandard = callPackage ../development/python-modules/zstandard { }; + zstandard = callPackage ../development/python-modules/zstandard { + inherit (pkgs) zstd; + }; zxcvbn = callPackage ../development/python-modules/zxcvbn { }; From 0091e0358bec6952511786b28676753b02bdf860 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 2 Jul 2020 21:49:20 +0200 Subject: [PATCH 3109/3452] python.pkgs.zstandard: it vendors a copy of zstd... so we don't even need to give zstd at all. Related discussion https://github.com/NixOS/nixpkgs/issues/92075. Follow-up to 3b4df94aeb6e215085d08e3d5b0edc1313b9f584 --- pkgs/development/python-modules/zstandard/default.nix | 2 -- pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index 75c847624315..760593904be3 100755 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -3,7 +3,6 @@ , fetchPypi , cffi , hypothesis -, zstd }: buildPythonPackage rec { @@ -15,7 +14,6 @@ buildPythonPackage rec { sha256 = "e5cbd8b751bd498f275b0582f449f92f14e64f4e03b5bf51c571240d40d43561"; }; - buildInputs = [ zstd ]; propagatedBuildInputs = [ cffi ]; checkInputs = [ hypothesis ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f272c88315f4..dc40a0668a7c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7298,9 +7298,7 @@ in { inherit (pkgs) zstd pkgconfig; }; - zstandard = callPackage ../development/python-modules/zstandard { - inherit (pkgs) zstd; - }; + zstandard = callPackage ../development/python-modules/zstandard { }; zxcvbn = callPackage ../development/python-modules/zxcvbn { }; From 66d0b2a0d05dc526e1d6d30d7289282e63af0ceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 23 Jun 2020 10:12:54 +0200 Subject: [PATCH 3110/3452] python3Packages.tokenizers: init at 0.8.0 --- .../python-modules/tokenizers/default.nix | 121 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 3 + 2 files changed, 124 insertions(+) create mode 100644 pkgs/development/python-modules/tokenizers/default.nix diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix new file mode 100644 index 000000000000..348df4ae95e8 --- /dev/null +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -0,0 +1,121 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, fetchurl +, maturin +, pipInstallHook +, pytest +, python +, requests +}: + +let + robertaVocab = fetchurl { + url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-vocab.json"; + sha256 = "0m86wpkfb2gdh9x9i9ng2fvwk1rva4p0s98xw996nrjxs7166zwy"; + }; + robertaMerges = fetchurl { + url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-merges.txt"; + sha256 = "1idd4rvkpqqbks51i2vjbd928inw7slij9l4r063w3y5fd3ndq8w"; + }; + bertVocab = fetchurl { + url = "https://s3.amazonaws.com/models.huggingface.co/bert/bert-base-uncased-vocab.txt"; + sha256 = "18rq42cmqa8zanydsbzrb34xwy4l6cz1y900r4kls57cbhvyvv07"; + }; + openaiVocab = fetchurl { + url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-vocab.json"; + sha256 = "0y40gc9bixj5rxv674br1rxmxkd3ly29p80x1596h8yywwcrpx7x"; + }; + openaiMerges = fetchurl { + url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-merges.txt"; + sha256 = "09a754pm4djjglv3x5pkgwd6f79i2rq8ydg0f7c3q1wmwqdbba8f"; + }; +in rustPlatform.buildRustPackage rec { + pname = "tokenizers"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = pname; + rev = "python-v${version}"; + sha256 = "0f5r1wm5ybyk3jvihj1g98y7ihq0iklg0pwkaa11pk1gv0k869w3"; + }; + + cargoSha256 = "131bvf35q5n65mq6zws1rp5fn2qkfwfg9sbxi5y6if24n8fpdz4m"; + + sourceRoot = "source/bindings/python"; + + nativeBuildInputs = [ + maturin + pipInstallHook + ]; + + propagatedBuildInputs = [ + python + ]; + + # tokenizers uses pyo3, which requires Rust nightly. + RUSTC_BOOTSTRAP = 1; + + doCheck = false; + doInstallCheck = true; + + postUnpack = '' + # Add data files for tests, otherwise tests attempt network access. + mkdir $sourceRoot/tests/data + ( cd $sourceRoot/tests/data + ln -s ${robertaVocab} roberta-base-vocab.json + ln -s ${robertaMerges} roberta-base-merges.txt + ln -s ${bertVocab} bert-base-uncased-vocab.txt + ln -s ${openaiVocab} openai-gpt-vocab.json + ln -s ${openaiMerges} openai-gpt-merges.txt ) + ''; + + postPatch = '' + # pyo3's build check verifies that Rust is a nightly + # version. Disable this check. + substituteInPlace $NIX_BUILD_TOP/$cargoDepsCopy/pyo3/build.rs \ + --replace "check_rustc_version()?;" "" + + # Patching the vendored dependency invalidates the file + # checksums, so remove them. This should be safe, since + # this is just a copy of the vendored dependencies and + # the integrity of the vendored dependencies is validated + # by cargoSha256. + sed -r -i 's|"files":\{[^}]+\}|"files":{}|' \ + $NIX_BUILD_TOP/$cargoDepsCopy/pyo3/.cargo-checksum.json + + # Maturin uses the crate name as the wheel name. + substituteInPlace Cargo.toml \ + --replace "tokenizers-python" "tokenizers" + ''; + + buildPhase = '' + maturin build --release --manylinux off + ''; + + installPhase = '' + # Put the wheels where the pip install hook can find them. + install -Dm644 -t dist target/wheels/*.whl + pipInstallPhase + ''; + + installCheckInputs = [ + pytest + requests + ]; + + installCheckPhase = '' + # Append paths, or the binding's tokenizer module will be + # used, since the test directories have __init__.py + pytest --import-mode=append + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/huggingface/tokenizers"; + description = "Fast State-of-the-Art Tokenizers optimized for Research and Production"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dc40a0668a7c..b2b3f85e7160 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1502,6 +1502,9 @@ in { inherit (pkgs) sentencepiece pkgconfig; }; + tokenizers = disabledIf (!isPy3k) + (toPythonModule (callPackage ../development/python-modules/tokenizers { })); + transformers = callPackage ../development/python-modules/transformers { }; transforms3d = callPackage ../development/python-modules/transforms3d { }; From 70d359ca0b8248e40ca171648e4c811da55cd516 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 20:00:08 +0000 Subject: [PATCH 3111/3452] telegraf: 1.14.4 -> 1.14.5 --- pkgs/servers/monitoring/telegraf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 388d7fe37908..7b284ac122a8 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.14.4"; + version = "1.14.5"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,10 +14,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "0kbf1r9b9xylq0akmklzy94pcljayhdjm539fwazp5c1364qmbjm"; + sha256 = "1rnrg1q0dylr62cfkzspp47w818cja3hs6bbarcksmp0s23rq6lz"; }; - vendorSha256 = "05nj99hl5f5l0a2aswy19wmbm94hd1h03r227gmn419dkzc5hpah"; + vendorSha256 = "1mjlakf88fa75qldkz62aja0wn0m6xqfr45vjy0lwpi0adc0fz70"; buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} From b5f7b79a2d0d7c0c9f08b5ee838b42d2dcb4897f Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 2 Jul 2020 16:08:50 -0400 Subject: [PATCH 3112/3452] ZFS: Update description for requestEncryptionCredentials --- nixos/modules/tasks/filesystems/zfs.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index cb8947fd9865..c9d9c6c1657d 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -197,9 +197,7 @@ in Request encryption keys or passwords for all encrypted datasets on import. For root pools the encryption key can be supplied via both an interactive prompt (keylocation=prompt) and from a file - (keylocation=file://). Note that for data pools the encryption key can - be only loaded from a file and not via interactive prompt since the - import is processed in a background systemd service. + (keylocation=file://). ''; }; From cf0552de9b46e33c54523019ed10becc129e624d Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Thu, 2 Jul 2020 15:04:37 +0200 Subject: [PATCH 3113/3452] owncloud-client: add libsecret dependency The libsecret dependency is required to access secrets from the gnome keychain. --- pkgs/applications/networking/owncloud-client/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 3fc9fedc4138..a487da6f5ad7 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtkeychain, sqlite }: +{ lib, stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtkeychain, sqlite, libsecret }: mkDerivation rec { pname = "owncloud-client"; @@ -12,6 +12,10 @@ mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ qtbase qtkeychain sqlite ]; + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" + ]; + cmakeFlags = [ "-UCMAKE_INSTALL_LIBDIR" "-DNO_SHIBBOLETH=1" From 17e1fbe0fc683de504907c95253db55e1eacc685 Mon Sep 17 00:00:00 2001 From: Pawel Kruszewski Date: Sun, 28 Jun 2020 03:17:49 +0200 Subject: [PATCH 3114/3452] eclipse-mat: init at 1.10.0.20200225 Closes #43611 --- .../development/tools/eclipse-mat/default.nix | 119 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 121 insertions(+) create mode 100644 pkgs/development/tools/eclipse-mat/default.nix diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix new file mode 100644 index 000000000000..44411d0db72c --- /dev/null +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -0,0 +1,119 @@ +{ buildEnv +, fetchurl +, fontconfig +, freetype +, glib +, gsettings-desktop-schemas +, gtk3 +, jdk11 +, lib +, libX11 +, libXrender +, libXtst +, makeDesktopItem +, makeWrapper +, shared-mime-info +, stdenv +, unzip +, webkitgtk +, zlib +}: + +with lib; +let + pVersion = "1.10.0.20200225"; + pVersionTriple = splitVersion pVersion; + majorVersion = elemAt pVersionTriple 0; + minorVersion = elemAt pVersionTriple 1; + patchVersion = elemAt pVersionTriple 2; + baseVersion = "${majorVersion}.${minorVersion}.${patchVersion}"; + jdk = jdk11; +in +stdenv.mkDerivation rec { + pname = "eclipse-mat"; + version = "${pVersion}"; + + src = fetchurl { + url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip"; + sha256 = "11cg01gjjvlm6lr6z6rwqs1r31xx5pxddnz55ca0s33lrnywf9fx"; + }; + + desktopItem = makeDesktopItem { + name = "eclipse-mat"; + exec = "eclipse-mat"; + icon = "eclipse"; + comment = "Eclipse Memory Analyzer"; + desktopName = "Eclipse MAT"; + genericName = "Java Memory Analyzer"; + categories = "Development;"; + }; + + unpackPhase = '' + unzip $src + ''; + + buildCommand = '' + mkdir -p $out + unzip $src + mv mat $out + + # Patch binaries. + interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) + libCairo=$out/eclipse/libcairo-swt.so + patchelf --set-interpreter $interpreter $out/mat/MemoryAnalyzer + [ -f $libCairo ] && patchelf --set-rpath ${ + stdenv.lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ] + } $libCairo + + # Create wrapper script. Pass -configuration to store settings in ~/.eclipse-mat/ + makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \ + --prefix PATH : ${jdk}/bin \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration" + + # Create desktop item. + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + mkdir -p $out/share/pixmaps + find $out/mat/plugins -name 'eclipse*.png' -type f -exec cp {} $out/share/pixmaps \; + mv $out/share/pixmaps/eclipse64.png $out/share/pixmaps/eclipse.png + ''; + + buildInputs = [ + fontconfig + freetype + glib + gsettings-desktop-schemas + gtk3 + jdk + libX11 + libXrender + libXtst + makeWrapper + zlib + unzip + shared-mime-info + webkitgtk + ]; + + dontBuild = true; + dontConfigure = true; + + meta = with stdenv.lib; { + description = "Fast and feature-rich Java heap analyzer"; + longDescription = '' + The Eclipse Memory Analyzer is a tool that helps you find memory + leaks and reduce memory consumption. Use the Memory Analyzer to + analyze productive heap dumps with hundreds of millions of + objects, quickly calculate the retained sizes of objects, see + who is preventing the Garbage Collector from collecting objects, + run a report to automatically extract leak suspects. + ''; + homepage = "https://www.eclipse.org/mat"; + license = licenses.epl20; + maintainers = [ maintainers.ktor ]; + platforms = [ "x86_64-linux" ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 462989e6fc69..9b6dac6bfc34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -183,6 +183,8 @@ in deadcode = callPackage ../development/tools/deadcode { }; + eclipse-mat = callPackage ../development/tools/eclipse-mat { }; + glade = callPackage ../development/tools/glade { }; hobbes = callPackage ../development/tools/hobbes { }; From f91075506c0bc67b08a7da755d018bdb128bd6c6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 21:05:21 +0000 Subject: [PATCH 3115/3452] txt2man: 1.7.0 -> 1.7.1 --- pkgs/tools/misc/txt2man/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix index 6013dc1c26b9..ded409754bcb 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "txt2man"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "https://github.com/mvertes/txt2man/archive/${pname}-${version}.tar.gz"; - sha256 = "06jf8hqav095db1v3njavx0rphmpmi3mgki4va6qkxjnvmdx4742"; + sha256 = "0ka3krmblsprv0v6h6wnm8lv08w30z0ynfnbwns6alks5gx1p6sd"; }; preConfigure = '' From caa858d77738232f043213b1cc371408e696ff34 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Wed, 24 Jun 2020 22:28:13 +0200 Subject: [PATCH 3116/3452] gpsbabel: enable usb PR #91439 --- pkgs/applications/misc/gpsbabel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index ef4c732ef521..1915b2dae17d 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase, libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "gpsbabel"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ zlib qtbase which ] + buildInputs = [ zlib qtbase which libusb-compat-0_1 ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; /* FIXME: Building the documentation, with "make doc", requires this: From 6f460a74a175e5f1176262a36dc8d9fe86bc3f99 Mon Sep 17 00:00:00 2001 From: Kimat Boven Date: Fri, 1 May 2020 17:38:22 +0200 Subject: [PATCH 3117/3452] espanso: init at 0.6.3 --- pkgs/applications/office/espanso/default.nix | 56 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/office/espanso/default.nix diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix new file mode 100644 index 000000000000..8fb9b3c78784 --- /dev/null +++ b/pkgs/applications/office/espanso/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, pkgconfig +, extra-cmake-modules +, libX11 +, libXi +, libXtst +, libnotify +, openssl +, xclip +, xdotool +}: + +rustPlatform.buildRustPackage rec { + pname = "espanso"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "federico-terzi"; + repo = pname; + rev = "v${version}"; + sha256 = "1x5p7hniapggqd18rx26mjvdf33z7rm7zz5vsqm2siv3mcl19033"; + }; + + cargoSha256 = "0liwwdncymjql5dw7rwhhimcr7qdbyvfgmsd0bawvi0ym7m1v408"; + + nativeBuildInputs = [ + extra-cmake-modules + pkgconfig + ]; + + buildInputs = [ + libX11 + libXtst + libXi + libnotify + openssl + xdotool + ]; + + # Some tests require networking + doCheck = false; + + meta = with stdenv.lib; { + description = "Cross-platform Text Expander written in Rust"; + homepage = "https://espanso.org"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ kimat ]; + platforms = platforms.all; + + longDescription = '' + Espanso detects when you type a keyword and replaces it while you're typing. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 010f5c489e15..1619bc690900 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1792,6 +1792,8 @@ in eschalot = callPackage ../tools/security/eschalot { }; + espanso = callPackage ../applications/office/espanso { }; + esphome = callPackage ../tools/misc/esphome { }; esptool = callPackage ../tools/misc/esptool { }; From e5c4f3777fb999b098c8961efb91fe0a15487e73 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Fri, 3 Jul 2020 00:15:41 +0200 Subject: [PATCH 3118/3452] matrix-synapse: 1.15.1 -> 1.15.2 [security] --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index fbcec04e5320..4af80e27711a 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.15.1"; + version = "1.15.2"; src = fetchPypi { inherit pname version; - sha256 = "1hfyqp5bzsqp002synxp9jcm9fwzw9p0gcklmycmv616x3flylkf"; + sha256 = "1qsrpzq6i2zakpi9sa5sjnjd4bk92n7zgkpcmpaa4sd9ya1wqifb"; }; patches = [ From c2228aea03b45b520dd73cf77c995566b2cedf55 Mon Sep 17 00:00:00 2001 From: Chuck Date: Thu, 2 Jul 2020 15:35:14 -0700 Subject: [PATCH 3119/3452] xsecurelock: Remove unused deps imagemagick, xset imagemagick dependency went away in version 1.2. xset dependency went away in version 1.4. --- pkgs/tools/X11/xsecurelock/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index effdd76ce9db..99d695df2674 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , libX11, libXcomposite, libXft, libXmu, libXrandr, libXext, libXScrnSaver -, pam, apacheHttpd, imagemagick, pamtester, xscreensaver, xset }: +, pam, apacheHttpd, pamtester, xscreensaver }: stdenv.mkDerivation rec { pname = "xsecurelock"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libX11 libXcomposite libXft libXmu libXrandr libXext libXScrnSaver - pam apacheHttpd imagemagick pamtester + pam apacheHttpd pamtester ]; configureFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d74bc22f2571..be4edaa413fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7822,9 +7822,7 @@ in libxml2 = libxml2Python; }; - xsecurelock = callPackage ../tools/X11/xsecurelock { - xset = xorg.xset; - }; + xsecurelock = callPackage ../tools/X11/xsecurelock { }; xsel = callPackage ../tools/misc/xsel { }; From f16dc8aaf4c45354772e0b24ccac733da6f8e0e5 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Fri, 3 Jul 2020 01:04:30 +0200 Subject: [PATCH 3120/3452] wasmtime: 0.17.0 -> 0.18.0 https://github.com/bytecodealliance/wasmtime/releases/tag/v0.18.0 --- pkgs/development/interpreters/wasmtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 5e8cba94e1ab..120d1c29f31c 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "bytecodealliance"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoSha256 = "149nav392wf4sr50dpdlnvfq3vfrrl9lqgr98g5dyzfjrf5jbzm3"; + cargoSha256 = "0r92jafxbji2sgc5a4syycsk705zcx4wqfwgg73sx568mfxkw225"; nativeBuildInputs = [ python cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ From 2b866d8b539fbb65b8ee72aef580074b08c31f53 Mon Sep 17 00:00:00 2001 From: Elan Kugelmass <64796365+ekpdt@users.noreply.github.com> Date: Thu, 2 Jul 2020 19:29:43 -0400 Subject: [PATCH 3121/3452] go-jsonnet: add jsonnetfmt binary (#91953) Add binary jsonnetfmt to go-jsonnet package go-jsonnet added a jsonnetfmt implementation in [0.16.0](https://github.com/google/jsonnet/releases/tag/v0.16.0) As nix includes the C++ jsonnetfmt implementation in the main jsonnet package, it makes sense to mirror that pattern in the go package. --- pkgs/development/compilers/go-jsonnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index d85cf1adfe78..f528b9f13646 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "0nsm4gsbbn8myz4yfi6m7qc3iizhdambsr18iks0clkdn3mi2jn1"; - subPackages = [ "cmd/jsonnet" ]; + subPackages = [ "cmd/jsonnet" "cmd/jsonnetfmt" ]; meta = with lib; { description = "An implementation of Jsonnet in pure Go"; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ nshalman ]; }; -} \ No newline at end of file +} From 502ad5b0ef4013d33f07b9fa39e7e3417df83831 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 16:31:38 -0700 Subject: [PATCH 3122/3452] nfpm: 1.3.1 -> 1.3.2 (#92055) --- pkgs/tools/package-management/nfpm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 4c04f24b26c3..17fa6fad83a5 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "14083sxim17nwmq7w7wvq9sq9pai860v8a2q14vz16hd2i427aqp"; + sha256 = "1z6z4ad5id6bcxzd8p76akxwvf5jzr54w81798ri9lysf4hdi6sh"; }; - vendorSha256 = "0v86fwi1i6b8ngf60ag31mrbah45f0ncqhrjdk5494f139c26067"; + vendorSha256 = "0v14j4vsp7f29xajym2dd2zlfv0sqhb04qfs76bcnn0ys6j1xkny"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From ce5cdd36cf09383d978f2393be3b9000421e7542 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 3 Jul 2020 09:32:25 +1000 Subject: [PATCH 3123/3452] crun: 0.13 -> 0.14 https://github.com/containers/crun/releases/tag/0.14 --- pkgs/applications/virtualization/crun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index a11d5d356d14..8e903f475da2 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "0c5acf916yv2zv3xjvxk1sa4h3n2wljc5hw61php7q37pbjc1ppn"; + sha256 = "14hmdarmhkfp5qgd8ifn7dn895j54ibaficci82q40haqh252l4n"; fetchSubmodules = true; }; From 30436fc02a557e02954fb096edc6e609917239f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 19:33:26 +0000 Subject: [PATCH 3124/3452] stella: 6.2 -> 6.2.1 --- pkgs/misc/emulators/stella/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 591b2daaf15b..4c657fc30bba 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "stella"; - version = "6.2"; + version = "6.2.1"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; rev = version; - sha256 = "1d97g4m686xsj6r5vy5x74ys9yk0hcpdppxh714n8hhcc9aglm19"; + sha256 = "1yhszswwg217x8d2qlcasi9l97y1z6w1pgliys4p27zv5b1ygy7p"; }; nativeBuildInputs = [ pkgconfig ]; From 23d2c9defda849126d5c5382d5885b01849728cb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Jul 2020 02:30:28 +0200 Subject: [PATCH 3125/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-7-g30d5c33 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/28afe9d9f290a392e5783074bc5d2f31f4ba6894. --- .../haskell-modules/hackage-packages.nix | 267 ++++++++++++++---- 1 file changed, 210 insertions(+), 57 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ab0526edd961..6ace0f0f6c06 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6363,6 +6363,8 @@ self: { pname = "Frames"; version = "0.6.4"; sha256 = "1z1bv3dqna9gp6k2rjnbl54hxkaxl4khdlfy52r0cv51ah8969ri"; + revision = "1"; + editedCabalFile = "0jyb2vvlcl8wjvaga4cipq9fwvjrimygq0cbdzmq4f806xrpk2y3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -28883,6 +28885,24 @@ self: { broken = true; }) {}; + "amqp-streamly" = callPackage + ({ mkDerivation, amqp, base, bytestring, hspec, process, streamly + , testcontainers, text + }: + mkDerivation { + pname = "amqp-streamly"; + version = "0.1.0"; + sha256 = "103srk8i4lpaxbr6sd1c3qq2ag1bv7x0qvzr1a4rqh3ra8wn46qq"; + libraryHaskellDepends = [ amqp base streamly text ]; + testHaskellDepends = [ + amqp base bytestring hspec process streamly testcontainers text + ]; + description = "A simple streamly wrapper for amqp"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {testcontainers = null;}; + "amqp-utils" = callPackage ({ mkDerivation, amqp, base, bytestring, connection, containers , data-default-class, directory, hinotify, magic, network, process @@ -75152,8 +75172,8 @@ self: { ({ mkDerivation, base, dobutokO-frequency }: mkDerivation { pname = "dobutokO-effects"; - version = "0.3.1.0"; - sha256 = "03xsgbmvbkgqprxq6pkdifjcli7wf9clvyz9k4g5c5p387yj9jh5"; + version = "0.4.0.0"; + sha256 = "1w4n4sag05qggj79ygdkxjgnyy4c7azl29gvhkqpf38gd4jqdysy"; libraryHaskellDepends = [ base dobutokO-frequency ]; description = "A library to deal with SoX effects and possibilities"; license = stdenv.lib.licenses.mit; @@ -83524,6 +83544,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exception-transformers_0_4_0_9" = callPackage + ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit + , transformers, transformers-compat + }: + mkDerivation { + pname = "exception-transformers"; + version = "0.4.0.9"; + sha256 = "033z8mhczwf59lh59q3z546gkcsy0bzg98r1qhm3fiq7j11hgd95"; + libraryHaskellDepends = [ base transformers transformers-compat ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit transformers + transformers-compat + ]; + description = "Type classes and monads for unchecked extensible exceptions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exceptional" = callPackage ({ mkDerivation, base, exceptions }: mkDerivation { @@ -124803,6 +124841,8 @@ self: { pname = "hledger"; version = "1.18.1"; sha256 = "1yl6akcbmz5qy559m0k0cndwb6wdzvq2jqn7ahc46v3ai6hwk20c"; + revision = "1"; + editedCabalFile = "1fz1wwpxf6scr8nnrd2n1g92vya9bd0l54fcx3sqhyk5kaf8kp2z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125000,6 +125040,8 @@ self: { pname = "hledger-lib"; version = "1.18.1"; sha256 = "16fd3412n4vdnjacngjx5078yzmypn389m91308kgbd8anv6bhj4"; + revision = "1"; + editedCabalFile = "1icjbfzdq2yd3h6qx245xyb4qahxih97rx63qhxx3vaicvph40pk"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -125125,6 +125167,8 @@ self: { pname = "hledger-web"; version = "1.18.1"; sha256 = "1s10xyiqs77xl949m7rc71a4511i755yiv88jb0pc32xba7a2b1y"; + revision = "1"; + editedCabalFile = "01amhyjlw6xjh97zhxx8j05jszw0c0wnv7ka835n7rjnnv8199l3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140833,6 +140877,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "implicit-hie-cradle" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, containers + , directory, extra, filepath, hie-bios, hslogger, implicit-hie + , process, temporary, text, time, transformers, unix-compat + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "implicit-hie-cradle"; + version = "0.1.0.0"; + sha256 = "0yyzfpmv5x2ivzjsjwngklxv5nkad987ns8w3g7h92s5j1fb7x82"; + libraryHaskellDepends = [ + base base16-bytestring bytestring containers directory extra + filepath hie-bios hslogger implicit-hie process temporary text time + transformers unix-compat unordered-containers vector yaml + ]; + testHaskellDepends = [ base ]; + description = "Auto generate hie-bios cradles"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "implicit-logging" = callPackage ({ mkDerivation, base, mtl, time, transformers }: mkDerivation { @@ -150141,30 +150205,33 @@ self: { "knit-haskell" = callPackage ({ mkDerivation, aeson-pretty, base, base64-bytestring - , blaze-colonnade, blaze-html, bytestring, case-insensitive + , blaze-colonnade, blaze-html, bytestring, case-insensitive, cereal , colonnade, constraints, containers, diagrams-lib, diagrams-svg - , directory, Glob, here, http-client, http-client-tls, http-types - , hvega, logging-effect, lucid, mtl, network, network-uri, pandoc - , plots, polysemy, polysemy-plugin, polysemy-RandomFu, polysemy-zoo - , prettyprinter, random, random-fu, random-source, svg-builder - , text, time + , directory, doctemplates, exceptions, Glob, here, http-client + , http-client-tls, http-types, hvega, lucid, monad-control, mtl + , network, network-uri, pandoc, plots, polysemy, polysemy-plugin + , polysemy-RandomFu, polysemy-zoo, prettyprinter, random, random-fu + , random-source, say, stm, store, streamly, streamly-bytestring + , svg-builder, text, time, transformers-base }: mkDerivation { pname = "knit-haskell"; - version = "0.7.0.0"; - sha256 = "06p802fx328hkl3d9rnbdvlmhh9fyx2l293hg65z5ad96c9xzwas"; + version = "0.8.0.0"; + sha256 = "1maq5s4f05fpd98nw2gljqcwgdr62hy5lpcblvybcyp2xqh8fc9i"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson-pretty base base64-bytestring blaze-colonnade blaze-html - bytestring case-insensitive colonnade constraints containers - diagrams-lib diagrams-svg directory Glob http-client - http-client-tls http-types hvega logging-effect lucid mtl network - network-uri pandoc polysemy polysemy-plugin polysemy-zoo - prettyprinter random random-fu random-source svg-builder text time + bytestring case-insensitive cereal colonnade constraints containers + diagrams-lib diagrams-svg directory doctemplates exceptions Glob + http-client http-client-tls http-types hvega lucid monad-control + mtl network network-uri pandoc polysemy polysemy-plugin + polysemy-zoo prettyprinter random say stm streamly + streamly-bytestring svg-builder text time transformers-base ]; testHaskellDepends = [ - base blaze-html colonnade containers here hvega mtl plots polysemy - polysemy-plugin polysemy-RandomFu random-fu random-source text + base blaze-html bytestring colonnade containers here hvega mtl + plots polysemy polysemy-plugin polysemy-RandomFu random-fu + random-source store streamly text ]; description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc"; license = stdenv.lib.licenses.bsd3; @@ -155168,8 +155235,8 @@ self: { pname = "lentil"; version = "1.3.2.0"; sha256 = "134f9ijnd1dw2l9k5m1ay643pc4jqmq5kx17cnijb7ff93442s0n"; - revision = "1"; - editedCabalFile = "0i3khfhc2k9wnyb8bb0mkh5vn2p3f6q9n6vy8ndydz1dzaxg56bb"; + revision = "2"; + editedCabalFile = "0xijjp1ysybbd9n3f5vcaph1qdad5v9ynp0jia5aaizr34lwx94z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -169721,10 +169788,8 @@ self: { }: mkDerivation { pname = "monad-dijkstra"; - version = "0.1.1.2"; - sha256 = "1890rnypk3ra4f0f3m7nr31df3x6pmpw6ivid77wj7h9mdp0bdb6"; - revision = "1"; - editedCabalFile = "0dwcwwlfkhjl31asr35cy1m26nacz9xjry01cnq1dyaqcg53xjjb"; + version = "0.1.1.3"; + sha256 = "13zb3k0rfqpzz3ngmkqhc4zfa6p8nzj9hcsnfilkn8179pwp0qkc"; libraryHaskellDepends = [ base containers free mtl psqueues transformers ]; @@ -179163,18 +179228,18 @@ self: { ({ mkDerivation, aeson, ansi-wl-pprint, base, base64, binary , bytestring, case-insensitive, containers, ede , enclosed-exceptions, http-client, http-types, ngx-export - , ngx-export-tools, snap-core, snap-server, template-haskell, text - , time, trifecta, unordered-containers + , ngx-export-tools, safe, snap-core, snap-server, template-haskell + , text, time, trifecta, unordered-containers }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.4.1.1"; - sha256 = "15d5dj8mdihj8m559lrfwwpb55nkkkapwd9x84jxsv6pmnh5m0qh"; + version = "0.5.0.0"; + sha256 = "190f1cwjz52j12mxr9bgrmrlna4nfqlvv4jf6qnjl92sgsci6dda"; libraryHaskellDepends = [ aeson ansi-wl-pprint base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client http-types - ngx-export ngx-export-tools snap-core snap-server template-haskell - text time trifecta unordered-containers + ngx-export ngx-export-tools safe snap-core snap-server + template-haskell text time trifecta unordered-containers ]; description = "More extra tools for Nginx haskell module"; license = stdenv.lib.licenses.bsd3; @@ -179624,6 +179689,46 @@ self: { broken = true; }) {}; + "nix-tree" = callPackage + ({ mkDerivation, aeson, async, base, brick, containers, deepseq + , directory, filepath, hashable, hrfsize, lens, parallel, protolude + , text, transformers, typed-process, unordered-containers, vty + }: + mkDerivation { + pname = "nix-tree"; + version = "0.1.0.0"; + sha256 = "0agj882mfnr53jlpn1cnds31b78qw3a13md1ap6jj2rnxs2zjcai"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async base brick containers deepseq directory filepath + hashable hrfsize lens parallel protolude text transformers + typed-process unordered-containers vty + ]; + description = "Interactively browse a Nix store paths dependencies"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "nixdu" = callPackage + ({ mkDerivation, aeson, async, base, brick, containers, deepseq + , directory, filepath, hashable, hrfsize, lens, parallel, protolude + , text, transformers, typed-process, unordered-containers, vty + }: + mkDerivation { + pname = "nixdu"; + version = "0.1.0.0"; + sha256 = "1a9ng3xaiddnmfjzd1dsmxf87114n6ga43w8hsij06p0la84mqq5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async base brick containers deepseq directory filepath + hashable hrfsize lens parallel protolude text transformers + typed-process unordered-containers vty + ]; + description = "Interactively browse a Nix store paths dependencies"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nixfmt" = callPackage ({ mkDerivation, base, cmdargs, directory, filepath, megaparsec , parser-combinators, safe-exceptions, text, unix @@ -186455,8 +186560,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.6.3"; - sha256 = "1528cn5phcsc2x3h69p64sm7jap34ca3dsdh5qw2jx1vmgn42mi5"; + version = "0.3.6.4"; + sha256 = "1k6gfjhfgzvqgm4j6qv9y3gg5p8f87kvqhql3819qzwpsm8nx3k6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -196858,8 +196963,8 @@ self: { }: mkDerivation { pname = "posplyu"; - version = "0.1.0"; - sha256 = "1whdihlfcgjy4na86qhhhixa0l494005shfxs5ns61qsdw7mwflk"; + version = "0.1.0.1"; + sha256 = "09yafx5d82h4vsx2pp2hccwy74b7nhbys971g86qcg6yf24ha621"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -206114,15 +206219,15 @@ self: { "random-fu" = callPackage ({ mkDerivation, base, erf, math-functions, monad-loops, mtl - , random-shuffle, random-source, rvar, syb, template-haskell - , transformers, vector + , random, random-shuffle, random-source, rvar, syb + , template-haskell, transformers, vector }: mkDerivation { pname = "random-fu"; - version = "0.2.7.4"; - sha256 = "13dgx069lvdfxm7l2q2l6d7q0gd3wp41b8l4l6wmhlfbl5xici3m"; + version = "0.2.7.6"; + sha256 = "1as1g6i80jy3vnj71h33bj5ywlw9bsdcqwbl3pdqqfqp0mv13rfk"; libraryHaskellDepends = [ - base erf math-functions monad-loops mtl random-shuffle + base erf math-functions monad-loops mtl random random-shuffle random-source rvar syb template-haskell transformers vector ]; description = "Random number generation"; @@ -206189,8 +206294,8 @@ self: { }: mkDerivation { pname = "random-source"; - version = "0.3.0.8"; - sha256 = "0kjvpmxhff6id99hhgjp3vvb4vlhs3shkrh1n5cbfm7450lpmmn2"; + version = "0.3.0.10"; + sha256 = "1ii7pr9dn6yfkkxsk504jmf6466phm15fhnk7894hhdg1qvfm43d"; libraryHaskellDepends = [ base flexible-defaults mersenne-random-pure64 mtl mwc-random primitive random stateref syb template-haskell th-extras @@ -216022,8 +216127,8 @@ self: { }: mkDerivation { pname = "rvar"; - version = "0.2.0.4"; - sha256 = "0p67lbzcbbm5bkhv0x380bdald6kaqlf968ay2q8qj69izpvk181"; + version = "0.2.0.6"; + sha256 = "1lwcmv3x3v7sjxkil7754sh085y5r5h9zkca39czjhyyzxsqiq81"; libraryHaskellDepends = [ base MonadPrompt mtl random-source transformers ]; @@ -222431,6 +222536,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-js_0_9_4_2" = callPackage + ({ mkDerivation, base, base-compat, charset, hspec, hspec-discover + , hspec-expectations, language-ecmascript, lens, QuickCheck + , servant, servant-foreign, text + }: + mkDerivation { + pname = "servant-js"; + version = "0.9.4.2"; + sha256 = "15n5s3i491cxjxj70wa8yhpipaz47q46s04l4ysc64wgijlnm8xy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat charset lens servant servant-foreign text + ]; + testHaskellDepends = [ + base base-compat hspec hspec-expectations language-ecmascript lens + QuickCheck servant text + ]; + testToolDepends = [ hspec-discover ]; + description = "Automatically derive javascript functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-jsonrpc" = callPackage ({ mkDerivation, aeson, base, servant }: mkDerivation { @@ -222655,24 +222784,30 @@ self: { "servant-multipart" = callPackage ({ mkDerivation, array, base, bytestring, directory, http-client - , http-media, lens, network, random, resourcet, servant + , http-media, http-types, lens, network, random, resourcet, servant , servant-client, servant-client-core, servant-docs - , servant-foreign, servant-server, text, transformers, wai - , wai-extra, warp + , servant-foreign, servant-server, string-conversions, tasty + , tasty-wai, text, transformers, wai, wai-extra, warp }: mkDerivation { pname = "servant-multipart"; - version = "0.11.5"; - sha256 = "19bz03y1fv0px30zw5q8394573d482lgchclihbnyg26w7xhmzha"; + version = "0.11.6"; + sha256 = "0yzr5hv2ki9ig4g6735bjnzv6mkpgj5l68g9hlvp9g9i0ryxqahn"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ array base bytestring directory http-media lens random resourcet servant servant-client-core servant-docs servant-foreign - servant-server text transformers wai wai-extra + servant-server string-conversions text transformers wai wai-extra ]; - testHaskellDepends = [ + executableHaskellDepends = [ base bytestring http-client network servant servant-client servant-client-core servant-server text transformers wai warp ]; + testHaskellDepends = [ + base bytestring http-types servant-server string-conversions tasty + tasty-wai text + ]; description = "multipart/form-data (e.g file upload) support for servant"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -222941,8 +223076,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.8.0"; - sha256 = "0zzbl8qp6pi5a59zbnaq3bfzxldfcb5xykkzp5czzgaj09ypxpgw"; + version = "0.0.9.0"; + sha256 = "042g1y4dhfbvyppy4rkd1hxmv2n84j8cja5kny12a1q05ab616yk"; libraryHaskellDepends = [ aeson base base-compat-batteries bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -225258,10 +225393,8 @@ self: { }: mkDerivation { pname = "shakebook"; - version = "0.8.0.0"; - sha256 = "1c26j95jcljr5qfn54kgvh2mcvgsk0995zij7a23nxmb5529glhd"; - revision = "1"; - editedCabalFile = "06b8inqz14zalfj5z0pfxbb7da8qblqxpq4r0z29z89mpjxz0961"; + version = "0.8.1.0"; + sha256 = "0cwd920svd7927f7im3qbkqg08ms7yy08wrvvlbzcidv6kh2554m"; libraryHaskellDepends = [ aeson aeson-with base binary-instances comonad comonad-extras doctemplates feed free http-conduit ixset-typed lens lens-aeson @@ -235429,8 +235562,8 @@ self: { pname = "stackcollapse-ghc"; version = "0.0.1.1"; sha256 = "18glq0hkfr02iw8p842hmk4rv5d8sb565lyccklxdmfn708ick23"; - revision = "1"; - editedCabalFile = "14pb8v69idj8dqqm50xigdasqg2jrai6lcl95mw96br70fwb6k15"; + revision = "2"; + editedCabalFile = "0d6in3107pgblh5g1shnmw3dsb6vg10h3kdic56n7zf14gsqqjqy"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -262997,6 +263130,8 @@ self: { pname = "vinyl"; version = "0.12.3"; sha256 = "0vqi8xkbijyjs0z7v08j37rlcjsy5s48b5q2dyj8j4j4z7ghnrcx"; + revision = "1"; + editedCabalFile = "1lh00vr5gwwlgmmry08bcx5nda3fhwkzq9hxy315c9m6651gcsxw"; libraryHaskellDepends = [ array base ghc-prim ]; testHaskellDepends = [ aeson base doctest hspec lens lens-aeson microlens mtl @@ -265626,6 +265761,24 @@ self: { broken = true; }) {}; + "wakame" = callPackage + ({ mkDerivation, base, doctest, QuickCheck, sop-core, tasty + , tasty-discover, tasty-hspec, tasty-quickcheck, text, time + }: + mkDerivation { + pname = "wakame"; + version = "0.1.0.0"; + sha256 = "1wm87z7ag1xzvf4lxqg3xz62ac8i5b9ljzlg85vphcfadsj9khh7"; + libraryHaskellDepends = [ base sop-core ]; + testHaskellDepends = [ + base doctest QuickCheck sop-core tasty tasty-discover tasty-hspec + tasty-quickcheck text time + ]; + testToolDepends = [ tasty-discover ]; + description = "Functions to manipulate records"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "waldo" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , blaze-builder, browscap, bytestring, case-insensitive, conduit From 2fed8df61dc5f7a0f728947706c5114c36f04497 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 20:06:12 +0000 Subject: [PATCH 3126/3452] teleport: 4.2.10 -> 4.2.11 --- pkgs/servers/teleport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index bfd00a08e6ff..b307f7861fa4 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -3,14 +3,14 @@ buildGoPackage rec { pname = "teleport"; - version = "4.2.10"; + version = "4.2.11"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "0y6qih4m8snzfj8ddbcfqx0cz4ric0i5vgz0rgqp6wpi2arwysnn"; + sha256 = "00mkh6rmdgwwhbk3jmxgwl0aisnnqw6q6i5zl1hn69hvdny9liii"; }; goPackagePath = "github.com/gravitational/teleport"; From bd7041b2fe68bdc3ce2a7db3a53f8851b6fd23b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 00:06:10 +0000 Subject: [PATCH 3127/3452] bashmount: 4.2.5 -> 4.3.0 --- 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 2d66dfcee9bb..206e68ce1c29 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 = "4.2.5"; + version = "4.3.0"; src = fetchFromGitHub { owner = "jamielinux"; repo = "bashmount"; rev = version; - sha256 = "1gvi2562vng887ba33s774lhhkacl8yl7d8b0yaxylzx0ap2y7l0"; + sha256 = "1idjyl5dr8a72w3lg15qx03wgc5mj2ga2v2jkyb8v9gi5ahl03mn"; }; installPhase = '' From a2cdd1464b72082c45277c9d9f502c684668f510 Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Fri, 3 Jul 2020 00:21:23 +0200 Subject: [PATCH 3128/3452] mattermost-desktop: 4.3.1 -> 4.5.0 --- .../instant-messengers/mattermost-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 0a41c9666b68..74406f217a26 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -43,18 +43,18 @@ let in stdenv.mkDerivation rec { pname = "mattermost-desktop"; - version = "4.3.1"; + version = "4.5.0"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - sha256 = "076nv5h6xscbw1987az00x493qhqgrli87gnn57zbvz0acgvlhfv"; + sha256 = "1p44vxs7i9f15h4xjyr99g8x73qygv909a32lfkqip1fh8lk7sf4"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz"; - sha256 = "19ps9g8j6kp4haj6r3yfy4ma2wm6isq5fa8zlcz6g042ajkqq0ij"; + sha256 = "03pn853z2famqxcsrwayqb94pzghlpfb0qs2nfi8mc5zzsgcic7z"; } else throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}"; From 252b838a7c358e47730f9c3bd545db453a7ef42a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 00:01:21 +0000 Subject: [PATCH 3129/3452] atlassian-cli: 9.2.0 -> 9.3.0 --- pkgs/applications/office/atlassian-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 22eee857b208..3cc62aa9dc18 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atlassian-cli"; - version = "9.2.0"; + version = "9.3.0"; src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; - sha256 = "0rdnbx3zfz3lpgka7bb8jzapkr81l2yvgsbmn8hrhva5k61xwx3d"; + sha256 = "1gsyxkkx04vhp8ii0xbln5h8wa8x3dj6xhh2fyjs4z0bil4hlf06"; extraPostFetch = "chmod go-w $out"; }; From 952e40fcbf19abb552fdff1228fc175cd8b18ae9 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 2 Jul 2020 19:29:24 -0400 Subject: [PATCH 3130/3452] yoda: 1.8.2 -> 1.8.3 --- pkgs/development/libraries/physics/yoda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 9d4d60949c19..1a8d5a6fd390 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - sha256 = "1nqbv334iwdvbsc5bw8g936cxzc1hyzv9r8kjy4v124vrw8qqmc9"; + sha256 = "12msmjiajvy2xj2m64n2fxblai5xg06a829wi7scsc7nw2jhxpfr"; }; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; From cb08cf30a26acb90053b82e983804d08581594e8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 2 Jul 2020 20:15:51 -0400 Subject: [PATCH 3131/3452] rivet: 3.1.1 -> 3.1.2 --- pkgs/development/libraries/physics/rivet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index bcf986346ac3..abf37def8c3f 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rivet"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "1cgr9jyfd9r7dwbk8fr3rys5dc74cmbx368441jvqngqymmb563w"; + sha256 = "0yjpx7n6ry3pfgkf7d7v7mcc3yv7681kf8nq2b1fgspl8jbd0hf0"; }; patches = [ From 2d6d3db7e2c6d82379d0ba42b644609b16734f24 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 01:07:55 +0000 Subject: [PATCH 3132/3452] bmake: 20200606 -> 20200629 --- pkgs/development/tools/build-managers/bmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index b119b5a38105..45fb791f3a69 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20200606"; + version = "20200629"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "00kh1g8z6808ylbfcn9afpb0xmb99k302dfdsmyx1rsn65xs58v7"; + sha256 = "1cxmsz48ap6gpwx5qkkvvfsiqxc7zpn8gzmhvc1jsfha68195ms5"; }; nativeBuildInputs = [ getopt ]; From 6630edb1bd6d1e54b0e0a0f3d598ce349be66c57 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 2 Jul 2020 16:52:39 +0000 Subject: [PATCH 3133/3452] picard-tools: 2.23.0 -> 2.23.1 --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 85d92d3af843..e6bcb4470bbd 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.23.0"; + version = "2.23.1"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0yhgfz5jjw55ipgdb32wjdcb01xx2g9ikgvwinnfwswx50iscf5a"; + sha256 = "1g4539x2081jgrbn207nsimpq9q5izd4z6cx7s8lr8p8ab8spbmk"; }; nativeBuildInputs = [ makeWrapper ]; From d1565a01d08c6cbe8aaf9f5cecf637af4da27dce Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 2 Jul 2020 20:24:17 -0500 Subject: [PATCH 3134/3452] skaffold: use src.rev --- pkgs/development/tools/skaffold/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 331f9528a010..b94217d20a44 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -3,16 +3,15 @@ buildGoPackage rec { pname = "skaffold"; version = "1.12.0"; - # rev is the ${version} commit, mainly for skaffold version command output - rev = "931a70a6334436735bfc4ff7633232dd5fc73cc1"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; buildFlagsArray = let t = "${goPackagePath}/pkg/skaffold"; in '' -ldflags= + -s -w -X ${t}/version.version=v${version} - -X ${t}/version.gitCommit=${rev} + -X ${t}/version.gitCommit=${src.rev} -X ${t}/version.buildDate=unknown ''; From 27af16bb6cbaabcb175d78a10baee3c1d79b9ff1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 01:29:44 +0000 Subject: [PATCH 3135/3452] activemq: 5.15.13 -> 5.16.0 --- pkgs/development/libraries/apache-activemq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index c09fb8d91ee1..8490541546b5 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.15.13"; + version = "5.16.0"; src = fetchurl { - sha256 = "1hzapnd0lbiid243xiaz8kv67al8griccjj4dabml62hqhrk9k96"; + sha256 = "0x68l4n0v2jqmbawdgpghmhnchpg1jsvxzskj6s4hjll6hdgb6fk"; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; From 1da9cd8676f057b31204f9df7b9c58af6aa6f4ad Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 3 Jul 2020 09:52:59 +0800 Subject: [PATCH 3136/3452] calibre: use webengine i/o webkit As of v4, calibre supports qtwebengine so use that instead of the deprecated qtwebkit. --- pkgs/applications/misc/calibre/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index ff39eccf4f84..3ae2fc7e288a 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -47,7 +47,7 @@ mkDerivation rec { ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; prePatch = '' - sed -i "/pyqt_sip_dir/ s:=.*:= '${pypkgs.pyqt5_with_qtwebkit}/share/sip/PyQt5':" \ + sed -i "/pyqt_sip_dir/ s:=.*:= '${pypkgs.pyqt5}/share/sip/PyQt5':" \ setup/build_environment.py # Remove unneeded files and libs From 9e67ac4a51e4ed2e007465d75a355e1dda557bd3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 02:13:48 +0000 Subject: [PATCH 3137/3452] castor: 0.8.14 -> 0.8.15 --- pkgs/applications/networking/browsers/castor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index 6163323fff6b..8181d782bd7b 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "castor"; - version = "0.8.14"; + version = "0.8.15"; src = fetchurl { url = "https://git.sr.ht/~julienxx/castor/archive/${version}.tar.gz"; - sha256 = "1ykpmbimhfy3ys2hvv0mn8xiwxzdl43gpny1nc58i0gzv07ar8sc"; + sha256 = "1i6550akxg78c9bh9111c4458ry1nmp3xh7ik7s2zqrp7lmxaf46"; }; - cargoSha256 = "04w49wka1vkb295lk6fzd6c5rwhzrqkp26hd5d94rx7bhcjmmb9w"; + cargoSha256 = "1y047cm46l5hph3n48h60xvyh2hr0yagzswp375kiil96ndk206i"; nativeBuildInputs = [ pkg-config From 6b82db25e3c3c33154e22cf0a18ac4b172f8996a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 2 Jul 2020 21:44:39 -0400 Subject: [PATCH 3138/3452] hepmc2: 2.06.10 -> 2.06.11, mark as LGPL 2.1 --- .../libraries/physics/hepmc2/default.nix | 17 ++++++------- .../libraries/physics/hepmc2/in_source.patch | 25 ------------------- 2 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 pkgs/development/libraries/physics/hepmc2/in_source.patch diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix index 41908e0383bf..b27d947ea5c4 100644 --- a/pkgs/development/libraries/physics/hepmc2/default.nix +++ b/pkgs/development/libraries/physics/hepmc2/default.nix @@ -2,28 +2,25 @@ stdenv.mkDerivation rec { pname = "hepmc"; - version = "2.06.10"; + version = "2.06.11"; src = fetchurl { url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC-${version}.tar.gz"; - sha256 = "190i9jlnwz1xpc495y0xc70s4zdqb9s2zdq1zkjy2ivl7ygdvpjs"; + sha256 = "1pp89bs05nv60wjk1690ndwh4dsd5mk20bzsd4a2lklysdifvb6f"; }; - patches = [ ./in_source.patch ]; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-Dmomentum:STRING=GEV" "-Dlength:STRING=MM" ]; - enableParallelBuilding = true; - - meta = { + meta = with stdenv.lib; { description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators"; - license = stdenv.lib.licenses.gpl2; + license = licenses.lgpl21; homepage = "http://hepmc.web.cern.ch/hepmc/"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/libraries/physics/hepmc2/in_source.patch b/pkgs/development/libraries/physics/hepmc2/in_source.patch deleted file mode 100644 index 836a56558691..000000000000 --- a/pkgs/development/libraries/physics/hepmc2/in_source.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -37,21 +37,6 @@ message(STATUS "default momentum and length are ${HEPMC_DEFAULT_MOM_UNIT} ${HEPM - # find the HepMC cmake modules - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules ${CMAKE_MODULE_PATH}) - --# make sure we are not building from within the source code directory --string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" in_source) --string( REGEX MATCH "${CMAKE_SOURCE_DIR}/" in_source_subdir --"${CMAKE_BINARY_DIR}") --if (in_source OR in_source_subdir) -- message(FATAL_ERROR " --ERROR: In source builds of this project are not allowed. --A separate build directory is required. --Please create one and run cmake from the build directory. --Also note that cmake has just added files to your source code directory. --We suggest getting a new copy of the source code. --Otherwise, delete `CMakeCache.txt' and the directory `CMakeFiles'. -- ") --endif () -- - # build_docs is OFF (false) by default - if ( build_docs ) - message(STATUS "documents WILL be built and installed" ) From 81b3a8c86b112e0b96610e17e4d6bf02a0c3aaa5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 03:11:29 +0000 Subject: [PATCH 3139/3452] cinnamon.cinnamon-translations: 4.6.0 -> 4.6.2 --- pkgs/desktops/cinnamon/cinnamon-translations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index ce630999147d..a679f15887b4 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "4.6.0"; + version = "4.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "04rlgcbz02n9kj1w12xa56b7f4x10y6g91hsl70zmag568mdclzz"; + sha256 = "0zaghha62ibhg3rir6mrfy1z3v7p7v83b6glhmj9s51nxd86fyv6"; }; nativeBuildInputs = [ From fa5ef3823ebfa2df95695d8f4357baff97a9b9bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 03:34:18 +0000 Subject: [PATCH 3140/3452] bzrtp: 4.3.1 -> 4.4.0 --- pkgs/development/libraries/bzrtp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 2eb5a2dfcffb..d54539d9f25a 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "14fqp6r9rf7z6j5phbsrdxlbjak03hs8kb94b6jgcrcdxrxhy3fy"; + sha256 = "1yjmsbqmymzl4r7sba6w4a2yld8m6hzafr6jf7sj0syhwpnc3zv6"; }; buildInputs = [ bctoolbox sqlite ]; From eb121e09018919b275a0ec73bf83ec4c1ec6a20b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 2 Jul 2020 23:36:20 -0400 Subject: [PATCH 3141/3452] snakemake: 5.17.0 -> 5.19.3 --- pkgs/applications/science/misc/snakemake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 63a727f9c88a..2b7532a93454 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "5.17.0"; + version = "5.19.3"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0y652i3saqq2z61yvk0i6q3lnq2xfrygcxms5gygspj71q2n4f7k"; + sha256 = "b83f3ef73e25dafcb39b3565030e33fa2f7e80ed70256c535dc7e58ea762305d"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json From 72f9a484715267d2cba54f0c5028c578fcca3579 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Tue, 30 Jun 2020 20:52:29 -0400 Subject: [PATCH 3142/3452] ghc810x: remove obsolete overrides (3/x) regex-pcre-builtin: -doJailbreak regex-posix: -doJailbreak regex-tdfa: -doJailbreak split: -doJailbreak tar: -doJailbreak --- .../development/haskell-modules/configuration-ghc-8.10.x.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 8299fbae7a2d..b0585d17989d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -63,12 +63,7 @@ self: super: { # Jailbreak to fix the build. base-noprelude = doJailbreak super.base-noprelude; pandoc = doJailbreak super.pandoc; - regex-pcre-builtin = doJailbreak super.regex-pcre-builtin; - regex-posix = doJailbreak super.regex-posix; - regex-tdfa = doJailbreak super.regex-tdfa; - split = doJailbreak super.split; system-fileio = doJailbreak super.system-fileio; - tar = doJailbreak super.tar; unliftio-core = doJailbreak super.unliftio-core; # Use the latest version to fix the build. From 4e4c0dda97f5beab4d57f4552fa60596edf61088 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 04:17:57 +0000 Subject: [PATCH 3143/3452] clipgrab: 3.8.12 -> 3.8.13 --- pkgs/applications/video/clipgrab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 2eda7fe1dab3..0e39ab056853 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -5,10 +5,10 @@ mkDerivation rec { pname = "clipgrab"; - version = "3.8.12"; + version = "3.8.13"; src = fetchurl { - sha256 = "1nnph6sn4mpdj20hngwr57ripmdp60w3vrn89s8ssy7cjv500ngd"; + sha256 = "0ryaha33m41y0xjrspa838qqr4iy2c8vbvhbb334qimpqn1hj3q5"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; From 46e4bc8a7dddc705a67789609fd86f242bda883e Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 2 Jul 2020 21:18:01 -0700 Subject: [PATCH 3144/3452] licenses: add bsd2Patent --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index b799a6ae8a43..549e94c3451b 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -95,6 +95,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = ''BSD 2-clause "Simplified" License''; }; + bsd2Patent = spdx { + spdxId = "BSD-2-Clause-Patent"; + fullName = ''BSD-2-Clause Plus Patent License''; + }; + bsd3 = spdx { spdxId = "BSD-3-Clause"; fullName = ''BSD 3-clause "New" or "Revised" License''; From f02b4c2e8453d56107e4274c0c5779c410143f14 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 2 Jul 2020 21:18:37 -0700 Subject: [PATCH 3145/3452] libvmaf: match upstream license --- pkgs/development/libraries/libvmaf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index 9d4cf5c924f4..6c2b61cf113c 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Netflix/vmaf"; description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; platforms = platforms.unix; - license = licenses.asl20; + license = licenses.bsd2Patent; maintainers = [ maintainers.cfsmp3 maintainers.marsam ]; }; From ea7fc409dd5888ffd4c64b4196afa8c36edf9089 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 04:23:16 +0000 Subject: [PATCH 3146/3452] chocolateDoom: 3.0.0 -> 3.0.1 --- pkgs/games/chocolate-doom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 1c2a24de01dd..1b77a72f8d0b 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "chocolate-doom"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "chocolate-doom"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0ajzb767wyj8vzhjpsmgslw42b0155ji4alk26shxl7k5ijbzn0j"; + sha256 = "1zlcqhd49c5n8vaahgaqrc2y10z86xng51sbd82xm3rk2dly25jp"; }; postPatch = '' From ada8a01fce7e65b305aa33f4a859838e2e6fbb78 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 04:27:58 +0000 Subject: [PATCH 3147/3452] ccid: 1.4.32 -> 1.4.33 --- pkgs/tools/security/ccid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index e74e1b61438a..b7f408e748fd 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ccid"; - version = "1.4.32"; + version = "1.4.33"; src = fetchurl { url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - sha256 = "0f8nzk7379ip4x2ii5vn6h67jyx733pq0ywnnsj2llbxi2vllpsl"; + sha256 = "0974h2v9wq0j0ajw3c7yckaw8wqcppb2npfhfhmv9phijy9xlmjj"; }; postPatch = '' From a76df901855a68c85027093c53ab8dbfb4b83b7b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 05:34:20 +0000 Subject: [PATCH 3148/3452] eksctl: 0.21.0 -> 0.22.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 4fce86557372..0a05b8b37e9b 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0pfjv5m1fly7n9hmxy8bnpblfh5rzbjkiav3dczy4hkmq226gjsa"; + sha256 = "1l7wcx89d7nil5lbr4x2w04lwranz0z83y892v290wv2l0xnmshj"; }; - vendorSha256 = "09c3a5g27aqmy4ml42c6zwzrv8yas7i04w3j9jbvp90npwvc62cz"; + vendorSha256 = "0fy9m72iciz5pjf2b3323brgi15w6a9fg1m1srpaiay3md87gagg"; subPackages = [ "cmd/eksctl" ]; From 5ace185aa21f0340be9624629856a06587221571 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 05:39:20 +0000 Subject: [PATCH 3149/3452] dpic: 2020.03.01 -> 2020.06.01 --- pkgs/tools/graphics/dpic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix index 0621d885694d..0bcac70e4b7f 100644 --- a/pkgs/tools/graphics/dpic/default.nix +++ b/pkgs/tools/graphics/dpic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dpic"; - version = "2020.03.01"; + version = "2020.06.01"; src = fetchurl { url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz"; - sha256 = "1wa1b8m98wdyryf0czn5g3g50znrjcdhsrzpqp6zgwr5w4a086mj"; + sha256 = "1gbkpbjwjaaifxff8amm9b47dynq4l4698snjdgnn4flndw62q88"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; From f969d3b829119ee14f84efb221e3773c4f8ebb6b Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Thu, 2 Jul 2020 22:43:30 -0700 Subject: [PATCH 3150/3452] nanopb: include C sources (#91055) --- pkgs/development/libraries/nanopb/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/nanopb/default.nix b/pkgs/development/libraries/nanopb/default.nix index a63d367b800d..cafc5c85f21a 100644 --- a/pkgs/development/libraries/nanopb/default.nix +++ b/pkgs/development/libraries/nanopb/default.nix @@ -50,6 +50,8 @@ in stdenv.mkDerivation rec { --subst-var-by python ${pythonRuntime}/bin/python \ --subst-var-by out $out chmod +x $out/bin/protoc-gen-nanopb + + cp ../pb_common.c ../pb_decode.c ../pb_encode.c $out/include/ ''; passthru.tests = { From 2dcc0adfbe81658c2fe3fdce5762d56bb7f8524d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 06:12:07 +0000 Subject: [PATCH 3151/3452] entr: 4.5 -> 4.6 --- pkgs/tools/misc/entr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index be8134a92a33..9bd9c2104f38 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "entr"; - version = "4.5"; + version = "4.6"; src = fetchurl { url = "http://entrproject.org/code/${pname}-${version}.tar.gz"; - sha256 = "08gsd99w20fdi0apppmzsh06z29ga8y89nfcizidil2hkl8b7jyn"; + sha256 = "0vcflgagna2gdlpjsd6748c73j2829xlhm276mi838zl1n121phn"; }; postPatch = '' From 50d9d2ef6ba66ba2135edbdc34ed6bf19ba4e454 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 3 Jul 2020 09:21:35 +0300 Subject: [PATCH 3152/3452] josm: 16538 -> 16731 --- pkgs/applications/misc/josm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 89d09703ddc5..7f607de5ffcc 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: let pname = "josm"; - version = "16538"; + version = "16731"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "07hzwcjnfbl3s8l0m6japln0clm6wjm1zd3r1pd47b1dvclnyv28"; + sha256 = "0r94jcqciggjwjxfz5q3m81sx6cvh94hq5r9mpw44dvpnyfjj6p6"; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip"; - sha256 = "1y0ssrwfqnmcvxwjfa3gdc3m9a952n8l3pdx0zmmaqwws4kak2a2"; + sha256 = "1ilcqy6ssi1jfnbw9nzpd4qlf2dmskfywy2lfm07y4w4gyjsp6w9"; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; From b1aefc40bf838aa113d7f736389c12cfcd3e50ca Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 26 Jun 2020 09:14:55 +0200 Subject: [PATCH 3153/3452] =?UTF-8?q?ocamlPackages.ocaml=5Fgettext:=200.4.?= =?UTF-8?q?1=20=E2=86=92=200.4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/ocaml-gettext/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index 547fa77ae6e9..ba571b32084e 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -1,21 +1,23 @@ -{ lib, fetchurl, buildDunePackage, gettext, fileutils, ounit }: +{ lib, fetchurl, buildDunePackage, cppo, gettext, fileutils, ounit }: buildDunePackage rec { pname = "gettext"; - version = "0.4.1"; + version = "0.4.2"; minimumOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-v${version}.tbz"; - sha256 = "0pwy6ym5fd77mdbgyas8x86vbrri9cgk79g8wxdjplhyi7zhh158"; + sha256 = "19ynsldb21r539fiwz1f43apsdnx7hj2a2d9qr9wg2hva9y2qrwb"; }; + buildInputs = [ cppo ]; + propagatedBuildInputs = [ gettext fileutils ]; doCheck = true; - checkInputs = lib.optional doCheck ounit; + checkInputs = [ ounit ]; dontStrip = true; From 89c5275baf3e67a8a47ccdd6ef01121f24c00c3e Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 31 Mar 2020 12:39:06 +0700 Subject: [PATCH 3154/3452] whirlpool-gui: init at 0.10.1 --- .../blockchains/whirlpool-gui/default.nix | 103 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 105 insertions(+) create mode 100644 pkgs/applications/blockchains/whirlpool-gui/default.nix diff --git a/pkgs/applications/blockchains/whirlpool-gui/default.nix b/pkgs/applications/blockchains/whirlpool-gui/default.nix new file mode 100644 index 000000000000..17b817bc61dc --- /dev/null +++ b/pkgs/applications/blockchains/whirlpool-gui/default.nix @@ -0,0 +1,103 @@ +{ stdenv, fetchFromGitHub, callPackage, makeWrapper, makeDesktopItem +, nodejs, yarn, electron_7, jre8, tor }: + +let + system = stdenv.hostPlatform.system; + +in stdenv.mkDerivation rec { + pname = "whirlpool-gui"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "Samourai-Wallet"; + repo = pname; + rev = version; + sha256 = "ru6WJQRulhnQCPY2E0x9M6xXtFdj/pg2fu4HpQxhImU="; + }; + + yarnCache = stdenv.mkDerivation { + name = "${pname}-${version}-${system}-yarn-cache"; + inherit src; + phases = [ "unpackPhase" "buildPhase" ]; + nativeBuildInputs = [ yarn ]; + buildPhase = '' + export HOME=$NIX_BUILD_ROOT + + yarn config set yarn-offline-mirror $out + yarn --frozen-lockfile --ignore-scripts --ignore-platform \ + --ignore-engines --no-progress --non-interactive + ''; + + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = { + x86_64-linux = "6fl4cSwHXWgQcYlqxCae0p1Ppcb9fI5fFrxm7y6wxTo="; + }.${system} or (throw "Unsupported platform ${system}"); + }; + + nativeBuildInputs = [ makeWrapper nodejs yarn ]; + + configurePhase = '' + # Yarn and bundler wants a real home directory to write cache, config, etc to + export HOME=$NIX_BUILD_ROOT + + # Make yarn install packages from our offline cache, not the registry + yarn config --offline set yarn-offline-mirror ${yarnCache} + ''; + + buildPhase = '' + yarn install --offline --ignore-scripts --frozen-lockfile --no-progress --non-interactive + + patchShebangs node_modules/ + + yarn build + ''; + + installPhase = '' + mkdir -p $out/{bin,share,libexec/whirlpool-gui/app} + + # install production dependencies + yarn install \ + --offline --frozen-lockfile --ignore-scripts \ + --no-progress --non-interactive \ + --production --no-bin-links \ + --modules-folder $out/libexec/whirlpool-gui/node_modules + + # copy application + cp -r app/{dist,app.html,main.prod.js,main.prod.js.map,img} $out/libexec/whirlpool-gui/app + cp -r package.json resources $out/libexec/whirlpool-gui + + # make desktop item + ln -s "${desktopItem}/share/applications" "$out/share/applications" + + # wrap electron + makeWrapper '${electron_7}/bin/electron' "$out/bin/whirlpool-gui" \ + --add-flags "$out/libexec/whirlpool-gui" \ + --prefix PATH : "${jre8}/bin:${tor}/bin" + ''; + + desktopItem = makeDesktopItem { + name = "whirlpool-gui"; + exec = "whirlpool-gui"; + icon = "whirlpool-gui"; + desktopName = "Whirlpool"; + genericName = "Whirlpool"; + comment = meta.description; + categories = "Network;"; + extraEntries = '' + StartupWMClass=whrilpool-gui + ''; + }; + + passthru.prefetchYarnCache = stdenv.lib.overrideDerivation yarnCache (d: { + outputHash = stdenv.lib.fakeSha256; + }); + + meta = with stdenv.lib; { + description = "Desktop GUI for Whirlpool by Samourai-Wallet"; + homepage = https://www.samouraiwallet.com/whirlpool; + license = licenses.unlicense; + maintainers = [ maintainers.offline ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0784416273d3..52d79893e882 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23624,6 +23624,8 @@ in quorum = callPackage ../applications/blockchains/quorum.nix { }; + whirlpool-gui = callPackage ../applications/blockchains/whirlpool-gui { }; + ### GAMES _2048-in-terminal = callPackage ../games/2048-in-terminal { }; From 4b104301194aad86101fcce4e597a7b81212f673 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 00:38:29 -0700 Subject: [PATCH 3155/3452] abcmidi: 2020.06.07 -> 2020.06.30 (#92114) --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 1987b0a87c28..63ca4dc5e7c2 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2020.06.07"; + version = "2020.06.30"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "06jpawwm4zcss9mi2bjdbdkkfr8cw1q9cpzplq5r83z8pljqb12l"; + sha256 = "0pdaf9y4ag2cdpygypf11aqa52hhj1y5f7gc8lv3aa1lplxyhi9m"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase From 460a48e41d22dde517dc92efb7cc94536c77da2b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 00:57:54 -0700 Subject: [PATCH 3156/3452] amazon-ecr-credential-helper: 0.3.0 -> 0.4.0 (#90293) --- pkgs/tools/admin/amazon-ecr-credential-helper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix index b36daefa16b6..30d74c14ce5e 100644 --- a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix +++ b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "amazon-ecr-credential-helper"; - version = "0.3.0"; + version = "0.4.0"; goPackagePath = "github.com/awslabs/amazon-ecr-credential-helper"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "awslabs"; repo = "amazon-ecr-credential-helper"; rev = "v${version}"; - sha256 = "06pcwgahcbi13ca5rs6giwdw3w364lbvmzcs4ka82igvcffxjvnd"; + sha256 = "1whwxjzlyzyvrf2mzbd7my2kdz5fdbr79g18g9h4xrg8xyzk1k5q"; }; meta = with lib; { From 4a53c910b7a3d8318221fb7442a1456c1e7988d1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 00:58:27 -0700 Subject: [PATCH 3157/3452] h3: 3.6.3 -> 3.6.4 (#91591) --- pkgs/development/misc/h3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/development/misc/h3/default.nix index 2b82cc2c0ae5..32f65c0925c3 100644 --- a/pkgs/development/misc/h3/default.nix +++ b/pkgs/development/misc/h3/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "h3"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "uber"; repo = "h3"; rev = "v${version}"; - sha256 = "1zgq496m2pk2c1l0r1di0p39nxwza00kxzqa971qd4xgbrvd4w55"; + sha256 = "1a4scs5n9srq6sjkz8d60ffzpc6aadkxmk1i3hdj081j0jzsrpf7"; }; nativeBuildInputs = [ cmake ]; From c611762ddafa1421b580b83ba7f1f00916cecf7b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 2 Jul 2020 21:10:47 +0300 Subject: [PATCH 3158/3452] mpd: Use latest ffmpeg --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index b801020a6652..44118277a28b 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -4,7 +4,7 @@ # Archive support , bzip2, zziplib # Codecs -, audiofile, faad2, ffmpeg_3, flac, fluidsynth, game-music-emu +, audiofile, faad2, ffmpeg, flac, fluidsynth, game-music-emu , libmad, libmikmod, mpg123, libopus, libvorbis, lame # Filters , libsamplerate @@ -46,7 +46,7 @@ let # Decoder plugins audiofile = [ audiofile ]; faad = [ faad2 ]; - ffmpeg = [ ffmpeg_3 ]; + ffmpeg = [ ffmpeg ]; flac = [ flac ]; fluidsynth = [ fluidsynth ]; gme = [ game-music-emu ]; From bc74a5aa0358bfe23beea188a0ad51117d9c17ba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 08:02:32 +0000 Subject: [PATCH 3159/3452] deadbeef: 1.8.3 -> 1.8.4 --- pkgs/applications/audio/deadbeef/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index c88b884444ef..6b92d1263e33 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -59,13 +59,13 @@ assert remoteSupport -> curl != null; stdenv.mkDerivation rec { pname = "deadbeef"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "DeaDBeeF-Player"; repo = "deadbeef"; rev = version; - sha256 = "0n0q7zfl56gnadcqqp5rg7sbh1xvfcmp7cvmh2ax07037b346qig"; + sha256 = "161b0ll8v4cjgwwmk137hzvh0jidlkx56vjkpnr70f0x4jzv2nll"; }; buildInputs = with stdenv.lib; [ jansson ] From fd09f09f85b3569860373a1b4d5cdc532a0711b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 08:28:19 +0000 Subject: [PATCH 3160/3452] dropbear: 2019.78 -> 2020.80 --- pkgs/tools/networking/dropbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 20d2545e5082..dcb05eb84842 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dropbear-2019.78"; + name = "dropbear-2020.80"; src = fetchurl { url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "19242qlr40pbqfqd0gg6h8qpj38q6lgv03ja6sahj9vj2abnanaj"; + sha256 = "0jbrbpdzyv11x5rkljdimzq9p6a7da5siw9k405ibnpjj4dr89yr"; }; dontDisableStatic = enableStatic; From 7df7291473128d8ae5d91454f37bb47e7816399f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 29 Jun 2020 18:00:57 +0200 Subject: [PATCH 3161/3452] =?UTF-8?q?ocaml-ng.ocamlPackages=5F4=5F11.ocaml?= =?UTF-8?q?:=204.11.0+=CE=B13=20=E2=86=92=204.11.0+=CE=B21?= 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 388ee4dba8b5..410e4ee713ef 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+alpha3"; - sha256 = "0c2g8ncq15nx9pdl14hnsc9342j80s7i1bsyiw98cvgic5miyw9b"; + patch_version = "0+beta1"; + sha256 = "1xhkwprbnd3wp6bi3k74f42l1mff1ngn7gl4rgad9dk4ly0yzfdr"; } From 5d356886bbc004a7a551f3212e8484980987de45 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 08:34:42 +0000 Subject: [PATCH 3162/3452] evince: 3.36.5 -> 3.36.6 --- pkgs/desktops/gnome-3/core/evince/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index d9d9f916d46d..d1047b37a727 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.36.5"; + version = "3.36.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0z79jl0j9xq9wgwkfr0d1w1qrdy4447y8shs407n5srr0vixc3bg"; + sha256 = "1c4ddlx12jm2cq0h0kfqwqncq3d8grvqhvpb29z86z7wqqhrpklm"; }; postPatch = '' From 935090ec23cd3a309191eb9ec77d501a64a8f599 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Fri, 3 Jul 2020 17:51:41 +0900 Subject: [PATCH 3163/3452] kaggle: init at 1.5.6 --- .../python-modules/kaggle/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/kaggle/default.nix diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix new file mode 100644 index 000000000000..7b21f984ceb6 --- /dev/null +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -0,0 +1,48 @@ +{ buildPythonPackage +, certifi +, fetchPypi +, lib +, python-dateutil +, python-slugify +, six +, requests +, tqdm +, urllib3 +}: + +buildPythonPackage rec { + pname = "kaggle"; + version = "1.5.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0f5qrkgklcpgbwncrif7aw4f86dychqplh7k3f4rljwnr9yhjb1w"; + }; + + # The version bounds in the setup.py file are unnecessarily restrictive. + patchPhase = '' + substituteInPlace setup.py \ + --replace 'urllib3 >= 1.21.1, < 1.25' 'urllib3' + ''; + + propagatedBuildInputs = [ + certifi + python-dateutil + python-slugify + requests + six + tqdm + urllib3 + ]; + + # Tests try to access the network. + doCheck = false; + + meta = with lib; { + description = "Official API for https://www.kaggle.com, accessible using a command line tool implemented in Python 3"; + homepage = "https://github.com/Kaggle/kaggle-api"; + license = licenses.asl20; + maintainers = with maintainers; [ cdepillabout ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c02d26801d6b..16a57a03041c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2036,6 +2036,8 @@ in ir-standard-fonts = callPackage ../data/fonts/ir-standard-fonts { }; + kaggle = with python3Packages; toPythonApplication kaggle; + lynis = callPackage ../tools/security/lynis { }; mapproxy = callPackage ../applications/misc/mapproxy { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2b3f85e7160..0f677a97ffab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4330,6 +4330,8 @@ in { jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; + kaggle = callPackage ../development/python-modules/kaggle { }; + keyring = if isPy3k then callPackage ../development/python-modules/keyring { } else From 132c530e188b3c50ca0a9c1c8b986a894e6c7c54 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 09:08:35 +0000 Subject: [PATCH 3164/3452] gnome3.gnome-calendar: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 88284c540e3b..988cb1ed2a33 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-calendar"; - version = "3.36.1"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ql3f509bj17riqs0jfpp434s97dzjgkjcd978i4m4y80nq2131v"; + sha256 = "07sc1kn65dzxsxpv0vl5dj1a5awljjsfl9jldrg0hnjmq12m7c6h"; }; passthru = { From 9685a03679b96e9f2f89b7062248b8425f39ebdb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 3 Jul 2020 04:20:00 -0500 Subject: [PATCH 3165/3452] eksctl: install fish completions --- pkgs/tools/admin/eksctl/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 0a05b8b37e9b..cd343f7fa111 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "eksctl"; @@ -17,11 +17,13 @@ buildGoModule rec { buildFlags = [ "-tags netgo" "-tags release" ]; - postInstall = '' - mkdir -p "$out/share/"{bash-completion/completions,zsh/site-functions} + nativeBuildInputs = [ installShellFiles ]; - $out/bin/eksctl completion bash > "$out/share/bash-completion/completions/eksctl" - $out/bin/eksctl completion zsh > "$out/share/zsh/site-functions/_eksctl" + postInstall = '' + for shell in bash fish zsh; do + $out/bin/eksctl completion $shell > eksctl.$shell + installShellCompletion eksctl.$shell + done ''; meta = with lib; { From 66db082282255f83e5c36cfadd362841a76f8c9f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 3 Jul 2020 04:21:00 -0500 Subject: [PATCH 3166/3452] eksctl: add ldflags --- pkgs/tools/admin/eksctl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index cd343f7fa111..ab309a11a6e2 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -17,6 +17,8 @@ buildGoModule rec { buildFlags = [ "-tags netgo" "-tags release" ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/weaveworks/eksctl/pkg/version.gitCommit=${src.rev} -X github.com/weaveworks/eksctl/pkg/version.buildDate=19700101-00:00:00" ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' From c284c863333d9b18217a9f3025c1abc3e9542a82 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 09:22:31 +0000 Subject: [PATCH 3167/3452] fwts: 20.05.00 -> 20.06.01 --- pkgs/os-specific/linux/fwts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index d05a8c52551b..d25c12294707 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "20.05.00"; + version = "20.06.01"; src = fetchzip { url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "14rqm45al6w42mzi0rqpwbw1spy7iv1jhywhwkdgs4w91zzc4gaj"; + sha256 = "04wxhmibykhm7jjw3xdmbn0rn25dsr11cig77k2jkhp7nwwqdm11"; stripRoot = false; }; From 6ef1a8db242ed7ddbf498f19a80aba72a34f1493 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Jul 2020 11:25:37 +0200 Subject: [PATCH 3168/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-7-g30d5c33 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/58555c5e61e4a5728a64084f56450d148b78eea3. --- .../haskell-modules/hackage-packages.nix | 79 +++++++++++++++---- 1 file changed, 65 insertions(+), 14 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6ace0f0f6c06..fc900dd080c3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3756,8 +3756,8 @@ self: { }: mkDerivation { pname = "CouchDB"; - version = "1.2.2"; - sha256 = "0imzpwrynr54as3bzx2222vqcnmmrzx6dis5qa2vmclf6yd8q1z8"; + version = "1.2.3"; + sha256 = "064savpqn5ppj3sg0jsaqq5625zf0ml6wa0k7x058pmsp9i93c4m"; libraryHaskellDepends = [ base bytestring containers HTTP json mtl network network-uri utf8-string @@ -6361,10 +6361,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.6.4"; - sha256 = "1z1bv3dqna9gp6k2rjnbl54hxkaxl4khdlfy52r0cv51ah8969ri"; - revision = "1"; - editedCabalFile = "0jyb2vvlcl8wjvaga4cipq9fwvjrimygq0cbdzmq4f806xrpk2y3"; + version = "0.7.0"; + sha256 = "0g4c8s4v3lg7bnsz8n09zrf8cwyywmxpv97wkwx6xvflknb7z0cc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36392,6 +36390,21 @@ self: { broken = true; }) {}; + "backtracking" = callPackage + ({ mkDerivation, base, primes, tasty, tasty-discover, tasty-hunit + , transformers + }: + mkDerivation { + pname = "backtracking"; + version = "0.1.0"; + sha256 = "0l1isnnld8drsb8jqkf6zd8v61gcy172zk8zdr21yawnkwfr057b"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ base primes tasty tasty-hunit ]; + testToolDepends = [ tasty-discover ]; + description = "A backtracking monad"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "backtracking-exceptions" = callPackage ({ mkDerivation, base, either, free, kan-extensions, mtl , semigroupoids, semigroups, transformers @@ -122149,6 +122162,17 @@ self: { broken = true; }) {}; + "hextra" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hextra"; + version = "0.3.0.0"; + sha256 = "13rpdrdq32d8fg9y5mgmfyxjmlpmclsck67fj6zsc1fwxx8c8f8f"; + libraryHaskellDepends = [ base ]; + description = "Generic and niche utility functions and more for Haskell"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "hextream" = callPackage ({ mkDerivation, attoparsec, base, base-compat, Cabal , cabal-doctest, containers, data-default, doctest, filepath @@ -179233,8 +179257,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.5.0.0"; - sha256 = "190f1cwjz52j12mxr9bgrmrlna4nfqlvv4jf6qnjl92sgsci6dda"; + version = "0.5.1.0"; + sha256 = "0yq5m5mkyzy90vi23pbsrmnymvf7h6s8f63wyz9dzwd9s7yvr9a4"; libraryHaskellDepends = [ aeson ansi-wl-pprint base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client http-types @@ -208677,8 +208701,8 @@ self: { }: mkDerivation { pname = "redis"; - version = "0.14.1"; - sha256 = "02r97k08n9gyrfmbm6qgb8dddivaiprp50hs79a5bnxvvl6vmq9b"; + version = "0.14.2"; + sha256 = "0l52adcr6wvdqixg9nd837pn8qqdx99zv74wmw63k5497p4mbw2y"; libraryHaskellDepends = [ base bytestring concurrent-extra containers exceptions mtl network old-time utf8-string @@ -210724,6 +210748,35 @@ self: { broken = true; }) {}; + "registry_0_1_9_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph + , MonadRandom, mtl, multimap, protolude, random, resourcet + , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog + , tasty-th, template-haskell, text, transformers-base, universum + }: + mkDerivation { + pname = "registry"; + version = "0.1.9.1"; + sha256 = "0vnx2sq3m6mqm1wcicknf7b8pfamx4pbn51hmzs6arwnvsq23vng"; + libraryHaskellDepends = [ + base containers exceptions hashable mmorph mtl protolude resourcet + semigroupoids semigroups template-haskell text transformers-base + ]; + testHaskellDepends = [ + async base bytestring containers directory exceptions generic-lens + hashable hedgehog io-memoize mmorph MonadRandom mtl multimap + protolude random resourcet semigroupoids semigroups tasty + tasty-discover tasty-hedgehog tasty-th template-haskell text + transformers-base universum + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "registry-hedgehog" = callPackage ({ mkDerivation, base, containers, generic-lens, hedgehog, mmorph , multimap, protolude, registry, tasty, tasty-discover @@ -263128,10 +263181,8 @@ self: { }: mkDerivation { pname = "vinyl"; - version = "0.12.3"; - sha256 = "0vqi8xkbijyjs0z7v08j37rlcjsy5s48b5q2dyj8j4j4z7ghnrcx"; - revision = "1"; - editedCabalFile = "1lh00vr5gwwlgmmry08bcx5nda3fhwkzq9hxy315c9m6651gcsxw"; + version = "0.13.0"; + sha256 = "1ks5rzv3b5fjgcy4g54wxnfqa450ifyap18pq2sb2c8a6bkh3qlh"; libraryHaskellDepends = [ array base ghc-prim ]; testHaskellDepends = [ aeson base doctest hspec lens lens-aeson microlens mtl From 9b0f6a0ffc3b91430aa33273f6a64d9f0426b629 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 09:33:30 +0000 Subject: [PATCH 3169/3452] gitAndTools.git-extras: 5.1.0 -> 6.0.0 --- .../version-management/git-and-tools/git-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index f2afdd941fe4..ed9e1cd4bdfa 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "git-extras"; - version = "5.1.0"; + version = "6.0.0"; src = fetchzip { url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; - sha256 = "0ja8ds9gpibrnwcf8n6cpbggwkbks0ik3z9vfx5h1yf3ln1nycky"; + sha256 = "0mxb3c5lb5n7c76bp10bw7bid564vjxi5f7cvzaj2ss93v5rr11g"; }; nativeBuildInputs = [ unixtools.column which ]; From c027541d123ba546d9993edb6f539fc3d7bfc6f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 09:53:03 +0000 Subject: [PATCH 3170/3452] gnome3.gnome-contacts: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/core/gnome-contacts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 6e933e7b9af0..5372552a7208 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0qb2kgyk6f6wr129a0gzhvpy5wdjpwjbksxyfs6zxv183jl9s73z"; + sha256 = "048l07biy8xrfidfyzrjd5lrnfzqhb767ih2gl7w6c4mmhj4g2dy"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; From 2f8baeb5880866f54774e113a2950386acf03cae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 09:40:19 +0000 Subject: [PATCH 3171/3452] spleen: 1.7.0 -> 1.8.0 --- pkgs/data/fonts/spleen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 6994b7d4a720..ace317bf35c5 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -2,7 +2,7 @@ let pname = "spleen"; - version = "1.7.0"; + version = "1.8.0"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; @@ -19,7 +19,7 @@ in fetchurl { # create fonts.dir so NixOS xorg module adds to fp ${mkfontscale}/bin/mkfontdir "$d" ''; - sha256 = "17dn6spfr8wv63sy009djb4q12q635m13wsyirzn074qabhr9ggg"; + sha256 = "0vaawnav4k2gpwsgxn5rmkd8wyxnwsrbd0ksp749sb7rwfd3nphc"; meta = with lib; { description = "Monospaced bitmap fonts"; From 14a76c25e7144885999e4aa96c1321dd477f3881 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 10:06:50 +0000 Subject: [PATCH 3172/3452] intel-gmmlib: 20.1.1 -> 20.2.2 --- pkgs/development/libraries/intel-gmmlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 23b26c9a8908..7b3cb0a2528a 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "20.1.1"; + version = "20.2.2"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "0k130yiq8n34ppddpgl7kwq5w2y7n49jxiyk7x52y773m97xd6y1"; + sha256 = "1gr4xfw8a99jwir7dxqwbfs42lrap3gimwkd7mrhi8vgacvkkvhf"; }; nativeBuildInputs = [ cmake ]; From 251c961c442bb601d79a8dfe9d450457b9c2f0e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 10:14:43 +0000 Subject: [PATCH 3173/3452] gallery-dl: 1.14.1 -> 1.14.2 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 6b8f6aa38cf8..8049f79af2d2 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.14.1"; + version = "1.14.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0w4zmfbsr7xdymrrmdvcc0kqz11ql8j067ghlr84faqlsnx09z74"; + sha256 = "14a8skaxc4xn2hm8ahp8lzrmwh1f3lbcibvhpprqr3szd6i2p0pf"; }; doCheck = false; From 2b54a7ed515fda320421ee98cd8129edd06a1072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Jul 2020 12:15:49 +0200 Subject: [PATCH 3174/3452] postfix: 3.5.3 -> 3.5.4 (#91768) --- pkgs/servers/mail/postfix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 585a6196831b..c895147875d2 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "0xcd9pmv2p4znn6bqvka19h5h2lw90inyxrm5020acd0yaf0i0g3"; + sha256 = "10b8g6xv90shhfx17cjw7p40gphwi02az1y2dd8a4sjm4z6b2bzw"; }; nativeBuildInputs = [ makeWrapper m4 ]; From e81b8197524f96e27b409e2d284fde1c3c55dc48 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 10:22:05 +0000 Subject: [PATCH 3175/3452] fetchmail: 6.4.6 -> 6.4.8 --- pkgs/applications/misc/fetchmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 00b858a32798..bed673ef8d49 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: let - version = "6.4.6"; + version = "6.4.8"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "04b0sq1xad6gs1bfhkbmhsn1kq6y4gsx9l9ywjvd5d0rc15yrvqn"; + sha256 = "1g893dr3982vrqzxybmflnqfmd1q6yipd9krvxn0avhlrrp97k96"; }; buildInputs = [ openssl ]; From 4535c662197c7e33a042e66ef092b3b35d3d94f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Jul 2020 12:36:11 +0200 Subject: [PATCH 3176/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-8-g13e29eb from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/3ea24c40c8452336ec2805476e3cf6c1d54ec26e. --- .../haskell-modules/hackage-packages.nix | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fc900dd080c3..d55321c3638d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -36125,6 +36125,33 @@ self: { broken = true; }) {}; + "azure-functions-worker" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers + , directory, filepath, glabrous, http-types, http2-client + , http2-client-grpc, http2-grpc-proto-lens, http2-grpc-types + , lens-family, lens-family-core, mtl, network-uri + , optparse-applicative, proto-lens-protobuf-types + , proto-lens-protoc, proto-lens-runtime, proto-lens-setup + , raw-strings-qq, stm, text, time + }: + mkDerivation { + pname = "azure-functions-worker"; + version = "0.0.0.0"; + sha256 = "0035kmxfnb121mg38xzbyxphwg2r4x63chlywl67b9nz1pwp828x"; + setupHaskellDepends = [ base Cabal proto-lens-setup ]; + libraryHaskellDepends = [ + aeson async base bytestring containers directory filepath glabrous + http-types http2-client http2-client-grpc http2-grpc-proto-lens + http2-grpc-types lens-family lens-family-core mtl network-uri + optparse-applicative proto-lens-protobuf-types proto-lens-runtime + raw-strings-qq stm text time + ]; + libraryToolDepends = [ proto-lens-protoc ]; + testHaskellDepends = [ base ]; + description = "Azure Functions Worker"; + license = stdenv.lib.licenses.mit; + }) {}; + "azure-service-api" = callPackage ({ mkDerivation, base, binary, bytestring, case-insensitive , certificate, crypto-pubkey-types, http-conduit, hxt, hxt-xpath @@ -196915,10 +196942,8 @@ self: { ({ mkDerivation, base, bytestring, process, unix, util }: mkDerivation { pname = "posix-pty"; - version = "0.2.1.1"; - sha256 = "1fdvzmk7v7lasyhwinl9wqxq8c67balyyygyb1bzljj3hzn0rid2"; - revision = "1"; - editedCabalFile = "1dhxxwlv69bczi7mbhdd9f3s9nnjb4b3jf9mlgdjg7wxqh84zrgi"; + version = "0.2.2"; + sha256 = "1wwpvjnc252miyqmg5ffvf6ba60kj1i7iknyxrpkmh3zhz31vyws"; libraryHaskellDepends = [ base bytestring process unix ]; librarySystemDepends = [ util ]; testHaskellDepends = [ base bytestring process ]; From 7c5b65c510fccaa43c22e87309c46e8efeefc569 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Jul 2020 12:39:38 +0200 Subject: [PATCH 3177/3452] hackag2nix: update git-annex to the latest version --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 0c28dbd06080..2f53d58aa29e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -67,8 +67,6 @@ core-packages: # comment saying "# LTS Haskell x.y". Any changes after that commend will be # lost the next time `update-stackage.sh` runs. default-package-overrides: - # Newer versions have test suite failures. - - git-annex < 8.20200522 # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag - MissingH ==1.4.2.0 # gi-gdkx11-4.x requires gtk-4.x, which is still under development and From a3e278e2c9fec2ddb4b040b6d71b2cc83ad2ece1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Jul 2020 12:43:08 +0200 Subject: [PATCH 3178/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-8-g13e29eb from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/f309bf0ba5b89da36b9098ddc124cc5d01ab2c1b. --- .../haskell-modules/hackage-packages.nix | 78 +------------------ 1 file changed, 2 insertions(+), 76 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d55321c3638d..ed91c9688dcb 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -100112,79 +100112,6 @@ self: { }) {}; "git-annex" = callPackage - ({ mkDerivation, aeson, async, attoparsec, aws, base, blaze-builder - , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive - , clientsession, concurrent-output, conduit, connection, containers - , crypto-api, cryptonite, curl, data-default, DAV, dbus, deepseq - , directory, disk-free-space, dlist, edit-distance, exceptions - , fdo-notify, feed, filepath, filepath-bytestring, free, git, gnupg - , hinotify, hslogger, http-client, http-client-tls, http-conduit - , http-types, IfElse, lsof, magic, memory, microlens, monad-control - , monad-logger, mountpoints, mtl, network, network-bsd - , network-info, network-multicast, network-uri, old-locale, openssh - , optparse-applicative, path-pieces, perl, persistent - , persistent-sqlite, persistent-template, process, QuickCheck - , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi - , securemem, shakespeare, socks, split, stm, stm-chans, tagsoup - , tasty, tasty-hunit, tasty-quickcheck, tasty-rerun - , template-haskell, text, time, torrent, transformers, unix - , unix-compat, unliftio-core, unordered-containers, utf8-string - , uuid, vector, wai, wai-extra, warp, warp-tls, wget, which, yesod - , yesod-core, yesod-form, yesod-static - }: - mkDerivation { - pname = "git-annex"; - version = "8.20200501"; - sha256 = "19rggaymvqy7r61n2rl2nigwdi2hzq5l1afcd5l0k1vbacwgq4jl"; - configureFlags = [ - "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" - "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" - "-fwebapp" "-fwebdav" - ]; - isLibrary = false; - isExecutable = true; - setupHaskellDepends = [ - base bytestring Cabal data-default directory exceptions filepath - filepath-bytestring hslogger IfElse process split transformers - unix-compat utf8-string - ]; - executableHaskellDepends = [ - aeson async attoparsec aws base blaze-builder bloomfilter byteable - bytestring case-insensitive clientsession concurrent-output conduit - connection containers crypto-api cryptonite data-default DAV dbus - deepseq directory disk-free-space dlist edit-distance exceptions - fdo-notify feed filepath filepath-bytestring free hinotify hslogger - http-client http-client-tls http-conduit http-types IfElse magic - memory microlens monad-control monad-logger mountpoints mtl network - network-bsd network-info network-multicast network-uri old-locale - optparse-applicative path-pieces persistent persistent-sqlite - persistent-template process QuickCheck random regex-tdfa resourcet - SafeSemaphore sandi securemem shakespeare socks split stm stm-chans - tagsoup tasty tasty-hunit tasty-quickcheck tasty-rerun - template-haskell text time torrent transformers unix unix-compat - unliftio-core unordered-containers utf8-string uuid vector wai - wai-extra warp warp-tls yesod yesod-core yesod-form yesod-static - ]; - executableSystemDepends = [ - bup curl git gnupg lsof openssh perl rsync wget which - ]; - preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; - postBuild = '' - ln -sf dist/build/git-annex/git-annex git-annex - ln -sf git-annex git-annex-shell - ''; - installPhase = "make PREFIX=$out BUILDER=: install install-completions"; - checkPhase = ''PATH+=":$PWD" git-annex test''; - enableSharedExecutables = false; - description = "manage files with git, without checking their contents into git"; - license = stdenv.lib.licenses.agpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; - inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; - inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; - inherit (pkgs) which;}; - - "git-annex_8_20200617" = callPackage ({ mkDerivation, aeson, async, attoparsec, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive , clientsession, concurrent-output, conduit, connection, containers @@ -100251,7 +100178,6 @@ self: { enableSharedExecutables = false; description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; @@ -164146,8 +164072,8 @@ self: { }: mkDerivation { pname = "mason"; - version = "0.2.1"; - sha256 = "08na34n8f8r9r2z95dfnkvsbc0w76x0ic8yxvpxnykax7n2xhpia"; + version = "0.2.2"; + sha256 = "1wck31lm5ms99r0aji8mkr0ax78i9z0qzz7gy9ihwriwwhyl9yiz"; libraryHaskellDepends = [ array base bytestring ghc-prim integer-gmp network text ]; From 4058ee8471d668d8d563a5eff059c675e8b6fd14 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Jul 2020 12:44:43 +0200 Subject: [PATCH 3179/3452] git-annex: update sha256 hash for the new release --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8aceba9d65f9..84316846ab65 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -69,7 +69,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0adw72lw3ygls87w6i7hirf26gz991dkm992jb5f0h5nvy6d44pl"; + sha256 = "1b5lb1h7pqfhmp54zzwha17ms20xvxai1dl7s6787m9asli4q406"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From 7117b0d6a2541fdc049397066f521bdfe005264d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 11:31:51 +0000 Subject: [PATCH 3180/3452] fdroidserver: 1.1.7 -> 1.1.9 --- pkgs/development/tools/fdroidserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index c038e4fdfaf1..2b96830b0022 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -4,14 +4,14 @@ , lib }: python.pkgs.buildPythonApplication rec { - version = "1.1.7"; + version = "1.1.9"; pname = "fdroidserver"; src = fetchFromGitLab { owner = "fdroid"; repo = "fdroidserver"; rev = version; - sha256 = "1xs4qmja7mm9m67368k2s9p7pmkdx9xz4g3xrsks0s8hwwyliz1s"; + sha256 = "098dcg8jdi4q1prfjmd2lbhcyzb8fmmfhbxhid4kqx8vcv7r0iql"; }; patchPhase = '' From 97c089f2f78160ab07f51f94381e497921ed00ac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 11:56:48 +0000 Subject: [PATCH 3181/3452] gmsh: 4.5.6 -> 4.6.0 --- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 946beff8003f..db7e238e8ded 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.5.6"; + version = "4.6.0"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "0gs65bgr1ph5lz7r6manqj8cra30s7c94pxilkd2z0p5vq6fpsj6"; + sha256 = "075dyblmlfdlhgbb1dwk6jzlqx93q90n6zwpr3mpii5n1zjmab0g"; }; buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL From f3e951814972f05b0ab9c1ee0ee7cbfa7c12e8a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 3 Jul 2020 14:06:21 +0200 Subject: [PATCH 3182/3452] dpic: cleanup derivation, install man pages - Use configure, since upstream provides it. - Rely on `make install` to install dpic. - This also installs the man pages. --- pkgs/tools/graphics/dpic/default.nix | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix index 0bcac70e4b7f..7b7eea3d5095 100644 --- a/pkgs/tools/graphics/dpic/default.nix +++ b/pkgs/tools/graphics/dpic/default.nix @@ -9,21 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1gbkpbjwjaaifxff8amm9b47dynq4l4698snjdgnn4flndw62q88"; }; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + # The prefix passed to configure is not used. + makeFlags = [ "DESTDIR=$(out)" ]; - makeFlags = [ "CC=${stdenv.cc.outPath}/bin/cc" ]; - - installPhase = '' - mkdir -p $out/bin - cp -fv dpic $out/bin - ''; - - meta = { - homepage = "https://ece.uwaterloo.ca/~aplevich/dpic/"; + meta = with stdenv.lib; { description = "An implementation of the pic little language for creating drawings"; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.aespinosa ]; - platforms = stdenv.lib.platforms.all; + homepage = "https://ece.uwaterloo.ca/~aplevich/dpic/"; + license = licenses.bsd2; + maintainers = with maintainers; [ aespinosa ]; + platforms = platforms.all; }; } From 873e21190ea9e640a58e228793e6cbbe6d062491 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 3 Jul 2020 14:27:51 +0200 Subject: [PATCH 3183/3452] cargo-make: 0.31.1 -> 0.32.0 https://github.com/sagiegurari/cargo-make/releases/tag/0.32.0 --- .../tools/rust/cargo-make/Cargo.lock | 410 +++++++++++++----- .../tools/rust/cargo-make/default.nix | 6 +- 2 files changed, 315 insertions(+), 101 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock index 7f240291ae5e..191e96f021f5 100644 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -1,18 +1,27 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. [[package]] -name = "adler32" -version = "1.0.4" +name = "adler" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" +checksum = "ccc9a9dd069569f212bc4330af9f17c4afb5e8ce185e83dbb14f1349dda18b10" [[package]] name = "aho-corasick" -version = "0.7.10" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" +checksum = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" dependencies = [ - "memchr", + "memchr 0.1.11", +] + +[[package]] +name = "aho-corasick" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +dependencies = [ + "memchr 2.3.3", ] [[package]] @@ -21,7 +30,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -38,9 +47,9 @@ checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" [[package]] name = "attohttpc" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5db1932a9d70d5091139d6b0e04ec6a4d9f9184041c15d71a5ef954cb3c5312" +checksum = "fe174d1b67f7b2bafed829c09db039301eb5841f66e43be2cf60b326e7f8e2cc" dependencies = [ "flate2", "http", @@ -58,7 +67,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -75,9 +84,9 @@ checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" [[package]] name = "base64" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d1ccbaf7d9ec9537465a97bf19edc1a4e158ecb49fc16178202238c569cc42" +checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" [[package]] name = "bitflags" @@ -98,13 +107,16 @@ dependencies = [ [[package]] name = "bytes" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" +checksum = "118cf036fbb97d0816e3c34b2d7a1e8cfc60f68fcf63d550ddbe9bd5f59c213b" +dependencies = [ + "loom", +] [[package]] name = "cargo-make" -version = "0.31.1" +version = "0.32.0" dependencies = [ "ci_info", "clap", @@ -123,7 +135,7 @@ dependencies = [ "run_script", "rust_info", "rusty-hook", - "semver", + "semver 0.10.0", "serde", "serde_derive", "serde_json", @@ -133,9 +145,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.54" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311" +checksum = "0fde55d2a2bfaa4c9668bbc63f531fbdeee3ffe188f4662511ce2c22b3eedebe" [[package]] name = "cfg-if" @@ -144,10 +156,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" [[package]] -name = "ci_info" -version = "0.10.1" +name = "chrono" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19c5f9baeac8a1176ca7fc58a0cc1abadd84d360365a93d1dd31e926f3f502b" +checksum = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00" +dependencies = [ + "num", + "time", +] + +[[package]] +name = "ci_info" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24f638c70e8c5753795cc9a8c07c44da91554a09e4cf11a7326e8161b0a3c45e" dependencies = [ "envmnt", ] @@ -174,8 +196,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" dependencies = [ "atty", - "lazy_static", - "winapi", + "lazy_static 1.4.0", + "winapi 0.3.9", ] [[package]] @@ -217,7 +239,7 @@ checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg", "cfg-if", - "lazy_static", + "lazy_static 1.4.0", ] [[package]] @@ -238,7 +260,7 @@ checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" dependencies = [ "libc", "redox_users", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -252,16 +274,17 @@ dependencies = [ [[package]] name = "duckscriptsdk" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b258092ada5ae7b5dda45906ebcae3e77c419a98e324750bc92af2b8912dd65e" +checksum = "0033c9c694e0a358f42316e3517442ca9039de8b3838d8320fb129da5dbec28b" dependencies = [ "attohttpc", - "base64 0.12.1", + "base64 0.12.3", "cfg-if", "duckscript", "fs_extra", "fsio", + "ftp", "glob", "home", "java-properties", @@ -340,9 +363,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] name = "envmnt" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fba7e7d8c007e12db7b3bd6f04b8e47e206c9173d9c75413a042ccc941723c8" +checksum = "0dad160daebf530422640d9496277681d6a2caa3172ec8fd2a315a122829319b" dependencies = [ "fsio", "indexmap", @@ -359,9 +382,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42" +checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e" dependencies = [ "cfg-if", "crc32fast", @@ -406,6 +429,30 @@ dependencies = [ "users", ] +[[package]] +name = "ftp" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "542951aad0071952c27409e3bd7cb62d1a3ad419c4e7314106bf994e0083ad5d" +dependencies = [ + "chrono", + "lazy_static 0.1.16", + "regex 0.1.80", +] + +[[package]] +name = "generator" +version = "0.6.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add72f17bb81521258fcc8a7a3245b1e184e916bfbe34f0ea89558f440df5c68" +dependencies = [ + "cc", + "libc", + "log", + "rustc_version", + "winapi 0.3.9", +] + [[package]] name = "getopts" version = "0.2.21" @@ -440,9 +487,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "hermit-abi" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91780f809e750b0a89f5544be56617ff6b1227ee485bcb06ebe10cdf89bd3b71" +checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" dependencies = [ "libc", ] @@ -453,7 +500,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -490,9 +537,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" +checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" [[package]] name = "java-properties" @@ -501,9 +548,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa" dependencies = [ "encoding", - "regex", + "regex 1.3.9", ] +[[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", + "winapi-build", +] + +[[package]] +name = "lazy_static" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf186d1a8aa5f5bee5fd662bc9c1b949e0259e1bcc379d1f006847b0080c7417" + [[package]] name = "lazy_static" version = "1.4.0" @@ -525,12 +588,32 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "loom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ecc775857611e1df29abba5c41355cdf540e7e9d4acfdf0f355eefee82330b7" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", +] + [[package]] name = "matches" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +[[package]] +name = "memchr" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" +dependencies = [ + "libc", +] + [[package]] name = "memchr" version = "2.3.3" @@ -549,11 +632,11 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.3.6" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5" +checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f" dependencies = [ - "adler32", + "adler", ] [[package]] @@ -562,7 +645,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" dependencies = [ - "lazy_static", + "lazy_static 1.4.0", "libc", "log", "openssl", @@ -586,6 +669,47 @@ version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" +[[package]] +name = "num" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" +dependencies = [ + "num-integer", + "num-iter", + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +dependencies = [ + "autocfg", +] + [[package]] name = "num_cpus" version = "1.13.0" @@ -598,14 +722,14 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.29" +version = "0.10.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" +checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" dependencies = [ "bitflags", "cfg-if", "foreign-types", - "lazy_static", + "lazy_static 1.4.0", "libc", "openssl-sys", ] @@ -658,9 +782,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea" +checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" dependencies = [ "proc-macro2", ] @@ -723,18 +847,37 @@ dependencies = [ "rust-argon2", ] +[[package]] +name = "regex" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" +dependencies = [ + "aho-corasick 0.5.3", + "memchr 0.1.11", + "regex-syntax 0.3.9", + "thread_local 0.2.7", + "utf8-ranges", +] + [[package]] name = "regex" version = "1.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", - "thread_local", + "aho-corasick 0.7.13", + "memchr 2.3.3", + "regex-syntax 0.6.18", + "thread_local 1.0.1", ] +[[package]] +name = "regex-syntax" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" + [[package]] name = "regex-syntax" version = "0.6.18" @@ -743,11 +886,11 @@ checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" [[package]] name = "remove_dir_all" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] @@ -778,10 +921,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02b506bd796703b88d74a3edb529acde6c71d81bb078c392eecd60a745cb1d2f" [[package]] -name = "rusty-hook" -version = "0.11.1" +name = "rustc_version" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27138b73a8ce63ae918707a5e3b57f9b0c0842a57b82f0e43474cf4e3aaf0ff4" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "rusty-hook" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96cee9be61be7e1cbadd851e58ed7449c29c620f00b23df937cb9cbc04ac21a3" dependencies = [ "ci_info", "getopts", @@ -810,10 +962,16 @@ version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" dependencies = [ - "lazy_static", - "winapi", + "lazy_static 1.4.0", + "winapi 0.3.9", ] +[[package]] +name = "scoped-tls" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" + [[package]] name = "security-framework" version = "0.4.4" @@ -837,6 +995,15 @@ dependencies = [ "libc", ] +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + [[package]] name = "semver" version = "0.10.0" @@ -854,15 +1021,15 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.111" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9124df5b40cbd380080b2cc6ab894c040a3070d995f5c9dc77e18c34a8ae37d" +checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" [[package]] name = "serde_derive" -version = "1.0.111" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250" +checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" dependencies = [ "proc-macro2", "quote", @@ -871,9 +1038,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.53" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993948e75b189211a9b31a7528f950c6adc21f9720b6438ff80a7fa2f864cea2" +checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" dependencies = [ "itoa", "ryu", @@ -886,15 +1053,9 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65" dependencies = [ - "regex", + "regex 1.3.9", ] -[[package]] -name = "smallvec" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" - [[package]] name = "strsim" version = "0.8.0" @@ -903,9 +1064,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "syn" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93a56fabc59dce20fe48b6c832cc249c713e7ed88fa28b0ee0a3bfcaae5fe4e2" +checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" dependencies = [ "proc-macro2", "quote", @@ -923,7 +1084,7 @@ dependencies = [ "rand", "redox_syscall", "remove_dir_all", - "winapi", + "winapi 0.3.9", ] [[package]] @@ -937,33 +1098,68 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13f926965ad00595dd129fa12823b04bbf866e9085ab0a5f2b05b850fbfc344" +checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "893582086c2f98cde18f906265a65b5030a074b1046c674ae898be6519a7f479" +checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "thread-id" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" +dependencies = [ + "kernel32-sys", + "libc", +] + +[[package]] +name = "thread_local" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" +dependencies = [ + "thread-id", +] + [[package]] name = "thread_local" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" dependencies = [ - "lazy_static", + "lazy_static 1.4.0", ] +[[package]] +name = "time" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "tinyvec" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" + [[package]] name = "toml" version = "0.5.6" @@ -993,24 +1189,24 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" +checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" dependencies = [ - "smallvec", + "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" [[package]] name = "unicode-xid" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" [[package]] name = "url" @@ -1033,10 +1229,16 @@ dependencies = [ ] [[package]] -name = "vcpkg" -version = "0.2.9" +name = "utf8-ranges" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d1e41d56121e07f1e223db0a4def204e45c85425f6a16d462fd07c8d10d74c" +checksum = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" + +[[package]] +name = "vcpkg" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" [[package]] name = "vec_map" @@ -1051,7 +1253,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" dependencies = [ "same-file", - "winapi", + "winapi 0.3.9", "winapi-util", ] @@ -1063,9 +1265,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "which" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd3edc3cf5458851a4d6a2329232bd5f42c7f9bbe4c4782c4ef9ce37e5d101b2" +checksum = "b5fe1a9cb33fe7cf77d431070d0223e544b1e4e7f7764bad0a3e691a6678a131" dependencies = [ "libc", "thiserror", @@ -1073,20 +1275,32 @@ dependencies = [ [[package]] name = "whoami" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08eb844b158ea881e81b94556eede7f7e306e4c7b976aad88f49e6e36dec391" +checksum = "7884773ab69074615cb8f8425d0e53f11710786158704fca70f53e71b0e05504" [[package]] name = "winapi" -version = "0.3.8" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ "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" @@ -1099,7 +1313,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi", + "winapi 0.3.9", ] [[package]] diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 3ed271e6ed8d..0daf50861877 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.31.1"; + version = "0.32.0"; src = let @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "0hxfysbrdc9f20v0nbvb1sxhyr86iwmf70x0xpkpkzp33i7ssdig"; + sha256 = "1bkc3z1w9gbjymmr5lk322kn0rd6b57v92a32jf7nckllxf43807"; }; in runCommand "source" {} '' @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1nvhlwssq7igb3bpp9y0lpfila2y6l48365kh8nqcrb189z3xs1q"; + cargoSha256 = "0l7krag7n4kjvh3d4zhkk1jdswsrkag5z664fm1zwvf6rw6sfdmi"; # Some tests fail because they need network access. # However, Travis ensures a proper build. From ff5bf5e793cfcab1a7abfa8f9f86da8962e78cf9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 13:40:00 +0000 Subject: [PATCH 3184/3452] flyway: 6.4.4 -> 6.5.0 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index adb36d8e92cb..19d898ce9930 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.4.4"; + version = "6.5.0"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "16zckqq64jv3031ssrvzw4ny98gnxhy2hsdp877i38zxqsvzdcym"; + sha256 = "0qag8xz347vwwqlwirlz5vnhvfga79ihwqp1y0rbqzhcnwpjzc69"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From dcf20331cf56fd26adde5b1831dcd1ea288cb3f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 14:15:50 +0000 Subject: [PATCH 3185/3452] graylog: 3.3.1 -> 3.3.2 --- pkgs/tools/misc/graylog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 8530d04b49a3..6b2059cafdf9 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1jcv2dqm49vbz810ypv024r3lqgz804l06yhhwshrih61xzj7dvh"; + sha256 = "0mw0nwj6i681bfsp3psjq377bha2qskkw955pp9h1p8xdyy8cx32"; }; dontBuild = true; From 491596bbae27e057d0188f88fd374cb651450f2c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 14:36:50 +0000 Subject: [PATCH 3186/3452] hikari: 2.0.2 -> 2.0.4 --- pkgs/applications/window-managers/hikari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 274c75a3c13c..16271864afaa 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -12,7 +12,7 @@ let pname = "hikari"; - version = "2.0.2"; + version = "2.0.4"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz"; - sha256 = "1a3i01936pw11hrmjmrhzzwpndl1jqjgx376m5m724wd1j9awm68"; + sha256 = "0arm2zmiqf63a7a3nwcqf88lsk79n0ycdqqgz0c2wafvdxl23v3d"; }; nativeBuildInputs = [ pkgconfig bmake ]; From b994272c13bb6908b12b13cc1f2460bac4496ee9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 14:51:48 +0000 Subject: [PATCH 3187/3452] hopper: 4.5.28 -> 4.5.29 --- pkgs/development/tools/analysis/hopper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index bd7b831b8162..68f12dac70f5 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "hopper"; - version = "4.5.28"; + version = "4.5.29"; rev = "v${lib.versions.major version}"; src = fetchurl { url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "0mjpkd5c9igkxp9jg8cvrgrxw9x7ag1p5xivjbzhb3vld6xjm4dh"; + sha256 = "1v1pff5fiv41khvrnlpdks2vddjnvziyn14qqj6v26snyhwi86zh"; }; sourceRoot = "."; From 05bc2118f18ba593b6c14a8f36ea9b34c593a1ec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 15:37:33 +0000 Subject: [PATCH 3188/3452] grml-zsh-config: 0.17.2 -> 0.17.3 --- pkgs/shells/zsh/grml-zsh-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 4a287e084449..2012e27e5386 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "1h17xdlxhnjqirqwksi8qhx2lyajz7b0hmvb80i7313splhjp6hn"; + sha256 = "1d5d68gflf67hsg1gy2ywssfdx61j1kl799akhvlwi5c0vvszvpi"; }; buildInputs = [ zsh coreutils txt2tags procps ] From fdea8164ecbb509cdb08b44495bc283a4476c400 Mon Sep 17 00:00:00 2001 From: Victor Luft Date: Mon, 15 Jun 2020 10:06:36 -0700 Subject: [PATCH 3189/3452] linuxPackages.zenpower: 0.1.10 -> 0.1.12 --- pkgs/os-specific/linux/zenpower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix index bc1d803bb100..43885027d9e7 100644 --- a/pkgs/os-specific/linux/zenpower/default.nix +++ b/pkgs/os-specific/linux/zenpower/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zenpower"; - version = "0.1.10"; + version = "0.1.12"; src = fetchFromGitHub { owner = "ocerman"; repo = "zenpower"; rev = "v${version}"; - sha256 = "1fqqaj7fq49yi2yip518036w80r9w7mkxpbkrxqzlydpma1x9v5m"; + sha256 = "116yrw4ygh3fqwhniaqq0nps29pq87mi2q1375f1ylkfiak8n63a"; }; hardeningDisable = [ "pic" ]; From 8307a3657b953fcf41fcf4041af44ac383825334 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 16:06:11 +0000 Subject: [PATCH 3190/3452] hitch: 1.5.2 -> 1.6.0 --- pkgs/servers/hitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix index c81cd80eb7a6..243f4af7d3a6 100644 --- a/pkgs/servers/hitch/default.nix +++ b/pkgs/servers/hitch/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, docutils, libev, openssl, pkgconfig }: stdenv.mkDerivation rec { - version = "1.5.2"; + version = "1.6.0"; pname = "hitch"; src = fetchurl { url = "https://hitch-tls.org/source/${pname}-${version}.tar.gz"; - sha256 = "1nnzqqigfw78nqhp81a72x1s8d6v49ayw4w5df0zzm2cb1jgv95i"; + sha256 = "01n70yf8hx42jb801jv5q1xhrpqxyjnqhd98hjf81lvxpd5fnisf"; }; nativeBuildInputs = [ pkgconfig ]; From 1bc8a6eeb3449f1577fce6c1ad69b76f740909ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 3 Jul 2020 18:13:09 +0200 Subject: [PATCH 3191/3452] python3Packages.transformers: add danieldk as maintainer --- pkgs/development/python-modules/transformers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 09ebf739d7d7..6ecc43b101b7 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "State-of-the-art Natural Language Processing for TensorFlow 2.0 and PyTorch"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ pashashocky ]; + maintainers = with maintainers; [ danieldk pashashocky ]; }; } From 4855aa62fa13052fb1a3daea68971503ab07a744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 3 Jul 2020 18:13:29 +0200 Subject: [PATCH 3192/3452] python3Packages.transformers: 2.2.1 -> 3.0.1 Changelog: https://github.com/huggingface/transformers/releases/tag/v3.0.0 https://github.com/huggingface/transformers/releases/tag/v3.0.1 --- .../python-modules/transformers/default.nix | 66 +++++++++++++++---- 1 file changed, 53 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 6ecc43b101b7..33cb5e049591 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -1,36 +1,76 @@ { buildPythonPackage , stdenv , fetchFromGitHub -, sacremoses -, requests -, sentencepiece , boto3 -, tqdm +, filelock , regex +, requests , numpy -, pytest +, sacremoses +, sentencepiece +, timeout-decorator +, tokenizers +, tqdm +, pytestCheckHook }: buildPythonPackage rec { pname = "transformers"; - version = "2.2.1"; + version = "3.0.1"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "1p8p3lhhiyk1xl9gpgq4vbchyz57v3w7hhvsj1r90zs3cckindl8"; + sha256 = "1l8l82zi021sq5dnzlbjx3wx0n4yy7k96n3m2fr893y9lfkhhd8z"; }; - propagatedBuildInputs = [ numpy sacremoses requests sentencepiece boto3 tqdm regex ]; + propagatedBuildInputs = [ + boto3 + filelock + numpy + regex + requests + sacremoses + sentencepiece + tokenizers + tqdm + ]; - checkInputs = [ pytest ]; - # pretrained tries to download from s3 - checkPhase = '' - cd transformers # avoid importing local files - HOME=$TMPDIR pytest -k 'not pretrained_tokenizers' + checkInputs = [ + pytestCheckHook + timeout-decorator + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "tokenizers == 0.8.0-rc4" "tokenizers>=0.8,<0.9" ''; + preCheck = '' + export HOME="$TMPDIR" + cd tests + ''; + + # Disable tests that require network access. + disabledTests = [ + "test_all_tokenizers" + "test_batch_encoding_is_fast" + "test_batch_encoding_pickle" + "test_config_from_model_shortcut" + "test_config_model_type_from_model_identifier" + "test_from_pretrained_use_fast_toggle" + "test_hf_api" + "test_outputs_can_be_shorter" + "test_outputs_not_longer_than_maxlen" + "test_pretokenized_tokenizers" + "test_tokenizer_equivalence_en_de" + "test_tokenizer_from_model_type" + "test_tokenizer_from_model_type" + "test_tokenizer_from_pretrained" + "test_tokenizer_identifier_with_correct_config" + ]; + meta = with stdenv.lib; { homepage = "https://github.com/huggingface/transformers"; description = "State-of-the-art Natural Language Processing for TensorFlow 2.0 and PyTorch"; From ddee83bcb562db4257c7662a758ef04390f77eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Fri, 3 Jul 2020 18:49:56 +0200 Subject: [PATCH 3193/3452] libreoffice: added ro locale. --- pkgs/applications/office/libreoffice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 66e12b221734..823f2b96b929 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -13,7 +13,7 @@ , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , gnome3, glib, ncurses, epoxy, gpgme -, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ru" "sl" "zh-CN" ] +, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null , ki18n ? null, kconfig ? null, kcoreaddons ? null, kio ? null, kwindowsystem ? null From 04eb79c8a95bd97d6911490accffae6808879686 Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Fri, 3 Jul 2020 18:48:10 +0200 Subject: [PATCH 3194/3452] metals: 0.9.0 -> 0.9.1 --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 5f4af6268770..be471a6e530b 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ let baseName = "metals"; - version = "0.9.0"; + version = "0.9.1"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -15,7 +15,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "116q2jzqlmdhkqvjg31b9ib8w1k7rlr8gmjcr7z32idpn16hqg59"; + outputHash = "1pa84y7jrfl8p7lwz2pjlv70fqg1wmcz98npqq5i443smf7r9v4f"; }; in stdenv.mkDerivation rec { From a277f1d54e22c4a4b915c45f6a9a55ca1ef20262 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 17:13:11 +0000 Subject: [PATCH 3195/3452] hydroxide: 0.2.14 -> 0.2.15 --- pkgs/applications/networking/hydroxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index 4753cd464b13..318867922c4e 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.14"; + version = "0.2.15"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "0d8wjyzmw89yhrszz487f7i19rcz7xlx4w2wd4c69k5nsdrs6dys"; + sha256 = "0r91cq39n89hfy8sbdy5vjzqfrsfd7cdhd41gwszpayq65qhbsyp"; }; - vendorSha256 = "0d8yfmsl8rycbq8gjnvc657j14644lq0zmr9l88ik360szw6v6gc"; + vendorSha256 = "1r5qg5cx48yw1l5nil28y4a82fc7g52jmy9pckaxygppmmn539pc"; subPackages = [ "cmd/hydroxide" ]; From 0ff4f8095a236fb70c939e0f8a91e2d2327ead70 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Jul 2020 13:02:24 -0400 Subject: [PATCH 3196/3452] linux/hardened/patches/4.14: 4.14.185.a -> 4.14.187.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 9fbe914f266d..e800f7cfb125 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.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" + "name": "linux-hardened-4.14.187.a.patch", + "sha256": "1mg2pmld8g2vrphf2hk2ndhr2m503z3yv0l9hgvrc1gqwdhsdcp2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.187.a/linux-hardened-4.14.187.a.patch" }, "4.19": { "name": "linux-hardened-4.19.129.a.patch", From 760c9b1da7dc78f4f6e741525aff0c4333f6adb4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Jul 2020 13:02:33 -0400 Subject: [PATCH 3197/3452] linux/hardened/patches/4.19: 4.19.129.a -> 4.19.131.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 e800f7cfb125..df5535e58001 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.187.a/linux-hardened-4.14.187.a.patch" }, "4.19": { - "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" + "name": "linux-hardened-4.19.131.a.patch", + "sha256": "0f8ql5d5r5drhv70glmq3dlpvnz63k7fl0rib6wakhdj4988jjkh", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.131.a/linux-hardened-4.19.131.a.patch" }, "5.4": { "name": "linux-hardened-5.4.48.a.patch", From 4de40fa9b42826b61202f2a905550ccc18417fc9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Jul 2020 13:02:36 -0400 Subject: [PATCH 3198/3452] linux/hardened/patches/5.7: init at 5.7.7.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index df5535e58001..fbd36451acfe 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -18,5 +18,10 @@ "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" + }, + "5.7": { + "name": "linux-hardened-5.7.7.a.patch", + "sha256": "0273g98vax3x2l2hc39d53m86xm4k8r99vnksm5vmg6i2xc4ir74", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.7.a/linux-hardened-5.7.7.a.patch" } } From 67557dff2fd8135ce48f0274c9a837870d8505d4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Jul 2020 13:09:38 -0400 Subject: [PATCH 3199/3452] oh-my-zsh: 2020-07-01 -> 2020-07-03 --- 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 31e0275d96a3..75fe569a437b 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-07-01"; + version = "2020-07-03"; pname = "oh-my-zsh"; - rev = "62648d71bb05116287206d83181f9daa5a59ba67"; + rev = "a15f0f0e9ff17c1ca5c6d694d732e72c7c03a62b"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "0pj73hvjzmp9x1b4b3zi9mlihzb9g04kfz230hmwz3kxpymw879q"; + sha256 = "1byyhkd17sdrm5pz1k31xy1w8r6y85dsmhwqzy5kqzlsxbinjwxr"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 5252a22e416297bbc1ead52c78ca197cb8e47817 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Jul 2020 13:14:32 -0400 Subject: [PATCH 3200/3452] linux_hardened_latest: 5.6 -> 5.7 --- 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 f9d3f4acbfda..d5dcecbb3993 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17345,7 +17345,7 @@ in # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_6; # TODO: Update to linux_latest + linux_latest_for_hardened = pkgs.linux_latest; kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { From e44f38c8448597642b8a6f0d6a3d0157829d1aef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 17:25:06 +0000 Subject: [PATCH 3201/3452] groonga: 10.0.3 -> 10.0.4 --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index b622cf3447d1..a1ccc2092e61 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "10.0.3"; + version = "10.0.4"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "0vnrpzd7gkjh4bc0lgvh5l11ym6pls4lp1pl5jjlkyx505635k8d"; + sha256 = "1gf9vqjhq89f5xqn90pwdbz7amv38j78s3pzlxd1c2q3g24wklrj"; }; buildInputs = with stdenv.lib; From 70021185c376c9eda631099ce4f4c32cefcb57ce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Jul 2020 19:48:36 +0200 Subject: [PATCH 3202/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-8-g13e29eb from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/037cf9cfd79cf93a335604d27c9365ac20c2e872. --- .../haskell-modules/hackage-packages.nix | 98 ++++++++++++------- 1 file changed, 60 insertions(+), 38 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ed91c9688dcb..359a02d3b9e1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12638,6 +12638,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ListLike_4_7_1" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string + , vector + }: + mkDerivation { + pname = "ListLike"; + version = "4.7.1"; + sha256 = "1gccb84fma0plkwjdz8hgqa70a5lr6d9gnw6pfky993555ig29mp"; + libraryHaskellDepends = [ + array base bytestring containers deepseq dlist fmlist text + utf8-string vector + ]; + testHaskellDepends = [ + array base bytestring containers dlist fmlist HUnit QuickCheck + random text utf8-string vector + ]; + description = "Generalized support for list-like structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ListT" = callPackage ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck , transformers, util @@ -183830,14 +183852,14 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "opentelemetry_0_5_0" = callPackage + "opentelemetry_0_5_1" = callPackage ({ mkDerivation, base, bytestring, exceptions, ghc-trace-events , hashable }: mkDerivation { pname = "opentelemetry"; - version = "0.5.0"; - sha256 = "1v58p4i32ix33a8fxx9m5b2nxj9zcdn906whbgkk6il22q4pik9k"; + version = "0.5.1"; + sha256 = "1rr58ygz83xgrb160yykibz561gd5byzm9w31jp6qx8m9xy8w200"; libraryHaskellDepends = [ base bytestring exceptions ghc-trace-events hashable ]; @@ -183881,7 +183903,7 @@ self: { broken = true; }) {}; - "opentelemetry-extra_0_5_0" = callPackage + "opentelemetry-extra_0_5_1" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, clock , containers, directory, exceptions, filepath, gauge , generic-arbitrary, ghc-events, hashable, hashtables, http-client @@ -183892,8 +183914,8 @@ self: { }: mkDerivation { pname = "opentelemetry-extra"; - version = "0.5.0"; - sha256 = "0m47rs86s3mrvayipdhm5awhlnkf7r8binvs094c7vsswfvwf5mv"; + version = "0.5.1"; + sha256 = "10scwjyxsfl7bl6bml1a5aj8fa1a39hmarwgzdnvw2kk6m4p82d0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -183962,7 +183984,7 @@ self: { broken = true; }) {}; - "opentelemetry-lightstep_0_5_0" = callPackage + "opentelemetry-lightstep_0_5_1" = callPackage ({ mkDerivation, aeson, async, base, bytestring, clock, containers , exceptions, filepath, ghc-events, http-client, http-client-tls , http-types, network, opentelemetry, opentelemetry-extra @@ -183971,8 +183993,8 @@ self: { }: mkDerivation { pname = "opentelemetry-lightstep"; - version = "0.5.0"; - sha256 = "1qh7534453smipvc3blwvfqnywn165if51zdkyxva84izi6r8rfy"; + version = "0.5.1"; + sha256 = "0nwz7z3lc4iav8wgwpz5ik6jv66fg4wix446n4qwqbhphsr6pymw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184006,14 +184028,14 @@ self: { broken = true; }) {}; - "opentelemetry-wai_0_5_0" = callPackage + "opentelemetry-wai_0_5_1" = callPackage ({ mkDerivation, base, bytestring, http-types, opentelemetry, text , wai }: mkDerivation { pname = "opentelemetry-wai"; - version = "0.5.0"; - sha256 = "1prqkwj2j0vpshiaz4f61f4l8jyiqnyjaqmsylaqwbpyinp8afbk"; + version = "0.5.1"; + sha256 = "0h7xvxgzhbqqvyrx8lp47hjmfnpzrs0zaanag6bfi995mkc8mvkm"; libraryHaskellDepends = [ base bytestring http-types opentelemetry text wai ]; @@ -186836,17 +186858,17 @@ self: { broken = true; }) {}; - "pandoc-plot_0_7_1_0" = callPackage + "pandoc-plot_0_7_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, directory , filepath, githash, hashable, hspec, hspec-expectations - , lifted-async, mtl, open-browser, optparse-applicative, pandoc - , pandoc-types, shakespeare, tasty, tasty-hspec, tasty-hunit - , template-haskell, text, typed-process, yaml + , lifted-async, mtl, optparse-applicative, pandoc, pandoc-types + , shakespeare, tasty, tasty-hspec, tasty-hunit, template-haskell + , text, typed-process, yaml }: mkDerivation { pname = "pandoc-plot"; - version = "0.7.1.0"; - sha256 = "1pknimxwfprg6cqw9gh20ixzsh7lxs1a2jnmzahgnx203zyavd0w"; + version = "0.7.2.0"; + sha256 = "1ah7j0pnf6dm7kzf01d07md5gr3023f03im5z494037hh8g7qd0d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186854,8 +186876,8 @@ self: { mtl pandoc pandoc-types shakespeare text typed-process yaml ]; executableHaskellDepends = [ - base directory filepath githash open-browser optparse-applicative - pandoc pandoc-types template-haskell text + base directory filepath githash optparse-applicative pandoc + pandoc-types template-haskell text typed-process ]; testHaskellDepends = [ base containers directory filepath hspec hspec-expectations @@ -186865,7 +186887,7 @@ self: { base criterion pandoc-types template-haskell text ]; description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2Plus; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -219742,15 +219764,15 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) secp256k1;}; - "secp256k1-haskell_0_3_0" = callPackage + "secp256k1-haskell_0_3_1" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cereal , deepseq, entropy, hashable, hspec, hspec-discover, HUnit , monad-par, mtl, QuickCheck, secp256k1, string-conversions }: mkDerivation { pname = "secp256k1-haskell"; - version = "0.3.0"; - sha256 = "1zkcacmjhbmgi06qwhva37z1piacl51gxkn4b1wy70y5b8cm0y24"; + version = "0.3.1"; + sha256 = "0bhp1d4wzvmznm41fbv8zzx7sw1407v21k83zfjjv2z8apk99w4n"; libraryHaskellDepends = [ base base16-bytestring bytestring cereal deepseq entropy hashable QuickCheck string-conversions @@ -234329,27 +234351,27 @@ self: { }) {}; "sr-extra" = callPackage - ({ mkDerivation, base, bytestring, bzlib, Cabal, cereal, containers - , Diff, directory, exceptions, fgl, filemanip, filepath - , generic-data, hslogger, HUnit, lens, ListLike, mmorph, mtl - , network-uri, pretty, process, process-extras, pureMD5, QuickCheck - , random, safecopy, show-combinators, show-please, syb + ({ mkDerivation, base, base64-bytestring, bytestring, bzlib, Cabal + , cereal, containers, Diff, directory, exceptions, fgl, filemanip + , filepath, generic-data, hslogger, HUnit, lens, ListLike, mmorph + , mtl, network-uri, pretty, process, process-extras, pureMD5 + , QuickCheck, random, safecopy, show-combinators, show-please, syb , template-haskell, text, th-lift, th-lift-instances, th-orphans , time, transformers, unexceptionalio-trans, unix, Unixutils , userid, uuid, uuid-orphans, uuid-types, zlib }: mkDerivation { pname = "sr-extra"; - version = "1.72.3"; - sha256 = "0jm7r0lxcwppc85rpyasq6grqqkcwhxs0clwyasicqklkcx2l5xw"; + version = "1.80"; + sha256 = "03xm9km8wzvz8g1czj320k00xf2dzdi8rm74l7xdr9h7bxcwyh84"; libraryHaskellDepends = [ - base bytestring bzlib Cabal cereal containers Diff directory - exceptions fgl filemanip filepath generic-data hslogger HUnit lens - ListLike mmorph mtl network-uri pretty process process-extras - pureMD5 QuickCheck random safecopy show-combinators show-please syb - template-haskell text th-lift th-lift-instances th-orphans time - transformers unexceptionalio-trans unix Unixutils userid uuid - uuid-orphans uuid-types zlib + base base64-bytestring bytestring bzlib Cabal cereal containers + Diff directory exceptions fgl filemanip filepath generic-data + hslogger HUnit lens ListLike mmorph mtl network-uri pretty process + process-extras pureMD5 QuickCheck random safecopy show-combinators + show-please syb template-haskell text th-lift th-lift-instances + th-orphans time transformers unexceptionalio-trans unix Unixutils + userid uuid uuid-orphans uuid-types zlib ]; description = "Module limbo"; license = stdenv.lib.licenses.bsd3; From d5d13e31133f70b3dce2ea14dfbaff78be393ee6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 18:11:52 +0000 Subject: [PATCH 3203/3452] haproxy: 2.1.6 -> 2.1.7 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index c43edd040e7b..09b228c0b818 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "1pyz4gckdn8982vpb1iiw9agwp2s5p8wc0nn1qh1ic0wq3lrnpg6"; + sha256 = "0fd3c1znid5a9w3gcf77b85hm2a2558w9s02c4b7xzkmivqnqbir"; }; buildInputs = [ openssl zlib ] From 333c05615938d71f70ef690ba7bc1badc1a49234 Mon Sep 17 00:00:00 2001 From: Julien Langlois Date: Fri, 3 Jul 2020 13:58:33 -0400 Subject: [PATCH 3204/3452] hitch: add passthru.tests --- pkgs/servers/hitch/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix index 243f4af7d3a6..89aa63f35bdc 100644 --- a/pkgs/servers/hitch/default.nix +++ b/pkgs/servers/hitch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, docutils, libev, openssl, pkgconfig }: +{ stdenv, fetchurl, docutils, libev, openssl, pkgconfig, nixosTests }: stdenv.mkDerivation rec { version = "1.6.0"; pname = "hitch"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" "man" ]; + passthru.tests.hitch = nixosTests.hitch; + meta = with stdenv.lib; { description = "Hitch is a libev-based high performance SSL/TLS proxy by Varnish Software"; homepage = "https://hitch-tls.org/"; From 800639f287b2e51834db898c2d6a46406f9e5c39 Mon Sep 17 00:00:00 2001 From: Chuck Date: Tue, 28 Jan 2020 13:54:46 -0800 Subject: [PATCH 3205/3452] nixos/qemu-vm: Refactor: Combine duplicate disk definitions --- nixos/modules/virtualisation/qemu-vm.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index be06d6feb11f..a9f8e327e424 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -542,25 +542,18 @@ in ]; virtualisation.qemu.drives = mkMerge [ + [{ + file = "$NIX_DISK_IMAGE"; + driveExtraOpts.cache = "writeback"; + driveExtraOpts.werror = "report"; + }] (mkIf cfg.useBootLoader [ - { - file = "$NIX_DISK_IMAGE"; - driveExtraOpts.cache = "writeback"; - driveExtraOpts.werror = "report"; - } { file = "$TMPDIR/disk.img"; driveExtraOpts.media = "disk"; deviceExtraOpts.bootindex = "1"; } ]) - (mkIf (!cfg.useBootLoader) [ - { - file = "$NIX_DISK_IMAGE"; - driveExtraOpts.cache = "writeback"; - driveExtraOpts.werror = "report"; - } - ]) (imap0 (idx: _: { file = "$(pwd)/empty${toString idx}.qcow2"; driveExtraOpts.werror = "report"; From 0bad8bb45b9521079423f7b183d45c950193479e Mon Sep 17 00:00:00 2001 From: Sebastian Krohn Date: Sat, 20 Jun 2020 22:44:18 +0200 Subject: [PATCH 3206/3452] emu2: init at unstable-2020-06-04 --- pkgs/misc/emulators/emu2/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/misc/emulators/emu2/default.nix diff --git a/pkgs/misc/emulators/emu2/default.nix b/pkgs/misc/emulators/emu2/default.nix new file mode 100644 index 000000000000..fb13b602b6a6 --- /dev/null +++ b/pkgs/misc/emulators/emu2/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "emu2"; + version = "unstable-2020-06-04"; + + src = fetchFromGitHub { + owner = "dmsc"; + repo = "emu2"; + rev = "f9599d347aab07d9281400ec8b214aabd187fbcd"; + sha256 = "0d8fb3wp477kfi0p4mmr69lxsbgb4gl9pqmm68g9ixzrfch837v4"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/dmsc/emu2/"; + description = "A simple text-mode x86 + DOS emulator"; + platforms = platforms.linux; + maintainers = with maintainers; [ dramaturg ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e31c42261e72..150d7bc576c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25651,6 +25651,8 @@ in dosbox = callPackage ../misc/emulators/dosbox { }; + emu2 = callPackage ../misc/emulators/emu2 { }; + dpkg = callPackage ../tools/package-management/dpkg { }; dumb = callPackage ../misc/dumb { }; From 175934c4f341962e7cbc2c71942b4f97bd22b145 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Jul 2020 20:46:58 +0200 Subject: [PATCH 3207/3452] haskell-cryptohash-sha256: the jailbreak is necessary for all compilers --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ea72168d2a8a..8b676ab9f038 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -787,6 +787,9 @@ self: super: { # Needs QuickCheck <2.10, HUnit <1.6 and base <4.10 pointfree = doJailbreak super.pointfree; + # Depends on tasty < 1.x, which we don't have. + cryptohash-sha256 = doJailbreak super.cryptohash-sha256; + # Needs tasty-quickcheck ==0.8.*, which we don't have. cryptohash-sha1 = doJailbreak super.cryptohash-sha1; cryptohash-md5 = doJailbreak super.cryptohash-md5; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index bb2f9294cc1e..204b5d5a08cf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -54,7 +54,6 @@ self: super: { async = doJailbreak super.async; ChasingBottoms = doJailbreak super.ChasingBottoms; chell = doJailbreak super.chell; - cryptohash-sha256 = doJailbreak super.cryptohash-sha256; Diff = dontCheck super.Diff; doctest = doJailbreak super.doctest; hashable = doJailbreak super.hashable; From e3eda7d22dce0292c2367c2f67d7b6a1827d060c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Jul 2020 20:47:17 +0200 Subject: [PATCH 3208/3452] Strip trailing white-space. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8b676ab9f038..cefc8c0d534d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1332,7 +1332,7 @@ self: super: { # 2020-06-24: Tests are broken in hackage distribution. # See: https://github.com/robstewart57/rdf4h/issues/39 rdf4h = dontCheck super.rdf4h; - + # hasn't bumped upper bounds # test fails: "floskell-test: styles/base.md: openBinaryFile: does not exist (No such file or directory)" # https://github.com/ennocramer/floskell/issues/48 @@ -1345,7 +1345,7 @@ self: super: { # haskell-language-server uses its own fork of ghcide # Test disabled: it seems to freeze (is it just that it takes a long time ?) - hls-ghcide = + hls-ghcide = dontCheck ( overrideCabal super.hls-ghcide (old: { From 8b895c9bcf2118adb8cdde78cc8b3ebd4a604fb4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 18:56:15 +0000 Subject: [PATCH 3209/3452] intel-graphics-compiler: 1.0.4062 -> 1.0.4241 --- .../development/compilers/intel-graphics-compiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 6374846f4407..8ca85817f9e4 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.4062"; + version = "1.0.4241"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "1fr9mb7s5f0kiwxf04lqbyqbxfsvki0kwnpcy41m3p3la22mqz47"; + sha256 = "1jp3c67ppl1x4pazr5nzy52615cpx0kyckaridhc0fsmrkgilyxq"; }; nativeBuildInputs = [ clang cmake bison flex llvm python ]; From 6f6e106b0c5196d2bb8f1253b2dd43f6a35d0707 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Jul 2020 20:56:33 +0200 Subject: [PATCH 3210/3452] hackage2nix: disable broken builds to fix evaluation on Hydra --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 2f53d58aa29e..8805958a78dd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3216,6 +3216,7 @@ broken-packages: - azubi - azure-acs - azure-email + - azure-functions-worker - azure-service-api - azure-servicebus - azurify From 06c7787be7e49990d4f3a37a681cb7d0fed6cb88 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Fri, 3 Jul 2020 11:42:01 -0700 Subject: [PATCH 3211/3452] pythonPackages.denonavr: 0.8.1 -> 0.9.3 --- pkgs/development/python-modules/denonavr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index 643556d8793e..58099a98bdcb 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -1,18 +1,18 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, requests +{ lib, buildPythonPackage, fetchFromGitHub, isPy27, requests, netifaces , pytest, testtools, requests-mock }: buildPythonPackage rec { pname = "denonavr"; - version = "0.8.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "scarface-4711"; repo = "denonavr"; rev = version; - sha256 = "12g9w5674fmyf3f4plbhvpxpyhzw32pzwl0hvwswzrc2823xl6vx"; + sha256 = "0s8v918n6xn44r2mrq5hqbf0znpz64clq7a1jakkgz9py8bi6vnn"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests netifaces ]; doCheck = !isPy27; checkInputs = [ pytest testtools requests-mock ]; From 75f8c1a0b96b0c9b28a606b77529cb5b3b67a0b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Fri, 3 Jul 2020 21:03:00 +0200 Subject: [PATCH 3212/3452] epiphany: 3.36.2 -> 3.36.3 --- pkgs/desktops/gnome-3/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 5cffe4187ca6..77d00cafe96a 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "3.36.2"; + version = "3.36.3"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ppvzfv98031y884cgy5agr90a0q3m37x2kybsd804g21ym7drn2"; + sha256 = "0vz1j6yrjv0nmf5lk8prkkm10fbcmd35khy9zsd7d4a86wk5c6v2"; }; # Tests need an X display From 3ba2e9f15ce68c190c16ce9b7f357ad7b9fc9d5d Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Fri, 3 Jul 2020 13:33:28 -0500 Subject: [PATCH 3213/3452] pythonPackages.zstandard: 0.13.0 -> 0.14.0 --- pkgs/development/python-modules/zstandard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index 760593904be3..a0c7ccd438d4 100755 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zstandard"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "e5cbd8b751bd498f275b0582f449f92f14e64f4e03b5bf51c571240d40d43561"; + sha256 = "0lkn7n3bfp7zip6hkqwkqwc8pxmhhs4rr699k77h51rfln6kjllh"; }; propagatedBuildInputs = [ cffi ]; From 0c1b8043dded6d57f5cbd9d6ff4091511c727543 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 09:28:25 +0000 Subject: [PATCH 3214/3452] python27Packages.foxdot: 0.8.8 -> 0.8.11 --- pkgs/development/python-modules/foxdot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix index bbf8395190f8..cc9ad87052b0 100644 --- a/pkgs/development/python-modules/foxdot/default.nix +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "FoxDot"; - version = "0.8.8"; + version = "0.8.11"; src = fetchPypi { inherit pname version; - sha256 = "06y626kgaz1wn1qajlngihpvd4qz8m6lx6sknmjqhhrznyji58wi"; + sha256 = "00yqpkv7cxwk301cyiwjzr9yfq8hpnhqyspw3z874ydrl3cmssdb"; }; propagatedBuildInputs = [ tkinter supercollider ]; From 3b701aa4b6c0f9edd1059d25cecefdd4379212fe Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 3 Jul 2020 05:44:35 +0200 Subject: [PATCH 3215/3452] gimp: Fix interpreter path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GIMP uses python interpreter specified in pygimp.interp file for running Python plug-ins, so any Python related wrapping is useless. It will pick up and use the python from build PATH. Let’s use a python environment containing pygtk, which is needed by many plug-ins. Closes: https://github.com/NixOS/nixpkgs/issues/87883 --- pkgs/applications/graphics/gimp/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 9e448fa23a43..1eee37223f1c 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -28,9 +28,10 @@ , ghostscript , aalib , shared-mime-info -, python2Packages +, python2 , libexif , gettext +, makeWrapper , xorg , glib-networking , libmypaint @@ -47,7 +48,7 @@ }: let - inherit (python2Packages) pygtk wrapPython python; + python = python2.withPackages (pp: [ pp.pygtk ]); in stdenv.mkDerivation rec { pname = "gimp"; version = "2.10.20"; @@ -63,7 +64,7 @@ in stdenv.mkDerivation rec { pkgconfig intltool gettext - wrapPython + makeWrapper ]; buildInputs = [ @@ -97,7 +98,6 @@ in stdenv.mkDerivation rec { libwebp libheif python - pygtk libexif xorg.libXpm glib-networking @@ -116,8 +116,6 @@ in stdenv.mkDerivation rec { gegl ]; - pythonPath = [ pygtk ]; - # Check if librsvg was built with --disable-pixbuf-loader. PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; @@ -136,9 +134,7 @@ in stdenv.mkDerivation rec { ]; postFixup = '' - wrapPythonProgramsIn $out/lib/gimp/${passthru.majorVersion}/plug-ins/ wrapProgram $out/bin/gimp-${lib.versions.majorMinor version} \ - --prefix PYTHONPATH : "$PYTHONPATH" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; From a408cd9e7ca97fed8fd2acd73d3082806bb73397 Mon Sep 17 00:00:00 2001 From: MetaDark Date: Sat, 6 Jun 2020 18:06:28 -0400 Subject: [PATCH 3216/3452] pythonPackages.debugpy: init at 1.0.0b12 --- .../python-modules/debugpy/default.nix | 68 +++++++++++++++++++ .../debugpy/fix-test-pythonpath.patch | 12 ++++ .../python-modules/debugpy/hardcode-gdb.patch | 13 ++++ pkgs/top-level/python-packages.nix | 4 ++ 4 files changed, 97 insertions(+) create mode 100644 pkgs/development/python-modules/debugpy/default.nix create mode 100644 pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch create mode 100644 pkgs/development/python-modules/debugpy/hardcode-gdb.patch diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix new file mode 100644 index 000000000000..2d11dee64a8b --- /dev/null +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -0,0 +1,68 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, substituteAll, gdb +, colorama, django, flask, gevent, psutil, pytest +, pytest-timeout, pytest_xdist, requests +, isPy27 +}: + +buildPythonPackage rec { + pname = "debugpy"; + version = "1.0.0b12"; + + src = fetchFromGitHub { + owner = "Microsoft"; + repo = pname; + rev = "v${version}"; + sha256 = "0sz33aq5qldl7kh4qjf5w3d08l9s77ipcj4i9wfklj8f6vf9w1wh"; + }; + + patches = [ + # Hard code GDB path (used to attach to process) + (substituteAll { + src = ./hardcode-gdb.patch; + inherit gdb; + }) + + # Fix importing debugpy in: + # - test_nodebug[module-launch(externalTerminal)] + # - test_nodebug[module-launch(integratedTerminal)] + # + # NOTE: The import failures seen in these tests without the patch + # will be seen if a user "installs" debugpy by adding it to PYTHONPATH. + # To avoid this issue, debugpy should be installed using python.withPackages: + # python.withPackages (ps: with ps; [ debugpy ]) + ./fix-test-pythonpath.patch + ]; + + # Remove pre-compiled "attach" libraries and recompile for host platform + # Compile flags taken from linux_and_mac/compile_linux.sh & linux_and_mac/compile_mac.sh + preBuild = ''( + set -x + cd src/debugpy/_vendored/pydevd/pydevd_attach_to_process + rm *.so *.dylib *.dll *.exe *.pdb + ${stdenv.cc}/bin/c++ linux_and_mac/attach.cpp -Ilinux_and_mac -fPIC -nostartfiles ${{ + "x86_64-linux" = "-shared -m64 -o attach_linux_amd64.so"; + "i686-linux" = "-shared -m32 -o attach_linux_x86.so"; + "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib"; + "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib"; + }.${stdenv.hostPlatform.system}} + )''; + + checkInputs = [ + colorama django flask gevent psutil pytest + pytest-timeout pytest_xdist requests + ]; + + # Override default arguments in pytest.ini + checkPhase = "pytest --timeout 0 -n $NIX_BUILD_CORES" + # gevent fails to import zope.interface with Python 2.7 + + stdenv.lib.optionalString isPy27 " -k 'not test_gevent'"; + + meta = with stdenv.lib; { + description = "An implementation of the Debug Adapter Protocol for Python"; + homepage = "https://github.com/microsoft/debugpy"; + license = licenses.mit; + maintainers = with maintainers; [ metadark ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ]; + }; +} diff --git a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch new file mode 100644 index 000000000000..751351e03cde --- /dev/null +++ b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch @@ -0,0 +1,12 @@ +diff --git a/tests/debug/session.py b/tests/debug/session.py +index 2b39106..6d45a10 100644 +--- a/tests/debug/session.py ++++ b/tests/debug/session.py +@@ -625,6 +625,7 @@ class Session(object): + if "PYTHONPATH" in self.config.env: + # If specified, launcher will use it in lieu of PYTHONPATH it inherited + # from the adapter when spawning debuggee, so we need to adjust again. ++ self.config.env.prepend_to("PYTHONPATH", os.environ["PYTHONPATH"]) + self.config.env.prepend_to("PYTHONPATH", DEBUGGEE_PYTHONPATH.strpath) + return self._request_start("launch") + diff --git a/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch new file mode 100644 index 000000000000..780cb1aed1c4 --- /dev/null +++ b/pkgs/development/python-modules/debugpy/hardcode-gdb.patch @@ -0,0 +1,13 @@ +diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +index 6d031b4..ecf21f2 100644 +--- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py ++++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +@@ -293,7 +293,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show + is_debug = 0 + # Note that the space in the beginning of each line in the multi-line is important! + cmd = [ +- 'gdb', ++ '@gdb@/bin/gdb', + '--nw', # no gui interface + '--nh', # no ~/.gdbinit + '--nx', # no .gdbinit diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2b3f85e7160..c86fbf6bde13 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2718,6 +2718,10 @@ in { # Alias that we should deprecate dateutil = self.python-dateutil; + debugpy = callPackage ../development/python-modules/debugpy { + django = if isPy27 then self.django_1_11 else self.django; + }; + decorator = callPackage ../development/python-modules/decorator { }; deform = callPackage ../development/python-modules/deform { }; From 4c84e1d8eb13c898ea2bc407fbf794ebb873f1e9 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sat, 20 Jun 2020 17:50:11 -0700 Subject: [PATCH 3217/3452] pythonPackages.matrix-nio: 0.12.0 -> 0.14.1 --- pkgs/development/python-modules/matrix-nio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index aca4bf35434b..890518658a2b 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.12.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "1d4jhl2xjjp31yjs4zz2cfkvzbi2vr5bsrp07s6nhyc18azxr7ba"; + sha256 = "0mgb9m3298jvw3wa051zn7vp1m8qriys3ps0qn3sq54fndljgg5k"; }; nativeBuildInputs = [ From 2a05a949f9fbbb295ed8c4445a814bb6fa277e16 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sun, 21 Jun 2020 12:00:00 +0000 Subject: [PATCH 3218/3452] pantalaimon: 0.6.3 -> 0.6.5 --- .../networking/instant-messengers/pantalaimon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index be7a8725df15..d58688565fdf 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.6.3"; + version = "0.6.5"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonApplication rec { owner = "matrix-org"; repo = pname; rev = version; - sha256 = "1h1z701sj1qgcqlsk3pnzifnbcg9fshl7v6271h9x54hm3d6hg8a"; + sha256 = "1pjrq71fkpvsc79nwhxhwjkqvqhj5wsnnwvsgslghaajdaw3n6wd"; }; propagatedBuildInputs = [ From 43a355654fd583c92894f7b6f0ec0fc485cb9107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Fri, 3 Jul 2020 21:21:53 +0200 Subject: [PATCH 3219/3452] gnome-control-center: 3.36.3 -> 3.36.4 --- pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index d282fec2e851..ea28d651eba9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -68,11 +68,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.36.3"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0739qcwfwrimfrpf3gaakkf7ipwy3virs096kkhkxjmy1nbls5xw"; + sha256 = "0m7pxjgymc7aqqz0vcmlq91nxnwzd1v7v1gdhrfam49krxmk80mc"; }; nativeBuildInputs = [ From 8f516e2af8e794a3d3a32d965f0d695866c3487f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Jul 2020 20:57:27 +0200 Subject: [PATCH 3220/3452] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-8-g13e29eb from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/ccbc2765586cc6f71894919f1f096714ca6ae453. --- .../haskell-modules/hackage-packages.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 359a02d3b9e1..8af74952a021 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -36172,6 +36172,8 @@ self: { testHaskellDepends = [ base ]; description = "Azure Functions Worker"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "azure-service-api" = callPackage @@ -240933,6 +240935,28 @@ self: { broken = true; }) {}; + "sweet-egison" = callPackage + ({ mkDerivation, backtracking, base, criterion, egison-pattern-src + , egison-pattern-src-th-mode, haskell-src-exts, haskell-src-meta + , logict, primes, tasty, tasty-discover, tasty-hunit + , template-haskell, transformers + }: + mkDerivation { + pname = "sweet-egison"; + version = "0.1.0.1"; + sha256 = "08lllk4z0mkcvchnkmi6f9kcxfh3srb48kxxha2kvx4p9aj7f623"; + libraryHaskellDepends = [ + backtracking base egison-pattern-src egison-pattern-src-th-mode + haskell-src-exts haskell-src-meta logict template-haskell + transformers + ]; + testHaskellDepends = [ base primes tasty tasty-hunit ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Shallow embedding implementation of non-linear pattern matching"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "swf" = callPackage ({ mkDerivation, base, mtl, pretty }: mkDerivation { From e081b183ab2763cabf7a3e3e0e959006df9d266e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Jul 2020 21:25:58 +0200 Subject: [PATCH 3221/3452] all-cabal-hashes: update to Hackage at 2020-07-02T22:46:43Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index b269042fd06b..5027371035ff 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/711b59b900ee0b267ebb86e41dbc83ad7fb69629.tar.gz"; - sha256 = "0vfg5pilhqi59826iciz15bmylhfdlxmmkps7samzbilsf21j0sy"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/ccbc2765586cc6f71894919f1f096714ca6ae453.tar.gz"; + sha256 = "001crq0myhn0bvyrbl10i8hski6z2a0hg9ij4plbjgvl5cldkzji"; } From d0269a3b97efa21334c1b4baccad2621bdd5f271 Mon Sep 17 00:00:00 2001 From: Renato Florentino Garcia Date: Sun, 26 Apr 2020 00:37:15 -0300 Subject: [PATCH 3222/3452] pythonPackages.executing: init at 0.4.3 --- .../python-modules/executing/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/executing/default.nix diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix new file mode 100644 index 000000000000..84026d7374c4 --- /dev/null +++ b/pkgs/development/python-modules/executing/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchzip, pytest, asttokens }: + +buildPythonPackage rec { + pname = "executing"; + version = "0.4.3"; + + src = fetchzip { + url = "https://github.com/alexmojaki/executing/archive/v${version}.tar.gz"; + sha256 = "1fqfc26nl703nsx2flzf7x4mgr3rpbd8pnn9c195rca648zhi3nh"; + }; + + checkInputs = [ pytest asttokens ]; + + meta = with lib; { + description = "Get information about what a frame is currently doing, particularly the AST node being executed"; + homepage = "https://github.com/alexmojaki/executing"; + license = licenses.mit; + maintainers = with maintainers; [ renatoGarcia ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c86fbf6bde13..612d0017b8d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3738,6 +3738,8 @@ in { eventlet = callPackage ../development/python-modules/eventlet { }; + executing = callPackage ../development/python-modules/executing { }; + exifread = callPackage ../development/python-modules/exifread { }; fastimport = callPackage ../development/python-modules/fastimport { }; From b19523ba2366d90e2556d22f1145af12f1a90fa5 Mon Sep 17 00:00:00 2001 From: Renato Florentino Garcia Date: Fri, 15 May 2020 23:40:07 -0300 Subject: [PATCH 3223/3452] pythonPackages.icecream: init at 2.0.0 --- .../python-modules/icecream/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/icecream/default.nix diff --git a/pkgs/development/python-modules/icecream/default.nix b/pkgs/development/python-modules/icecream/default.nix new file mode 100644 index 000000000000..eba5a70577f7 --- /dev/null +++ b/pkgs/development/python-modules/icecream/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi +, asttokens, colorama, executing, pygments +}: + +buildPythonPackage rec { + pname = "icecream"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16kpixl43nrn093cvkmxiq2dzd9xc73zwzkmwp0rs7x01nji8kj3"; + }; + + propagatedBuildInputs = [ asttokens colorama executing pygments ]; + + meta = with lib; { + description = "A little library for sweet and creamy print debugging"; + homepage = "https://github.com/gruns/icecream"; + license = licenses.mit; + maintainers = with maintainers; [ renatoGarcia ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 612d0017b8d5..a3db0b8f0c79 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4213,6 +4213,8 @@ in { icalendar = callPackage ../development/python-modules/icalendar { }; + icecream = callPackage ../development/python-modules/icecream { }; + ics = callPackage ../development/python-modules/ics { }; ifaddr = callPackage ../development/python-modules/ifaddr { }; From 2fc143241548abd50aff3172fafdc353ac353786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Fri, 3 Jul 2020 21:36:38 +0200 Subject: [PATCH 3224/3452] simple-scan: 3.36.2.1 -> 3.36.3 --- pkgs/desktops/gnome-3/core/simple-scan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 938e89be1e30..8a097b74ae74 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.36.2.1"; + version = "3.36.3"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0aq1pf0wk536b91as54684xgmhl7lps0k2xcwha5wh6h1isyb35v"; + sha256 = "0gsz7jqk0fdj0mama3cnss9i1adw18cpdnlcjcjh4r5qijmvx0vh"; }; nativeBuildInputs = [ From c6720a05f6d84da34da21b84a914700655c7d522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Fri, 3 Jul 2020 21:50:42 +0200 Subject: [PATCH 3225/3452] iagno: 3.36.3 -> 3.36.4 --- pkgs/desktops/gnome-3/games/iagno/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 3b4fca5f364e..0263de1c9b02 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "iagno"; - version = "3.36.3"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0cid9fag8irlq0cywyqaj402vb60l8f66ld1zj7a023rg0khqnbb"; + sha256 = "1fh2cvyqbz8saf2wij0bz2r9bja2k4gy6fqvbvig4gv0lx66gl29"; }; nativeBuildInputs = [ From caa5a63f37cc43386e7101f372dad6ea0eb50ede Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 19:52:19 +0000 Subject: [PATCH 3226/3452] jc: 1.11.6 -> 1.11.8 --- pkgs/development/python-modules/jc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index e48fec89b9d7..027ae8000b96 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.11.6"; + version = "1.11.8"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "0jyygq7zmam7yriiv5j4d6mpjdi2p3p7d53bn3qwfzkh4ifsbfan"; + sha256 = "0rkckbgm04ql4r48wjgljfiqvsz36n99yqcpcyna8lvlm8h4nmwa"; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; From b9fd42db62990701a69969bcbce46eac1764796a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 3 Jul 2020 12:44:07 -0700 Subject: [PATCH 3227/3452] python3Packages.sparse: fix tests --- pkgs/development/python-modules/sparse/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index f60d7383ba1f..d72830f3fb90 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , isPy3k +, dask , numpy , scipy , numba @@ -19,7 +20,7 @@ buildPythonPackage rec { sha256 = "ffbca00a53f938e4f04230f582b210440efb54d74d60af1d1ced3864f61677ac"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest dask ]; propagatedBuildInputs = [ numpy scipy From 5e73c358aaebfb8139f87d3ec31d047ff2da560c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 19:57:53 +0000 Subject: [PATCH 3228/3452] joker: 0.15.4 -> 0.15.5 --- pkgs/development/interpreters/joker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 823ab6d10990..efe670f97671 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "joker"; - version = "0.15.4"; + version = "0.15.5"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "1ad6cdqadd1zs9zh85zyhdiiv6ir28k28w034vzsx5zaipvy4kml"; + sha256 = "0v4mamd5zkw7r9gfl4rzy4mr1d7ni9klryd93izqssgps954bikz"; }; vendorSha256 = "031ban30kx84r54fj9aq96pwkz9nqh4p9yzs4l8i1wqmy52rldvl"; From 8eb0654d169db0d20fd86d158aa8949acc55f0ba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 20:04:39 +0000 Subject: [PATCH 3229/3452] jruby: 9.2.11.1 -> 9.2.12.0 --- pkgs/development/interpreters/jruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 79cb1c7154b5..6ce5eb905fc8 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { pname = "jruby"; - version = "9.2.11.1"; + version = "9.2.12.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "1p4ml5rqidqllc7z85zn2q4pyyih71j0gb71wl43j4v74p44j17i"; + sha256 = "013c1q1n525y9ghp369z1jayivm9bw8c1x0g5lz7479hqhj62zrh"; }; buildInputs = [ makeWrapper ]; From afcbc2eaa3acffe81c4fc4fbfa099443b112faf1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 20:22:04 +0000 Subject: [PATCH 3230/3452] kdiff3: 1.8.2 -> 1.8.3 --- pkgs/tools/text/kdiff3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index f41de9baffc0..9c0526c3e63e 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "kdiff3"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0s5vsm1avzv88b6mf2pp20c2sz0srrj52iiqpnwi3p4ihivm8wgv"; + sha256 = "1awb62y09kbkjhz22mdkrppd6w5aihd3l0ssvpil8c9hg8syjd9g"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; From b63e659a72ee3ea6abefec8800390ad4d12f0d2f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 3 Jul 2020 14:38:36 +0300 Subject: [PATCH 3231/3452] chromaprint: use latest ffmpeg --- pkgs/development/libraries/chromaprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 9da5a80f6205..4702d67a01f2 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost, ffmpeg_3 }: +{ stdenv, fetchurl, cmake, boost, ffmpeg }: stdenv.mkDerivation rec { pname = "chromaprint"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ffmpeg_3 ]; + buildInputs = [ boost ffmpeg ]; cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; From 64ec4fd65d14d89903364048a2a8090b23a7d8ac Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 3 Jul 2020 21:03:26 +0200 Subject: [PATCH 3232/3452] gimp: Hardcode interpreter paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The E (extension) line in pygimp.interp prints the following warnings: GIMP-Warning: Bad interpreter referenced in interpreter file /nix/store/5c91dah385gn70blsn6i5rzncqj3ks0y-gimp-with-plugins-2.10.18/lib/gimp/2.0/interpreters/pygimp.interp: python2 GIMP-Warning: Bad binary format string in interpreter file /nix/store/5c91dah385gn70blsn6i5rzncqj3ks0y-gimp-with-plugins-2.10.18/lib/gimp/2.0/interpreters/pygimp.interp This means that the py extension will not be registered when python2 is not in PATH. To prevent this, let’s hardcode the absolute python2 path. https://github.com/NixOS/nixpkgs/issues/60937#issuecomment-653652093 Closes: https://github.com/NixOS/nixpkgs/issues/60937 --- pkgs/applications/graphics/gimp/default.nix | 24 ++++++++++++------- .../gimp/hardcode-plugin-interpreters.patch | 11 +++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 1eee37223f1c..aa440f2c47a1 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -2,6 +2,7 @@ , lib , fetchurl , substituteAll +, autoreconfHook , pkgconfig , intltool , babl @@ -60,7 +61,21 @@ in stdenv.mkDerivation rec { sha256 = "4S+fh0saAHxCd7YKqB4LZzML5+YVPldJ6tg5uQL8ezw="; }; + patches = [ + # to remove compiler from the runtime closure, reference was retained via + # gimp --version --verbose output + (substituteAll { + src = ./remove-cc-reference.patch; + cc_version = stdenv.cc.cc.name; + }) + + # Use absolute paths instead of relying on PATH + # to make sure plug-ins are loaded by the correct interpreter. + ./hardcode-plugin-interpreters.patch + ]; + nativeBuildInputs = [ + autoreconfHook # hardcode-plugin-interpreters.patch changes Makefile.am pkgconfig intltool gettext @@ -124,15 +139,6 @@ in stdenv.mkDerivation rec { export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES" ''; - patches = [ - # to remove compiler from the runtime closure, reference was retained via - # gimp --version --verbose output - (substituteAll { - src = ./remove-cc-reference.patch; - cc_version = stdenv.cc.cc.name; - }) - ]; - postFixup = '' wrapProgram $out/bin/gimp-${lib.versions.majorMinor version} \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" diff --git a/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch b/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch new file mode 100644 index 000000000000..1528404c31d2 --- /dev/null +++ b/pkgs/applications/graphics/gimp/hardcode-plugin-interpreters.patch @@ -0,0 +1,11 @@ +--- a/plug-ins/pygimp/Makefile.am ++++ b/plug-ins/pygimp/Makefile.am +@@ -157,7 +157,7 @@ install-interp-file: + echo 'python=$(PYBIN_PATH)' > '$(DESTDIR)$(pyinterpfile)' + echo 'python2=$(PYBIN_PATH)' >> '$(DESTDIR)$(pyinterpfile)' + echo '/usr/bin/python=$(PYBIN_PATH)' >> '$(DESTDIR)$(pyinterpfile)' +- echo ":Python:E::py::`basename $(PYTHON)`:" >> '$(DESTDIR)$(pyinterpfile)' ++ echo ":Python:E::py::$(PYTHON):" >> '$(DESTDIR)$(pyinterpfile)' + + install-data-local: install-env-file install-interp-file + From db0540d1787fd8470f8b491b9474a3d10bcce700 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 3 Jul 2020 23:09:43 +0200 Subject: [PATCH 3233/3452] cargo-make: fix darwin build https://hydra.nixos.org/build/123569405 --- pkgs/development/tools/rust/cargo-make/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 0daf50861877..bffa9186fd5f 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, runCommand, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config }: +{ stdenv, fetchurl, runCommand, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config +, SystemConfiguration +}: rustPlatform.buildRustPackage rec { pname = "cargo-make"; @@ -22,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; cargoSha256 = "0l7krag7n4kjvh3d4zhkk1jdswsrkag5z664fm1zwvf6rw6sfdmi"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81b8ff7a530a..2c84e9d8256b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9284,7 +9284,7 @@ in }; cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; cargo-make = callPackage ../development/tools/rust/cargo-make { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; From 9988f8d939d89c8507396835d3171b0d5d06241e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Cabrera?= Date: Mon, 29 Jun 2020 20:20:32 -0400 Subject: [PATCH 3234/3452] maintainers: add saulecabrera --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 85259e78c58a..a5814f84d0aa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9019,4 +9019,10 @@ github = "davegallant"; githubId = 4519234; }; + saulecabrera = { + name = "Saúl Cabrera"; + email = "saulecabrera@gmail.com"; + github = "saulecabrera"; + githubId = 1423601; + }; } From a45b66e3d92127f5e6037f63cef59d91f7a89ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Cabrera?= Date: Mon, 29 Jun 2020 20:21:00 -0400 Subject: [PATCH 3235/3452] asls: init at 0.4.0 --- pkgs/development/tools/misc/asls/default.nix | 25 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/misc/asls/default.nix diff --git a/pkgs/development/tools/misc/asls/default.nix b/pkgs/development/tools/misc/asls/default.nix new file mode 100644 index 000000000000..8a457593d52f --- /dev/null +++ b/pkgs/development/tools/misc/asls/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchurl +, erlangR22 +}: + +stdenv.mkDerivation rec { + pname = "asls"; + version = "0.4.0"; + + src = fetchurl { + url = "https://github.com/saulecabrera/asls/releases/download/v${version}/bin.tar.gz"; + sha256 = "0zy89fvdhk2bj41fzx349gi8237ww96s21hlg6blqmfhvfxsnszg"; + }; + + buildInputs = [ erlangR22 ]; + installPhase = "install -Dm755 -t $out/bin asls"; + + meta = with stdenv.lib; { + description = "AssemblyScript Language Server"; + homepage = "https://github.com/saulecabrera/asls"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ saulecabrera ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c84e9d8256b..bf831e3d6210 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -738,6 +738,8 @@ in asciiquarium = callPackage ../applications/misc/asciiquarium {}; + asls = callPackage ../development/tools/misc/asls { }; + asymptote = callPackage ../tools/graphics/asymptote { texLive = texlive.combine { inherit (texlive) scheme-small epsf cm-super texinfo; }; gsl = gsl_1; From b75f75cd5b683b4c9c1e62c6af34ae33284fe29c Mon Sep 17 00:00:00 2001 From: Evils Date: Tue, 5 May 2020 02:08:42 +0200 Subject: [PATCH 3236/3452] python.pkgs.btrfs: init at v11 --- .../python-modules/btrfs/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/btrfs/default.nix diff --git a/pkgs/development/python-modules/btrfs/default.nix b/pkgs/development/python-modules/btrfs/default.nix new file mode 100644 index 000000000000..225b26b4d650 --- /dev/null +++ b/pkgs/development/python-modules/btrfs/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "btrfs"; + version = "11"; + + src = fetchPypi { + inherit pname version; + sha256 = "1w92sj47wy53ygz725xr613k32pk5khi0g9lrpp6img871241hrx"; + }; + + meta = with stdenv.lib; { + description = "Inspect btrfs filesystems"; + homepage = "https://github.com/knorrie/python-btrfs"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.evils ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a3db0b8f0c79..4021244995f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -557,6 +557,8 @@ in { browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy {}); + btrfs = callPackage ../development/python-modules/btrfs { }; + bt_proximity = callPackage ../development/python-modules/bt-proximity { }; bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 From e3a752dfabb4d35058941ccd5abd1bb1034511f3 Mon Sep 17 00:00:00 2001 From: Evils Date: Tue, 5 May 2020 02:09:26 +0200 Subject: [PATCH 3237/3452] btrfs-heatmap: init at v8 --- .../filesystems/btrfs-heatmap/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/tools/filesystems/btrfs-heatmap/default.nix diff --git a/pkgs/tools/filesystems/btrfs-heatmap/default.nix b/pkgs/tools/filesystems/btrfs-heatmap/default.nix new file mode 100644 index 000000000000..04d74d78cfde --- /dev/null +++ b/pkgs/tools/filesystems/btrfs-heatmap/default.nix @@ -0,0 +1,46 @@ +{ stdenv, lib +, fetchFromGitHub +, python3 +, installShellFiles +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "btrfs-heatmap"; + version = "8"; + + src = fetchFromGitHub { + owner = "knorrie"; + repo = "btrfs-heatmap"; + rev = "v${version}"; + sha256 = "035frvk3s7g18y81srssvm550nfq7jylr7w60nvixidxvrc0yrnh"; + }; + + # man page is currently only in the debian branch + # https://github.com/knorrie/btrfs-heatmap/issues/11 + msrc = fetchurl { + url = "https://raw.githubusercontent.com/knorrie/btrfs-heatmap/45d844e12d7f5842ebb99e65d7b968a5e1a89066/debian/man/btrfs-heatmap.8"; + sha256 = "1md7xc426sc8lq4w29gjd6gv7vjqhcwrqqcr6z39kihvi04d5f6q"; + }; + + buildInputs = [ python3 ]; + nativeBuildInputs = [ python3.pkgs.wrapPython installShellFiles ]; + + outputs = [ "out" "man" ]; + + installPhase = '' + install -Dm 0755 heatmap.py $out/sbin/btrfs-heatmap + installManPage ${msrc} + + buildPythonPath ${python3.pkgs.btrfs} + patchPythonScript $out/sbin/btrfs-heatmap + ''; + + meta = with lib; { + description = "Visualize the layout of a mounted btrfs"; + homepage = "https://github.com/knorrie/btrfs-heatmap"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.evils ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c84e9d8256b..11c1f3aa6f80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -860,6 +860,8 @@ in boulder = callPackage ../tools/admin/boulder { }; + btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; + buildbot = with python3Packages; toPythonApplication buildbot; buildbot-ui = with python3Packages; toPythonApplication buildbot-ui; buildbot-full = with python3Packages; toPythonApplication buildbot-full; From 18b5737723b8d188fb664ab60d2508f045266329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Fri, 3 Jul 2020 13:55:18 +0200 Subject: [PATCH 3238/3452] nixos-artwork: add missing wallpapers --- pkgs/data/misc/nixos-artwork/wallpapers.nix | 27 +++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix index 6e6b6e92678e..36242db4621f 100644 --- a/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -46,6 +46,15 @@ in rec { + dracula = mkNixBackground { + name = "dracula-2020-07-02"; + description = "Nix background based on the Dracula color palette"; + src = fetchurl { + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/03c6c20be96c38827037d2238357f2c777ec4aa5/wallpapers/nix-wallpaper-dracula.png"; + sha256 = "07ly21bhs6cgfl7pv4xlqzdqm44h22frwfhdqyd4gkn2jla1waab"; + }; + }; + gnome-dark = simple-dark-gray-bottom; mosaic-blue = mkNixBackground { @@ -57,6 +66,24 @@ rec { }; }; + nineish = mkNixBackground { + name = "nineish-2019-12-04"; + description = "Nix background inspired by simpler times"; + src = fetchurl { + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/da01f68d21ddfdc9f1c6e520c2170871c81f1cf5/wallpapers/nix-wallpaper-nineish.png"; + sha256 = "1mwvnmflp0z1biyyhfz7mjn7i1nna94n7jyns3na2shbfkaq7i0h"; + }; + }; + + nineish-dark-gray = mkNixBackground { + name = "nineish-dark-gray-2020-07-02"; + description = "Dark gray Nix background inspired by simpler times"; + src = fetchurl { + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/f07707cecfd89bc1459d5dad76a3a4c5315efba1/wallpapers/nix-wallpaper-nineish-dark-gray.png"; + sha256 = "07zl1dlxqh9dav9pibnhr2x1llywwnyphmzcdqaby7dz5js184ly"; + }; + }; + simple-blue = mkNixBackground { name = "simple-blue-2016-02-19"; description = "Simple blue background for Nix"; From 5c9d8825507e9ce09c612b1d07ee084c16aacccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Fri, 3 Jul 2020 22:20:34 +0200 Subject: [PATCH 3239/3452] libgweather: 3.36.0 -> 3.36.1 --- pkgs/development/libraries/libgweather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index 51ee70f070c6..5493343fc239 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "3.36.0"; + version = "3.36.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bd30g3facfcgf18y2110xhc7ijly313y49mpwdkvl482z0fxzyj"; + sha256 = "0l74hc02rvzm4p530y539a67jwb080fqdaazdl8j0fr3xvq0j9yy"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; From a933f7dc55bc48cd9ff5319e9087812ca79b9548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Fri, 3 Jul 2020 20:54:15 +0200 Subject: [PATCH 3240/3452] searhorse: 3.36 -> 3.36.2 --- pkgs/desktops/gnome-3/apps/seahorse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index ec6791e32311..3668fc171b36 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "3.36"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nqn4a6dr4l1fpzj3mv4swhpnvhjcqlwsyhwm59sdzqgdfx4hbwr"; + sha256 = "16wmxxppgcgfj8zkagcny5af1c81x32ysm9d6j9f2k7bmik21ss5"; }; doCheck = true; From 4389b676951d8c368a382f9411f1816bcab54307 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Sun, 28 Jun 2020 20:50:49 +0200 Subject: [PATCH 3241/3452] _1password: 1.0.0 -> 1.1.1 --- pkgs/applications/misc/1password/default.nix | 34 +++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 5e027fcdf04b..eeaf8d561852 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,26 +2,22 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "1.0.0"; + version = "1.1.1"; src = - if stdenv.hostPlatform.system == "i686-linux" then - fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "1d1lxmrmirh3837zib91dmxblb4imdz8gbq56pb7kgbff3zf96ql"; - stripRoot = false; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then - fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "0pscm61dc69vmkrzrnxi531d37ig9y48w8q1lvzsg13zvvwaw8hs"; - stripRoot = false; - } - else if stdenv.hostPlatform.system == "x86_64-darwin" then - fetchurl { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; - sha256 = "1sb5qdssasqm7z7j4xzgkmkgf132zhgm93d7rkx3y5j0rac98y0g"; - } - else throw "Architecture not supported"; + if stdenv.isLinux then fetchzip { + url = { + "i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; + "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; + }.${stdenv.hostPlatform.system}; + sha256 = { + "i686-linux" = "1andl3ripkcg4jhwdkd4b39c9aaxqpx9wzq21pysn6rlyy4hfcb0"; + "x86_64-linux" = "0qj5v8psqyp0sra0pvzkwjpm28kx3bgg36y37wklb6zl2ngpxm5g"; + }.${stdenv.hostPlatform.system}; + stripRoot = false; + } else fetchurl { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; + sha256 = "16inwxkrky4xwlr7vara1l8kapdgjg3kfq1l94i5855782hn4ppm"; + }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ]; From 9c29b84ab1d640f5e8463a8fd5320cba937ed27a Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sat, 4 Jul 2020 01:30:08 +0200 Subject: [PATCH 3242/3452] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 504 ++++++++++++++-------------- 1 file changed, 258 insertions(+), 246 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 5cd7df4597f2..0c38255966ca 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-20"; + version = "2020-07-01"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "834d6f9c48ce349a4c3d72e98bd0de81aaa84042"; - sha256 = "0b9606yspjvmfarjmgqcbsg9qp64gkr7b1w7py2gd1fvbmnkmac0"; + rev = "b3c6db173a019c37c83d4600c0c68872e91086dd"; + sha256 = "0il34czgidxdy8hpwn6aa3mjs4rzplixyvx58cqy7cbcbs0vk933"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -353,36 +353,36 @@ let coc-css = buildVimPluginFrom2Nix { pname = "coc-css"; - version = "2020-04-15"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-css"; - rev = "41fe3122753b62c4416eb5e4ca4bef1cb3d3ebd2"; - sha256 = "13xg0v2iwf8nrd1bba5nmwgav37fb8q4fqr5bsg3qxlbghpw0bbl"; + rev = "a8cde12697de70dddf235ada61dc3601a6c04b57"; + sha256 = "03n7czxiraa9pjcdfigmxgwyprpijbs0vhmzccxx0nwm038291y6"; }; meta.homepage = "https://github.com/neoclide/coc-css/"; }; coc-denite = buildVimPluginFrom2Nix { pname = "coc-denite"; - version = "2020-04-17"; + version = "2019-01-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-denite"; - rev = "50a573af21a9563f331f2711f3fd7a568c33907f"; - sha256 = "06h3if5sn5sqgrq1ql1j7g5xy658mwywd7ri1hajzi8s3mb5lanq"; + rev = "f0cf609724249e662fef54169b484b7d089032f9"; + sha256 = "0jknvcf1cf53bwyhf1rhm5fa7nsp0l7sihns1qybph8hayb5rwvp"; }; meta.homepage = "https://github.com/neoclide/coc-denite/"; }; coc-emmet = buildVimPluginFrom2Nix { pname = "coc-emmet"; - version = "2020-05-19"; + version = "2020-07-01"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-emmet"; - rev = "5424c10fb8c451059cdcf04b10aa7c28178ce5b0"; - sha256 = "15zfmsy7ymcp3js3y8f6wvwj3r0p9a45v1zvq07ilwri91z6nkrl"; + rev = "edeb4c25e95257f943145ff7b114b9ddc2d8fa2b"; + sha256 = "0pjvfbwxa4p647fjkrqr9rkvxlhcwsddrz0gn2rxh1x7hsxm2ma2"; }; meta.homepage = "https://github.com/neoclide/coc-emmet/"; }; @@ -401,12 +401,12 @@ let coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-06-20"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "c4af6c2ea44eb630049340becfc6c66ddfb8b01c"; - sha256 = "1s8vlnabkjgzs2l5rwzcx5rfhhr7lszhl7mvk6l53rylc875zmd7"; + rev = "806b44b3d223ae8e24134eaa3b5cffd210300b98"; + sha256 = "0rabc8ck1mkn0xxryzy27nq7ncqbhm6zhlg1vab8gyfm35l2zr9v"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -449,12 +449,12 @@ let coc-html = buildVimPluginFrom2Nix { pname = "coc-html"; - version = "2020-03-30"; + version = "2020-06-24"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-html"; - rev = "8ae5d2832761b5868f69c67f33ce26f9edb26c65"; - sha256 = "1rf9qfimnbxjr5s55pzm8npixan5cz2v17g4j34f18i9ky6yyk0b"; + rev = "c841e3bd11d76cf0806d21f32c9cac5c9afa35e9"; + sha256 = "1xail08fb7hd43d03l79ynrp0bmcbk2hdcyk3mxl3fkizw9pd9dy"; }; meta.homepage = "https://github.com/neoclide/coc-html/"; }; @@ -473,12 +473,12 @@ let coc-java = buildVimPluginFrom2Nix { pname = "coc-java"; - version = "2020-05-29"; + version = "2020-06-25"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-java"; - rev = "bf698c0df4d63c7c84013d58111b7b458f6b12f1"; - sha256 = "1nyswz55dg4d1nz6ff2479ibnzcdhv9ky8a4awlakwp0g0c3680s"; + rev = "54133e9f411837a54ffc838185c343e628213b29"; + sha256 = "06blp4bidz74qgb44h498jbhx4gw5g57ki0a5gwms11zm74v0k00"; }; meta.homepage = "https://github.com/neoclide/coc-java/"; }; @@ -521,12 +521,12 @@ let coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-06-16"; + version = "2020-07-02"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "a75fb41cc7f766f048ed04ff24d2b9036c80a0c1"; - sha256 = "024mpad6cpivxpf9fjrr9mh7iy8hq64d75yazhzm4kax6f121xk0"; + rev = "c99a4ea7902293460b4d903cdcce4892f12046f5"; + sha256 = "0r4xs0mhdxvac81cly89jqnby14h1dmrpkdfs0chz5ji4gbsgair"; }; meta.homepage = "https://github.com/ckipp01/coc-metals/"; }; @@ -557,12 +557,12 @@ let coc-prettier = buildVimPluginFrom2Nix { pname = "coc-prettier"; - version = "2020-05-27"; + version = "2020-07-03"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-prettier"; - rev = "1fbfe34dfce455111e3eae939fc8a37d2fd1ec42"; - sha256 = "170zhsq73shykxszwwcqakrnl5cawf9kkgc1mqy0l0jqmw3jk8qy"; + rev = "ef16275ef4dfe5e0790f425822f955c349f7f01a"; + sha256 = "0q1cr3rjxjsj2dwfjs0vmbcqcdq986cn14d4iryxa2vihhihiwl2"; }; meta.homepage = "https://github.com/neoclide/coc-prettier/"; }; @@ -593,24 +593,24 @@ let coc-rls = buildVimPluginFrom2Nix { pname = "coc-rls"; - version = "2020-05-13"; + version = "2020-07-03"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-rls"; - rev = "166fd05342d026759246594eb5fd8d0bc240505d"; - sha256 = "17x0h2g5791z5xmhl7kps09b9zrac2yni3r59rrx96rry50fkca5"; + rev = "71bbe50be43c886aa1ef8190cb55fa6f7fe44f59"; + sha256 = "19r0gb3qbnsg5q4ai7an7d3a1zwdzjh3vg0l4khhnkhbh5ws69m4"; }; meta.homepage = "https://github.com/neoclide/coc-rls/"; }; coc-rust-analyzer = buildVimPluginFrom2Nix { pname = "coc-rust-analyzer"; - version = "2020-06-18"; + version = "2020-07-03"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "2079280b12e565ae5c437b675f09b7915f1f9d92"; - sha256 = "0l4jz8mdbn352cb7gkycbdlaw18k9qf4v0vcljni7hxdqc6k1hiz"; + rev = "3a055d616ac8047e1411912ba2eff73f1ec3fce8"; + sha256 = "1ypkx7m8z7nhdbrh7jbskwmb4yjis1m56bmp4sp1nygr52jshz03"; }; meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/"; }; @@ -713,24 +713,24 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2020-06-20"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "a065861bebc201b722145d3d39af76cdbaf92f46"; - sha256 = "1iwp8gs5f49chncbqv5w7x435jhwqczlmw00clf345yvx2kirngn"; + rev = "a45d50acca1c79c72485811cd9bf308b9fbf4ec3"; + sha256 = "0b8cr9xaqigs1nn7vqyvs2frawfz20pn28xp1q6fbx089rddiv0a"; }; meta.homepage = "https://github.com/neoclide/coc-tsserver/"; }; coc-vetur = buildVimPluginFrom2Nix { pname = "coc-vetur"; - version = "2020-06-19"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vetur"; - rev = "6f106f10c981fd314d6a83cab29f8a464da6b34b"; - sha256 = "1b2zac7z8ja1ymf4psd48gwm7cdkyiwyglinpqy5g2zyspc16qpg"; + rev = "37c70071a93aeacf23ac651cd6e9f7ed11582033"; + sha256 = "037p3zkavfyh75wclibd2iwd1ds8kzi72q8zy7rwdchwxw57xwhj"; }; meta.homepage = "https://github.com/neoclide/coc-vetur/"; }; @@ -761,12 +761,12 @@ let coc-yaml = buildVimPluginFrom2Nix { pname = "coc-yaml"; - version = "2020-03-06"; + version = "2020-06-26"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-yaml"; - rev = "338192a2434b96b139fb8c07d260da00b3100997"; - sha256 = "020jpsm9ss2v3x1g43m920w2yamv8khl7mg7wm4sx6qsl3rlfq4g"; + rev = "e3db99f415a1439b44548473fbaa3f79df4f383e"; + sha256 = "0aij94s5jak5g2myd6xmcwx5aclpvgcbg9nwxqzkij5m24wpi23n"; }; meta.homepage = "https://github.com/neoclide/coc-yaml/"; }; @@ -785,12 +785,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-06-20"; + version = "2020-07-03"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "aa3647842f5bf436c8e1556667033046d83426d5"; - sha256 = "0gzm0pm3gqis7y3qpmwjgnn5g11ym6s4fj18j5qmdfshbsajh9xv"; + rev = "87d5c948277d29abe5e8a43603b89f071e0bca47"; + sha256 = "0ndixl2pf33l1qh0y5ixsflgy0vdzsy79mwl3kqmm6wnal8gj94v"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -858,12 +858,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2020-06-16"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "778c8e711a23d6921a99986a00cdbb6d76e1b103"; - sha256 = "1dk0j4f4dpl21rjc7gfl2r23sf0vjajcdyrc20pfr8kan86acz18"; + rev = "9ad1c3423d4174ebff09039387eeb3c85fc848f9"; + sha256 = "1kshivd4gaq6kx2idhjndjmca2np5r3hfzq09wk4ivzxjmcwg94p"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -978,12 +978,12 @@ let dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2020-05-20"; + version = "2020-06-25"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "70bc2f27d579d24e4973aea19df2fdffb1a8c95d"; - sha256 = "01agwm0scg7g5l04djxmj22rd5rd3di1z9g89hp2lr3rqp8ipdrn"; + rev = "b9fd9d22d0c705e89e2cc50b993db04d824dd8aa"; + sha256 = "1m2i263ppvs8xbb5xfif5pyd5zxwhimvm373dlmlwmgn339cw0pa"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; @@ -1014,12 +1014,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-06-20"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "acd68311bbb3296aa81c5799695715e85326b738"; - sha256 = "1rv8b7g6prjibl9hx5wapj71hfg0dd2ipkpdj8w1zj4b0inj5848"; + rev = "a17b460fe6b571135347e7464df1d5769c589fdc"; + sha256 = "0fldnfn4w2sarc7mxmp157xijwqhf8d8jy85qxppibfah4wicaia"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1062,24 +1062,24 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-06-11"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "6139d4cd2d6944be8b713766f92f521eaa056c18"; - sha256 = "0v64fj9jjq51h2cr1haih4ac4kffvzp6g0gli2vs4vjcbjbcil5r"; + rev = "1923d69eff4b1f9a9a70d9978a447bdccadecd4c"; + sha256 = "0h30z8zq34ps1qxp85kyhb1v8cbx3l9iz77zrjgddk6pf6hx31yh"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2020-06-20"; + version = "2020-07-01"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "5f23eef76ffe62ddd78a3f3318d4efc6d236f403"; - sha256 = "0gi9r8rvf725s65jafbskkn7c90ld74ckdv9xxm1d6rql0n9dsbb"; + rev = "b9113d9defa0bf92cd69c2811450943a33526344"; + sha256 = "07v3b3lcl8qjsc9rxv3zkw8idgsp633q1n986wm6pg1310scxw07"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1293,12 +1293,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-06-21"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "2a44d0f331c57bc0527bef1c975153c274bd52f6"; - sha256 = "0v61734kh3zz4q2bj1085kydkviycmjv6c45qmsxnvh9vcjz7ip3"; + rev = "a57980ab9d08b11affddc30439f6975e4eb01b41"; + sha256 = "0aiq70q82w6la4969nmbqz86innm7siz420yy87g9zwadja8nx6c"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1584,12 +1584,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-06-19"; + version = "2020-06-22"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "24e67a74e430da87f66fbd88acc01c9227842fde"; - sha256 = "193acbbmkl1102fyhm3kj0jais5b3f6y1rnyhzkikwl3rjjf6gaj"; + rev = "e54c1ebcec8bf4313ef04a1c5f47ecdbb6d11db3"; + sha256 = "1bs07jjj3pgwdr81w8piph6wz73n0gwj3imbnd2za0jqxbshyzry"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1668,12 +1668,12 @@ let gruvbox = buildVimPluginFrom2Nix { pname = "gruvbox"; - version = "2020-02-23"; + version = "2020-07-03"; src = fetchFromGitHub { owner = "morhetz"; repo = "gruvbox"; - rev = "040138616bec342d5ea94d4db296f8ddca17007a"; - sha256 = "0qk2mqs04qlxkc1ldgjbiv1yisi2xl2b8svmjz0hdp9y2l5vfccw"; + rev = "bf2885a95efdad7bd5e4794dd0213917770d79b7"; + sha256 = "0576sqzljal3k8rsnbmcvlsk4ywg1vfgkxkvrv2zac2d5wwa9i8z"; }; meta.homepage = "https://github.com/morhetz/gruvbox/"; }; @@ -1752,12 +1752,12 @@ let iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2020-05-15"; + version = "2020-06-27"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "bdd630fb15dca7793b04deaf1c1fb3a6af33ceae"; - sha256 = "045jm4gz8gqv7mgz04l3q42mj1ji9qv99n915zq8fgzfskc0pixj"; + rev = "8e9b8717121c1b9ce93bbf6ef3372e9a567abbcd"; + sha256 = "0rimchajc7slqid9s4dhhy5fjfspsg66b4ddfik3djgzvq088rpn"; }; meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; @@ -1896,12 +1896,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2020-03-07"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "e83112f9aab147ab485ee7af72e01d047c5206d3"; - sha256 = "0yj1bsfn43crmfn0ylyzyz41z0vmvapl5cgm7k1rnbj96i7vifx7"; + rev = "a0207fadf9f165adac61f01abc07db0ae898cbe6"; + sha256 = "0hdnswwp0nw8z2rm4dij958arb13rlqr4izqydbh046lh1ksc9b1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -2041,12 +2041,12 @@ let lexima-vim = buildVimPluginFrom2Nix { pname = "lexima-vim"; - version = "2019-07-22"; + version = "2020-07-01"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "aa32e972b69230625989daa09ee5fd74a2d877ef"; - sha256 = "15cc09vb0yrasz76qkcqxhj95y1m6yrsx3wsn6khx39kp1bas0jd"; + rev = "de17b1ec4009017b08d108e495c2d8d209074ad0"; + sha256 = "0ks2nyg2pvvyd3lrlhdbbf3ix48zdh839d65hglk34xl59hmnx1y"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -2077,12 +2077,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-06-03"; + version = "2020-07-01"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "448982501112f69f8edb7fb7bb61573091036366"; - sha256 = "1k4man0jm8pkvb2f8l2f743ipwiz76ljzzn1hi4pvs0wncdr7k6q"; + rev = "d704949896e56b1a54c8947abe090068ee12d8a9"; + sha256 = "0bv3036l1r1jkdwc0j9w9842n3his799ggwii3m65pvsk62ghcjf"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -2101,12 +2101,12 @@ let lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2020-05-08"; + version = "2020-07-01"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "ef674de5ca1c963ad12f04631ea58f90dbbc70da"; - sha256 = "0kdla3gmkyk77vqz6hj41alq3jmrkml7836fhsd3hb50f6wwvk11"; + rev = "77eb9c67d3d7cc14f11d68e865e3540fcc56fdbe"; + sha256 = "1c1aznfs297846f0w6f67sx4fdk9pxxalayfz1dcwabbfq785g6p"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -2317,12 +2317,12 @@ let neocomplete-vim = buildVimPluginFrom2Nix { pname = "neocomplete-vim"; - version = "2020-01-23"; + version = "2020-06-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "neocomplete.vim"; - rev = "0f83788cb67e0743a3a9c8d3a3a6e52a01bdc6c2"; - sha256 = "1ydnb576qbdbij7ipciw0m46wbj45gj7xirpmqxazgp9y6b13isf"; + rev = "5c18aacf03e210a23800775bf3585f3735d00a30"; + sha256 = "08vpfcgx88hfbmnipsg590i6fcpq5gwa6va46pd2lipmcpc4p17g"; }; meta.homepage = "https://github.com/Shougo/neocomplete.vim/"; }; @@ -2341,12 +2341,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-06-12"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "1cee66fe6219f8cc698eb244ba4001bdad1d09cb"; - sha256 = "0w5hw5qc5n0i2hal91nilmxazskixv6c1rcszgqar4dfh951kazy"; + rev = "96c3cbdee4d0ddbe385388319d7e976e4009e943"; + sha256 = "1cvg4ziadjlxr4gkjmdrr6ddhpw7gsc24c8jsj85p45x7ijaqhbl"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2365,12 +2365,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2020-04-09"; + version = "2020-06-22"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "d10e53956161176c7f8a1ef2899880d5384f47b0"; - sha256 = "0zv27bln0n687s0xm19nrk16i58hmxdhy26jmjh335zji0ydx27v"; + rev = "3193bd1c96b1071ed6c1316641acdcc977934d36"; + sha256 = "1gnnnmnzb0nsfsj2iq20dpycmfzk48vfsc06968srzpkzbpw2glf"; }; meta.homepage = "https://github.com/neomake/neomake/"; }; @@ -2389,48 +2389,48 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-05-06"; + version = "2020-06-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "66abcb7de82a45be6ba8b669d5e7bdca51deafdd"; - sha256 = "0a0irlhj1skkwy1897q6dbg9zh8v6b0sx12dsgj3z37rvplfw78y"; + rev = "40494577a44c6c7cc03e70e4bb6b4e27cbd8e417"; + sha256 = "1jiva2s4bvp98kwjprk2qh47avz4nqawsl93118cwh01ys9hhdah"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-06-18"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "2c6c457e0655090639bd8c68f6eac4b01d071696"; - sha256 = "0ca8im1kmj4d1wshjjgci7v2d0szia36hhgnb2dmsg601ninkvmw"; + rev = "ad04263359412e1dbfd687e861f3d28cd702a7f9"; + sha256 = "1mlvs8wxj8d3yh8srn0zr8bz753mhcyixsrfwcr90qcibglc1ihy"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; NeoSolarized = buildVimPluginFrom2Nix { pname = "NeoSolarized"; - version = "2020-03-10"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "overcache"; repo = "NeoSolarized"; - rev = "70609c44215c8d2c43ad8c631296caae08a9c8d4"; - sha256 = "0bxrm2vm3z1y37sm6m2hdn72g2sw31dx1xhmjvd0ng72cnp84d9k"; + rev = "25990b06d8ddbca74fae0bc082926419af75bdca"; + sha256 = "1z7yg0jif5bj8szvvcx9qyrgbbhhwmbf2s47dbr0i6rc0f2zs3r4"; }; meta.homepage = "https://github.com/overcache/NeoSolarized/"; }; neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-05-30"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "d6667d8fca8425753d7da215f57e1a0e936e75de"; - sha256 = "1wmsqnhbd438xs8dp2jrkk7fhzzi7w1l66jqwfwz6sxl0ayc3k7y"; + rev = "f6596a893fc7aafa4c100feb325c2fe0a25d38ad"; + sha256 = "1qvb90688khm5czwdagm0x6zp59zlcisn9ha0n9q3jz98y088agx"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -2485,12 +2485,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-06-01"; + version = "2020-06-23"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "d48ab70721d4f688ed34bd5939e2d6f4c89548c5"; - sha256 = "0rd228ks4gppskcvz6cj94gnbd9wykic8f4ilc9smaqw817gq20s"; + rev = "6571452857fd1b14f15a3886f9fffc113c36bbac"; + sha256 = "11hnzc2glnwzn24pz9fixwv87skqf024y0fpfs7jlsklvgs5pw8f"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -2593,12 +2593,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-06-16"; + version = "2020-06-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "a82ce0ebff06ec85ddb2c61763158b8e97b9a85e"; - sha256 = "0dsg79qklb942af0qhpzd8h2j1rllk1qgm88p0s49m7rprfah3g4"; + rev = "8e978339b57cd03d97ae301659136ce103435910"; + sha256 = "14j15cfbzxv2m12i4r5j3fk3438l7k27knnrbkqas83jvrkb3q2f"; }; meta.homepage = "https://github.com/neovim/nvim-lsp/"; }; @@ -2761,12 +2761,12 @@ let plantuml-syntax = buildVimPluginFrom2Nix { pname = "plantuml-syntax"; - version = "2020-05-09"; + version = "2020-07-03"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "8dddc45f3f7ba4f0319a14e6f0167d97a703ac55"; - sha256 = "1fkls8qwkdgr5fyaml9rlrjzrbwav2zyp2xyfdyg4h6pbgchvkbl"; + rev = "eb3df3092a767c844db3f3ff355da840abd0aa97"; + sha256 = "02psvyxli5gs2cx2sha33mk98ivllb8zr1jwgv4hgi5bh6qd7wg3"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; @@ -3073,12 +3073,12 @@ let seoul256-vim = buildVimPluginFrom2Nix { pname = "seoul256-vim"; - version = "2020-03-14"; + version = "2020-06-21"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "cfc0167e546a40eb26ec2a0a0f1c141a8c1bcaf1"; - sha256 = "1z980hsmf6gcvd16ja67az131mrgv5fv6v0ivsh0ga8hwc4f9l6q"; + rev = "24ed467ca6ef9ce7ede56c9ffb1c6b30cd0ee906"; + sha256 = "0ihs5nxdyx3jr1n96l2yx4b5gc48x7qbyxv6dc53ihw2vpn783fx"; }; meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; @@ -3290,12 +3290,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-04-19"; + version = "2020-06-22"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "b3e2d8470fddc7f2b598f09023ebc5045a3fb1fd"; - sha256 = "1ljsh0npbcv9g6l23z4jpba0bk1k5n13ix0p0rr22cipgzlxsbvh"; + rev = "140f516eaeae855b3d57068e6e66c8f40fd45295"; + sha256 = "1df2lm8rms535gmcgwnlpjr5bmcd76h6hisyfl922kbj4b02v0b6"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -3338,12 +3338,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-06-11"; + version = "2020-06-24"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "56399f446c64d187c106e112afa4d97985508eba"; - sha256 = "1bmfv09lxwq9b8hp4v2avmd979178lm60xxf5g0qiifrr4ym2gqk"; + rev = "d7063c7484f0f99bfa182b02defef7f412a9289c"; + sha256 = "0awh6p7nc9hggiazhvvaw2hhfml76yl7856ssx8ym6r2vbzqw82v"; }; meta.homepage = "https://github.com/majutsushi/tagbar/"; }; @@ -3386,12 +3386,12 @@ let tender-vim = buildVimPluginFrom2Nix { pname = "tender-vim"; - version = "2020-04-24"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "jacoborus"; repo = "tender.vim"; - rev = "44d04bc9ecb0188e7b1a3e6b6715b9a63dc8f3e1"; - sha256 = "059my5q6gqjdkaf7qn842h92c6y7lp5z8wpwsi2ww6anzy85506z"; + rev = "25924cb8b29a5158e56fb896a2540c70691c7a28"; + sha256 = "0mm5h5jhb6y0f1zsfhq0frvdm6s93skshi66rfrpn82l93zigw4c"; }; meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; @@ -3471,12 +3471,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2020-06-21"; + version = "2020-06-22"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "a1eea2431e19e441555442ce41738524042b2493"; - sha256 = "1k8sw8yr9ak4dggd51ishvnljsq3iycrnpfikhzn9h8qgclx2lfl"; + rev = "baed959ee85a3f7631a68104beee512a78233800"; + sha256 = "0nvl238fd7rnnwdf8xbzz5nzw9r74k86qhaw6khjvl5gydyzg1ah"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -3555,12 +3555,12 @@ let unite-vim = buildVimPluginFrom2Nix { pname = "unite-vim"; - version = "2019-08-27"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "5addeca429f64130d74d2f7cb8255afdb9e309d2"; - sha256 = "03bqljjc1h43qimm81mv8ywkx5388kd6clm2f7887diiww0fgvfi"; + rev = "787c777ff2fedd46fc10e315bdfea339fe016d33"; + sha256 = "1bm48d3n07i2hy7bqz6pzyl3zb5mikhplmk5fk5x09q2i47l6bqg"; }; meta.homepage = "https://github.com/Shougo/unite.vim/"; }; @@ -3615,12 +3615,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2020-05-19"; + version = "2020-06-22"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "494dbe9d4effff140ffe6743b614d900a0f34dd7"; - sha256 = "0d85kgxb52xw6120q6zrksr10nj54s8qi0fl6gqw6nc08ldaq0b1"; + rev = "3916fb2daff546c6fe61d141b0e7519fde347b79"; + sha256 = "1f1l3ik15rqw9xqss22irpzxffcrpmihmga1q37gc1gvsnl6ibq5"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -3867,24 +3867,24 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-06-19"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "5ce3e636580dde6653a74535bb7b358725d1e37c"; - sha256 = "02a5nhhyi7k4645jmmgjdj28l46knv7l6219lkgixrbgdq5gc43h"; + rev = "ba9b3e183929263bffc44592e5c9a92d2ab8a62d"; + sha256 = "0xkqh68x7nx1w4a5668ih7mmz1xy8qimb4z827dhgv6i23zh6yq6"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-04-01"; + version = "2020-06-26"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "3fb676b8729a98817f561ef1554c0ad1a514c96a"; - sha256 = "18bfw09ywmw10jiv37iw2ijf46jhj2yw5wndqdgn7k42gy1wk7p6"; + rev = "04fa4fc40f21d9490954213c1ee06c7fdea66a6d"; + sha256 = "0dzckj0449rw37v5kwmfm5wa9spfhsbfr56i30mb063zmv8wk551"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -3939,12 +3939,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2020-05-29"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "f116a3b86cb3e9fbcd8563cce4958759610d8f51"; - sha256 = "1vamldn3y9pima18ryrrzn2mz1czzzadkiiklcrcl104v9mhv4am"; + rev = "99f4a4159876ade1c5cfde60cdc3768f439dd702"; + sha256 = "0xmcswr6lgh26ldn7wrhp1pcfmf45r4n7sb2aa38wmdss14x0vb6"; }; meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; @@ -3997,6 +3997,18 @@ let meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/"; }; + 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-buffergator = buildVimPluginFrom2Nix { pname = "vim-buffergator"; version = "2018-05-02"; @@ -4021,18 +4033,6 @@ 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"; @@ -4299,12 +4299,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-06-17"; + version = "2020-06-23"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "50eb8e2d88be4e8bbcd8e5ddccbe499b3a1f473d"; - sha256 = "0hgbi7l4qlblmp28gbzzdw0bpfnw1mghyl7prk4zzf8w4m4vsrpa"; + rev = "c08e526760c0403d307583afdf7110fbaf98577f"; + sha256 = "0mv6vlf6s6hx244rb4qn7chir1sdg6qr4ffkdiqlbn1lnbm93i8a"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -4335,12 +4335,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2020-05-01"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "a19760770b810050e748de14ced589dd34c2dcb5"; - sha256 = "0iz72p992z2bkvz66x7fgyd9hpjq558h009bsjvfr4l6fpbi4ys2"; + rev = "7c4dc5945b15a6b97ebef860070d30e36da01788"; + sha256 = "0mg8fdfsr59015m309kr9v5akwc3zfwfygn36x47c8q2bwjjr052"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -4491,12 +4491,12 @@ let vim-exchange = buildVimPluginFrom2Nix { pname = "vim-exchange"; - version = "2017-01-27"; + version = "2020-06-24"; src = fetchFromGitHub { owner = "tommcdo"; repo = "vim-exchange"; - rev = "05d82b87711c6c8b9b7389bfb91c24bc4f62aa87"; - sha256 = "09fa156y8pxpzdbngifa7yzg1vjg1fjsgp1h9inj818zbig8mamb"; + rev = "0e95600517aad244d947b955a2e34ec30bdd09ff"; + sha256 = "1dh8xc5szm5rrv7xp299hcfhgp1155k5kfipzz6q2r69blhwyl1d"; }; meta.homepage = "https://github.com/tommcdo/vim-exchange/"; }; @@ -4539,12 +4539,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2020-06-08"; + version = "2020-06-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "15fcf3db308ce34a12c1e41a88178c7cccea0d96"; - sha256 = "148qjhln1v4cv15idsn36n82g0g7bjq2vhf0il9a6djwycf374kb"; + rev = "237c122f34132714a55709b4af13b94a10043136"; + sha256 = "0gwc6pb5psqwma0wzn87igd3wwsc9grl48y0w47q3jvc3xj01cgs"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -4597,6 +4597,18 @@ let meta.homepage = "https://github.com/dcharbon/vim-flatbuffers/"; }; + vim-floaterm = buildVimPluginFrom2Nix { + pname = "vim-floaterm"; + version = "2020-07-02"; + src = fetchFromGitHub { + owner = "voldikss"; + repo = "vim-floaterm"; + rev = "e3fec03b10444ecd3d73342ab6db1a433cc72522"; + sha256 = "0vv2hdi8an8a56848nnghbx35p9na8m54r2n2x2l5yaq84vnk30d"; + }; + meta.homepage = "https://github.com/voldikss/vim-floaterm/"; + }; + vim-flutter = buildVimPluginFrom2Nix { pname = "vim-flutter"; version = "2019-09-29"; @@ -4635,12 +4647,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-05-31"; + version = "2020-06-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "27a5c3abd211c2784513dab4db082fa414ad0967"; - sha256 = "18rvp600vk0anbzxdgcw3kdswqr3100b3jgnmz6c2k5c50wz37rm"; + rev = "1da7c133b109cd329060174a104e325e4d6bcc82"; + sha256 = "0yla2m8k6mqhr8sr4s1pgh2l2dzn9kpk0955f0r0pccirfj7c9pk"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -4695,12 +4707,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-06-20"; + version = "2020-06-25"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "d82f2721424762f14587240e09cfb0dc499779da"; - sha256 = "1ynl6jdnij2hi0gmpgq2b01r5g2db5582jzsqbz079ydb2kbp1jp"; + rev = "c27bfab8c51e77419ee0c4a9c4e3ba359dbc2ad4"; + sha256 = "0m4wrg2j6mdxqfv4d6sw4qcaffk0748spzqvwid5wpzrjvwg2ydp"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -4731,12 +4743,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-06-19"; + version = "2020-07-02"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "4ebfb5967fa2aa3269edb3962b347a7e5e213a1b"; - sha256 = "1x8bg9c5yrfydaqkprf0cvl1jl0lncl0y1zrw1y5gvbq0cgdplqp"; + rev = "f919e0c50deffba7ae2789cf785ed491a6bec9d4"; + sha256 = "068msrfl0v64djws1cb5p2yvwsk29j4msdqqf4c13bafjyhxqwb7"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5128,12 +5140,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2020-06-20"; + version = "2020-06-27"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "ca3c880f77b4cec6b14d9436b07f4152bebc2712"; - sha256 = "04sq7wips3rybmaqwpxmf7920nv4nrm82lvbr5s9jdn0594lkg9c"; + rev = "1aaa33774783630e21426ad1ffd7a389be59abd0"; + sha256 = "1d3lf1khshwp1gd0wn3jvm35qg3siz5pmbixqysz2hi130b2c3sq"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -5164,24 +5176,24 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2020-04-11"; + version = "2020-06-22"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "496c44d89281d1e13c9bb4c75a2e69daba48b47b"; - sha256 = "09xr8pbx27qpffcr0j1857cpyxgkv5xay6mgpzvynpxq21xrmm3q"; + rev = "c665d5ca4247b696f478f91b7c97b9e44442e4b6"; + sha256 = "1p1461rh3yp0ldg4x1cb2nj9xng6scdlrkzj1q8ykspi98qnz0mm"; }; meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; vim-jsx-typescript = buildVimPluginFrom2Nix { pname = "vim-jsx-typescript"; - version = "2020-04-29"; + version = "2020-07-02"; src = fetchFromGitHub { owner = "peitalin"; repo = "vim-jsx-typescript"; - rev = "7b47d06819b5778de78cfbb28c225c3ab276f700"; - sha256 = "0pm40psql6mzrzy750vm6jk71pp467hz9231izicp0554mq6qmsn"; + rev = "f93f121335ae99bac123a6fecc9fa45a4790bb64"; + sha256 = "0a9p8d8hgd32gwp2lvzm9v354985pp0pqm36qn9cblgikgm9plgz"; }; meta.homepage = "https://github.com/peitalin/vim-jsx-typescript/"; }; @@ -5212,12 +5224,12 @@ let vim-latex-live-preview = buildVimPluginFrom2Nix { pname = "vim-latex-live-preview"; - version = "2018-09-25"; + version = "2020-06-25"; src = fetchFromGitHub { owner = "xuhdev"; repo = "vim-latex-live-preview"; - rev = "855c30915547c7e9c19b7e6efb528730c071d2e8"; - sha256 = "14fgbq7wyyhhzkd8832g07z97jg1b9awibzf3sn33ih7p5bb3hhp"; + rev = "32d1a911641e08c11b3f82ba886540cbae0b7513"; + sha256 = "0hnjc1jpjr6fdy9b5j85didi97f6w8p8ad5cn6b0fnxxlkykymjg"; }; meta.homepage = "https://github.com/xuhdev/vim-latex-live-preview/"; }; @@ -5284,24 +5296,24 @@ let vim-liquid = buildVimPluginFrom2Nix { pname = "vim-liquid"; - version = "2019-11-13"; + version = "2020-07-01"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-liquid"; - rev = "9ebc192daec70e620c22d574b5a1c1e16f89a48c"; - sha256 = "0cvcjiii5wv55n695284k520rrwi0l4gqpyiqnrpnhmsaqks0n0f"; + rev = "94bd2ea1fd45cf0a21edc3433231e7fcb7791323"; + sha256 = "0r8lisyhbzyw2w9xzbashlhnag98vws78xwmh03dpd8kbpcdiz0w"; }; meta.homepage = "https://github.com/tpope/vim-liquid/"; }; vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2020-05-20"; + version = "2020-06-30"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "7f9d254a0c46889454cc2fd2d5918b413e4cb85a"; - sha256 = "0428hbcj4w9lwmsv9jribkp5fjcbw3sg0gs81jf9n5ax0mxgnbzy"; + rev = "ac6444afb5fd11e3f7750f696a0c6b8b0b6ec116"; + sha256 = "182fvmfnpcqda0cm878lk79iprxsd7nb9r97jmr7lx5agdcvzaqb"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -5416,12 +5428,12 @@ let vim-move = buildVimPluginFrom2Nix { pname = "vim-move"; - version = "2019-11-23"; + version = "2020-06-22"; src = fetchFromGitHub { owner = "matze"; repo = "vim-move"; - rev = "58049562efb0e6e077416d897b760c4dc9bb25c4"; - sha256 = "18pnk6ri73a6dq86zh510wy1s0z1dwnsyay7lxrgirjgh3s9nhhq"; + rev = "54f06c405bfd1ec3142750e8788f4dcd0ca0c065"; + sha256 = "0wnfk164fyfyyl5pbbfa7wzy39arn2ny790d6g14bf6zl2kapkas"; }; meta.homepage = "https://github.com/matze/vim-move/"; }; @@ -5476,12 +5488,12 @@ let vim-nftables = buildVimPluginFrom2Nix { pname = "vim-nftables"; - version = "2020-02-21"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "nfnty"; repo = "vim-nftables"; - rev = "01c7b97eff12fd4b624e6efa2c0468163db61ebc"; - sha256 = "1n3mpaa60k4w0sqpkgw19aksa1sbcqz7vl8fp6bj6i63bhiprsqf"; + rev = "26f8a506c6f3e41f1e4a8d6aa94c9a79a666bbff"; + sha256 = "1z5ffgxdq8niggm18qikrh5hl8zs05gdij4z6dfnzy00xvancc40"; }; meta.homepage = "https://github.com/nfnty/vim-nftables/"; }; @@ -5512,12 +5524,12 @@ let vim-nix = buildVimPluginFrom2Nix { pname = "vim-nix"; - version = "2019-06-03"; + version = "2020-06-23"; src = fetchFromGitHub { owner = "LnL7"; repo = "vim-nix"; - rev = "a3eed01f4de995a51dfdd06287e44fcb231f6adf"; - sha256 = "0pwdfwws1dj3705m00ghw3dvym5zbm00bfsj023gmbp6vr8wn6yi"; + rev = "d733cb96707a2a6bdc6102b6d89f947688e0e959"; + sha256 = "12k2gwm8b1n02361gpjhsldql99yd7qsh80a3lbwc5c5gz5j8jsb"; }; meta.homepage = "https://github.com/LnL7/vim-nix/"; }; @@ -5740,12 +5752,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-06-08"; + version = "2020-06-25"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "01aab60adef47c6606aa68c8783f5b994fda9fc4"; - sha256 = "1x5m98k20ncvhz6sngzxwhh74s2ll3d119p1g0di4vr59rkx8szq"; + rev = "3aa3b5a4e85620dd58302926b571860c92fdbb2f"; + sha256 = "1lksg2qphxy6bj1jfhjmq28z67asq7vqyplf42sr49r1076imb0q"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -5764,12 +5776,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-06-19"; + version = "2020-06-25"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "8b6c06e7239eb46d5b5096fd7fe9507aca88b091"; - sha256 = "1j4fg0xhnwk0hf89djv0l2gzrj5dna1a9g8vjdxgdq0pilz5hqnj"; + rev = "d09a56a494863afd789cba1850e123dfc1dd26cf"; + sha256 = "02z4aidr8bbcrvfj2c5jgradm6n2c1c9hywb22wn8bwiig8aiqv3"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -5956,12 +5968,12 @@ let vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2020-04-19"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "fd49b25e08618b58db678c3f8ce6e443b1ad04e7"; - sha256 = "086pzicqal2cmvbrzy09d93c7cz5scgjcqc9xn4cw19dn55irllp"; + rev = "416be2b00de6390f05da2f60f18aa15a4397eef7"; + sha256 = "1nlda38bp67hzmp851haxs5g48kd8dav53484jzdfmxxq0lwy0mb"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -6160,12 +6172,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2020-02-29"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "98a5c946d6dc76528b9d9b044059b5ef1fab5a48"; - sha256 = "0xcxr658i5vzdkxfssd7zx6n3ar9b6dg4b2ddaswgnwq75xphrh9"; + rev = "afe94543bb3bb95ef9ae2a58eebcbc17d69eb304"; + sha256 = "0iaksyh77xahg5cp0q9x5c14jdklsrgy9400jp4xjb83qgg6d7qq"; }; meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; @@ -6184,12 +6196,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-06-02"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "900bf93c6680e38ce568dba26c3f48b4365ac730"; - sha256 = "1gxqmvr6hz7vblrji2dz2l1x18264ainbl70j60yfx3vjp5aa9vq"; + rev = "3f805a0101e5fdfea4eab992af5aa50e8a242459"; + sha256 = "0ybysjzxpka7lkqd9fjj1nk8byr8g96a3ykmcq0m6xwwyv8732x5"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6556,12 +6568,12 @@ let vim-trailing-whitespace = buildVimPluginFrom2Nix { pname = "vim-trailing-whitespace"; - version = "2019-12-09"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "bronson"; repo = "vim-trailing-whitespace"; - rev = "6b7cdecff252474fe560d32c6f05641f3c5952c7"; - sha256 = "0arv1hmlw7c1rlkc00hzjyg48pg8g4cc9q9l2hy8kpmsl037akm3"; + rev = "610ca1a97c8dc85cdeb38635e5a4703317c4b94d"; + sha256 = "1bh15yw2aysvpn2ndnc0s6jzc0y93x6q1blc5pph67rdix5bm7gy"; }; meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; }; @@ -6604,12 +6616,12 @@ let vim-vinegar = buildVimPluginFrom2Nix { pname = "vim-vinegar"; - version = "2019-11-13"; + version = "2020-06-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-vinegar"; - rev = "fcce70f1403ba4101668a4c960c577bddbd00f06"; - sha256 = "0zxqdyla40xcp0ps362b85bqwl3mp4zfmfdggl0gwvgd5m949yk0"; + rev = "5fee9d230ec4a6a16c45f2c71482595e4d9a67bd"; + sha256 = "14n0mnj1lmk3bmhm0knipsw120dlxpsd98fimmchw0kd80vpph41"; }; meta.homepage = "https://github.com/tpope/vim-vinegar/"; }; @@ -6628,12 +6640,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-06-14"; + version = "2020-06-28"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "507c498c7dac31c396ed64bfddcd92551a93669d"; - sha256 = "0jq1ywz4fwlln93qwwxl28dlq43c5vaybhi1y365hcn03nz526cc"; + rev = "d7a75cf6284d6706c77b18f86b0ce0afcddec965"; + sha256 = "0j7hdh58hizg14806r6vsq81sfy2yvqrn934xxb1hw3rzirhsjjj"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -6856,12 +6868,12 @@ let vimproc-vim = buildVimPluginFrom2Nix { pname = "vimproc-vim"; - version = "2020-01-20"; + version = "2020-06-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "51f4664c92f0f1b121127c84d3b1c901e1c698f0"; - sha256 = "06nzh4x7j7j3nvw2s4m1gmds0z0bldxbizja91jd43qma9xnwvlk"; + rev = "8f40d86ab938d5df8c1c9824320621ae9f0d5609"; + sha256 = "11k59lc31056lk9ndkmi9a4459lnv6hdhvw3y4gpin40xchl6d61"; }; meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; @@ -6880,12 +6892,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-06-09"; + version = "2020-07-02"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "49bc335fffa40a7b7b84b6110b57ebcbaaf019ea"; - sha256 = "06zdj0pgr6d8vddx87rk36lb00nngydl367g06zi8jkx4673rzz8"; + rev = "0019dc6182ef5fa232887118b46119bd6f5d4063"; + sha256 = "1p0hgrjhzlg1a5f33mj68db123m71r0icqaxbj6mhmkr97887jym"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -6928,12 +6940,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-06-21"; + version = "2020-06-26"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "0b5ece152b56e424b6df6ca9545517007ceb840f"; - sha256 = "1dr98fibcpq6c1adsb4bnbbgg6gpk9brfy3kkrbl49jqf2120zww"; + rev = "0cbf100215f2136aaea53386bc7f9b2aef7d7021"; + sha256 = "1vdmcwmdrfka03px7rm1hg7irmv8wfq3rzr7qgv255jv65mblvid"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -7012,12 +7024,12 @@ let xptemplate = buildVimPluginFrom2Nix { pname = "xptemplate"; - version = "2020-02-08"; + version = "2020-06-29"; src = fetchFromGitHub { owner = "drmingdrmer"; repo = "xptemplate"; - rev = "79d650bad58b9c896ec47785f8a0c7b603105c2d"; - sha256 = "1myxp0ldk0s46aipx1iswa9zx2fkc4gwqpmhbswqgg7sxl1bz30g"; + rev = "359ffe4d426bce2e95f5866b682856b25555396f"; + sha256 = "1rj5k58n1ybcc7qxsxlh09p2v4cps5xyzxmvjfrixy1qm2f85kd5"; }; meta.homepage = "https://github.com/drmingdrmer/xptemplate/"; }; @@ -7061,12 +7073,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-06-14"; + version = "2020-07-03"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "f9906f804b02e6b7e70a7f1a6f949e905784b5b9"; - sha256 = "0jg5g2yzaf4xs14phak7k1s5s7jfnsx5ijjgx2arddgaxbvpxlrs"; + rev = "195f730dfb4d818a81082b383e294a302f61bcfe"; + sha256 = "021z74is3bz746azxn05hzlrzd2asdb0kz5ab2fizgxl7n33cml0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -7110,12 +7122,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-06-18"; + version = "2020-06-23"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "fdc73a51d168677ec9a1da68afbe30c8ddb6263a"; - sha256 = "14qkrlh07qg6192m2lgbjh3dshgrlbwni2i00vm04xax8dm436j1"; + rev = "6e4e34862c82b66fd939042018b334f66ee4847c"; + sha256 = "1g1k2myhpyd58qj6amwq7ynsl2hvqmn6gd638i8k3hk7kxr1n22a"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; From ad173a7cddedf9a01a1ffa1e686d1b75023b5f1e Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Sat, 4 Jul 2020 01:29:22 +0200 Subject: [PATCH 3243/3452] vimPlugins.vim-monokai: init at 2020-06-17 --- 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 0c38255966ca..5cb779d5e1f8 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5414,6 +5414,18 @@ let meta.homepage = "https://github.com/xolox/vim-misc/"; }; + vim-monokai = buildVimPluginFrom2Nix { + pname = "vim-monokai"; + version = "2020-06-17"; + src = fetchFromGitHub { + owner = "crusoexia"; + repo = "vim-monokai"; + rev = "703a4a6ee96a5772c204c4dd852f246ce71231df"; + sha256 = "1avp4zr9sa38ygx9c9ffkdb6mmzqv7sxyb093bqq06gfdv8yzk2a"; + }; + meta.homepage = "https://github.com/crusoexia/vim-monokai/"; + }; + vim-monokai-pro = buildVimPluginFrom2Nix { pname = "vim-monokai-pro"; version = "2020-05-07"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 7b34ff4bd8b1..46d445e9c2ab 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -57,6 +57,7 @@ cloudhead/neovim-fuzzy CoatiSoftware/vim-sourcetrail cocopon/iceberg.vim cohama/lexima.vim +crusoexia/vim-monokai ctjhoa/spacevim ctrlpvim/ctrlp.vim dag/vim-fish From c0148726b2b56e713dbc18e088a47875d7d00d97 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 Jul 2020 00:04:01 +0000 Subject: [PATCH 3244/3452] bettercap: 2.27.1 -> 2.28 --- pkgs/tools/security/bettercap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index d3cc3c7cadbb..b6cec239f1e5 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "bettercap"; - version = "2.27.1"; + version = "2.28"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0jb78c3s6p210mj28qg4aacd8ly6d6k5h9c48y88vmcyllzjvbhl"; + sha256 = "0aihinn3i3jj350l2rqph7nv3wy4nh4f8syidf77zybjcp9nmcys"; }; - vendorSha256 = "1j272w0zdndcz4fmh9fzbk2q8wmyfi70vn0p6d8cg0r0l231sbyx"; + vendorSha256 = "0yfs1f18d8frbkrshsajzzbj4wh2azd89g2h35wm6wqknvlipwr0"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ]; From 06b8b96500502cb3bbd335242faf787e5d68bb9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 4 Jul 2020 02:05:03 +0200 Subject: [PATCH 3245/3452] docs: Explain how to set password-less logins. This explains the # Allow the user to log in as root without a password. users.users.root.initialHashedPassword = ""; that the NixOS installer live systems use in `profiles/installation-device.nix`. --- nixos/modules/config/users-groups.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 8defa86818ab..e6b9a78f416b 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -27,6 +27,15 @@ let hashedPasswordDescription = '' To generate hashed password install mkpasswd package and run mkpasswd -m sha-512. + + For password-less logins without password prompt, use + the empty string "". + + For logins with a fixed password (including the empty-string password with + prompt), use one of the un-hashed password options instead, such as + . + + Such unprotected logins should only be used for e.g. bootable live systems. ''; userOpts = { name, config, ... }: { From e91e213aca9f378a7d815b135a1977d040d2b9a6 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 17 Jun 2020 14:12:56 +0000 Subject: [PATCH 3246/3452] apk-tools: init at 2.10.5 --- .../package-management/apk-tools/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/package-management/apk-tools/default.nix diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix new file mode 100644 index 000000000000..33c08636e44d --- /dev/null +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchurl, lua, openssl, pkg-config, zlib }: + +stdenv.mkDerivation rec { + pname = "apk-tools"; + version = "2.10.5"; + + src = fetchurl { + url = "https://dev.alpinelinux.org/archive/apk-tools/apk-tools-${version}.tar.xz"; + sha256 = "00z3fqnv8vk2czdm4p2q4sldq0n8sxyf2qfwppyk7wj59d2sq8dp"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ lua openssl zlib ]; + + makeFlags = [ + "SBINDIR=$(out)/bin" + "LIBDIR=$(out)/lib" + "LUA_LIBDIR=$(out)/lib/lua/${lib.versions.majorMinor lua.version}" + "MANDIR=$(out)/share/man" + "DOCDIR=$(out)/share/doc/apk" + "INCLUDEDIR=$(out)/include" + "PKGCONFIGDIR=$(out)/lib/pkgconfig" + ]; + + NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://gitlab.alpinelinux.org/alpine/apk-tools"; + description = "Alpine Package Keeper"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.gpl2; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7880475cd49a..6a4cb77f7734 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -678,6 +678,10 @@ in apfs-fuse = callPackage ../tools/filesystems/apfs-fuse { }; + apk-tools = callPackage ../tools/package-management/apk-tools { + lua = lua5_3; + }; + apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; }; From 9f93642b79ad4f6ac95300522dd690dac02f0066 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 17 Jun 2020 14:13:20 +0000 Subject: [PATCH 3247/3452] alpine-make-vm-image: init at 0.6.0 --- .../alpine-make-vm-image/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/virtualization/alpine-make-vm-image/default.nix diff --git a/pkgs/tools/virtualization/alpine-make-vm-image/default.nix b/pkgs/tools/virtualization/alpine-make-vm-image/default.nix new file mode 100644 index 000000000000..08d37a1d53bc --- /dev/null +++ b/pkgs/tools/virtualization/alpine-make-vm-image/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper +, apk-tools, coreutils, e2fsprogs, findutils, gnugrep, gnused, kmod, qemu-utils +, utillinux +}: + +stdenv.mkDerivation rec { + pname = "alpine-make-vm-image"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "alpinelinux"; + repo = "alpine-make-vm-image"; + rev = "v${version}"; + sha256 = "0955kd2ddqfynjwk2xfzys96l7abxp30hhrs2968hl78rhmkvpnq"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/alpine-make-vm-image --set PATH ${lib.makeBinPath [ + apk-tools coreutils e2fsprogs findutils gnugrep gnused kmod qemu-utils + utillinux + ]} + ''; + + meta = with lib; { + homepage = "https://github.com/alpinelinux/alpine-make-vm-image"; + description = "Make customized Alpine Linux disk image for virtual machines"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a4cb77f7734..078d5f6517dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -651,6 +651,8 @@ in almanah = callPackage ../applications/misc/almanah { }; + alpine-make-vm-image = callPackage ../tools/virtualization/alpine-make-vm-image { }; + amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { }; amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { }; From c271dab10a5e10a23002be62395a0aa2feca9418 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 Jul 2020 01:28:11 +0000 Subject: [PATCH 3248/3452] cpp-hocon: 0.2.2 -> 0.3.0 --- pkgs/development/libraries/cpp-hocon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index 01da4753b0e6..00399616d9af 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "cpp-hocon"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { - sha256 = "1c8zy4hi0182k0vfx5l8bjq1iv7lvvw1zi4vy3429s898rx7z3d3"; + sha256 = "0b24anpwkmvbsn5klnr58vxksw00ci9pjhwzx7a61kplyhsaiydw"; rev = version; repo = "cpp-hocon"; owner = "puppetlabs"; From a5e211dd7f95167ab42066e82bfaa5a65971e67c Mon Sep 17 00:00:00 2001 From: Chuck Date: Tue, 28 Jan 2020 14:30:41 -0800 Subject: [PATCH 3249/3452] nixos/qemu-vm: Generalize drive naming --- nixos/modules/virtualisation/qemu-vm.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index a9f8e327e424..7507db40578e 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -74,6 +74,16 @@ let drivesCmdLine = drives: concatStringsSep " " (imap1 driveCmdline drives); + # Creates a device name from a 1-based a numerical index, e.g. + # * `driveDeviceName 1` -> `/dev/vda` + # * `driveDeviceName 2` -> `/dev/vdb` + driveDeviceName = idx: + let letter = elemAt lowerChars (idx - 1); + in if cfg.qemu.diskInterface == "scsi" then + "/dev/sd${letter}" + else + "/dev/vd${letter}"; + # Shell script to start the VM. startVM = '' @@ -512,8 +522,7 @@ in optional cfg.writableStore "overlay" ++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx"; - virtualisation.bootDevice = - mkDefault (if cfg.qemu.diskInterface == "scsi" then "/dev/sda" else "/dev/vda"); + virtualisation.bootDevice = mkDefault (driveDeviceName 1); virtualisation.pathsInNixDB = [ config.system.build.toplevel ]; @@ -601,7 +610,7 @@ in }; } // optionalAttrs cfg.useBootLoader { "/boot" = - { device = "/dev/vdb2"; + { device = "${driveDeviceName 1}2"; fsType = "vfat"; options = [ "ro" ]; noCheck = true; # fsck fails on a r/o filesystem From f3034084da73772e4d2ec3907d9536d106fd393a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 Jul 2020 04:55:04 +0000 Subject: [PATCH 3250/3452] libgen-cli: 1.0.6 -> 1.0.7 --- pkgs/tools/misc/libgen-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/libgen-cli/default.nix b/pkgs/tools/misc/libgen-cli/default.nix index 7d66941c99a3..51e390f6c0c7 100644 --- a/pkgs/tools/misc/libgen-cli/default.nix +++ b/pkgs/tools/misc/libgen-cli/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "libgen-cli"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "ciehanski"; repo = pname; rev = "v${version}"; - sha256 = "1ahqwrlsvgiig73dwlbjgkarf3a0z3xaihj8psd2ci5i0i07nm5v"; + sha256 = "15nzdwhmgpm36dqx7an5rjl5sw2r4p66qn2y3jzl6fc0y7224ns1"; }; - vendorSha256 = "15ch0zfl4a7qvwszsfkfgw5v9492wjk4l4i324iq9b50g70lgyhd"; + vendorSha256 = "0smb83mq711b2pby57ijcllccn7y2l10zb4fbf779xibb2g09608"; subPackages = [ "." ]; From 95930da953a6f5ca5e6f9871c6e2014abaf8ce63 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 Jul 2020 05:22:12 +0000 Subject: [PATCH 3251/3452] liquibase: 3.10.0 -> 3.10.1 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index ae993f9611e0..5049eb07b871 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.10.0"; + version = "3.10.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1h5mcbs6mkk6cqjm8qm63rynz7611gq32v2jirl1qn71x2s7pq6y"; + sha256 = "1q20iswakhnrmsmlcsjnhl3glj4p0314gridqyy4wh7s77bcakg5"; }; buildInputs = [ jre makeWrapper ]; From cb78a74bbfef2b0afe00b4c6f02d790b8e0a5391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Fri, 3 Jul 2020 20:07:15 +0200 Subject: [PATCH 3252/3452] evolution: 3.36.3 -> 3.36.4 --- pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index b9ac719004aa..e6b2db3330eb 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.36.3"; + version = "3.36.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00yann3cibbsap7vh6qq08aklvydynmk6gmljkzd80kc52m6rqal"; + sha256 = "0vgd3i5zrs4r0i0700hhl89c66j41bgdzg9j8wdf0w8irlqj5xv2"; }; nativeBuildInputs = [ From bedd68acf021bdeb4851a6651143b5e436937a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Fri, 3 Jul 2020 20:10:31 +0200 Subject: [PATCH 3253/3452] evolution-data-server: 3.36.3 -> 3.36.4 --- pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 4bb3f4517f0e..ccda82765c2b 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.36.3"; + version = "3.36.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1cix02xl473m0l7h715s68cn7bi1p4y1jkrxswcq4a0g7lblhpqz"; + sha256 = "03sc7r6hpi62kcxpnzm5gv1ky3hmslh4fnf2vy2qghb5xqg3zy1r"; }; patches = [ From 7157e599ebdb1dc0425aaa58b080921d1c1f2cbb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 Jul 2020 07:37:44 +0000 Subject: [PATCH 3254/3452] papirus-icon-theme: 20200602 -> 20200702 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 37bde66c3df4..fe64325013c5 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20200602"; + version = "20200702"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "0cms5dn8qfasi9xpfcq1hsdyvcb39vkh97mjvi7zrng4iyihq06y"; + sha256 = "0p1grfgnmqawayk15qxnl09jai96avx9731qladmcbm2lik4qdpl"; }; nativeBuildInputs = [ From e6612937cbca15d27b2c7d73f0ee1c071485e219 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 4 Jul 2020 11:01:00 +0300 Subject: [PATCH 3255/3452] guvcview: use latest ffmpeg (#92170) --- pkgs/os-specific/linux/guvcview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 41c21502e0b3..d780cade7865 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -5,7 +5,7 @@ , pkgconfig , portaudio , SDL2 -, ffmpeg_3 +, ffmpeg , udev , libusb1 , libv4l @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 alsaLib - ffmpeg_3 + ffmpeg libusb1 libv4l portaudio From b3f0d9da9ab5b8c3b9f7e746d90eb91d5edf3c6f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 4 Jul 2020 04:20:00 -0500 Subject: [PATCH 3256/3452] libwhereami: enable on darwin --- pkgs/development/libraries/libwhereami/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index 8e190f998d56..0e580d8fa856 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Library to report hypervisor information from inside a VM"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; - platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; # fails on aarch64 + platforms = with platforms; [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; # fails on aarch64 }; } From 5a4fe405d34b32540ea149c0699be20a2f22c6d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 Jul 2020 10:51:58 +0000 Subject: [PATCH 3257/3452] tendermint: 0.33.5 -> 0.33.6 --- pkgs/tools/networking/tendermint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 4c0f87efbc4e..12e89ac6065a 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tendermint"; - version = "0.33.5"; + version = "0.33.6"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "0a6wm1gnr75mdfhzb9cgg4an655vln525slgp10r5abg9j3l8202"; + sha256 = "17zy18s9373f3fp6bqjgj02irzasfv3b6axi84kw7da17mq68vnv"; }; vendorSha256 = "0i0n89lal99fqnzva51kp9f7wzqsfmncpshwxhq26kvykp7ji7sw"; From 82106e0c3b2cee0a976e62744bc4a1e7c03d47b5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 4 Jul 2020 04:20:00 -0500 Subject: [PATCH 3258/3452] tendermint: use subPackages --- pkgs/tools/networking/tendermint/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 12e89ac6065a..31cbd1515d8d 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -13,6 +13,10 @@ buildGoModule rec { vendorSha256 = "0i0n89lal99fqnzva51kp9f7wzqsfmncpshwxhq26kvykp7ji7sw"; + subPackages = [ "cmd/tendermint" ]; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/tendermint/tendermint/version.GitCommit=${src.rev}" ]; + meta = with stdenv.lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; homepage = "https://tendermint.com/"; @@ -20,4 +24,4 @@ buildGoModule rec { maintainers = with maintainers; [ alexfmpe ]; platforms = platforms.linux ++ platforms.darwin; }; -} \ No newline at end of file +} From 3d88d16458cec0ceac64b8b8652c1c0ee255666e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 4 Jul 2020 04:21:00 -0500 Subject: [PATCH 3259/3452] leatherman: enable on darwin --- pkgs/development/libraries/leatherman/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 8a34f05f6cf0..952265044952 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -11,12 +11,7 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = builtins.toString [ - "-Wno-error=ignored-qualifiers" - "-Wno-error=class-memaccess" - "-Wno-error=catch-value" - "-Wno-error=deprecated-copy" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; buildInputs = [ boost curl ruby ]; @@ -28,7 +23,7 @@ stdenv.mkDerivation rec { description = "A collection of C++ and CMake utility libraries"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 2380e153a324eb87acc4591e68f27cd6923df76a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 4 Jul 2020 04:22:00 -0500 Subject: [PATCH 3260/3452] cpp-hocon: enable on darwin --- pkgs/development/libraries/cpp-hocon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index 00399616d9af..47ec7a1a6eb4 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; - description = " A C++ port of the Typesafe Config library"; + description = "A C++ port of the Typesafe Config library"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 951a5bcc7ab91d2a57b2322a777212b5feb2c6bc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 4 Jul 2020 04:23:00 -0500 Subject: [PATCH 3261/3452] facter: enable on darwin --- pkgs/tools/system/facter/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index b6a04f808a4c..a4065cce8644 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -11,15 +11,15 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - CXXFLAGS = "-fpermissive -Wno-error=catch-value"; - NIX_LDFLAGS = "-lblkid"; + CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-fpermissive -Wno-error=catch-value"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lblkid"; cmakeFlags = [ - "-DFACTER_RUBY=${ruby}/lib/libruby.so" + "-DFACTER_RUBY=${ruby}/lib/libruby${stdenv.hostPlatform.extensions.sharedLibrary}" "-DRUBY_LIB_INSTALL=${placeholder "out"}/lib/ruby" ]; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-copy"; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ]; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "A system inventory tool"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From b2aa673d5ac626c429417ef4cb4ff9c866ff74f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 4 Jul 2020 10:18:52 +0100 Subject: [PATCH 3262/3452] nixos: fix manual build https://github.com/NixOS/nixpkgs/pull/92240#issuecomment-653740926 --- nixos/modules/config/users-groups.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index e6b9a78f416b..c2f16e5ed8e5 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -33,7 +33,7 @@ let For logins with a fixed password (including the empty-string password with prompt), use one of the un-hashed password options instead, such as - . + . Such unprotected logins should only be used for e.g. bootable live systems. ''; From cc46362929dbb5d13a8ff8c4669ac3a8d47db028 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Sat, 4 Jul 2020 22:00:57 +1200 Subject: [PATCH 3263/3452] dockerTools: Support files directly under /nix/store Also makes sure that the files inside a layer added in a sorted order to make the results more deterministic. --- nixos/tests/docker-tools.nix | 6 ++++++ pkgs/build-support/docker/examples.nix | 10 ++++++++++ pkgs/build-support/docker/stream_layered_image.py | 8 ++++---- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index c48e5b079762..01f7d17f58f0 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -178,5 +178,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { # This check may be loosened to allow an *empty* store rather than *no* store. docker.succeed("docker run --rm no-store-paths ls /") docker.fail("docker run --rm no-store-paths ls /nix/store") + + with subtest("Ensure buildLayeredImage supports files directly under /nix/store"): + docker.succeed( + "docker load --input='${pkgs.dockerTools.examples.filesInStore}'", + "docker run file-in-store |& grep 'some data'", + ) ''; }) diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index b040d830b31c..8b77d6011d38 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -335,4 +335,14 @@ rec { }; }; + # 19. Support files in the store on buildLayeredImage + # See: https://github.com/NixOS/nixpkgs/pull/91084#issuecomment-653496223 + filesInStore = pkgs.dockerTools.buildLayeredImage { + name = "file-in-store"; + tag = "latest"; + config.Cmd = [ + "${pkgs.coreutils}/bin/cat" + (pkgs.writeText "somefile" "some data") + ]; + }; } diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index 4348513338d7..609af30c8bb3 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -39,6 +39,7 @@ import json import hashlib import pathlib import tarfile +import itertools import threading from datetime import datetime from collections import namedtuple @@ -87,10 +88,9 @@ def archive_paths_to(obj, paths, mtime, add_nix, filter=None): tar.addfile(apply_filters(dir("/nix/store"))) for path in paths: - ti = tar.gettarinfo(os.path.join("/", path)) - tar.addfile(apply_filters(append_root(ti))) - - for filename in pathlib.Path(path).rglob("*"): + path = pathlib.Path(path) + files = itertools.chain([path], path.rglob("*")) + for filename in sorted(files): ti = append_root(tar.gettarinfo(filename)) # copy hardlinks as regular files From cd31f0d503e6b3c95267a22cfdcead0e3ad0f54e Mon Sep 17 00:00:00 2001 From: Illia Shestakov Date: Tue, 16 Jun 2020 22:51:17 +0300 Subject: [PATCH 3264/3452] utahfs: init at 1.0 --- .../networking/utahfs/default.nix | 24 ++ pkgs/applications/networking/utahfs/deps.nix | 327 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 353 insertions(+) create mode 100644 pkgs/applications/networking/utahfs/default.nix create mode 100644 pkgs/applications/networking/utahfs/deps.nix diff --git a/pkgs/applications/networking/utahfs/default.nix b/pkgs/applications/networking/utahfs/default.nix new file mode 100644 index 000000000000..6e30e03531dc --- /dev/null +++ b/pkgs/applications/networking/utahfs/default.nix @@ -0,0 +1,24 @@ +{ buildGoPackage, lib, fetchFromGitHub }: + +buildGoPackage rec { + pname = "utahfs"; + version = "1.0"; + src = fetchFromGitHub { + owner = "cloudflare"; + repo = pname; + rev = "v${version}"; + sha256 = "1hpwch5fsqlxwpk5afawa1k5s0bx5c1cw0hvdllp7257lgly19fb"; + }; + + goPackagePath = "github.com/cloudflare/utahfs"; + goDeps = ./deps.nix; + + meta = with lib; { + homepage = "https://github.com/cloudflare/utahfs"; + description = + "Encrypted storage system that provides a user-friendly FUSE drive backed by cloud storage"; + license = licenses.bsd3; + maintainers = [ maintainers.snglth ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/utahfs/deps.nix b/pkgs/applications/networking/utahfs/deps.nix new file mode 100644 index 000000000000..a144211fc954 --- /dev/null +++ b/pkgs/applications/networking/utahfs/deps.nix @@ -0,0 +1,327 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "a6b88cf34a491498e4c7d15c107a31058693e2cb"; + sha256 = "0ilqqymrphg546c66jc0npd48dlr88wbgrg462h1jgm2ykbnq1ba"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "420cda5d6383f94f7d9c231aa44bad3325181950"; + sha256 = "1mp0c9173328r67iica662013jnshiv8yg2p5zgs0kr5sh3ri0ws"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46"; + sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/groupcache"; + fetch = { + type = "git"; + url = "https://github.com/golang/groupcache"; + rev = "8c9f03a8e57eb486e42badaed3fb287da51807ba"; + sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + }; + } + { + goPackagePath = "github.com/google/readahead"; + fetch = { + type = "git"; + url = "https://github.com/google/readahead"; + rev = "eaceba16903255cb149d1efc316f6cc83d765268"; + sha256 = "19l6a29yyypgpqf7v5877ni0bqgxfp41q7ffp2xj57rvikimwiyb"; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2"; + sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; + }; + } + { + goPackagePath = "github.com/jacobsa/fuse"; + fetch = { + type = "git"; + url = "https://github.com/jacobsa/fuse"; + rev = "cd3959611bcb6bb23d49f1598d98f2bf44476805"; + sha256 = "0qy7gyczmdwclhml0n4js3rai7qinnvlr8xz1wn0g6z0vqc9p9iz"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "c2b33e84"; + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; + }; + } + { + goPackagePath = "github.com/jstemmer/go-junit-report"; + fetch = { + type = "git"; + url = "https://github.com/jstemmer/go-junit-report"; + rev = "cc1f095d5cc5eca2844f5c5ea7bb37f6b9bf6cac"; + sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "c7c4067b79cc51e6dfdcef5c702e74b1e0fa7c75"; + sha256 = "1zmz6asplixfihxhj11spgfs0v3xzb3nv0hlq6n6zsg781ni31xx"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/pquerna/ffjson"; + fetch = { + type = "git"; + url = "https://github.com/pquerna/ffjson"; + rev = "e517b90714f7c0eabe6d2e570a5886ae077d6db6"; + sha256 = "0lb76zvdi045r3kab529p9ippccsi9vw84xhinddyr4qrxvs9b06"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "4ab88e80c249ed361d3299e2930427d9ac43ef8d"; + sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fd36f4220a901265f90734c3183c5f0c91daa0b8"; + sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "31bed53e4047fd6c510e43a941f90cb31be0972a"; + sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "3f98efb27840a48a7a2898ec80be07674d19f9c8"; + sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "d835ff86be02193d324330acdb7d65546b05f814"; + sha256 = "0xj16iq5jp26hi2py7lsd8cvqh651fgn39y05gzvjdi88d9xd3nw"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285"; + sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "738671d3881b9731cc63024d5d88cf28db875626"; + sha256 = "0jkiz4py59jjnkyxbxifpf7bsar11lbgmj5jiq2kic5k03shkn9c"; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "ed3ec21bb8e252814c380df79a80f366440ddb2d"; + sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "244492dfa37ae2ce87222fd06250a03160745faa"; + sha256 = "0vm2q44phz4vjnzq9428rjk58c82fxf003whczp7c9ryn9fazh7s"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "bf48bf16ab8d622ce64ec6ce98d2c98f916b6303"; + sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "fae7ac547cb717d141c433a2a173315e216b64c4"; + sha256 = "11pl0dycm5d8ar7g1l1w5q2cx0lms8i15n8mxhilhkdd2xpmh8f0"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "e8dd451b4bcb2ef4a22627699ed7d9df7653d6f3"; + sha256 = "0a088x8gpq7y0nx7z5baz2p9n1br908yrwjqnh2f9b4mv38kagzi"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "9bdfabe68543c54f90421aeb9a60ef8061b5b544"; + sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-api-go-client"; + rev = "c24765c18bb761c90df819dcdfdd62f9a7f6fa22"; + sha256 = "13syr1x33k6mrn5w6l4sgdbzn368w3m60vf6kk2j10fwa45125rg"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "971852bfffca25b069c31162ae8f247a3dba083b"; + sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/go-genproto"; + rev = "43be25429f5aa0b9a3f18fa4e32583729ca30b78"; + sha256 = "0rj8xjyn4b73wvfg6v0fff7brnc61xd41500vxa6lw8cg36d51gr"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "142182889d38b76209f1d9f1d8e91d7608aff542"; + sha256 = "1m36rg3w2mf4r3383yf0r1pjrz890mdw506h1lpm6bkc8w3kyqz3"; + }; + } + { + goPackagePath = "gopkg.in/kothar/go-backblaze.v0"; + fetch = { + type = "git"; + url = "https://github.com/kothar/go-backblaze"; + rev = "7594ed38700f5ca3fc7da8f8c7b91b0526ee66f2"; + sha256 = "0zgd5jwwdrqrnx828yxkzywh1dnwqi9y8pmq0vsndi6bwdp6dvkb"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "508b5eb18ee2f667ce06235ed383647038e2afc5"; + sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; + }; + } +] \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 078d5f6517dc..8289a3d071b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3207,6 +3207,8 @@ in vorta = python3Packages.callPackage ../applications/backup/vorta { }; + utahfs = callPackage ../applications/networking/utahfs { }; + wallutils = callPackage ../tools/graphics/wallutils { }; wev = callPackage ../tools/misc/wev { }; From d8956ba50ed4019dba9cddaa70822a8784525851 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 Jul 2020 10:45:49 +0000 Subject: [PATCH 3265/3452] tebreak: 1.0 -> 1.1 --- pkgs/applications/science/biology/tebreak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/tebreak/default.nix b/pkgs/applications/science/biology/tebreak/default.nix index 9ff81944f6a7..07669d097a44 100644 --- a/pkgs/applications/science/biology/tebreak/default.nix +++ b/pkgs/applications/science/biology/tebreak/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "tebreak"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "adamewing"; repo = "tebreak"; rev = version; - sha256 = "194av17wz66n4zxyi56mbkik31j2wmkly5i9qmxgaxymhavzi3kq"; + sha256 = "13mgh775d8hkl340923lfwwm4r5ps70girn8d6wgfxzwzxylz8iz"; }; nativeBuildInputs = [ findutils python3Packages.cython ]; From 87accbfb901c8f217de36ee4462d965a57f8b658 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 Jul 2020 11:01:18 +0000 Subject: [PATCH 3266/3452] terragrunt: 0.23.23 -> 0.23.31 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 74f576b9a394..d65e15373b32 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.23.23"; + version = "0.23.31"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "1087zs5k73rhhzni8zdj950aw4nsc7mqjj8lgdcc8y3yx8p8y5hy"; + sha256 = "1wpb749hc6pbmxcba1k4yrwcg8547rnsskxb45bzqyqyj1nj775s"; }; vendorSha256 = "1xn7c6y32vpanqvf1sfpw6bs73dbjniavjbf00j0vx83bfyklsr4"; From 2fea6a2a64735145779b440b37fed67fcc69a0a1 Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Sat, 4 Jul 2020 20:41:03 +1000 Subject: [PATCH 3267/3452] aws-lambda-builders: 0.8.0 -> 0.9.0 --- .../python-modules/aws-lambda-builders/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 9979ccdd3c07..fdce47b25946 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -2,22 +2,24 @@ , buildPythonPackage , fetchFromGitHub , six +, pathlib , pytest , mock , parameterized +, isPy27 , isPy35 }: buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "0.8.0"; + version = "0.9.0"; # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "1akiv92cd7ciky0aay94lh9azr73jajn0x0x6ywaf3qm5c4hyvys"; + sha256 = "0cgb0hwf4xg5dmm32wwlxqy7a77jw6gpnj7v8rq5948hsy2sfrcp"; }; # Package is not compatible with Python 3.5 @@ -25,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six - ]; + ] ++ lib.optionals isPy27 [ pathlib ]; checkInputs = [ pytest From c0e9bc1cf8b937435d12d081e1291ab9263f470e Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Sat, 4 Jul 2020 20:45:43 +1000 Subject: [PATCH 3268/3452] aws-sam-cli: 0.44.0 -> 1.0.0rc1 --- .../development/tools/aws-sam-cli/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 8af26a06c5c2..c2ebf2235084 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -1,4 +1,5 @@ -{ lib +{ fetchFromGitHub +, lib , python , enableTelemetry ? false }: @@ -6,6 +7,14 @@ let py = python.override { packageOverrides = self: super: { + aws-sam-translator = super.aws-sam-translator.overridePythonAttrs (oldAttrs: rec { + version = "1.25.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "08756yl5lpqgrpr80f2b6bdcgygr37l6q1yygklcg9hz4yfpccav"; + }; + }); + flask = super.flask.overridePythonAttrs (oldAttrs: rec { version = "1.0.2"; src = oldAttrs.src.override { @@ -30,11 +39,11 @@ with py.pkgs; buildPythonApplication rec { pname = "aws-sam-cli"; - version = "0.44.0"; + version = "1.0.0rc1"; src = fetchPypi { inherit pname version; - sha256 = "0r3m41xjmg8m2jwsqwc9kdkcs3xbz8dsl240ybwbnr7rp29pnirf"; + sha256 = "011b334gdvd9lhqia8c952q3cmzj99vik680180nbp0qh2xw6zpf"; }; # Tests are not included in the PyPI package @@ -66,9 +75,11 @@ buildPythonApplication rec { # fix over-restrictive version bounds postPatch = '' substituteInPlace requirements/base.txt \ + --replace "boto3~=1.13.0, >=1.13.0" "boto3~=1.14.3" \ --replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" \ --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \ - --replace "tomlkit==0.5.8" "tomlkit~=0.5.8" \ + --replace "jmespath~=0.9.5" "jmespath~=0.10.0" \ + --replace "tomlkit==0.5.8" "tomlkit~=0.6.0" \ --replace "requests==2.22.0" "requests~=2.22" ''; From 0b159862c947923d21d75c889a1f0f3961293905 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 Jul 2020 11:56:16 +0000 Subject: [PATCH 3269/3452] watchexec: 1.13.1 -> 1.14.0 --- pkgs/tools/misc/watchexec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 01993ebed6d2..8e3db232feb0 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1idyr3h9dhb67xlhd5bsa7866i75w4jzjbbchq6fd9lqd488bsj7"; + sha256 = "0nvd8x60nkk8izqy8m8m1fi0x48s9sjh4zfl8d2ig46lqc8n5cpm"; }; - cargoSha256 = "14lkvfr1yz8g15ffc8j1vvy7q1nwqbkhz2y0fnskwqfzpd17f9gl"; + cargoSha256 = "08pv7nr471apzy77da1pffdmx2dgf5mbj09302cfmf8sj49saal6"; nativeBuildInputs = [ installShellFiles ]; From 26913cebb038914f45b817c263a49ea70206ef9c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 4 Jul 2020 12:19:30 +0000 Subject: [PATCH 3270/3452] xits-math: 1.301 -> 1.302 --- pkgs/data/fonts/xits-math/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix index db0ed425dee2..dfb38973edd9 100644 --- a/pkgs/data/fonts/xits-math/default.nix +++ b/pkgs/data/fonts/xits-math/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xits-math"; - version = "1.301"; + version = "1.302"; src = fetchFromGitHub { owner = "alif-type"; repo = "xits"; rev = "v${version}"; - sha256 = "043g0gnjc7wn1szvrs0rc1vvrq1qmhqh45b0y2kwrlxsgprpv8ll"; + sha256 = "1x3r505dylz9rz8dj98h5n9d0zixyxmvvhnjnms9qxdrz9bxy9g1"; }; nativeBuildInputs = (with python3Packages; [ python fonttools fontforge ]); From e74755c422180bfa0ca2f74eb11f32e20d4030ee Mon Sep 17 00:00:00 2001 From: Chuck Date: Tue, 28 Jan 2020 15:08:56 -0800 Subject: [PATCH 3271/3452] nixos/qemu-vm: Don't assume boot drive is always vdb --- nixos/modules/virtualisation/qemu-vm.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 7507db40578e..5a502c361808 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -46,6 +46,13 @@ let description = "Extra options passed to device flag."; }; + name = mkOption { + type = types.nullOr types.str; + default = null; + description = + "A name for the drive. Must be unique in the drives list. Not passed to qemu."; + }; + }; }; @@ -84,6 +91,14 @@ let else "/dev/vd${letter}"; + lookupDriveDeviceName = driveName: driveList: + (findSingle (drive: drive.name == driveName) + (throw "Drive ${driveName} not found") + (throw "Multiple drives named ${driveName}") driveList).device; + + addDeviceNames = + imap1 (idx: drive: drive // { device = driveDeviceName idx; }); + # Shell script to start the VM. startVM = '' @@ -406,6 +421,7 @@ in mkOption { type = types.listOf (types.submodule driveOpts); description = "Drives passed to qemu."; + apply = addDeviceNames; }; diskInterface = @@ -552,12 +568,14 @@ in virtualisation.qemu.drives = mkMerge [ [{ + name = "root"; file = "$NIX_DISK_IMAGE"; driveExtraOpts.cache = "writeback"; driveExtraOpts.werror = "report"; }] (mkIf cfg.useBootLoader [ { + name = "boot"; file = "$TMPDIR/disk.img"; driveExtraOpts.media = "disk"; deviceExtraOpts.bootindex = "1"; @@ -610,7 +628,7 @@ in }; } // optionalAttrs cfg.useBootLoader { "/boot" = - { device = "${driveDeviceName 1}2"; + { device = "${lookupDriveDeviceName "boot" cfg.qemu.drives}2"; fsType = "vfat"; options = [ "ro" ]; noCheck = true; # fsck fails on a r/o filesystem From 850d7d1790d4abc0638466973c78a2053b97d2f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Sat, 4 Jul 2020 15:15:26 +0200 Subject: [PATCH 3272/3452] nixos/*: wether -> whether --- nixos/modules/services/computing/slurm/slurm.nix | 4 ++-- nixos/modules/services/web-apps/codimd.nix | 2 +- nixos/modules/system/boot/kernel_config.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 050872e933fb..705390a21d4e 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -67,7 +67,7 @@ in type = types.bool; default = false; description = '' - Wether to enable the slurm control daemon. + Whether to enable the slurm control daemon. Note that the standard authentication method is "munge". The "munge" service needs to be provided with a password file in order for slurm to work properly (see services.munge.password). @@ -135,7 +135,7 @@ in type = types.bool; default = false; description = '' - Wether to provide a slurm.conf file. + Whether to provide a slurm.conf file. Enable this option if you do not run a slurm daemon on this host (i.e. server.enable and client.enable are false) but you still want to run slurm commands from this host. diff --git a/nixos/modules/services/web-apps/codimd.nix b/nixos/modules/services/web-apps/codimd.nix index 751f81649ddb..cd8e9af5302c 100644 --- a/nixos/modules/services/web-apps/codimd.nix +++ b/nixos/modules/services/web-apps/codimd.nix @@ -385,7 +385,7 @@ in type = types.bool; default = true; description = '' - Wether to enable email registration. + Whether to enable email registration. ''; }; allowGravatar = mkOption { diff --git a/nixos/modules/system/boot/kernel_config.nix b/nixos/modules/system/boot/kernel_config.nix index 85bd420e3044..783685c9dfe4 100644 --- a/nixos/modules/system/boot/kernel_config.nix +++ b/nixos/modules/system/boot/kernel_config.nix @@ -54,7 +54,7 @@ let type = types.bool // { merge = mergeFalseByDefault; }; default = false; description = '' - Wether option should generate a failure when unused. + Whether option should generate a failure when unused. Upon merging values, mandatory wins over optional. ''; }; From 5bb0b7272032d64dc450929d3e116dec67d7131c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Gr=C3=A4fenstein?= Date: Sat, 4 Jul 2020 15:20:41 +0200 Subject: [PATCH 3273/3452] nixos/*: wheter -> whether --- nixos/modules/services/security/tor.nix | 2 +- nixos/modules/services/web-apps/codimd.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 18c105b2f576..b33e905c67de 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -159,7 +159,7 @@ in type = types.bool; default = false; description = '' - Wheter to enable Tor control socket. Control socket is created + Whether to enable Tor control socket. Control socket is created in ${torRunDirectory}/control ''; }; diff --git a/nixos/modules/services/web-apps/codimd.nix b/nixos/modules/services/web-apps/codimd.nix index cd8e9af5302c..ab922a38e5c6 100644 --- a/nixos/modules/services/web-apps/codimd.nix +++ b/nixos/modules/services/web-apps/codimd.nix @@ -93,7 +93,7 @@ in type = types.bool; default = true; description = '' - Wheter to enable HSTS if HTTPS is also enabled. + Whether to enable HSTS if HTTPS is also enabled. ''; }; maxAgeSeconds = mkOption { From c886cb026cf7a5cce884719b45705dc1a1f7cc4a Mon Sep 17 00:00:00 2001 From: oxalica Date: Sat, 4 Jul 2020 22:25:22 +0800 Subject: [PATCH 3274/3452] typora: 0.9.73 -> 0.9.89 --- pkgs/applications/editors/typora/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 583229eb8684..1418734fba1a 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , makeWrapper -, electron_5 +, electron_8 , dpkg , gtk3 , glib @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "typora"; - version = "0.9.73"; + version = "0.9.89"; src = fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "1fgcb4bx5pw8ah5j30d38gw7qi1cmqarfhvgdns9f2n0d57bvvw3"; + sha256 = "0gk8j13z1ymad34zzcy4vqwyjgd5khgyw5xjj9rbzm5v537kqmx6"; }; nativeBuildInputs = [ @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { gtk3 ]; - unpackPhase = "dpkg-deb -x $src ."; + # The deb contains setuid permission on `chrome-sandbox`, which will actually not get installed. + unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; dontWrapGApps = true; @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_5}/bin/electron $out/bin/typora \ + makeWrapper ${electron_8}/bin/electron $out/bin/typora \ --add-flags $out/share/typora \ "''${gappsWrapperArgs[@]}" \ ${lib.optionalString withPandoc ''--prefix PATH : "${lib.makeBinPath [ pandoc ]}"''} \ From 2e050546b86be835f3f93443468645641034ee6d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 4 Jul 2020 07:42:19 -0700 Subject: [PATCH 3275/3452] google-music-scripts: fix build --- .../audio/google-music-scripts/default.nix | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/audio/google-music-scripts/default.nix b/pkgs/tools/audio/google-music-scripts/default.nix index f95dcc8bb6dd..272cf9025392 100644 --- a/pkgs/tools/audio/google-music-scripts/default.nix +++ b/pkgs/tools/audio/google-music-scripts/default.nix @@ -1,19 +1,36 @@ { lib, python3 }: -with python3.pkgs; +let + py = python3.override { + packageOverrides = self: super: { + loguru = super.loguru.overridePythonAttrs (oldAttrs: rec { + version = "0.4.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0j47cg3gi8in4z6z4w3by6x02mpkkfl78gr85xjn5rg0nxiz7pfm"; + }; + }); + }; + }; + +in + +with py.pkgs; buildPythonApplication rec { pname = "google-music-scripts"; - version = "4.3.0"; + version = "4.5.0"; src = fetchPypi { inherit pname version; - sha256 = "0dykjhqklbpqr1lvls0bgf6xkwvslj37lx4q8522hjbs150pwjmq"; + sha256 = "0apwgj86whrc077dfymvyb4qwj19bawyrx49g4kg364895v0rbbq"; }; + # pendulum pinning was to prevent PEP517 from trying to build from source postPatch = '' substituteInPlace setup.py \ - --replace "audio-metadata>=0.8,<0.9" "audio-metadata" + --replace "tomlkit>=0.5,<0.6" "tomlkit" \ + --replace "pendulum>=2.0,<=3.0,!=2.0.5,!=2.1.0" "pendulum" ''; propagatedBuildInputs = [ From ff5aaa33e9844fe825bb12b031e61e3dc2b75f89 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 4 Jul 2020 07:32:01 -0700 Subject: [PATCH 3276/3452] python3Packages.aiorun: fix build --- pkgs/development/python-modules/aiorun/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index 8eda59a9abf0..0cb7a441015e 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 +, pygments , pytest , pytestcov , uvloop @@ -21,6 +22,10 @@ buildPythonPackage rec { sha256 = "0wcj8prkijb889ic8n6varms7xkwy028hhw0imgkd1i0p64lm3m4"; }; + propagatedBuildInputs = [ + pygments + ]; + checkInputs = [ pytest pytestcov From 7e6e87e7eb79437c4d12877d620fb7ee043fd58f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 4 Jul 2020 08:03:58 -0700 Subject: [PATCH 3277/3452] python3Packages.pipdate: fix dependency management --- pkgs/development/python-modules/pipdate/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index 4e730df1c91d..5cc5789144f6 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -1,8 +1,10 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , isPy27 , appdirs +, importlib-metadata , requests , pytest }: @@ -20,8 +22,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ appdirs requests + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; + # can be removed when https://github.com/nschloe/pipdate/pull/41 gets merged + postPatch = '' + substituteInPlace setup.cfg \ + --replace "importlib_metadata" "importlib_metadata; python_version < \"3.8\"" + ''; + checkInputs = [ pytest ]; From ee63ff7d4e7fda7d499e163297e1c7f1adea891d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 4 Jul 2020 08:13:22 -0700 Subject: [PATCH 3278/3452] soil: fix build --- pkgs/development/libraries/soil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/soil/default.nix b/pkgs/development/libraries/soil/default.nix index 10a60c36987c..cf0896170c17 100644 --- a/pkgs/development/libraries/soil/default.nix +++ b/pkgs/development/libraries/soil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mesa, libX11 }: +{ stdenv, fetchurl, unzip, mesa, libX11, libGL }: stdenv.mkDerivation { name = "soil"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "00gpwp9dldzhsdhksjvmbhsd2ialraqbv6v6dpikdmpncj6mnc52"; }; - buildInputs = [ unzip mesa libX11 ]; + buildInputs = [ unzip mesa libGL libX11 ]; sourceRoot = "Simple OpenGL Image Library/projects/makefile"; preBuild = "mkdir obj"; From f0c7019005d2227532c8813c250b5f2450c080a4 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Wed, 1 Jul 2020 20:22:55 +0200 Subject: [PATCH 3279/3452] python3Packages.testfixtures: fix build (ignore failing tests) Signed-off-by: Sirio Balmelli Co-authored-by: Joh --- .../python-modules/testfixtures/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index b3db882c82b2..7c875ec05918 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy27 +{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy27 , mock, pytest, sybil, zope_component, twisted }: buildPythonPackage rec { @@ -15,12 +15,16 @@ buildPythonPackage rec { doCheck = !isPy27; checkPhase = '' # django is too much hasle to setup at the moment - pytest -W ignore::DeprecationWarning --ignore=testfixtures/tests/test_django testfixtures/tests + pytest -W ignore::DeprecationWarning \ + --ignore=testfixtures/tests/test_django \ + -k 'not (log_then_patch or our_wrap_dealing_with_mock_patch or patch_with_dict)' \ + testfixtures/tests ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Simplistix/testfixtures"; description = "A collection of helpers and mock objects for unit tests and doc tests"; license = licenses.mit; + maintainers = with maintainers; [ siriobalmelli ]; }; } From 01f1f3d5d021c33ccef79dcd990f792c3c69f1c0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 4 Jul 2020 08:32:41 -0700 Subject: [PATCH 3280/3452] python2Packages.prawcore: disable on python2 no longer compatible with python2's urllib ``` prawcore/exceptions.py:2: in from urllib.parse import urlparse E ImportError: No module named parse builder for '/nix/store/3l1rqygq58hbwyzn6fqx8x4djbmzgggh-python2.7-prawcore-1.4.0.drv' failed with exit code ``` --- pkgs/development/python-modules/prawcore/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index aebe5766e9ce..39e3bb239c6a 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, isPy27 , requests , testfixtures, mock, requests_toolbelt , betamax, betamax-serializers, betamax-matchers, pytest @@ -7,6 +7,7 @@ buildPythonPackage rec { pname = "prawcore"; version = "1.4.0"; + disabled = isPy27; # see https://github.com/praw-dev/prawcore/pull/101 src = fetchPypi { inherit pname version; From 93e7581c9a85741b508b8ed0551d5912eed23881 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 4 Jul 2020 08:39:36 -0700 Subject: [PATCH 3281/3452] python3Packages.zope_contenttype: fix build --- pkgs/development/python-modules/zope_contenttype/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope_contenttype/default.nix index d3cd69943a75..b1792d718543 100644 --- a/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/pkgs/development/python-modules/zope_contenttype/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, zope_testrunner }: buildPythonPackage rec { @@ -12,12 +13,12 @@ buildPythonPackage rec { sha256 = "c12d929c67ab3eaef9b8a7fba3d19cce8500c8fd25afed8058c8e15f324cbd5b"; }; + checkInputs = [ zope_testrunner ]; + meta = with stdenv.lib; { homepage = "https://github.com/zopefoundation/zope.contenttype"; description = "A utility module for content-type (MIME type) handling"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; - broken = true; }; - } From ba5559fd7af38b3528518b6477315100cb39f160 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 4 Jul 2020 08:46:11 -0700 Subject: [PATCH 3282/3452] pythonPackages.detox: remove --- .../python-modules/detox/default.nix | 30 ------------------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/development/python-modules/detox/default.nix diff --git a/pkgs/development/python-modules/detox/default.nix b/pkgs/development/python-modules/detox/default.nix deleted file mode 100644 index 5353d4361e35..000000000000 --- a/pkgs/development/python-modules/detox/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pytest, tox, py, eventlet }: - -buildPythonPackage rec { - pname = "detox"; - version = "0.19"; - - src = fetchPypi { - inherit pname version; - sha256 = "e650f95f0c7f5858578014b3b193e5dac76c89285c1bbe4bae598fd641bf9cd3"; - }; - - buildInputs = [ pytest ]; - propagatedBuildInputs = [ tox py eventlet ]; - - checkPhase = '' - py.test - ''; - - # eventlet timeout, and broken invokation 3.5 - doCheck = false; - - meta = with stdenv.lib; { - description = "What is detox?"; - homepage = "https://bitbucket.org/hpk42/detox"; - license = licenses.mit; - # detox is unmaintained and incompatible with tox > 3.6 - broken = true; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4021244995f9..498425ee0f51 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2459,7 +2459,7 @@ in { pretend = callPackage ../development/python-modules/pretend { }; - detox = callPackage ../development/python-modules/detox { }; + detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 pbkdf2 = callPackage ../development/python-modules/pbkdf2 { }; From e747fc91fa367cf7a4b578f945313d7976677a36 Mon Sep 17 00:00:00 2001 From: betaboon Date: Sat, 4 Jul 2020 18:05:36 +0200 Subject: [PATCH 3283/3452] python3.pkgs.pyls-black: 0.4.4 -> 0.4.6 --- pkgs/development/python-modules/pyls-black/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix index 478b08b26471..c59a67606ee6 100644 --- a/pkgs/development/python-modules/pyls-black/default.nix +++ b/pkgs/development/python-modules/pyls-black/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "pyls-black"; - version = "0.4.4"; + version = "0.4.6"; src = fetchFromGitHub { owner = "rupert"; repo = "pyls-black"; rev = "v${version}"; - sha256 = "1ynynay9g6yma39szbzf15ypq3c72fg1i0kjmq1dwxarj68i2gf9"; + sha256 = "0cjf0mjn156qp0x6md6mncs31hdpzfim769c2lixaczhyzwywqnj"; }; disabled = !isPy3k; @@ -27,9 +27,6 @@ buildPythonPackage rec { homepage = "https://github.com/rupert/pyls-black"; description = "Black plugin for the Python Language Server"; license = licenses.mit; - # Not compatible with 0.33.1 - # https://github.com/rupert/pyls-black/issues/24 - broken = true; # since 2020-06-16 maintainers = [ maintainers.mic92 ]; }; } From 8842a387efbe41d51be90430815b982d6ceb1455 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 4 Jul 2020 18:32:33 +0200 Subject: [PATCH 3284/3452] mautrix-whatsapp: 0.1.1 -> 0.1.2 https://github.com/tulir/mautrix-whatsapp/releases/tag/v0.1.2 --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index bb129063e26d..00a726cf80e4 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; rev = "v${version}"; - sha256 = "0cjgyn311zvpdsagyndkw89bvdrcli5kqznss8dsh05wrllxp3x4"; + sha256 = "1df6m1jjv8la6qcz3c5a6pw0jk81f1khx3d9q17d6v3ihrki8krk"; }; buildInputs = [ olm ]; - vendorSha256 = "0980p9x62iav6j1w36w2i8pqyv6amnx4ngrgylq2vkjlcgihl2i8"; + vendorSha256 = "1mgjfs9q3id36qb012l652ljcrvjaryjf6n4ry57k09gixla8wx9"; overrideModAttrs = _: { postBuild = '' From 1c98b0781dfcf79556442cae1e21fa137c411115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Sat, 4 Jul 2020 18:55:52 +0200 Subject: [PATCH 3285/3452] evince: 3.36.6 -> 3.36.7 --- pkgs/desktops/gnome-3/core/evince/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index d1047b37a727..47edf2f92c51 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.36.6"; + version = "3.36.7"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1c4ddlx12jm2cq0h0kfqwqncq3d8grvqhvpb29z86z7wqqhrpklm"; + sha256 = "0clg9fhgjyj23mmcmw7dp512wzgv5m18fppn05qf1frz7r11mmk5"; }; postPatch = '' From ab35379cdb6919cd77000e175dc6e6fa23eb4e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 3 Jul 2020 12:53:27 +0200 Subject: [PATCH 3286/3452] evince: remove myself from meta.maintainers That reflects reality of the past couple of years. I used to spend really large fraction of my time reading PDFs but not anymore. Fortunately there seem to be enough other maintainers... --- pkgs/desktops/gnome-3/core/evince/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 47edf2f92c51..11a5bcbd0f78 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -128,6 +128,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; - maintainers = teams.gnome.members ++ [ maintainers.vcunat ]; + maintainers = teams.gnome.members; }; } From e97b8b629c208de714674a5074af1aeabbcf256e Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 5 Jul 2020 02:59:59 +0900 Subject: [PATCH 3287/3452] kaggle: add simple check to make sure it's not trivially broken Co-authored-by: Jon --- pkgs/development/python-modules/kaggle/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix index 7b21f984ceb6..cccd553a31f3 100644 --- a/pkgs/development/python-modules/kaggle/default.nix +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -36,7 +36,13 @@ buildPythonPackage rec { ]; # Tests try to access the network. - doCheck = false; + checkPhase = '' + export HOME="$TMP" + mkdir -p "$HOME/.kaggle/" + echo '{"username":"foobar","key":"00000000000000000000000000000000"}' > "$HOME/.kaggle/kaggle.json" + $out/bin/kaggle --help > /dev/null + ''; + pythonImportsCheck = [ "kaggle" ]; meta = with lib; { description = "Official API for https://www.kaggle.com, accessible using a command line tool implemented in Python 3"; @@ -45,4 +51,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ cdepillabout ]; }; } - From ee33c731b59fba833b7d62d47784f8e924e1d551 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sat, 4 Jul 2020 00:13:09 -0700 Subject: [PATCH 3288/3452] zoxide: 0.4.1 -> 0.4.3 https://github.com/ajeetdsouza/zoxide/compare/v0.4.1...v0.4.3 Also removes unnecessary `rec` and `stdenv`. --- pkgs/tools/misc/zoxide/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index ee15786d40cc..f6c018f4e05a 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -1,28 +1,31 @@ -{ stdenv +{ lib , fetchFromGitHub , rustPlatform -, withFzf ? true, fzf +, withFzf ? true +, fzf }: - -rustPlatform.buildRustPackage rec { +let + version = "0.4.3"; +in +rustPlatform.buildRustPackage { pname = "zoxide"; - version = "0.4.1"; + inherit version; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "1zfk9y5f12h2d5zwf2z8c95xwhbhc6ayv971875fbxgz1nd8vqb6"; + sha256 = "1ghdal6pqkp56rqawhj26ch1x4cvnjj032xz3626aiddqgn134zj"; }; - postPatch = stdenv.lib.optionalString withFzf '' + postPatch = lib.optionalString withFzf '' substituteInPlace src/fzf.rs \ --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "0z0p3cxxazw19bmk3zw7z2q93p00ywsa2cz1jhy78mn5pq1v95rd"; + cargoSha256 = "0klnjmda77bq9i9f0rz48jzaw4rcf7hafcjjpb0i570d7hlxnwsr"; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; license = with licenses; [ mit ]; From 29c538392c00713f2200fae59fd50d5da19a74b9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 4 Jul 2020 12:17:46 +0300 Subject: [PATCH 3289/3452] stale-bot: Make it's messages more instructive As somewhat discussed at: https://git.io/JJkRa, make the bot's message a bit more instructive, and clearer as for what it will and won't do, so random contributors will have a better idea what this is about. Also: Split stale issues' and PRs' messages because each should suggest different actions to do. --- .github/stale.yml | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/.github/stale.yml b/.github/stale.yml index 1cf5014cfb37..afa307926fe5 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -9,17 +9,33 @@ exemptLabels: # Label to use when marking an issue as stale staleLabel: "2.status: stale" # Comment to post when marking an issue as stale. Set to `false` to disable -markComment: | - Thank you for your contributions. +pulls: + markComment: | + Hello, I'm a bot and I thank you in the name of the community for your contributions. - This has been automatically marked as stale because it has had no activity for 180 days. + Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human. - If this is still important to you, we ask that you leave a comment below. Your comment can be as simple as "still important to me". This lets people see that at least one person still cares about this. Someone will have to do this at most twice a year if there is no other activity. + If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do: - Here are suggestions that might help resolve this more quickly: + If you received an approval by an unpriviledged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using [Git blame](https://git-scm.com/docs/git-blame) on the relevant files, or via [GitHub's web interface](https://docs.github.com/en/github/managing-files-in-a-repository/tracking-changes-in-a-file). You can see if someone's a member of the [nixpkgs-committers](https://github.com/orgs/NixOS/teams/nixpkgs-committers) team, by hovering with the mouse over their username on the web interface, or by searching them directly on [the list](https://github.com/orgs/NixOS/teams/nixpkgs-committers). + + If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use [Git blame](https://git-scm.com/docs/git-blame) on the relevant files, or [GitHub's web interface](https://docs.github.com/en/github/managing-files-in-a-repository/tracking-changes-in-a-file) to find someone who touched the relevant files in the past. + + If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always [officially request them for a review](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review), or just @ mention them and say you've addressed their comments. + + Lastly, you can always ask for help at [our Discourse Forum](https://discourse.nixos.org/), or more specifically, [at this thread](https://discourse.nixos.org/t/prs-in-distress/3604) or at [#nixos' IRC channel](https://webchat.freenode.net/#nixos). + +issues: + markComment: | + Hello, I'm a bot and I thank you in the name of the community for opening this issue. + + To help our human contributors focus on the most-relevant reports, I check up on old issues to see if they're still relevant. This issue has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human. + + The community would appreciate your effort in checking if the issue is still valid. If it isn't, please close it. + + If the issue persists, and you'd like to remove the stale label, you simply need to leave a comment. Your comment can be as simple as "still important to me". If you'd like it to get more attention, you can ask for help by searching for maintainers and people that previously touched related code and @ mention them in a comment. You can use [Git blame](https://git-scm.com/docs/git-blame) or [GitHub's web interface](https://docs.github.com/en/github/managing-files-in-a-repository/tracking-changes-in-a-file) on the relevant files to find them. + + Lastly, you can always ask for help at [our Discourse Forum](https://discourse.nixos.org/) or at [#nixos' IRC channel](https://webchat.freenode.net/#nixos). - 1. Search for maintainers and people that previously touched the related code and @ mention them in a comment. - 2. Ask on the [NixOS Discourse](https://discourse.nixos.org/). - 3. Ask on the [#nixos channel](irc://irc.freenode.net/#nixos) on [irc.freenode.net](https://freenode.net). # Comment to post when closing a stale issue. Set to `false` to disable closeComment: false From 67a1c36929cbbca7eab50469d4689cdde9cc153d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 4 Jul 2020 23:01:07 +0200 Subject: [PATCH 3290/3452] cargo-watch: 7.4.1 -> 7.5.0 https://github.com/passcod/cargo-watch/releases/tag/v7.5.0 Also fixes the `aarch64`-build: https://hydra.nixos.org/build/123187262 --- pkgs/development/tools/rust/cargo-watch/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 850b6d2e1e71..91f259236099 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -1,23 +1,25 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust }: rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "7.4.1"; + version = "7.5.0"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "1nq7sfdxvqldj94laz562y4cvgagm67b6a5b7bzxdip0sf1l11f8"; + sha256 = "181v922nx8152ymszig1kw6y0mnix6si1zfnv6vqgr5r53pwkbc1"; }; - cargoSha256 = "1rjx3k8li8ck5cdygm4pd2i5wkslr6d9z9vl2vp0x6hqv1gcv5zh"; + cargoSha256 = "1abhzi1396x8lnxvakj34nysl3ybvsaf21j678wzaqwj16sd3w3d"; buildInputs = lib.optional stdenv.isDarwin CoreServices; # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) - checkPhase = "PATH=target/debug:$PATH cargo test"; + preCheck = '' + export PATH="$(pwd)/target/${rust.toRustTarget stdenv.hostPlatform}/release:$PATH" + ''; meta = with lib; { description = "A Cargo subcommand for watching over Cargo project's source"; From 52987ec8d36cf3d464dd8bbe1571d7a827c5855a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 4 Jul 2020 16:20:00 -0500 Subject: [PATCH 3291/3452] libdigidoc: enable on darwin --- pkgs/development/libraries/libdigidoc/default.nix | 11 +++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index 0acab6023312..5936853dcbcb 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2 }: +{ stdenv, fetchurl, cmake, openssl, pcsclite, opensc, libxml2, Security }: stdenv.mkDerivation rec { @@ -12,13 +12,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl pcsclite opensc libxml2 ]; + buildInputs = [ openssl pcsclite opensc libxml2 ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-DFRAMEWORK=OFF" ]; meta = with stdenv.lib; { description = "Library for creating DigiDoc signature files"; - homepage = "http://www.id.ee/"; + homepage = "https://github.com/open-eid/libdigidoc"; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.jagajaga ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f635f7a81eb1..4f25dc421135 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12901,7 +12901,9 @@ in libGL = null; }; - libdigidoc = callPackage ../development/libraries/libdigidoc { }; + libdigidoc = callPackage ../development/libraries/libdigidoc { + inherit (darwin.apple_sdk.frameworks) Security; + }; libdigidocpp = callPackage ../development/libraries/libdigidocpp { }; From dc2dfe277ff18cd941493a520a098191c82cac86 Mon Sep 17 00:00:00 2001 From: Ludovic Claude Date: Sat, 4 Jul 2020 22:16:53 +0200 Subject: [PATCH 3292/3452] jd-gui: pin gradle to 5.X in build --- pkgs/tools/security/jd-gui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index af88fd6270f4..c4b7706c266b 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jre, jdk, gradle, makeDesktopItem, perl, writeText, runtimeShell }: +{ stdenv, fetchFromGitHub, jre, jdk, gradle_5, makeDesktopItem, perl, writeText, runtimeShell }: let pname = "jd-gui"; @@ -15,7 +15,7 @@ let name = "${pname}-deps"; inherit src; - nativeBuildInputs = [ jdk perl gradle ]; + nativeBuildInputs = [ jdk perl gradle_5 ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d); @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { inherit pname version src; name = "${pname}-${version}"; - nativeBuildInputs = [ jdk gradle ]; + nativeBuildInputs = [ jdk gradle_5 ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) From 5e759553aef4f681d4dd16ca966e99ca1621bdba Mon Sep 17 00:00:00 2001 From: Marcus Boyd Date: Thu, 25 Jun 2020 21:38:50 +0930 Subject: [PATCH 3293/3452] pythonPackages.pylint: propagate toml --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 1986dd4936c1..ccb764398165 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { sha256 = "b95e31850f3af163c2283ed40432f053acbc8fc6eba6a069cb518d9dbf71848c"; }; - nativeBuildInputs = [ pytestrunner toml ]; + nativeBuildInputs = [ pytestrunner ]; checkInputs = [ pytestCheckHook pytest-benchmark ]; - propagatedBuildInputs = [ astroid isort mccabe ]; + propagatedBuildInputs = [ astroid isort mccabe toml ]; postPatch = lib.optionalString stdenv.isDarwin '' # Remove broken darwin test From db1835a5993c7aab8a840ee68bcb6422f3d91ac3 Mon Sep 17 00:00:00 2001 From: Marcus Boyd Date: Fri, 26 Jun 2020 19:50:23 +0930 Subject: [PATCH 3294/3452] cq-editor: use python37Packages --- 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 078d5f6517dc..161c9d5d0999 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19249,7 +19249,9 @@ in coyim = callPackage ../applications/networking/instant-messengers/coyim {}; - cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { }; + cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { + python3Packages = python37Packages; + }; cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { }; From 6eeb612a9b6160df2e110021d93bef3e6e538b9a Mon Sep 17 00:00:00 2001 From: Ludovic Claude Date: Fri, 3 Jul 2020 00:40:22 +0200 Subject: [PATCH 3295/3452] gradle: 5.6.4 -> 6.5.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Daniël de Kok Use https for all urls fix version for native library pin gradle for jd-gui --- .../tools/build-managers/gradle/default.nix | 16 +++++++++++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index b5215611c0c3..1d5ef75fb228 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -51,14 +51,24 @@ rec { }; }; - gradle_latest = gradle_5_6; + gradle_latest = gradle_6_5; + + gradle_6_5 = gradleGen rec { + name = "gradle-6.5.1"; + nativeVersion = "0.22-milestone-3"; + + src = fetchurl { + url = "https://services.gradle.org/distributions/${name}-bin.zip"; + sha256 = "0jmmipjh4fbsn92zpifa5cqg5ws2a4ha0s4jzqhrg4zs542x79sh"; + }; + }; gradle_5_6 = gradleGen rec { name = "gradle-5.6.4"; nativeVersion = "0.18"; src = fetchurl { - url = "http://services.gradle.org/distributions/${name}-bin.zip"; + url = "https://services.gradle.org/distributions/${name}-bin.zip"; sha256 = "1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d"; }; }; @@ -68,7 +78,7 @@ rec { nativeVersion = "0.14"; src = fetchurl { - url = "http://services.gradle.org/distributions/${name}-bin.zip"; + url = "https://services.gradle.org/distributions/${name}-bin.zip"; sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 161c9d5d0999..f635f7a81eb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10598,6 +10598,7 @@ in gradle_4_10 = res.gradleGen.gradle_4_10; gradle_4 = gradle_4_10; gradle_5 = res.gradleGen.gradle_5_6; + gradle_6 = res.gradleGen.gradle_6_5; gperf = callPackage ../development/tools/misc/gperf { }; # 3.1 changed some parameters from int to size_t, leading to mismatches. From 088c4c09ed4e8e9d1c7df739b03e552da8b76a4d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 5 Jul 2020 01:59:08 +0200 Subject: [PATCH 3296/3452] python3Packages.docker: 4.2.1 -> 4.2.2 https://github.com/docker/docker-py/releases/tag/4.2.2 --- pkgs/development/python-modules/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 9c788bde123d..fd43e8cf77c4 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "docker"; - version = "4.2.1"; + version = "4.2.2"; src = fetchPypi { inherit pname version; - sha256 = "380a20d38fbfaa872e96ee4d0d23ad9beb0f9ed57ff1c30653cbeb0c9c0964f2"; + sha256 = "0m4vgk2831yfdjy8vqyvvfnmwv270a44z358frdzb672wzfbmvi6"; }; nativeBuildInputs = lib.optional isPy27 mock; From 9e924bd046e06685105c5ee4d5be024f5ce3299d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 5 Jul 2020 02:00:18 +0200 Subject: [PATCH 3297/3452] docker-compose: 1.25.5 -> 1.26.2 https://github.com/docker/compose/releases/tag/1.26.0 https://github.com/docker/compose/releases/tag/1.26.1 https://github.com/docker/compose/releases/tag/1.26.2 --- .../virtualization/docker-compose/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index 71359467c5c6..cf11b6932931 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -4,16 +4,16 @@ , pyyaml, backports_ssl_match_hostname, colorama, docopt , dockerpty, docker, ipaddress, jsonschema, requests , six, texttable, websocket_client, cached-property -, enum34, functools32, paramiko +, enum34, functools32, paramiko, distro, python-dotenv }: buildPythonApplication rec { - version = "1.25.5"; + version = "1.26.2"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "1ijhg93zs3lswkljnm0rhww7gdy0g94psvsya2741prz2zcbcbks"; + sha256 = "0c3v30z7jlbxm9nxs42vv3nbja0zsppkcd6fnd0mjcm1s60hyssp"; }; # lots of networking and other fails @@ -23,7 +23,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyyaml backports_ssl_match_hostname colorama dockerpty docker ipaddress jsonschema requests six texttable websocket_client - docopt cached-property paramiko + docopt cached-property paramiko distro python-dotenv ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34 ++ stdenv.lib.optional (pythonOlder "3.2") functools32; From 8683ac07d6a22b1326eb9153f1e1bee78c71c6b0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 5 Jul 2020 02:04:29 +0200 Subject: [PATCH 3298/3452] ell: 0.31 -> 0.32 https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.32 --- pkgs/os-specific/linux/ell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index cb971d452d61..a83e02ae6be7 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.31"; + version = "0.32"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "1qlpc906xd78fzxvvj2kxi3aikgnw0c0h3x620s131apax4qrnqa"; + sha256 = "07hm9lrhhb5y53l13yja2kr3xmjgs0azk3x7w2si99cplwkgxak2"; }; patches = [ From 77ffd8d5e023d1232ec226eb22dae47a7c4900c1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 5 Jul 2020 02:05:41 +0200 Subject: [PATCH 3299/3452] iwd: 1.7 -> 1.8 https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog?h=1.8 --- pkgs/os-specific/linux/iwd/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index be2a4ff3e56a..fd34440f6036 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -13,14 +13,16 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.7"; + version = "1.8"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "1qi25qav1rv8gm5lbrip8ayq5vwynmyv2q4ar7bbmnjh6cglvyh2"; + sha256 = "0ds8nhbnkhxzhnnsi7vj3y2v8wq0nxqbmidhiac7mpxgjkc684gf"; }; + outputs = [ "out" "man" ]; + nativeBuildInputs = [ autoreconfHook docutils From 93c55d7d2a30ca55ef286e265592de433eccbe83 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 01:36:41 +0000 Subject: [PATCH 3300/3452] govc: 0.23.0 -> 0.23.1 --- pkgs/tools/virtualization/govc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index 433da1b07f27..08999aca97b7 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "govc"; - version = "0.23.0"; + version = "0.23.1"; goPackagePath = "github.com/vmware/govmomi"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "05nb5xd90kbazdx4l9bw72729dh5hrcaqdi9wpf5ma7bz7mw9wzi"; + sha256 = "05f6i7v8v9g3w3cmz8c952djl652mj6qcwjx9iyl23h6knd1d9b1"; }; meta = { From 35f6df01d4149612ad381f5480f625d60b3a4156 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 11:15:57 +0000 Subject: [PATCH 3301/3452] gnome-builder: 3.36.0 -> 3.36.1 --- pkgs/applications/editors/gnome-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index d41746a16ee3..a94ab58a78fe 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "02ni81jyncycgfwslvaav0a62wzx3r9bi86xf0x7jvvk6plfaj8v"; + sha256 = "17pvmd5jypar8dkr6w56hvf7jnq4l1wih2wwgkrv7sblr7rkkar2"; }; nativeBuildInputs = [ From 891003d8f884aec8c2b875cf5c37f48e70a18b38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 04:50:19 +0000 Subject: [PATCH 3302/3452] gnome3.gnome-maps: 3.36.2 -> 3.36.4 --- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index a722ab9616ed..57ba6fd0766f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.36.2"; + version = "3.36.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "114pia3nd8k7j6ll7za7qzv0ggcdvcw6b3w4lppqqrwqvswik8jv"; + sha256 = "1ila7li9yi4lyjc84a787qr33wr7ayppphxn451jzg410pfcamhz"; }; doCheck = true; From 7e37c5ce99624e079ba597d70fd1a439febb9d20 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 02:18:07 +0000 Subject: [PATCH 3303/3452] gnome3.gnome-nibbles: 3.36.0 -> 3.36.1 --- pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 9dcc8744d2e2..a9757de63938 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-nibbles"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01vzcjys2x95wnanwq25x0a7x6cc4j6g8gk69c5yc9ild48rr9c1"; + sha256 = "17n6ji6yr521kzxfbfm0yxvrlnw4hlzacbwn0jqmw7xf3pdq35z6"; }; nativeBuildInputs = [ From 72f619f8a7c5da2898d12f89b4fc8583e18c323b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 5 Jul 2020 01:35:44 -0400 Subject: [PATCH 3304/3452] pythonPackages.hglib: re-enable test_merge_prompt_cb This was resolved since ea18da4b ('mercurial: 5.3 -> 5.3.1') --- pkgs/development/python-modules/hglib/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hglib/default.nix b/pkgs/development/python-modules/hglib/default.nix index 14e5b4edcd7b..e96d7e228708 100644 --- a/pkgs/development/python-modules/hglib/default.nix +++ b/pkgs/development/python-modules/hglib/default.nix @@ -30,8 +30,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; checkPhase = '' - ${python.interpreter} test.py --with-hg "${mercurial}/bin/hg" -v \ - --exclude=test_merge_prompt_cb # https://bz.mercurial-scm.org/show_bug.cgi?id=6265 + ${python.interpreter} test.py --with-hg "${mercurial}/bin/hg" -v ''; meta = with stdenv.lib; { From 8cf4393152c57700a85de26ccce79cd2d459cc48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Sun, 5 Jul 2020 07:52:45 +0200 Subject: [PATCH 3305/3452] libreoffice: add danish support --- pkgs/applications/office/libreoffice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 823f2b96b929..7e20c0bb4fee 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -13,7 +13,7 @@ , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , gnome3, glib, ncurses, epoxy, gpgme -, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ] +, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null , ki18n ? null, kconfig ? null, kcoreaddons ? null, kio ? null, kwindowsystem ? null From 0bf7f12a52b1be21cee05b9611416d626431cd78 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 08:36:41 +0000 Subject: [PATCH 3306/3452] netsurf.libnsbmp: 0.1.5 -> 0.1.6 --- pkgs/applications/misc/netsurf/libnsbmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/pkgs/applications/misc/netsurf/libnsbmp/default.nix index a553eb3e7153..8a7e8b607417 100644 --- a/pkgs/applications/misc/netsurf/libnsbmp/default.nix +++ b/pkgs/applications/misc/netsurf/libnsbmp/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "netsurf-${libname}-${version}"; libname = "libnsbmp"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; - sha256 = "0lib2m07d1i0k80m4blkwnj0g7rha4jbm5vrgd0wwbkyfa0hvk35"; + sha256 = "0krjg69a2amxjsahdgm3wmy9ngnyr3gfs2a1zhdlbvb0z1jr7i3r"; }; nativeBuildInputs = [ pkgconfig ]; From 60940d7dde0eed8d8d1bc8614ebfd021e09ddc6b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 27 Jun 2020 11:19:14 +0200 Subject: [PATCH 3307/3452] =?UTF-8?q?coqPackages.QuickChick:=201.2.0=20?= =?UTF-8?q?=E2=86=92=201.2.1,=201.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coq-modules/QuickChick/default.nix | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 7f3c77c75e61..96ab512db619 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -27,15 +27,23 @@ let params = }; "8.10" = rec { - version = "1.2.0"; + version = "1.2.1"; rev = "v${version}"; - sha256 = "1xs4mr3rdb0g44736jb40k370hw3maxdk12jiq1w1dl3q5gfrhah"; + sha256 = "17vz88xjzxh3q7hs6hnndw61r3hdfawxp5awqpgfaxx4w6ni8z46"; + }; + + "8.11" = rec { + version = "1.3.1"; + rev = "v${version}"; + sha256 = "0cajan9w52faqrg42r9rxai4wzsggs86qar88w7lcb928jvcakml"; }; }; param = params.${coq.coq-version}; in -let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in +let inherit (stdenv.lib) maintainers optional optionals versionAtLeast; in + +let recent = versionAtLeast coq.coq-version "8.8"; in stdenv.mkDerivation { @@ -51,12 +59,16 @@ stdenv.mkDerivation { "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native"; buildInputs = [ coq ] - ++ (with coq.ocamlPackages; [ ocaml camlp5 findlib ]) - ++ stdenv.lib.optionals recent - (with coq.ocamlPackages; [ ocamlbuild num ]) + ++ (with coq.ocamlPackages; [ ocaml findlib ]) + ++ optionals (recent && !versionAtLeast coq.coq-version "8.10") + (with coq.ocamlPackages; [ camlp5 ocamlbuild ]) + ++ optional recent coq.ocamlPackages.num ; propagatedBuildInputs = [ ssreflect ] - ++ stdenv.lib.optionals recent [ coq-ext-lib simple-io ]; + ++ optionals recent [ coq-ext-lib simple-io ] + ++ optional (versionAtLeast coq.coq-version "8.10") + coq.ocamlPackages.ocamlbuild + ; enableParallelBuilding = false; @@ -64,7 +76,7 @@ stdenv.mkDerivation { make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install ''; - meta = with stdenv.lib; { + meta = { homepage = "https://github.com/QuickChick/QuickChick"; description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck"; maintainers = with maintainers; [ jwiegley ]; From aca998de5e0eb9b96cd87e88cf7e5db9f81ee02c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 08:43:25 +0000 Subject: [PATCH 3308/3452] last: 1061 -> 1066 --- pkgs/applications/science/biology/last/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index fc302522215f..13f6a23913fc 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1061"; + version = "1066"; src = fetchurl { url = "http://last.cbrc.jp/last-${version}.zip"; - sha256 = "1jbvcxfy5xrf90qbhif0bd6aywm9rjqrm0sx24yr312f7r7c1dnx"; + sha256 = "098j3f3a80rmhd01ds7rnb9y1xykmll2yh5ivpnvskssd8z2vc4r"; }; nativeBuildInputs = [ unzip ]; From 0270bea44100c304033eba2df26f92b942dbdb2e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 28 Jun 2020 11:59:45 +0200 Subject: [PATCH 3309/3452] ocamlPackages.inotify: fix tests for OCaml 4.02 --- pkgs/development/ocaml-modules/inotify/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix index e29930775212..e3599a2304ad 100644 --- a/pkgs/development/ocaml-modules/inotify/default.nix +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild +{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocamlbuild , ocaml_lwt # optional lwt support -, doCheck ? stdenv.lib.versionAtLeast ocaml.version "4.03" , ounit, fileutils # only for tests }: @@ -15,13 +14,18 @@ stdenv.mkDerivation rec { sha256 = "1s6vmqpx19hxzsi30jvp3h7p56rqnxfhfddpcls4nz8sqca1cz5y"; }; - buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ] - ++ stdenv.lib.optionals doCheck [ ounit fileutils ]; + patches = [ (fetchpatch { + url = "https://github.com/whitequark/ocaml-inotify/commit/716c8002cc1652f58eb0c400ae92e04003cba8c9.patch"; + sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k"; + }) ]; + + buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ]; + checkInputs = [ ounit fileutils ]; configureFlags = [ "--enable-lwt" (stdenv.lib.optionalString doCheck "--enable-tests") ]; - inherit doCheck; + doCheck = true; checkTarget = "test"; createFindlibDestdir = true; From a028138adf241945d2e4b082851d82978674a88b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 28 Jun 2020 11:59:52 +0200 Subject: [PATCH 3310/3452] =?UTF-8?q?ocamlPackages.inotify:=20fix=20tests?= =?UTF-8?q?=20with=20Lwt=20=E2=89=A5=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/inotify/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix index e3599a2304ad..44b34beb79d6 100644 --- a/pkgs/development/ocaml-modules/inotify/default.nix +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-lwt" (stdenv.lib.optionalString doCheck "--enable-tests") ]; + postConfigure = stdenv.lib.optionalString doCheck '' + echo ': pkg_threads' | tee -a _tags + ''; + doCheck = true; checkTarget = "test"; From cef53ab37109af81b373104eaee639dfb4260970 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 28 Jun 2020 11:59:56 +0200 Subject: [PATCH 3311/3452] =?UTF-8?q?ocamlPackages.lwt:=204.5.0=20?= =?UTF-8?q?=E2=86=92=205.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.lwt_ppx: 1.2.4 → 2.0.1 --- pkgs/development/ocaml-modules/lwt/default.nix | 4 ++-- pkgs/development/ocaml-modules/lwt/ppx.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index a809e68000fe..759f0deedf1f 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -7,11 +7,11 @@ let inherit (lib) optional versionAtLeast; in buildDunePackage rec { pname = "lwt"; - version = "4.5.0"; + version = "5.3.0"; src = fetchzip { url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz"; - sha256 = "0l836z5zr38969bi77aga7ismj4wb01i3ffxf5v59jsgd3g44r2w"; + sha256 = "15hgy3220m2b8imipa514n7l65m1h5lc6l1hanqwwvs7ghh2aqp2"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/pkgs/development/ocaml-modules/lwt/ppx.nix index 3cf4541aa016..f2707064f2af 100644 --- a/pkgs/development/ocaml-modules/lwt/ppx.nix +++ b/pkgs/development/ocaml-modules/lwt/ppx.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "lwt_ppx"; - version = "1.2.4"; + version = "2.0.1"; src = fetchzip { # `lwt_ppx` has a different release cycle than Lwt, but it's included in @@ -12,8 +12,8 @@ buildDunePackage { # # This is particularly useful for overriding Lwt without breaking `lwt_ppx`, # as new Lwt releases may contain broken `lwt_ppx` code. - url = "https://github.com/ocsigen/lwt/archive/4.4.0.tar.gz"; - sha256 = "1l97zdcql7y13fhaq0m9n9xvxf712jg0w70r72fvv6j49xm4nlhi"; + url = "https://github.com/ocsigen/lwt/archive/5.2.0.tar.gz"; + sha256 = "1znw8ckwdmqsnrcgar4g33zgr659l4l904bllrz69bbwdnfmz2x3"; }; From b1f5e293cb8a807af4b6bbe7c8baf7715898f994 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 5 Jul 2020 04:20:00 -0500 Subject: [PATCH 3312/3452] haskellPackages.math-functions: dontCheck on darwin --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cefc8c0d534d..19f7685f7860 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -305,6 +305,9 @@ self: super: { ldap-client = dontCheck super.ldap-client; lensref = dontCheck super.lensref; lvmrun = disableHardening (dontCheck super.lvmrun) ["format"]; + math-functions = if pkgs.stdenv.isDarwin + then dontCheck super.math-functions # "erf table" test fails on Darwin https://github.com/bos/math-functions/issues/63 + else super.math-functions; matplotlib = dontCheck super.matplotlib; memcache = dontCheck super.memcache; metrics = dontCheck super.metrics; From f25f7eb7f3388e4998293e88142148aada9ae3f8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 5 Jul 2020 04:20:00 -0500 Subject: [PATCH 3313/3452] haskellPackages.mockery: fix build on darwin --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 19f7685f7860..5a5204c3db36 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -312,6 +312,9 @@ self: super: { memcache = dontCheck super.memcache; metrics = dontCheck super.metrics; milena = dontCheck super.milena; + mockery = if pkgs.stdenv.isDarwin + then overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; }) # darwin doesn't have sub-second resolution https://github.com/hspec/mockery/issues/11 + else super.mockery; modular-arithmetic = dontCheck super.modular-arithmetic; # tests require a very old Glob (0.7.*) nats-queue = dontCheck super.nats-queue; netpbm = dontCheck super.netpbm; From 969e35423c4237941cb3a3c3e40264d258b7599a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 3 Jul 2020 04:20:00 -0500 Subject: [PATCH 3314/3452] dune_2: 2.6.0 -> 2.6.1 Changelog: https://github.com/ocaml/dune/releases/tag/2.6.1 --- pkgs/development/tools/ocaml/dune/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index ac3b7f2a4299..001c42460399 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "1hvgj78xqqqph8dwn1jjkjp8bpppvwzx33lzkvwh5wn5zd4xij8j"; + sha256 = "184ri2w1n1yvhar1aq3fcxibdxx67728dz6gy5rf33j4hvr5kyay"; }; buildInputs = [ ocaml findlib ]; From bb9cd254dbe482cade9d0b774c56d22ee4b9ca83 Mon Sep 17 00:00:00 2001 From: Anton Parkhomenko Date: Sun, 5 Jul 2020 13:54:21 +0300 Subject: [PATCH 3315/3452] tiny: fix build on darwin --- pkgs/applications/networking/irc/tiny/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index abb296d64744..d6b19fc77dd5 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -6,6 +6,7 @@ , pkg-config , dbus , openssl +, Foundation }: rustPlatform.buildRustPackage rec { @@ -24,7 +25,7 @@ rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; - buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ]; + buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ] ++ lib.optional stdenv.isDarwin Foundation; meta = with lib; { description = "A console IRC client"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 474b10792528..c57144a093dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22601,7 +22601,9 @@ in tint2 = callPackage ../applications/misc/tint2 { }; - tiny = callPackage ../applications/networking/irc/tiny { }; + tiny = callPackage ../applications/networking/irc/tiny { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; tipp10 = qt5.callPackage ../applications/misc/tipp10 { }; From 0cc670ab6bb3e94019675af80bba1cd57c7788a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 12:09:23 +0000 Subject: [PATCH 3316/3452] kubernetes-helm: 3.2.1 -> 3.2.4 --- pkgs/applications/networking/cluster/helm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 2e4f68d6bfa7..bcea26746a2e 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helm"; - version = "3.2.1"; + version = "3.2.4"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "1453qkd9s4z4r0xzmv8ym7qfg33szf6gizfkb5zxj590fcbsgnd7"; + sha256 = "1plpk8qnv11d47qz93h57abjchyp6ahgyazyp0c6rv24vb9fp9zi"; }; vendorSha256 = "0j25m56cwzjd9b75v7xlb26q81bsmln77k23h9n8v2f2gqwwpkrl"; From 54e98623daefa73e243afdc3e5c48315bbf649f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 12:55:37 +0000 Subject: [PATCH 3317/3452] ldb: 2.1.3 -> 2.1.4 --- pkgs/development/libraries/ldb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 33a9974211f6..52daebf8323e 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "ldb"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - sha256 = "0xkps414ndb87abla7dlv44ndnfg5r5vwgmkm3ngcq9knbv1x6w7"; + sha256 = "0kmzs2s7fvar9ksaxyiqlh8q8mbwc7bxrq9w1y91zlyb23p142wy"; }; outputs = [ "out" "dev" ]; From 382000f6b75463e1d00c2825d56cbdb499f335c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 14:03:28 +0000 Subject: [PATCH 3318/3452] mediawiki: 1.34.1 -> 1.34.2 --- pkgs/servers/web-apps/mediawiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index c23fb685c605..b9e0acfedb8f 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediawiki"; - version = "1.34.1"; + version = "1.34.2"; src = with stdenv.lib; fetchurl { url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "0jg1ls5xy2bmvvd63lpvnkj53rfmik6sy2px14mphxba3gbcpf5c"; + sha256 = "1mi46a14b2080x6mh61mb49xq0ky27g0lbm3gqgvkgckc1zmbp0f"; }; prePatch = '' From 48a2ea4d3935bb8d3749da37f78b1af2b28574c2 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 1 Jul 2020 18:09:17 +0200 Subject: [PATCH 3319/3452] firefox-bin: 77.0.1 -> 78.0.1 (PR #92043) --- .../browsers/firefox-bin/release_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 464eef9f4b7c..ae610152432c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "77.0.1"; + version = "78.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ach/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ach/firefox-78.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "12adc58633a67921e1d1944501191510baf3b0308213f417a202abcc09d5abad3155a478c2541508273d6e8b07bd3c13f7f8ab6e40855927429a94cc8d989888"; + sha512 = "db99ddb8a4996b5acc75b70277b4582de0cc885aa203257edff519e97c5ba79352697c65a2f728553c67afbb2d3857a3fb106b6bacc6386927766c23b8cf87b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/af/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/af/firefox-78.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "ee58827ac139f48b870d3c30d8c317857ad5973593fa99addd7d09faa1fc53ae5ae31e36cd1f5c9dec6ff56ab31b987baccad98d4c8f8e009830e2e5065b8a4a"; + sha512 = "57d2b959a3fd68b2ad859288b310d0c4d7dbfeb9fb1a528348e62d847dece5ef7fb4fb92fb8e3d7e2fac12e4d96612ef0f3c18377d1e170409c38d2b7e7b7895"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/an/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/an/firefox-78.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "ba8a36a8e7a8638c88355ce68ca4f320d13b60522f7699dbefd056ad01c4476799c38c3cb5817d5c506f29ec32532b533bb6aa5a592cef971f1a617d353b12aa"; + sha512 = "4e823bc4c5ab815081a0446198f148abd2741bb9022e1a13b796297b3deb84ef4fd889c3f651dec172940cbc1e31445a0b0e26a506b4ffd84f3235b11e1dcb9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ar/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ar/firefox-78.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "507a3c9487f0d2fd89b91473afbb9607d2c8fe2f642e331a4c781078d0f474b5345827a83167981c0d9b06556370b6d7baddd9eb3355dfd8c64014d139483e06"; + sha512 = "5dd9f4f5ce3bf42833ae82bc568bebf000fb2b78d631fd13882b7a3a65e8e9d98a32a8ac5e3f806d19e10bb6f9ba13106599975c147b49125a2146184c5a98e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ast/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ast/firefox-78.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "70df4d795059609d2935243ca1af753e9e57d303f43df42f72a423135d095b8a295cf06fc3aa0284f68415c77de46b6925b34fc19987309a9b3f749e8234d9c5"; + sha512 = "e46307e5aae2e1bc643daf517bdf4234583645267be62e0db476ed2d4fea909cf9bcaa22064137bd76164220f60d98b8469a715558d92a8204a9c5acfa559155"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/az/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/az/firefox-78.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "34a95a03400f67bc17a405767d174de67103a57cfc2154621e4452b914e070344b361547876b2a17813638405440642f28684f84782285960d3ed5bd0d8c0eec"; + sha512 = "e0e8ed2303266f664db62a4054a10306bdf4c84f9f173124c60a0c1b211c9c3d67491c86f0e6a57d560ee1d3cba02ced5cbaa03ee1a40d1e8443842123cff8ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/be/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/be/firefox-78.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "66acd13f56a2a3c79cc49f3cd5cd203c7b7e1f7f978a1ce1eb90f702f35f501bf7b16b1fbc9be8ba9b176b103bc37d0868aaf765ca485c854192c2c4d27b1030"; + sha512 = "7454f9b8741544092042dbc2cdffba4b7abeb529ad1997da74412432cab9a3e286531a72a853eb6447c097db103e05d2444abd74b4d23221903c31f32bd508ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/bg/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/bg/firefox-78.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "44f3dc39fb73c03461d16a34f1fcfeb385722a0b4deb7b75199a8f8fb40fe85cec8116e11eb2f7852580a4ce9925d8f022c6133647232f6547db689b6d87912a"; + sha512 = "5fcc7d8165d168146158e1da4589ecf6677b9339716badfefe9c9289162f2a935dff2773f3a84499130499aba6b40d0d815c819d04cd62a574c867a92e95650e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/bn/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/bn/firefox-78.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "2ecc1a1433eb8301cc7e9d66dadf1926aa20b609b7683e69004dd56a12b3a8a2a1db19ec85113bdb0bb0759c29b0e70a157ef6f2f7ba29a121f22d39cb256c5e"; + sha512 = "e470ef70de7197f5eec35f873aa0140cec8728b945db4e947141734119a960d998be3420a1e2375c4677be0b6d9fbfa94ef63b19b525ab6cf3b48c6b659f7037"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/br/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/br/firefox-78.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "f9561f0d2f00da6736af19dfc2ec21a25a46b0a2c0ae195e0725a59f8df0367be3c0dbbfacc4b79ba82bce7643b00127b9a9431379e533c0393d49c6d3017ccf"; + sha512 = "ea178fb88aa45ccb4754325c82752f51d078d5a04689e22f53ad3ccadb6635adecfb2384048a05e932eb0f02739a11540cb62d94efba7c207277ec4647c6fdba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/bs/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/bs/firefox-78.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "e76982df74ee812f37f802d3e82a7ba842d6a211be3beff4fe6347a991ed49601678f11c01847a9708ce36ec2ca956f452b2d7b1fe168a7608ae7999113fbf22"; + sha512 = "ede391fbccc2859139329508dc34140b33d214038cc6045d5d25eb7752bca4059c7d89adddd6e4d0d34a7bc3019b6bbf65d165d12a33ffdc823f687c41c29a72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ca-valencia/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ca-valencia/firefox-78.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "a2633b6e009edcb98c4af62df6cac991254a0f370384c2d0a3b81f8c4e49648ab6cdc580888a628668acd0a4daef1bf6b65633c58441aa0e9aaf84dfccfd10fa"; + sha512 = "15913e0b6d2383a4212cbd9ef84d0ce7d7cd601f112852d78f0a8425f5981655ef92bf0a6b9486a6f7cf80eb630877d7b74289f6d6b0302b6191b179c21aae63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ca/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ca/firefox-78.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "c8ba559b912670a86f94188e1b3c0962093955a527b2751e4264699bdf343050999d76b93857f6819c797dbafbbd0980032cf5c497b0d34a50c5c8395cd07cd9"; + sha512 = "9c223ec9967f42f1b17fc28d6fc9a58643c875d20df6c2d03b22bafdc930369aed2e406297195239c1ec214bf005dfe166834d4c4c7d35253da35774588b90bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/cak/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/cak/firefox-78.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "52f446f2a2c4bd6d79f680ebdb38e2f62e0830d14fc98dc6ad01c5b404794da1e59f4b8da2d7f4a0483187f4725a212e41edcc2006190818e6229a5a9af8a597"; + sha512 = "0925571d801b754d692a1a7f72e454a918cd6bd1fbf06dd336673cae725b153756d2d69ae1d409dda08ffddb5f46d6b630daf6e3585ca7e3a2aefee0a97804f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/cs/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/cs/firefox-78.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "91d8dbd3d8dd6e242943d9b416534492125746694a721fff6c9d51f811e2f93b5d521f63357addd0e11bbeac80d3a07d2fda0133d746eb3d4d5d086e59a713b9"; + sha512 = "f99aac3e9476d5039c66ef6465da9c2391f735b7c26a4bc7afc7e4789904f37d152a85beece8a518c2e64729686ccc6b7909682181e20bb3b99e4955c56d1089"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/cy/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/cy/firefox-78.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "14a04b2d97ea473b45602ab44d8ad08f35f21e98621e93b901ae25731fd86d207b4949bca3283e39cf22aea7667e110c94b948b51a370551c4416a3009f10854"; + sha512 = "02aec196c960943438f5facde42ce2d98d8a6f7484ede3ce6358ebc6c54ba8f86c12901b294721f614acf81619ccc811712c637b37233dd36b517761f215e7ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/da/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/da/firefox-78.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "5ff9be1796f70f608e12732c71f46c6c4f636e52ed03cb445ee1fc35d4db2897ee1b8f231ba0a5724696d3f7db04845dddf268a3ba59b26a869f65729abd57e5"; + sha512 = "162352f788132bda44349bc880b0187c3870ac87fd13bffd4683386c279570b81f46d5bdc88e61bdc1870b288c5bf8ba7d485024bbbdde0c1e2ae4d2dabe7908"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/de/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/de/firefox-78.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "b15a90114ea7f2c69fa94bb6e9c2559be0f7a7a0b7c4c1042823153000bc6a04a27f62c9373cb4c73535e676c41b23dfd260396fa691f2ac0319badb7a087f05"; + sha512 = "a6f3c8bd0b05749b1cf65d233382c2bfbb60d57b9ab51675c2fdacfd7819ee6588096d326d2b4ebce7b8c87f474203cf9c701f1e9289a15f25903d9e776b6743"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/dsb/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/dsb/firefox-78.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "bd10d40bb2f52c1b5cae9c7d91d53b3cc33bac0415a6f0b37fa5e1e2f5249ce5313a45e0e8b8b218ad961b2e3b3597c7132486a71eae76acdc61805181cd7220"; + sha512 = "695e3d710f0828566b30f10eb26cdf8963e0e086846ce8ce772eb0c720655509a69dfdbd4a40e25b739295bcf37e866c4c7e3341845038fbac6b3ee41dc7e3e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/el/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/el/firefox-78.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "4c28c9104085d2ddd024a1418f0f54cd4c57d0ad5fc59bbd26d28bf173a78999eadb025618f0221273c5cb697708f944764a88fe9c08695b10694c68ec54473c"; + sha512 = "4b7042034faccd67d5de9917b8ef48ef1184953036ff87ca1f44e9bf82578179b093fb5654761ad02b1f14cfcd6eaa2111178ec281eb93823fbf7b957ea25922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/en-CA/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/en-CA/firefox-78.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "0722520753a1bdb093e696cebe1e9074661b7602b5d8285b41f62acd462e740cb0833b751d870d602e7473bd11f3bcb3e5dd8e84ca00ca3babeea3a19d45974d"; + sha512 = "03a35b1329a0ebcf458a0166ef205b7d67f8aeb09172a3ab1b4f4f89feb2152907e4d4637b8677470e3aaf60854da5ac390338666c078f5f212a8116de83da82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/en-GB/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/en-GB/firefox-78.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "8f6aa14f4dddadf19661e3bf11573d930c5e931f383498fd22826cb1e61f97bb5cc5db7507e5363648fba3368c7d49d7395bd4d68c6f9787db65401e990a62c7"; + sha512 = "bd04a0eef99858d8219921405f1534b5892a9dceeb735d75ff6e727c945b805dcd5e7f164dd9b7b4f5c438ed63e80d134af7d7c1d6003208cf44a59b48075093"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/en-US/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/en-US/firefox-78.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "28b0f843220a88759893813c48f9b02a255c26fe954632e530f956f43c4cda6441546f3e9d827fd61bca0d61fc6a5580d3134b8d5315cdab90fb57aaf96fa5f8"; + sha512 = "d9e2333c5d5924c7ce3b863ced6567de676bf1f42cb44e757dc393963745f153bf1291aebbf2af315766ee35edffd0e594e5b422eada141fe6192771540d7944"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/eo/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/eo/firefox-78.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "da2d5d3d337c39236ecf39291dc44ce5c023dc0dc0b093c73b17425befa5f8b54239f166831b2d2b88d3556b9ea1e3dddcda8bdf2907fa7c5a63d78ef222b214"; + sha512 = "a4c75a47814683e02bea5729b86b1cc843537593ecc35383b259cabc7b348966dab8ef54dc95602c0e38c1077acec1e681159fa5396eb1f5d2cac63457bc7af7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/es-AR/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/es-AR/firefox-78.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ffece84feea0c13e2f1b40c41ddf0c6bcb9db03d5d377c509421abc2bbab7d04134e14f9eda5bb87bf7a63da57ac214cf88a054fd58cf7785e620e37076b5820"; + sha512 = "b32f55b5af411c955f24ea36cf96012af925d0175a341fa1e52cb8c413c47fccd5b7e3144711d579c45c0ccd032940843a58f8caa663528fa29e7fc971f20a23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/es-CL/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/es-CL/firefox-78.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "649bcc8ffa5ae82a26c277ed648e7e02bdae3df782c2716ae15834f46230105ec4c33bf838a7c5dc7cd1ab1ef92f9babe9bd39e8dd5d34376ae76121119e7a2a"; + sha512 = "1741774d47cf4e807bde9e5774b64f436650a020b80cf28eacfef2524b0ae7bbc2def341ccf9b595680c0127cd1e9ef9d1d42f53f5d5bdc001e9a18b1326030e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/es-ES/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/es-ES/firefox-78.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c292b0f01d5289ca978b0af87d15a0472748db192ef4f09b36f5fcb1a671edc9a3286d3981e482bbe0b33158f930ee1514cf0e8b18cdf31a47a2c72b0e0dbf19"; + sha512 = "5711c34174784e8955821ef02362a4b83635fd7b0b785e90de1f68b1b8eb159fe9efdcf0b6a64115ec104b5a8369b56a9ab8c9c23691d62f255598ae10810cdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/es-MX/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/es-MX/firefox-78.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "969f18a23691d80f7cd7df0ac43c6a725eaffbee73d8044daf90ff4ea0baf504cba9e73049f74b9cf8619b78326797d831f247f86e5181a791fb4ae211b20e46"; + sha512 = "ec506986f0b8449172bc532512ee323eba7198b132ade8bb31b35d36e1fbb3241dc5691896ce893803fb264a059e0e52f617924fc8b3cc8bc53d84fefc9a624f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/et/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/et/firefox-78.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "cacc56bec434d5c44422f2178bce9db151249b4298df079a00c378995cd353d6369b6a1edc841928eef26a5dfa23d44f25cc33f0dabe96b44c13004bf134ecf4"; + sha512 = "86db7028acb3ce968ba0939609f886fa44651cf9de9b36cd160fb743f0578b8a6118da26dabd69e5a0cdebe28c3f8be8025ab6197d47d11708ba7030ae29e7f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/eu/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/eu/firefox-78.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a5fcf26a1b614006463f0b2503c39c00009ccadeeeef54c7ade12717837858594037cdcf96983cec88c5816e436e97eebacd07b40182504c016d238207bd3e62"; + sha512 = "469551b3e5637251cee86f7f7a515486846894a4a4e54018e41b4387fc3457426b4aafbf99d875dafc4d1c4c4fe12a96474cd6bcb5d25284f68ff07a099f61c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/fa/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/fa/firefox-78.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "68a2938aa4f190941595e66efad29adb7770657dc755725e926a19e189f15f83a5e234d896f589c693fc3665e50b5da95fb3538238a2c2c2f955caf08d7a9cd0"; + sha512 = "e02a4f3826e3df3eb36e1b04d1f973458675b22a3259c5bf7a8d6ccab4a2cd3055eebf1e5dda154258e5806a1a78c0f0a1bdcce92dff144f2037f52e0d0dd050"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ff/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ff/firefox-78.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "28298f6619a3c485f08d25fd9cfcd9ff8c60014c702ff7e4b6e462a0877b7225829d4a5014a653a3073d4d51dca731859bb6600ba9a66fdc488734af7487f9a4"; + sha512 = "5b7a1e71b35361a7db2d846fe6ef87a8c8aed37a805d75aceb5483d0aac662d3e2225a2a16aea3346ae5a1efa7df997e4c8f424cf0d06def155267ec5f7c6af3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/fi/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/fi/firefox-78.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "fb4ee19b0b71d6d51f82cdfa384a4229e4cb735e0901ef9d246dd192ea5fab010de5549a0236917ee0002de0cb28b0328692079087184f46511c429b4c0201f5"; + sha512 = "936a39ffdea7f503a9efd7f509610a03326e50d790cfcaae38d79ce928fc949a73a0609d1bc7b11e9026a3bc0b536b9d040b81c6bfb332706bb44ccba51c73ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/fr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/fr/firefox-78.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "73a06198b1b62ce230c76d045b8950008b0ea608a967cd7a143b79b745ca269b6d5960232dc2f20a26af6b9df785785db535182b2fcea2bc1fb6d46abffa1659"; + sha512 = "38408f71646747124a10d2e5206be9d8c186a070aecbcc94d4e7f8beb436905597648548f8e36775101732f3e73b2899e2b5049bc5f7e461603b9cf33a48e526"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/fy-NL/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/fy-NL/firefox-78.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a7a2ae5b4e1c5b6e0bee93e4dba501638d4f6aefb094833eca2e1a4c342beb29102d92840ef8c898106c8689d585548a2dd192dfdcdfae3a0c7a9fdffa604008"; + sha512 = "f84e596d2362910c8acc8baf4f693f889745eca90e3a0f1d4fb2886fe90b7c9579daef826d0c382aab531c6791072ef068fb15122b9e592d413debde6e84e59b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ga-IE/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ga-IE/firefox-78.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "1341a646c758c1b879464722a536743cbe406b964ba289d9bd36ac973db8cfe008331f1736a838c1b0fa5c2c3a01e12fd8a4b3bbc073e0772ec3d50da7ea7159"; + sha512 = "a9c120f6d86e707c3c46f767bb26f8eee6e260026882278387d0c9e4de3baf99a8d7c75e97fbae1021da570fc13419717c11ec944baa26267737941a7b2d1eb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/gd/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/gd/firefox-78.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "d7996916bf60c44df2a354c2f09bd1116c2bf1f20bc4445686e16f1eadfa6606e772fb0f9f3086231b8666a5a22a4dd549a4efcf7aad4529ac57a49adf9a7777"; + sha512 = "f9296428d0853ae1a500e399a612cee9989581e6164839e80eb9ce087d76df8d8ff1c8b31c9722671b0b2838480e4cb6243bea0d143f7758524c008f7c97fa26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/gl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/gl/firefox-78.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "38068429fb33f17451babe535ed9692f8d97aa9bd10a419016f6b61c8a02232c801a2e018bb6164ddcd1c4b3216fae71c1cc7f00cbfab3e20b85d3aabda02727"; + sha512 = "9d1b1060c4f6914eaabd687a7e96d49430823aaf32d8660bacadd35d3de8dd2e4086702b35b71116351cdf06574c7a6f6283c555a8dd4e72792ea35b466f7cf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/gn/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/gn/firefox-78.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "ceedc3f1e05ca7b33e03bea9e0da10eec1930ebe30cc5b539e6b928da8a19eaa619289f25188888799c3a0d91c12a6873e38411e136fa684f5ad27d6ded6d6e0"; + sha512 = "7860386b1bca90e83b8be0aff0bf6e1ed9e9e252e4a586d8c1e500291ae0e2dd3459f3ba4fde5e0ac67af31d751dda4549713decde78bb443dd562885909f395"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/gu-IN/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/gu-IN/firefox-78.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "f2497076febb3f19964b3ffa29de9061cd64706224c29ea8680a4e7277131de559b67c0012d6d7a8905143e6b19ebf27b5ddccb3263d5fb3bfcc8aed1f93b294"; + sha512 = "9685d659915c165b7874cef4db2d7c6df65cb4f4da4410edd214f51b5b968683c6f92c358358aa83dda53e94827351470b12123ac0a13b50bd64cdf3faa57b21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/he/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/he/firefox-78.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "d91a982c027d2b68c449fcaeb719d8943d089c778d017534d72b571b26af8c7e01ed9ee37309394b6984daec3579b91c901a3a1d9ecf5485a2a0a1a8f93d522e"; + sha512 = "4ccb313911be8e65fb3eb05613dc2b2d9158095a8d8afcb60e04fb995d81af4fba65250587194e32c432530069ea79260f5ba84ff72d6a7286430253ccb52062"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hi-IN/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/hi-IN/firefox-78.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "7aa929a279e568ca517f3727b4c51417cb4acb6e2606da30658c9a213fb789dba9191b51d62037928a47daa394ddb5baa0e2746f68a4c5569bda3632be17a719"; + sha512 = "cf5e343b3254201ee03616f97524e9ee593590cfbfdab3555127184c235b130987b32439217a015e055b12f1fa886dd42d9c5cfe1420df80a16482a48c553ce3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/hr/firefox-78.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "07fde2ae76e5b9ffe81ed5d68114f66aacd7209e5edb353d1962a9509c7cf75bd42ae21ee8cf30216f502e31af5caa7984676192a714712bd279440659dc1661"; + sha512 = "e5ef11818b97e8723530b2d54405bdf3415cd3232c7f189fde978c03b5a72af9416b7c54628363fe54b0016ec3047405900da28fcfb7037562ee2b5ef3a216e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hsb/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/hsb/firefox-78.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "b591a29c05f751374fbcf9c8557d208842ee26eb27ec0be766fa1f5c608c4eac7311e667f27f95bddb4d55b984d1975533e4c6d3267c69130ec21ddf189e84ac"; + sha512 = "c0c2dce67695a902c35d58b7af25b7a8e12268a2471bb7d942857cc8ce0cba720fb05a187f385e26db715b4a873bd67f38d326b5953480fd585e92de942a1b79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hu/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/hu/firefox-78.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "cd5f400c8e66e201f34155450eadf6d920327a19e87f0d0d1f7728c481c03588268b7711c865a011a207287ba16ada555b6d370badb28ee3ea2b469a76f0a03a"; + sha512 = "e44c6843dfb99004b1958ff06d07c03019b414dcaa98263dbbcdac0a08e962d9ecf1db90f90874aad02e93663f5cc844fb119d17eafbfad75b6c4c8df057ec52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/hy-AM/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/hy-AM/firefox-78.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "f08d7c0d8db0cfefad662eece31ef9d23de333f88aac225960bffd20a9de4bdeb4f2c9835be7351e20615f24024861231a79ab7ee598caa83dde88e810d973f4"; + sha512 = "722081b5bd85046cc4c909d59f8fc8c11ba05e33d21a6267b5f620fefca364e101467ed147948c36eeb287a80cd2992b9ff0d25f2aba8363ec447f41cb06abeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ia/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ia/firefox-78.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "b5bc06630095041dffff149743d7dd43fe0d4c698f514f2f91ec0d8dea62273501df4a304903dd96532e9fc1756a8330f052a5833e331bb39478397dca5fe7b0"; + sha512 = "560996657ec336f60436aceb38a7351f4dcf77ba16fa99bf4aefead2caf45e508c1bb2bfe500e1db3b00351a30641b2e4cf98edc52c2ca1ff53c8979a320aa47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/id/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/id/firefox-78.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "2960c0551aadd142c5fac2e99b327be4393bc2e5515d3c67cca617cdbbf6dac8e20898d124960420a8804bc7e1c61a8bc3de715fe43ff7c5a9dba62d515a4e10"; + sha512 = "980cf67d1dd3b1eaa3625187f8c46b05b7e2c37518e5ed55aede67b69a8da016d552a9d806ecde93d775992fb9537a96a92813b512701897522b70eea481181d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/is/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/is/firefox-78.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ca9be0a8d2ed5cbaa3228de5d5cbc4ed6a0b14c5bf5f1e978e28fa1840c00d3cb32334f24cd9846e9aacbd61e04f79949f5271d061d62b5654a44e95f813b397"; + sha512 = "9ae44c9e03ea56aac4bb866d5655e37970ad59d8f0c34e4fb9426afb6b657e369db34b767aef2009ed48f6771b617cac74ddf81aee8559c0433d41644625ef74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/it/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/it/firefox-78.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "20259f0b35d85a75a90182851cb57f33b9e043e358a2b80e9d3e4fc5e6b0f3ce8bfffd9dca4f574304d66070f307c3832647d4829169202b119a998cf969ef39"; + sha512 = "f39ccbd905a0d4d5e6d1f8c906239995cd2ae03c522f91ef26b732720abf1bdbf4f258fb63b88c325682b1efcdd7d4148b056c3e8610851480cbcb154b34a109"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ja/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ja/firefox-78.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "41234ac1f73c3f93f61bb6f1dda395d7e6b969627b86fe36f93f33353c1b28b4f9302014ad7cde6b3e8df2f84b3eaf0bb75c6df884de0a9a77ed2d133beef863"; + sha512 = "6e1e114c9bbbc9de06a0fb7c2780d96aeff0ab1a65ab3436a1c8944c383f59689e615c15909cca08f29362e85e0a7859b271ec390a50de91d48c53b213f17e0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ka/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ka/firefox-78.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "be9130cd5835cb103c3149dc53dc325c54c1cc5f5006cbf3598314be2022c1f51928529cf3218052abc5f7f6f649e862f69ccb5b39ab5053141e231e56113ba1"; + sha512 = "e56fa7cda4d4bb639e77959ce35e42379cdd52011891462accbec4cbf871f689e6dea2409a2b1f7aedc1880a1fec443d35abceb30396bc67d92e0a5bdb9082f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/kab/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/kab/firefox-78.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "75d15e95416f3f61e49164b7be43f9335049f62f8350cb4abcbe3c7df6848a124ff5b5e43f81a4eb2f492ad3a61ab1c0979083d14998b684b2ba8988c94d6b57"; + sha512 = "350d55c59acf6d8559e271bdc0c7bd8c8c2541b5af35415c6edab6069155c603b65ff8188dbd7d24b448da96d4c6caa2a82bba4b6fe8fd0d9a89d24adf8be470"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/kk/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/kk/firefox-78.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "df7ecfd04df63351d35425f74bcd5b0b342302b6c7b24deb35394aff9ed3f025ea9ad1c1147d46a789a2a11d8dda924c15584ee826819fb4b1fb0509aa71cc9e"; + sha512 = "02f6768983e2ccc07bc0f815342a8630bbfc0bb502897b1dff2aac343b78666581fc387f5e8fe10849bcd24e75b9c7c4b04cac1c751a6080c92ffb5ce344086f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/km/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/km/firefox-78.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "811876b5a4d070aba73426b2da43ffa5e9f9beb1a4ca37ecfb5e058100c60d3455e6284e9a71d5ae58af8cb9fe9e3e0703847ffb16fd963b4eb1410a3921f260"; + sha512 = "557231e69b16d1a6269c8597bfe06c0654b95680ebdb85afa6eeec3abebbc209e76663c5cbf7bc74b83212b34bfc514a7aecc637a4e9af2137600de320e84eb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/kn/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/kn/firefox-78.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "8c195accc9adbe3662abf62435d3b42ae4e2affcc41cefbb8f5a702ef75ad8566cab07eead40869118ef9164fb6529e1b4203970b908ed7d3f0cf43190049b2f"; + sha512 = "5a952a07050a4fa8710a1b275a241de412d4b076834a7134259f6ead12d550d86621fd00011450e5be3eb2071bc2807d842eb434de58bb45cdb509988a676ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ko/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ko/firefox-78.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "2c571a931e88a49e4c977728bfe51a2008d4c384aae55b759dea665bf2810e5929a693f633c82c5ee26e1236cdcbc003a9a39e0e01ac46db71c9bcc20eb8d17c"; + sha512 = "b7d8d220add5a0d94b7d8709d69d2b8abcde7693f1bf744970d59cffb4defd6aa768c7cb48f49d0f137605ac34c3a41689aa3768c8bd9deceabb3de80adeeed6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/lij/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/lij/firefox-78.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d624ab2b73c03157d0559a3a41a7a50f985364b8b2c03466f949d2cd212d206bb39957eed9ea769796f4091d7644cf7191fdd0881eb8101e2cb8944923c677ca"; + sha512 = "3c3856e3611edd3b506dbd7a31345480f410fdaac47e7ce9baee79119951075a8223cb388227aabf9d2501b71cd746c067307c702ebcaf131f1698d7a85070eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/lt/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/lt/firefox-78.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "72607d7201c562103dd241f18cdc2b681fcd5d28302f5afcf9e03f8aded2339a88e2b8c2b81fffdad5e10bfef94fe39810116d61a415f9625d0a48c794078bd4"; + sha512 = "f19f06b6b7f6c1ff909f0678d907b9dba6a51bf448c165d85baae49b36df67b55768520cbf783fee1b02f2d82fb339d84fdd6d3f73e98bca83fcabc302b0acb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/lv/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/lv/firefox-78.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "f928e22f29e46bd9405f5d2bc902c82093ad8073d8f6ea52af20c93805b0c7b5523f489f9140baae1b04b015b7c185ba27398ca857b00c171dce32f38ea0d706"; + sha512 = "d17f6b6cb38b1ddae2e2726253317453acdcb769d6cbb8211c6e9fee0061b9a9ad77992e4e005517f3e4f5f6eb8df9d48804bfe0b85fcca1d716837463dd28b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/mk/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/mk/firefox-78.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f6c7bcda5da5d3315a0a5a47d7a0b9ec0d4a6d4b0daf8fc11d41a8a8376fa05607889d108d38f3a6085c0f9cfdde86a6486993f72f44822a75a97b1b9dbfe185"; + sha512 = "07297e3a2e07f79e84dccc8ac7def3ae934d7634c69639917474def646d1ba6622ad4b291ff6c8b15645059e280026f500596d6262c134125bb0777682d08116"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/mr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/mr/firefox-78.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "8a41b844c5faf640f78615593343dee0bde8dfc2c20977b80a6e9de37fbe10e997345c801b025e4eb79627aac27a92169e0c332e7595715227b2d3015b2c9b3b"; + sha512 = "d71cea736c9ab098eefba63e6d5d725627064978fddf81deb459f7a40f68979a6954ebaba89dbdff5a159d5c557dd07d2a129b697a2b7aba32a5b099dfbf52c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ms/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ms/firefox-78.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "866daf16e535cf9e404a788c8b792c8cbb391c43912738d7eafa723c5e6eaee7290d94c39324708533b4c8514391a0eabd62626029ee7591934e5ff6abd72969"; + sha512 = "c674394337e06e4498259835a4d04cb704dbb6a7a63a1466fe52510aa669f3f76720e190a13b0c19a4005461bd19e098b36acb0aff89b31bc4e1f6103be99e11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/my/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/my/firefox-78.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "94ba7fa3a0cb791daaeaaf9998b0c574759f7afcafcd388b0b5aeb9bb1ce97e36671378f0c56c3d5120872ab2ca48933b2a304f3ef3e194a77741c492e8e75bd"; + sha512 = "015da4500bc05a23ec8fea41b9a95f10fc79f55349cea2a15fc8decc56f42bacc385881bb9f10fbed50b471053e828be16bea16441ad7600ab4676ec1da47c01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/nb-NO/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/nb-NO/firefox-78.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c46ada870f940387fa6bff044176aa59f3fb376a8d8b1df1715f6abbe3bf87f932a49e53f2c4bde967bdc04c930fa2e426f7c4f66c22c64353be68220d9ed94a"; + sha512 = "f93d8f8926f259307bb830ae5a5be873edd02623bf999d87af7e8865c1f24d1ea47db8990c3fd7be5ce0b02c5297f35de3cfc20cdc2e1d1d6029b896ffd3df36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ne-NP/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ne-NP/firefox-78.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "005aac3f43e0104b284f1805062eea457e81e8b29940b8c034f99de7e07d38dcbf9077d62a1c44a1f2dccd65258b1346889e08b7736d9fc983f03df788fd5e2f"; + sha512 = "8a46e433a017e98e600273df3bdf22e13cf61bd06c628341bdb2c11453c28997de0527c298454595c5b2e9c4d558b7f0ed9b25ae8ea15356ebcb698840ea6e79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/nl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/nl/firefox-78.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "9d00c7ebf4589615afffddf6a33f0e75172059fa3e9ccd56d3fe720b01c521fa30a88217b77cb2ebc37b088ce69ad280488da6ab53525170cb1fafba64816235"; + sha512 = "ef70a2deb7073ae34702af4cc1beda2bba50df3d25384dd58a6b17a4f79f90085ac496a1cc1388b852bde6e75d39e8790baa921cca55521a7df0b37e02215afe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/nn-NO/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/nn-NO/firefox-78.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "5a9ff27a1355497d57056826ea0ba465d9f10fe0112628634267b262b4bdaa07b0133fbacb8a5644063cacbd0d59526a09a6b98caef78d25c39173934445432d"; + sha512 = "7feacccecb235690a3273e8bbfd9cd45e2e4ddebd4a30eed65377ec201c98a5ecb63a45886c41aec4fe1d4dfa166c7d4c5b822a121d6f3f7702fafc63c9a095a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/oc/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/oc/firefox-78.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "02e1519ec4097a990325cdcc2e13e70c16b25febb466d9d06db64b8b0c689c7246546d0666a71003a533d73d0b73b472aa8312d9bc59463dffde979618570ef8"; + sha512 = "1f7bf7d6bebda792134958c7ae598c5860afc7dd32a8f8b70a11084ab00fc901c812fd47e15e029b592899a1904f014138e28dab99c72a7b8853a441cce89f0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/pa-IN/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/pa-IN/firefox-78.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "9f7218eeb5abe8f2196b2a43cc24a0cf6cd13dcf8801f7b57100336a90550bce23579dac36353fdefe542714e67bdb86102de734ef74e4ccd29a55c8f79a2689"; + sha512 = "43b7f857f528c64dd1a32d3c44e4213901edf103808997b7349d46580217379d8d00c4774c1bee6e1abe7824f732d720f8c4339e16cfeff09555e958b9806157"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/pl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/pl/firefox-78.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "d986bfcc489a89a9f49defd9383904043d36d4b29b02715186977cd60add217845dd1785fb457228c71ae02243d10a110b563f18fe5352e68e315ffa8290848a"; + sha512 = "51f5f6b92d6b7f6f0c98cdc55173c4be863486a1cd2ff92e8e69dcf87bfbe155f5cdfc91647b9d96f391d7dfa9f0ac336a8625155cba2fec01fced004318ed07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/pt-BR/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/pt-BR/firefox-78.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "cfb4d9510ec5e35d25d53302e553c9a85f8eea4120a236dffc5f2350b70868016b852bb1d43eddcc03b7dc9593f8f76e133fc8329c000f315f68f2e4ae5e3201"; + sha512 = "f779d42be7566a8caed7274e7e4670d468fba45338039ce3d8d054ede85a8617166f3b0dc1c9d42f38c91cf37f456ed364562ccacc6d85b81aaa4fe9e7e124d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/pt-PT/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/pt-PT/firefox-78.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "335fa2e31e66f0ee0323a50154dcbfdb1516b8376a587f0097e40c51c93e3c019de3e1c4af19cbeb4f57c1b736703b82dd63af91e53c2af5532eac42d80fd800"; + sha512 = "e036d8a0a9cab40b66978509754bd3c9b076f43b14361a7146d23a099d5e01b351ee9c6be8ea5540041575b9f273ac853066a1d2c8d065209f468c643bec332a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/rm/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/rm/firefox-78.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "f7f06e4ad2f0f01f398afb5e95c4d88e6c045d57c86d7e004aac3bc79c29043853aeeb4a6162fe004ebcdd7278055a19f6c25d60887ed451905ec4e376eed175"; + sha512 = "016e25d74cac3861e67b530dbddf113c73008974d050492d5e36ae5b1a046c469b416a9b27ff9737e9224a6f57e7605c9e29932e4899812c5400210bb822a21a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ro/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ro/firefox-78.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "4017ef08f0f1d7fb82bd9b7afa72a617a3f781ef6296b97b9c351528d8107523df5c2dac5aa1ca112cf6e6b5aaea818195f3458cbd20b9f0cf88b3acf09699f3"; + sha512 = "8871ce1e76c0d931b3f9580c06d8f5db6867f8718b695ff326c2b96bc888e7f777424ce9f11bde1f379c5c34a45557c136e08993eac2b007c2cdc85161e7b7f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ru/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ru/firefox-78.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "7aa2ade09571ea44e08b12f2c758e56fa66eac8cbd49d90c28abad04b99f9fe005eaa04f5b6b238cdf56cd7a59ca388ff769c862310dff0a41d952d35f1cc7a5"; + sha512 = "867b09faa171c2fd43eada03853a7914835f940edcc4da4629233d58eb93dc56743e2cc89a98f33f0506bfaca7b1d50f41702b3390067f2cbcfb1c3e5e468571"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/si/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/si/firefox-78.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "668df6d1741a9d300e975d1d25b42931a7eb3c2883c33c4ce1a585ed7a065a589ff569732e1ee04ef8f25c84d69ec3458f92263aaa5b2a36fa6da8a1ccacaffd"; + sha512 = "2837c84696fe73f606460b4ee10df40d50b314cfd12638ca5960a23638b6a280d3c7e8401e0ee30d818c3ef4d3dafc122b4a4247fdb4c3fc396287cbd710e9c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sk/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/sk/firefox-78.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "e295e69e84a768ba070f087aecf3cf041e67bc297f144af5eed9a75758e0d322f730b797601fa0733b1b9260f5d3225c899ccd80a3861fdc77ab1ce9179dc589"; + sha512 = "c107427fa37a058a2615ec5b3a5bf62352961c52d844bd6cd529f8587dbfa45a34447d5337b920a44b6ec6d758e0c99a9f4fcbfbeb2a789fbf7fcc025f93e1d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/sl/firefox-78.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "63dd33ca7ce582b4f3284e936f54469a4c31ae1006dcd95ec5952dc4d97b2d524a91adfebc041e8a7b9358f5af847a6fb6af35b41af744c2701d408f64d181d6"; + sha512 = "241285d567ced17e1fa0662a09246d5a649d9bb6df8d8d5cbc768a158e4cfaba9af52911ff947f04421a4a0a827ab9749477224e8983263af107ce38a989470b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/son/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/son/firefox-78.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "801bbdd3da93480dedcc13589c77dd2bebed151df9ff468e8d9d2358f69fb57c22f8916a9581e460ce4fefed6bff651126f92ca588392169556444c21a4aaf42"; + sha512 = "591dec019e12f076561a5b2fa12f76373ff3b6a14c6faf5bda03458e42704d7494b1accda213746bf614533a0ddd6204f850e2bc1e5bb78b9284bf00b33f5104"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sq/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/sq/firefox-78.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "4eff5f67eaededa77e962609ef7da1af2b10f5510f3d354d5d8065957aec115d827da0c0ea056d02b5d7c11f05db7e4b91cfdd6bb0f879ab92f6fe84a1e137a3"; + sha512 = "71b49311b94d5a8da57149109d0ea053a563ec34732315304a500195e099d72662185e1b574343d08115bcf7bc21c2bb6f597aa8368f83e7d7e16b8e8df70d08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/sr/firefox-78.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "d688aa2911bd7925f6be1307bfad521ac29364f047b8c7d683328b95b871a7ca0f382c103babffd518f607eea0298177d6ce145511271f3c92b8e2de81da06e8"; + sha512 = "cb2f33c0bf14c14a2116c7e3d8e9031bf18ab425ca8be93986cd3821e9821a4632959037aac37167c92ec8e1b686fc05de7373a44861692f21cc3eb6b2f0f2c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/sv-SE/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/sv-SE/firefox-78.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "27fad5bd1e0a2b2a06ff48c90049ed2d03fe8c463ce5a5a5b5a83a24add6d1fb72ec83d02f4c9e2e741c3d43b86e9fd3a821cb6d158d3fc940fadcac9d040061"; + sha512 = "6e27fc83d6cca90de08232606b4ef6ae11b747bbf09469d883c9345640fb15bd8f979bda8daa54a07e4a4aea9b4ef0605b078ac99ae30085dbf93a29414a6866"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ta/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ta/firefox-78.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "1dc96ca10fdedd37369037126c48940c060ec1b0238cb4c592db79b3154c8e1ed167152ebbd33bd7375b241776109222c1c3e886dacf4f885319eeeb7e33ee8b"; + sha512 = "3838ec6a15d35c0bdd2bd7208da2ad2e35d5c7e80dd3c46e3a319c2fdd002dbd00759907293460ea9bec42e1ae9888bd5dacc835c01479bc881de65b8a0b5b3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/te/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/te/firefox-78.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "4c203815b896aec1a94416ae2baf96dda2c0c035da00e592ed16eadb9b729710d5cca26cd0d03fc654576b9458b4c2fc50be159164e6ef1f1fddf90609221eb3"; + sha512 = "f4c2904d4df49a09a74f578cec6a1fcad2ad1fea1f0c04f353a331506cd4083ae7c16791c6157da065b78ea7c1508e88ba90c58c1293561ad830f66771496b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/th/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/th/firefox-78.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "22ae877469cd895afd487175ebf04c6a10b42cd7b408e5dcb352143e457690bc13561395abe15db0bb6594074f2298609fc381d2137c5e1aef2af273f17e2489"; + sha512 = "db604a6658da979ed156a7be315d61e506ee8ca525b4d6ec10094b8e4dce033f42123af68bee24fde4b5ce8e6d31e0e840a113876d20681d7ac0e3d4ac4124df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/tl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/tl/firefox-78.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "10d60e3389f43f1206a3eb1252897d0a047cb14272f8408c61f34eaeb227966e8e43f9fbb92d246bbffde77fd139e5354fd2abdf0abc91b8631dbbb64635b549"; + sha512 = "f2c63196954d2cd15255830f57620033853a640cbb3ce2bc38981e637e8edfb72adff3c535dcd4333c2c33f5ae18b31515cefa13bc4b94f51a08a61045e5a917"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/tr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/tr/firefox-78.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "c17c8ae0e97b130ee437752410eec9d2bbacc84aa2e5f13e0c52147d7540fe6f76e91a01b0c94aa81b1a67f2a7d8ac29fe9e21197b659a6840c3c9933603c119"; + sha512 = "4b77f48d89724bfdb5fd3768334d7f4fb5a8d66cfb848bcf0588283cfc541f8e2be97c0ef869df8f55319c5796aa4d9da9b4412ac70641fe16ce14b294aa1653"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/trs/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/trs/firefox-78.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "df664c21640b9d36c487030a5db3f83a2947f375a7bbea3fef9a86add22ebe23f482091cff6205ef22e8544dacad43345302a7b34f0a4729a8da6670ee9ec9cd"; + sha512 = "fc4fc48f1f88992de1c3a78b3e51ccec0f8259e5faf2c8fed9305bc501b567af54c28a6c5c0be73831eeadf47484fa620969f16995af81c2b6472899e4b48c4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/uk/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/uk/firefox-78.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "68f6c6a804b40441cd5bccab2e925864ae8642dd2be6433e215e1a786043b50eebb8e00299d47c19d5b3c52a86c8a0877a511f3142299b906ea2bf4bcd92099f"; + sha512 = "93b9382cd9b3589b293af321347d73c9209c23993293eb9b3d04ea3f5e7c89867490a4991f2af1c04014b278674347424ef8b1f997ede7ef68a8556ba62b0565"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/ur/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/ur/firefox-78.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "05751d956fe5c5d3662c722bf97af4056e32daaff5b704e0f514a16529d8110ffb6caa4207747745b9c46bdaabe51be658b15b54168fea4f0b27287ba7ae9173"; + sha512 = "d882f4226f507ca329dc7b2aa1688d92963c470d5ea206516dfd3f450ff8b7ccb0057a2018db64387fb6eb83cb7680e9339ec97b7acde142d12c76ae10a3e482"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/uz/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/uz/firefox-78.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "bbc479208f90b22da1a8cc154870b1b2eaaed25395525820c5add437186c7e3a391545f5efef0d1b11e6ff82d5cb7ba85d1a0872e919cd681eca7abf92aefb92"; + sha512 = "14da50d23bbb3f6cc810178bc7c401d7899a332dc3d1f35a6047a9ba4a213421da9874108d78cf5f8d16ee1a20f06ac4ba317c537037b3449312c100c33b37b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/vi/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/vi/firefox-78.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "9414e3c51efde79c1d959036d6365416cb421d0cf37bc5e2fbfadf7673d5bd87d506e0ee1914949292c4cdb9061dc93ec50c405eff5cbba8bfe5f1870afb4948"; + sha512 = "724eca9214b67c43a0be06174a7e9ae882791250e5a58bc6fb028b4b0bd950536d6cf66fa675812b33dda905640e6fe57105b941cb98974d6e6863a63291b1c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/xh/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/xh/firefox-78.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "61c8b31b28f406eb63688258757ba072065eccc91cf0195f03721cb774ac3e5d5aca0fdba27e09933be8e4106e30ba39ba4cdcfa85d3bda1a8e976695a3e47e8"; + sha512 = "4923b2624055b831e819904d9a6f5ffbe8522e7053a321801e351d23ec69c3632fca45501a14c6b6e649d4aab2bd046fcf72eaf25859fe4201137761a8dbe82c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/zh-CN/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/zh-CN/firefox-78.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "4fc2046f4f2cce47c27876cb63a7b07024b639e43cd01c771bf01ffbbaa70943dab0a17e08ecf63d47b66416a7fbf89cd37cb06dd0eb5d589f0e58168632d6ab"; + sha512 = "73723489e99810134e6e9f07f23b0cc2ac536604cc955784e401b23c3ae6c7a45f5792e6adf936c16599e2bca9f6127562ece5a67d68a7a5912c10dec7298a59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-x86_64/zh-TW/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-x86_64/zh-TW/firefox-78.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "5eaca5f3d81588547f0df7929f8591527c2a331d52136b23aca547e7d97b711ef45d1b5309d63b08eef44897fb9ba47d91b0b94f077856dbc5e6db3bb62ae441"; + sha512 = "c2b43aa05b6a0b8273343207e8d0717e42e4764ab450d34ecec4e78e5d27553929abb2bc6e52901fc9d3647f2ec3832648c54681c95a28f649f7a3d713969b19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ach/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ach/firefox-78.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "10723c4bfb26d00637f4e190330bcce602b80b4693c4321b7fd7cfa58cf7ee33d8829c0afd23c17c836ef82f03d5c7da98695248bf932264697015a2949a3576"; + sha512 = "65447b9eb40a8d8ae0cc9af3c05aaabc02fef60e761d6ce93ac4e72c0b6ea0eca92507f9e2d76ded491ac552f76e55278b02563c6d3ef8d0b3f0a6f504cacf9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/af/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/af/firefox-78.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "276a26621d0fb37f9c57bb5de992a3213cfc97ddf891b6fbec331722455221d71b1dbe6f5ec63cbb552a1dd0addc2ca8549451facd83d9b3b3b5d88fc0e5537c"; + sha512 = "3f26293e523b3562bfe20ae0e012ac786d52cf9d248dfd217c08fb6c70afb333ca9c864aedeea45786773eb6ad30653dd816e2928a27b56d9a317ca45333bdc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/an/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/an/firefox-78.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "2cd26f8507a49676c32fb7c9c8ce43a9df082a965d59340ec794f11e85077f126a2052c86ab78edc6087a1fbbed3e58e773930f20a5e3e69fece29df0931aa1f"; + sha512 = "fa455be7b92e3090a00b62cbacffb6b335a6d4c4c9f4b4850d73bd87287939ec324fa088c26cfedac5329a6a8bf8d6d71271b27e90342cf9abc260f5762ee6d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ar/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ar/firefox-78.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "80a4fa4279f0121fddc956ebec61b9ad2fc4417f8e41461517e50fbbd6d44278640590e4d4ae383a3e1d732382f037ed7bcbfe599fb08ab21a0d98b52f32d0f8"; + sha512 = "3bcd0dd9111fceb307ddc4c1cea8b14427a738415ed971503091ef3aa4133a98a6b7304ecbe0445a0fb0d9101fb5f480056aed82b7248a705015e17dd41dd625"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ast/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ast/firefox-78.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "68392bec35e5ae6913311c7f6187d916dee6e3702663e0812a557e331a5cc4f30cf8cd6555abdf132ae7d638100ddbcd485bdbbe1519693ba34d607e32c361e6"; + sha512 = "3813f1bfcb630a28221380880956ea7c02a2533ef3d1fd33ce08d0b90e92b0ae7a69311aa8c455b7f8f9b17c7f5f3483bbb25c2588c642bbb5585caf4644df46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/az/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/az/firefox-78.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "e15dda365436f32ce3b553f63e459e5d32c5a00aa3b4413899c9028e0b18d1a575c33747cd621d1b8e08a84a77ee2ead5c5fdd8b4077055dbe96cbf2d223cb05"; + sha512 = "10c84486c32d57d5a41ea39c2ec819127fa7b9208a37b3b8aa8051e2451f8a394b6199a5d9c2941264a1d9c22ea7785d105de9432ba98bdd29b37953b9927f0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/be/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/be/firefox-78.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "46dc546bf28e57f7d2fd462733eb7486f88d4198159e77873a5b566590fa1b81db8ef4149dffcf60cbc6aad1529be11b8eaf5aa4fc410600a4a1eff3b576f0e0"; + sha512 = "da55714687a00cdfb748e528e244fa7da8d0cee203aa72c99198a6dabfc0bfd40a8fd249f73f4f42cc9cc884eaacbb6e278543c2d48285e886d566183cce461b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/bg/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/bg/firefox-78.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "f44fbeb1b25249a28a9fd77dda908c3247f85f788ba22dc131155e6c21d80450975687e546a63291832974555745e29bc8b8b177c338bf911c212125a10f95c1"; + sha512 = "a562f67837cdb976717943b7e1bf810b76314c7a5b4cb2b7987edf6f0baeca702e1cb8cac451b0b7b45e1fc05ff9a0e802354216e2a6769fb4259f318f7d2fc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/bn/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/bn/firefox-78.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "b2fdfb72aede045bbdf03feeb38d0f8530edbf6f2e9ecd9723b481365eaf0827e879a38136e6d72efb666138403205c13cdb10a1018e5d255a847d8fda4a2507"; + sha512 = "e3efb7c6d98a6da05551694b893569fe59d92f7a3f663c102a914439df12a1ca22360dd59992246cdc18839efdfae1a8201447959748f2421055902b5c635c98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/br/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/br/firefox-78.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "68cd1a7eaabab81400c78e1fa36850dd84fae8f2b05d5c57a4769beb7948d050b6cdb5b4b6928afa3a70ab9cd97e37214d67ccc5cebf62d09b7c1194ff410b24"; + sha512 = "d9fbca8c9769ab531842cf7806f6a8b330718b54348f2c574b674eed4ac2e34bf10485b1dea1dfaffaaa693e9e999d263555a5c64acad32be9c5e940f51419e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/bs/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/bs/firefox-78.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "4fa4d41a85e4746e383bb514aab8222a9c0aa4ebb1779009a50e891c672e6a1002ba454ed24d7d4fc4f0f79ca53a985ff56981acb2845762085570bed93da3f2"; + sha512 = "fac589bd36a0c11394b16ab6ae14f843921dc2fbbddd1a6deb934c40e4cc991fb88fccc5956852e701213ea173594bfd70a51a9e08da0e28eac90d705f730bca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ca-valencia/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ca-valencia/firefox-78.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "23b3a60a34fdc9dc31e54141e5f62d21fc118b9932ed5b0eef6614535174c107b113bbcb3c42a940fcf6a86d1e734d5478dcf840f882cad6a772c6006c8944c6"; + sha512 = "2aec110200e687b04f7363fd1db5202c52bf92e46e0a3e442f0a70bf1510d9e0ee85da7d9df2f1e17a71421ffc2514b0cc80ae8ff880c736769fa38c4205364b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ca/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ca/firefox-78.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "227cbe52a302f4030fe610ba816c70c5051c58732964fbe64462b62e879df0e35069b0a5d5a862bed87c21f36387fa43bdb82db827fe58b1e1d80c966f0ccf5f"; + sha512 = "de4dcea94ef6f3b561c2d6edea8806a02355048afaa5c545f18364d0124dc661e9f62bec43172a17bd2ae908c3c18525fda2eff1a640f2cae1270b98bb8a32a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/cak/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/cak/firefox-78.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "5a615b7de8caefaab8f4f75401b13f40f3cc4ea23404f9a998979402789e8b2493c1cdb88b56a450b3a0bdc075a42722d963c3f65241ed3b690398d0d71dc196"; + sha512 = "1a2c6e2ac7a460ebf27113a823ba1d058712f4fb8af43a6d6e3184181bd6a020f4b0526896c3cc3849e638ca00a146d13f3c097fd265d4a6aa4cdcfb01ab3c82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/cs/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/cs/firefox-78.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "75f06c1697372e0432e8c6e9691497e0cd328ed7e050a0bdf76acd3513328994d734c4ebddd923e2d19b5a83142c4570e16f3079fa6e0406ac83de25e3fe6e42"; + sha512 = "1fac69ae3512e217a80ae58d6d7306de8809c66cb89dde50beacb1532cee67bfc1b890d8534cec0bd8680bd41bf80b6b23aa96cfdb7a9ec279c7aa986fe8c754"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/cy/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/cy/firefox-78.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7636a99636e77e4a6b6ea20c6d73eefc11c91691d0418d75a3fa7033d844c8ab652cc5dd1caa1c574dbf4c1a143ed738c08346af4ff4323493aca461fa256b44"; + sha512 = "f905804cd5188df40512672418e08d452e246239ff4828ef9ca72ba73ba6a6ce8cde81da42ac14309a9a6fe4be70da0f042de14a402b16ebbddf5e06eedabe7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/da/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/da/firefox-78.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "0a591e75f79f196dc45630b32e237e8b28cc2ae8463ababfb36b1fa9ae4f271eb53d7cf31834de8ebc0e453b89310e5789996add2f57d0035d1d9a80369e6ae6"; + sha512 = "c700d63c9b4c4111510fe87b332b42293ef420dfcead03e8333078ea573f50b588b2424ae0241793cb8e3daa5950f7fb2e59bed53d1789f626831d1f5a278caf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/de/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/de/firefox-78.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "fcbfe21676ccda69d67f945260ec5a62a7513b5d4c4a51dadd252d083860f2b0d2ca0882714af55485a0e11b36a0059c87db682032901506973ca54a8e341c38"; + sha512 = "49149c85054fef48963ad597e3aeed058d8092085cfbdedef3c8351639130abb577acd97183d82ed94a07e489153f1682aa732cefbaddd549f12e0847b74a01b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/dsb/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/dsb/firefox-78.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "76e8200017f7a89b0418ff555ef8028e38012fa520ca2fa83239290eebfbf4c1e063d42bbe288e6d32daf9dd27d463cc6fde2d8c60e7a3b8ab2cd442742da450"; + sha512 = "50494c8898e560d14045c2f3a194773a2461be0467ca0474a69c96a9d8dcddecdb8035b9775f7ea21c8db4964403b9870580016ddf9a514528dc46a818ff1e78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/el/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/el/firefox-78.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "73f5a0f278556b0c99eb479407401f19ce228cfef164ab1cfc61c766052beac10ad9ca3d8bb2e9684d31db75b764572203ad22682f48af3db9d74b3b2c7e327d"; + sha512 = "856deb9f7cb0414da90fd33458e1baf5f1c2cedd90f011ca93c43759731663cb7a57f25b0f9c5bb257e971b84037ade4a25bdc28dd236b073efa87bd390b5dda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/en-CA/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/en-CA/firefox-78.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "51d76ddee014df74e45fcf960fbcf61aff4500fbd86d4ce99b9f52223955af2b7f81bf6c66501085460ec759471a8ea45d45b09295d3be8f9d03a3b55d788570"; + sha512 = "48ecaca7d79a411e722471a54a48775033e56585698c9cedc7fe1cab6e930aaa13db430904c34774d0a35c45eddf7de731cd6838714c1c08b6924bb2f1ef5703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/en-GB/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/en-GB/firefox-78.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "93aa0d761f68c2b5b6c387284418795a77491d5f880d3cc0fa9ccdea2971563326545fc9dbb1f5ca0bae19e7199553c757320706e95afb2b77c00c2e06fba911"; + sha512 = "8e09e975e38d20a74045316203b170b02a7e49b3671985f899777a589d6df96d9bce9e9e5531cc51ffe25f7dc1ced7c00e2f1dc3051fe2e22c12c281d7dd3c32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/en-US/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/en-US/firefox-78.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "b3da650b9da5df10c611aeb5e08a6f96be431a85edc0c3768221faabfc3b302bb23677b33527d23d9df37aac7b83daf869f4a373d461893a9be83d1b74937e87"; + sha512 = "ca939f5fc630dc4cf56da09dca8ec0ba4f5817598558c47f8efd76c21a82321951f3cc3b446f2949230d6fa17bb71a0d49a8b118e717080ec466a3da0841b317"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/eo/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/eo/firefox-78.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "c089b6425c683a1a75956fe50be90e9027693eb4bf3dd7b19efcfedcae36cf8c989898b5d6e69f15810be0a2485a353fd0d6a1ef9041e50ac62888769e9187cf"; + sha512 = "f711d740ba893ac1839d55b73a9e6b87b58495dd840ca25f8407dc32fe215dffe748ad9b32c2697503101de9f3193b895afc8b15bb1b0b8c711b59e3a12d83fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/es-AR/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/es-AR/firefox-78.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "369fe08d54a48e9d6c5260b03c4af124ab43676ba46d96eac08f71b4bcd3a9776563e6bebf37ed523828463735792f6a160e222cba912cea9020a84b92136d31"; + sha512 = "f6eb98206ffcb15a8275f33b9352e9d47ecb196cd10ca4ee982af3efc61465a6a01e1b3ea5a98e1ebf5d04480ceb0767c63c29ce6ee7dfb29f6259cac8b26e2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/es-CL/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/es-CL/firefox-78.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "dc9f850c487209b414b77d9bbebfbf3c32a8ee5644dbb2a9a119fb0f9da6d3d711a3783a4151dbf3036b9f94c28273802893add63238ffffdbf77cf213686c12"; + sha512 = "7e6f2e3f7f93d8fb225edcca40691a1fad91dcbb6a8c9f560e115f91c5d4e795c307c6931fac51f35f6c01566e43ea365792b45afe187181f117866680fe19f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/es-ES/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/es-ES/firefox-78.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "331a100f8b71ad1e33e436e0d03c37438e0c7dfaad9f280d627dd02c2c28e28756d7856d36e407b84c254ca45b88a761e9a940955a8aa52c0c558fb98b4e6bc2"; + sha512 = "d510a7d0d5d56836dacfef82d6d36db83e0d39f8ff5e99b60314d4a657534af3faaf585901726c72c50c1596e428dc4660349e6a632820b05df4392b622a420a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/es-MX/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/es-MX/firefox-78.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "c4ce60e070214ca4901e153c3033e66cfcfe8d0ebf9c1d1e448105467b8a129e7904a3293fb3d895a6380a0e54bfd007e5d581bba4f1d2ee7ba3cd44b5117705"; + sha512 = "b76dd14bb471330ac0b7f71322bbf5d04a59678fa2f53d3e8da2092b4f5f85c0fa1ec5c118edef2fdafdd790fe298da11db3f068f3aebc3d3044062cde7c02b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/et/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/et/firefox-78.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "bae0eec7d0578f8ba911f71505d803efcb8b7005e6e6ba0bc7dc36093f462c7f704c1244dddad5d38249204b553cdf8b0efeb12c235db171d98f5e2827d085eb"; + sha512 = "8a33f0657a000dd86ed6b29053a71a809230211d6cb1760fccacfbb19bf356784606b27fda478eabab9946baf181c5ce1cf72344912fa8c08dfa6900b9081d44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/eu/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/eu/firefox-78.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "821d3b331ac1bda31543c08ca678d141f640e862986da1c5b0e8c48981fe88252cacbc728b63e4552fbd83dcd086268420f63a0afad5a37ab0348e7d29828d03"; + sha512 = "71f1e7dd684f277b3b752e419a0551823efbb64bebf6bfb8b0e545829e39cf0bb0e4c6c8113c10ed15017d4a3bc808b4c7d82ec6eb69a29adaca815b96e2c900"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/fa/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/fa/firefox-78.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "1ded2445623c10c5b348041935c03050eebfe1af1fcbc9ca9c2bb630a38a095408f3d09e9f4ecb9db4e06ea51d9aa139ddde8531db0072f6a57c7932fe302e80"; + sha512 = "0f996af648c14039d0b55624dabddd7be5b34d46c1ab6753bd7cc719ee4b59bd3fc457add8bdff4b48274ba3bf033976e9640b783cc296259cd92f5defa65f75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ff/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ff/firefox-78.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "1f3a2d9c0c981c20f1dcabcdc5c8b6a8170a238f4381004183f8381bc1059d65d650374f03d124d22e821cb8d9bef59d59aba6ef132dec991b72af4c77f61d8b"; + sha512 = "f2381760a6d33789e4e0f5376ddcf93191928f0cfb857cea893881ef17a158f9773560a885d7f7b8a7b21f0af93e9f775d933367be926c6c1fa82b8c29baa8b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/fi/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/fi/firefox-78.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "8f4737e9bbdfae980faae68758906099aede135167cc99b3ee98eab85e6d9d22616e8043af7f02981ab96b885312a89869980a06fc0ddc117806b1d5f9b2d3ab"; + sha512 = "c7d0b61788cad2d853079e15409d8d1c0ff9da151a5a6b33b516f63247b26e690e5fb9adb96b816ca7c7948bd1864b92b2b95a589fa02f0bf0724ef2ac1f6020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/fr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/fr/firefox-78.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "8680f38e6b9d56f3339f243e99cb5d541d6b2eb10a7210d8cd81bdc91f35dedd0de3b551e1b857b216806bda223c3a638cdd7e786d97674c5b7ea6710f669304"; + sha512 = "5acff8785a75ff9b96dd7a2b054f4b5643461350611425c8fa80449fbedafa4ecae52accc2e3c9511b4c3217785953c4474adf75a5e934339e2b5460606d2428"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/fy-NL/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/fy-NL/firefox-78.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "aa34dde7faed1b86707f71fe190abde730f0ecf33351c487d1a2fdd369dd67375d122a266fb5dc2b28aba87c93663a5606c43fe3092597b04cf9adc752c3bcb4"; + sha512 = "9b1128b1afa525777432093cc0fdf48b06b4d3ea2bdf74c5fdac2105555d1713f2f763634ae42b2648f0b86948ad86fbab18df3d161b177d0412a42cf595f160"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ga-IE/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ga-IE/firefox-78.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "bb1988e6b4b718cc698a5de87b9f339dd28a2d552906c24fbe9d67385c70e3669eb284220f506f3afe03949be5df0178af1d13c727716e1bcc07d9020c180661"; + sha512 = "346d88d260c4ed7d17cf0500de558b2525c9da2fbc691dc26db74f71338b3d246fcb8acf9f636bda19cbea8ed8c5eae80e34d7ec2a6cfb0f7a951c70befe448a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/gd/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/gd/firefox-78.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "57b665e7bf404a0ae8c7602b88d987ff550d66a2a72c47ad8d163d9a697cef18753dde981d46471c5276002ebc5464bae54316e595d1d2aa8a00ca07bae25d69"; + sha512 = "14cc5c842b52c5bb7d98cd1f10ede92ea2cac6bf71ba4de15016f7deb6584de480e8e5ac6b6386b8dd2f3e2635c313ac0d8d159b0cd90049140d3a17fdd1f7b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/gl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/gl/firefox-78.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "409cec1407ab01070aa75a0234ecc82e974f00ef7391119828b1a2ab019c62b5986a15226f620bb1fb403288d9aabded3bad1226ae8ce516476929a181b0ffad"; + sha512 = "47558985a84547ad0aac4baad9daf7a5879348f058e6c4cdde961e8bf47bc99940df5ef060787e0851e591e123beefe4b815657570b9cf586c3787911212aef1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/gn/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/gn/firefox-78.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "e2db32222279de40ae37392af9df330ab6d3bc1d1a583c93530262ad541b4d3139392a5d0043d6e9d0841fd0eaeb40c53b5e6f3f8fea762ad160888012dc7428"; + sha512 = "5a5cee3fa7fdbed998c8d00e8afdc35d13e36d123334acc1ec12774f93027822757d8e6651cc8268aae165940f4bfa5281e6dc25b0b45225f40b8fa989f777b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/gu-IN/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/gu-IN/firefox-78.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "99bb0e4244ad5c406259d627161c8abbf5dbedd664c83ecff6767656af8e4101c8d62081ded7a8cd1842d739689cb6aaee02bba593ab162dad3139d5b03ad3cd"; + sha512 = "059f6967e4c348f4f197978374ec3417303d7edb38fa149d67f4a02afb79ab24b147a336e309693b321699450e89e3dc9a2a1d3c34b30a147c72c21c195aabb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/he/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/he/firefox-78.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "ec00d7c46d50f38d0d43efe2e98d6e404398676eaee9640a4148e3cc196cb73ac62711a188d32c167c48bf048a5e0155db714172ba0bb7024dce6c2122c656ed"; + sha512 = "8cc2e6af1c19f6eda9e58d1ae4344fc9bfa1db7960a68b3cab58bf797225c9af7c1cc37de517f36ea256232e3a1b2ee31317fad7bace6b59fccc1b0e630c574f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hi-IN/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/hi-IN/firefox-78.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "e107c3042a1e9ab1896a7b98dcff5918b8b3adf35d3e50fea5847337c505d2cb4073a9a15fd2d3b4f6949615cd8b0376541e715d686388e418d5ce64c1001e0b"; + sha512 = "1e8ef514b83625d69e60201b74dc2f249407d7e6a77331176b551dc7fd31ec41db8e5737f411eae82c6210932aca24397578892a258c4b6417db06d553267e10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/hr/firefox-78.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "cee9eb9a7b13944d2dd4c52456cc44404b2377062972eb3c9992499f3835d352567fb05560829ebd9db083f62bf9722d9c0e9610d439fb5d79c2dc120542970f"; + sha512 = "b0bf4aa0ec4e94fd88e73f6bcaaed55794376301ca13dd41bd6e9c9cfec5422d70189a3d93e1af3e7d0caded3ef41d3d1301be72902459df4632d38d9d1ee9c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hsb/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/hsb/firefox-78.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7936c949ac42d69b573f8b6be4055cf3b4cc62a8ad7c5c060ee4be8aaf0ad1e9e3c651289dab7c159e8ab18584374023dc605629233f58d944f13ca87db574c7"; + sha512 = "839e610c2dfd6539dacfab136ba3437f238cb49bb93f842366e0e44631ac252b5ca66efee3ea45cde437b0a34e2d6207cf870cdac7ec459c31aa8c0b61ccfd96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hu/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/hu/firefox-78.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "a68299f239c80c1346a5aa559fc5dd6f6e6dfc13f883c2e7be88c267725c837b6ca3c4dda06e5bf6c81ecd16739a1921c21bc71c3caf72944797915f452ba450"; + sha512 = "26210c60e62492403079b9644fd35fca15d523625fdef000f30bec7b8bca4449eb202371992e0e57724117562b011670c36d1381c6a5df02c69fa71c558dc7e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/hy-AM/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/hy-AM/firefox-78.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "a8ef4b5467d58ef6935bb4525363d38a9167a00a8ad84665b2971cae231c60706ac46618d62d183c19ca2eaaee04d0f386c845cefe6eed3a3e12dae188524f2c"; + sha512 = "c61d17768cc011ff87f37c936f07cee2ea357853026fde34d1bf3c023d267d973a70b0fd5a211c61b6fa90ddaa8771557f540a91fb13e11af99692bbdcba8367"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ia/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ia/firefox-78.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "5c3b30a18467b416b109e2ff48e3a50c1cf10e550b22436115a44d13aaa03696443a5fee6c978e3560ada583fdd2806f3f1ec13c221dea097768b2d282d12160"; + sha512 = "f39c527b12b5ccf8be9fbcfe7f41d292516c9162ba53e4c50e363082bfe29852054ed716d658ab2765390d979b1f9411b657780f52008b37a2cbfb469292541a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/id/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/id/firefox-78.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "bfbd86bd3eef27c2eed900c23c29a0236884b1fd4d858ee8bcdda2a071abe1d042624b31ef258f9ea415b04ff1d17e70333c6507ef2a534033f1869e742e8b82"; + sha512 = "43dbd132c882807d982005a7ba06fb2203b6e1ae6730a19663fbb97b2095548f20318461a8d6172c36a401de3d466aaced1fe5d4138ee9f9b998b4d3ab3f8ff0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/is/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/is/firefox-78.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "459e4c9686952467d7e179c1b4f9f422e6445509813b0e0fba200e46468dabbefe59210a2cb218b226a6c41a333a64bc17005380be7e319015d722fa70a600fc"; + sha512 = "b8f3f8c3cd3dd3f509bdcdc297b82f89f8fa1c009076f52bd043c93d5d9bc64021a5accf85a4ca32c0a4798a28804c58d3e1d06ed38f85daccdd87de9490d022"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/it/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/it/firefox-78.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "6cd7c36d28e6abbcb92582b14022e56b048481cda7832b93c5dec6b0b4e38bd99de121c433eb0e90c9ebaad2bd00f681f22fadd09acfb1b669c0886544ebd8d4"; + sha512 = "0f3edce0ab1b5f0d93967d911a8c8c43d77e13c67ed0a2315de1e7eea313b274fafe4cecb903952b58aa18736e74f8485db4e495a9f0af5a6ca85d8f01a3be03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ja/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ja/firefox-78.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "cecda310147fc3298bbdb250d4d7a5a66225dd96f1bb0317b1846049a15c47bd2b7579982dac583dd4eaa1cd8bf706e7213b0c7bbe48ca980070f413380a133e"; + sha512 = "3f402a586c19bca3d9ff94a2b112397d07a4fb0932fd4cddafeacfc3a3a51a92c214faab644d576589f1cdb30da38d754bf20aa1eaed4cba8ccbe8c77b9c4e74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ka/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ka/firefox-78.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "ad29814eb9cbe19061b361c23c896f8bf8cb21c67d36942a1614af74a5adcb225df20dccf3af8d34dba27036d38feb758a945cb69a66c6ad1ec0271fe1c316b6"; + sha512 = "45b82ba33b8a76e756b45bb0336ca61b3fc11d1da4f7fd4bae7d8d50753145e6a39631c92d9c1419cf33019bfb415b20a162322e3bf5bfbf26c8fdc924581c13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/kab/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/kab/firefox-78.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "cadd0cb80e9d00d2a4f6f5a5274d85b23eaf802874c813a87fd7464d4cf7ac528c4b2ff30446c7cb438fd1faa514c80a2576d1d6b36779ab983fac5fd6654317"; + sha512 = "34e0335cd1de216e3bb739ff511145d281541c9edab43fb8deaac9a5a65b343189af1f2364671832d466af00c4cf9d482bc764a56296c0e8c0b37891fd068dfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/kk/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/kk/firefox-78.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "033bdb4274c05b06b2c1fc3822a220aceb7b39bff310de6fbe2e59a097eac77a6aafcd275be690e84334ea7bf70c6bdb1a43f4bec0b82286e42db7797348ee57"; + sha512 = "fb250ac0f2d74b2b24a91b6c5f9ca4ea9bdff99f0abe4fca4d93d62d30937c881dedae847288d391da7c223d905f01f78700ab21f59b6e995413861e51624569"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/km/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/km/firefox-78.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "d028d387c7546ccba6b3001d006d0243300d770b1e255cbe02841bba759a8b4d75a55a68dc5f8a7dcc869badde9d7bd38f572e26d544444190ae05c23ff4b9c6"; + sha512 = "9621469fce50f1bf0c16f7fde41e54ef2fea567e55a7af9f5dd2f47f7dea2e672f3199913f98e516c6064fe03956f14804ac27697ed6b947117a23aba8b93fec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/kn/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/kn/firefox-78.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "e7c17380869b5f47359bcbb82fbe6b2b16d814536218bfa1447432f0affae78d6c53e68a7ff7153e0e2ed72979c026edf6e8a9689b0cc90ff3d10919b3e06061"; + sha512 = "bc918bb40d30339f4beca3b1ec825573af65d1f8b641c9c2f117c19d60fd7a6f01b728eebf02045ed1483a0eee299d6383e7d350b10676a7ba4be5cfa68db251"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ko/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ko/firefox-78.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "bda7e81ddb11dd7a197a9e6e286b3a8cc10e3c3d2a627f5c970643427a158c7615901aa05fc4da737586d5bd86eb4411a23e5830c1f6af582963f18c169eaa05"; + sha512 = "4cbeac467e660b3105695bd780075b5ba4bbe7c20bb58645b8ad8f11cce3b35e3d4219e91bd532f54844faa3365dceb8b162659dd6107b7f0758ad3fccdad8df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/lij/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/lij/firefox-78.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "4a2a07e90d9ec3aa26557523c0c20d1aef34895ee06ee02dfedbb6f3d612623c23c84f10eaaeaabb35133e3f69b9545dd8720929ea04b73af8c9c3acac53901e"; + sha512 = "5a3c102eb7ca88d0f57bab01526ce56da999b9cb33fee3bbbc4814a8fbe87fef1731c33aee74d19ca1b54bbfa506f700cec5172bd85333e8adf22ec9c46690b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/lt/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/lt/firefox-78.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ddccb22c9d0dac8abe9c81782293834213a53b182ae0650b7904c6cc8f5777255ef642cb442345c64a1cad96d0ec8f45ce6d6cafb0e6405474c2a8e972250254"; + sha512 = "22950d65b5c0ccdd8d44ba0a22db400ac1bf7b7b4e6a6c88cfce0fa221cdb6111d951755b31976388c1e12e4a87bcd3a09b647f1a19704631d7e84c946c59020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/lv/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/lv/firefox-78.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "86af4440803d27a5f6312b8a7dbd0d5f66fd1cf90b0e9b1cee8c4ee3b555927830a8cc3a06b6c72a66cee4e75d7e11168060d8681fa1f7c39ea2522819dc893d"; + sha512 = "bc076c273edb093544354a58f5dd5ddea3f5ca48cde1f5ce16ce2ed6f887190ebfa4635d6c76fe514594d975fc3d85467bc1b1ee5e210350eb8697a39efcc011"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/mk/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/mk/firefox-78.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "e3876258021cd0d3197af334eff967ef2d1429eee880b63ee0d88569b94f0ab938b5843153cf4b9e6608c4c63c50682671ef4f6c15d8298b43748885f8d57c17"; + sha512 = "62ce405f2a0ded7892d10c0a2e6b5181c4418f0c649113e95cca7ac8fd4b210512855c3c946b49d083ac6362a8fd9eee4b075088a25f2e7febed1c4381a6afe5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/mr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/mr/firefox-78.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "9b7379aef1061ffc24f9f70e28dde4c5828315bbff4848cec7764a7d373f3590539a052e6578e1e87d214263f009c831dd2890f3d7a7eb071b0011f75402ecc0"; + sha512 = "5c34e43b053ae99b0600746035bb0c3021962a3459ee2248d7b8f08816e35bbfe07d68ae25ded17c2c5bb9bad562f76dce8b76fa95b0f286016f0797c3acc6f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ms/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ms/firefox-78.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "36d44b200a554476da7c63918b709d57c31741901bd33081f493d9ef8bfb27969d491381ccbb8f4a21e48693cd35bc1630144121c8871dbc0d1a87a730d467b1"; + sha512 = "d32c992d672cf93b0c006ee75d26a81c4a0b7525acd2a15ed55c7635cf573280a5277212436c1707bfdc0b4f5d25615f09dc66a1320675ff709f40d4f0dbb25d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/my/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/my/firefox-78.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "4e290ea118b8b2ce63879a926d7992a3a231343ae98f9d6f61de720c5c39e2b4dd5b2e63ce8937945b02cc6b2acad1e7ee6aa3c2c15441e11270d817ea2615df"; + sha512 = "372378926e0a8ce7fd1d3ec17925c1c62071bf54a9a3bcd7cff74bf17d566759aea2016ea0592bc7b1dffc3cc6c8ab9fcc72dd00be87647f8b9642c1b9749b5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/nb-NO/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/nb-NO/firefox-78.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "82820f7da33b522f6e4547f650ff85e8d05e8b2142d2e113b9e0d94af560792ca3314a1afe98d3f18d3fc0fcf887de601bc22e93101908cc31a2238af359d150"; + sha512 = "a92c182118f1a26dc8b89f7e28227b1b6d6853a3e94c2738ed21ec6815917e23cd8421cc936014c3f0332849f5d54e51f4791ea4187b0dd03eaad900ea82fae1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ne-NP/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ne-NP/firefox-78.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "591699f34737fcbfdf9c72b12be83ba5bc83bc027ef439c40f5b0eb22014fac54b5661da9fa0f118ed82bb5290147445f4d703e40a152ad4f7d2cb7153b9586b"; + sha512 = "c10310967c1f111330c854f3a56f8c725159f359a5a6c9d1a7c720c06bbdf1d3ea3a923cb3b0fbde27c532caf8c5322fdb2762ccc19f688f8b4f598f66bee34e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/nl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/nl/firefox-78.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "fbeae8de6a8297a9e0fab0a10e2c95aaa2d82af7304bbf49fad7cae69f26c5a9dae9de4d84614a1061cf9a82f71abb7eba2e8cb4988ad93d1b5667912ee537fb"; + sha512 = "47224a690103cdce2f4d69de00c2bc9e7558097b618e33ed018f3d57a0e063d79fd9eb80e7c88c028fdf339a83f055ffd04974a31a2610c2d9a37bd2ac42bb72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/nn-NO/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/nn-NO/firefox-78.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "4cbef717a02fec48d29a9f0ed80c8db34fcee2ccd1f2cd6e0fbf0d2b0d36cb5101bbe794c59c8bdafe28c6286eb4c0fa28942c77b3d4a4c047a97bd66c41b7c0"; + sha512 = "a58b83ab6eae5acaa0d2139ac539ca13039dd63c375bdf2eb95b4abaa77269da17a1f997df999135097577a9c3bf18211f640cfd23a2800cad4128e3a903a776"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/oc/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/oc/firefox-78.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "5a1cf2f3b9200c0fc039ff7c961eb7fff97464f0259c4b6a5fbfecf54d7d333abdc8b052d3138278c87726769bf7b10f2bd4557493e6e666f96187386289c8b0"; + sha512 = "acde758013dfd86a43eb3cad09a8ad75956b5710ec81674c52b86f644c37ea209d3ed0c9e06832536173f35afd5b405f203d77e42d8eb59143b9284ff33d51b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/pa-IN/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/pa-IN/firefox-78.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "355656300dfd9bef921e2123ffcc633d0562798b5ac692506c87204f2951f3800c03fc3e9e85c6dc9110644b17e40fe5058149b805255f43b1217b1cd71aacf0"; + sha512 = "7e00e99034133d961d88370bf7603c64840cf03d0d523b8e446bdfc7fb190b419cbd99c8866b718268771c51aa5d4ffb8a2165877c595b444d0d591f94bf6d8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/pl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/pl/firefox-78.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "b677c207bad42145fac04efb40d9c48800ca0796536ece583d6588f612a3e7c1e5dfa8476e38795eac7362ee0cf4ff60e803bf4263bb6ef875337688d2f9897b"; + sha512 = "d02d27a4ed078ba7107fdbe7c8f1b0ef1d99b20c4c433192bac0acdc8a027673d59a1ea95d260bf2ec7f031fb79941d0c79b69c11f18661b50b8af8bcfaa1c8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/pt-BR/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/pt-BR/firefox-78.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "96e99c72d3131b7e920652a9adfa0794ed67932adfa9193796a8375e907a6c7817a21a2aa41f852e5c58897f41de8394c8e7e81462d74900fa45e2b3b5837d51"; + sha512 = "bf7ba18527b78f901fc92635dbc9b04c9537dd102df3beda043ef5b7814c1d5f8e02df223d96573bfeffc5b011623d46df55fb99e2f5ed335b56dab376b8bfd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/pt-PT/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/pt-PT/firefox-78.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "2c119a0774f6ae8802a15ae24f2a1fae50da1d4a2f676e3fee7349745ffac497859aafdfca3d092dd3b2dae7f51307953337281ca3274a2746503161b93ff2d3"; + sha512 = "211bc0e65f67e71c135be3978e90863239452074d93b9b17224ec6ed7c1ecf3abf10d71c7dae69e3bc1aa53b68edbb5d14c504caece2706f18dc2a50938e19ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/rm/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/rm/firefox-78.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "09c9669f36b03be27b4defde30cb3c20ea2790e18a05a2059bc79ecde006f019053cdf6c8f0eb2523de0c8d0fca3b2f0bd9cf02b8e2b6d9890ca3ecd51abe965"; + sha512 = "b60fa5b45902d233f33c95333093ec996029e7bcc0586ff471f57cfad0ca09e965f59ae2368534593aec33c5d40c5975d7afe7647392b5fcce27801ff923d59e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ro/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ro/firefox-78.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "24b1b5587dafc81a45e6ed89db33cf0bdf054f14a4d7e883a4f779573d17fc04cde1065b22243d0e0827c73accdc0dd08619a56e8caa04986e7500a57916f95e"; + sha512 = "131283028606faa40f9afa3c31cabd57e91b61db89282b62d32f788a173c26f0f5fbc4a9321c0c1eba8468e50883782c0324538857f8086339c80820675a1421"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ru/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ru/firefox-78.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "dbb9654c696ac29966551843b6c27d0867750565c21e84c9e71b6443bb5557847e109826ff550107bd56008e913c625e89ac60268f4cd140d2278a4eb82b1a67"; + sha512 = "62afe480c4aad01518850e9322b793ebf8f5eb9c4e61f784eb3c3397397ad98339705e10e96266618e560ccefd62f728b9e0342cdd2153877c378aab0f9e19c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/si/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/si/firefox-78.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "a47e67c9b3e6a33dcd0dc489e32d95f44345593fac2e678610045fe5408928e12445551011ae87d4e6e242f35c11ee0edad2b6955485394d1f55d3d4e8f68dd3"; + sha512 = "dfc664dc033e1a9e7f9ac7ae388e61f9136614258cf3008645aa1b79d6fa1ab255afb3498195e9fb8633012a21fb10788ba1af13fc46a600650517198b16acb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sk/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/sk/firefox-78.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "c73e183daea5adc333c04b0c473af3189c2d24f84ee352733b211925e62c02cdcd2125c4ccb12fa15b08a48bd0a690a06e39c364108ce47b834b321268cf5488"; + sha512 = "6d4e4a4ae3da2bffe8311eac6c12beed2fe49ddf7c816c53b30265dfa61d3ed77033fa69027e7701147ea40360e6b8a420fd28ef49c5173f43dbd136a51c5c70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/sl/firefox-78.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "7f64f829c83b5483fd3a839aca41dbc0e3506576d633f8c6dfb9265a5bf783aeed537ca801fd07f8356b71aa47719e742b1bcf680f4a6d6c21469327bfa0b9b9"; + sha512 = "e9e1724749175624c21a8c031fe7109a0d414411b769d78c8c4f68ac70e58ed433734df15f32a37403bac489688e7b6f9035850f69afe298e4dce9b7773d68a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/son/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/son/firefox-78.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "fc8120011f886f996840420c07bd7502622f63a1b53b7d918c16ba1b60ed76a737bc6bd27532f03262671cbfc0f094e41422f5485b4c6854d78d4f95422141da"; + sha512 = "57711af5dbd163528758887f10199d9a2556d6bca9586ed98c3e55c64ed16a8e3527e17032c87a83240eef82f1c03c36390ffb59472af0bd4f14d51bf00e79d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sq/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/sq/firefox-78.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "9116b54651b0ed2caa04f7c9327cb1fb977242364ee17ea19e114d8fcfad03c08cc3706ab6e355f91ecc3d1f6232955db0668e5f7f290d191a051b214f06b779"; + sha512 = "7b4425743d4f6373ef3928160e9715cf8f0a6df5951fc8d4eb26a33ba8503d85ce4c4a9a042d8e82fff5a9c8744fe73705f31c5708fbfc6b22b883d2ae38f1d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/sr/firefox-78.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "ec0ac112222d35bf2345a91f448677ccc24f213710a1d5cda976c6ac15b8d3ca28bc32790f301103cfd3f2ae52ebfdf41464b6fb95df4b0f8535238b714649de"; + sha512 = "0e8484d7e3e938b422b8d6926ec29981cb1dad6eb1beb2cf40bcae798a3ebc244171eb573260271a71b5d1b8f73e3214ab84667bc62db0ed12606032a70b93a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/sv-SE/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/sv-SE/firefox-78.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "7e3a6c8da1143c3cf19e3f98542ed6b3e9dc1bab0667a2e64ab82c5f68f9623ed2196ed4378174998070e72a77bf00d5d9bc9d727b319d1c7699992a7bb67aef"; + sha512 = "14e90a0e01c105aee367930211eb0981c1b821f965e1fd44dafe64d464aac1c2ea6bc10cefec2b6d3d14709e5a0f48e11d8de9c6ebcba63c5ae8c4b9900b726e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ta/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ta/firefox-78.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "5e3d653003fe036687bc55f4f5f0a2f1008ae58a196047654a1a067d88c7cf06b132207a3647ad5d3a707d85322d0d9eee21222c832daf67b9dc2895e6cf75ce"; + sha512 = "a6b7953a0a1bcdbf21d1fc60904b211143d28a81ec682f85863447444d119c4d0dae4c57e2fa3ece195ebc3339dcc30ceb2a00e4a5d349a20fa43c9b7a6d0343"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/te/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/te/firefox-78.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "2f42f73eb590ed605e1871d11217027abed2dfe0d2bdba2e9c29c6cbcc5c639b48e4bc26b8a6807c316dde23005e5e1010ebef4c4dfb385bf2e41a4710acf12e"; + sha512 = "7ae2cdfd45a3ad4a8ce63eb3e6d1bbc502bb8a1d33248f60c0477e5c9de2252f68b76f22b484a3a0fc5937bce501a2fffe7029c5549946dbba09a08f7e9e8da7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/th/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/th/firefox-78.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "49f4f6d2f5dacf108debe915116905f5da4c65bed1c13d7f2a65b8b21b0734a34add68c6b56c340e90f6f82ba1f8cbcf9b7fb2546ce64e33c73e2a73e9b3bb17"; + sha512 = "d0f9abe748a54e08ef9ea83732b19330ed0a2f856baac2fa4632f0f0a669889e7ca2dcf79f7082d3c34ce63bf1be6885af453db3a59cde6b3a0e901abd1e3932"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/tl/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/tl/firefox-78.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "6e4368b4a0ebe0b296eae341563f8712567f08c7889b0600cd5c0ab881b1de1f5bf8e657b5ac497746fdfe087c8bed902014bb6daa0ce4c2d3712dda614b698e"; + sha512 = "16efe912b409fbbceba3ce735bf33fce1dd375953a5702b0fb3f5b98dcb47d6da42226255c3d791d52eb03475641f0483687743783527ff024481cd8899a283a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/tr/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/tr/firefox-78.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "fedfa95f6516d3685d73ec3997148eb0954a8ef6713e8cffc304080937a1962a26cf384a85e937a9394150d52fc9db14c3a85b8b483d18615759dd06bb04a558"; + sha512 = "14d7b6549394f771577fc3cc66eb693330d8072b312e42571a2f21e2517b96a420d8d05ccb7d7d3fca76278a83b5d74e08e8b762b5909d2a9a3ea27235b3ce81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/trs/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/trs/firefox-78.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "3b165460a7a34e5b2a059101a508a6353ca7f89c03c9eeb7b062e734c2cb1786b1cd2f9415cef7fd3ca2aceb72b4311b2b5da778f96b51f33aeb39cd7e69f1e4"; + sha512 = "5b0588f1e0158628e69d40d9dd4c55ca516af683eeec6958a22cef14533bdd6919291ca59bcaafaca7b417102ab1d85ad03c8656be58c61cfbd75253ce7c2dc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/uk/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/uk/firefox-78.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "02c39e86a144dcb6ccffaf4a6c6620088409b8a098e3d2d92268d5b2dd7098c01b9a55878a9ebf1a91552b3f1be8dc86a6a8ff514e3988ffa51e581dfcf43b8b"; + sha512 = "c8e637d13ac8bbf99c600fefde0e81b425d33b98b16d589523b0cd75b6b9401a87e1d948abc46792cba841909999b5d060cbe108616ead4b0e18929f02872147"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/ur/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/ur/firefox-78.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "d244301b2ee17b78a1ab20cb7a8fe362b6ac86e0cdb9d811afc11c0637ad3fe1e1dffb721411f36960ecec011b7b691a12df1bef1d257c22ae45d345096b7166"; + sha512 = "03b70706b159204ba3d6fe64316c68060862d427336d221883d9b37604c548a350aa52ec24dcd249a37f77360eeea9b89e536e31af3880bd220eac5aa0a88921"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/uz/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/uz/firefox-78.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "8fc3cf2b1eca9b229ada7ca632fd362e42bc1063ad1bc22df1f6781cf996d179dd8e8fa231e02ffb12dcdfccd6f6641735e0b4b28c6e2a1a9372d80c0dc8fd78"; + sha512 = "b0fc5aebc14e0c524a0ae0e679a4cc780efe7f373180895640c7bde4c31253da5bcd0813b70177119442a3813a5195993a1520c08b47f840bcc446a833f9d5d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/vi/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/vi/firefox-78.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "3676a6246a7fbd49a5779fb2b9ad3e14be809228e15bb19f81ca3b880ee5d584c4aba07d1a94ed2cdb6ec7549409d7738750422d06fa2415722d3424e948ab98"; + sha512 = "024695dbc003c4a59c563eb1dfd433bc201532c19be9963eb777bc8277df67541f3f09bc38e87d47822023183a4b5e124d0ad4025df35ed8bbfddf538ac683d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/xh/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/xh/firefox-78.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "d4a8d251a4ad5603f301ad45f7eb3518066f06668a765d1583d067e0b89caa87f6699e1e06f67853527dd352b903c4b3a063d5ad7d19d297a040671a98aac2dc"; + sha512 = "3890cbb7675df1d1690313abfdeae82f4e1654bd0bb48526b49bff392ab550492bba4ffd72fa0014254d3da175048590eb612f8964b143bdf6355db61ae2cc51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/zh-CN/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/zh-CN/firefox-78.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "2137ced68047439bfff22eaa7bccdeac3b0c30c7e71e3523c54f47a3127a8f0ecf6ff3a3ff789e05c5df525f3c3d32d616eb731f022fe063170d3c67e459b093"; + sha512 = "a1a993beb48cbbcee780b9aa84b70db84b7673ecdffc5f4b44d627420aeee2f524c86881c13be5765b303290d22ae9aeac9bec629a6895353be1ff3d998e0465"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/77.0.1/linux-i686/zh-TW/firefox-77.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0.1/linux-i686/zh-TW/firefox-78.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "23efdb7382ea3483784589fe0cfb9919630f34e5418734de9bd52ad9e91438a4d86f8760b1c4a4c127e1fe05de19ed24aedd0e21c2bdb32c5ab62183bc32fb18"; + sha512 = "bf6127a3ee2b8fabb78bd89094ca568559d7fbb4c8c47b3426d61755c1435c8d30b27ca8325bc296ba4bfce7fd02771e6ca4981697d598aa3943226473c4cbf5"; } ]; } From 84cb46a37bfaeb16e90527d787962f8637b682d2 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 1 Jul 2020 18:10:26 +0200 Subject: [PATCH 3320/3452] firefox-beta-bin: 78.0b9 -> 79.0b2 (PR #92043) --- .../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 f9565a4f8a8c..07e2f78b1963 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.0b9"; + version = "79.0b2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ach/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ach/firefox-79.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "fdab8b20137ff4c5491d6d8888d3ed96939f167376b4de9a2636b055a936e1b18e458cbb9ebbe34a65021907fb97cb6367470083dc74a46d7a3cd15bfc008f9c"; + sha512 = "8121168a85a37f0ca6f4cb52eb7e972bee79f8c389d30a1e938720fcaf53a50d5d869a8faee92089eee04965d329632f7d3592dfe7c22e0e0a98711a6c152e74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/af/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/af/firefox-79.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "26c94bf548812dd7641e9ed2a741cca0732e5691ba391da684f2229abd50e78795740b04b4cd7d6e8b66d8d6098360d1f115bf9cf6216483093fc7298328bd32"; + sha512 = "96c3859b75184a1c9f862e3070f4896863e88fadf4e4b2957b59e5aa4b04c8501146309c08faaaf864c267a0e97fda78cd8d3e256242d2c7544e736688dd12a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/an/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/an/firefox-79.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "fbff456586aea9dfa174fef02d056efb7f4b85f085f6e59e879e5ddc8414f5f0c1089e14832ace1086cf11b7bb6d1f58d34df6b38dc79c8b3ec420f64645923d"; + sha512 = "357855f9972af17140f98ffb828861a024e5ff62ac89d1bece5c60ff224c4698695216440e563c7d6bbdf00d2db7b148afd20d6f52ef6a4d0a93367a62090444"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ar/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ar/firefox-79.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "5cc255be9a6ba2c559be5f882211254264ed4bdb5871cbdc6a6edf34c2ed9d6fe399d85a978c146f0da26260c741f5887c33b68c85acee1ea1f72a0d1473a033"; + sha512 = "dfa85e06e332edf8bc93fd4a5031c73fc79950fa29435d2fa7bee4e8b3efb016fbeba44fc9ab8da42a625dc0fd607dac29a9889ced5b14b315cb7c8bef2b665e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ast/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ast/firefox-79.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "1ec2408d738be67191e7f19bda47c180ff13b5eb6af54ed6aeab4105eff493b2ac185141deb8446ef7e474207f3c78518d15e9e9dada173905bb6f3fb96babf3"; + sha512 = "5c6a4d09ac192c29424891c8cd0beeef4416a6a62cdae9dca6880c1726bb77157b1ded58df4e0f39f0a74210ea84bebdf863bc4fdb873d573394672873c9d9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/az/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/az/firefox-79.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "375b60d1c023594b4d5a09d2b8d0d1b36942f7083a6cfbd577ebc5256970b4c4c9e81631f4e3671eb52597b661d220da701eabfcde180fa01fe3ede5c1ad8c14"; + sha512 = "9462678e576dee06b96897d83eef339bd60eb1dfad226ea65230e1f364b05e97d63a217c99965eeeeaf1880b84b72d329d8f253d2e2bafd453f5e73e45970761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/be/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/be/firefox-79.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "4a948d44708a8913c1ab991fd60c245d8d2708ddd23bfca8fcf8439e2feb8c597298945964770a7dbdf183128b44a4820c2a15473250b6e31a20374b35f148dc"; + sha512 = "8ef88d4de1bca70398dbaf59639596e160b6183485f09d7b87b6ae7deca8d07cb91d0cf4adb36581ba8d078d5bcd8ddfb07beacc255c2577f7c40ef01de28582"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/bg/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/bg/firefox-79.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "d0283703ee8b06db0e48af2155d6352b4fede42676511e47229ad452ce10ca2893babf3aa82258e434803615bff8822e8b5379a6f8fc756b873eaf4b9d7428ea"; + sha512 = "08e86866fadb33f718b792bacb3c060fff9587254e031d20a056ee1f6ad2caf4f03f3b7af7ae4b8d8ad06daab3a23cdecd2ed4fba58b5547cc56ad7f5ccc253f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/bn/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/bn/firefox-79.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "9d0b8365651ec1b5e83defc18a3310fcf9b3b6d262850970500d73fdc226be22579302042e0f7095d041193c02e09160dd1c18f53e702ee24279d8fa9877579d"; + sha512 = "c2be43c67926da8f023650090f8659d8b1c3c8ca990f59ad527f6fa0d58576a6da17eb368e3be0c4d5e0ebf6466b0528e91c5c17edf909d1b6229c850ff3362f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/br/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/br/firefox-79.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "e0a576a6ab6227d38b2db3211990c02b56b695b138e66386a56fe7a923a679f5050478e043cfeb8de80e8e7f42379f03e2a08f3954d6f75453956918ac8602bb"; + sha512 = "2ab0c7f1d16057357da2b08aa0613dac3cd2597617a2e83720ee0bf5194dc26be39f2242651145680133f614e0e7d05ad6f1b24401f3617e322ea19e398c09a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/bs/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/bs/firefox-79.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "f9fd7a505326a404acd15709317b0c18db49ee52ab38d3ab7912fb1a3642d6048a8c1384ffd642a72811362e7340728b98c2706c1e54e59c8e238d8dab19b2c5"; + sha512 = "8f33043617bc32d7f5358b80117e2fae92db97ab065698794a1b41e1bfa21275dd3c588bc88b0c63b5049408b8d089010212a4baad837795d025bab051ba9a42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ca-valencia/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ca-valencia/firefox-79.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "89f6383f6f5d8c8d84fc2e95da88543eaec61a791aac15afe64fe742ef5996a47f9dce74bbaefb8b293f8cce3ccffa744ccf182bb3083d0eda2c6d3ab268d1b8"; + sha512 = "0e2f8230cbc020c69dc30dba77047e2d593cd5e0ec23fb0f5a718419b1314648b390a19375d60989a9de7658e11935e4ba353e08b024c219645628ae858663ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ca/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ca/firefox-79.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "822bcc56277b75b5d329e3d5e58ecb6ca37ae95ccd6194efbd5d21494a7e87f84129aeebca8f3d01620abaa29bffedf85058e54b633c0dd513b51a7a6c93800a"; + sha512 = "271ea181d32c49026c6dd6c847a7d85eb0b2288b909f5ab26dbd66fe8ab84f4536b99f557148346f12bfa3b931d81fb958732a7b3d9a308f4a3941233c302886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/cak/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/cak/firefox-79.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "c317d87b9437b344a46426c46905eeacab73b450719bc14e3666d18b1fa3129457d6670082ccc0f215b0e7d559745a886f3de9991f1a53629af9b67db464a6af"; + sha512 = "a8216384d650f6f122489c7fcad7452d79b87aacdfd5ba64ad746739e64aeffd0619a30edd2893fe34a89260e058b4182d4a11c51a5d1f6b838be5621b3fc3df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/cs/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/cs/firefox-79.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "ef661f3251ff6dcea7138b1c014ffbdce61f9abc1116fc2a7bc226cf01369347b19eb949bdce3b0c78c476c81144c1f7ca8824c81df70282454818a97001ed52"; + sha512 = "a5be4944bfea32dd34b1cd4bb58d49540435c1cc5f5f67f96273be4a106aa08534a005b17c248b1c108776683e0ba7e1bee888c7de49e685f453765d3b17585f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/cy/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/cy/firefox-79.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "df3341bf1815ad4e415d1fb57a638e2ef68c3dd2083fa504e1ee09276962aa26fd8de327f37c92270d2eb724a9870f527ff16fbad13bf8ea4b4ef0136f326220"; + sha512 = "a1260fab795fe3ffcff9451d5225b76fc72fa0ca161b6837660bb19f23af8812791b87506df464c2b0ac771721e429a23545d8d861317954c7f0c7742d6e3af9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/da/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/da/firefox-79.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "bc8691f460b1074cbb5ffc3641d20d0678aac54421d82dc99f96cdf73f33089ad3ea388945a32b4dce76c2a6a1221b8278ba1ad545b95a08e53e012ff41f27cd"; + sha512 = "906c9b756448b0ec48cbb9629244caaf95bef5ebc2be27eea223df4a7ca20b13ef9bea64cd3e095c6a034f6e8424602abee88daa7e9d0ac28cb103bf2d09b268"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/de/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/de/firefox-79.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "aa2ab6372a1de1afd8d354e85047329c445ba47e0c7ecd91f8282b48e05cb074b9d024f0aee0738c9f3b3efba072fd40a7de6aad7d3b77235003f85824143637"; + sha512 = "2c020ceb71886fcbaed8fbe35b5025c95f0896dc5dabd84aa39f669c45284a15f166ca30a262d0ee2f9e21619994b598821b93414ad658a708746b9d0b496b97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/dsb/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/dsb/firefox-79.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "4a018ce1e2fe5124c72d8270acc97c465c88c5ce0606930cb12db7f36448c46bef17a6b1b118325278126b0553008276c4e21fe514f0eddb63d03fb52ef8688a"; + sha512 = "bd943a44e89d92254a83c01fed4577682cc7337f32d4d999649419ccf88d4aa261fcdd2b18ed716e8aba0be14b5214881c11dfb7afd5d09ce212cad952cbe3b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/el/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/el/firefox-79.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "1dc9c12e719030731ef2ec505ba7ff8b9d437ad7092509b2d8e6047d925430a96ddd80143fd5a6f10076ad0100583bfea8b28909db759bf01f381f73f25311a0"; + sha512 = "776f5eed70dbbc9407e32032ab1952259a549b87cbc7e16bcab3d55be6a6701569f262231bc56a67fec60c3b17db024644715424a12d6641166a1b904f933ebe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/en-CA/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/en-CA/firefox-79.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "618d1f675d80c155a5f250e6bd21b16293220b0b2db3c45d50769cbabdad5de13f5e28f5447b6533219a2a741193025e0592e6a78862c7604c469cf026f8486a"; + sha512 = "85a6fe8f2a085add6aeded83b2adaec3694ed741a9c08b358db284ba4eeb899a72394897d3a284ecc0ffaf03612bbb12f83cb4ec97ed36539a1e0f348f7591a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/en-GB/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/en-GB/firefox-79.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "a1aa32aee0084b9659378e4cc1ffb899edd3e46a8c040a6036bc63036441d9b2f47091a48aad119fa912e2ca06494beb2d67883270d87d41142f5e357a30fe00"; + sha512 = "ef150feab4b4331714682595cf519d7121d7707427a287e8e50939757aca20e158142e17bbd7141d1f567f60efd6f0cba4fff48b2273931aa57a62fa47826d9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/en-US/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/en-US/firefox-79.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "575ad9a880f68480d4b185f24a332f8243d6381d5bbcad66f91a80a313b88d4e0041af3dcff6ce93d7391c9f6021998151b6a2842d13a243e6d0b860d0590037"; + sha512 = "91e98c47d587302db70d2710a8d35f5288dffd8ce859ccdab3df1dbdd39d4f42ad705454179d6bb1653fd79ea1680c4b13e8330219c5d9702374a1d7fd7fa7ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/eo/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/eo/firefox-79.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "e89b6c12a8693682d0d7f1d748ef6b45677db13b4391fdab9f2c0c7e03cd3d569057c4d0131f79b0a17f4dbef288e9e69a3bbcab1bb15ec4305a5f3851896b48"; + sha512 = "ca6fe5166c3e5712d882c65c44c42f9d67b09a9f46d96034e79ec7f1912d39087a940c74b3a50193923334ce415178b0ea73b4c38e43bfb81548e815e0a15363"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/es-AR/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/es-AR/firefox-79.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "36de0a28f03ad285e8d9a071261edcfa19346716f131cd82b3b35bd672b766a1a31fd665555e60a84e7534adab8343d24cee78f1dcdd314eb540b8e22b639edf"; + sha512 = "04f53cce081bf96270d25c49c0ba3354aa12c6610926f343358288e12e5cfb24bdf2ceba3c7d557950f2d63cb70e5f00b33385c98a4d051c3f8e388c789715a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/es-CL/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/es-CL/firefox-79.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "4aca111e3a8b7da1ca828b3a8952f4864683606b622d83acc6be8c2775573ba41390f2c2f8d1de98b0378d12a38c11a5cf0b048cef5f2fffc4332d07634504dd"; + sha512 = "e529fc5cf945aff8904a9bc171e3a0ac4f9b7af980d83c5f702e5bd444b2bd3ca7f079fa2d4ac970919bac20ebbd04380a4c8019b4a643106e73a8a320ac071f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/es-ES/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/es-ES/firefox-79.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "52c17193bf79164be5466c8563f7d22e961e858a2ceac5229f234aa8613135cf025a80fec26c279857d94d5f6fca5d26d440265f76af20e181598895126b87b1"; + sha512 = "4771479c9e530dec5796d76f3ad3050fbf6e0990cd02d9f586f59534faa02bfd96ce316fcc81931e0e81d5a9ab525381c70cc031adb919b8cfc83a83bf94f3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/es-MX/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/es-MX/firefox-79.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "744e556084ede6c9bdfadbb25c71d72d56ae92dfaeceb3e21139e02b5330fef6d6f732f88215cc08ef79aee48a1c7616b4d39cae6d3833560cfd61ca0fef061a"; + sha512 = "86a2d3c7942a51fa5e98ecca4a2c0778dcc0d0359e90d179cbc1273cd6f61ab77c98654af04043a4f7cca38be44778a1ff4aef2de30cb5e3eaf81dd37c725cb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/et/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/et/firefox-79.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "2f9fe3fda93486e2142e27a1976b986f997b690b506aa82a9f75701dcaccb566ecc224d777915c32bfbe5c55d2b42f1e9a1e1768f4c8dbdf7616b43c5fadbaa4"; + sha512 = "44a260b69abcbb1e924bae06db548cf864638ce57fd6b5d62239a5ea090981692a4ce029cc194e134ebef2724dd2323d152b25f0cf6b787954f2f28545c944b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/eu/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/eu/firefox-79.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a98f966a473029af2108631200ef08cd29b5b0f4abc391294a20b346d40c00794f0ca032c9103e888d7f38d08e25b8f8a57dcfcf713bb30d847262722871bd17"; + sha512 = "7e6fb0f370869b70f6288f95bd43dfcffb5369766a2e6b975c1ab8ef98c5e1b6e901a0241d10eb0ba0f07d0d067208dd69ed08dd87f96a18b51121a6955a53a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/fa/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/fa/firefox-79.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "2f3adb926df4c296b1b38ba53cd7880714e009c005f9627a164b1a59aef6f921994c398361845dea6d0f7591d55e542b06f4dc162ff1d66b4f04c4916efa9eab"; + sha512 = "73c2fbcdf2e99569020e8c5a220a6dea3acc5c650f9f370e9aaa3cac2fad9914516f9e95611ab701887459f00853ef660c21e28480386a6635ce8ec7b131dfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ff/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ff/firefox-79.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "e2692acc18dad0df35759ded9a37ad525a88b17c1471ef4ee1b5b550173736b57b1df525861a78861e824c9deb211c856e7e6d8f4adcff02ce8c9cf152ae8a0c"; + sha512 = "3f1fe3a06892e715c013263d7b8a0280b5f29f8fe4bf830f1357dc8bf61fcac546826508e8d7007d5ae761119b6c7e3de36980f5a71f9c8a7091bcee2d9e469c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/fi/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/fi/firefox-79.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "67d710bbf74c9b51530f1146e0822c533e8847c73150305428ae4ba6f3f4529edc8b68fab15dd39037ba921a6821412dca6c4713a5566f6a6bed6a8e1e204fd6"; + sha512 = "e2db5cb1a5bd6090d42fcf881d79f1f8bcd021d1db82f43c2970f4d4226ae42c75899e0d7dca568c9b8064ef7fbaeaae224c6b46c3e1158d053da4f5d9a13346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/fr/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/fr/firefox-79.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "b30b49577339e3ec52eaa4601c703baad0ea62b0698e67df328f6c1830acc03088a77ea34768624b4f352c2ff2a09dd219e3c676c0088c8a5345f61e7a94210b"; + sha512 = "839eb98cb6793ae39e02c99e82be09593eded7d1db42908fc25e78822bd54f5f8ca704d5f4dd3b54e043458899e39da6e154d39f779f186daf288c6a33261f42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/fy-NL/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/fy-NL/firefox-79.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "fae9b6a80a49bdc5709dbcb3812ec13c758050f0cd17ac6e391fe0e1c3d5e0d2bc7e025b4303575351cb4c9fd1eb04d678569baab179486808082eeff03717b7"; + sha512 = "3a9409ac47a38f3534edb33014aec98771cfca47e25aba0f882bbfad67ee0f98b539d8b9fe546588ea130c52f4a4144f396286360beeb4d1c7a63b8124aa50b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ga-IE/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ga-IE/firefox-79.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "6fa7670a546178126f87d8820f3afcf0d8b470c77a8f151382700025eaa4bb7ceca976037322e4dafd2aa27241ed0d7d0f066dacf742cbf301ab0f2f73b14cb0"; + sha512 = "f8ca5d0183edd58e9e3041523df577caece3a40dc3dffa0a3c6579f0fc9cc7e31e398490389339c2d55b0bec64c5c1efce216e457f6bf136b7045f45d681e1b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/gd/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/gd/firefox-79.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "26fca8fdca9927e8436e327b90a0d3453a518a7013830a3cadce33079cf805d8c5861d80f6bab078f39ddf0f80fca0a27be5fc981b0343c88b4f9849ac387ebe"; + sha512 = "d867c1f52a5b2b9983361f21b93010342447dfcfb63859a5b3a89cb8b01eadea7d876a8f5ca14551c3f80248cf2603be000e5f18f42e1c61b979fdab8839e8f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/gl/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/gl/firefox-79.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "2749fce67388b56e2e705ff04b75e72408c05ea388c9ff082cc79094201a1ec5a869f2ea9f79b96dc90169f861221c210f43d51e7fa16e7ab532af4d0ee079b9"; + sha512 = "cf9d371bc7863c376627072cb4f33d43bbe9db95f6aa2057daa174c675e22c2dd2990c6f0e38a25780f202a0fa3330603d62cf3c3f4191dde98d75f6718c9a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/gn/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/gn/firefox-79.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "08f9308f7f6ea1df67085a381b19bd614ed773afb5d038cb035c38c54d440c5bca01ba2b1573ea6ea89ea36e99eb326f2c313f1239026362826425c256bcfbf1"; + sha512 = "0e03264ac8e4e24fb71646ccb2dd362564643b3e93aa187484e6ed8c3779262df26706690485550992404443a7f7d37d503fc554c9834901936cebce0453e0a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/gu-IN/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/gu-IN/firefox-79.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "4c54584913907e49558961af5abc0099a8afa9c53c65adbca4b963d37d6850e10139942ee3b18fd508256b4d49ea89bc3a9cb3375d3454154c82fb65bcb39ba3"; + sha512 = "a546791a410e6b97d79bb0050306585422835c9203db1b65a14574230556025b896ae53c85a8ee77711ebf9339097f449bd57538b7c56eb5e2be2df2ce157295"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/he/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/he/firefox-79.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "658ed0ebcf81ed906ebe3ae5a056b544ba1a5caf95fc0d3387a84f439a493fe982095f0e5c683f7da989371f52e0917a7358a3c7d27f480f48d66c74a5deff04"; + sha512 = "5360b710358f9c9bdce1db619a91d8c5a2832a5b18a76282e442de4d237ca80fc7b00eb68e78930a626ba17d89230726c041cac405b300fcdc89a41d84c366e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/hi-IN/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/hi-IN/firefox-79.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "035a5a1d7104175985e05f93bb4899a78b988d8f229af35390d4ad53abf1b9fb71b7f1e32d1a5ab9396b067bbd79e2f3e2b095b65d0e23250a207c05d3e852d2"; + sha512 = "93b0ccf20494fa383b57a7098e6b8b2bed4d2ceaf182fa7684961961068f73e6c724376106cc1c8201c6c8d846febe90ecca7ea5b426ce9a28d7a7cbc4a1bbe5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/hr/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/hr/firefox-79.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "d1de8fe0b1765359281619ca251314369005d0769242be2edc77b5ac5e6535556157046c8de0ef58304ad49410b6cc2a249bd2b1c87165664bbafee43613ab9a"; + sha512 = "c317620bc3bccd6e5575b58f7238c275a92bf1a16a7ca3cb02bb4e648d3103581cab0bfb7cc8707406dafd93f7e83cb6adfb5bfe2232194aff7e48a499f4153d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/hsb/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/hsb/firefox-79.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "4ca5fe030d6b584feb51a9e4fbe76ab1ab24ddeee621c143d9902c3307c61bbb6add38591c5caedfdbc40f437dd351ee4e7a7eb035e2d6c3cb93567cb017d58c"; + sha512 = "0be8a7340719e475351a1ee1fbb54f8182ddec984d8c49170aad1505a9ab074216c077001835f378e2e2eafeb3cd3f3fcdff307d53145744b2c6d314a0ff7946"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/hu/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/hu/firefox-79.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "929a4647c59a11c5daf7afe27360c784c50015ad674819629eba2f148e5d06fa963c8b7b2650b6cdbe024c5147cfd8a9d83f5ae65e4d8c9d67a7c222b8598763"; + sha512 = "6ef75de055dc74d82af399640b8ed9c851bf568b46cdf6bcd9ca3d1f6c79a7506348a73f1ca973ae013b15deeafb638c82e73122d467ee8cf7d974aecc1af3ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/hy-AM/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/hy-AM/firefox-79.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "ec3c42e4c9b43dfef6d8d911d8b38ec843b148325a493f2ae6c72071e5e351a6e246b6453a463a225eafdaacfb112e439a66f2e7cd63f42f968fd2d56c034888"; + sha512 = "f8a1fec0e9180b2ebec9013a18c81dff5914aaa4df852d7f7a38a8126c0cb6aba802ca86ca0b796160c738e52d6c00c5a0b66b4f6e4790bd3d5779db34b296d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ia/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ia/firefox-79.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "c161f0e27942e8223597308c61eb2f4cc4e7c75cb3fec5e3780827a267ea414ae5ec1271f546c4b0df35fd40acde2e35892159c78a66adc430409510f925f3c0"; + sha512 = "61f8727b101b16d336f39867538d3b4edc8a2e04174fdd1bc5d932507fb143ed4035c0d1b9347829402f20bab93e6a759a0287b059f49880323f57e4c9aaef84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/id/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/id/firefox-79.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "e388f0fd168fd22a0061c9de38907fb64dd6b3d0b9170b4c5bae537e39ac400501cf0dd94f4d7af56ba392de71dc01d3b8fa02733db5e414d769afa1cf87ab2c"; + sha512 = "60663a588c67c9f3975fa26ad21266d61afd8f3cc3ad3b3d81e466d623e9c3fe04bec2adcbb28dfd07bdc93e55427ba076081f53ba368a0973096404c5919503"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/is/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/is/firefox-79.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f2a94d74e0cf9373e9e9a80fcdb4f7b54e7b60b83adb19c133e68ac97a34e3861e9384af89da89c668493a96a6bf189342b4f3fe8d48def3ae32d16d7cf3e3f4"; + sha512 = "e351b7f67fdc0dc718c39a1df81b940973c42a6c2ccb25f27a35912b38161c58f39e52d055f1353f36c22d68ecc3df133ad74f3b0880f2a136582bf8b2ed5a81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/it/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/it/firefox-79.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "1c67c8982e6e53a4881d2a5f11e50079bdeed8a812e0832f2c909ba2c99aacd174bc3df2251f8f545ca0df7aa2efcb2fab93b4e189114bcae62c9f713c5b53ad"; + sha512 = "730542c0f62cf59dc2af6bbd661335ade49aeaca84ec11fecaea9a4658b6c2a8944976c86159229467de017c187b9934a2964c1eea436bb4182d13d90bafaa6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ja/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ja/firefox-79.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "19d152097f016fd21eff6aba409f3d60d1cc54ac62cff294386cca0df780a53c507e1734089e58ad8ef8ba04a92458754d7062a3508e2bc506cd029b8dcc1c7f"; + sha512 = "521daa4431b9bddacee885b80c49fc909ee0a68cab53dcaad4d67b0d5d4434510b89284671042ca3535a15c3da1aec8b291d88c962c9ece506cb72b700747867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ka/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ka/firefox-79.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "e2b5c57b222216f19ee62feabad0421f6afe40ad7b88359037fd068bb1c24c9c728f84a3b3213aa43a3f5f1ec4168979aef38dbe7228f0d809a48b3c75ad6f92"; + sha512 = "7c18a7d0939f6c433a38177042af84fc6bd6b3e37f902dcdcab92db4f944c49092741001ab6119770acc5e0dab31a72250754121502dc52328d943ac73a6bbd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/kab/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/kab/firefox-79.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "c5b8159a3b4c24cf739ce4084017281ef8fa133ad5b599205a392b4ac52f8015860d08c206ab37bbf5d5b4534f786ebe530b6bcde962dc2b783e3154f3ba8cc0"; + sha512 = "3e2fab68158de0618d60ebdc3d0d2ccf097e663ecfde0079b8637427b708618f35d96b7f9d4301ea29fedb8d12b969edf1c143e2119de3a8c2d0106239bdba43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/kk/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/kk/firefox-79.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "ef54b2da6c0197cb4f85731cc441bf99e0576c5c688cc875ba52a6b985656d509a6784a4e6608b77be1d5031718cb07091c2f0371cf953be93ca92810f600319"; + sha512 = "79d00d20d1cde9437e40da5ee881e32eda4b800894c966116b74bb7244a24a7d2c723ee841743d4c5f1f670029ab6bfeace103f4f03c7e2f7ef0d524795917ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/km/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/km/firefox-79.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "3866fdbf865b42a27606ad9e1c84a75615309a0bf06f0e72689916269efda2c6a6659ecc70dba496f76eb5f4415d556f37e4c94aedfe4124c7da4e6bc1991de2"; + sha512 = "4c5cabcaa7427bdbda890f2cd2fc34800ce26f1c9ba12affdbf029f3bd6aa39273d13fa0a1318ec50e0290807f98e9a6581ad91693030e8569bb32bb100e1b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/kn/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/kn/firefox-79.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "418376db9b6fc67e479bfc18170a96b0c1b23b05727760d2d10f4e6eab553f7b3b5f68a4697ef5bbb977ce78362ddc66a2fd7d6a539098fd30494a9d91a11f76"; + sha512 = "7d62a83b0366dab2bf6954fa623d731060103c95635c72b0f7d1a6e69eba2e05285bba530736f03a1ce2e108fe9b94dfac7b7dba41c0ff2b2e2a48ecff660959"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ko/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ko/firefox-79.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "34389c964d786f81b8832881c3367ae4de66afa982467bd09a5492540aeea4b0db691b2cb20e0b0030eb871de31991e884d4aa98844b4855c6be34470d1fcaf4"; + sha512 = "b82a026b22ee0f60b5374774e3bc3816261b7d1a8a26305bed710392e96e9e61aea0f3db67422931ab7fe0fa293c48704b6076a5674ec3357dbb6e787d220378"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/lij/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/lij/firefox-79.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "8e3b30f3b844e2cf3596b3d582435078a8d81cb42b0b05602038a017f7dac907a172a9660f1f37b977dc1fc95e51d21c0f71535c298df7a8a073763d79d427d1"; + sha512 = "c215a86b45bcb01a430e8b63d9ab70044e75162fb8282565b3910b538b5817a374858c42e8cdefbb1768b91d192856a74aa67bbba8e8448eb16d6c1118f58afa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/lt/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/lt/firefox-79.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "9f06455338b565d112a376e6b5577d8fd5ea3690f20a481232fcc21172f87fedc01c6e04102ba97ac8074abdd314043da9fb313f367dca7c53ffb38e8ec55aa9"; + sha512 = "c20d63e03c864c12a5b8e8a8fc017ae29cce7d64b4b32edfaf99be00fd3ada73d82b6c4b9823695bd1614a0005599a03b1e6299f74977ec6db23c43d32c23c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/lv/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/lv/firefox-79.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "4d81635af9f6d08d91a2cf7123b5aff996ee592308ff5754380998ec0592d058055050156a70e47ee29e32a5a1b4b17512656ffe19b9e551c547c186bab42087"; + sha512 = "45a94f66a043678e0c7414a57587103aaaef7cc415ba6a2d2f1c17f59848b156331153c55a36087e4f7eaa1236586c866625ca14acae98505879adcf444f0206"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/mk/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/mk/firefox-79.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "920d16c4cb05c821d690c50a552c2a3c80cb1afe70a58aa4bbc6230701a5858641c25a9d41b0ce3ab3eb2312104a8a70249316bb46bcaff6ebc46cafef8e8e10"; + sha512 = "17db20ea2c66386aa625e04927c4b76716e0aaf5c28a80b67f21db9df1c36952696c0602402d368adad45413eadce7f89ea10a3c7c769260235c3fcf08c10241"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/mr/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/mr/firefox-79.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "ff9e640206fda93d09daf08a74e31203e6a660aab7a62c0395f293011d81eff7ec8122192690c0e663647765f843b582e15676c6141d732a0a987c360d269035"; + sha512 = "103d3ad8e27d1be8b12e657e2842a7d68276e34b8554902f8ec974b14150fa8f89b252bd7cd838004f7c080c7f268d9bfb3eb2625b67bc79f06f0989648fca2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ms/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ms/firefox-79.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "18105aef3e2734b36462ab6bafbd18788e6ebcf9681762abb32ebfc57c1ef3b9379ae2b30d526774191d878a8b8af02310e2993c2eef54869611dfaa45814b5e"; + sha512 = "aa88592ec59fc575e4c50ec3054eae63027a96e1a0750aa5c468f456bb8d2757fab1ed74ad9a0176eecf39e5a6f1e3feac666858e32a3b972b87b9522230b0bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/my/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/my/firefox-79.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "0568c7d5cfae6164296ced6b2522831d2ad3b8faca5b955f78de830e49cd7428eaf0f93a12e8b664bacdb1bb90bb5fc65c4d2a1566ebd3e13d3f2cc2ed83e80d"; + sha512 = "2f0dda6c0a9176eae4d938520707bc58493238aad18e46b07c4356fabb57d75eb513ef1f6bd1ad6f4fdf5ee3c334949c914c713785cb1cdd8be1d1a9c3253682"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/nb-NO/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/nb-NO/firefox-79.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "52eb5928c39fe71eb47a3d81ebb6589a8d68612f85f250fcc744f473ba0c06eda5722a066c21720f42ff4592bc996d3d37e4b824a753b8797a8c11785f2d0406"; + sha512 = "6053e541fe7e95d1d3a13f337ab72f0b2492f7d6b3201234df0f18569cb1da334b1e35af92a536baa9251da6c9c16c6397ef046f4bd32df2dd8694112ce2c6ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ne-NP/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ne-NP/firefox-79.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "c4dead373d6d240fb481f768910c5a837a41bae657311ff2b9f9b7a9ee0f090e7fed76213d6a4f5d27e9b380d32ca44b8b8e08ea6e401a6bffd862fc57fb83a8"; + sha512 = "41e3e3fe7a59fa3dbc99c156b0c14dde4f27dbcdcbf25e3b3b5ab00febdb6d781a4811f8534d26b902a3c432319caa770cd65d460931b799764f1f25b602e25a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/nl/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/nl/firefox-79.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "3e1c448e7419f8919f9524e8bc762790cc79a6784cac54d0bde170238d79a2f3e00b88d29e1cab6013b57b1091579d36f113c08ef7071ad5289942ff58a79bf2"; + sha512 = "4601cd9b094b1e9e4adcf8a413d6165875f5641c67c1d205b2184b9b7d5b5b9eb61c0a43d9ff7bad2c45786f0bacd8124372ac49f677688dc3d8c72207ea9de1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/nn-NO/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/nn-NO/firefox-79.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "0c730d0734614c97ce7ff98ded19798852f17747120619ec2b992c1bf68e5427495075ea126f5cef737fdf266a3975dfb4052903913a326a91729184595c79a4"; + sha512 = "33c47d08abbe90c1ae936c0927b1446b020c4e64780738239de08d8998e69122c4fb1fab47aba15f654f49c96bc93dc24503f48b4b338168fcec649342741409"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/oc/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/oc/firefox-79.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "e69ffdba4624194ea9085f755d718e75094a65e04128c1f51ab71de7e79e33462cd4683c8f7e5e5e734dcabf0959a5f01a0e4a72694745fd79c1a66b034ee502"; + sha512 = "22bb626dd9d850636653937ac7101dc42d5da2aca604f8f31581a8401dde2df59ea280d06cfafebeee5d557e9d64c05e4accd52074236ac12929c9a6104358a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/pa-IN/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/pa-IN/firefox-79.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "bef28a4dc75532ca4007632fa50826107f63807901bf163fcffcee048728a377518ff496f15cd9090c555b21c8b04fb03f78bfd4b9609f7b95ff98e571dcc576"; + sha512 = "dd0b3c16ed7b5cd9d3fc1e9a86d3e16e99497d3b0450613b8ed7acf7c6bcf2e78fcbde1048cdb4de3b818a17df6cf0617ede62f7bcbc087dcdd6a7838b3bd915"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/pl/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/pl/firefox-79.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "961c13384d2419e571547b312d9f4b349df804283bb8af47bc5e81305606ab514e944efe0a1dec5734f0dcfe11cdb9aabc3b4c1bff6c3c18d218106e314e0898"; + sha512 = "b22f13985f9c1116d9d7194d0e7f7f765888240ca9de5d9a5f78764639846f3617b6d2de5af9e29375746ee7f5753044530b24b837df608fb7deb19ac5e82975"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/pt-BR/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/pt-BR/firefox-79.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "749da63d7a39aa571dbfa3cdc61393fdabaa92cd4e3965c5a40c072f0da431981c046766ab1a64d18dff00e627db26ec21421e386cade84589889a970e420a52"; + sha512 = "65ce3f793877757dbbdf149a2dd12fcc8aca1e6789e7180888163949daadbea9d14e1757fd097945db061210f569144d3d8d1fc2b2f9be25a78abce37944f4d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/pt-PT/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/pt-PT/firefox-79.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "445e43f228cae85e4bbc777032d1530d20694c779ed58456712efbd99a5312b27de23db598c3d963c9ef3c82ebc01f12a667125aa8b6acce528b9e9f6aef4571"; + sha512 = "a9baf170a432f502ef1909507e0a42a23ce2fd90af72683e02d06d1253ea35a3b57c7384edb9d7840d71947fdd8ea3dddf0b98b615fc2c0cc859f83b4843982c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/rm/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/rm/firefox-79.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "bb04bd0d5c062225aba838824d66b9ac42fd6991c04f1b7a64a5373fb7a4e36c6ef6d4615014141d252288cb2a5af877c2e7fc6addcaea11919e0216def4b02c"; + sha512 = "aa3154b46d69e81ee7c55d7e6e068651cd407fbcd5053650bbf283c45d0c09aac0b18fafb094508b456857f8318287b3ae5771da1beca9641b90fa95c93060f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ro/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ro/firefox-79.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "301ed2ff68efd6b58aea68b4c18c89e1bf9c2092e56d18201d9fa9f1bcf0c81bed5a54a682ba9654269dc3edf8906b444ae13cfb8b396743521dd45499a568ee"; + sha512 = "3058ada800801aeddfe3d38d612156ade43a0c6b63466d5919dc2ab15a0e98bc3df645ac60ebca0522e20d57e17d6a18a5369bc5db9040722ec846d7d11e65d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ru/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ru/firefox-79.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "0de28f427eabf2c6baa531e37d5d3dacdb193f63ab4f76f1aacea3ac0f228e77e097bdd4a090a2516cc52007403ebaa19900fd20235d5436a73a90893dba1e3c"; + sha512 = "77840d40bdc33abe38d4c431f153d56486e2c307726777190e3c462fd146f5db7eb2b5c69e89dd7ec72aa2ae3d9d8b46e027d90d15c81e22bd8fbf5414464f8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/si/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/si/firefox-79.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "70d2c5ccbcac516f7c88e064f8fe996daabbe9e31e2c073ddc527aba5ae29c7114947f0c022231ad3add80cdbb2a40f6a8d78b2707ee92c3891d0a9025d2ba54"; + sha512 = "aee283ee71676e1ecd74127c16b6a765b177edb23cae2ddedd116b04218d46597088bf7b64a2cde880335b92d87ef15f4df4e506ee05e9654b6c2afa7517f7f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/sk/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/sk/firefox-79.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "ddf6aa8ced841054d931129bdf9e6b9bffd5ca02a0bc61b12a5e88834e8c314b4ea869e6713cc476c6900e00aa521cf4d1b40dd388d2d754c63f18a01ab60c32"; + sha512 = "767a50e2789cacaea3f9347ca683e554979e4e66375b29432dc8fbe1ccbbf4b7b8432e3c7bd4b5695c95b1b3a64b6c6f835eb7366f92d774bb58cc1413b6f81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/sl/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/sl/firefox-79.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "73ee6ae45da91bf901f19bf1d03b523d79b1341deade05c52faccfa1d7bf1611058104a69cfb40896d50f33a01f6ae1172d8e59fab77e9d9767355b5ff7a30e2"; + sha512 = "0421f692892d4857f30a69f2cca8d5ed8a7e76c0fc3f8d20bd78b497db4eedcb4660049e2973a9598375090a3a3831ce74657dd0caaeda0bb16fb3238c9100ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/son/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/son/firefox-79.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "39f1b59caf9b4fb0a349cb890aa6ec598753907aae934abe1ace3845f50a996d03bc3b55fffb56b87cdb43ae0c8e7f521c9ec184049fbb8f82828947b6c777cb"; + sha512 = "17cbde58c89e82ec0ac8a7952d31156cc76895d11f3815c3b1fd0d27688e3db9153548e84ca4b9423e8d6099e274698b5cb06b2093a8dcdb05ce3f6681aaa2a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/sq/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/sq/firefox-79.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "cfb8dde4ee081d3f20bfcbf28dfc6cfa42d15366313af95e393a496a619a4ef2f929fd4abcc1939dde64f3816a822ab64bac49cfe6b3f6f1127ce2f81d791060"; + sha512 = "bea977616f362d9b3a36154e099aca072e6c27015bff4694797eafb52d768f24f6967c055bb7220a936c24c5092d3e4f39028042ee10b1373b5f2fed261353e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/sr/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/sr/firefox-79.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "0e1830128bf23801dfb6c02c2b5f8128c47a320ab251889ba20e9e4fc1b098d0fd1d8bb7f3268b205eb86e570526f0c62b36f411efe8d2bd936ad0d6a08b97c0"; + sha512 = "c3e0ffff8b1c94574ca089e506ef192873e568a7565ece5597353d0b80bcde336bada0dded2d8cd27b71f7be43270fa94023ec9068aef3c562e35232d6af3736"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/sv-SE/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/sv-SE/firefox-79.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "f1d22cbeddfee1212e7566a7fa1864aa8fefbf015b59d7a875dec84577558a120024104ee377b4ad14094a2edf5faed8a6667f575e2c83ff704cc97fd10ff72f"; + sha512 = "4654b98382c316f4e52dbc5026a841c9ff2d1dc1c98907d8cea0cae568a24082d901cfbe238968b750dfb06ef48314d016ee152b7641ca127976578a62e6023a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ta/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ta/firefox-79.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "294ee5683589fadc76523c556070e32aa06223b3f591c01d6a586f0844325f246db151e01192e81bcf21d6e1b790c9497c46af08bd6168c417d8cd9352a3c6dd"; + sha512 = "9e86d503616bde17a34b0167fa87bba9796de031c120ab8f0433c6774547d2c1def0fb38742a33fe19affd0ca01636bf8b93aa951fb8b1e0a94bd2d5f31af0d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/te/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/te/firefox-79.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "3fc115822fdb9129b841b2a851f62df5997beb6191d95d85ea1ec363c1ce7992334f1a48557a90d1ea56e473922be00163c75635871ba39b8628aef074c9ed0e"; + sha512 = "ae969381fb66bb798aac79f456019abd2a302b6ffa5ecab9a093f6ee45c27315995a9363c5fe3ec702cebe049f6cda61113f9bf0806074ddc17d9b8f04af0bf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/th/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/th/firefox-79.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "93ffc698a80c20ad58db52ec56a4d25448b172618b80436ca62356db8509c4d93afbe3bdda4b1dfd3a38c49847a9b5eedfa3393365fbf7217312890d571bb55d"; + sha512 = "0212ad66704f5746ef4495e8fb62b8527f32d9b255e1d767501366d5ce241b1e9ec1ecc10adec86763f05533be2e6c3d5c7d544f319ed1c84eabed1ce78d7207"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/tl/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/tl/firefox-79.0b2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "27f440f611162988f1686f4a1cc4902cf104a1efade3a698397ad0b4312c0984f2d1d3c759d0a94aa099ac782bd1914265ed4e8a0dd20f4b076e05b681f5399a"; + sha512 = "ddda2a5d1e4acec4ad4f9ad1765371e45d638ae286dda60c77171e3d8e7cba763dfc9b600b9f9b5e66bb87f7d79a014d0ca2609a86fe051cd2820d1a3a0c0602"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/tr/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/tr/firefox-79.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "eeb122a4082823e1075d92e5e096f2bdea1f16ed9c8a944694ee06e394156822bbd33c7af81f956edcc4010f620997af7361d5f9182cf4b1e8e21aa7415aed18"; + sha512 = "00ce607191022ae43eb4127926ea1704176a0104dd0e8524c977cfcb96a2167dea5bae23195c3fbd16f1627c69f64d1b9e680280437edbf6e54f6681f72248e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/trs/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/trs/firefox-79.0b2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "9d1fba7a1b9ddc18cbe8be6dc9eced593cc8ae7e97cb7db5a6cca59965a88b572d47701e20b0ec99f2e0784ead8cc03b6913098c00f61bcf80c95c787a959712"; + sha512 = "4b40bb1861ffbdc77aea1e1b2730dbb2822a8ab92f912d6c34457d1e9e99b1b3915be588eea8912009674e4219bf2462cc330277f6b8afbe647d7c05d52db17a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/uk/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/uk/firefox-79.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "0e3ab01314523d936ac055a197919794cae269e5244f93a9df11a7b7ebc922a2b075aeb928316c82007d7af5616371c8b42671bad6ca7e3be1a78ecaf844175b"; + sha512 = "ff4c10030ab8d8bbbf3d3738744f643af78ef4ee0d872778a31291924c084941872365569ae15dbf3a1ca0808e0cd0b2ae2286b972f7c2f283ba08e1b7f1c025"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ur/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/ur/firefox-79.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "9768fa01a377b7c9c2417d91cbbac68031606f55ae01106de3df4c43ffcfef7ed8632be95e666f67c3a6c0941d9ed0b1fb00703b519bf906ecafef1c9843bf6a"; + sha512 = "0dc8982e41a382e58a892cec55205773d2eecdb74218f5a9f38de656ec480ea94ae25defeab4d5bd63022dccf6668864f7d05be3323625b2b36c3ab7f2a0cdfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/uz/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/uz/firefox-79.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "19f4cd13217a8abaa447c1157413564ca2594cdc02da49496af884530c2652acb62bcdaab218c140e9d067052e5f33d05b5b1d897ca72ace0acaa202afc45a78"; + sha512 = "dffddb07b104b0012f705eb438a43b1a29098ac19422769766264a749728bf6a3f6fee5dcb27e8c53d28b3383c8669cbf4ab099fc21e34e1085ec0852be7c561"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/vi/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/vi/firefox-79.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "e29103dc7de0de15ba5e90a1e47eb1154b1bf55889654afdb8923985b0be35fd5c5c66e5f3228acbddc99a17e43e2dba6aa62e695037687b9bee728b63cda38b"; + sha512 = "799fb81d9a5b00d0db5567dd9dcd396fdf9001ce0b68f38db0bf8662526b97255fee0535720fb35481f92f2e83fca1e5aee76d2fb7809ec6bbd3230d3f0fb905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/xh/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/xh/firefox-79.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "06e57712ae710266672aba578666e0b258e23c29d6a38ea3b642af01a7f82cd41719eef3e3296f9e9e2092b3a34deb317f933b63b48419fdbe654a4f7f1554d0"; + sha512 = "ae6dc83d6be883ac8d9e350bb1373dfe780b8d4e2d8f7374f73bf8fff3d7e1dffeb4bddf6e8b160f018470e72c9bf2dfcf6311bdd6ec60ebbb4f0a6ca21d7776"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/zh-CN/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/zh-CN/firefox-79.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "7c1bbc3c0623790cbbbcbefd8f86f2bea918d1ed4bb72e8e9b6902a01a3c2459c07223ac5b4a04443e41693d1e50d771835fca2db5772cc6bc7134e06d306be1"; + sha512 = "7165f6e810232e517b0f85deb257fbd58ac704bb4c4be0c2a19334d03d98871dff14a915636e4880e0e8ea253dfa9a97d307b80e2991ad9f89c49446f0b76b6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/zh-TW/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-x86_64/zh-TW/firefox-79.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "487ee80d785b0b1a3ebf583191f6840ccdecaa868ceb139d8e2a318e7d113fc27d692df4aa877924f60ce81207f8186c5c2e7634b0ecee252dbad3f5cbce3139"; + sha512 = "ba1b9dffffedbeebebc72538070f34e244018899d95cfb2bf8f4e0dfca95da6d5ccfcbfb29c8ef291ae022c9ec566adffc5a59daaf824d90927fcb2802cb0594"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ach/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ach/firefox-79.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "e99b0b7e69aa1023db7e57f21f30921313eef6f591e74eec9fa324cd575332d2391743a723993ba9d783c6a6ecea274fd8d48dc8875ce258e18359fa96833fd0"; + sha512 = "3e05103b0b7d8c2ba6f7a863610b5a9cc41da44571c1eec156fdb17d9c3958f88bf22751b38075144ac7accd678edd042e3fc2d1ce0d23f30739c324bd44ae38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/af/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/af/firefox-79.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "9651404f703b153cc44af146de732231d73fe2b3976d5620c197a6273137a246f3c46444e1a40023d50e4f56c66aa2de95f1762a65a98a89d54fe589c1577c08"; + sha512 = "3ff4b5734c78f9d3befd3765cdc99c77272a65a44bd7ff26758ec6c7739a48190e4b22488106382b16e114a3f77bd524b13e377b04b3d0bdf70030671861f1a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/an/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/an/firefox-79.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "11f6023da98ccfd4762b8851f303b0e26ee0adf55d54eb8a116c0d078f30bb9a663c339f584bd7bee6cdd73b83d992ba2df36c1797d0973a65469f48386f562a"; + sha512 = "977b8902fc3797f3ab4dcc7af6ad46eb78d4ff421ad840966cc9f68b22767765ca4e86342ce70ef0de3433ce489311f289f7bda7c41d7ff6dae1ee9d4a0e1a69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ar/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ar/firefox-79.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "c19e5f1615e40345e62d0bfb18fcb25b71f29ee6fdbd9da20ae6faf9d585f1c5ca53897393b15b911e0379ac36a5c1f1a885bfa10c6ea79f0d3129a2c0176105"; + sha512 = "9c457cc8ddf965ca05e80f0221e1734b95be994737197f9d327e513c0cc92c3ecc1157b969b860146e43d28a3ca79dd3a822ac1a2c9b1cdcd8c1e9d4b1cbd79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ast/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ast/firefox-79.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "bb9bcb2a81e0a574c8e85c48a4177c10f0331a26e2b18c5ec74b8efe43d0b2128ba385a388ad72165fa6b1e96587a1544a7703ef5224a33948e663fc02dd6eae"; + sha512 = "38a20a1f3b1c0d6dced604d0d4c437d20da674928fe1cc9b4ddfe4d1e06a9a64ab4b67c6fd2fc1dfffe8892b6ac15734ec0dbad1b307fd056122de152742d610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/az/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/az/firefox-79.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "b0e833c99286643a88a06b68af74e34724ebd2ef98aea5f138ef33e1f35b411bec482d52884ec1ad7d61d73ae2e52bc0510998bc9c8fe9ef8bd4887e7969dc30"; + sha512 = "5a265542620f00e0ee66fa518d3b248782566f94bcb8a70e372ade9c04d84d6ce9622f702433dab7816798258a5287dd4f1f79b78bf8f84c8bd8023717c5da16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/be/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/be/firefox-79.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "af4ae6dbaaadf22ed0d7743185f4e2c89201014665ab3d606d60cc4c86ada14135ac5816497ccd022bbc346218a452b614f25d32bb0b8e42fdca3ae261631351"; + sha512 = "f84b647f262b6fc9707ff9164dd1dc5f52bd1f3fb200789e3f1f244b99e1dc2ecb140a6827e0080e548a594b6a7b908ef444ca9066fa1f00d90873ba470aa4f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/bg/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/bg/firefox-79.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "c9854d8402af75a174e8478713f715d39e888c8354d27bbf17161b2629834e24c0b89b182477946e736002481dea3e7a9887b1e2efbbbb47e940b4089b19a970"; + sha512 = "3fcc5fa8de4e30f0746a9e9fb960889d4b55f229bf488cabeb4ffd8ad3237036d6581c3376be3a49e5d6e34658e9f0bcc39f74cd4cf1060befafe136f4344812"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/bn/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/bn/firefox-79.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "efee82a7c08bc0681e29b1604ed683894dd8ee70be22bcc00ed3dfb5e8af6b6739bddeddaf9850900e602935422e0f5c833e1256c78b2367c07f311e86ced69c"; + sha512 = "b07e1f7957179885317dd7fc1d6fac0765bd255f36d3f1adb4fc8499987e6ff02dca3b6e44c8245cd17f1ab5b9a7a0fb2ee0bf202b5c362d371f89eb2687b39d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/br/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/br/firefox-79.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "1ba23efefe314bf53b9b0979eae103193152d8e7bf623f2c3ec5ff450de38f52d59f64b85d8816647845710b51e9e9bdbb9e17c36cee78d718b646903fe97d34"; + sha512 = "d735d5770913e87f2d702fe282116e26d138be038b1dbd71a52d1fe666f043399a7651da3da0135e590b2aaddc9ccb87b9dc2e7ba8aa8661f15f73b51bd1d4f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/bs/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/bs/firefox-79.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "bcd509bf0f893d37e83e2b3cc80d64a8c53919cbb043f480af3e57829b6537d208d0870a72509f2391ebfa5446a7be93136b34f9b2090a72b0191ce0b3918baa"; + sha512 = "69ad24d464f543fb298ba10ef4ce058e835d822e149c2a7e9b216a485ba9b6113e61cbdae4199485231f6d627835371bb9f47bd9c1b90c1007a2284dd2cb99e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ca-valencia/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ca-valencia/firefox-79.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "cb1b88aa61a2ae6786f4300b5ec7f35b01120da9d0c5bc5fe4b273820f1bab53949acd65e6acd5db421bb7e6d5cb99c02a2986592d45307a6e57121e85cc2657"; + sha512 = "b3c1f3f4e81eabbbdbeaeb65db6b8e19c9968fb7dfffe5df6a9400952f82f93f36b7085c4af85fd0b70cabeb206827eaa36f72763a44b6278757d127a06072b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ca/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ca/firefox-79.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "88b115ecab3e4b34ba105d5227ac48c10824c76f20a5f8dba63cb2850fb2c2c7f85a0e1cd5cbc8bcc368cc371007a094b03d81a880f47fe0211171a381f53b15"; + sha512 = "2884379ea928dcfc87eefac77262ab6a098aa098a3cdc3e998284b4fe0f41e9e70c320fe1de31f16b66b5ccd0f3645b58e8e17b227aaeab91d8eae4c65dfa0c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/cak/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/cak/firefox-79.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "90b986f41f5ba63fda27084be05684baba11a4ca22fa9fec1177c4c90bfe36f0e3001c1169361b36de313cdf9d3a99902fc509f6515c24f08702df5617faabd7"; + sha512 = "858727e5e8e1502572e35bad4207dd67b99028cebfb88bb7c22bc1d72eb3bc2541eaed8190abd987e5ab51c161f14ca414d557e54b257a0b4487e64343f81249"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/cs/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/cs/firefox-79.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "ab8ea7e7fcac7687f93dff99670273c9c52a4b6d0945a60829fb2d0859e982df40bc2ddddd93a0f0048695d455ef8f30e9561826231880de19c5710800eec852"; + sha512 = "44c7cc370b13715ca7405cadfc9317bd357d4f6cb453bdf5c347cf07e880aee3b1b01a8bf5d7eef3d141849a88d098c9aac510d1883cdb21ef0fd21e46fba79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/cy/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/cy/firefox-79.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "34ecb5f957fe88be8bbda757b98ca18739c38f1f84f4dc65dec6dd4e185a10922760049da3de020f07de9542976cf2b48bb90076cbe235071a7e99bb674670c3"; + sha512 = "9530ddff00b94c9e0e176ca986bf4b8bfdcc5739b5ececd1b902a15aba2bacf8d1c455800d009dd6e7304bed4f2c3e59bf5551e121ebd13b482aa4709e252642"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/da/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/da/firefox-79.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "24272dcfc6f6ca922f4d19b7f277713516d36ee9404336baeb8ea0956cb1330aa9bab93ba9296312f6a3f302a8855f2e1cc28f33529927c85f26ae190a70a9a9"; + sha512 = "77c03919d88f30ef5fccc067779665851dac61d6d6de1804d49a3ddccf798c389e7d54b1850d54770e4f3351836dd7efcb96c4efd6decd2983588e98ba3cb4ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/de/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/de/firefox-79.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "bb02945539fb419ac5fd9c090b2df6114af917c267a33a16b435ba95cb2e5d1849939707985824ba201560d1ff67f11a419587d28aaeb699eeb15fccac678a67"; + sha512 = "164ee48c5a711be1d1da62b7369eaaf8d87e2aba4b7fb124d41593a5e113c84512fb686e3d3cecbea637407badb8ec0ba42ef13e1441834bfeb0f7df1aa60eac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/dsb/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/dsb/firefox-79.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "ac1e8b9f315f76eede59e212cd71d7af5c12b97747e362d968ff26c6184e5a232a3ea0a0248f5c0a7cf4cf3fe3ec2bdf1f3dce5cdc0b57b28f7459ed1c0d0b6b"; + sha512 = "25ca8153f50e5d84334d1c054a51660350d62a88abe0c10cc6ca1e41f823050fef6cff0398229cf4f9bf2627e6659ea9c700822cb2a02c769f152dc8caf26dc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/el/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/el/firefox-79.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "41e223ed3b348107cb0d4b283eb3e271f11ba4cca843ef3ff059263040879be58cc36d86449d305c327b69148c4ebc24294695b2fe75634124fcc8af04024860"; + sha512 = "83a77586077200988d62254e5041560c67159c25518074f1364e3e0e52df729fe78dd5a01b3368d5681aabfb3a7b7d6cef705c3a6aef99dd4b4249d804d46a8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/en-CA/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/en-CA/firefox-79.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "850b10f65d29d351f24a82d35c9ba631931af262e039cb6a2aa08498d4af99a1791bfe1da6de50fc4713c3450d346a54af4dfbd0adbbbfc8450b14ae075545a6"; + sha512 = "8e18ea09823ab4a8c543f48c7fe56699e74f79a946828fd3bdb63c1e2bde798fb91f3d417639a1bae89e0b9b98250e57e7e5876c182b608646a604ae91b2e98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/en-GB/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/en-GB/firefox-79.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "34e6c313307a750f92c4f7e02b5b9210a5999154e701376b63d34866262b43b5b054d376bc7cd8b256925f895604acd5b664d7d198593e181f4fde21a97621e6"; + sha512 = "0672089ac0cf1e47d8e607913ecf4ec2bdf3337c4fcaa0c85675cd1fba5a24bfa458778a3c579a042afeac4f470d6c6ba94b8e9af6b6fe6bf57eef3c6062b540"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/en-US/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/en-US/firefox-79.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "3c6cc88bbad795f2c7f1db75b045ae14f062d28ed11c594d22c68189df3a4213b5b56d441ccbd032cf61c69102ffcd43c86a97fe34e5a0565da25471eb53c646"; + sha512 = "d5d9d8622ef764aeeab9308eefd5d9d5024013fdc56f982b75ca1847f223770029ecc65442dbf5f466a2c3c087bb1a174159699fd5c84dc22b8677a610228065"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/eo/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/eo/firefox-79.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "f2b287e831c21f3b5d8c78e0d73fbe2ee832326a5ea656f9ea7ae304cc38831813a9b504984f090bdea48bff5d78644748650c2e9c0a8f031b61902e5a787ef9"; + sha512 = "134acd2a3ea2e9b94e7c7f211b609e76ae7bb91d64aa3e6fe74867d866905b1fb13bea3b8e108a2f3246d1aef6c4cd0fafaa1879ca40165fa7508f3254dc1733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/es-AR/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/es-AR/firefox-79.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "06e968619285332e5101ac0f7257de0a5326a5f44c0e92a5e7aee3a1f57b021585841179591d0032e17ad4168d3feef5a8467ae5660a6b4d815d24844c8aee30"; + sha512 = "9bff580a5d34e5fa0c96ee0341f7d7ea91f592ae1c61efcf7f024913fd936444fda20b6a9109b6dd8ba8b741e1d7cf79f959fa92988d21fc4c355ed7d424d109"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/es-CL/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/es-CL/firefox-79.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "e50c1eda0d1362ce5a3efd5495a9e75b2fc5d1bc1d3bb3f03b92e89dbf59e751823af4c24cfad3bdda798a2202dd9f204e575107a8e178ddce24682b40ef9a53"; + sha512 = "8a9a371bf986be582086ef85c8a17436c470990ddfd581620f0175b391c3510edfb3ef9965c58094999479b8c1dabcfca253168d7eab61d820c1ed8488af17e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/es-ES/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/es-ES/firefox-79.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "beb673f020367194ddcace2b1647a33f95d7fc017c352b4ecbae4539e4401b11bbd7711f4702cf80f5f33b29e6536083d5a40bb5dd9cb661ab3b718ffb976620"; + sha512 = "65e24929bce98ba428d57d6f5930ad8ed7edd265d516d00d7b071610152c269eaa443a02aac50e69337c5bf602f02a7fadf2337bf36898743bb5f797005c380e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/es-MX/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/es-MX/firefox-79.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "3b61c3a813e4271ae70a8a5bc0b613da11c712ec3cb3965e95ad9c9e99889f755a22820d950a75e304a68f5861fbd204dbe254debbf1987a2d4300167291c396"; + sha512 = "9dba2bdb5290912ecb5a5b890e52dd943a1e34f486211a141b31c3a8788311aea0f91229ad0d746f332df8f1b67a53778036d962b1ceb75adb4052ee492283d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/et/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/et/firefox-79.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "6f5b9bbc855f8a954c72857526a4c687bdbf6d3997143096ec74562ccd1033b0cca6db8b48983944a1e2b60781c3a6c53fb022e4c10bbef07ed0262b354614cf"; + sha512 = "68df6f17a33ff0066eab2dfbf14c5a658e446aa075d4ab9b1f092f84f55fd4f3dca6b36c7ff6841d6fac0e0cd3ea70b50584eda1604137be3fa373ec74ef9793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/eu/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/eu/firefox-79.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d576c709576482053ac445f8d83efa1d6a6c18320c3674bd7e71444440aecee0a6e8ae9fadfc71cf36f152caedc0353a472a8ac4f7e29104287e5c7bacaae39d"; + sha512 = "9b766fc1c0eddbf974d0cb11c96b8cfdb7cc6e2cea8e16ee5cac479f8709fe9e799375d4302a200c93cef779586e4ff863a6f634f8ddbc586e5e62cb6431eee6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/fa/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/fa/firefox-79.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "b79769bffdc1f7b9531dc7e58a48c8a93b422a6608a3fc94b7f781da1fe1f721690d909033ab8617e5dd71b00db513604af033e667f87064cb139822adbef4c6"; + sha512 = "bd00952f2d3061aff003245d188b6419e98ac3496ef9cc286b99b590a8c63283ee4c38599cbd83c33dca30aa69ff1eab0b49bd6e83f13a282b2b719f2a07fab5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ff/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ff/firefox-79.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "f71d4692e0a9ba2d0c4d982a543d3cf7a1fd634071d0926ed5ce9f97880e235cf9ff10622ff6c30a0b8713ddc7708cbeb7ae823dce9adf79657f49cb10bacc27"; + sha512 = "63822a207df7101db3543d73ab90633201c1a37140b17ee8fe3db71f85e05b35910084cfb5247cd3ea64d2a357d9785c9c4e441bf4b6905e1ea19e901d153b97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/fi/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/fi/firefox-79.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "3d6b4ce128214edad6265144f3f1b800d311586566358807a62a9ab13ec4da090b6898799890af4b1cceffc0426328be189fd66daed9398c68492b7d0695a309"; + sha512 = "b29ae81ddf8d660064235d96f7a183e71b27879680af282d3cb2687378c55b7f9fe24f1c4a48e4ce7dc03d2308c39377f39dc54e2ec742e7c4088da248137110"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/fr/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/fr/firefox-79.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "234d91842553a82f854c6802137949cbd9e1b8706d887573ca4597a81aea08086d531ba01858bd441fc996e30261bf90032587dd4cb76b906f993431517c266d"; + sha512 = "596aa72b358aa2607d54a0011eacc27447f6ef6155212a356425301f06bde6de1b4ce07d174dc984e332ccd38f5726717e378042c9d24df2af974238e7d9693f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/fy-NL/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/fy-NL/firefox-79.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "fb00b7749dfc4fc64a9d08e5d07fee6d79d10c088206eeb0ee97382eaed813c30758745ce4eeb0352549e251d524f5c57c440d67545a0844c17ea611247f6ee7"; + sha512 = "1172b0767e7f92fb358d52d0918b9f2eaa999b92b34ff6b1d0b6ced9feb1d10eac90c23e670546f8430060f354559ea2ec6f7799d946741aa93dc5d98750f894"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ga-IE/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ga-IE/firefox-79.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "ebaf22f5a885fef126e5fbaead30d4e1eaf619ebbb3c87407607debc0957d3b39016422005123f3ace25c64aa306a8a4eafdb5a82487b43aa7058ba2447dea6b"; + sha512 = "c1ff93b4c651865215890ea35e5988113c63e85ea6e09524d94b2dd548c2f3523c4a74f94eef5d2735addeec09054297d367e2a00cea5a6d2d994f2460e57954"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/gd/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/gd/firefox-79.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "19d26827df70204f6de6c350aae53a584064edc6194de1b4957e5c504d20a32a3a39566df74196c33ed4d91740d730a21a63209d6bb1cdce9a70e494c9d5bccd"; + sha512 = "dd7c53d832d8786e0af4f605661bcc837a4816617ad01fed68ece9c2c09e64e2b96e8c6189b058a978ba255adda54206715fc8a15500fa49ea78d2ecdb35615d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/gl/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/gl/firefox-79.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "ad3b9da6b560729d32e99fd92c19e089b60123387ef926abee962120b6e6dc84461dd31c25615eacb09323a8346bbbd38d052b6ecab80e2d88ca507db8084176"; + sha512 = "692f07495ae2bfc599197804277524384612ba9647f52cf375eb5ae6d5bac07a0eddf02a25f8bc1d37a1b570f9f0dc99149552a78a338270c648e0f9890b96ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/gn/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/gn/firefox-79.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "e32243be5d9b47da6e4307071a1a1d5f9d323491604d889d699f96777296cb3e03961be9323d2fd0910d289e2721aa025068dc7a2fc30ecc53bcdfdf73469fae"; + sha512 = "65505d48d71b1e5cfa87902bfdcd902f9947ec254942a664e63689815d739c62781dfbcf841c7f2acd633af38823ca2b07c85e7f204536788719ed07bf6647e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/gu-IN/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/gu-IN/firefox-79.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "fbba7f14628061f5840b13d48797297515eab2812ce858db1c8d57e1aa30818cc92d6496e411dd437c3cc1c96a37d9b3e6029b06593cf2cc952c051a7f09f89b"; + sha512 = "2869cdf72d2d2ddaf9c2174ceb97f6ef00c2365cff14ac9b91684ae480b074b51449ed2998f4a668254ab23ac08107811533ac79fe51334855e0e6a2f614edbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/he/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/he/firefox-79.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "a00ecca4ba4c6360f039becd87a7c3a15b5ca8e8b371791ca14dd22504283dea598a3f8dee16f060dd23f0b9ca4ec910c671cf69e39f0afff4ee80705c5d42bd"; + sha512 = "e88eed5e6ac19377e08afb881b4784d71df2f7f7240a84dd6b1f4d2ab322333dd9a2c8ddda6a0ffdbbd24ec3c8456e35c6e1e33090d24f68571289ba0ceeff65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/hi-IN/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/hi-IN/firefox-79.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "f38845963cf99e8d0de6ec82fea1b259d0001389bbeb08827d9c602989ee9c58693675c7c5d24428b2917cb0dad3fdf50b3183d8cfd5d06a5c4557b6a7f57ff1"; + sha512 = "8b7b58bbfe4f5c2f5a7962730ac063972fc1b7b42bad3c3f77387cd7e43a0b4557ea1a9b358acaab9bc48e8911fec27a01b1e7450dc11d80f3d24f0cbdd71d70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/hr/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/hr/firefox-79.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "7770470e02621740a8da17f917fbe17d97d9f8d484bd0de0899cc8c4fde81995bd6a27d033ad99f67b858f00f18f1561a225080fddf832030fc156bcfd34dd68"; + sha512 = "05a9de47f766884ffc6f09c5e971329aab42f8ee82c426bc6f09451dc5c269315647bf77ac169a286340efbd2bcfb3ba222843176274b57196463a4bdce4c67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/hsb/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/hsb/firefox-79.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "bec5c0fe7e41a546ea05c6e311a195e84652e2968f25fb0b8daa8677e5feba9e9363c523343789823cb7f4333ba217ba337c6e05bdbd7c1e24679794f5391254"; + sha512 = "19a892646cd8d5619d3bbfe72cecfdcbe522b7038ee878d532a6014f9ad2fe9e7a1712699801920fb1cd3816bc0ad14c2411032c94103390d05323b7d0e5e599"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/hu/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/hu/firefox-79.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "e2cceb23880ec83543b9bf9d05cdb33df99637c8d873706f1a76d9a5e7bb4f838b469f729f5e5c857cd4bddf6911b25800c01da826d8abf54da9e63e2afcf17a"; + sha512 = "39637750ccfdc20c82d52a148b7d2bbfe512acd2f84a5f84696304aee81782ad4a0f300951fcc3d1ed74c375baadea9cd980469dfe256c9aee5d89fb4d76a567"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/hy-AM/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/hy-AM/firefox-79.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "fdc7528f78dae192b08c6fbe4221ebdfc60c2be99368a11de0f5db2fac6d04dd069b4c5cd3683bb55d87e6152cdd2ae7e0725499171021004dcc03982144eac9"; + sha512 = "5ac48a2442acd580a39860ca18904241c0ae3282795dd05e6f5228a45e28bcafdef33929f94a489169666a15f3312e7050061bd062b37ff9dc5182054c7dcfc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ia/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ia/firefox-79.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "4916876d76ed40eb21ccd99c68ba9fa326b991577cd97375425835aa0e7a3fa84963a72b03a9a8b2b37b969fee812e7205a7cf4facda49e74961f06819f0e2cf"; + sha512 = "28fd93c1e5727106a0d295a2390d67c58ea6ba28e7632f3675471ec67fcd681e71a30c1f16e3b0a942aa0308301762b4929aa0ffeccebb8021fa02f16dcb7c11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/id/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/id/firefox-79.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "e566b27eb9a493571750d199e77c65480ef075fbfc4fffdc2705b197aa3521e5808b23bc9229f89c9430ff772a29694c6eb35502893325cbd94ef18d3a6ce264"; + sha512 = "287505bc06905e549c302496ff3adb4d7fb6489c91bbbfb3baa049652876c00509c7d04a2852de4f6363b4893294371d4ebac51189a933688eaaa428c32f5c1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/is/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/is/firefox-79.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e92585293cac8457162b969b8173056d7946641f598e277c03c36a71ab1dcff3efde2d28b1b4cea0136294641f2fa414073192887f02249e344d2b653d4505dc"; + sha512 = "511a5ba0002274f19697c090f96d90cec1175909671b43d8aeb5c8aab483a81ed89733e79db0b86d8bf029cd071f325ecf4b43a9ba6d1e047fe4eb8d5c93199a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/it/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/it/firefox-79.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "af82be9e0c19451c2cf009240be9aa1ea85f7f6dfceb54663bbeb43449f5302efe94ced7a6fae71bc7c402de6e83149c5d2999f79c414750ef58714ab292ce7a"; + sha512 = "e20b9e740501deba9e0ee8810a8da51b98ea09d33ec7d840c75d429096a9b47a2e76d6b46f9376ab5d69072a32272a1ddd118d105e22cfa07900b1ef445b7587"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ja/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ja/firefox-79.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "5005bb3f0f0435fff380d857996e6b14a81654ad879609b9db6fca76af583591b3ea149fac119f63370195491bb9a235c5dbb49f878d77dc8dd86c4d196c4dcb"; + sha512 = "929a89a431d3e73c509517d52da9c4b89051aaaad307c0cacf42b9d8ed7fc299ec787a9bcfd938c5af44232e234320cb83072daa146b96f1a50b4eb4aad283bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ka/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ka/firefox-79.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "134d29830fabc73ac1b880d918e707e779ff8fc947bfc830bbf959a2fcb5fd505e1c8dd1d4fef6376741ddc51d87f9eaaa9f358c734eb372a8c5131d87c8c506"; + sha512 = "f7b79a0d5502c2f0c893d94ca96f88361bf6bef8cdcbb8da41b07bda5c0dd9e7eddb18006f3c0b8f0b611522e0d0659980f234b1143a426529bbd738406e4e26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/kab/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/kab/firefox-79.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "cdf7bf73277af59d69077f528b1255edc81eb907d587c620c75ce0ae41affd82ba6f3923094baaa4a5d1b2e2ab2324066f82845fd21b80cfdc32dae89d36492c"; + sha512 = "fbe27a66357ecc55b07559043bda5c247c043a95498841358b36433f18663ff5731030720130af2f008fb27226542430ea9de5a5c9f62bcb562350da1ff7395a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/kk/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/kk/firefox-79.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "5ae069f81714b409879a525f560b64c6d113d1c824b1397b64eade31b2ea0c90d4f406c86e6bad241dd03c6eeb693182f79446e0d44086d695e86595410d28eb"; + sha512 = "39b26241d770543c7efc70d15fb6dc1ca38d48068e8b207c68dd239ee2b91b1920393c60fec2971a09b7fb2089db6494a9286a00457453bdcebeadb2192aab7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/km/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/km/firefox-79.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "642bc1a3ff81f34366c124fbbcf7dae88f20cdda44ba9c19296c62b2ddad04166dc9d8449f58781044924fc42cd2e9ce7310227c86e6c3aad8e7bb5420d1c006"; + sha512 = "1d5d518ec0a6f83fb5877185b9687a104e9cd654a44f3ec6b002ff8c163b6971efc5e1b2cac1d97e70b007d65d24b4cf9e8e47afd271382e5509937abc30abec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/kn/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/kn/firefox-79.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "459ddbc9d9879963bef5c57429d8622171362dc6c23ddc3b3445a65b9e7fb509b5da4dfac579841079b886f2d62252771f672d32ab5e70e8af4fff577bf059c3"; + sha512 = "bd6d459925fbcf258cf76a98b814ce8c5615de526eb052886f1d1424cfe066fac4ac4493f7e816724da1266ae91e4421b80d468f94b60b629d1fa594b6e6eb62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ko/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ko/firefox-79.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "6d674f5576c0ac5d880e532666337b334ad304a41a7974bb488036ad246386da6f21dd7b77d618e53c474798533b59ce8eade31b1ac96a649e86ec9cff51b4b0"; + sha512 = "5be4b3e60c2588d04604393ea58d295ed41c1ee3c578542536a22f815863932283b886ceb9007ec57a609493e927ee9360f8974d10aa327b8f7b78b562608777"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/lij/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/lij/firefox-79.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "95ff005b3bbe950fad7ee04f1f2fd81c35f4545613919d86172f2f5173c52c2fb4bf357d929d007f576fc2977e0eeb3ba2ae13ac7aff754c3d4a52ab919f82df"; + sha512 = "76834d6437002a3838b91af87c61dbefa1a9d444e75fe3a05b4f4bb3d1ea4482c6c7961480132295d53c270026e748bfb873b8fa8a7a8f02ae21f0c6dfa6b851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/lt/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/lt/firefox-79.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "1a5e2f9ea0dff0070acf0bd62b5aa4a2df6f545fb736837d2e49f68329766d7b4e1fb75a23cadfc3f6780cb4fb77bb2bdc7292d0c6a48e2a5ac0077599461793"; + sha512 = "ce3cda073f487463a74d618726762412138ca394d5c9a01dfead0ddab878497ec5f8027649e36c21998b03709e0f92dfc29f83ff323e462696f70d0fd88c0579"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/lv/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/lv/firefox-79.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "d79d11a4147e3a10f582527848580c32948c4868d06f521914b159534f2285d9371ff12f5abb436296bea2e8b99c4e0bbfde10281f07543aeb8190890a069698"; + sha512 = "550e173220efb18807d00a0ab63aa19dcc4b0486abf2e0c5bb75a3cb1ad1069725118eaeed0570aac842550447dd80d57a4f56675d8bc48cc3230a9bf7ce3b74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/mk/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/mk/firefox-79.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "9af70af0e6e997081cb2c8d899462b67b649821bd073a8ce25dd1cc16204d5cdef5a23d633ecf25d52697941f7c0edf0386088c91640db173bc029976e3bc320"; + sha512 = "0805a56762269aa3dfa9d36084d5bcc02782f60b9669fb555f970e9a6914191e6e5fc91f3c66cb831dd2deb50e0777a37cd22196335c3c81e184b156ae599418"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/mr/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/mr/firefox-79.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "c766bffdf742a3bff9620765d5536b1ee89674678aec48c00f7cc9d5badf8f8387f1a83b1429e3eb5d6753a5c97f547b2b71686f7c35ff70d7339d83229a9772"; + sha512 = "a71b6785c7a29b43567e647c12591be2376ea0c8c517e776904ce62f8e85633a3c02bbc822be0aaa2f242d490b64b3b806ce607848fcfadafe131efef521542"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ms/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ms/firefox-79.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "6de6d32414a251c0534c3ff794606d44489590c54ce2b9e12254e1743e38c5055149e9c55337bed4a487b2de5c47200e69a22d1ad6c126f09a6dc63c171db850"; + sha512 = "d486b636fa1615c1fba5af0146d52f54a257f59b245f88ef95f431f6f784d8b66f69dcb8f0b0cedce904a08396134d180535950b52a6c56ff03eda71fe9da9e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/my/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/my/firefox-79.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "b8e12bdb581f5e3b20522c15e35a249bc270e63fbaf298a955d42e7ae796e411b903689fb930ec8ed0a7a607ac143aafaf74e67b845ffbdf2907bf06590393c0"; + sha512 = "71215908a5a5c9ec624327330da65fb6f42b1e2e3f5ce85aec571288d7bfbda004f5f877f676d9e0cc899f669389a4372a35fada34433f4ea2340d26c547fc42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/nb-NO/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/nb-NO/firefox-79.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "62913a53dee0f9617da39bdc9adec5e500b85aeac68fcefc3b0797da515e570ac0eca70e142488b6de61ef7684ca5e3b100c6c4892660e7132e7cb77c2668a26"; + sha512 = "b539775b42d6a59a9f80d2986545079081675dc21ae58c1f646229badf27759b44c6ad887acb7bf35d7ebbb0f28fc2a9c83b46773f08d94b6e987b6f8023ebfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ne-NP/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ne-NP/firefox-79.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "7d5c6b977b0e274c32932ef3c0c430a434cbe82664907b7fdaabc27b06d4d66b4d7a29a266876089a5647438544d0c2de82f236d394cbce5bcc095e0c627e91e"; + sha512 = "5782a8e33a21a1050bad35052f1785a4d5cab945cba654903cc4e434a6e983b6ca3ca5fa7fc48bae561009363c029048c5dc5788216f5462403483dd462316d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/nl/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/nl/firefox-79.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "7ac864091f66ef5be5d64a4c858ad9331c46a1b801a24da83a440062d4a4eb7c29e39354730e019a78f5d3ae0d52011a11d24f851a05015ad30c05e5e66f8a90"; + sha512 = "e9b49e769bd39732f2160e80096013e06fc7bdab169ef6461940e5caaa70d095c66d98ae3c14354aa4acbc06974b5b0208bc4ac670e9a4193d62d421f672da6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/nn-NO/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/nn-NO/firefox-79.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0825347f0076b5b6ef9f41811e7be2577d534031fac81d2bd8a7b8d943a08cb2adeef43ef31eee3c22176f22af7dd92d73d3f66cabdeb11b70de2f2093952b1e"; + sha512 = "bedcc442a97f53d07d55e6c1ad160562fc2be5e71996619c4bcd5711955cf9747252598c2388bcba6775413c072f5a81c04c55d75b36896c7733e6eaf5a11570"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/oc/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/oc/firefox-79.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "336ddac8c9d3d0f1ebd56d693c6a1a316622a8abd75b37ffc1d0f511d1c1204f08b2997f95639a4144fbe70921e098b2eadfc036c0ca79f840a54f3cd6fe4e56"; + sha512 = "be56e45661f10a58407067322b0023eb139dc0b95ca21e44c049f061cc3d366578ffde33f28ab480cb3df7c8c68ee25373d4a7a37623c1dc55a45846ad36312e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/pa-IN/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/pa-IN/firefox-79.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "84b93992b7b424a0253e65aec272a90c603867d513191610bb8000b6317784cbf8a706097e64707bb7e6c5b8c17b2ac0c2922b4d78168aae792706142b637f49"; + sha512 = "908e98ed580f5780c8204eb10de36e87f908baf3c60439ad8f2db48bd69385d606d2b2be685bd8233d8f029455b4c881855440679b314f3d309ac616b794a644"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/pl/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/pl/firefox-79.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "df53aa6a153b6cef0c1f53907131f046aec359a45dce64ac6580e887c233b653ec8a363374a5d39a755388b8bd562afb01be537f2192a4c7ba6c95089b8615f4"; + sha512 = "b93aa5d83d416ecb7b4cd1957b2e16086fbbfac86b4e8f92b77e5c95e178e83b9c9086fbc79e450f84beb22687d3dff7b36fe252851fe3885d267894a214496c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/pt-BR/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/pt-BR/firefox-79.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "6c6322785cc4e5f7597fdee4261eba1c44f4aa65fe25731488bd4a755baf619d08d4e1c8b3ffef328e5671db3f01cdd633f0405f4d234763e5e6d28031528362"; + sha512 = "595708b079d7872774dd6bf4a4f350e3ebe608ee4a0b8b12cd57dd158f65564fa57f6c1566ebc07fcb577c247978964a257f19680b701a085a2e00f51d8fd271"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/pt-PT/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/pt-PT/firefox-79.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "88c761b94b4f2eaf3fe3b977b6c9ff57ce5f6f378ceea6d892f04e8c05fd60a2af664dcdb96fe2beca79d78032282a8d97d9e963cae90883b00a53d90d975c4b"; + sha512 = "8a6365251b70472cbce1abb37e72614c12a2d535e7fe300bc5fbb370b8089dc3ee9c45e7c7095ec5ba848e20e4126bc8fd3e7953244416aeff6371a180d1c3ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/rm/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/rm/firefox-79.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "8c2ba93f63d0418c9c89db8b9a80019940483a233520a5c4803f2d4731235c05e2012610118d90376d53e1ea3e32df69f0f50cf1ba6678f105ed1cd7b77d251b"; + sha512 = "a761c78030baacb801b2906ddd3d8a18820e1d7359fb3258f5738d4eb709748858f9f73bce0d82ef61e517caa66754e943c6d9181ec036ece7fc8655ee862af4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ro/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ro/firefox-79.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "3d11bc187feceaaf323e4dcd146ac9fa865061c61185f2122603eb99b9b619a86f1ab83afe5a4cbc64ec70fa400c5039b185bc36f397f4f642a983900b7585c0"; + sha512 = "66377462b9a0e1da5f76f9a869e73c0f83419931b4c4c305c4b23b05b3ebf5809645fb161bde374075c33bbcefc3451021a5cdeb6a3187f740fdcd1d1a54698d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ru/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ru/firefox-79.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "0ed98d7436ba397e4ac7daffd5d0b2b1ff18ccb06db97795be60dcf88f267bc72d47f7024deb96f4de79e9386841dcb874ba2277de6c2f3dca12405711e56d41"; + sha512 = "f4de91b071d410ef1f17dbf9393ee6d0a4b44aad9acfba24e9c34e12c5bad03112f26d69de9400699247589175142ba9755cce1a5b6a29a6f051ab98cc322658"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/si/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/si/firefox-79.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "6e630790cfa072cdc65d264bc8fd06503fd27a0cb45a6ea2ee3512bff758cdbc70267f26ccd48cc0b25ec2d6a099943055f48e268df4dfab5b92a41c07eb2ee9"; + sha512 = "2b784fcd8cca0ca7c9891c9f86ddf2c542f4a10549c6a0e96b1ec473aabbacb94cb86f33b2d743873b2b1acb9cbb2a504fff7e1d8b14e8aa72643f8cc7b0d307"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/sk/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/sk/firefox-79.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "343751675e14419851b4d44019b149033e19f0946cb99a244e087c61cb2ebe6d649920823538fc992abb746471ef411214d5d06c82aaaee58383f1e1f9971c43"; + sha512 = "81b7fc24372636dfa6b25aaade036c276115a792022f579d302a6daa9e9ebd6adf6573b6c2ef67e02de6d247a207ac8b9f26a2917c4ec03064e44017ffbb8f71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/sl/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/sl/firefox-79.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "bb4e20af34b7897f92929694520b9763a1717fc18b4f17318c399d737f76f75b0a20c6ab64e74415868bc6ab9af7368780c8e6ebd7680fd6a610231a161dd1c6"; + sha512 = "506379df730572475d631c549cbca20a4ad42350034d3175d62314f2c2541f43a658e45cc460d72715a1c54402317292b05bfdec8959382112aacc0e9ee830ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/son/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/son/firefox-79.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "5b5dafe5899d5e72ebad2b0feddb1a15992c4bd6d7f0c156bbe80eb09f8288f90186c05300d27323ad6df8f0b87f46c8419b77ea186cfce806a84e9a7894fc46"; + sha512 = "b9336d53e8929253f83b9b7193ada1bc96dc33026da53a117c45ad9a9b52e5e41984b07672b589d6a80a89dcfb7ac4ea2ff4bb5abccd0c0cd50a0a2f21313913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/sq/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/sq/firefox-79.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "2865b9573e3fbd5ffe6ce2fc7472fd0a952cc9bda986b42456b811ae1fc135fd3d80910da76472d5d148fc96cedba78deb09b099568749dbe4f02c6166e7b7cd"; + sha512 = "99914032fd314de32a8a2978d57cfddc47eba5da765b6ed07a536b0ae2784f587278dfcc21320c17f8e0c1ac94bfc23f4fd78b6b66d3417028d24b6ef861d48a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/sr/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/sr/firefox-79.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c1f12986394670b2368ba83886491a260776a8959d28fefbbb3e28f89ff15992400d6d52399557f7787b4b90d6cae59f099c94f0ff487912e6813733822fc848"; + sha512 = "aa705282eb01ea0d3b7802e6d980940b194a431b70b76c272588bbb3a460cf3906f5300e77853b9e03139abb35c3b8f83ef6f7108a65d46b218de5d1cef756e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/sv-SE/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/sv-SE/firefox-79.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "b1c4c8210c0f18ada011512cd7a48755db08b4067c7530e30a06ac34f43a863c0929cff714d2d78a79fbb3643c0aff7e901a0e36ba1d006cdb0dd9c42673f8e2"; + sha512 = "9dceeac3798e5ddec0db0cfe79ba7f63830e2ffb2d6d6a1e589df0fd882c42639ad6bfb5b677167c14ac8f689d01800955281d21417ca0b13f3a50630e213091"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ta/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ta/firefox-79.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "5ef1af63b19b2dfe49488cb11ad12c495a576a5aa3623e6b977031974778943ce5714ce4eedcfafbeb621b298fb45b13454798ef72040a17d7e1ae722454f39f"; + sha512 = "67ea9cc2792ad11fe0a82327c831d65ff2e79bb3ef7f64af0f4f2ff471379cf4530d2b438fe6f0c966d77d07bcdf05ee11272a862f780b89ce09528229510eff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/te/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/te/firefox-79.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "8235d3907e8315bb1422e1b32f055571126f39892b2fccc53aeeccea00d896a0b8312e649998daf7ad2994863818b87a1dd14a48510e84caadc5ccb836bd98ca"; + sha512 = "40142ac11f0d351afbf6fb1f4120a94318bc19a32da43ab050debe5fecaf778ee79acfdfdec49b4e710ebf0c458fc0006bb9df2380f381b2ce9ae128c558a62d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/th/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/th/firefox-79.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "05c6fa9d79b7d3e4fa922abe100b3d0f371b60e534a12faecf7691189f0431d7cff457e11cd8ed3c6494cfe0736c0d90f3ec3ba553b2da91c45a99a183cfe073"; + sha512 = "96611ae19a04a246942eadeb68c95dc206dc922c9d6adb5877f0f4aa7dd89e72d8a46e153d322687842a0d526d8085c0915057396b65fee143dc5a0455cf7857"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/tl/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/tl/firefox-79.0b2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "5f911a30b99972bb2b521b96ee50741a42ba921c345d7e9a820b9954e5c77c16afe9299ee5df98f971fb045d757c4ea96c269aac90a21d4fa7c9c6f651b125e6"; + sha512 = "c3fdbd41fc2cc227405db6faccf55cb17c79e1e915f21f603ba3927ba2844785ed306b767361cb45b9097e143e2b96b7b364647dc18015750b36fc5c2d476930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/tr/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/tr/firefox-79.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "326798d3058adfd3d13ede18c643972e4435fc0ccfc126a1d9002c7cda264c94dd691c1929719f7dd0ead6e62454b7198da05cd2796c0393f010bc7bd15487ba"; + sha512 = "6a27b0a490e8e71e75178f4f4ae4486414015fc2823002ee181d1ef66946577a38464efe31553b269ccd5ac47f770c22f22be1f8d46134c87e34ad6c817ab6ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/trs/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/trs/firefox-79.0b2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "6b92fe4b0eb39c90d05d15c4b0ad7fc0774e4351af2cdff620465c9d949ab678fd37e671d1292cbb4830d88a66f81184a696938fd190dc4059aaac91c9b7a15f"; + sha512 = "9495d973366583f3bb0ea3dfeff9bfcc7cee70e438f83385a2aa799acb23d77f07e4edb7bba1917a8dbc8ca63c67ecb4776671c3efda821e85d52dc22d119ed7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/uk/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/uk/firefox-79.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "3940ee3f91ad762937a1e7efb8e864339871e712d47348a08eb4ccf01a3bddc892048b6bbbf300f453ee0298de5d2269a86f2898579f34b70719c35b8bd27a86"; + sha512 = "f3cb32e86fed32c0d98637799415cee7d829bd9d7a8f1eee1c2ce09c222e8e014bcbaa0d76a378231516c19c2a55de43592779eccba20d7e3ba55b775ceb1750"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ur/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/ur/firefox-79.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "fc363167abf28830a0b00ffc9b9d1f51e8805518854369516491fafb4bedda2eae9172659732cd89af782381ac3a7636968405e8e084e4e39623eb32246ba691"; + sha512 = "b669fab1efb59dff9882fc2c0aac497cc2c63705602459cc794d73462362d578d006e6d7910efca6046f4f7f42ed7f182957048441c54b991cfb44f541d4c995"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/uz/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/uz/firefox-79.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "1f8ae3f175837bddbe6b6efb594085892c28abb557316b2eb991d94ea0f83f34210c758d17f0fae3c8c79072772608948871a8b03e075f3ea1efacb0cafc0bd5"; + sha512 = "6a734761dcd1ad0e68280968a0a8c4f286530dc6a82862f580a4f5abad7da667316b548c1aed2fbd05d01eac4e1c3feb7b50f6387e959f6a278952716a8b131a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/vi/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/vi/firefox-79.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "2c6b5087fe7b58be884abc9bfff647d3ebf146e7b9497b2664d4d0ad055f8a335c93bda5149e43c18752e1fcb3f1b5d9d09632552a2daa15983a5c79ef1f71ce"; + sha512 = "0828b3e4bcc529616f2d67679da82e5b602a95acf1c050a3830e1cb76c47c26dd2ed6865348328d028ca1523d7a6f94975c1dc5288b25541c9af1995b9c03ff6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/xh/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/xh/firefox-79.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "0274824180e21a1b9b4e7d7bf5c03710b23e5ce68171c3b7a2a53acb173a081ae6038802896a0eedf933c278f0553c58d443557a6a8e5c3fe9146e8d3a6de59d"; + sha512 = "21903aebf85a8426b797c8780fcce353bc639e73230e768730eaeb25c0cea02d81ab178f3e46c19f50404280900fc115536ed919c2fd739b077f2ee04f40101f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/zh-CN/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/zh-CN/firefox-79.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "603fa464a03e65049c2520bb237e73f528542a7f58305e6cf3976bb0581323daec01e7c925d269e72e9990198a36950a8013563e1c40aad38e6ee818e622fe77"; + sha512 = "52fc8278993575fa594a173b66088f0ed4f759d51e019104ea493a5aad0b8e74a261d3800242cadcb5d93aa99181dd62d7dc4fd462977fae06668175ac396c63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/zh-TW/firefox-78.0b9.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/79.0b2/linux-i686/zh-TW/firefox-79.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "3c91149a15e27e9e3bd3d5aa8c8d26f2e7ea92b8930e801d48c2fc8c9b67581e724d79a90bcb8e91a4bb4d74426c421962cc16938cda3292cb749cf204487795"; + sha512 = "7843b329d73b328ffb7157b3b420dd6482774129cbb1144b4c2d5964ab03a76314b95110119a86b925d7c3238dd30d97c07d54a5fc23bf2e0f3ca40841b2454e"; } ]; } From 3a3d5ff8a0046d4ad235928b63b22a9aa203ab06 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 14:40:56 +0000 Subject: [PATCH 3321/3452] mercurial: 5.4.1 -> 5.4.2 --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 47453cb5e6fe..c7a1c4149870 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -8,11 +8,11 @@ let in python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "1ilam0dz121nn4852jgkgyzyrvk3hn5cqnivy8gk1qg815mh4763"; + sha256 = "0ls8nwx3nz26pibphw54fg8pxqb365zmmqx95lqrxqqyf3d972sw"; }; format = "other"; From 50da2471c21b317cafc64de2753afeb6ee4bb2fe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 13:12:45 +0000 Subject: [PATCH 3322/3452] mpd_clientlib: 2.18 -> 2.19 --- pkgs/servers/mpd/clientlib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index cb02a7684785..3016b7dba835 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: stdenv.mkDerivation rec { - version = "2.18"; + version = "2.19"; pname = "libmpdclient"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "libmpdclient"; rev = "v${version}"; - sha256 = "0p2dw3jwyl34azzvr9bm7q6ni8v4ix9qr5lig62xskvrrbjfc4a6"; + sha256 = "01agvjscdxagw6jcfx0wg81c4b6p8rh0hp3slycmjs2b835kvmq2"; }; nativeBuildInputs = [ meson ninja ] From 1ed248eac2c8bb368fa4c383bca22017fb3d6d20 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 1 Oct 2018 20:17:17 -0400 Subject: [PATCH 3323/3452] nixos/nix-daemon: Organize buildMachine options with a submodule --- nixos/modules/services/misc/nix-daemon.nix | 99 ++++++++++++++++++++-- 1 file changed, 92 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 0b3d7f3f03c3..ee0f8a228b11 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -193,7 +193,92 @@ in }; buildMachines = mkOption { - type = types.listOf types.attrs; + type = types.loaOf (submodule ({ config }: { + options = { + sshUser = mkOption { + type = types.nullOr types.string; + default = null; + description = '' + The user as who to SSH to the build machine. + ''; + }; + hostName = mkOption { + type = types.string; + description = '' + The hostname of the build machine. + ''; + }; + system = mkOption { + type = types.string; + default = null; + description = '' + The system type the build machine can execute derivations on. + null if multiple are supported. + ''; + }; + systems = mkOption { + type = types.listOf types.string; + default = []; + description = '' + The system types the build machine can execute derivations on. + ''; + }; + sshKey = mkOption { + type = types.string; + default = "-"; + description = '' + The path to the SSH private key with which to authenticate with + the build machine. "-" indicates falling back + on defaults. + ''; + }; + maxJobs = mkOption { + type = types.int; + default = 1; + description = '' + The number of concurrent jobs the build machine supports. The + build machine will enforce its own limits but this allows hydra + to schedule better since there is no work-stealing between build + machines. + ''; + }; + speedFactor = mkOption { + type = types.int; + default = 1; + description = '' + Something at indicates how fast the machine is relative to an + arbitrary norm??? + ''; + }; + mandatoryFeatures = mkOptions { + type = types.listOf types.string; + default = []; + decriptions = '' + A list of features derivations built with this remote are + required to opt into using. (See the documentation on Nix itself + for what those features are.) + ''; + }; + supportedFeatures = mkOptions { + type = types.listOf types.string; + default = []; + decriptions = '' + A list of features derivations built with this remote may choose + to use or not. (See the documentation on Nix itself for what + those features are.) + ''; + }; + }; + config = { + assertions = [{ + assertion = config.system != null || config.systems != null; + message = '' + At least one system type (via system or + systems) must be set for every build machine. + ''; + }]; + }; + })); default = []; example = literalExample '' [ { hostName = "voila.labs.cs.uu.nl"; @@ -461,14 +546,14 @@ in { enable = cfg.buildMachines != []; text = concatMapStrings (machine: - "${if machine ? sshUser then "${machine.sshUser}@" else ""}${machine.hostName} " - + machine.system or (concatStringsSep "," machine.systems) - + " ${machine.sshKey or "-"} ${toString machine.maxJobs or 1} " - + toString (machine.speedFactor or 1) + "${if machine.sshUser != null then "${machine.sshUser}@" else ""}${machine.hostName} " + + (if machine.system != null then machine.system else concatStringsSep "," machine.systems) + + " ${machine.sshKey} ${toString machine.maxJobs} " + + toString (machine.speedFactor) + " " - + concatStringsSep "," (machine.mandatoryFeatures or [] ++ machine.supportedFeatures or []) + + concatStringsSep "," (machine.mandatoryFeatures ++ machine.supportedFeatures) + " " - + concatStringsSep "," machine.mandatoryFeatures or [] + + concatStringsSep "," machine.mandatoryFeatures + "\n" ) cfg.buildMachines; }; From 5395397fd6abc45e4d6e6aadec1053733f6b0452 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sat, 21 Mar 2020 20:21:58 +0100 Subject: [PATCH 3324/3452] nixos/nix-daemon: work on buildMachines submodule --- nixos/modules/services/misc/nix-daemon.nix | 142 +++++++++------------ 1 file changed, 59 insertions(+), 83 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index ee0f8a228b11..0fbc9cecb4df 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -193,43 +193,60 @@ in }; buildMachines = mkOption { - type = types.loaOf (submodule ({ config }: { + type = types.listOf (types.submodule ({ options = { - sshUser = mkOption { - type = types.nullOr types.string; - default = null; - description = '' - The user as who to SSH to the build machine. - ''; - }; hostName = mkOption { - type = types.string; + type = types.str; + example = "nixbuilder.example.org"; description = '' The hostname of the build machine. ''; }; system = mkOption { - type = types.string; + type = types.nullOr types.str; default = null; + example = "x86_64-linux"; description = '' The system type the build machine can execute derivations on. - null if multiple are supported. + Either this attribute or systems must be + present, where system takes precedence if + both are set. ''; }; systems = mkOption { - type = types.listOf types.string; + type = types.listOf types.str; default = []; + example = [ "x86_64-linux" "aarch64-linux" ]; description = '' The system types the build machine can execute derivations on. + Either this attribute or system must be + present, where system takes precedence if + both are set. + ''; + }; + sshUser = mkOption { + type = types.nullOr types.str; + default = null; + example = "builder"; + description = '' + The username to log in as on the remote host. This user must be + able to log in and run nix commands non-interactively. It must + also be privileged to build derivations, so must be included in + . ''; }; sshKey = mkOption { - type = types.string; - default = "-"; + type = types.nullOr types.str; + default = null; + example = "/root/.ssh/id_buildhost_builduser"; description = '' - The path to the SSH private key with which to authenticate with - the build machine. "-" indicates falling back - on defaults. + The path to the SSH private key with which to authenticate on + the build machine. The private key must not have a passphrase. + If null, the building user (root on NixOS machines) must have an + appropriate ssh configuration to log in non-interactively. + + Note that for security reasons, this path must point to a file + in the local filesystem, *not* to the nix store. ''; }; maxJobs = mkOption { @@ -237,7 +254,7 @@ in default = 1; description = '' The number of concurrent jobs the build machine supports. The - build machine will enforce its own limits but this allows hydra + build machine will enforce its own limits, but this allows hydra to schedule better since there is no work-stealing between build machines. ''; @@ -246,82 +263,41 @@ in type = types.int; default = 1; description = '' - Something at indicates how fast the machine is relative to an - arbitrary norm??? + The relative speed of this builder. This is an arbitrary integer + that indicates the speed of this builder, relative to other + builders. Higher is faster. ''; }; - mandatoryFeatures = mkOptions { - type = types.listOf types.string; + mandatoryFeatures = mkOption { + type = types.listOf types.str; default = []; - decriptions = '' - A list of features derivations built with this remote are - required to opt into using. (See the documentation on Nix itself - for what those features are.) + example = [ "big-parallel" ]; + description = '' + A list of features mandatory for this builder. The builder will + be ignored for derivations that don't require all features in + this list. All mandatory features are automatically included in + supportedFeatures. ''; }; - supportedFeatures = mkOptions { - type = types.listOf types.string; + supportedFeatures = mkOption { + type = types.listOf types.str; default = []; - decriptions = '' - A list of features derivations built with this remote may choose - to use or not. (See the documentation on Nix itself for what - those features are.) + example = [ "kvm" "big-parallel" ]; + description = '' + A list of features supported by this builder. The builder will + be ignored for derivations that require features not in this + list. ''; }; }; - config = { - assertions = [{ - assertion = config.system != null || config.systems != null; - message = '' - At least one system type (via system or - systems) must be set for every build machine. - ''; - }]; - }; })); default = []; - example = literalExample '' - [ { hostName = "voila.labs.cs.uu.nl"; - sshUser = "nix"; - sshKey = "/root/.ssh/id_buildfarm"; - system = "powerpc-darwin"; - maxJobs = 1; - } - { hostName = "linux64.example.org"; - sshUser = "buildfarm"; - sshKey = "/root/.ssh/id_buildfarm"; - system = "x86_64-linux"; - maxJobs = 2; - speedFactor = 2; - supportedFeatures = [ "kvm" ]; - mandatoryFeatures = [ "perf" ]; - } - ] - ''; description = '' - This option lists the machines to be used if distributed - builds are enabled (see - ). Nix will perform - derivations on those machines via SSH by copying the inputs - to the Nix store on the remote machine, starting the build, - then copying the output back to the local Nix store. Each - element of the list should be an attribute set containing - the machine's host name (hostname), the - user name to be used for the SSH connection - (sshUser), the Nix system type - (system, e.g., - "i686-linux"), the maximum number of - jobs to be run in parallel on that machine - (maxJobs), the path to the SSH private - key to be used to connect (sshKey), a - list of supported features of the machine - (supportedFeatures) and a list of - mandatory features of the machine - (mandatoryFeatures). The SSH private key - should not have a passphrase, and the corresponding public - key should be added to - ~sshUser/authorized_keys - on the remote machine. + This option lists the machines to be used if distributed builds are + enabled (see ). + Nix will perform derivations on those machines via SSH by copying the + inputs to the Nix store on the remote machine, starting the build, + then copying the output back to the local Nix store. ''; }; @@ -548,7 +524,7 @@ in concatMapStrings (machine: "${if machine.sshUser != null then "${machine.sshUser}@" else ""}${machine.hostName} " + (if machine.system != null then machine.system else concatStringsSep "," machine.systems) - + " ${machine.sshKey} ${toString machine.maxJobs} " + + " ${if machine.sshKey != null then machine.sshKey else "-"} ${toString machine.maxJobs} " + toString (machine.speedFactor) + " " + concatStringsSep "," (machine.mandatoryFeatures ++ machine.supportedFeatures) From 6d52e2e8977091c5e984f61039cefe01a3d4e491 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sun, 5 Jul 2020 16:48:15 +0200 Subject: [PATCH 3325/3452] nixos/nix-daemon: mention potential breakage in release notes --- nixos/doc/manual/release-notes/rl-2009.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index c2f26371d667..a28ce4721fef 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -682,6 +682,12 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; behaviour and keep the same VM state between different test runs. + + + The nix.buildMachine option is now type-checked. + There are no functional changes, however this may require updating some configurations to use correct types for all attributes. + + From 1f02e09a2c08a1d685fe220dcba9e01863d9505f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 1 Jul 2020 15:52:53 +0200 Subject: [PATCH 3326/3452] firefox-esr-68: 68.9.0esr -> 68.10.0esr (PR #92043) --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index f0ca1c7cd154..232c9acb70fa 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -35,10 +35,10 @@ rec { firefox-esr-68 = common rec { pname = "firefox-esr"; - ffversion = "68.9.0esr"; + ffversion = "68.10.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "mEMYANgPfGgK757t4p34IXgQkSoxmn9/jC5jfEPs1PTikiOkF6+ypjFegl+XlFP/bmtaV1ZJq6XMY85ZVjdbuA=="; + sha512 = "xcGDNWA2SFHnz46lFlm8T7YCOblgElzbIP4x90LXV//a748xT4ANyRIU7o41gDPcKvlxwIu7pHTvYVixAYgWUw=="; }; patches = [ From c0ebe721a912f15f1c6c717d2565c20599d0ab45 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 15:06:16 +0000 Subject: [PATCH 3327/3452] marvin: 20.13.0 -> 20.15.0 --- pkgs/applications/science/chemistry/marvin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index c090fbee377b..39055519e6f9 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.13.0"; + version = "20.15.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "1mbbl7z215l6z4acwdrmqnvlvc2hv4znz4dmng9iw7rrqns3jjlv"; + sha256 = "0wbk69cg8zsv4c64ilgngc78dggrclmi0iphnsd15cpzrwfgsrfa"; }; nativeBuildInputs = [ dpkg makeWrapper ]; From d80eeaea473d9caf1ef1fd7853f95ab4984fb0ab Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 5 Jul 2020 17:29:17 +0200 Subject: [PATCH 3328/3452] endgame-singularity: 0.30c -> 1.00 --- pkgs/games/endgame-singularity/default.nix | 50 +++++++++------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/games/endgame-singularity/default.nix index 46f21629ca36..c6355d05fa1f 100644 --- a/pkgs/games/endgame-singularity/default.nix +++ b/pkgs/games/endgame-singularity/default.nix @@ -1,46 +1,36 @@ -{ stdenv, fetchurl, unzip, python2 }: +{ stdenv +, fetchurl +, fetchFromGitHub +, unzip +, python3 +}: -python2.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "endgame-singularity"; - version = "0.30c"; - format = "other"; + version = "1.00"; srcs = [ - (fetchurl { - url = "http://www.emhsoft.com/singularity/singularity-${version}-src.tar.gz"; - sha256 = "13zjhf67gmla67nkfpxb01rxs8j9n4hs0s4n9lnnq4zgb709yxgl"; + (fetchFromGitHub { + owner = "singularity"; + repo = "singularity"; + rev = "v${version}"; + sha256 = "0ndrnxwii8lag6vrjpwpf5n36hhv223bb46d431l9gsigbizv0hl"; }) (fetchurl { url = "http://www.emhsoft.com/singularity/endgame-singularity-music-007.zip"; sha256 = "0vf2qaf66jh56728pq1zbnw50yckjz6pf6c6qw6dl7vk60kkqnpb"; }) ]; - sourceRoot = "."; + sourceRoot = "source"; nativeBuildInputs = [ unzip ]; # The music is zipped - propagatedBuildInputs = with python2.pkgs; [ pygame numpy ]; + propagatedBuildInputs = with python3.pkgs; [ pygame numpy polib ]; - # This is not an error: it needs both compilation rounds - buildPhase = '' - ${python2.interpreter} -m compileall "singularity-${version}" - ${python2.interpreter} -O -m compileall "singularity-${version}" - ''; - - installPhase = '' - install -Dm755 "singularity-${version}/singularity.py" "$out/share/singularity.py" - install -Dm644 "singularity-${version}/singularity.pyo" "$out/share/singularity.pyo" - install -Dm644 "singularity-${version}/singularity.pyc" "$out/share/singularity.pyc" - cp -R "singularity-${version}/code" "singularity-${version}/data" "$out/share/" - cp -R "endgame-singularity-music-007" "$out/share/music" - ''; - - # Tell it where to find python libraries - # Also cd to the same directory as the code, since it uses relative paths - postFixup = '' - makeWrapper "${python2.interpreter}" "$out/bin/endgame-singularity" \ - --set PYTHONPATH "$PYTHONPATH" \ - --run "cd \"$out/share\"" \ - --add-flags "$out/share/singularity.py" + # Add the music + postInstall = '' + cp -R "../endgame-singularity-music-007" \ + "$(echo $out/lib/python*/site-packages/singularity)/music" + # ↑ we cannot glob on [...]/music, it doesn't exist yet ''; meta = { From c823b4c374599508b3c95b3357da03e9f51f3221 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 5 Jul 2020 17:37:04 +0200 Subject: [PATCH 3329/3452] endgame-singularity: add option to disable the default music pack It's the heaviest part of the game. People may not want to have it take space or may want to use their own music. --- pkgs/games/endgame-singularity/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/games/endgame-singularity/default.nix index c6355d05fa1f..4e855dbd053f 100644 --- a/pkgs/games/endgame-singularity/default.nix +++ b/pkgs/games/endgame-singularity/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , unzip , python3 +, enableDefaultMusicPack ? true }: python3.pkgs.buildPythonApplication rec { @@ -16,18 +17,19 @@ python3.pkgs.buildPythonApplication rec { rev = "v${version}"; sha256 = "0ndrnxwii8lag6vrjpwpf5n36hhv223bb46d431l9gsigbizv0hl"; }) - (fetchurl { + ] ++ stdenv.lib.optional enableDefaultMusicPack ( + fetchurl { url = "http://www.emhsoft.com/singularity/endgame-singularity-music-007.zip"; sha256 = "0vf2qaf66jh56728pq1zbnw50yckjz6pf6c6qw6dl7vk60kkqnpb"; - }) - ]; + } + ); sourceRoot = "source"; nativeBuildInputs = [ unzip ]; # The music is zipped propagatedBuildInputs = with python3.pkgs; [ pygame numpy polib ]; # Add the music - postInstall = '' + postInstall = stdenv.lib.optionalString enableDefaultMusicPack '' cp -R "../endgame-singularity-music-007" \ "$(echo $out/lib/python*/site-packages/singularity)/music" # ↑ we cannot glob on [...]/music, it doesn't exist yet From de00fa10414db552fd9061de0add1f8330c5cd12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Sun, 5 Jul 2020 18:01:00 +0200 Subject: [PATCH 3330/3452] nixos/manual: Fix invalid link reference in release notes --- nixos/doc/manual/release-notes/rl-2009.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index a28ce4721fef..93238a5233fa 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -684,7 +684,7 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; - The nix.buildMachine option is now type-checked. + The nix.buildMachines option is now type-checked. There are no functional changes, however this may require updating some configurations to use correct types for all attributes. From b8a64b3ecf31b94a927ffeec2d6aca6595ca39ef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 16:33:16 +0000 Subject: [PATCH 3331/3452] lxc: 4.0.2 -> 4.0.3 --- pkgs/os-specific/linux/lxc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index cc25f90f2481..f39f3adf5010 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1c2wbbcvs58slyq0skxizx61q1lb4yvak28x4gzsbzh3yg6nscya"; + sha256 = "1rbj2rkn8cn6av74cqld3l2i5r37i6mhsxvvlvlmg724fbbr2vfm"; }; nativeBuildInputs = [ From 50bb0a3a8d2f15ac4074078563a297c0f84749f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 12:35:36 +0000 Subject: [PATCH 3332/3452] libnma: 1.8.28 -> 1.8.30 --- pkgs/tools/networking/network-manager/libnma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/libnma/default.nix b/pkgs/tools/networking/network-manager/libnma/default.nix index 727c18e92c10..7d7889f9a5bc 100644 --- a/pkgs/tools/networking/network-manager/libnma/default.nix +++ b/pkgs/tools/networking/network-manager/libnma/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "libnma"; - version = "1.8.28"; + version = "1.8.30"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja"; + sha256 = "1d5gzn7ss5vi0bhc8s4i5gsrck1ajslajam5jxfqazg094mffcys"; }; patches = [ From 9b9fe3053d0aec5ed69578d8f4fb3c78941a4c64 Mon Sep 17 00:00:00 2001 From: David Wood Date: Sun, 5 Jul 2020 18:08:49 +0100 Subject: [PATCH 3333/3452] mdcat: 0.19.0 -> 0.20.0 --- pkgs/tools/text/mdcat/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 66d1105770b5..572431752642 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -2,30 +2,31 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - hash = "sha256-/ZhhDiiUc+swXr3IuuQD4YqIIdgh8PeRWm/ko9Lc0rM="; + hash = "sha256-1qxz6p7VaJ9eMcLQaTW/M4+Xo0WLihzyEAycbkjjPyA="; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-SGX94XY7e38xySvTO+CDTUBDTfYybPy12iWFoFc2Nto="; + cargoSha256 = "sha256-/mAwlxed1MOFUA1jDSrgPzJuURbKzwucBWORVVHlrt8="; checkInputs = [ ansi2html ]; checkPhase = '' # Skip tests that use the network and that include files. - cargo test -- --skip terminal::iterm2 \ - --skip magic::tests::detect_mimetype_of_svg_image \ - --skip magic::tests::detect_mimetype_of_png_image \ + cargo test -- \ --skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length \ --skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length \ + --skip magic::tests::detect_mimetype_of_png_image \ + --skip magic::tests::detect_mimetype_of_svg_image \ --skip resources::tests::read_url_with_http_url_fails_when_status_404 \ - --skip resources::tests::read_url_with_http_url_returns_content_when_status_200 + --skip resources::tests::read_url_with_http_url_returns_content_when_status_200 \ + --skip iterm2_tests_render_md_samples_images_md ''; meta = with stdenv.lib; { From c073d5077f2c80db5e8597699a920107e91b4a49 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 17:57:17 +0000 Subject: [PATCH 3334/3452] mypy: 0.780 -> 0.782 --- pkgs/development/python-modules/mypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index bdc032a942ba..0bcf216fa46f 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.780"; + version = "0.782"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4ef13b619a289aa025f2273e05e755f8049bb4eaba6d703a425de37d495d178d"; + sha256 = "030kn709515452n6gy2i1d9fg6fyrkmdz228lfpmbslybsld9xzg"; }; propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ]; From 2d24b8b187965fa13922be5c9c2994a81879094c Mon Sep 17 00:00:00 2001 From: Sage Raflik Date: Fri, 3 Jul 2020 17:24:09 -0500 Subject: [PATCH 3335/3452] crispyDoom: fixed CVE-2020-14983 --- pkgs/games/crispy-doom/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index ea7c3c6e4784..5bd6e714e427 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }: +{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "crispy-doom"; @@ -11,6 +11,18 @@ stdenv.mkDerivation rec { sha256 = "1b6gn0dysv631jynh769whww9xcss1gms78sz3nrn855q1dsvcb4"; }; + patches = [ + # Fixes CVE-2020-14983 + (fetchpatch { + url = "https://github.com/chocolate-doom/chocolate-doom/commit/f1a8d991aa8a14afcb605cf2f65cd15fda204c56.diff"; + sha256 = "1z6pxg9azcqq7g09hjc09d01knd803nhqilkw2kbx8648hil9mgn"; + }) + (fetchpatch { + url = "https://github.com/chocolate-doom/chocolate-doom/commit/54fb12eeaa7d527defbe65e7e00e37d5feb7c597.diff"; + sha256 = "0ww21jn02ld73rkp06f7fqy92jqv8c9q4d1mvsryag1gmvy57znj"; + }) + ]; + postPatch = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ''; From d4f3a40137604e20c05e14432ce6d8d9b9ebe76f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 18:11:22 +0000 Subject: [PATCH 3336/3452] mopidy-iris: 3.49.0 -> 3.50.0 --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 5cc3a957d260..796812a9bd0e 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.49.0"; + version = "3.50.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0zddm7286iwx437gjz47m4g28s8gdcxnm2hmly9w1dzi08aa4fas"; + sha256 = "04miwf0dqb8jir9g7xkfnn3l62bdn74ap03kqzz2v3byg64f1p0g"; }; propagatedBuildInputs = [ From 829e32b1048e410005d148177440b9a4a60b4120 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 19:05:51 +0000 Subject: [PATCH 3337/3452] numix-icon-theme-square: 19.12.27 -> 20.06.07 --- pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 9cebdc331065..53c8e5399893 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "19.12.27"; + version = "20.06.07"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0pjbi2g7wk8gyr4lvp8fvcb8z29kc3l6v19a45axgadnc609hqw7"; + sha256 = "0irib8qywc32cqxchb4z20p0vnyvlgxk8z4vqa5lzx7cd4xmflm1"; }; nativeBuildInputs = [ gtk3 ]; From e45ddb758886875917a101a034e5b96b18e377e1 Mon Sep 17 00:00:00 2001 From: Benjamin Esham Date: Sun, 5 Jul 2020 15:17:13 -0400 Subject: [PATCH 3338/3452] vim_configurable: only run patchelf on gvim if gvim was built --- pkgs/applications/editors/vim/configurable.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 83c8533f5cdf..77d7ca983cdd 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,5 +1,3 @@ -# TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. -# but I have gvim with python support now :) - Marc { source ? "default", callPackage, stdenv, ncurses, pkgconfig, gettext , writeText, config, glib, gtk2-x11, gtk3-x11, lua, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu @@ -156,7 +154,12 @@ in stdenv.mkDerivation rec { '' + stdenv.lib.optionalString stdenv.isLinux '' patchelf --set-rpath \ "$(patchelf --print-rpath $out/bin/vim):${stdenv.lib.makeLibraryPath buildInputs}" \ - "$out"/bin/{vim,gvim} + "$out"/bin/vim + if [[ -e "$out"/bin/gvim ]]; then + patchelf --set-rpath \ + "$(patchelf --print-rpath $out/bin/vim):${stdenv.lib.makeLibraryPath buildInputs}" \ + "$out"/bin/gvim + fi ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc '' + stdenv.lib.optionalString wrapPythonDrv '' From 1a1f2b05923d75353acc6b8fe9a753c6fbc8475d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 19:49:00 +0000 Subject: [PATCH 3339/3452] moodle: 3.8.3 -> 3.9 --- pkgs/servers/web-apps/moodle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 62de7620c5e4..ec3fa2287b95 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, writeText }: let - version = "3.8.3"; + version = "3.9"; stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version); in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "1anjv4gvbb6833j04a1b4aaysnl4h0x96sr1hhm4nm5kq2fimjd1"; + sha256 = "1splsxdxzwf49zxrdb4q05fj60agqyzv0ikvk05gaf49qqd8rznz"; }; phpConfig = writeText "config.php" '' From 9b605b5a2398fc459c1a81dba0746eb2e1e5b4dc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 19:57:17 +0000 Subject: [PATCH 3340/3452] nftables: 0.9.3 -> 0.9.6 --- pkgs/os-specific/linux/nftables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 34f899977d1a..9ec42ad66b06 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -10,12 +10,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.9.3"; + version = "0.9.6"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2"; - sha256 = "0y6vbqp6x8w165q65h4n9sba1406gaz0d4744gqszbm7w9f92swm"; + sha256 = "0vmn6xwqa1nq6crfxshh049b199d0aj6hfgin7k068xhibzgvmk8"; }; nativeBuildInputs = [ From c1dbd9a0fab1cf5f784634173da8336f84e399ad Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 20:15:13 +0000 Subject: [PATCH 3341/3452] monero-gui: 0.16.0.0 -> 0.16.0.2 --- pkgs/applications/blockchains/monero-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 89b41a6110e7..e42f0ddc96e2 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.16.0.0"; + version = "0.16.0.2"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "06vdrsj5y9k0zn32hspyxc7sw1kkyrvi3chzkdbnxk9jvyj8k4ld"; + sha256 = "1b1m8vhs0hdh81ysm8s8vfwqskqsihylb51wz16kc98ba40r9gqg"; }; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; From 297efcd26ee9357ba2f2bbda1eab6bffa8f9f037 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 20:20:44 +0000 Subject: [PATCH 3342/3452] numix-icon-theme-circle: 19.12.27 -> 20.06.07 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 3c991cf1fc83..885423d9a258 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "19.12.27"; + version = "20.06.07"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0za44h7f4vk37yl30xlaa6w76maiipb6p63gl9hl1rshdn9nxq0y"; + sha256 = "1j1i5w3pfw61axcqh8jdkcv20fkmwq0mslfhq725sp3jwv9wyqy2"; }; nativeBuildInputs = [ gtk3 ]; From 14ee9eba4301e8852fd2357d4e5496a467737f84 Mon Sep 17 00:00:00 2001 From: OmnipotentEntity Date: Sun, 5 Jul 2020 16:25:24 -0400 Subject: [PATCH 3343/3452] postgresqlPackages.repmgr 5.0.0 -> 5.1.0 (#92362) --- pkgs/servers/sql/postgresql/ext/repmgr.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix index 4ac74b2620bc..a2e319170bd4 100644 --- a/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "repmgr"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "2ndQuadrant"; repo = "repmgr"; rev = "v${version}"; - sha256 = "0zrpv17zrgl8hynbzaaqj17qrchc8r9qwpqh8y10b0v3xdr22ayl"; + sha256 = "1igcy98ggwyx8zg4g4kz7xb32b7vc3h668r5wbfk4w49x9v97f4m"; }; nativeBuildInputs = [ flex ]; From 95274b0b579b9459fc0da00d7f45b9ba0cd064ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 20:27:41 +0000 Subject: [PATCH 3344/3452] ntp: 4.2.8p14 -> 4.2.8p15 --- pkgs/tools/networking/ntp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index d118227c3268..a7deaf7b6948 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { - name = "ntp-4.2.8p14"; + name = "ntp-4.2.8p15"; src = fetchurl { url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "1dsfbrad5adwjnm3k0y0ip8dzs7r2nmw66vjil8gvapnh7qf8q0r"; + sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n"; }; # The hardcoded list of allowed system calls for seccomp is From 472e4d5940422f45c176591fc28e6abb125fa1b9 Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Sun, 5 Jul 2020 16:55:51 -0400 Subject: [PATCH 3345/3452] todoist-electron: 1.22 -> 1.23.0 --- pkgs/applications/misc/todoist-electron/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index be9027f9d098..e1d578edb0f5 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "1.22"; + version = "1.23.0"; src = fetchurl { - url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}.0_amd64.deb"; - sha256 = "09w2040xkvv78190fmhx99c0dwy7vpab5fvxs67s7yyjwh5n4693"; + url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}_amd64.deb"; + sha256 = "1yxa0fdc3fnffny6jf1hm7545792pw7828mc27il17l4kn346g98"; }; desktopItem = makeDesktopItem { From d4cf52c414936c066c04f95b15f51e39fa68fbef Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 5 Jul 2020 23:35:16 +0200 Subject: [PATCH 3346/3452] roundcube: 1.4.6 -> 1.4.7 https://github.com/roundcube/roundcubemail/releases/tag/1.4.7 --- pkgs/servers/roundcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 03c1a6cf770b..2bdcd94fe799 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "06xxzvjd06r90fxpq9zh9fwylg6sbd26c08rxfd553jikyp5znsm"; + sha256 = "1jdcda6102n948l6qzhjsiylnmx5fkgjg2hn17g93x3yzwkmvn16"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; From bfc1c1533c8edaadf8fecd5481c16332ae031ae3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 21:49:43 +0000 Subject: [PATCH 3347/3452] pentobi: 18.0 -> 18.1 --- pkgs/games/pentobi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix index 909f09a0b392..2b5a86ad52c9 100644 --- a/pkgs/games/pentobi/default.nix +++ b/pkgs/games/pentobi/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "18.0"; + version = "18.1"; pname = "pentobi"; src = fetchurl { url = "mirror://sourceforge/pentobi/${pname}-${version}.tar.xz"; - sha256 = "0dlvshywxijl0hrkl66szamcr77arh118f44ngr1ail8mg1fx1fy"; + sha256 = "1vfw61lk9z7dngncmx3fggy5ld7ksdk48dpwnsq2vl5fh3f71qbq"; }; nativeBuildInputs = [ cmake docbook_xsl wrapQtAppsHook ]; From 8854d86dd2c68bc2f32442dab67e1f18d33c44ca Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Sun, 5 Jul 2020 18:27:30 -0400 Subject: [PATCH 3348/3452] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 84 ++++++++++++++--------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 5cb779d5e1f8..9b56183b3720 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -521,12 +521,12 @@ let coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-07-02"; + version = "2020-07-04"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "c99a4ea7902293460b4d903cdcce4892f12046f5"; - sha256 = "0r4xs0mhdxvac81cly89jqnby14h1dmrpkdfs0chz5ji4gbsgair"; + rev = "3dbe29b9462a1dd910ff653564cadd72146386c8"; + sha256 = "1j2z557lzsr25s9ijdfiyg8zd7f967qnq8imacwn6qzfs1r337nj"; }; meta.homepage = "https://github.com/ckipp01/coc-metals/"; }; @@ -605,12 +605,12 @@ let coc-rust-analyzer = buildVimPluginFrom2Nix { pname = "coc-rust-analyzer"; - version = "2020-07-03"; + version = "2020-07-04"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "3a055d616ac8047e1411912ba2eff73f1ec3fce8"; - sha256 = "1ypkx7m8z7nhdbrh7jbskwmb4yjis1m56bmp4sp1nygr52jshz03"; + rev = "6502de6ac34a5f15285530082644d5923986f77e"; + sha256 = "09z1nbp8yr77mr7rn4nbsf278q6qwf6snfdh25il61bal9pvh4cz"; }; meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/"; }; @@ -1014,12 +1014,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-06-29"; + version = "2020-07-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "a17b460fe6b571135347e7464df1d5769c589fdc"; - sha256 = "0fldnfn4w2sarc7mxmp157xijwqhf8d8jy85qxppibfah4wicaia"; + rev = "17c86b95f2667c674fd87d54c3807ff1e449a714"; + sha256 = "1zqvblnp1654l8fkn77a6q4k7gb005ps2cvzj3pw2g4ksdmfznxy"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1074,12 +1074,12 @@ let deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2020-07-01"; + version = "2020-07-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "b9113d9defa0bf92cd69c2811450943a33526344"; - sha256 = "07v3b3lcl8qjsc9rxv3zkw8idgsp633q1n986wm6pg1310scxw07"; + rev = "b07a1f2a23a4e68010c53a1e4e1d2a9e46e37ec5"; + sha256 = "0dac5q55cqzl2xawfb2dnqnvbwribbbc58lsm612iz425bhv2yn3"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2341,12 +2341,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-06-30"; + version = "2020-07-04"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "96c3cbdee4d0ddbe385388319d7e976e4009e943"; - sha256 = "1cvg4ziadjlxr4gkjmdrr6ddhpw7gsc24c8jsj85p45x7ijaqhbl"; + rev = "0182a798813f974f21d5779d76747fa68e9717e8"; + sha256 = "02jh8ph55bns8dhxd1rpl62b4z7i5rx8v28b1ldrrvc29y1ymqs2"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2593,12 +2593,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-06-24"; + version = "2020-07-04"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "8e978339b57cd03d97ae301659136ce103435910"; - sha256 = "14j15cfbzxv2m12i4r5j3fk3438l7k27knnrbkqas83jvrkb3q2f"; + rev = "8defde900a60b4a377384d3758b2b9a11930ed90"; + sha256 = "0gzy50ih60v6h13cvmg8ywsr43a1z7gmxqz7gx3s33fbbvlbgah2"; }; meta.homepage = "https://github.com/neovim/nvim-lsp/"; }; @@ -3229,12 +3229,12 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2020-06-20"; + version = "2020-07-05"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "20e41455e1155f5989ecac007fc92c9415244822"; - sha256 = "1jzqz0pi9zaf2ivdvb2prv5k86003dswpv2n3vh5vkmwgl1r3ml4"; + rev = "f60b6c5ee3341e66373457d3d8007c8b9c2e0a74"; + sha256 = "1vyirnzswjipimc14gdxnm07wvbkw1sp3kpsggqccwjkibh3fxhh"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -3290,12 +3290,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-06-22"; + version = "2020-07-05"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "140f516eaeae855b3d57068e6e66c8f40fd45295"; - sha256 = "1df2lm8rms535gmcgwnlpjr5bmcd76h6hisyfl922kbj4b02v0b6"; + rev = "63b74a7473ec01548298284c210fee0a78a6156d"; + sha256 = "1xp63bfb9ln80gz4jsp4gjk9ckhlkzxmfi5sb72vvlsravw5g3v7"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -3867,12 +3867,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-06-29"; + version = "2020-07-05"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "ba9b3e183929263bffc44592e5c9a92d2ab8a62d"; - sha256 = "0xkqh68x7nx1w4a5668ih7mmz1xy8qimb4z827dhgv6i23zh6yq6"; + rev = "b843321428209c892f4a1fab7a5fe473f0b7d386"; + sha256 = "143x1235p2wdnifpv637lbhi6jsxwdws07z6hrf6915qjc39zi53"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4299,12 +4299,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-06-23"; + version = "2020-07-04"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "c08e526760c0403d307583afdf7110fbaf98577f"; - sha256 = "0mv6vlf6s6hx244rb4qn7chir1sdg6qr4ffkdiqlbn1lnbm93i8a"; + rev = "1ac58941ba3da654c0e1060e3d6077c5cf93427e"; + sha256 = "1mzmlza640iikip0l9fpm8v3g5b6k6ijxc1z7gj1fdfz145zvsli"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -4743,12 +4743,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-07-02"; + version = "2020-07-04"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "f919e0c50deffba7ae2789cf785ed491a6bec9d4"; - sha256 = "068msrfl0v64djws1cb5p2yvwsk29j4msdqqf4c13bafjyhxqwb7"; + rev = "54a49ebd7c884da13f0a12136bf46232a1bcc564"; + sha256 = "1wikchbwyvlr2i9vbxfz4nvic3wwirssm89hsxbqqs5xny147b6i"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5440,12 +5440,12 @@ let vim-move = buildVimPluginFrom2Nix { pname = "vim-move"; - version = "2020-06-22"; + version = "2020-07-05"; src = fetchFromGitHub { owner = "matze"; repo = "vim-move"; - rev = "54f06c405bfd1ec3142750e8788f4dcd0ca0c065"; - sha256 = "0wnfk164fyfyyl5pbbfa7wzy39arn2ny790d6g14bf6zl2kapkas"; + rev = "07459060d9166a19a2279740fedef2412eeee807"; + sha256 = "1xikw6cq2pp5j2w0n8sckyq6l91y8gzqs2y1cs0h3bd5qba62nna"; }; meta.homepage = "https://github.com/matze/vim-move/"; }; @@ -6148,12 +6148,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2020-04-12"; + version = "2020-07-04"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "a81139239d6447b1c021e4873e6a14b47f32b65a"; - sha256 = "0wavkm9k2vm23nm5bmc3lpm6cac7mihzjcyk4r77qgdgmnnxkm49"; + rev = "f7442cdb1fb37778ddff93649e172b0ad752c237"; + sha256 = "0xf9qj0i4jpimbk0qyzvg88s74dfxgd4kzvzcvjpcd3q6cn8sard"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -7072,12 +7072,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-06-20"; + version = "2020-07-04"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "7f4e88b3ba11261e6ec4c7364c5a420d48e253ac"; - sha256 = "1q98pf0cr38k1z9czm57pvb0mari57q89swsk4aq0pl6b6cvi5d5"; + rev = "e6f121561506f011d878855b66ca8116a46121ae"; + sha256 = "09241155jwrwqqifkh7a64nk5x8yf96835jkywwysl554ppjz8s5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; From c6aa4058adbd128755a22879478a5680222e7c7a Mon Sep 17 00:00:00 2001 From: Imran Hossain Date: Sun, 5 Jul 2020 18:27:51 -0400 Subject: [PATCH 3349/3452] vimPlugins.neuron-vim: init at 2020-07-05 --- 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 9b56183b3720..8d67856feec0 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2507,6 +2507,18 @@ let meta.homepage = "https://github.com/albfan/nerdtree-git-plugin/"; }; + neuron-vim = buildVimPluginFrom2Nix { + pname = "neuron-vim"; + version = "2020-07-05"; + src = fetchFromGitHub { + owner = "ihsanturk"; + repo = "neuron.vim"; + rev = "4ccd13f95a2c9f3dafef2d4adf633e0b18a16019"; + sha256 = "1z7i0szajykhdqckjydgh297k6b83ni9yds809skx90dlgbxwpfx"; + }; + meta.homepage = "https://github.com/ihsanturk/neuron.vim/"; + }; + nim-vim = buildVimPluginFrom2Nix { pname = "nim-vim"; version = "2019-04-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 46d445e9c2ab..e496a26f27aa 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -146,6 +146,7 @@ hsitz/VimOrganizer iamcco/coc-spell-checker ianks/vim-tsx idris-hackers/idris-vim +ihsanturk/neuron.vim Inazuma110/deoplete-greek inkarkat/vim-SyntaxRange int3/vim-extradite From bb63d0fcb538a91037fe4057b524f8fdc5694b2c Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Mon, 6 Jul 2020 01:37:57 +0800 Subject: [PATCH 3350/3452] chewing-editor: init at 0.1.1 chewing-editor is the user phrase editor for Chewing input method (a widely used bopomofo Chinese input method) Chewing IM memorize phrases input by the automatically or when the hot keys are pressed. With this package, users will be able to correct/add phrases in the database. This is one of the fundamental functionality of Chewing IM and it will be great to have it in NixOS. The corresponded Packaging Request is #89554. --- .../misc/chewing-editor/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/misc/chewing-editor/default.nix diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix new file mode 100644 index 000000000000..838acd98a274 --- /dev/null +++ b/pkgs/applications/misc/chewing-editor/default.nix @@ -0,0 +1,30 @@ +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, libchewing, qtbase +, qttools }: + +mkDerivation rec { + pname = "chewing-editor"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "chewing"; + repo = "${pname}"; + rev = "${version}"; + sha256 = "0kc2hjx1gplm3s3p1r5sn0cyxw3k1q4gyv08q9r6rs4sg7xh2w7w"; + }; + + doCheck = true; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libchewing qtbase qttools ]; + + meta = with stdenv.lib; { + description = "Cross platform chewing user phrase editor"; + longDescription = '' + chewing-editor is a cross platform chewing user phrase editor. It provides a easy way to manage user phrase. With it, user can customize their user phrase to increase input performance. + ''; + homepage = "https://github.com/chewing/chewing-editor"; + license = licenses.gpl2Plus; + maintainers = [ ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe1e861081ee..c1382c2a131e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3400,6 +3400,8 @@ in fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { }; + chewing-editor = libsForQt5.callPackage ../applications/misc/chewing-editor { }; + fcppt = callPackage ../development/libraries/fcppt { }; fcrackzip = callPackage ../tools/security/fcrackzip { }; From 66020b7b525e9af19f779db53905d08aa727f565 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Mon, 6 Jul 2020 01:35:05 +0800 Subject: [PATCH 3351/3452] maintainer-list: Add ShamrockLee (myself) to maintainer-list --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/misc/chewing-editor/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9364636d1a62..ae81c0b942cd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7148,6 +7148,12 @@ githubId = 24496705; name = "Scott Hamilton"; }; + ShamrockLee = { + name = "Shamrock Lee"; + email = "44064051+ShamrockLee@users.noreply.github.com"; + github = "ShamrockLee"; + githubId = 44064051; + }; shanemikel = { email = "shanepearlman@pm.me"; github = "shanemikel"; diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix index 838acd98a274..b70f9a2e7d80 100644 --- a/pkgs/applications/misc/chewing-editor/default.nix +++ b/pkgs/applications/misc/chewing-editor/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { ''; homepage = "https://github.com/chewing/chewing-editor"; license = licenses.gpl2Plus; - maintainers = [ ]; + maintainers = [ maintainers.ShamrockLee ]; platforms = platforms.all; }; } From 63866c47f8b53e37c897c035e02c3988259868ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Jul 2020 23:25:38 +0000 Subject: [PATCH 3352/3452] pacman: 5.2.1 -> 5.2.2 --- pkgs/tools/package-management/pacman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index 3ca55ddbbf29..980f0d1e0c91 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -3,11 +3,11 @@ lzma, curl, runtimeShell }: stdenv.mkDerivation rec { pname = "pacman"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { url = "https://sources.archlinux.org/other/${pname}/${pname}-${version}.tar.gz"; - sha256 = "04pkb8qvkldrayfns8cx4fljl4lyys1dqvlf7b5kkl2z4q3w8c0r"; + sha256 = "1829jcc300fxidr3cahx5kpnxkpg500daqgn2782hg5m5ygil85v"; }; enableParallelBuilding = true; From cace0f76e4d06dff5e9a07f5118c5e0ab8fa914b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 10 Jun 2020 02:26:39 +0200 Subject: [PATCH 3353/3452] pythonPackages.spidev: init at 3.5 --- .../python-modules/spidev/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/spidev/default.nix diff --git a/pkgs/development/python-modules/spidev/default.nix b/pkgs/development/python-modules/spidev/default.nix new file mode 100644 index 000000000000..0d0fd582363e --- /dev/null +++ b/pkgs/development/python-modules/spidev/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "spidev"; + version = "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "03cicc9kpi5khhq0bl4dcy8cjcl2j488mylp8sna47hnkwl5qzwa"; + }; + + # package does not include tests + doCheck = false; + + pythonImportsCheck = [ "spidev" ]; + + meta = with lib; { + homepage = "https://github.com/doceme/py-spidev"; + description = "Python bindings for Linux SPI access through spidev"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 69284f90582b..642e2ad06292 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1567,6 +1567,8 @@ in { spglib = callPackage ../development/python-modules/spglib { }; + spidev = callPackage ../development/python-modules/spidev { }; + srvlookup = callPackage ../development/python-modules/srvlookup { }; sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; From 8af58eda1202bc9df98add36dbca118f88a2b0b7 Mon Sep 17 00:00:00 2001 From: Eric Wolf <1983821+typetetris@users.noreply.github.com> Date: Mon, 6 Jul 2020 03:37:56 +0200 Subject: [PATCH 3354/3452] postfix: Add submissions option for postfix and test (#91691) RFC 8314 suggests, for end user submission of mails, SMTP over TLS on port 465 should be used. Closes #91690 --- nixos/modules/services/mail/postfix.nix | 51 +++++++++++++ nixos/tests/all-tests.nix | 2 + ...postfix-raise-smtpd-tls-security-level.nix | 44 +++++++++++ nixos/tests/postfix.nix | 76 +++++++++++++++++++ 4 files changed, 173 insertions(+) create mode 100644 nixos/tests/postfix-raise-smtpd-tls-security-level.nix create mode 100644 nixos/tests/postfix.nix diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 608f64a68fb0..f025932fa126 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -280,6 +280,17 @@ in description = "Whether to enable smtp submission."; }; + enableSubmissions = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable smtp submission via smtps. + + According to RFC 8314 this should be preferred + over STARTTLS for submission of messages by end user clients. + ''; + }; + submissionOptions = mkOption { type = types.attrs; default = { @@ -298,6 +309,29 @@ in description = "Options for the submission config in master.cf"; }; + submissionsOptions = mkOption { + type = types.attrs; + default = { + smtpd_sasl_auth_enable = "yes"; + smtpd_client_restrictions = "permit_sasl_authenticated,reject"; + milter_macro_daemon_name = "ORIGINATING"; + }; + example = { + smtpd_sasl_auth_enable = "yes"; + smtpd_sasl_type = "dovecot"; + smtpd_client_restrictions = "permit_sasl_authenticated,reject"; + milter_macro_daemon_name = "ORIGINATING"; + }; + description = '' + Options for the submission config via smtps in master.cf. + + smtpd_tls_security_level will be set to encrypt, if it is missing + or has one of the values "may" or "none". + + smtpd_tls_wrappermode with value "yes" will be added automatically. + ''; + }; + setSendmail = mkOption { type = types.bool; default = true; @@ -878,6 +912,23 @@ in command = "smtp"; args = [ "-o" "smtp_fallback_relay=" ]; }; + } // optionalAttrs cfg.enableSubmissions { + submissions = { + type = "inet"; + private = false; + command = "smtpd"; + args = let + mkKeyVal = opt: val: [ "-o" (opt + "=" + val) ]; + adjustSmtpTlsSecurityLevel = !(cfg.submissionsOptions ? smtpd_tls_security_level) || + cfg.submissionsOptions.smtpd_tls_security_level == "none" || + cfg.submissionsOptions.smtpd_tls_security_level == "may"; + submissionsOptions = cfg.submissionsOptions // { + smtpd_tls_wrappermode = "yes"; + } // optionalAttrs adjustSmtpTlsSecurityLevel { + smtpd_tls_security_level = "encrypt"; + }; + in concatLists (mapAttrsToList mkKeyVal submissionsOptions); + }; }; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 26ea0570f0fe..e13a5ee57f6f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -268,6 +268,8 @@ in plasma5 = handleTest ./plasma5.nix {}; plotinus = handleTest ./plotinus.nix {}; podman = handleTestOn ["x86_64-linux"] ./podman.nix {}; + postfix = handleTest ./postfix.nix {}; + postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {}; postgis = handleTest ./postgis.nix {}; postgresql = handleTest ./postgresql.nix {}; postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {}; diff --git a/nixos/tests/postfix-raise-smtpd-tls-security-level.nix b/nixos/tests/postfix-raise-smtpd-tls-security-level.nix new file mode 100644 index 000000000000..bfe02865553f --- /dev/null +++ b/nixos/tests/postfix-raise-smtpd-tls-security-level.nix @@ -0,0 +1,44 @@ +let + certs = import ./common/acme/server/snakeoil-certs.nix; +in +import ./make-test-python.nix { + name = "postfix"; + + machine = { pkgs, ... }: { + imports = [ common/user-account.nix ]; + services.postfix = { + enable = true; + enableSubmissions = true; + submissionsOptions = { + smtpd_tls_security_level = "none"; + }; + }; + + environment.systemPackages = let + checkConfig = pkgs.writeScriptBin "check-config" '' + #!${pkgs.python3.interpreter} + import sys + + state = 1 + success = False + + with open("/etc/postfix/master.cf") as masterCf: + for line in masterCf: + if state == 1 and line.startswith("submissions"): + state = 2 + elif state == 2 and line.startswith(" ") and "smtpd_tls_security_level=encrypt" in line: + success = True + elif state == 2 and not line.startswith(" "): + state == 3 + if not success: + sys.exit(1) + ''; + + in [ checkConfig ]; + }; + + testScript = '' + machine.wait_for_unit("postfix.service") + machine.succeed("check-config") + ''; +} diff --git a/nixos/tests/postfix.nix b/nixos/tests/postfix.nix new file mode 100644 index 000000000000..0d677427d761 --- /dev/null +++ b/nixos/tests/postfix.nix @@ -0,0 +1,76 @@ +let + certs = import ./common/acme/server/snakeoil-certs.nix; +in +import ./make-test-python.nix { + name = "postfix"; + + machine = { pkgs, ... }: { + imports = [ common/user-account.nix ]; + services.postfix = { + enable = true; + enableSubmission = true; + enableSubmissions = true; + sslCACert = certs.ca.cert; + sslCert = certs."acme.test".cert; + sslKey = certs."acme.test".key; + submissionsOptions = { + smtpd_sasl_auth_enable = "yes"; + smtpd_client_restrictions = "permit"; + milter_macro_daemon_name = "ORIGINATING"; + }; + }; + + security.pki.certificateFiles = [ + certs.ca.cert + ]; + + networking.extraHosts = '' + 127.0.0.1 acme.test + ''; + + environment.systemPackages = let + sendTestMail = pkgs.writeScriptBin "send-testmail" '' + #!${pkgs.python3.interpreter} + import smtplib + + with smtplib.SMTP('acme.test') as smtp: + smtp.sendmail('root@localhost', 'alice@localhost', 'Subject: Test\n\nTest data.') + smtp.quit() + ''; + + sendTestMailStarttls = pkgs.writeScriptBin "send-testmail-starttls" '' + #!${pkgs.python3.interpreter} + import smtplib + import ssl + + ctx = ssl.create_default_context() + + with smtplib.SMTP('acme.test') as smtp: + smtp.ehlo() + smtp.starttls(context=ctx) + smtp.ehlo() + smtp.sendmail('root@localhost', 'alice@localhost', 'Subject: Test STARTTLS\n\nTest data.') + smtp.quit() + ''; + + sendTestMailSmtps = pkgs.writeScriptBin "send-testmail-smtps" '' + #!${pkgs.python3.interpreter} + import smtplib + import ssl + + ctx = ssl.create_default_context() + + with smtplib.SMTP_SSL(host='acme.test', context=ctx) as smtp: + smtp.sendmail('root@localhost', 'alice@localhost', 'Subject: Test SMTPS\n\nTest data.') + smtp.quit() + ''; + in [ sendTestMail sendTestMailStarttls sendTestMailSmtps ]; + }; + + testScript = '' + machine.wait_for_unit("postfix.service") + machine.succeed("send-testmail") + machine.succeed("send-testmail-starttls") + machine.succeed("send-testmail-smtps") + ''; +} From 3fc86629ed549e18102fcc2f6b71f2a88d2e5ebd Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Sun, 5 Jul 2020 03:00:10 +0000 Subject: [PATCH 3355/3452] rippled: 1.5.0 --- pkgs/servers/rippled/default.nix | 103 +++++++++++++++++-------------- 1 file changed, 55 insertions(+), 48 deletions(-) diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 69a54a1202d2..0ece3ee5d86a 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchgit, fetchurl, runCommand, git, cmake, pkgconfig -, openssl, boost, zlib }: +, openssl, zlib, boost, grpc, c-ares, abseil-cpp, protobuf3_8 }: let sqlite3 = fetchurl rec { @@ -8,21 +8,43 @@ let passthru.url = url; }; + boostSharedStatic = boost.override { + enableShared = true; + enabledStatic = true; + }; + + beast = fetchgit { + url = "https://github.com/boostorg/beast.git"; + rev = "2f9a8440c2432d8a196571d6300404cb76314125"; + sha256 = "1n9ms5cn67b0p0mhldz5psgylds22sm5x22q7knrsf20856vlk5a"; + fetchSubmodules = false; + leaveDotGit = true; + }; + docca = fetchgit { url = "https://github.com/vinniefalco/docca.git"; rev = "335dbf9c3613e997ed56d540cc8c5ff2e28cab2d"; - sha256 = "1yisdg7q2p9q9gz0c446796p3ggx9s4d6g8w4j1pjff55655805h"; - leaveDotGit = true; + sha256 = "09cb90k0ygmnlpidybv6nzf6is51i80lnwlvad6ijc3gf1z6i1yh"; fetchSubmodules = false; + leaveDotGit = true; + }; + + nudb = fetchgit rec { + url = "https://github.com/CPPAlliance/NuDB.git"; + rev = "2.0.1"; + sha256 = "10hlp2k7pc0c705f8sk0qw6mjfky0k08cjhh262bbjvp9fbdc7r4"; + leaveDotGit = true; + fetchSubmodules = true; + postFetch = "cd $out && git tag ${rev}"; }; rocksdb = fetchgit rec { url = "https://github.com/facebook/rocksdb.git"; - rev = "v5.17.2"; - sha256 = "0d9ssggjls1hc4zhng65yg8slqlcw0lr23qr6f39shg42lzr227p"; - leaveDotGit = true; + rev = "v6.5.3"; + sha256 = "11kbwqph1i3w6rbhr0kl2aq4jidhai24gw420y9qi9ab7zl0zcqg"; + deepClone = true; fetchSubmodules = false; - postFetch = "cd $out && git tag ${rev}"; + leaveDotGit = true; }; lz4 = fetchgit rec { @@ -60,19 +82,10 @@ let postFetch = "cd $out && git tag ${rev}"; }; - nudb = fetchgit rec { - url = "https://github.com/CPPAlliance/NuDB.git"; - rev = "2.0.1"; - sha256 = "0h7hmwavrxzj1v547h3z0031ckwphjayfpv1mgcr6q86wm9p5468"; - leaveDotGit = true; - fetchSubmodules = true; # submodules are needed, rocksdb is dependency - postFetch = "cd $out && git tag ${rev}"; - }; - - protobuf = fetchgit rec { - url = "https://github.com/protocolbuffers/protobuf.git"; - rev = "v3.6.1"; - sha256 = "0zl09q25ggfw95lakcs3mkq5pvsj17mx29b4nqr09g0mnbw9709c"; + cares = fetchgit rec { + url = "https://github.com/c-ares/c-ares.git"; + rev = "cares-1_15_0"; + sha256 = "1fkzsyhfk5p5hr4dx4r36pg9xzs0md6cyj1q2dni3cjgqj3s518v"; leaveDotGit = true; fetchSubmodules = false; postFetch = "cd $out && git tag ${rev}"; @@ -80,64 +93,58 @@ let google-test = fetchgit { url = "https://github.com/google/googletest.git"; - rev = "c3bb0ee2a63279a803aaad956b9b26d74bf9e6e2"; - sha256 = "0pj5b6jnrj5lrccz2disr8hklbnzd8hwmrwbfqmvhiwb9q9p0k2k"; - fetchSubmodules = false; + rev = "5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081"; + sha256 = "1ch7hq16z20ddhpc08slp9bny29j88x9vr6bi9r4yf5m77xbplja"; leaveDotGit = true; + fetchSubmodules = false; }; google-benchmark = fetchgit { url = "https://github.com/google/benchmark.git"; rev = "5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8"; - sha256 = "0qg70j47zqnrbszlgrzmxpr4g88kq0gyq6v16bhaggfm83c6mg6i"; - fetchSubmodules = false; + sha256 = "0kcmb83framkncc50h0lyyz7v8nys6g19ja0h2p8x4sfafnnm6ig"; leaveDotGit = true; + fetchSubmodules = false; }; - # hack to merge rocksdb revisions from rocksdb and nudb, so build process - # will find both - rocksdb-merged = runCommand "rocksdb-merged" { - buildInputs = [ git ]; - } '' - commit=$(cd ${nudb} && git ls-tree HEAD extras/rocksdb | awk '{ print $3 }') - git clone ${rocksdb} $out && cd $out - git fetch ${nudb}/extras/rocksdb $commit - git checkout $commit - ''; + date = fetchgit { + url = "https://github.com/HowardHinnant/date.git"; + rev = "fc4cf092f9674f2670fb9177edcdee870399b829"; + sha256 = "0w618p64mx2l074b6wd0xfc4h6312mabhvzabxxwsnzj4afpajcm"; + leaveDotGit = true; + fetchSubmodules = false; + }; in stdenv.mkDerivation rec { pname = "rippled"; - version = "1.4.0"; + version = "1.5.0"; - src = fetchFromGitHub { - owner = "ripple"; - repo = "rippled"; + src = fetchgit { + url = "https://github.com/ripple/rippled.git"; rev = version; - sha256 = "1z04378bg8lcyrnn7sl3j2zfxbwwy2biasg1d4fbaq4snxg5d1pq"; + sha256 = "0nh0x1ygrj3fw558vxbcp0md80qh27yrp3xhdlasrir7h1l2nplv"; + leaveDotGit = true; + fetchSubmodules = true; }; hardeningDisable = ["format"]; - cmakeFlags = [ - "-Dstatic=OFF" - "-DBOOST_LIBRARYDIR=${boost.out}/lib" - "-DBOOST_INCLUDEDIR=${boost.dev}/include" - ]; + cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON"]; nativeBuildInputs = [ pkgconfig cmake git ]; - buildInputs = [ openssl openssl.dev zlib ]; + buildInputs = [ openssl openssl.dev boostSharedStatic zlib grpc c-ares c-ares.cmake-config abseil-cpp protobuf3_8 ]; preConfigure = '' export HOME=$PWD + git config --global url."file://${rocksdb}".insteadOf "${rocksdb.url}" git config --global url."file://${docca}".insteadOf "${docca.url}" - git config --global url."file://${rocksdb-merged}".insteadOf "${rocksdb.url}" git config --global url."file://${lz4}".insteadOf "${lz4.url}" git config --global url."file://${libarchive}".insteadOf "${libarchive.url}" git config --global url."file://${soci}".insteadOf "${soci.url}" git config --global url."file://${snappy}".insteadOf "${snappy.url}" git config --global url."file://${nudb}".insteadOf "${nudb.url}" - git config --global url."file://${protobuf}".insteadOf "${protobuf.url}" git config --global url."file://${google-benchmark}".insteadOf "${google-benchmark.url}" git config --global url."file://${google-test}".insteadOf "${google-test.url}" + git config --global url."file://${date}".insteadOf "${date.url}" substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "URL ${sqlite3.url}" "URL ${sqlite3}" ''; From 8eee3478aed0f86bc63f6b98811c4f117e78bb23 Mon Sep 17 00:00:00 2001 From: raghavsood Date: Mon, 6 Jul 2020 10:00:09 +0800 Subject: [PATCH 3356/3452] rippled: update maintainers --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/servers/rippled/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a5814f84d0aa..99c780db8425 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6486,6 +6486,12 @@ githubId = 131856; name = "Arnout Engelen"; }; + RaghavSood = { + email = "r@raghavsood.com"; + github = "RaghavSood"; + githubId = 903072; + name = "Raghav Sood"; + }; rafaelgg = { email = "rafael.garcia.gallego@gmail.com"; github = "rafaelgg"; diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 0ece3ee5d86a..426b29c4b08a 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -157,7 +157,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ripple P2P payment network reference server"; homepage = "https://github.com/ripple/rippled"; - maintainers = with maintainers; [ ehmry offline ]; + maintainers = with maintainers; [ ehmry offline RaghavSood ]; license = licenses.isc; platforms = [ "x86_64-linux" ]; }; From 576db6a0599d86c161c5f528b2cefe7b476d3523 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 3 Jul 2020 18:16:56 +0000 Subject: [PATCH 3357/3452] ibus-engines.m17n: 1.4.2 -> 1.4.3 --- pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 48d082564b76..35e02d52b486 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "16davz397svhjb234kx7mnq2m3wdxi2fh1ryniphbczjpbwn23g6"; + sha256 = "0lb2vcnkzy64474j7306ydyw1ali0qbx07sxfms2fqv1nmh161i2"; }; nativeBuildInputs = [ From af34714c8d239c25131d9c618cf797eea982651a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 30 Jun 2020 03:14:04 +0000 Subject: [PATCH 3358/3452] cldr-emoji-annotation: 36.12.120200305_0 -> 37.0_13.0_0_1 --- pkgs/data/misc/cldr-emoji-annotation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/cldr-emoji-annotation/default.nix b/pkgs/data/misc/cldr-emoji-annotation/default.nix index d74a9cebcea6..f2dc4213e004 100644 --- a/pkgs/data/misc/cldr-emoji-annotation/default.nix +++ b/pkgs/data/misc/cldr-emoji-annotation/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cldr-emoji-annotation"; - version = "36.12.120200305_0"; + version = "37.0_13.0_0_1"; src = fetchFromGitHub { owner = "fujiwarat"; repo = "cldr-emoji-annotation"; rev = version; - sha256 = "1zg4czaqnfjkd4hx06h8q56z8iiw22crwqr69w94s4hy9zcanfrs"; + sha256 = "19cqxyrap3p7djzzs99pndjbcvzmdv86n2m1sw2zqiwpirw7y1sy"; }; nativeBuildInputs = [ From d246bad2e76a323c46dd94cbbb2809187c0ee5fd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 02:34:37 +0000 Subject: [PATCH 3359/3452] osmid: 0.6.8 -> 0.8.0 --- pkgs/applications/audio/osmid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/osmid/default.nix b/pkgs/applications/audio/osmid/default.nix index 7e49b872a6a5..2e31efd8172c 100644 --- a/pkgs/applications/audio/osmid/default.nix +++ b/pkgs/applications/audio/osmid/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "osmid"; - version = "0.6.8"; + version = "0.8.0"; src = fetchFromGitHub { owner = "llloret"; repo = "osmid"; rev = "v${version}"; - sha256 = "1yl25abf343yvd49nfsgxsz7jf956zrsi5n4xyqb5ldlp2hifk15"; + sha256 = "1s1wsrp6g6wb0y61xzxvaj59mwycrgy52r4h456086zkz10ls6hw"; }; nativeBuildInputs = [ cmake ]; From a659d69a82f839b71aa8e1f21fa269b5b5bcdb7c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 03:03:39 +0000 Subject: [PATCH 3360/3452] postgresql11Packages.pgroonga: 2.2.5 -> 2.2.6 --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index f57a6e8fa508..2e69444ccdd5 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0lwj99kdx9kfp4vfd7lfapj183mz235kj1vjfscfnkg5ypj656gz"; + sha256 = "0anlxw4j6c3rd7q34j9mgph6i0zb1nff3warcxrkwvnnd1jbb6vr"; }; nativeBuildInputs = [ pkgconfig ]; From b3fcaa5440170a1d060ee2ec5a03c1309217ce9f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 08:17:13 +0000 Subject: [PATCH 3361/3452] adwaita-qt: 1.1.3 -> 1.1.4 --- pkgs/data/themes/adwaita-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index dce625de5e35..c5c9bbbe37f0 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "adwaita-qt"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "FedoraQt"; repo = pname; rev = version; - sha256 = "1zfah1ybfgi4dag3lxqap99giwwng9b3lgcick1ciylz6vwf2gwh"; + sha256 = "19s97wm96g3828dp8m85j3lsn1n6h5h2zqk4652hcqcgq6xb6gv5"; }; nativeBuildInputs = [ From 8bc783974025f1a1e6dd9497c7f70e9c9d879ce9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 04:09:52 +0000 Subject: [PATCH 3362/3452] python37Packages.asgiref: 3.2.7 -> 3.2.10 --- pkgs/development/python-modules/asgiref/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 56c69bb97ede..3537736f77f6 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }: buildPythonPackage rec { - version = "3.2.7"; + version = "3.2.10"; pname = "asgiref"; disabled = pythonOlder "3.5"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "1qf29blzhh6sljaj1adc0p8cnyxh9ar6hky9ccdfbgmrk4rw5kwc"; + sha256 = "1sj4yy2injaskwfi5pkb542jl8s6ljijnyra81gpw0pgd3d0bgxv"; }; propagatedBuildInputs = [ async-timeout ]; From e3c56edba6d453cf48feffc54d9d71852239e347 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 03:36:29 +0000 Subject: [PATCH 3363/3452] python27Packages.braintree: 4.1.0 -> 4.2.0 --- pkgs/development/python-modules/braintree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 8e8c89e7f59e..3722a294b20e 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.1.0"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1fqh1bdkk3g222vbrmw3ab4r4mmd1k4x2jayshnqpbspszcqzcdq"; + sha256 = "0aw5n1hqrg5pb5xmcr1b8y9i7v8zj23q9k2p4b6bwnq2c2fqi8wr"; }; propagatedBuildInputs = [ requests ]; From b94cfc07ab83ec65e83eaf9e9610e6079a949615 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 03:40:42 +0000 Subject: [PATCH 3364/3452] python27Packages.aioconsole: 0.1.16 -> 0.2.1 --- pkgs/development/python-modules/aioconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 6e867d0b0f65..5ee7b3295121 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -10,11 +10,11 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.1.16"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0yk4ghvg47drfvdrrcw7nk14pg4shccmyhln9d8hy1lyafcqmnd5"; + sha256 = "1l61zv6qq94ybqz7s8ag3h08dsh7jds6n2mgd43s7m8gbiy00ggn"; }; # hardcodes a test dependency on an old version of pytest-asyncio From 1fc94396c2e35f8a337f9518043e34255918732d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 03:30:24 +0000 Subject: [PATCH 3365/3452] python27Packages.azure-mgmt-containerservice: 9.0.1 -> 9.1.0 --- .../python-modules/azure-mgmt-containerservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index d77d28479a1a..37a1fcf0500b 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "9.0.1"; + version = "9.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7e4459679bdba4aa67a4b5848e63d94e965a304a7418ef7607eb7a9ce295d886"; + sha256 = "0xdm4kkqmfsj7vkq3b9inqwx6nif5kmbd09wl40ckkjndvs1sclz"; }; propagatedBuildInputs = [ From 2f8206ea976b7bd5b8a8b43bbd33d946fa28c12c Mon Sep 17 00:00:00 2001 From: David Arnold Date: Fri, 3 Jul 2020 15:54:31 -0500 Subject: [PATCH 3366/3452] maintainers: init blaggacao --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9f991804a2f5..8d63c8cba9b0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1031,6 +1031,12 @@ githubId = 5718007; name = "Bastian Köcher"; }; + blaggacao = { + name = "David Arnold"; + email = "dar@xoe.solutions"; + github = "blaggacao"; + githubId = 7548295; + }; blanky0230 = { email = "blanky0230@gmail.com"; github = "blanky0230"; From e1b48ea8eaefbe9490feaf9cbcbf3d31a16c21fc Mon Sep 17 00:00:00 2001 From: David Arnold Date: Fri, 3 Jul 2020 12:42:29 -0500 Subject: [PATCH 3367/3452] kubespy: init at 0.5.1 A tool to observe Kubernetes resources in real time. This is uesful, among others, for "staffing" shell.nix environments for k8s projects. --- .../networking/cluster/kubespy/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kubespy/default.nix diff --git a/pkgs/applications/networking/cluster/kubespy/default.nix b/pkgs/applications/networking/cluster/kubespy/default.nix new file mode 100644 index 000000000000..6b08f43589c6 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubespy/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "kubespy"; + version = "0.5.1"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "pulumi"; + repo = "kubespy"; + sha256 = "1p0qmn6458pa9la6zkvyrkgs2rhzfwsk9m3rk5fkmcfbh7b031r8"; + }; + + vendorSha256 = "0q85is01cbgxflnqdvxc9w5iqdizgvsc44h8z21j712bm2w7blqq"; + + # TODO: enable after https://github.com/pulumi/kubespy/issues/72 is addressed. + # postInstall = '' + # for shell in bash zsh; do + # $out/bin/kubespy completion $shell > kubespy.$shell + # installShellCompletion kubespy.$shell + # done + # ''; + + meta = with lib; { + description = "A tool to observe Kubernetes resources in real time"; + homepage = "https://github.com/pulumi/kubespy"; + license = licenses.asl20; + maintainers = with maintainers; [ blaggacao ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d964b5baeb3..109c39e804f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10721,6 +10721,8 @@ in kube-prompt = callPackage ../development/tools/kube-prompt { }; kubeprompt = callPackage ../development/tools/kubeprompt { }; + + kubespy = callPackage ../applications/networking/cluster/kubespy { }; kubicorn = callPackage ../development/tools/kubicorn { }; From 2ae2186dfda22ee49b8ab1027643bd11909246d5 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Mon, 6 Jul 2020 16:42:03 +1200 Subject: [PATCH 3368/3452] dockerTools.streamLayeredImage: Correctly copy hardlinks --- pkgs/build-support/docker/stream_layered_image.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index 609af30c8bb3..9a13878a783d 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -97,6 +97,7 @@ def archive_paths_to(obj, paths, mtime, add_nix, filter=None): if ti.islnk(): ti.type = tarfile.REGTYPE ti.linkname = "" + ti.size = filename.stat().st_size ti = apply_filters(ti) if ti.isfile(): From 909ed3a749d19e0f6b1b74f3c6dab7367f353f13 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 04:52:29 +0000 Subject: [PATCH 3369/3452] python27Packages.boolean-py: 3.7 -> 3.8 --- pkgs/development/python-modules/boolean-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boolean-py/default.nix b/pkgs/development/python-modules/boolean-py/default.nix index 8f5ef73c7e23..dc1b1be0d81b 100644 --- a/pkgs/development/python-modules/boolean-py/default.nix +++ b/pkgs/development/python-modules/boolean-py/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "boolean.py"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { owner = "bastikr"; repo = "boolean.py"; rev = "v${version}"; - sha256 = "1q9ji2jq07qr6vgp9yv6y8lx6h0zyi07fqjga3yi3vpfk46h2jn1"; + sha256 = "02jznrfrihhk69ai1vnh26s3rshl4kfc2id7li6xccavc2ws5y3b"; }; meta = with lib; { From 06db3319226b061d385521cdab74cd676254e9e9 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Mon, 6 Jul 2020 16:59:58 +1200 Subject: [PATCH 3370/3452] dockerTools: Verify nix-store contents on buildLayeredImage test --- nixos/tests/docker-tools.nix | 5 +++-- pkgs/build-support/docker/examples.nix | 17 +++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 01f7d17f58f0..ad734a71f01f 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -179,10 +179,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { docker.succeed("docker run --rm no-store-paths ls /") docker.fail("docker run --rm no-store-paths ls /nix/store") - with subtest("Ensure buildLayeredImage supports files directly under /nix/store"): + with subtest("Ensure buildLayeredImage does not change store path contents."): docker.succeed( "docker load --input='${pkgs.dockerTools.examples.filesInStore}'", - "docker run file-in-store |& grep 'some data'", + "docker run --rm file-in-store nix-store --verify --check-contents", + "docker run --rm file-in-store |& grep 'some data'", ) ''; }) diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 8b77d6011d38..068daa8df722 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -337,12 +337,21 @@ rec { # 19. Support files in the store on buildLayeredImage # See: https://github.com/NixOS/nixpkgs/pull/91084#issuecomment-653496223 - filesInStore = pkgs.dockerTools.buildLayeredImage { + filesInStore = pkgs.dockerTools.buildLayeredImageWithNixDb { name = "file-in-store"; tag = "latest"; - config.Cmd = [ - "${pkgs.coreutils}/bin/cat" - (pkgs.writeText "somefile" "some data") + contents = [ + pkgs.coreutils + pkgs.nix + (pkgs.writeScriptBin "myscript" '' + #!${pkgs.runtimeShell} + cat ${pkgs.writeText "somefile" "some data"} + '') ]; + config = { + Cmd = [ "myscript" ]; + # For some reason 'nix-store --verify' requires this environment variable + Env = [ "USER=root" ]; + }; }; } From 3aa04a63e5a82e6f41d1ef5d1e61c345d1557953 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 04:41:20 +0000 Subject: [PATCH 3371/3452] python27Packages.azure-mgmt-monitor: 0.9.0 -> 0.10.0 --- .../development/python-modules/azure-mgmt-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index 36124ff6baaf..edd7abd11a78 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "170jyr1qzwhv5ihyrsg5d8qzjylqmg31dscd31jzi4i7bwqf3sb8"; + sha256 = "0r3l55mhd00zx8sw13d7i9l7r214946s1y3wxcswxad7q5660zfm"; }; propagatedBuildInputs = [ From b580de9e1cd4d76a5856cff78daf0b37ccce59a4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 03:59:06 +0000 Subject: [PATCH 3372/3452] python27Packages.btchip: 0.1.28 -> 0.1.30 --- pkgs/development/python-modules/btchip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/btchip/default.nix b/pkgs/development/python-modules/btchip/default.nix index 069358a4d6d3..7370d3db7dbf 100644 --- a/pkgs/development/python-modules/btchip/default.nix +++ b/pkgs/development/python-modules/btchip/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "btchip-python"; - version = "0.1.28"; + version = "0.1.30"; src = fetchPypi { inherit pname version; - sha256 = "10yxwlsr99gby338rsnczkfigcy36fiajpkr6f44438qlvbx02fs"; + sha256 = "1mraf2lmh70b038k934adxi7d40431j7yq93my3aws99f5xccsb8"; }; propagatedBuildInputs = [ hidapi pyscard ecdsa ]; From 01ede8c61571b580f6f6ab08dd6513638c8f2a1e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 6 Jul 2020 01:46:10 -0400 Subject: [PATCH 3373/3452] =?UTF-8?q?nix:=20don=E2=80=99t=20precompile=20h?= =?UTF-8?q?eaders=20on=20cross=20compilation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit avoids this error: mk/precompiled-headers.mk:38: *** Don't know how to precompile headers on aarch64-unknown-linux-gnu-g++. Stop. --- pkgs/tools/package-management/nix/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index a7eca679780d..7c5973190711 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -119,7 +119,8 @@ common = # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; - makeFlags = [ "profiledir=$(out)/etc/profile.d" ]; + makeFlags = [ "profiledir=$(out)/etc/profile.d" ] + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0"; installFlags = [ "sysconfdir=$(out)/etc" ]; From 00be3fac9ffe34afe2d874088d76494c1f861a31 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 6 Jul 2020 01:46:43 -0400 Subject: [PATCH 3374/3452] nix: gmock is a library https://hydra.nixos.org/build/123111516 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 7c5973190711..5af539bd9177 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -42,14 +42,14 @@ common = nativeBuildInputs = [ pkgconfig ] ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt - docbook5 docbook_xsl_ns jq gmock ]; + docbook5 docbook_xsl_ns jq ]; buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json brotli boost editline ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is24 [ libarchive ] + ++ lib.optionals is24 [ libarchive gmock ] ++ lib.optional withLibseccomp libseccomp ++ lib.optional withAWS ((aws-sdk-cpp.override { From f2cafb162650204367a277d75bc4dc0f8a8580f5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 6 Jul 2020 01:50:55 -0400 Subject: [PATCH 3375/3452] argp-standalone: support all linux architectures --- pkgs/development/libraries/argp-standalone/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix index 6544c4811875..f961c577aa7d 100644 --- a/pkgs/development/libraries/argp-standalone/default.nix +++ b/pkgs/development/libraries/argp-standalone/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://www.lysator.liu.se/~nisse/misc/"; description = "Standalone version of arguments parsing functions from GLIBC"; - platforms = with platforms; darwin ++ [ "x86_64-linux" ]; + platforms = with platforms; darwin ++ linux; maintainers = with maintainers; [ amar1729 ]; license = licenses.gpl2; }; From 80ca70b0e1e7f9459aaabe026f4b024b0b1ec2bb Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 6 Jul 2020 01:51:46 -0400 Subject: [PATCH 3376/3452] elfutils: add argp-standalone for musl https://hydra.nixos.org/build/123111192 --- pkgs/development/tools/misc/elfutils/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 56bfe26ec069..9440463e83f3 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs }: +{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz, setupDebugInfoDirs, argp-standalone }: # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { @@ -17,10 +17,15 @@ stdenv.mkDerivation rec { # We need bzip2 in NativeInputs because otherwise we can't unpack the src, # as the host-bzip2 will be in the path. nativeBuildInputs = [ m4 bison flex gettext bzip2 ]; - buildInputs = [ zlib bzip2 xz ]; + buildInputs = [ zlib bzip2 xz ] + ++ lib.optional stdenv.hostPlatform.isMusl argp-standalone; propagatedNativeBuildInputs = [ setupDebugInfoDirs ]; + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' + NIX_CFLAGS_COMPILE+=" -fgnu89-inline" + ''; + configureFlags = [ "--program-prefix=eu-" # prevent collisions with binutils "--enable-deterministic-archives" From 9b53a835b4a02299a7b1c4ee642261df88a19b0d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 26 Jun 2020 10:09:04 +0000 Subject: [PATCH 3377/3452] graphene: 1.10.0 -> 1.10.2 --- pkgs/development/libraries/graphene/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index e540604c9cb9..3fc0094f104f 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "graphene"; - version = "1.10.0"; + version = "1.10.2"; outputs = [ "out" "devdoc" "installedTests" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "ebassi"; repo = pname; rev = version; - sha256 = "16vqwih5bfxv7r3mm7iiha804rpsxzxjfrs4kx76d9q5yg2hayxr"; + sha256 = "1ljhhjafi1nlndjswx7mg0d01zci90wz77yvz5w8bd9mm8ssw38s"; }; patches = [ From 1085c056376041af71e8f1cf72c1ed4a4db01dc6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 03:25:16 +0000 Subject: [PATCH 3378/3452] piper: 0.5 -> 0.5.1 --- pkgs/os-specific/linux/piper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 0da972316788..641c8b8ba81f 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -4,7 +4,7 @@ python3.pkgs.buildPythonApplication rec { pname = "piper"; - version = "0.5"; + version = "0.5.1"; format = "other"; @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { owner = "libratbag"; repo = "piper"; rev = version; - sha256 = "00vrcsbsv2477l1ncpyzc61lhxgac84dsgr3sjs8qxw3nh1gaasv"; + sha256 = "1nfjnsiwg2rs6gkjsxzhr2708i6di149dgwq3cf6l12rxqpb8arj"; }; nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; From 3bc54d4c1055ef376253ee96d568290c8df3a651 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 06:45:36 +0000 Subject: [PATCH 3379/3452] plasma-applet-volumewin7mixer: 24 -> 25 --- .../misc/plasma-applet-volumewin7mixer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index 3ecace18f924..15dd7222b285 100644 --- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plasma-applet-volumewin7mixer"; - version = "24"; + version = "25"; src = fetchFromGitHub { owner = "Zren"; repo = "plasma-applet-volumewin7mixer"; rev = "v${version}"; - sha256 = "1pms71229y7fv3zs38a0l9mdcg5qkcdv9yrcvdm6xqpdyk21jbz2"; + sha256 = "1nvz0a06qb3pfk8dfh5n5vgf3psd6k0j3vms9pskr511qsxw0dfi"; }; patches = [ ./cmake.patch ]; From f7c4c5cf98e2e72489f9deff6c03d89019b7cf60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Mon, 6 Jul 2020 09:05:01 +0200 Subject: [PATCH 3380/3452] fdupes: 1.6.1 -> 2.1.1 --- pkgs/tools/misc/fdupes/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index 731ad86e622a..7203d6b57fcd 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, autoreconfHook, ncurses, pcre2 }: stdenv.mkDerivation rec { pname = "fdupes"; - version = "1.6.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "adrianlopezroche"; repo = "fdupes"; rev = "v${version}"; - sha256 = "19b6vqblddaw8ccw4sn0qsqzbswlhrz8ia6n4m3hymvcxn8skpz9"; + sha256 = "1c5hv7vkfxsii1qafhsynzp9zkwim47xkpk27sy64qdsjnhysdak"; }; - makeFlags = [ "PREFIX=$(out)" ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ncurses pcre2 ]; meta = with stdenv.lib; { description = "Identifies duplicate files residing within specified directories"; From 5173f2a55995bde74de6edf5c9b830879ab38913 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 6 Jul 2020 09:46:46 +0200 Subject: [PATCH 3381/3452] =?UTF-8?q?ocamlPackages.mirage-crypto:=200.8.0?= =?UTF-8?q?=20=E2=86=92=200.8.1,=20tls:=200.12.2=20=E2=86=92=200.12.3=20(#?= =?UTF-8?q?92324)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mirage-crypto/default.nix | 8 ++++---- pkgs/development/ocaml-modules/tls/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index d778a7eb4872..74bf3ce73a22 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, pkg-config }: +{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config }: buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "1wb2923v17z179v866ragil0r601w5b3kvpnbkmkwlijp4i5grih"; + sha256 = "13qjisijayviw1s77s74f7klkrjj470vhj4b21cpif7jj2i4ljgk"; }; useDune2 = true; @@ -17,7 +17,7 @@ buildDunePackage rec { checkInputs = [ ounit ]; nativeBuildInputs = [ dune-configurator pkg-config ]; - propagatedBuildInputs = [ cstruct ]; + propagatedBuildInputs = [ cstruct eqaf ]; meta = with lib; { homepage = "https://github.com/mirage/mirage-crypto"; diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 222496fc6d10..5a208801d4c4 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; - version = "0.12.2"; + version = "0.12.3"; pname = "tls"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "1wpgs0cd79wl4lnn1i44xjn8prha793nrbyv68zjiqpq3gmpyy3k"; + sha256 = "1kfkxsy0nkqi0gbsqn1ssh4x0xhy0p07ijclm42806rxlqr3x405"; }; useDune2 = true; From bf1e753f1c0c4db09d8e76fbc1051e88bdc61344 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 6 Jul 2020 16:06:37 +0800 Subject: [PATCH 3382/3452] check-wmiplus: 1.64 -> 1.65 --- pkgs/servers/monitoring/plugins/wmiplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/wmiplus/default.nix b/pkgs/servers/monitoring/plugins/wmiplus/default.nix index 9a4e5d706e93..dacd4e2c5b7b 100644 --- a/pkgs/servers/monitoring/plugins/wmiplus/default.nix +++ b/pkgs/servers/monitoring/plugins/wmiplus/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "check-wmiplus"; - version = "1.64"; + version = "1.65"; # We fetch from github.com instead of the proper upstream as nix-build errors # out with 406 when trying to fetch the sources @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "speartail"; repo = "checkwmiplus"; rev = "v${version}"; - sha256 = "1m36rd2wnc5dk4mm9q4ch67w19144dl112p9s6lhc1sh6h25ln6r"; + sha256 = "1as0iyhy4flpm37mb7lvah7rnd6ax88appjm1icwhy7iq03wi8pl"; }; patches = [ From 5da46e2739824a3b3b448e8d314b0898ca42334e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 6 Jul 2020 04:56:48 -0400 Subject: [PATCH 3383/3452] bluejeans-gui: 2.3.0 -> 2.4.0 --- .../networking/instant-messengers/bluejeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index bd71166be222..ed2158c6a164 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans.rpm"; - sha256 = "06lcpkga8h0zpl2wlysj6n979f0yg361frp3zr0vwzln3fiil2a7"; + sha256 = "180hc854ngwfn6y6nsrfn74rv78cxhq6sgshrca5zqv6wq3l98g0"; }; nativeBuildInputs = [ rpmextract makeWrapper ]; From 107052b907f98c00eb85913bb26779e5c5dacfa2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 09:30:51 +0000 Subject: [PATCH 3384/3452] python27Packages.mahotas: 1.4.9 -> 1.4.10 --- pkgs/development/python-modules/mahotas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index f48c36bdb03e..b7d17d943f7b 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mahotas"; - version = "1.4.9"; + version = "1.4.10"; src = fetchFromGitHub { owner = "luispedro"; repo = "mahotas"; rev = "v${version}"; - sha256 = "151hri3lwcm9p7w1nyw99h8c70j51698cvzaiazvwb6gl4khwavv"; + sha256 = "0fjiyl82wj1a6xzr9mss2y2rydl4zchl2cbdbg0jm0fcrs99q4hw"; }; # remove this as soon as https://github.com/luispedro/mahotas/issues/97 is fixed From 587bb6eace2c8d9cf97ec12907628cbf11d0bdae Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Wed, 24 Jun 2020 23:05:33 +0200 Subject: [PATCH 3385/3452] linuxPackages.e1000e: 3.3.5.3 -> 3.8.4 Upgrade e1000e from version 3.3.5.3 to 3.8.4 --- pkgs/os-specific/linux/e1000e/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix index ea17c287a292..d5d6697a01e3 100644 --- a/pkgs/os-specific/linux/e1000e/default.nix +++ b/pkgs/os-specific/linux/e1000e/default.nix @@ -4,11 +4,11 @@ assert stdenv.lib.versionOlder kernel.version "4.10"; stdenv.mkDerivation rec { name = "e1000e-${version}-${kernel.version}"; - version = "3.3.5.3"; + version = "3.8.4"; src = fetchurl { url = "mirror://sourceforge/e1000/e1000e-${version}.tar.gz"; - sha256 = "1ajz3vdnf1y307k585w95r6jlh4ah8d74bq36gdkjl1z5hgiqi9q"; + sha256 = "1q8dbqh14c7r15q6k6iv5k0d6xpi74i71d5r54py60gr099m2ha4"; }; hardeningDisable = [ "pic" ]; @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { configurePhase = '' cd src kernel_version=${kernel.modDirVersion} - sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' Makefile + substituteInPlace common.mk \ + --replace "/lib/modules" "${kernel.dev}/lib/modules" export makeFlags="BUILD_KERNEL=$kernel_version" ''; From b8391804889e8d359ebc91f86a0156552e2b8b56 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 11:16:19 +0000 Subject: [PATCH 3386/3452] python27Packages.phonenumbers: 8.12.5 -> 8.12.6 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 2ba64faad31e..a14a790059d7 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.5"; + version = "8.12.6"; src = fetchPypi { inherit pname version; - sha256 = "3586f19abeb92aa6b539d7a4757cb507cf54efcd78224e895caf20fbdde07c26"; + sha256 = "02yfyphrrlx00r7s2j522kjszchq6ql8gb33lasm6q8wwy7hfcnk"; }; meta = { From dce24cfb55442ec52ee0b1c3e031d17a091a5e35 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 6 Jul 2020 08:27:35 -0400 Subject: [PATCH 3387/3452] boto3: 1.14.3 -> 1.14.16 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 53a2be0b8d1f..4e95946127d0 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.14.3"; # N.B: if you change this, change botocore too + version = "1.14.16"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "1qapj3hbbj116x7yca3m9ivl44iisrk0cppri9sk3b1mpv371a0v"; + sha256 = "1yywn4wbzn37b5gbkmksqpxnabw1yjvbp710chc3v6cymyv4lnnf"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 717bee48551f0ffc89a0326ab1380ffb7885b12c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 6 Jul 2020 08:27:54 -0400 Subject: [PATCH 3388/3452] botocore: 1.17.3 -> 1.17.16 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 0e4870a4300f..3a35ed0c4cc1 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.17.3"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.17.16"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "0mrkkb7vc7jdxrr9gyg92i6ar801kpss53nfqp1di6xfi4jxkx0k"; + sha256 = "0k4bx4anj0xjjfj4jx3v1fhzrmk5k9qgdpxqghxzyzmnsry4y37y"; }; propagatedBuildInputs = [ From 4d9872076c66ec9ca769207812b2a983845aed87 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 6 Jul 2020 08:28:09 -0400 Subject: [PATCH 3389/3452] awscli: 1.18.80 -> 1.18.93 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 02d25b07ab1a..39fa0a8ca470 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -19,11 +19,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.80"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.93"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "0519rlc0m0888ag7s55lz516vsgif5pws6rzhmclbbw38g4wmb2k"; + sha256 = "1kl0sa125k4q4ximg0p9rriz18w90lj3nhc7racqnc3bhig7w1ih"; }; postPatch = '' From 3c1b3a08e6305a22121489d8e4bc89d13381f3f6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 6 Jul 2020 08:29:43 -0400 Subject: [PATCH 3390/3452] oh-my-zsh: 2020-07-03 -> 2020-07-05 --- 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 75fe569a437b..5c764b561f35 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-07-03"; + version = "2020-07-05"; pname = "oh-my-zsh"; - rev = "a15f0f0e9ff17c1ca5c6d694d732e72c7c03a62b"; + rev = "7afaee858a4ae5a8d0d8c1f5fe150979842ebefc"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1byyhkd17sdrm5pz1k31xy1w8r6y85dsmhwqzy5kqzlsxbinjwxr"; + sha256 = "0mqvi9x7k74c2sg89wr8fzjpq7nbj30qhbvdzjx9l1q9hh9mkc8a"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 19f7be374bfb77ad792eef68d750a42e3af3a3d8 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 6 Jul 2020 15:41:50 +0200 Subject: [PATCH 3391/3452] perlPackages.MetaCPANClient: init at 2.026000 --- pkgs/top-level/perl-packages.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6520ee88a616..646d5ca07772 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11685,6 +11685,31 @@ let }; }; + MetaCPANClient = buildPerlPackage { + pname = "MetaCPAN-Client"; + version = "2.026000"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.026000.tar.gz"; + sha256 = "ee711619d59655dac1bd2e4b894ffeb3171bd73b1ed38ba4b7b07d3690f94465"; + }; + + # Most tests are online, so we only include offline tests + postPatch = '' + substituteInPlace Makefile.PL \ + --replace '"t/*.t t/api/*.t"' \ + '"t/00-report-prereqs.t t/api/_get.t t/api/_get_or_search.t t/api/_search.t t/entity.t t/request.t t/resultset.t"' + ''; + + buildInputs = [ LWPProtocolhttps TestFatal TestNeeds ]; + propagatedBuildInputs = [ IOSocketSSL JSONMaybeXS Moo NetSSLeay RefUtil SafeIsa TypeTiny URI ]; + meta = { + homepage = "https://github.com/metacpan/metacpan-client"; + description = "A comprehensive, DWIM-featured client to the MetaCPAN API"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ sgo ]; + }; + }; + MethodSignaturesSimple = buildPerlPackage { pname = "Method-Signatures-Simple"; version = "1.07"; From cb6b1b22aa06fc24a0d304e17e0c7c0e7d3e9d46 Mon Sep 17 00:00:00 2001 From: Markus Schmidl Date: Mon, 6 Jul 2020 15:46:46 +0200 Subject: [PATCH 3392/3452] firestarter: v1.7.4 fix commit hash --- pkgs/applications/misc/firestarter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix index 05c535e62c0e..a03c87eb41b5 100644 --- a/pkgs/applications/misc/firestarter/default.nix +++ b/pkgs/applications/misc/firestarter/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "tud-zih-energy"; repo = "FIRESTARTER"; rev = "v${version}"; - sha256 = "161mg0h1hvp6bxfjdhyfqrljvphys896mfd36254rbgzxm38ibi7"; + sha256 = "0zqfqb7hf48z39g1qhbl1iraf8rz4d629h1q6ikizckpzfq23kd0"; }; nativeBuildInputs = [ python3 ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://tu-dresden.de/zih/forschung/projekte/firestarter"; description = "Processor Stress Test Utility"; platforms = platforms.linux; - maintainers = with maintainers; [ astro ]; + maintainers = with maintainers; [ astro marenz ]; license = licenses.gpl3; }; } From 8b9e7fd50dc70140c24daad8d8c1d45cc5254015 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 28 Jun 2020 11:14:21 +0200 Subject: [PATCH 3393/3452] diffoscope: 148 -> 150 --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index cf5275fcfe49..784d7494b9b9 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -16,11 +16,11 @@ let in python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "148"; + version = "150"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "1fx3wq5bv12pjcpkd7lvis0vg50apzwvxa5jvcs2dv1r8385wchz"; + sha256 = "0hsjhcaka4nxbwyyk2gajblsp648km9492aq4100drsgnj5d36hg"; }; outputs = [ "out" "man" ]; From c52af984c293fa3149bff311d520ced074d78270 Mon Sep 17 00:00:00 2001 From: Moritz Scheuren Date: Fri, 3 Jul 2020 14:47:50 +0200 Subject: [PATCH 3394/3452] portfolio: 0.46.3 -> 0.46.6 --- pkgs/applications/office/portfolio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 53f3b8a3150a..31abb9815b16 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.46.3"; + version = "0.46.6"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0263v0ymqmf7kcwys4smwx1p1gh8d20dh10canjfqgl4c5lfx966"; + sha256 = "0df5fhyr4di3c5fvbkli8ff7ylji6wvjghj82zfp0hr02f7cnr6b"; }; nativeBuildInputs = [ @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { description = "A simple tool to calculate the overall performance of an investment portfolio."; homepage = "https://www.portfolio-performance.info/"; license = licenses.epl10; - maintainers = with maintainers; [ elohmeier ]; + maintainers = with maintainers; [ elohmeier oyren ]; platforms = [ "x86_64-linux" ]; }; } From 08b440bb99179c9ba9e2e0e50d478d19f4cfd609 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 6 Jul 2020 07:32:19 +0000 Subject: [PATCH 3395/3452] deno: 1.1.2 -> 1.1.3 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index d47b029a67ca..27bc441c8c31 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.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "1vfvkrwlhixygd9cn05wq28iw8dch04j8d62a54pbyyxlixrjwfx"; + sha256 = "0knm27xygrbs8h460aw3xh9h2gymw18diy8j3y49h8i20gmgj05n"; fetchSubmodules = true; }; - cargoSha256 = "0ddsks81wdddcd4d8w2xz17l41iiga44xiv74hi2158ykrk8rqdi"; + cargoSha256 = "0kssazwpqhldafpl5c6yq0ywgd6f18y082r5gwq9igpfyg4amb6z"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; From 9fec655578bd08ce267779ac49bf90c7d008df46 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 14:32:08 +0000 Subject: [PATCH 3396/3452] python27Packages.mwclient: 0.10.0 -> 0.10.1 --- pkgs/development/python-modules/mwclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index b26a3f948c8a..2744ff9a277c 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -4,14 +4,14 @@ }: buildPythonPackage rec { - version = "0.10.0"; + version = "0.10.1"; pname = "mwclient"; src = fetchFromGitHub { owner = "mwclient"; repo = "mwclient"; rev = "v${version}"; - sha256 = "1c3q6lwmb05yqywc4ya98ca7hsl15niili8rccl4n1yqp77c103v"; + sha256 = "120snnsh9n5svfwkyj1w9jrxf99jnqm0jk282yypd3lpyca1l9hj"; }; checkInputs = [ pytest pytestpep8 pytestcache pytestcov responses mock ]; From 5cb5ccb54229efd9a4cd1fccc0f43e0bbed81c5d Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Sun, 5 Jul 2020 18:11:32 -0300 Subject: [PATCH 3397/3452] python3Package.nibabel: 3.1.0 -> 3.1.1 --- pkgs/development/python-modules/nibabel/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 2ca6635674cc..22a734a7a782 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -2,8 +2,8 @@ , buildPythonPackage , fetchPypi , isPy27 -, nose , pytest +, nose , numpy , h5py , pydicom @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "nibabel"; - version = "3.1.0"; + version = "3.1.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "774adcff834f22915afb68c6cdd7acbcb5d0240b7f87f6da6c63ff405480884b"; + sha256 = "1kir9g7kmy2qygyzczx8nj4b0sc6jjvqy0ssm39bxzqsr1vzzvxm"; }; propagatedBuildInputs = [ numpy scipy h5py pydicom ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { checkInputs = [ nose pytest ]; checkPhase = '' - nosetests + pytest ''; meta = with lib; { From 5befae9c9cd9812b0fe7729a30d76c664a3871b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 06:21:03 +0000 Subject: [PATCH 3398/3452] pulseeffects: 4.7.2 -> 4.7.3 --- pkgs/applications/audio/pulseeffects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index eaedcb426b81..12ab8ce2e063 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -46,13 +46,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.7.2"; + version = "4.7.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1yga25da5bpg12zkikp6dn4wqhn9f7r10awvjzfcz8s6w9xlz6rx"; + sha256 = "1xsw3v9vapd8q1dxacdgy2wk0xf3adqwbmcqiimdkd34llbdv88f"; }; nativeBuildInputs = [ From 956d7b8169ceb7449139dfc059393061a9244954 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Sun, 5 Jul 2020 17:52:33 -0300 Subject: [PATCH 3399/3452] python3Package.gdcm: 3.0.6 -> 3.0.7 --- pkgs/development/libraries/gdcm/default.nix | 31 +++++++++++++-------- pkgs/top-level/python-packages.nix | 5 ++++ 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 745c96f57943..a4b5752e887d 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,29 +1,39 @@ -{ stdenv, fetchurl, cmake, vtk_7, darwin }: +{ stdenv, fetchurl, cmake, vtk_7, darwin +, enablePython ? false, python ? null, swig ? null}: stdenv.mkDerivation rec { - version = "3.0.6"; + version = "3.0.7"; pname = "gdcm"; src = fetchurl { url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2"; - sha256 = "048ycvhk143cvsf09r7vwmp4sm9ah9bh5pbbrl366m5a4sp7fr89"; + sha256 = "1mm1190fv059k2vrilh3znm8z1ilygwld1iazdgh5s04mi1qljni"; }; dontUseCmakeBuildDir = true; + + cmakeFlags = [ + "-DGDCM_BUILD_APPLICATIONS=ON" + "-DGDCM_BUILD_SHARED_LIBS=ON" + "-DGDCM_USE_VTK=ON" + ] + ++ stdenv.lib.optional enablePython [ + "-DGDCM_WRAP_PYTHON:BOOL=ON" + "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}" + ]; + preConfigure = '' cmakeDir=$PWD mkdir ../build cd ../build ''; - cmakeFlags = [ - "-DGDCM_BUILD_APPLICATIONS=ON" - "-DGDCM_BUILD_SHARED_LIBS=ON" - "-DGDCM_USE_VTK=ON" - ]; - enableParallelBuilding = true; - buildInputs = [ cmake vtk_7 ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.Cocoa ]; + buildInputs = [ cmake vtk_7 ] + ++ stdenv.lib.optional stdenv.isDarwin [ + darwin.apple_sdk.frameworks.ApplicationServices + darwin.apple_sdk.frameworks.Cocoa + ] ++ stdenv.lib.optional enablePython [ swig python ]; propagatedBuildInputs = [ ]; meta = with stdenv.lib; { @@ -37,4 +47,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 357b85e33005..f057e86b2557 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -777,6 +777,11 @@ in { glom = callPackage ../development/python-modules/glom { }; + gdcm = disabledIf isPy27 (toPythonModule (pkgs.gdcm.override { + inherit (self) python; + enablePython = true; + })); + goocalendar = callPackage ../development/python-modules/goocalendar { }; grandalf = callPackage ../development/python-modules/grandalf { }; From f925ce333b90f7245527f4c48f7681d986a96131 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 15:36:08 +0000 Subject: [PATCH 3400/3452] python27Packages.Nuitka: 0.6.8.1 -> 0.6.8.4 --- pkgs/development/python-modules/nuitka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index f65f5079b2c8..f5726b91b9c1 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -12,13 +12,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.8.1"; + version = "0.6.8.4"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "1rn6i2mcljhb9nmh8qj3slcmqzs9jx8s7j8r2b7685n7751h5ipj"; + sha256 = "0awhwksnmqmbciimqmd11wygp7bnq57khcg4n9r4ld53s147rmqm"; }; checkInputs = [ vmprof pyqt4 ]; From 275d34a646ddbaa5ca26845345dfcfe1142c2c31 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 15:17:19 +0000 Subject: [PATCH 3401/3452] python37Packages.libevdev: 0.7 -> 0.9 --- pkgs/development/python-modules/libevdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libevdev/default.nix b/pkgs/development/python-modules/libevdev/default.nix index ab00340cfe19..220d60663a3a 100644 --- a/pkgs/development/python-modules/libevdev/default.nix +++ b/pkgs/development/python-modules/libevdev/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "libevdev"; - version = "0.7"; + version = "0.9"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "10gwj08kn2rs4waq7807mq34cbavgkpg8fpir8mvnba601b8q4r4"; + sha256 = "17agnigmzscmdjqmrylg1lza03hwjhgxbpf4l705s6i7p7ndaqrs"; }; doCheck = false; From 5c60d0cbfc506811cb5748b607b522c686bef2d3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 16:24:24 +0000 Subject: [PATCH 3402/3452] python27Packages.latexcodec: 2.0.0 -> 2.0.1 --- pkgs/development/python-modules/latexcodec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix index 3514d5da9a23..77b75193ca40 100644 --- a/pkgs/development/python-modules/latexcodec/default.nix +++ b/pkgs/development/python-modules/latexcodec/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "latexcodec"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0pyzhidpnc3q3rh9d5hxhzv99rl5limyyrll7xcyssci92fn8gyd"; + sha256 = "16pynfnn8y8xp55yp06i721fccv5dlx9ba6k5bzcwq9j6wf5b8ia"; }; propagatedBuildInputs = [ six ]; From b7fd3f75cfc0e093d98b0137e161f23afa036558 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 14:59:09 +0000 Subject: [PATCH 3403/3452] python27Packages.paste: 3.4.0 -> 3.4.1 --- pkgs/development/python-modules/paste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 9d45f35d3657..5b12f04b2e5a 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "paste"; - version = "3.4.0"; + version = "3.4.1"; src = fetchPypi { pname = "Paste"; inherit version; - sha256 = "16sichvhyci1gaarkjs35mai8vphh7b244qm14hj1isw38nx4c03"; + sha256 = "1csqn7g9b05hp3fgd82355k4pb5rv12k9x6p2mdw2v01m385171p"; }; propagatedBuildInputs = [ six ]; From 84de929d4eabdd9bd785c19c3027989d09a23894 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 12:02:12 +0000 Subject: [PATCH 3404/3452] python27Packages.pep8-naming: 0.10.0 -> 0.11.1 --- pkgs/development/python-modules/pep8-naming/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix index 5f3f0a5145dd..5f6ef894d8ff 100644 --- a/pkgs/development/python-modules/pep8-naming/default.nix +++ b/pkgs/development/python-modules/pep8-naming/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pep8-naming"; - version = "0.10.0"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "0fmzccbmr0jn9ynamdb9ly2ai8qs5qfk8alfgnzr3fbjvpwsbd7k"; + sha256 = "0937rnk3c2z1jkdmbw9hfm80p5k467q7rqhn6slfiprs4kflgpd1"; }; propagatedBuildInputs = [ From 65c2c01686a785cdfcf842513118f28d98a3ab6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 15:05:32 +0000 Subject: [PATCH 3405/3452] python37Packages.ckcc-protocol: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/ckcc-protocol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix index 01e2955d08ac..7f5311f45b00 100644 --- a/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ckcc-protocol"; - version = "1.0.1"; + version = "1.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "13ihbhjgxyn1xvrbppjvnqm199q5fdwrljs0wm16iwyl56kf3wh3"; + sha256 = "0zpn3miyapskw6s71v614pmga5zfain9j085axm9v50b8r71xh1i"; }; checkInputs = [ From 7ce695f0fd13a3eb500d44337e444c98af1c1cb9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 11:08:26 +0000 Subject: [PATCH 3406/3452] python27Packages.identify: 1.4.19 -> 1.4.21 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 9f78298a3f3a..e1e691582542 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.19"; + version = "1.4.21"; src = fetchPypi { inherit pname version; - sha256 = "249ebc7e2066d6393d27c1b1be3b70433f824a120b1d8274d362f1eb419e3b52"; + sha256 = "105n1prgmzkzdwr8q0bdx82nj7i8p3af1abh864k2fcyjwmpzl64"; }; # Tests not included in PyPI tarball From 11f0e9d21da3862ea7eb85a597822465f19f449b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 12:19:00 +0000 Subject: [PATCH 3407/3452] python27Packages.ipdb: 0.13.2 -> 0.13.3 --- pkgs/development/python-modules/ipdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index 4b234cc11ac8..c32726be7e47 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipdb"; - version = "0.13.2"; + version = "0.13.3"; disabled = isPyPy; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; - sha256 = "0jcd849rx30y3wcgzsqbn06v0yjlzvb9x3076q0yxpycdwm1ryvp"; + sha256 = "0y3yk5k2yszcwxsjinvf40b1wl8wi8l6kv7pl9jmx9j53hk6vx6n"; }; propagatedBuildInputs = [ ipython ]; From fc068404d7ab13d408988752b71d7833b2e80230 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 08:40:15 -0700 Subject: [PATCH 3408/3452] python3Packages.mt-940: disable tests, no longer present --- pkgs/development/python-modules/mt-940/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index d28cda99d748..01abd718c758 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -15,10 +15,14 @@ buildPythonPackage rec { checkInputs = [ pyyaml pytest ]; + # requires tests files that are not present + doCheck = false; checkPhase = '' py.test ''; + pythonImportsCheck = [ "mt940" ]; + meta = with lib; { description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation"; homepage = "https://github.com/WoLpH/mt940"; From 7971042b202f680e4683f26acc3580e0999126b6 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 11 Apr 2020 12:00:00 +0000 Subject: [PATCH 3409/3452] nixos/tests/ihatemoney: fix --- nixos/tests/ihatemoney.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/tests/ihatemoney.nix b/nixos/tests/ihatemoney.nix index 7df0ea0b691f..a1160bbbbd54 100644 --- a/nixos/tests/ihatemoney.nix +++ b/nixos/tests/ihatemoney.nix @@ -1,5 +1,11 @@ +{ system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../.. { inherit system config; } +}: + let - f = backend: import ./make-test-python.nix ({ pkgs, ... }: { + inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; + f = backend: makeTest { name = "ihatemoney-${backend}"; machine = { lib, ... }: { services.ihatemoney = { @@ -48,7 +54,7 @@ let assert "ihatemoney" in machine.succeed("curl http://localhost:8000") ''; - }); + }; in { ihatemoney-sqlite = f "sqlite"; ihatemoney-postgresql = f "postgresql"; From 0848c2f5293da608b905a2b9b3964926d90b6997 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 11 Apr 2020 12:00:00 +0000 Subject: [PATCH 3410/3452] python3Packages.ihatemoney: 4.1 -> 4.1.3 --- pkgs/development/python-modules/ihatemoney/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index 5df5e6b18cd2..18da46d45e23 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -33,13 +33,13 @@ buildPythonPackage rec { pname = "ihatemoney"; - version = "4.1"; + version = "4.1.3"; src = fetchFromGitHub { owner = "spiral-project"; repo = pname; rev = version; - sha256 = "1ai7v2i2rvswzv21nwyq51fvp8lr2x2cl3n34p11br06kc1pcmin"; + sha256 = "02mxhf41c95gfp2wi74li2xli7sblm075w5z5ywkrh0pc1v02mgp"; }; propagatedBuildInputs = [ From 3603c4e16353d10771a0c973f71a95345ee33156 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 11 Apr 2020 12:00:00 +0000 Subject: [PATCH 3411/3452] nixos/ihatemoney: work around bug in uwsgi happens when dowbloading csv reports --- nixos/modules/services/web-apps/ihatemoney/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/web-apps/ihatemoney/default.nix b/nixos/modules/services/web-apps/ihatemoney/default.nix index 68769ac8c031..b7c646df238f 100644 --- a/nixos/modules/services/web-apps/ihatemoney/default.nix +++ b/nixos/modules/services/web-apps/ihatemoney/default.nix @@ -132,6 +132,9 @@ in chdir = "${pkg}/${pkg.pythonModule.sitePackages}/ihatemoney"; env = [ "IHATEMONEY_SETTINGS_FILE_PATH=${configFile}" ]; pythonPackages = self: [ self.ihatemoney ]; + # workaround for https://github.com/unbit/uwsgi/issues/1126 + # probably fixed in uwsgi 2.0.19 https://github.com/unbit/uwsgi/commit/d0444450a195f218456a2149d9c2066afa0ae52a + wsgi-disable-file-wrapper = true; } // cfg.uwsgiConfig; }; }; From a71acfeb0bab7bf375bb74b810d5f95964f8a1cc Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 24 Apr 2020 12:00:00 +0000 Subject: [PATCH 3412/3452] python3Packages.debts: init at 0.5 --- .../python-modules/debts/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/debts/default.nix diff --git a/pkgs/development/python-modules/debts/default.nix b/pkgs/development/python-modules/debts/default.nix new file mode 100644 index 000000000000..cc571f056314 --- /dev/null +++ b/pkgs/development/python-modules/debts/default.nix @@ -0,0 +1,42 @@ +{ lib +, python +, buildPythonPackage +, fetchFromGitLab +, isPy27 +, jinja2 +, pytest +}: + +buildPythonPackage rec { + pname = "debts"; + version = "0.5"; + + # pypi does not ship tests + src = fetchFromGitLab { + domain = "framagit.org"; + owner = "almet"; + repo = "debts"; + rev = "d887bd8b340172d1c9bbcca6426529b8d1c2a241"; # no tags + sha256 = "1d66nka81mv9c07mki78lp5hdajqv4cq6aq2k7bh3mhkc5hwnwlg"; + }; + + disabled = isPy27; + + propagatedBuildInputs = [ jinja2 ]; + + checkInputs = [ pytest ]; + + # for some reason tests only work if the module is properly installed + checkPhase = '' + rm -r debts + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + py.test tests + ''; + + meta = with lib; { + inherit (src.meta) homepage; + description = "A simple library and cli-tool to help you solve some debts settlement scenarios"; + license = licenses.beerware; + maintainers = [ maintainers.symphorien ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 498425ee0f51..64940c8b4b5f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -683,6 +683,8 @@ in { inherit (pkgs) dbus pkgconfig; }; + debts = callPackage ../development/python-modules/debts { }; + dftfit = callPackage ../development/python-modules/dftfit { }; dicom2nifti = callPackage ../development/python-modules/dicom2nifti { }; From 7918f8c47acce77b282792cb8fa7b8efc9e99bbc Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 24 Apr 2020 12:00:00 +0000 Subject: [PATCH 3413/3452] python3Packages.sqlalchemy-i18n: init at 1.0.3 --- .../sqlalchemy-i18n/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/sqlalchemy-i18n/default.nix diff --git a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix new file mode 100644 index 000000000000..4ef0adefe3e7 --- /dev/null +++ b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, lib +, fetchPypi +, buildPythonPackage +, sqlalchemy +, sqlalchemy-utils +, psycopg2 +}: + +buildPythonPackage rec { + pname = "SQLAlchemy-i18n"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "15xah8643p29kciz365ixs9pbsflj92pzr2d9anbdh2biyf4cka8"; + }; + + propagatedBuildInputs = [ + sqlalchemy + sqlalchemy-utils + ]; + + # tests require running a postgresql server + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/kvesteri/sqlalchemy-i18n"; + description = "Internationalization extension for SQLAlchemy models"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64940c8b4b5f..b49e675182c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6004,6 +6004,8 @@ in { sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { }; + sqlalchemy-i18n = callPackage ../development/python-modules/sqlalchemy-i18n { }; + sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; From ed5b736ace77c0850b6a8ff0e27793423cf352f6 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 24 Apr 2020 12:00:00 +0000 Subject: [PATCH 3414/3452] python3Packages.sqlalchemy-continuum: init a 1.3.9 --- .../sqlalchemy-continuum/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/sqlalchemy-continuum/default.nix diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix new file mode 100644 index 000000000000..fb854c1809d4 --- /dev/null +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, fetchPypi +, buildPythonPackage +, flask +, flask_login +, flask_sqlalchemy +, flexmock +, pytestCheckHook +, sqlalchemy +, sqlalchemy-utils +, sqlalchemy-i18n +}: + +buildPythonPackage rec { + pname = "SQLAlchemy-Continuum"; + version = "1.3.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b7q0rqy5q7m9yw7yl7jzrk8p1jh1hqmqvzf45rwmwxs724kfkjg"; + }; + + propagatedBuildInputs = [ + sqlalchemy + sqlalchemy-utils + ]; + + # indicate tests that we don't have a database server at hand + DB = "sqlite"; + + checkInputs = [ + pytestCheckHook + sqlalchemy-i18n + flask + flask_login + flask_sqlalchemy + flexmock + ]; + + meta = with lib; { + homepage = "https://github.com/kvesteri/sqlalchemy-continuum/"; + description = "Versioning and auditing extension for SQLAlchemy"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b49e675182c4..7621a5b88426 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6004,6 +6004,8 @@ in { sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { }; + sqlalchemy-continuum = callPackage ../development/python-modules/sqlalchemy-continuum { }; + sqlalchemy-i18n = callPackage ../development/python-modules/sqlalchemy-i18n { }; sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; From 2720b53385ce0dc2b8a09536606d6f1f18d51c77 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 24 Apr 2020 12:00:00 +0000 Subject: [PATCH 3415/3452] python3Packages.ihatemoney: 4.1.3 -> 4.2 --- .../python-modules/ihatemoney/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index 18da46d45e23..31640ec147e7 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -15,6 +15,7 @@ , flask_script , flask_sqlalchemy , flask_wtf +, debts , idna , itsdangerous , jinja2 @@ -25,6 +26,7 @@ , pytz , six , sqlalchemy +, sqlalchemy-continuum , werkzeug , wtforms , psycopg2 # optional, for postgresql support @@ -33,15 +35,20 @@ buildPythonPackage rec { pname = "ihatemoney"; - version = "4.1.3"; + version = "4.2"; src = fetchFromGitHub { owner = "spiral-project"; repo = pname; rev = version; - sha256 = "02mxhf41c95gfp2wi74li2xli7sblm075w5z5ywkrh0pc1v02mgp"; + sha256 = "0d4vc6m0jkwlz9ly0hcjghccydvqbldh2jb8yzf94jrgkd5fd7k1"; }; + patchPhase = '' + # remove draconian pinning + sed -i 's/==.*$//' setup.cfg + ''; + propagatedBuildInputs = [ alembic aniso8601 @@ -68,9 +75,11 @@ buildPythonPackage rec { pytz six sqlalchemy + sqlalchemy-continuum werkzeug wtforms psycopg2 + debts ]; checkInputs = [ From 7761494be9bc3291eeab9c97913d2d6461c5c925 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 25 Apr 2020 12:00:00 +0000 Subject: [PATCH 3416/3452] python3Packages.ihatemoney: fix postgresql test --- .../python-modules/ihatemoney/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index 31640ec147e7..0dff8ac7f96d 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, fetchFromGitHub, isPy27, nixosTests +{ buildPythonPackage, lib, fetchFromGitHub, isPy27, nixosTests, fetchpatch , alembic , aniso8601 , Babel @@ -44,7 +44,16 @@ buildPythonPackage rec { sha256 = "0d4vc6m0jkwlz9ly0hcjghccydvqbldh2jb8yzf94jrgkd5fd7k1"; }; - patchPhase = '' + patches = [ + # fix migration on postgresql + # remove on next release + (fetchpatch { + url = "https://github.com/spiral-project/ihatemoney/commit/6129191b26784b895e203fa3eafb89cee7d88b71.patch"; + sha256 = "0yc24gsih9x3pnh2mhj4v5i71x02dq93a9jd2r8b1limhcl4p1sw"; + }) + ]; + + postPatch = '' # remove draconian pinning sed -i 's/==.*$//' setup.cfg ''; From 4b819d443c3a160aa2fe1bafad120045c7ad0c38 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 25 Apr 2020 12:00:00 +0000 Subject: [PATCH 3417/3452] python3Packages.ihatemoney: disable on python2 it does not build and is not supported according to setup.cfg --- pkgs/development/python-modules/ihatemoney/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index 0dff8ac7f96d..68a8b85a4ed1 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -21,7 +21,6 @@ , jinja2 , Mako , markupsafe -, mock , python-dateutil , pytz , six @@ -44,6 +43,8 @@ buildPythonPackage rec { sha256 = "0d4vc6m0jkwlz9ly0hcjghccydvqbldh2jb8yzf94jrgkd5fd7k1"; }; + disabled = isPy27; + patches = [ # fix migration on postgresql # remove on next release @@ -93,7 +94,7 @@ buildPythonPackage rec { checkInputs = [ flask_testing - ] ++ lib.optionals isPy27 [ mock ]; + ]; passthru.tests = { inherit (nixosTests) ihatemoney; From bcafd845c67873f1c122d87c2d14a3ec6130ed2b Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 25 Jun 2020 12:00:00 +0000 Subject: [PATCH 3418/3452] python3Packages.ihatemoney: pin wtforms to 2.2.1 --- .../python-modules/ihatemoney/default.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index 68a8b85a4ed1..38d762ec3607 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, fetchFromGitHub, isPy27, nixosTests, fetchpatch +{ buildPythonPackage, lib, fetchFromGitHub, isPy27, nixosTests, fetchpatch, fetchPypi , alembic , aniso8601 , Babel @@ -32,6 +32,21 @@ , flask_testing }: +# ihatemoney is not really a library. It will only ever be imported +# by the interpreter of uwsgi. So overrides for its depencies are fine. +let + # https://github.com/spiral-project/ihatemoney/issues/567 + pinned_wtforms = wtforms.overridePythonAttrs (old: rec { + pname = "WTForms"; + version = "2.2.1"; + src = fetchPypi { + inherit pname version; + sha256 = "0q9vkcq6jnnn618h27lx9sas6s9qlg2mv8ja6dn0hy38gwzarnqc"; + }; + }); + pinned_flask_wtf = flask_wtf.override { wtforms = pinned_wtforms; }; +in + buildPythonPackage rec { pname = "ihatemoney"; version = "4.2"; @@ -75,7 +90,7 @@ buildPythonPackage rec { flask-restful flask_script flask_sqlalchemy - flask_wtf + pinned_flask_wtf idna itsdangerous jinja2 @@ -87,7 +102,7 @@ buildPythonPackage rec { sqlalchemy sqlalchemy-continuum werkzeug - wtforms + pinned_wtforms psycopg2 debts ]; From 2e342f4c595e7544e618dc86c3f74d57bd3c190c Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 25 Jun 2020 12:00:00 +0000 Subject: [PATCH 3419/3452] nixos/tests/ihatemoney: fix --- nixos/tests/ihatemoney.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/ihatemoney.nix b/nixos/tests/ihatemoney.nix index a1160bbbbd54..0451a4505808 100644 --- a/nixos/tests/ihatemoney.nix +++ b/nixos/tests/ihatemoney.nix @@ -30,9 +30,10 @@ let testScript = '' machine.wait_for_open_port(8000) machine.wait_for_unit("uwsgi.service") + machine.wait_until_succeeds("curl http://localhost:8000") assert '"yay"' in machine.succeed( - "curl -X POST http://localhost:8000/api/projects -d 'name=yay&id=yay&password=yay&contact_email=yay\@example.com'" + "curl -X POST http://localhost:8000/api/projects -d 'name=yay&id=yay&password=yay&contact_email=yay@example.com'" ) owner, timestamp = machine.succeed( "stat --printf %U:%G___%Y /var/lib/ihatemoney/secret_key" From 826b7c18b55d054209d2157c0a91789f86e89dc3 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 25 Jun 2020 12:00:00 +0000 Subject: [PATCH 3420/3452] uwsgi: 2.0.18 -> 2.0.19.1 release notes: https://uwsgi-docs.readthedocs.io/en/latest/Changelog-2.0.19.html https://uwsgi-docs.readthedocs.io/en/latest/Changelog-2.0.19.1.html --- pkgs/servers/uwsgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 0f0d2c23e4c4..39a3113eb410 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -54,11 +54,11 @@ in stdenv.mkDerivation rec { pname = "uwsgi"; - version = "2.0.18"; + version = "2.0.19.1"; src = fetchurl { url = "https://projects.unbit.it/downloads/${pname}-${version}.tar.gz"; - sha256 = "10zmk4npknigmbqcq1wmhd461dk93159px172112vyq0i19sqwj9"; + sha256 = "0256v72b7zr6ds4srpaawk1px3bp0djdwm239w3wrxpw7dzk1gjn"; }; nativeBuildInputs = [ python3 pkgconfig ]; From 2b0cfa48abe311e85785b94d8efa23d104e0e9b8 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 25 Jun 2020 12:00:00 +0000 Subject: [PATCH 3421/3452] remove workaround for uwsgi < 2.0.19 --- nixos/modules/services/web-apps/ihatemoney/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/services/web-apps/ihatemoney/default.nix b/nixos/modules/services/web-apps/ihatemoney/default.nix index b7c646df238f..68769ac8c031 100644 --- a/nixos/modules/services/web-apps/ihatemoney/default.nix +++ b/nixos/modules/services/web-apps/ihatemoney/default.nix @@ -132,9 +132,6 @@ in chdir = "${pkg}/${pkg.pythonModule.sitePackages}/ihatemoney"; env = [ "IHATEMONEY_SETTINGS_FILE_PATH=${configFile}" ]; pythonPackages = self: [ self.ihatemoney ]; - # workaround for https://github.com/unbit/uwsgi/issues/1126 - # probably fixed in uwsgi 2.0.19 https://github.com/unbit/uwsgi/commit/d0444450a195f218456a2149d9c2066afa0ae52a - wsgi-disable-file-wrapper = true; } // cfg.uwsgiConfig; }; }; From f166a133aed61df30bbd8ab81c81a8a5f60dd904 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 11:02:09 +0000 Subject: [PATCH 3422/3452] python37Packages.geopandas: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/geopandas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 9a86acf83b50..07982b1e42b1 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "geopandas"; - version = "0.7.0"; + version = "0.8.0"; disabled = isPy27; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; rev = "v${version}"; - sha256 = "0cfdvl4cvi0nim1qbmzf7vg0all272i8r0kj4xgdd0hr2j4jdg9p"; + sha256 = "033jygbyycl9s6b0kqix9xynhapc2xd8nh47kcfacn514gyncgah"; }; checkInputs = [ pytest Rtree ]; From a5ac6d01b6f1a9eb16954a0876c6660f88e3879b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 09:56:43 +0000 Subject: [PATCH 3423/3452] python27Packages.dnslib: 0.9.13 -> 0.9.14 --- pkgs/development/python-modules/dnslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix index df9843893238..25a2ffea2f08 100644 --- a/pkgs/development/python-modules/dnslib/default.nix +++ b/pkgs/development/python-modules/dnslib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dnslib"; - version = "0.9.13"; + version = "0.9.14"; src = fetchPypi { inherit pname version; - sha256 = "a0fed3e139c12ee4884b19bcde1d4a170745bcabb6026397876e3236ce38b9db"; + sha256 = "1yz63cgiv910wkx90if09bql1n63lq6hy4wfpqink0q4sxy0mlpv"; }; checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh"; From b7f560662eaf3d18fd68adbbee6883af7dbb5dfa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 09:43:11 +0000 Subject: [PATCH 3424/3452] python37Packages.libversion: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/libversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix index 21aa46348b12..ed3629ce65d5 100644 --- a/pkgs/development/python-modules/libversion/default.nix +++ b/pkgs/development/python-modules/libversion/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libversion"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1p3snjlsg11vhba8h286h19kn6azlxbywg9f6rdhj8sfraccqlmk"; + sha256 = "1h8x9hglrqi03f461lhw3wwz23zs84dgw7hx4laxcmyrgvyzvcq1"; }; nativeBuildInputs = [ pkgconfig ]; From 32dd8df0bd2e30170019c835be6ab718c87499a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 10:22:22 +0000 Subject: [PATCH 3425/3452] python27Packages.elasticsearch: 7.7.1 -> 7.8.0 --- pkgs/development/python-modules/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index b04bc9069f71..59541cbb3d27 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.7.1"; + version = "7.8.0"; src = fetchPypi { inherit pname version; - sha256 = "9bfcb2bd137d6d7ca123e252b9d7261cfe4f7723f7b749a99c52b47766cf387c"; + sha256 = "14m7lfn36y0bjlpqxd7j9ggvbx46q30fva4czyspkqi79v7xhdz6"; }; # Check is disabled because running them destroy the content of the local cluster! From 8fc8153fa3dec12d6e0b076124e71af4be84d728 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 09:21:19 +0000 Subject: [PATCH 3426/3452] python37Packages.nbsphinx: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/nbsphinx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 9b96bc12d647..f46322954f36 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "77545508fff12fed427fffbd9eae932712fe3db7cc6729b0af5bbd122d7146cf"; + sha256 = "0j56bxdj08vn3q1804qwb1ywhga1mdg1awgm7i64wfpfwi8df2zm"; }; propagatedBuildInputs = [ From a372677b9e75d3f739527d3a899af3fbfaf37f12 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 08:03:24 +0000 Subject: [PATCH 3427/3452] python27Packages.azure-mgmt-cosmosdb: 0.14.0 -> 0.15.0 --- .../python-modules/azure-mgmt-cosmosdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 61bc17df0148..8578800e56e6 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "692544dd2fa6276a7a4b4e094e2a5e0915d29b7829e266c6ade2b17a5fdcc2a9"; + sha256 = "03ysr8kx0gavjrxsi9wqrgxpg3g17nvii7z68qfm0k2mv6ryj3z7"; }; propagatedBuildInputs = [ From 918a651d2a0ffe8f27f369a19515f2460088220e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 09:01:38 +0000 Subject: [PATCH 3428/3452] python27Packages.geoalchemy2: 0.8.3 -> 0.8.4 --- pkgs/development/python-modules/geoalchemy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index ea673dc33468..e96c67b044db 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.8.3"; + version = "0.8.4"; src = fetchPypi { inherit pname version; - sha256 = "a5a2444d90ce7f2c6b2d7bd7346c8aed16fd32c3e190e631576a51814e8f7ee9"; + sha256 = "02jbad9vbnjx8bmfvxg77z18nymrry6li8hy9pwi0yiyvwbnycyr"; }; nativeBuildInputs = [ setuptools_scm ]; From fd263c2fe2d6827019351ad97b7a99c60cedb75d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 07:54:22 +0000 Subject: [PATCH 3429/3452] python27Packages.atlassian-python-api: 1.15.9 -> 1.16.0 --- .../python-modules/atlassian-python-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 5f124cc09434..57e54d24ae3b 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "1.15.9"; + version = "1.16.0"; src = fetchPypi { inherit pname version; - sha256 = "c6a3125ee68ecf4d11947497c1f891b6436df9d8453f8865cabf595813504cc1"; + sha256 = "1sp036192vdl5nqifcswg2j838vf8i9k8bfd0w4qh1vz4f0pjz7y"; }; checkInputs = [ pytestrunner pytest ]; From be75df90dd6cad60c9315678866fba9e19c0e7d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 07:44:07 +0000 Subject: [PATCH 3430/3452] python27Packages.azure-mgmt-eventhub: 3.1.0 -> 4.0.0 --- .../python-modules/azure-mgmt-eventhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix index 1057322a8e6a..78e30841c148 100644 --- a/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-eventhub/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-eventhub"; - version = "3.1.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c823a0ed879230a3ec9f15c32c9788610af1db56e6aeae6b2725476ddbe0d138"; + sha256 = "1qisnwn0gqfsa3h5x0fdbsgdjwn92hdbg71gdijrja0kryb328k5"; }; propagatedBuildInputs = [ From 636fec8ea72a4c0c7f2de87acc84595fab6a751d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 07:18:24 +0000 Subject: [PATCH 3431/3452] python37Packages.azure-mgmt-security: 0.4.0 -> 0.4.1 --- .../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 ae50ee6d3ebd..90a64ff098ae 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.4.0"; + version = "0.4.1"; pname = "azure-mgmt-security"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1gpkvvk4prx6khs6vrlbqlg6zarsmplg3k9zbymxfm6irriqildm"; + sha256 = "08gf401d40bd1kn9wmpxcjxqdh84cd9hxm8rdjd0918483sqs71r"; extension = "zip"; }; From f650a8783e25f211b2f5182aa3d9742c8b058836 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 10:55:05 +0000 Subject: [PATCH 3432/3452] python27Packages.hvac: 0.10.3 -> 0.10.4 --- pkgs/development/python-modules/hvac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index d68e12b37732..864a1300c3ee 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.10.3"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "391b558a465d1919a2862926ab9a7c6bef1f2ac2c46daf8dd5115080c42978e4"; + sha256 = "0yhywm8f86pc4f7ivvbwicwhzf0khjqp9jj77pqy6nha6znvpvnh"; }; propagatedBuildInputs = [ requests six ]; From c93f5194c8bde97f61f5c68a7cc6a6ea6e4c39f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Jul 2020 11:57:32 +0000 Subject: [PATCH 3433/3452] python37Packages.jupyterlab: 2.1.4 -> 2.1.5 --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 8d08fec6f5d9..0aab09117e75 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "2.1.4"; + version = "2.1.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7b5bd4a05330a01c8522ee7f1cda5cb2e0d96412d9e1e879a19b3afb63d4ac69"; + sha256 = "162jn51cg36fsn4l2zhnb5n4nbkhm9wlv974ggcnmdij3i4r4yya"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; From 5e79e32897ec2c4b3f1d7a9ea01ff4daa33a1c89 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 09:48:03 -0700 Subject: [PATCH 3434/3452] python3Packages.azure-mgmt-appconfiguration: 0.4.0 -> 0.5.0 --- .../python-modules/azure-mgmt-appconfiguration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index 75c912dfe40c..e5879bd4e8c3 100644 --- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.4.0"; + version = "0.5.0"; pname = "azure-mgmt-appconfiguration"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5"; + sha256 = "211527511d7616a383cc196956eaf2b7ee016f2367d367924b3715f2a41106da"; extension = "zip"; }; From acd9f387ca15b274ba7f16e4c881460b5dc65e7f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 09:48:03 -0700 Subject: [PATCH 3435/3452] python3Packages.azure-mgmt-compute: 12.0.0 -> 12.1.0 --- .../development/python-modules/azure-mgmt-compute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index e78d93fb7bc1..a89a28bb2645 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "12.0.0"; + version = "12.1.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0vzq93g2fpnij4rykkk3391xq2knhlbz87vhim4zvj8s45sx6z8q"; + sha256 = "54416e6fa4584bb986e8985f510486a36b4fdf47af012a4982a0960c7b11e89c"; }; propagatedBuildInputs = [ From 4b0c2874ded01d0ff8e8a0350e4fb19765d1f487 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 09:48:03 -0700 Subject: [PATCH 3436/3452] python3Packages.azure-mgmt-containerinstance: 1.5.0 -> 2.0.0 --- .../python-modules/azure-mgmt-containerinstance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index 5bf67fc6787c..2dfff00dfa61 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerinstance"; - version = "1.5.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1kd8lxm5kzk0wxbw1f3vin10hlhb4sygrxqd5c8k715s0ipkhmdh"; + sha256 = "5ad247d186c3c040da7a1d40ad39c9881e99afc58271f673abb602abb0b6b85b"; }; propagatedBuildInputs = [ From ff0161796d4b996d48b0735c3362e52dd991b6a6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 09:48:04 -0700 Subject: [PATCH 3437/3452] python3Packages.azure-mgmt-datafactory: 0.10.0 -> 0.11.0 --- .../python-modules/azure-mgmt-datafactory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index e7da7541dd98..8dd91f845523 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "48b1ec81f30f4b5f38dd17f68f0dfc968db96e0a04fdcfc99f43f80ca041f14b"; + sha256 = "35d7c737054a7e6fc7c88d8c437fc012904c4568809487cac443eb3b13e6655b"; }; propagatedBuildInputs = [ From 593bcd18dea8126b0529d5a583e1a71e1af30b5e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 09:48:04 -0700 Subject: [PATCH 3438/3452] python3Packages.azure-mgmt-hdinsight: 1.5.0 -> 1.5.1 --- .../python-modules/azure-mgmt-hdinsight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 8ca128dad87b..6713f24ca5cc 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.5.1"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d13088bb506700a7aecf59faf042cb48dc82c423082482b2f50cc2403ac43e55"; + sha256 = "76b94f3e43fdc6698023d79be731937dc645dc3178dc134854768528ecc0aea3"; extension = "zip"; }; From d61218a741f99c1ac6fa9eb16edd6fb0c9d72435 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 09:48:04 -0700 Subject: [PATCH 3439/3452] python3Packages.azure-mgmt-iotcentral: 3.0.0 -> 3.1.0 --- .../python-modules/azure-mgmt-iotcentral/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix index 5ba25e11a89e..963d794d5505 100644 --- a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iotcentral"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f6dacf442ccae2f18f1082e80bcbdcaa8c0efa2ba92b48c5db6ee01d37240047"; + sha256 = "c175f6642be514ad0efd3dc03d09e50d923596fd9e634381793dcc46bb8a57c7"; }; propagatedBuildInputs = [ From 60eda2a6e9a7defc7947dc24a3720ccb5362d727 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 09:48:04 -0700 Subject: [PATCH 3440/3452] python3Packages.azure-mgmt-media: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/azure-mgmt-media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix index f3dfaba6d9cb..018d7140a3d9 100644 --- a/pkgs/development/python-modules/azure-mgmt-media/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-media"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm"; + sha256 = "0adeee9e654a9011f5107def06fea6838864a3514a1e5a9ed495f3a56a687cc7"; }; propagatedBuildInputs = [ From f2f30182a94a7309b3912853fe9b7096fa3e7ab7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 09:48:05 -0700 Subject: [PATCH 3441/3452] python3Packages.azure-mgmt-network: 10.2.0 -> 11.0.0 --- .../development/python-modules/azure-mgmt-network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 24f7165281d4..a140c779fff1 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "10.2.0"; + version = "11.0.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d50c74cdc1c9be6861ddef9adffd3b05afc5a5092baf0209eea30f4439cba2d9"; + sha256 = "7fdfc631c660cb173eee88abbb7b8be7742f91b522be6017867f217409cd69bc"; }; postInstall = if isPy3k then "" else '' From 0fd0b4ba98a9138d1a24ec3efdf1ad2fe0a24ac6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 09:48:05 -0700 Subject: [PATCH 3442/3452] python3Packages.azure-mgmt-recoveryservicesbackup: 0.7.0 -> 0.8.0 --- .../azure-mgmt-recoveryservicesbackup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index ece93025b571..75781dab8ed3 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "6355d9234d87422d57bf2ea8d1cc242463c203e4bb79b8930f22f29f4e025fa1"; + sha256 = "a0ee89691b21945cc4b892a9194320f50c1cd242d98f00a82d7e3848c28517a5"; }; propagatedBuildInputs = [ From 6a3b7c1a71b754def21cac66560aaa282848dd55 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 09:48:05 -0700 Subject: [PATCH 3443/3452] python3Packages.azure-mgmt-resource: 10.0.0 -> 10.1.0 --- .../python-modules/azure-mgmt-resource/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 45fabcb88af1..ee1149f6ef2e 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { - version = "10.0.0"; + version = "10.1.0"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bd9a3938f5423741329436d2da09693845c2fad96c35fadbd7c5ae5213208345"; + sha256 = "9be7fcdf586f24acb799a799cf5e9363e9323ca0ce54cca63ab505f69fa0fddd"; }; postInstall = if isPy3k then "" else '' From d3c846e48c1094a526919960f5bfd64bd8786dfe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 09:48:05 -0700 Subject: [PATCH 3444/3452] python3Packages.azure-mgmt-sql: 0.18.0 -> 0.19.0 --- pkgs/development/python-modules/azure-mgmt-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index 1b6649a36f23..f481d939705c 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "0.18.0"; + version = "0.19.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "99ca085eb523a5c27933060ccb04d7a6b60864f98d87bf5b63ac17d419b43445"; + sha256 = "694649d4c9c5f89e543f23ec10e450b6382b2f1bc5843ef266cfc302276038c6"; }; propagatedBuildInputs = [ From f73156459210fd9fcbec52c55a29804a82529d33 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 09:48:06 -0700 Subject: [PATCH 3445/3452] python3Packages.azure-mgmt-storage: 10.0.0 -> 11.1.0 --- .../development/python-modules/azure-mgmt-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index e3ac0961542b..8e101ef051ac 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "10.0.0"; + version = "11.1.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d1edead1ad36e957c9f9b605f547ad1ff7152f8f785fa03d3c7891bb428a68ef"; + sha256 = "ef23587c1b6dc0866ebf0e91e83ba05d7f7e4fea7951b704781b9cd9f5f27f1c"; }; propagatedBuildInputs = [ azure-mgmt-common ]; From 515a494faf5edaee882c3c0d47a7b7563e401197 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 09:48:06 -0700 Subject: [PATCH 3446/3452] python3Packages.azure-mgmt-subscription: 0.5.0 -> 0.6.0 --- .../python-modules/azure-mgmt-subscription/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix index 92dcc7cd952a..6a429a056f45 100644 --- a/pkgs/development/python-modules/azure-mgmt-subscription/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-subscription/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-subscription"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1w91zqi2icld76mcrz0kwq0adb1nr83yqdq6qp1p1445p914qjsh"; + sha256 = "7448a322eceed3d300e181fde0f626c0e37df773f6c7297df2b73d98cb0936cf"; }; propagatedBuildInputs = [ From 18a7de713d3d844b41337d3aadca69832bcbc528 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 09:48:06 -0700 Subject: [PATCH 3447/3452] python3Packages.azure-multiapi-storage: 0.3.2 -> 0.3.5 --- .../python-modules/azure-multiapi-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index d10045b41d78..17833940c9a6 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "0.3.2"; + version = "0.3.5"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c403a47e40e4a80d9c42c854993f5c07f12c2a75bd9a85ba8225985493a9b792"; + sha256 = "71c238c785786a159b3ffd587a5e7fa1d9a517b66b592ae277fed73a9fbfa2b0"; }; propagatedBuildInputs = [ From 966d7bed533d29b3596889bf084e321a44387241 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 09:48:06 -0700 Subject: [PATCH 3448/3452] python3Packages.azure-storage-file-share: 12.1.1 -> 12.1.2 --- .../python-modules/azure-storage-file-share/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index a4f8e161ba3b..fb4a94952d68 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.1.1"; + version = "12.1.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "661ed9669b9fbb3163899294d28f11f7c135336e1513aab6bd1ff9ef3c6febb3"; + sha256 = "74422d241454d66fdc3184dbe52334997ebe4f9f9a0d88ec1a2ba6c602f8a332"; }; propagatedBuildInputs = [ From e3fe15df4c04cd365034e88819c07a9c22bc3b83 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 10:31:06 -0700 Subject: [PATCH 3449/3452] python3Packages.azure-multiapi-storage: fix packaging --- .../python-modules/azure-multiapi-storage/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index 17833940c9a6..2d1ff4c29164 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -1,4 +1,5 @@ { lib, python, buildPythonPackage, fetchPypi, isPy27 +, fetchpatch , azure-common , azure-core , msrest @@ -24,6 +25,14 @@ buildPythonPackage rec { requests ]; + # Fix to actually install the package + patches = [ + (fetchpatch { + url = "https://github.com/Azure/azure-multiapi-storage-python/pull/29/commits/1c8b08dfc9c5445498de3475dec8820eafbd0ca1.patch"; + sha256 = "1f80sdbw4pagrlp9dhcimhp23sdmy0whiba07aa84agkpv4df9ny"; + }) + ]; + # fix namespace pythonNamespaces = [ "azure.multiapi" ]; From e9e8486c79753a2c22eaf6df6e0a147937113951 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 10:43:30 -0700 Subject: [PATCH 3450/3452] azure-cli: pin azure-mgmt-containerinstance --- pkgs/tools/admin/azure-cli/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 820659c68a23..a2d2ec88d818 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -151,6 +151,9 @@ let azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; + azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "1.4.0" "zip" + "1qw6228bia5pimcijr755npli2l33jyfka1s2bzgl1w4h3prsji7"; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "9.0.1" "zip" "11nqjpi9qypb0xvfy63l98q5m5jfv5iqx15mliksm96vkdkmji3y"; From 7516429fc1cea5ec93a7076651614e8ec9688460 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 10:58:18 -0700 Subject: [PATCH 3451/3452] python3Packages.azure-mgmt-containerservice: 9.1.0 -> 9.2.0 --- .../python-modules/azure-mgmt-containerservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 37a1fcf0500b..8e186da6d880 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "9.1.0"; + version = "9.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0xdm4kkqmfsj7vkq3b9inqwx6nif5kmbd09wl40ckkjndvs1sclz"; + sha256 = "e7904b60c42a153b64b1604f3c698602686b38787bebdaed6e808cd43b6e5967"; }; propagatedBuildInputs = [ From 2af99b8ba1a9b81df88819f7cd84bec18befbabc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 6 Jul 2020 11:12:01 -0700 Subject: [PATCH 3452/3452] azure-cli: 2.7.0 -> 2.8.0 --- pkgs/tools/admin/azure-cli/default.nix | 4 +-- .../tools/admin/azure-cli/python-packages.nix | 32 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 4cfe1beb2cdc..50a4b6eebeb7 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python, fetchFromGitHub, installShellFiles }: let - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "0g0ddg04pwcsmyyzrqllx4ladw4x5zxc5yw29q8f6q59j6jaf1zb"; + sha256 = "1jfavxpqa0n6j7vs1233ghgxs5l9099xz4ncgmpj4s826f8chdi8"; }; # put packages that needs to be overriden in the py package scope diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index a2d2ec88d818..fabdd38afe70 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -121,8 +121,8 @@ let azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.1.0" "zip" "06bqqkn5mx127x1z7ycm6rl8ajxlrmrm2kcdpgkbl4baii1x6iax"; - azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "7.0.0" "zip" - "18dwgbwk1kc0pdqa85hbsm9312l50rf8ymb60fia1c9rni9bdi8n"; + azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "9.0.0" "zip" + "1zn3yqwvm2f3sy8v0xvj4yb7m8kxxm1wpcaccxp91b0zzbn7wh83"; azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip" "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g"; @@ -136,14 +136,14 @@ let azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip" "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "9.0.0" "zip" - "00bmdbr7hdwb3ibr9sfbgbmmr6626qlz19cdi84d87rcisczf4nw"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.0.0" "zip" + "0ic3409m5bn5szdzldbcv7xc4i9qd44xmlinjhr42ds2ylw3k6mx"; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.4.0" "zip" "1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5"; - azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "5.0.0" "zip" - "1m7v3rfkvmdgghrpz15fm8pvmmhi40lcwfxdm2kxh7mx01r5l906"; + azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.2.0" "zip" + "1khk9jdfx7706xsqpwrnfsplv6p6wracvpyk9ki8zhc7p83kal4k"; azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "12.0.0" "zip" "0vzq93g2fpnij4rykkk3391xq2knhlbz87vhim4zvj8s45sx6z8q"; @@ -166,8 +166,8 @@ let azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6"; - azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.2.1" "zip" - "0mwlvy4x5nr3hsz7wdpdhpzwarzzwz4225bfpd68hr0pcjgzspky"; + azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.4.0" "zip" + "0cqpjnkpid6a34ifd4vk4fn1h57pa1bg3r756wv082xl2szr34jc"; azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.12.0" "zip" "187z0w5by7d9a2zsz3kidmzjw591akpc6dwhps4jyb4skcmyw86s"; @@ -211,8 +211,8 @@ let azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip" "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3"; - azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.1.0" "zip" - "1cb466722bs0ribrirb32kc299716pl0pwivz3jyn40dd78cwhhx"; + azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.4.1" "zip" + "08gf401d40bd1kn9wmpxcjxqdh84cd9hxm8rdjd0918483sqs71r"; azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "0.3.0" "zip" "08b2i6wz9n13h77ahay1hvmg8abk2vvs7kn4y7xip9gi6ij8fv0a"; @@ -229,8 +229,8 @@ let azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip" "1jss6qhvif8l5s0lblqw3qzijjf0h88agciiydaa7f4q577qgyfr"; - azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "3.0.0" "zip" - "05c6isg13dslds94kv28v6navxj4bp4c5lsd9df0g3ndsxvpdrxp"; + azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.0.0" "zip" + "1qisnwn0gqfsa3h5x0fdbsgdjwn92hdbg71gdijrja0kryb328k5"; azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.2.0" "zip" "1r5ww9ndya6sifafrbp4cr5iyyaww2ns7wrbqm6hc6aqxcpf30qq"; @@ -238,8 +238,8 @@ let azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "4.1.0rc1" "zip" "00q5723gvc57kg2w1iyhfchp018skwd89ibrw23p7ngm2bb76g45"; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc12" "zip" - "0q7w26n53x0lvr1a944jjl9d0yn0l029brx5nzfrz7ydf3jpb2i2"; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc13" "zip" + "1imjjg93fqfg1j9v5l9w2qz7qzgqlh8vxvykl1ijyxzmjf7ydwlz"; azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.9.0" "zip" "170jyr1qzwhv5ihyrsg5d8qzjylqmg31dscd31jzi4i7bwqf3sb8"; @@ -253,8 +253,8 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.52.0" "zip" "0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "9.0.0" "zip" - "198r51av2rd1mr3q9j8jibhd14w0v8k59ipc3czsm4g1n44adgkl"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "11.0.0" "zip" + "1f192420cwqfbqnl4xcfjpdh5qfilji34xkmpxdsbq7fhhm1qygr"; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip" "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2";